diff --git a/rss-generator/Class/RSS/Danbooru/rank.cs b/rss-generator/Class/RSS/Danbooru/rank.cs index 3a52b87..66d0ae9 100644 --- a/rss-generator/Class/RSS/Danbooru/rank.cs +++ b/rss-generator/Class/RSS/Danbooru/rank.cs @@ -17,14 +17,18 @@ internal class rank /// Danbooruのランクフィードを取得し、各投稿ページから詳細情報を取得して整形したRSSを出力します。 /// /// HttpClient インスタンス - public static async Task CreateRSSAsync(HttpClient client) + public static async Task CreateRSSAsync(HttpClient client, string? sessionId = null) { var pageMaster = "https://danbooru.donmai.us/posts.atom?tags=order%3Arank"; try { - // FlareSolverr セッションを作成して複数リクエストを高速化 - string? sessionId = await CmnUtil.CreateFlareSolverrSession(client); + // 外部からセッションが渡されなかった場合は自前で作成 + bool ownSession = sessionId == null; + if (ownSession) + { + sessionId = await CmnUtil.CreateFlareSolverrSession(client); + } try { // FlareSolverr 経由で Atom フィードアイテムを取得 @@ -52,7 +56,7 @@ internal class rank } finally { - if (sessionId != null) + if (ownSession && sessionId != null) { await CmnUtil.DestroyFlareSolverrSession(client, sessionId); } diff --git a/rss-generator/Class/RSS/FlareSolverrFeedManager.cs b/rss-generator/Class/RSS/FlareSolverrFeedManager.cs new file mode 100644 index 0000000..41a7654 --- /dev/null +++ b/rss-generator/Class/RSS/FlareSolverrFeedManager.cs @@ -0,0 +1,121 @@ +using System; +using System.Diagnostics; +using System.Net.Http; +using System.Threading.Tasks; +using rss_generator.Class.RSS.Danbooru; +using rss_generator.Class.RSS.hitomi_la; + +namespace rss_generator.Class.RSS; + +/// +/// FlareSolverr を利用するすべての RSS 生成処理を単一のセッションで順次(直列)実行し、 +/// 完了後に確実にセッションを破棄してメモリ消費を極小化するマネージャークラス +/// +internal static class FlareSolverrFeedManager +{ + /// + /// FlareSolverr セッションを 1 つ作成し、そのセッションを共有して各フィードを順次生成します。 + /// 完了後(または異常終了時)にセッションを確実に破棄して Chromium プロセスを終了させます。 + /// + /// HttpClient インスタンス + public static async Task CreateAllRSSAsync(HttpClient client) + { + LogManager.AddLog("[情報] FlareSolverr フィード生成(単一セッション順次実行)を開始します"); + var sw = Stopwatch.StartNew(); + string? sessionId = null; + + try + { + // 1. 全タスク共通の単一 FlareSolverr セッションを作成(Chromium 1インスタンスのみ起動) + sessionId = await CmnUtil.CreateFlareSolverrSession(client); + LogManager.AddLog($"[情報] 共通 FlareSolverr セッションを作成しました (Session: {sessionId ?? "none"})"); + + // 2. メモリ節約のため、1つのセッションを使い回して直列(同期)で順番に実行 + // 個別のエラーで全体が止まらないよう各タスクを保護 + + // npb_6 + try + { + await npb_6.CreateRSSAsync(client, sessionId); + } + catch (Exception ex) + { + LogManager.AddLog($"[エラー] [FlareSolverrFeedManager] npb_6 実行失敗: {ex.Message}"); + } + + // aurahentai + try + { + await aurahentai.CreateRSSAsync(client, sessionId); + } + catch (Exception ex) + { + LogManager.AddLog($"[エラー] [FlareSolverrFeedManager] aurahentai 実行失敗: {ex.Message}"); + } + + // Danbooru rank + try + { + await rank.CreateRSSAsync(client, sessionId); + } + catch (Exception ex) + { + LogManager.AddLog($"[エラー] [FlareSolverrFeedManager] Danbooru.rank 実行失敗: {ex.Message}"); + } + + // missav + try + { + await missav.CreateRSSAsync(client, sessionId); + } + catch (Exception ex) + { + LogManager.AddLog($"[エラー] [FlareSolverrFeedManager] missav 実行失敗: {ex.Message}"); + } + + // missav123 + try + { + await missav123.CreateRSSAsync(client, sessionId); + } + catch (Exception ex) + { + LogManager.AddLog($"[エラー] [FlareSolverrFeedManager] missav123 実行失敗: {ex.Message}"); + } + + // hitomi.la + try + { + await index_japanese.CreateRSSAsync(client, sessionId); + } + catch (Exception ex) + { + LogManager.AddLog($"[エラー] [FlareSolverrFeedManager] hitomi.la 実行失敗: {ex.Message}"); + } + } + catch (Exception ex) + { + LogManager.AddLog($"[エラー] [FlareSolverrFeedManager] 共通セッション処理中に例外発生: {ex.Message}"); + CmnUtil.PrintCallStackToEvent(ex); + } + finally + { + // 3. すべて取得完了後にセッション(Chromiumインスタンス)を確実に破棄してメモリ解放 + if (sessionId != null) + { + try + { + await CmnUtil.DestroyFlareSolverrSession(client, sessionId); + LogManager.AddLog($"[情報] 共通 FlareSolverr セッションを破棄しました (Session: {sessionId})"); + } + catch (Exception ex) + { + LogManager.AddLog($"[警告] [FlareSolverrFeedManager] セッション破棄中にエラー: {ex.Message}"); + } + } + + sw.Stop(); + LogManager.AddLog($"[情報] FlareSolverr フィード生成完了 実行時間:{sw.Elapsed.TotalSeconds:0.##}秒"); + } + } +} diff --git a/rss-generator/Class/RSS/aurahentai.cs b/rss-generator/Class/RSS/aurahentai.cs index 9cd0418..b765e37 100644 --- a/rss-generator/Class/RSS/aurahentai.cs +++ b/rss-generator/Class/RSS/aurahentai.cs @@ -19,7 +19,7 @@ internal class aurahentai /// 500 Internal Server Error や過負荷を根本防止しています。 /// /// HttpClient インスタンス - public static async Task CreateRSSAsync(HttpClient client) + public static async Task CreateRSSAsync(HttpClient client, string? sessionId = null) { var baseURL = "https://aurahentai.com/language/japanese"; var feed = new SyndicationFeed("aurahentai.com", "", new Uri(baseURL)); @@ -27,8 +27,12 @@ internal class aurahentai try { - // セッションを作成して複数ページ取得を高速化 - string? sessionId = await CmnUtil.CreateFlareSolverrSession(client); + // 外部からセッションが渡されなかった場合は自前で作成 + bool ownSession = sessionId == null; + if (ownSession) + { + sessionId = await CmnUtil.CreateFlareSolverrSession(client); + } try { for (int pageId = 1; pageId <= 5; pageId++) @@ -46,7 +50,7 @@ internal class aurahentai } finally { - if (sessionId != null) + if (ownSession && sessionId != null) { await CmnUtil.DestroyFlareSolverrSession(client, sessionId); } diff --git a/rss-generator/Class/RSS/hitomi_la/index_japanese.cs b/rss-generator/Class/RSS/hitomi_la/index_japanese.cs index e7d4b6f..69e77f0 100644 --- a/rss-generator/Class/RSS/hitomi_la/index_japanese.cs +++ b/rss-generator/Class/RSS/hitomi_la/index_japanese.cs @@ -14,7 +14,7 @@ namespace rss_generator.Class.RSS.hitomi_la; internal class index_japanese { - public static async Task CreateRSSAsync(HttpClient client) + public static async Task CreateRSSAsync(HttpClient client, string? sessionId = null) { var baseURL = "https://hitomi.la/index-japanese.html"; @@ -23,8 +23,12 @@ internal class index_japanese try { - // セッションを作成して複数ページ取得を高速化 - string? sessionId = await CmnUtil.CreateFlareSolverrSession(client); + // 外部からセッションが渡されなかった場合は自前で作成 + bool ownSession = sessionId == null; + if (ownSession) + { + sessionId = await CmnUtil.CreateFlareSolverrSession(client); + } try { for (int pageId = 1; pageId <= 5; pageId++) @@ -42,7 +46,7 @@ internal class index_japanese } finally { - if (sessionId != null) + if (ownSession && sessionId != null) { await CmnUtil.DestroyFlareSolverrSession(client, sessionId); } diff --git a/rss-generator/Class/RSS/missav.cs b/rss-generator/Class/RSS/missav.cs index 46d5451..680b589 100644 --- a/rss-generator/Class/RSS/missav.cs +++ b/rss-generator/Class/RSS/missav.cs @@ -12,14 +12,18 @@ namespace rss_generator.Class.RSS; internal static class missav { - public static async Task CreateRSSAsync(HttpClient client) + public static async Task CreateRSSAsync(HttpClient client, string? sessionId = null) { var feed = new SyndicationFeed("missav.ai", "", new Uri("https://missav.ai/ja/new")); var items = new List(); try { - // セッションを作成して複数ページ取得を高速化 - string? sessionId = await CmnUtil.CreateFlareSolverrSession(client); + // 外部からセッションが渡されなかった場合は自前で作成 + bool ownSession = sessionId == null; + if (ownSession) + { + sessionId = await CmnUtil.CreateFlareSolverrSession(client); + } var docList = new List(); try { @@ -32,7 +36,7 @@ internal static class missav } finally { - if (sessionId != null) + if (ownSession && sessionId != null) { await CmnUtil.DestroyFlareSolverrSession(client, sessionId); } diff --git a/rss-generator/Class/RSS/missav123.cs b/rss-generator/Class/RSS/missav123.cs index c18c68d..98965fa 100644 --- a/rss-generator/Class/RSS/missav123.cs +++ b/rss-generator/Class/RSS/missav123.cs @@ -18,7 +18,7 @@ internal class missav123 /// 123av.com の新着動画を取得し、FreshRSS等のRSSリーダー内で動画を直接再生できるiframeを埋め込んだRSSを生成します。 /// /// HttpClient インスタンス - public static async Task CreateRSSAsync(HttpClient client) + public static async Task CreateRSSAsync(HttpClient client, string? sessionId = null) { var pageMaster = "https://123av.com"; @@ -26,8 +26,12 @@ internal class missav123 var items = new List(); try { - // FlareSolverr セッションを作成して複数ページおよび詳細ページ取得を高速化 - string? sessionId = await CmnUtil.CreateFlareSolverrSession(client); + // 外部からセッションが渡されなかった場合は自前で作成 + bool ownSession = sessionId == null; + if (ownSession) + { + sessionId = await CmnUtil.CreateFlareSolverrSession(client); + } try { var docList = new List(); @@ -209,7 +213,7 @@ internal class missav123 } finally { - if (sessionId != null) + if (ownSession && sessionId != null) { await CmnUtil.DestroyFlareSolverrSession(client, sessionId); } diff --git a/rss-generator/Class/RSS/npb_6.cs b/rss-generator/Class/RSS/npb_6.cs index 339014a..7611880 100644 --- a/rss-generator/Class/RSS/npb_6.cs +++ b/rss-generator/Class/RSS/npb_6.cs @@ -9,7 +9,7 @@ namespace rss_generator.Class.RSS; internal class npb_6 { - public static async Task CreateRSSAsync(HttpClient client) + public static async Task CreateRSSAsync(HttpClient client, string? sessionId = null) { var feed = new SyndicationFeed("広島東洋カープ - プロ野球 - スポーツナビ", "", new Uri("https://baseball.yahoo.co.jp/npb/teams/6/top")); var items = new List(); @@ -17,14 +17,18 @@ internal class npb_6 { var pageURL = $"https://baseball.yahoo.co.jp/npb/teams/6/top"; IDocument document; - string? sessionId = await CmnUtil.CreateFlareSolverrSession(client); + bool ownSession = sessionId == null; + if (ownSession) + { + sessionId = await CmnUtil.CreateFlareSolverrSession(client); + } try { document = await CmnUtil.GetDocumentFlareSolverr(client, pageURL, session: sessionId); } finally { - if (sessionId != null) + if (ownSession && sessionId != null) { await CmnUtil.DestroyFlareSolverrSession(client, sessionId); } diff --git a/rss-generator/Program.cs b/rss-generator/Program.cs index 9f178b6..0302a48 100644 --- a/rss-generator/Program.cs +++ b/rss-generator/Program.cs @@ -80,20 +80,15 @@ while (true) tasks.Add(momonga_magazine.CreateRSSAsync(client)); } #if DEBUG - tasks.Add(aurahentai.CreateRSSAsync(client)); + tasks.Add(FlareSolverrFeedManager.CreateAllRSSAsync(client)); + //tasks.Add(aurahentai.CreateRSSAsync(client)); #else tasks.Add(YouTubeFeedManager.CreateRSSAsync(client)); tasks.Add(rss_generator.Class.RSS.X.x_list.CreateRSSAsync(client)); tasks.Add(kimochiinfo.CreateRSSAsync(client)); - tasks.Add(missav.CreateRSSAsync(client)); - tasks.Add(missav123.CreateRSSAsync(client)); - tasks.Add(npb_6.CreateRSSAsync(client)); tasks.Add(ci_en.CreateRSSAsync(client)); - - tasks.Add(aurahentai.CreateRSSAsync(client)); tasks.Add(javtwi.CreateRSSAsync(client)); - tasks.Add(rss_generator.Class.RSS.Danbooru.rank.CreateRSSAsync(client)); tasks.Add(mangalear.CreateRSSAsync(client)); tasks.Add(e_hentai_ai.CreateRSSAsync(client)); tasks.Add(e_hentai_non_ai.CreateRSSAsync(client)); @@ -101,8 +96,9 @@ while (true) tasks.Add(pixiv_non_r18_ai.CreateRSSAsync(client)); tasks.Add(pixiv_r18_non_ai.CreateRSSAsync(client)); tasks.Add(pixiv_r18_ai.CreateRSSAsync(client)); - - tasks.Add(index_japanese.CreateRSSAsync(client)); + + // FlareSolverr 利用タスク群(単一セッションで順次実行し、完了後に破棄してメモリ最小化) + tasks.Add(FlareSolverrFeedManager.CreateAllRSSAsync(client)); #endif