diff --git a/rss-generator/Class/CmnUtil.cs b/rss-generator/Class/CmnUtil.cs
index fa70eba..91339da 100644
--- a/rss-generator/Class/CmnUtil.cs
+++ b/rss-generator/Class/CmnUtil.cs
@@ -853,6 +853,66 @@ public class CmnUtil
return string.Equals(flareResponse?.Status, "ok", StringComparison.OrdinalIgnoreCase);
}
+ ///
+ /// FlareSolverr に存在するすべてのセッションを取得します。
+ ///
+ public static async Task> ListFlareSolverrSessions(
+ HttpClient client,
+ string flareSolverrEndpoint = "https://udukipc-flaresolverr.armonica-vps.work/v1")
+ {
+ try
+ {
+ var payload = new FlareSolverrRequest { Cmd = "sessions.list" };
+ using var request = new HttpRequestMessage(HttpMethod.Post, flareSolverrEndpoint)
+ {
+ Content = JsonContent.Create(payload, options: FlareSolverrJsonOptions)
+ };
+ using var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
+ if (!response.IsSuccessStatusCode) return new List();
+
+ using var responseStream = await response.Content.ReadAsStreamAsync();
+ var flareResponse = await JsonSerializer.DeserializeAsync(responseStream, FlareSolverrJsonOptions);
+ return flareResponse?.Sessions ?? new List();
+ }
+ catch (Exception ex)
+ {
+ LogManager.AddLog($"[警告] [CmnUtil] FlareSolverr セッション一覧取得失敗: {ex.Message}");
+ return new List();
+ }
+ }
+
+ ///
+ /// FlareSolverr に存在するすべてのセッション(孤立・残留セッション含む)を破棄し、Chromium プロセスを終了させます。
+ ///
+ public static async Task DestroyAllFlareSolverrSessions(
+ HttpClient client,
+ string flareSolverrEndpoint = "https://udukipc-flaresolverr.armonica-vps.work/v1")
+ {
+ try
+ {
+ var sessions = await ListFlareSolverrSessions(client, flareSolverrEndpoint);
+ if (sessions.Count == 0) return;
+
+ LogManager.AddLog($"[情報] [CmnUtil] FlareSolverr 残留セッション ({sessions.Count} 件) の一括破棄を開始します");
+ foreach (var s in sessions)
+ {
+ try
+ {
+ await DestroyFlareSolverrSession(client, s, flareSolverrEndpoint);
+ }
+ catch (Exception ex)
+ {
+ LogManager.AddLog($"[警告] [CmnUtil] セッション破棄失敗 ({s}): {ex.Message}");
+ }
+ }
+ LogManager.AddLog($"[情報] [CmnUtil] FlareSolverr 全セッションの破棄完了");
+ }
+ catch (Exception ex)
+ {
+ LogManager.AddLog($"[警告] [CmnUtil] 全セッション破棄処理中にエラー: {ex.Message}");
+ }
+ }
+
///
/// FlareSolverr リクエスト用 DTO
///
@@ -888,6 +948,9 @@ public class CmnUtil
[JsonPropertyName("session")]
public string? Session { get; set; }
+ [JsonPropertyName("sessions")]
+ public List? Sessions { get; set; }
+
[JsonPropertyName("solution")]
public FlareSolverrSolution? Solution { get; set; }
diff --git a/rss-generator/Class/RSS/FlareSolverrFeedManager.cs b/rss-generator/Class/RSS/FlareSolverrFeedManager.cs
index 41a7654..d2a679f 100644
--- a/rss-generator/Class/RSS/FlareSolverrFeedManager.cs
+++ b/rss-generator/Class/RSS/FlareSolverrFeedManager.cs
@@ -26,6 +26,9 @@ internal static class FlareSolverrFeedManager
try
{
+ // 0. 開始前に過去の残留セッションがあればすべて事前に破棄
+ await CmnUtil.DestroyAllFlareSolverrSessions(client);
+
// 1. 全タスク共通の単一 FlareSolverr セッションを作成(Chromium 1インスタンスのみ起動)
sessionId = await CmnUtil.CreateFlareSolverrSession(client);
LogManager.AddLog($"[情報] 共通 FlareSolverr セッションを作成しました (Session: {sessionId ?? "none"})");
@@ -100,18 +103,16 @@ internal static class FlareSolverrFeedManager
}
finally
{
- // 3. すべて取得完了後にセッション(Chromiumインスタンス)を確実に破棄してメモリ解放
- if (sessionId != null)
+ // 3. すべて取得完了後にセッション(Chromiumインスタンス)を確実に破棄してメモリ・CPUを完全解放
+ // 個別の sessionId 破棄に加え、万が一の残留セッションも一括破棄
+ try
{
- try
- {
- await CmnUtil.DestroyFlareSolverrSession(client, sessionId);
- LogManager.AddLog($"[情報] 共通 FlareSolverr セッションを破棄しました (Session: {sessionId})");
- }
- catch (Exception ex)
- {
- LogManager.AddLog($"[警告] [FlareSolverrFeedManager] セッション破棄中にエラー: {ex.Message}");
- }
+ await CmnUtil.DestroyAllFlareSolverrSessions(client);
+ LogManager.AddLog($"[情報] [FlareSolverrFeedManager] FlareSolverr セッションクリーンアップ完了");
+ }
+ catch (Exception ex)
+ {
+ LogManager.AddLog($"[警告] [FlareSolverrFeedManager] セッションクリーンアップ中にエラー: {ex.Message}");
}
sw.Stop();