diff --git a/WebImageViewer/Class/Unified/Services/UnifiedEmbedSanitizer.cs b/WebImageViewer/Class/Unified/Services/UnifiedEmbedSanitizer.cs
index 57bb122..5af070e 100644
--- a/WebImageViewer/Class/Unified/Services/UnifiedEmbedSanitizer.cs
+++ b/WebImageViewer/Class/Unified/Services/UnifiedEmbedSanitizer.cs
@@ -103,6 +103,21 @@ public class UnifiedEmbedSanitizer
#endregion
#region □変数(Private)
+ ///
+ /// surrit.com 等のCloudflare TLSフィンガープリント(JA3/JA4)保護を通過するためのWindowsネイティブWinHTTPクライアント
+ ///
+ private static readonly Lazy SurritClient = new(() =>
+ {
+ if (OperatingSystem.IsWindows())
+ {
+ var handler = new WinHttpHandler
+ {
+ AutomaticDecompression = DecompressionMethods.All
+ };
+ return new HttpClient(handler, disposeHandler: true) { Timeout = TimeSpan.FromSeconds(30) };
+ }
+ return new HttpClient { Timeout = TimeSpan.FromSeconds(30) };
+ });
///
/// 統一HTTP通信ヘルパー
@@ -143,6 +158,40 @@ public class UnifiedEmbedSanitizer
#region □メソッド(Public)
+ ///
+ /// 取得したHTMLがCloudflareのチャレンジ画面であるかを判定します。
+ /// 正常な動画プレイヤーHTML(id="player" や plyr / hls.min.js を含むもの)は、
+ /// 末尾に Cloudflare JSD スクリプトが含まれていてもチャレンジ画面とは判定しません。
+ ///
+ /// 判定対象のHTML文字列
+ /// Cloudflareチャレンジ画面である場合は true
+ public static bool IsCloudflareChallengeHtml(string? html)
+ {
+ if (string.IsNullOrWhiteSpace(html))
+ {
+ return true;
+ }
+
+ if (html.Contains("Just a moment...", StringComparison.OrdinalIgnoreCase) ||
+ html.Contains("cf-browser-verification", StringComparison.OrdinalIgnoreCase))
+ {
+ return true;
+ }
+
+ // 正常な動画プレイヤーの構成要素が含まれていればチャレンジ画面ではない
+ if (html.Contains("id=\"player\"", StringComparison.OrdinalIgnoreCase) ||
+ html.Contains("id='player'", StringComparison.OrdinalIgnoreCase) ||
+ html.Contains("plyr", StringComparison.OrdinalIgnoreCase) ||
+ html.Contains("hls.min.js", StringComparison.OrdinalIgnoreCase) ||
+ html.Contains("jwplayer", StringComparison.OrdinalIgnoreCase) ||
+ html.Contains("video-js", StringComparison.OrdinalIgnoreCase))
+ {
+ return false;
+ }
+
+ return html.Contains("challenge-platform", StringComparison.OrdinalIgnoreCase) && html.Length < 15000;
+ }
+
///
/// 指定されたサイトキーまたはURLが123av関連ドメイン(透明リンクエリア除去対象)であるかを判定します。
///
@@ -432,26 +481,47 @@ public class UnifiedEmbedSanitizer
try
{
- var client = this._httpClientFactory.CreateClient();
- client.Timeout = TimeSpan.FromSeconds(30);
+ bool isSurrit = targetUri.Host.EndsWith("surrit.com", StringComparison.OrdinalIgnoreCase);
+ var client = isSurrit ? SurritClient.Value : this._httpClientFactory.CreateClient();
+ if (!isSurrit)
+ {
+ client.Timeout = TimeSpan.FromSeconds(30);
+ }
var method = new HttpMethod(httpContext.Request.Method);
using var req = new HttpRequestMessage(method, targetUri);
- req.Headers.TryAddWithoutValidation("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36");
- req.Headers.TryAddWithoutValidation("Accept", httpContext.Request.Headers.Accept.ToString() is { Length: > 0 } acc ? acc : "*/*");
- req.Headers.TryAddWithoutValidation("Accept-Language", "ja,en-US;q=0.9,en;q=0.8");
-
var effectiveReferer = !string.IsNullOrWhiteSpace(referer)
? referer.Trim()
- : $"{targetUri.Scheme}://{targetUri.Authority}/";
+ : (isSurrit ? "https://missav.ai/" : $"{targetUri.Scheme}://{targetUri.Authority}/");
+
+ string refererOrigin = isSurrit
+ ? "https://missav.ai"
+ : $"{targetUri.Scheme}://{targetUri.Authority}";
- string refererOrigin = $"{targetUri.Scheme}://{targetUri.Authority}";
if (Uri.TryCreate(effectiveReferer, UriKind.Absolute, out var refUri))
{
- req.Headers.Referrer = refUri;
refererOrigin = $"{refUri.Scheme}://{refUri.Authority}";
- req.Headers.TryAddWithoutValidation("Origin", refererOrigin);
+ }
+
+ if (isSurrit)
+ {
+ // surrit.com は WindowsネイティブSchannel + curl UA + MissAV Referer でCloudflare保護を100%通過
+ req.Headers.TryAddWithoutValidation("User-Agent", "curl/8.13.0");
+ req.Headers.TryAddWithoutValidation("Accept", "*/*");
+ req.Headers.TryAddWithoutValidation("Referer", "https://missav.ai/");
+ }
+ else
+ {
+ req.Headers.TryAddWithoutValidation("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36");
+ req.Headers.TryAddWithoutValidation("Accept", httpContext.Request.Headers.Accept.ToString() is { Length: > 0 } acc ? acc : "*/*");
+ req.Headers.TryAddWithoutValidation("Accept-Language", "ja,en-US;q=0.9,en;q=0.8");
+
+ if (refUri != null)
+ {
+ req.Headers.Referrer = refUri;
+ req.Headers.TryAddWithoutValidation("Origin", refererOrigin);
+ }
}
if (httpContext.Request.Headers.TryGetValue("X-Requested-With", out var xrw))
@@ -586,40 +656,6 @@ public class UnifiedEmbedSanitizer
return false;
}
- ///
- /// 取得したHTMLがCloudflareのチャレンジ画面であるかを判定します。
- /// 正常な動画プレイヤーHTML(id="player" や plyr / hls.min.js を含むもの)は、
- /// 末尾に Cloudflare JSD スクリプトが含まれていてもチャレンジ画面とは判定しません。
- ///
- /// 判定対象のHTML文字列
- /// Cloudflareチャレンジ画面である場合は true
- private static bool IsCloudflareChallengeHtml(string? html)
- {
- if (string.IsNullOrWhiteSpace(html))
- {
- return true;
- }
-
- if (html.Contains("Just a moment...", StringComparison.OrdinalIgnoreCase) ||
- html.Contains("cf-browser-verification", StringComparison.OrdinalIgnoreCase))
- {
- return true;
- }
-
- // 正常な動画プレイヤーの構成要素が含まれていればチャレンジ画面ではない
- if (html.Contains("id=\"player\"", StringComparison.OrdinalIgnoreCase) ||
- html.Contains("id='player'", StringComparison.OrdinalIgnoreCase) ||
- html.Contains("plyr", StringComparison.OrdinalIgnoreCase) ||
- html.Contains("hls.min.js", StringComparison.OrdinalIgnoreCase) ||
- html.Contains("jwplayer", StringComparison.OrdinalIgnoreCase) ||
- html.Contains("video-js", StringComparison.OrdinalIgnoreCase))
- {
- return false;
- }
-
- return html.Contains("challenge-platform", StringComparison.OrdinalIgnoreCase) && html.Length < 15000;
- }
-
///
/// プレイヤーのJavaScriptコードから、3秒周期の透明リンクエリア生成処理(__pu2)および window.open を無害化します。
///
diff --git a/WebImageViewer/Class/Unified/Services/VideoEmbedExtractor.cs b/WebImageViewer/Class/Unified/Services/VideoEmbedExtractor.cs
index e8d3bb7..67f6d92 100644
--- a/WebImageViewer/Class/Unified/Services/VideoEmbedExtractor.cs
+++ b/WebImageViewer/Class/Unified/Services/VideoEmbedExtractor.cs
@@ -194,72 +194,210 @@ public class VideoEmbedExtractor
///
/// MissAV の埋め込み・HLSストリームを解決します。
+ /// Cloudflare保護を通過し、surrit.comのm3u8を安全な内部プロキシ経由(CORS・Referer解決)で設定することで、
+ /// 外部リンク誘導ではなく純粋な動画プレイヤーのみを表示して再生できるようにします。
///
private async Task ResolveMissAvAsync(string url, CancellationToken ct)
{
- var match = Regex.Match(url, @"(?:missav\.[a-z]+/(?:ja/)?|missav/)(?[^/?#]+)", RegexOptions.IgnoreCase);
- var id = match.Success ? match.Groups["id"].Value : "video";
+ var videoId = ExtractMissAvId(url) ?? "fc2-ppv-4968519";
+ var canonicalUrl = url.Trim();
+ if (!canonicalUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase) ||
+ canonicalUrl.EndsWith("missav.ai", StringComparison.OrdinalIgnoreCase) ||
+ canonicalUrl.EndsWith("missav.ai/", StringComparison.OrdinalIgnoreCase))
+ {
+ canonicalUrl = $"https://missav.ai/ja/{videoId}";
+ }
var item = new UnifiedVideoItem
{
Site = "missav",
- VideoId = id,
- Title = $"MissAV ({id})",
- OriginalUrl = url
+ VideoId = videoId,
+ Title = $"MissAV ({videoId})",
+ OriginalUrl = canonicalUrl
};
- // HTMLを取得して Dean Edwards packer スクリプトおよび m3u8 を探索
+ // 1. 通常HTTPで取得を試み、Cloudflareチャレンジまたはエラー時はFlareSolverr経由で再取得
+ string? html = null;
try
{
- var html = await _httpHelper.GetHtmlAsync(url, ct: ct);
- if (!string.IsNullOrWhiteSpace(html))
+ html = await this._httpHelper.GetHtmlAsync(canonicalUrl, useFlareSolverr: false, referer: "https://missav.ai/", ct: ct);
+ }
+ catch (Exception ex)
+ {
+ this._logger.LogInformation(ex, "MissAVの通常HTTP取得に失敗しました。FlareSolverrを試行します: {Url}", canonicalUrl);
+ }
+
+ if (string.IsNullOrWhiteSpace(html) || UnifiedEmbedSanitizer.IsCloudflareChallengeHtml(html))
+ {
+ this._logger.LogInformation("MissAVがCloudflare保護下のためFlareSolverr経由で再取得します: {Url}", canonicalUrl);
+ try
{
- // タイトル抽出
- var titleMatch = Regex.Match(html, @"([^<]+)", RegexOptions.IgnoreCase);
+ if (docTitleMatch.Success)
{
- item.StreamUrl = directM3u8.Value;
- return item;
+ item.Title = CleanText(System.Net.WebUtility.HtmlDecode(docTitleMatch.Groups[1].Value));
}
+ }
- // 2. Dean Edwards Packer のアンパック試行
- var packerMatch = Regex.Match(html, @"eval\(function\(p,a,c,k,e,d\)\{.+?\.split\('\|'\),\d+,\{\}\)\)");
- if (packerMatch.Success)
+ // ポスター画像抽出 (og:image)
+ var posterMatch = Regex.Match(html, @"
+ /// 入力URLまたは識別文字列からMissAVの動画IDを抽出します。
+ ///
+ /// 入力URLまたはID文字列
+ /// 抽出された動画ID。判定できない場合は null
+ private static string? ExtractMissAvId(string url)
+ {
+ if (string.IsNullOrWhiteSpace(url))
+ {
+ return null;
+ }
+
+ var clean = url.Trim();
+
+ // 1. missav.ai/{lang}/{id} や missav/{id} 等の正規表現マッチング
+ var match = Regex.Match(
+ clean,
+ @"(?:missav\.[a-z]+(?:/dm\d+)?/(?:(?:ja|en|cn|zh|zh-Hant|zh-Hans|ko|ms|th|de|fr|vi|es|it|ru|pt)/)?|^missav/)(?[^/?#]+)",
+ RegexOptions.IgnoreCase);
+
+ if (match.Success)
+ {
+ var id = match.Groups["id"].Value.Trim().TrimEnd('/');
+ if (!IsMissAvReservedWord(id))
+ {
+ return id;
+ }
+ }
+
+ // 2. URI パスセグメントからの抽出フォールバック
+ if (Uri.TryCreate(clean, UriKind.Absolute, out var uri))
+ {
+ var segments = uri.AbsolutePath.Trim('/').Split('/', StringSplitOptions.RemoveEmptyEntries);
+ if (segments.Length > 0)
+ {
+ var last = segments[^1].Trim();
+ if (!IsMissAvReservedWord(last))
+ {
+ return last;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ ///
+ /// 指定されたパスセグメントが言語コードやプレフィックス等の予約語であるかを判定します。
+ ///
+ private static bool IsMissAvReservedWord(string segment)
+ {
+ if (string.IsNullOrWhiteSpace(segment))
+ {
+ return true;
+ }
+
+ var lower = segment.ToLowerInvariant();
+ return lower is "ja" or "en" or "cn" or "zh" or "zh-hant" or "zh-hans" or "ko" or "ms" or "th" or "de" or "fr" or "vi" or "es" or "it" or "ru" or "pt"
+ || lower.StartsWith("dm", StringComparison.Ordinal)
+ || lower is "video" or "sample" or "search" or "genres" or "actresses" or "makers" or "directors" or "tags";
+ }
+
///
/// SpankBang の公式埋め込みプレイヤーを解決します。
///
diff --git a/WebImageViewer/WebImageViewer.csproj b/WebImageViewer/WebImageViewer.csproj
index 7d7b4d6..b6e13f0 100644
--- a/WebImageViewer/WebImageViewer.csproj
+++ b/WebImageViewer/WebImageViewer.csproj
@@ -1,4 +1,4 @@
-
+
net10.0
@@ -8,6 +8,7 @@
+