Compare commits

...
15 Commits
Author SHA1 Message Date
armonica 22a6f74184 修正: 85PO動画のX-Frame-Options遮断解消とクリーン埋め込みプロキシ対応
- UnifiedEmbedSanitizerに85POを統合し、同一オリジン中継(/api/clean-embed)経由でX-Frame-Options遮断を完全解消
- IsCloudflareChallengeHtmlにkt_player/video_urlの検出を追加し、正常プレイヤーHTMLの誤判定を防止
- ProxyEmbedRequestAsyncのUA調整(curl/8.13.0)によりアセットおよび動画ストリームのプロキシ取得を完全化
- UnifiedHttpHelperにWindows標準curl.exeによるCloudflare回避フォールバックを追加
- プレイヤー内video_urlの自動プロキシ化と広告コード無効化による即時動画再生を実現
2026-11-11 19:35:16 +09:00
armonica bec51879c7 追加: 85PO(85po.com / 85ro.com / 85po.net)の動画閲覧・埋め込みプレイヤー再生対応
- DomainClassifierに85po.comおよび関連ドメインを登録し動画メディアとして自動認識
- VideoEmbedExtractorにResolve85PoAsyncを実装し公式埋め込みプレイヤー(embed)の自動抽出・解決に対応
- UnifiedHtmlRendererのトップページに85POのサンプルカードおよび対応ドメインチップを追加
- Windows環境でのWinHttpHandler適用によるCloudflare TLSフィンガープリント耐性の向上
- レガシーVideoUrlResolverへの85POホスト判定の追加による後方互換性担保
2026-11-11 18:56:18 +09:00
armonica cd202a1719 修正: 大量画像ZIP化時のページ抜け防止と10秒取得試行・中断/続行ダイアログの実装
- ページ遷移直後のZIPダウンロード開始時にバックグラウンド先読みリクエストを即時中断・一時停止し接続競合を解消
- 3桁を超える大量画像でも抜けが発生しないようページ順に10秒間繰り返し取得を試行するロジックへ改修
- 10秒間試行して取得できない場合にエラーメッセージおよび「中断」「続行」ボタンをダイアログ上に表示して処理を制御
- E-Hentaiスクレイパーの大量ページ取得時の並列数制御とリトライを追加
2026-11-05 02:42:25 +09:00
armonica bc8bce8de4 改善: ZIPダウンロード時のページ抜け防止、保存先事前指定および進捗モーダルの実装
- ダウンロードボタン押下時にFile System Access APIを用いて先に保存先(ファイル名・場所)を指定するフローを導入
- 保存先指定後にリアルタイム進捗モーダル(進行状況・パーセンテージ・件数・スキップ警告・中断機能)を表示
- 各画像の取得において最大3回リトライ+待機を行い、一時的な通信エラーによる抜けを完全防止(タイムアウト時のみスキップ許容)
- 外部依存ゼロの軽量インラインZIPエンジン(Store形式・UTF-8対応)を実装し、ブラウザ内で高速かつ確実にアーカイブを生成・保存
- サーバーサイドAPI(/api/download-zip)にも最大3回のリトライおよび待機処理を追加し、バックエンド側でも抜け防止を徹底
2026-11-04 11:13:41 +09:00
armonica ab8216b38e 追加: 全ページZIP一括ダウンロードAPIの新設とヘッダーボタンの追加
- ギャラリーの全ページ画像を安全かつ高速にZIPアーカイブとして一括配信するAPI(/api/download-zip)を新設
- 最大4並列での画像取得、ContentTypeおよび拡張子の自動判別、ゼロ埋め連番ファイル名(001.jpg等)による格納を実装
- サーバーメモリ枯渇を防ぐ一時ファイルストリーミング配信とFastest圧縮レベルによる高速生成を実現
- ビューアー画面およびサムネイル一覧画面のヘッダーに「ZIP保存」ボタンを追加
2026-11-04 10:46:30 +09:00
armonica b9a316254b 追加: 全ページサムネイル一覧表示画面の新設とヘッダー遷移ボタンの追加
- ギャラリー全ページのサムネイルをグリッドカード形式で閲覧できる新画面(RenderThumbnailGridPage)を新設
- ビューアーヘッダーに「サムネイル一覧」ボタンを追加し、ワンクリックで全ページ一覧画面へ遷移可能に
- サムネイル画面のカードクリック時に該当ページ番号(?page=N)付きでビューアーを直接開くシームレスな画面連携を実装
- Program.csにて /?url=...&view=thumbnails および /thumbnails?url=... のルーティングを追加
2026-11-04 10:43:10 +09:00
armonica 60c2648add 追加: HTML表示内での画像のみ表示(没入モード)とスクロール・キーボード切り替え機能
- OS全画面APIとは別に、HTML表示領域全体で画像のみを集中閲覧できる没入モード(画像のみ表示)を追加
- コントロールバーに「画像のみ」切り替えボタン(ショートカット: V / I)を配置
- 画像のみ表示モード時にマウスホイール上下でのスムーズなページ送り、キーボード(矢印キー、A/D、Space、PageUp/Down、Home/End)によるページ切り替えに対応
- 画面右上のフローティング解除ボタン(✕)およびEscキーによる通常表示復帰を実装
2026-11-04 10:39:55 +09:00
armonica 6ec727e9c5 機能改善: MissAVの動画埋め込みプレイヤー対応とWinHttpプロキシ連携の追加
- MissAVのHTML抽出において通常アクセス失敗時にFlareSolverrへ自動フォールバックする連携を追加

- surrit.comのHLSマニフェスト(playlist.m3u8)のDean Edwards packerアンパック抽出を強化

- WindowsネイティブWinHttpHandlerを導入し、surrit.comのCloudflare TLS保護・CORS・Refererを内部プロキシで完全突破

- 外部リンク誘導を排除し、WebImageViewerの統一動画プレイヤーで直接高画質再生できるよう改善
2026-10-27 02:21:28 +09:00
armonica 210543ba1f 修正: 動画ビューア描画における123av用サンドボックス保護と透明広告リンク監視を追加
UnifiedHtmlRendererおよびLegacyのHtmlRendererにて、123av関連ドメイン接続時にiframeのsandbox属性(ポップアップ遮断・プレイヤー操作許可)を設定し、Plyrコントローラーに干渉せず外部遷移aタグのみを除去する監視処理を追加
2026-10-24 16:31:05 +09:00
armonica 0e805184d9 改善: 123av動画ページからの埋め込みURL抽出とクリーン埋め込みURL変換を強化
Resolve123AvAsyncでのAjax API・v-scope解析時に外部広告ドメインを除外し、抽出した埋め込みプレイヤーURLを /api/clean-embed 経由のサニタイズ済みURLへ自動変換するよう更新
2026-10-24 16:31:05 +09:00
armonica 373169d697 追加: 123av埋め込みプレイヤーの透明広告リンク除去サービスとプロキシAPIを追加
123av埋め込みプレイヤー(sadie-shop.site等)で定期的に出現する透明リンクエリア(__pu2)および外部サイト遷移を除去するUnifiedEmbedSanitizerを追加し、Plyrプレイヤー操作やHLSストリーム(.m3u8/セグメント/VTT)を維持したまま配信する /api/clean-embed と /api/proxy-embed-req エンドポイントを登録
2026-10-24 16:31:04 +09:00
armonica 211da2a9d4 refactor(legacy): 旧/viewエンドポイントの新/?url=統一とProgram配線を更新 2026-10-06 08:11:48 +09:00
armonica d3ef4fe04f feat(unified): HTTPヘルパー設定注入とビューアーサービス連携を改善 2026-10-06 08:11:46 +09:00
armonica 295d1f0731 fix(scraper): Hitomi/HentaiPaw等のスクレイピング抽出ロジックを修正 2026-10-06 08:11:44 +09:00
armonica b415c74601 feat(video): 動画埋め込み抽出とドメイン分類ロジックを強化 2026-10-06 08:11:42 +09:00
17 changed files with 4695 additions and 311 deletions

No files matched your search

+172 -160
View File
@@ -43,214 +43,144 @@ public static class LegacyEndpoints
/// </summary> /// </summary>
public static WebApplication MapLegacyEndpoints(this WebApplication app) public static WebApplication MapLegacyEndpoints(this WebApplication app)
{ {
// 汎用ビューアー画面 (旧 /view) // 汎用ビューアー画面 (旧 /view -> 新 /?url=...)
app.MapGet("/view", async (string? url, string? site, string? id, string? category, GalleryService galleryService, CancellationToken ct) => app.MapGet("/view", (string? url, string? site, string? id, string? category) =>
{ {
var target = url ?? id; var target = url ?? id;
if (string.IsNullOrWhiteSpace(target)) if (string.IsNullOrWhiteSpace(target))
{ {
return Results.Redirect("/"); return Results.Redirect("/", permanent: true);
} }
if (IsVideoUrlOrSite(site, target)) var canonicalUrl = target.StartsWith("http", StringComparison.OrdinalIgnoreCase)
{ ? target
return Results.Redirect($"/video?url={Uri.EscapeDataString(target)}"); : BuildCanonicalUrl(site, target, category);
}
return await RenderGalleryResponseAsync(site, target, category, galleryService, ct); return Results.Redirect($"/?url={Uri.EscapeDataString(canonicalUrl)}", permanent: true);
}); });
// 汎用動画プレイヤー画面 (旧 /video) // 汎用動画プレイヤー画面 (旧 /video -> 新 /?url=...)
app.MapGet("/video", async ( app.MapGet("/video", (
string? url, string? url,
string? id, string? id,
string? site, string? site,
string? play, string? play,
string? stream, string? stream,
string? title, string? title) =>
VideoUrlResolver resolver,
CancellationToken ct) =>
{ {
var target = url ?? id; var target = url ?? id;
if (string.IsNullOrWhiteSpace(target) && string.IsNullOrWhiteSpace(stream) && string.IsNullOrWhiteSpace(play)) if (string.IsNullOrWhiteSpace(target) && string.IsNullOrWhiteSpace(stream) && string.IsNullOrWhiteSpace(play))
{ {
return Results.Redirect("/"); return Results.Redirect("/", permanent: true);
} }
if (IsGalleryUrlOrSite(site, target)) var canonicalUrl = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase))
? target
: (!string.IsNullOrWhiteSpace(site) && !string.IsNullOrWhiteSpace(target)
? BuildCanonicalUrl(site, target, null)
: (play ?? stream ?? target ?? ""));
var redirectUrl = $"/?url={Uri.EscapeDataString(canonicalUrl)}";
if (!string.IsNullOrWhiteSpace(play) && canonicalUrl != play)
{ {
return Results.Redirect($"/view?url={Uri.EscapeDataString(target!)}"); redirectUrl += $"&play={Uri.EscapeDataString(play)}";
}
if (!string.IsNullOrWhiteSpace(stream) && canonicalUrl != stream)
{
redirectUrl += $"&stream={Uri.EscapeDataString(stream)}";
} }
if (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase) && string.IsNullOrWhiteSpace(play) && string.IsNullOrWhiteSpace(stream)) return Results.Redirect(redirectUrl, permanent: true);
{
var resolved = await resolver.ResolveAsync(target, title, ct);
if (resolved.IsSuccess)
{
site ??= resolved.Site;
id ??= resolved.VideoId;
play ??= resolved.PlayerUrl;
stream ??= resolved.StreamUrl;
title ??= resolved.Title;
target = resolved.OriginalUrl ?? target;
}
}
if (string.Equals(site, "123av", StringComparison.OrdinalIgnoreCase) || (target != null && target.Contains("123av", StringComparison.OrdinalIgnoreCase)))
{
var vId = (target != null ? Extract123AvId(target) : null) ?? id?.Trim() ?? "video";
var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : $"https://123av.com/ja/video/{vId}";
return Results.Content(HtmlRenderer.RenderVideoPlayer("123av", vId, play, null, orig, title ?? $"123av 動画 ({vId})"), "text/html; charset=utf-8");
}
if (string.Equals(site, "missav", StringComparison.OrdinalIgnoreCase) || (target != null && target.Contains("missav", StringComparison.OrdinalIgnoreCase)))
{
var vId = (target != null ? ExtractMissAvId(target) : null) ?? id?.Trim() ?? "video";
var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : $"https://missav.ai/ja/{vId}";
return Results.Content(HtmlRenderer.RenderVideoPlayer("missav", vId, play, stream, orig, title ?? $"missav 動画 ({vId})"), "text/html; charset=utf-8");
}
if (string.Equals(site, "spankbang", StringComparison.OrdinalIgnoreCase) || (target != null && target.Contains("spankbang", StringComparison.OrdinalIgnoreCase)))
{
var videoId = (target != null ? ExtractSpankBangId(target) : null) ?? id?.Trim() ?? "video";
var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : $"https://jp.spankbang.com/{videoId}/video/";
return Results.Content(HtmlRenderer.RenderVideoPlayer("spankbang", videoId, play ?? $"https://spankbang.com/{videoId}/embed/", stream, orig, title ?? $"SpankBang 動画 ({videoId})"), "text/html; charset=utf-8");
}
if (string.Equals(site, "doga", StringComparison.OrdinalIgnoreCase) || string.Equals(site, "eroterest_doga", StringComparison.OrdinalIgnoreCase) || (target != null && target.Contains("do-ga.eroterest.net", StringComparison.OrdinalIgnoreCase)))
{
var vId = id?.Trim() ?? (target != null ? System.Text.RegularExpressions.Regex.Match(target, @"detail/([0-9]+)").Groups[1].Value : "") ?? "doga";
if (string.IsNullOrWhiteSpace(vId)) vId = "doga";
var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : $"https://do-ga.eroterest.net/video/detail/{vId}/";
return Results.Content(HtmlRenderer.RenderVideoPlayer("doga", vId, play, stream, orig, title ?? $"エロタレドーガ ({vId})"), "text/html; charset=utf-8");
}
if (string.Equals(site, "inporn", StringComparison.OrdinalIgnoreCase) || (target != null && target.Contains("inporn.com", StringComparison.OrdinalIgnoreCase)))
{
var vId = id?.Trim() ?? (target != null ? System.Text.RegularExpressions.Regex.Match(target, @"/video/([0-9]+)").Groups[1].Value : "") ?? "video";
play ??= $"https://inporn.com/embed/{vId}/";
var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : $"https://inporn.com/video/{vId}/";
return Results.Content(HtmlRenderer.RenderVideoPlayer("inporn", vId, play, stream, orig, title ?? $"InPorn 動画 ({vId})"), "text/html; charset=utf-8");
}
if (string.Equals(site, "bdsmx", StringComparison.OrdinalIgnoreCase) || (target != null && target.Contains("bdsmx.tube", StringComparison.OrdinalIgnoreCase)))
{
var vId = id?.Trim() ?? (target != null ? System.Text.RegularExpressions.Regex.Match(target, @"/video/([0-9]+)").Groups[1].Value : "") ?? "video";
play ??= $"https://bdsmx.tube/embed/{vId}/";
var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : $"https://bdsmx.tube/video/{vId}/";
return Results.Content(HtmlRenderer.RenderVideoPlayer("bdsmx", vId, play, stream, orig, title ?? $"BDSMx 動画 ({vId})"), "text/html; charset=utf-8");
}
if (string.Equals(site, "vjav", StringComparison.OrdinalIgnoreCase) || (target != null && target.Contains("vjav.com", StringComparison.OrdinalIgnoreCase)))
{
var vId = (target != null ? System.Text.RegularExpressions.Regex.Match(target, @"/videos/([0-9]+)").Groups[1].Value : null);
if (string.IsNullOrWhiteSpace(vId)) vId = id?.Trim() ?? "video";
play ??= $"https://vjav.com/embed/{vId}/";
var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : $"https://vjav.com/videos/{vId}/";
return Results.Content(HtmlRenderer.RenderVideoPlayer("vjav", vId, play, stream, orig, title ?? $"VJAV 動画 ({vId})"), "text/html; charset=utf-8");
}
if (string.Equals(site, "laxd", StringComparison.OrdinalIgnoreCase) || (target != null && (target.Contains("video.laxd.com", StringComparison.OrdinalIgnoreCase) || target.Contains("laxd.com", StringComparison.OrdinalIgnoreCase))))
{
var vId = (target != null ? System.Text.RegularExpressions.Regex.Match(target, @"laxd\.com/(?:a/content/|content/|embed/)?([0-9a-zA-Z_\-]+)").Groups[1].Value : null);
if (string.IsNullOrWhiteSpace(vId)) vId = id?.Trim() ?? "video";
play ??= $"https://video.laxd.com/a/embed/player/{vId}/";
var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : $"https://video.laxd.com/a/content/{vId}";
return Results.Content(HtmlRenderer.RenderVideoPlayer("laxd", vId, play, stream, orig, title ?? $"LAXD 動画 ({vId})"), "text/html; charset=utf-8");
}
if (string.Equals(site, "fc2", StringComparison.OrdinalIgnoreCase) || string.Equals(site, "fc2video", StringComparison.OrdinalIgnoreCase) || (target != null && (target.Contains("contents.fc2.com", StringComparison.OrdinalIgnoreCase) || target.Contains("video.fc2.com", StringComparison.OrdinalIgnoreCase))))
{
var vId = (target != null ? System.Text.RegularExpressions.Regex.Match(target, @"(?:article/|aid=|content/|video/)([0-9a-zA-Z_\-]+)").Groups[1].Value : null);
if (string.IsNullOrWhiteSpace(vId)) vId = id?.Trim() ?? "video";
play ??= $"https://video.fc2.com/a/embed/player/{vId}/";
var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : $"https://adult.contents.fc2.com/article/{vId}/";
return Results.Content(HtmlRenderer.RenderVideoPlayer("fc2", vId, play, stream, orig, title ?? $"FC2 動画 ({vId})"), "text/html; charset=utf-8");
}
if (string.Equals(site, "xvideos", StringComparison.OrdinalIgnoreCase) || (target != null && target.Contains("xvideos.com", StringComparison.OrdinalIgnoreCase)))
{
var vId = (target != null ? System.Text.RegularExpressions.Regex.Match(target, @"(?:video\.|video|embedframe/)([0-9]+)").Groups[1].Value : null);
if (string.IsNullOrWhiteSpace(vId)) vId = id?.Trim() ?? "video";
play ??= $"https://www.xvideos.com/embedframe/{vId}";
var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : $"https://www.xvideos.com/video.{vId}/";
return Results.Content(HtmlRenderer.RenderVideoPlayer("xvideos", vId, play, stream, orig, title ?? $"XVIDEOS 動画 ({vId})"), "text/html; charset=utf-8");
}
if (!string.IsNullOrWhiteSpace(stream) || !string.IsNullOrWhiteSpace(play) || !string.IsNullOrWhiteSpace(site))
{
var currentSite = !string.IsNullOrWhiteSpace(site) ? site : "video";
var videoId = id?.Trim() ?? (!string.IsNullOrWhiteSpace(target) && !target.StartsWith("http") ? target : "video");
var orig = (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase)) ? target : "";
return Results.Content(HtmlRenderer.RenderVideoPlayer(currentSite, videoId, play, stream, orig, title ?? $"{currentSite} 動画プレイヤー"), "text/html; charset=utf-8");
}
if (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase))
{
return Results.Content(HtmlRenderer.RenderVideoPlayer("video", "video", play, stream, target, title ?? "動画プレイヤー"), "text/html; charset=utf-8");
}
return Results.Content(
HtmlRenderer.RenderErrorPage($"指定された動画URLまたはID({target})を認識できませんでした。", 400),
"text/html; charset=utf-8",
statusCode: 400);
}); });
// 123av プレイヤー画面 // 123av プレイヤー画面 (旧 /123av/{id} -> 新 /?url=...&play=...)
app.MapGet("/123av/{id}", (string id, string? play, string? url) => app.MapGet("/123av/{id}", (string id, string? play, string? url) =>
{ {
var videoId = Extract123AvId(id) ?? id.Trim(); var videoId = Extract123AvId(id) ?? id.Trim();
var origUrl = !string.IsNullOrEmpty(url) ? url : $"https://123av.com/ja/video/{videoId}"; var canonicalUrl = !string.IsNullOrEmpty(url) ? url : $"https://123av.com/ja/v/{videoId}";
return Results.Content(HtmlRenderer.RenderVideoPlayer("123av", videoId, play, null, origUrl, $"123av 動画 ({videoId})"), "text/html; charset=utf-8"); var redirectUrl = $"/?url={Uri.EscapeDataString(canonicalUrl)}";
if (!string.IsNullOrWhiteSpace(play))
{
redirectUrl += $"&play={Uri.EscapeDataString(play)}";
}
return Results.Redirect(redirectUrl, permanent: true);
}); });
// missav プレイヤー画面 // missav プレイヤー画面 (旧 /missav/{id} -> 新 /?url=...)
app.MapGet("/missav/{id}", (string id, string? stream, string? play, string? url) => app.MapGet("/missav/{id}", (string id, string? stream, string? play, string? url) =>
{ {
var videoId = ExtractMissAvId(id) ?? id.Trim(); var videoId = ExtractMissAvId(id) ?? id.Trim();
var origUrl = !string.IsNullOrEmpty(url) ? url : $"https://missav.ai/ja/{videoId}"; var canonicalUrl = !string.IsNullOrEmpty(url) ? url : $"https://missav.ai/ja/{videoId}";
return Results.Content(HtmlRenderer.RenderVideoPlayer("missav", videoId, play, stream, origUrl, $"missav 動画 ({videoId})"), "text/html; charset=utf-8"); var redirectUrl = $"/?url={Uri.EscapeDataString(canonicalUrl)}";
if (!string.IsNullOrWhiteSpace(stream))
{
redirectUrl += $"&stream={Uri.EscapeDataString(stream)}";
}
if (!string.IsNullOrWhiteSpace(play))
{
redirectUrl += $"&play={Uri.EscapeDataString(play)}";
}
return Results.Redirect(redirectUrl, permanent: true);
}); });
// SpankBang プレイヤー画面 // SpankBang プレイヤー画面 (旧 /spankbang/{id} -> 新 /?url=...)
app.MapGet("/spankbang/{id}", (string id) => app.MapGet("/spankbang/{id}", (string id) =>
{ {
var videoId = ExtractSpankBangId(id) ?? id.Trim(); var videoId = ExtractSpankBangId(id) ?? id.Trim();
return Results.Content(HtmlRenderer.RenderVideoPlayer(videoId, $"https://jp.spankbang.com/{videoId}/video/"), "text/html; charset=utf-8"); var canonicalUrl = $"https://spankbang.com/{videoId}/video/";
return Results.Redirect($"/?url={Uri.EscapeDataString(canonicalUrl)}", permanent: true);
}); });
// 統一ビューアー画面(3階層) // モモンガ旧URL形式 (旧 /fanzine/{id/base64}, /magazine/{id/base64} -> 新 /?url=...)
app.MapGet("/{site}/{category}/{id}", async (string site, string category, string id, GalleryService galleryService, CancellationToken ct) => app.MapGet("/fanzine/{*id}", (string? id) =>
{ {
if (string.Equals(site, "123av", StringComparison.OrdinalIgnoreCase)) var rawId = id ?? "";
{ var decoded = TryDecodeBase64Url(rawId);
return Results.Content(HtmlRenderer.RenderVideoPlayer("123av", id, null, null, $"https://123av.com/ja/video/{id}", $"123av 動画 ({id})"), "text/html; charset=utf-8"); var canonicalUrl = decoded ?? (!rawId.StartsWith("http", StringComparison.OrdinalIgnoreCase)
} ? $"https://momon-ga.com/fanzine/{rawId.Trim().TrimEnd('/')}"
if (string.Equals(site, "missav", StringComparison.OrdinalIgnoreCase)) : rawId);
{ return Results.Redirect($"/?url={Uri.EscapeDataString(canonicalUrl)}", permanent: true);
return Results.Content(HtmlRenderer.RenderVideoPlayer("missav", id, null, null, $"https://missav.ai/ja/{id}", $"missav 動画 ({id})"), "text/html; charset=utf-8");
}
return await RenderGalleryResponseAsync(site, id, category, galleryService, ct);
}); });
// 統一ビューアー画面(2階層) app.MapGet("/magazine/{*id}", (string? id) =>
app.MapGet("/{site}/{id}", async (string site, string id, GalleryService galleryService, CancellationToken ct) =>
{ {
if (string.Equals(site, "123av", StringComparison.OrdinalIgnoreCase)) var rawId = id ?? "";
var decoded = TryDecodeBase64Url(rawId);
var canonicalUrl = decoded ?? (!rawId.StartsWith("http", StringComparison.OrdinalIgnoreCase)
? $"https://momon-ga.com/magazine/{rawId.Trim().TrimEnd('/')}"
: rawId);
return Results.Redirect($"/?url={Uri.EscapeDataString(canonicalUrl)}", permanent: true);
});
app.MapGet("/books/{*id}", (string? id) =>
{ {
return Results.Content(HtmlRenderer.RenderVideoPlayer("123av", id, null, null, $"https://123av.com/ja/video/{id}", $"123av 動画 ({id})"), "text/html; charset=utf-8"); var rawId = id ?? "";
} var decoded = TryDecodeBase64Url(rawId);
if (string.Equals(site, "missav", StringComparison.OrdinalIgnoreCase)) var canonicalUrl = decoded ?? (!rawId.StartsWith("http", StringComparison.OrdinalIgnoreCase)
? $"https://momon-ga.com/books/{rawId.Trim().TrimEnd('/')}"
: rawId);
return Results.Redirect($"/?url={Uri.EscapeDataString(canonicalUrl)}", permanent: true);
});
// 統一ビューアー画面(3階層:旧 /{site}/{category}/{id} -> 新 /?url=...)
app.MapGet("/{site}/{category}/{*id}", (string site, string category, string? id) =>
{ {
return Results.Content(HtmlRenderer.RenderVideoPlayer("missav", id, null, null, $"https://missav.ai/ja/{id}", $"missav 動画 ({id})"), "text/html; charset=utf-8"); if (string.IsNullOrWhiteSpace(id))
}
if (string.Equals(site, "spankbang", StringComparison.OrdinalIgnoreCase))
{ {
return Results.Redirect($"/spankbang/{id}"); // 末尾スラッシュ付き2階層URL(例: /hentaipaw/4207932/)の救済
var canonical2 = BuildCanonicalUrl(site, category, null);
return Results.Redirect($"/?url={Uri.EscapeDataString(canonical2)}", permanent: true);
} }
return await RenderGalleryResponseAsync(site, id, null, galleryService, ct); var canonicalUrl = BuildCanonicalUrl(site, id, category);
return Results.Redirect($"/?url={Uri.EscapeDataString(canonicalUrl)}", permanent: true);
});
// 統一ビューアー画面(2階層:旧 /{site}/{id} -> 新 /?url=...)
app.MapGet("/{site}/{*id}", (string site, string? id) =>
{
var canonicalUrl = BuildCanonicalUrl(site, id ?? "", null);
return Results.Redirect($"/?url={Uri.EscapeDataString(canonicalUrl)}", permanent: true);
}); });
// 旧JSON API群 // 旧JSON API群
@@ -357,7 +287,7 @@ public static class LegacyEndpoints
input = input.Trim(); input = input.Trim();
var match = System.Text.RegularExpressions.Regex.Match( var match = System.Text.RegularExpressions.Regex.Match(
input, input,
@"(?:123av\.com/[a-z]{2}/(?:video/)?|^123av/)(?<id>[^/?#]+)", @"(?:123av\.[a-z]+/(?:[a-z]{2}/)?(?:video|v)/|^/?123av/)(?<id>[^/?#]+)",
System.Text.RegularExpressions.RegexOptions.IgnoreCase); System.Text.RegularExpressions.RegexOptions.IgnoreCase);
if (match.Success) return match.Groups["id"].Value; if (match.Success) return match.Groups["id"].Value;
@@ -370,6 +300,88 @@ public static class LegacyEndpoints
return input; return input;
} }
/// <summary>
/// Base64エンコードされたURL文字列(パディング欠損・URL-safe形式対応)のデコードを試みます。
/// </summary>
public static string? TryDecodeBase64Url(string input)
{
if (string.IsNullOrWhiteSpace(input)) return null;
var trimmed = input.Trim().TrimEnd('/', '\\');
if (trimmed.StartsWith("http://", StringComparison.OrdinalIgnoreCase) || trimmed.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
{
return trimmed;
}
try
{
var s = trimmed.Replace('-', '+').Replace('_', '/');
switch (s.Length % 4)
{
case 2: s += "=="; break;
case 3: s += "="; break;
}
var bytes = Convert.FromBase64String(s);
var decoded = System.Text.Encoding.UTF8.GetString(bytes);
if (decoded.StartsWith("http://", StringComparison.OrdinalIgnoreCase) || decoded.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
{
return decoded;
}
}
catch
{
// Base64ではない通常のIDの場合はnullを返す
}
return null;
}
/// <summary>
/// 旧形式のサイト識別子・カテゴリ・IDから、新形式(/?url=...)で受け付ける正規URLを構築します。
/// </summary>
public static string BuildCanonicalUrl(string? site, string id, string? category = null)
{
// 1. id そのものが Base64 デコードで URL になるかチェック
var decodedId = TryDecodeBase64Url(id);
if (!string.IsNullOrWhiteSpace(decodedId))
{
return decodedId;
}
if (id.StartsWith("http://", StringComparison.OrdinalIgnoreCase) || id.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
{
return id;
}
var normalizedSite = (site ?? "").Trim().ToLowerInvariant();
var safeId = id.Trim().TrimEnd('/', '\\');
return normalizedSite switch
{
"123av" => $"https://123av.com/ja/v/{Extract123AvId(safeId) ?? safeId}",
"missav" => $"https://missav.ai/ja/{ExtractMissAvId(safeId) ?? safeId}",
"spankbang" => $"https://spankbang.com/{ExtractSpankBangId(safeId) ?? safeId}/video/",
"doga" or "eroterest_doga" => $"https://do-ga.eroterest.net/video/detail/{safeId}/",
"eroterest" => $"https://movie.eroterest.net/page/{safeId}/",
"vjav" => $"https://vjav.com/videos/{safeId}/",
"laxd" => $"https://video.laxd.com/a/content/{safeId}",
"fc2" or "fc2video" => $"https://adult.contents.fc2.com/article/{safeId}/",
"xvideos" => $"https://www.xvideos.com/video.{safeId}/",
"inporn" => $"https://inporn.com/video/{safeId}/",
"bdsmx" => $"https://bdsmx.tube/video/{safeId}/",
"hitomi" => !string.IsNullOrWhiteSpace(category) ? $"https://hitomi.la/{category}/{safeId}.html" : $"https://hitomi.la/cg/{safeId}.html",
"ehentai" => !string.IsNullOrWhiteSpace(category) ? $"https://e-hentai.org/g/{category}/{safeId}/" : $"https://e-hentai.org/g/{safeId}/",
"momonga" => !string.IsNullOrWhiteSpace(category) ? $"https://momon-ga.com/{category}/{safeId}" : $"https://momon-ga.com/fanzine/{safeId}",
"fanzine" => $"https://momon-ga.com/fanzine/{safeId}",
"magazine" => $"https://momon-ga.com/magazine/{safeId}",
"books" => $"https://momon-ga.com/books/{safeId}",
"aurahentai" => $"https://aurahentai.com/gallery/{safeId}/",
"mangalear" => $"https://www.mangalear.blog/doujinshi/{safeId}/",
"hentaipaw" => $"https://ja.hentaipaw.com/articles/{safeId}",
_ => $"https://{normalizedSite}.com/{safeId}"
};
}
private static string? ExtractMissAvId(string input) private static string? ExtractMissAvId(string input)
{ {
if (string.IsNullOrWhiteSpace(input)) return null; if (string.IsNullOrWhiteSpace(input)) return null;
@@ -1,4 +1,4 @@
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
using System.Text.Json; using System.Text.Json;
using WebImageViewer.Class.Legacy.Models; using WebImageViewer.Class.Legacy.Models;
@@ -1720,8 +1720,6 @@ public static class HtmlRenderer
</body> </body>
</html> </html>
"""; """;
} }
@@ -2106,7 +2104,6 @@ public static class HtmlRenderer
playerUrl ??= $"https://video.fc2.com/a/embed/player/{safeId}/"; playerUrl ??= $"https://video.fc2.com/a/embed/player/{safeId}/";
break; break;
default: default:
siteDisplayName = !string.IsNullOrWhiteSpace(site) ? site.ToUpperInvariant() : "動画プレイヤー"; siteDisplayName = !string.IsNullOrWhiteSpace(site) ? site.ToUpperInvariant() : "動画プレイヤー";
badgeText = "WEB VIDEO"; badgeText = "WEB VIDEO";
@@ -2117,10 +2114,19 @@ public static class HtmlRenderer
break; break;
} }
bool is123Av = string.Equals(normalizedSite, "123av", StringComparison.OrdinalIgnoreCase) ||
(!string.IsNullOrWhiteSpace(originalUrl) && originalUrl.Contains("123av.", StringComparison.OrdinalIgnoreCase)) ||
(!string.IsNullOrWhiteSpace(playerUrl) && (playerUrl.Contains("123av.", StringComparison.OrdinalIgnoreCase) || playerUrl.Contains("jav-master", StringComparison.OrdinalIgnoreCase) || playerUrl.Contains("javplayer.cc", StringComparison.OrdinalIgnoreCase) || playerUrl.Contains("sadie-shop.site", StringComparison.OrdinalIgnoreCase)));
var effectivePlayerUrl = (!string.IsNullOrWhiteSpace(playerUrl) && is123Av && !playerUrl.StartsWith("/api/clean-embed", StringComparison.OrdinalIgnoreCase))
? $"/api/clean-embed?url={Uri.EscapeDataString(playerUrl.Trim())}&referer={Uri.EscapeDataString(!string.IsNullOrWhiteSpace(originalUrl) ? originalUrl.Trim() : defaultOrigUrl)}"
: (playerUrl ?? "");
var safeTitle = !string.IsNullOrWhiteSpace(title) ? Encoder.Encode(title) : $"{siteDisplayName} 動画プレイヤー ({safeId})"; var safeTitle = !string.IsNullOrWhiteSpace(title) ? Encoder.Encode(title) : $"{siteDisplayName} 動画プレイヤー ({safeId})";
var safeOriginalUrl = !string.IsNullOrWhiteSpace(originalUrl) ? Encoder.Encode(originalUrl) : defaultOrigUrl; var safeOriginalUrl = !string.IsNullOrWhiteSpace(originalUrl) ? Encoder.Encode(originalUrl) : defaultOrigUrl;
var safePlayerUrl = !string.IsNullOrWhiteSpace(playerUrl) ? Encoder.Encode(playerUrl) : ""; var safePlayerUrl = !string.IsNullOrWhiteSpace(effectivePlayerUrl) ? Encoder.Encode(effectivePlayerUrl) : "";
var safeStreamUrl = !string.IsNullOrWhiteSpace(streamUrl) ? Encoder.Encode(streamUrl) : ""; var safeStreamUrl = !string.IsNullOrWhiteSpace(streamUrl) ? Encoder.Encode(streamUrl) : "";
var sandboxAttr = is123Av ? """sandbox="allow-scripts allow-same-origin allow-forms allow-presentation" """ : "";
bool hasStream = !string.IsNullOrEmpty(safeStreamUrl); bool hasStream = !string.IsNullOrEmpty(safeStreamUrl);
bool hasPlayer = !string.IsNullOrEmpty(safePlayerUrl); bool hasPlayer = !string.IsNullOrEmpty(safePlayerUrl);
@@ -2413,7 +2419,7 @@ public static class HtmlRenderer
<iframe <iframe
id="videoIframe" id="videoIframe"
src="{{safePlayerUrl}}" src="{{safePlayerUrl}}"
class="player-iframe" {{sandboxAttr}}class="player-iframe"
frameborder="0" frameborder="0"
scrolling="no" scrolling="no"
referrerpolicy="no-referrer-when-downgrade" referrerpolicy="no-referrer-when-downgrade"
@@ -168,8 +168,8 @@ public class HitomiScraper : BaseScraper
// 高解像度 WebP 画像URLの計算 // 高解像度 WebP 画像URLの計算
var rawImageUrl = BuildWebpImageUrl(hash, ggData); var rawImageUrl = BuildWebpImageUrl(hash, ggData);
// サムネイル画像URLの計算 // サムネイル画像URLの計算 (1ページ目は大サムネイル、2ページ目以降は通常サムネイル)
var rawThumbUrl = BuildThumbnailUrl(hash, ggData); var rawThumbUrl = BuildThumbnailUrl(hash, ggData, isBig: pageNum == 1);
// hitomi.laの画像CDNはReferer制限があるため、プロキシURLを介して確実に配信 // hitomi.laの画像CDNはReferer制限があるため、プロキシURLを介して確実に配信
var referer = $"{BaseUrl}/reader/{galleryId}.html"; var referer = $"{BaseUrl}/reader/{galleryId}.html";
@@ -273,29 +273,55 @@ public class HitomiScraper : BaseScraper
return cached; return cached;
} }
// フォールバック用の正時タイムスタンプ(UTC毎正時秒 + 1)
var nowSec = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
var fallbackB = $"{nowSec / 3600 * 3600 + 1}/";
try try
{ {
var ggJs = await HttpHelper.GetHtmlAsync($"{LtnDomain}/gg.js", cancellationToken); var ggJs = await HttpHelper.GetHtmlAsync($"{LtnDomain}/gg.js", cancellationToken);
var ggData = ParseGgJs(ggJs); var ggData = ParseGgJs(ggJs, fallbackB);
_cache.Set(cacheKey, ggData, GgCacheDuration);
// 次の正時(0分)までの残り時間、または最大15分でキャッシュ
var nextHour = DateTimeOffset.FromUnixTimeSeconds((nowSec / 3600 + 1) * 3600);
var cacheDuration = nextHour - DateTimeOffset.UtcNow;
if (cacheDuration > GgCacheDuration) cacheDuration = GgCacheDuration;
if (cacheDuration < TimeSpan.FromSeconds(30)) cacheDuration = TimeSpan.FromSeconds(30);
_cache.Set(cacheKey, ggData, cacheDuration);
Logger.LogInformation("[{SiteName}] gg.js を更新しました (プレフィックス: {Prefix}, Case数: {Cases})", Logger.LogInformation("[{SiteName}] gg.js を更新しました (プレフィックス: {Prefix}, Case数: {Cases})",
SiteName, ggData.B, ggData.Cases.Count); SiteName, ggData.B, ggData.Cases.Count);
return ggData; return ggData;
} }
catch (Exception ex) catch (Exception ex)
{ {
Logger.LogError(ex, "[{SiteName}] gg.js の取得に失敗しました。デフォルト値を使用します", SiteName); Logger.LogError(ex, "[{SiteName}] gg.js の取得に失敗しました。動的フォールバック値を使用します", SiteName);
return new GgData("1788710402/", new HashSet<int>()); return new GgData(fallbackB, new HashSet<int>(), 0, 1);
} }
} }
/// <summary> /// <summary>
/// gg.js の文字列を解析して GgData を構築します。 /// gg.js の文字列を解析して GgData を構築します。
/// </summary> /// </summary>
private static GgData ParseGgJs(string ggJs) private static GgData ParseGgJs(string ggJs, string fallbackB)
{ {
var bMatch = Regex.Match(ggJs, @"b:\s*['""]([^'""]+)['""]"); var bMatch = Regex.Match(ggJs, @"b:\s*['""]([^'""]+)['""]");
var b = bMatch.Success ? bMatch.Groups[1].Value : "1788710402/"; var b = bMatch.Success ? bMatch.Groups[1].Value : fallbackB;
// gg.js の m(g) 関数内の初期値とcaseマッチ時の値をパース(Hitomi側の仕様変更に動的追従)
int defaultO = 0;
var defaultMatch = Regex.Match(ggJs, @"var\s+o\s*=\s*(\d+)");
if (defaultMatch.Success && int.TryParse(defaultMatch.Groups[1].Value, out var dVal))
{
defaultO = dVal;
}
int matchedO = 1;
var matchedMatch = Regex.Match(ggJs, @"o\s*=\s*(\d+);\s*break;");
if (matchedMatch.Success && int.TryParse(matchedMatch.Groups[1].Value, out var mVal))
{
matchedO = mVal;
}
var cases = new HashSet<int>(); var cases = new HashSet<int>();
var caseMatches = Regex.Matches(ggJs, @"case\s+(\d+):"); var caseMatches = Regex.Matches(ggJs, @"case\s+(\d+):");
@@ -307,7 +333,7 @@ public class HitomiScraper : BaseScraper
} }
} }
return new GgData(b, cases); return new GgData(b, cases, defaultO, matchedO);
} }
/// <summary> /// <summary>
@@ -323,9 +349,8 @@ public class HitomiScraper : BaseScraper
var g = int.Parse(m2 + m1, NumberStyles.HexNumber); var g = int.Parse(m2 + m1, NumberStyles.HexNumber);
var ggS = g.ToString(CultureInfo.InvariantCulture); var ggS = g.ToString(CultureInfo.InvariantCulture);
// gg.js の仕様: caseに含まれる数値は 0 (w1), 含まれないものは 1 (w2) // gg.js の m(g) ロジック: caseに一致した場合は MatchedO、不一致なら DefaultO
// (var o = 1; switch (g) { case ...: o = 0; break; } return o;) var mVal = gg.Cases.Contains(g) ? gg.MatchedO : gg.DefaultO;
var mVal = gg.Cases.Contains(g) ? 0 : 1;
var subNum = 1 + mVal; var subNum = 1 + mVal;
return $"https://w{subNum}.{ContentDomain}/{gg.B}{ggS}/{hash}.webp"; return $"https://w{subNum}.{ContentDomain}/{gg.B}{ggS}/{hash}.webp";
@@ -334,7 +359,7 @@ public class HitomiScraper : BaseScraper
/// <summary> /// <summary>
/// ハッシュと ggData からサムネイル画像 URL を構築します。 /// ハッシュと ggData からサムネイル画像 URL を構築します。
/// </summary> /// </summary>
private static string BuildThumbnailUrl(string hash, GgData gg) private static string BuildThumbnailUrl(string hash, GgData gg, bool isBig = false)
{ {
if (hash.Length < 3) return string.Empty; if (hash.Length < 3) return string.Empty;
@@ -343,14 +368,15 @@ public class HitomiScraper : BaseScraper
var m2 = hash.Substring(hash.Length - 1, 1); var m2 = hash.Substring(hash.Length - 1, 1);
var g = int.Parse(m2 + m1, NumberStyles.HexNumber); var g = int.Parse(m2 + m1, NumberStyles.HexNumber);
// gg.js の仕様: caseに含まれる数値は 0 ('a' -> atn), 含まれないものは 1 ('b' -> btn) // gg.js の m(g) ロジック: caseに一致した場合は MatchedO、不一致なら DefaultO
var mVal = gg.Cases.Contains(g) ? 0 : 1; var mVal = gg.Cases.Contains(g) ? gg.MatchedO : gg.DefaultO;
var subLet = (char)('a' + mVal); var subLet = (char)('a' + mVal);
var tnDir = isBig ? "webpbigtn" : "webpsmalltn";
return $"https://{subLet}tn.{ContentDomain}/webpbigtn/{m2}/{m1}/{hash}.webp"; return $"https://{subLet}tn.{ContentDomain}/{tnDir}/{m2}/{m1}/{hash}.webp";
} }
private record GgData(string B, HashSet<int> Cases); private record GgData(string B, HashSet<int> Cases, int DefaultO, int MatchedO);
} }
@@ -1,4 +1,4 @@
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using HtmlAgilityPack; using HtmlAgilityPack;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using WebImageViewer.Class.Legacy.Common; using WebImageViewer.Class.Legacy.Common;
@@ -155,6 +155,24 @@ public class VideoUrlResolver
}; };
} }
// 85PO
if (url.Contains("85po.com", StringComparison.OrdinalIgnoreCase) ||
url.Contains("85ro.com", StringComparison.OrdinalIgnoreCase) ||
url.Contains("85po.net", StringComparison.OrdinalIgnoreCase))
{
var match = Regex.Match(url, @"(?:/v/|/embed/|/videos/|^)(?<id>[0-9]+)", RegexOptions.IgnoreCase);
var id = match.Success ? match.Groups["id"].Value : "video";
return new ResolvedVideoResult
{
Site = "85po",
VideoId = id,
PlayerUrl = $"https://www.85po.com/embed/{id}",
OriginalUrl = url,
Title = title ?? $"85PO 動画 ({id})",
IsSuccess = true
};
}
// HDZog // HDZog
if (url.Contains("hdzog.com", StringComparison.OrdinalIgnoreCase)) if (url.Contains("hdzog.com", StringComparison.OrdinalIgnoreCase))
{ {
@@ -514,4 +532,3 @@ public class VideoUrlResolver
}; };
} }
} }
@@ -1,5 +1,8 @@
using System.Diagnostics;
using System.Net; using System.Net;
using System.Text;
using System.Text.Json; using System.Text.Json;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace WebImageViewer.Class.Unified.Common; namespace WebImageViewer.Class.Unified.Common;
@@ -11,14 +14,16 @@ namespace WebImageViewer.Class.Unified.Common;
public class UnifiedHttpHelper public class UnifiedHttpHelper
{ {
private readonly HttpClient _httpClient; private readonly HttpClient _httpClient;
private readonly IConfiguration _configuration;
private readonly ILogger<UnifiedHttpHelper> _logger; private readonly ILogger<UnifiedHttpHelper> _logger;
private const string FlareSolverrUrl = "http://localhost:8191/v1";
public UnifiedHttpHelper(HttpClient httpClient, ILogger<UnifiedHttpHelper> logger) public UnifiedHttpHelper(HttpClient httpClient, IConfiguration configuration, ILogger<UnifiedHttpHelper> logger)
{ {
_httpClient = httpClient; _httpClient = httpClient;
_configuration = configuration;
_logger = logger; _logger = logger;
_httpClient.Timeout = TimeSpan.FromSeconds(25); // FlareSolverrでのチャレンジ解決(最大60秒)に備え十分なタイムアウトを設定
_httpClient.Timeout = TimeSpan.FromSeconds(70);
_httpClient.DefaultRequestHeaders.Clear(); _httpClient.DefaultRequestHeaders.Clear();
_httpClient.DefaultRequestHeaders.Add("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"); _httpClient.DefaultRequestHeaders.Add("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");
_httpClient.DefaultRequestHeaders.Add("Accept-Language", "ja,en-US;q=0.9,en;q=0.8"); _httpClient.DefaultRequestHeaders.Add("Accept-Language", "ja,en-US;q=0.9,en;q=0.8");
@@ -49,13 +54,35 @@ public class UnifiedHttpHelper
req.Headers.Referrer = new Uri(referer); req.Headers.Referrer = new Uri(referer);
} }
using var resp = await _httpClient.SendAsync(req, ct); using var resp = await this._httpClient.SendAsync(req, ct);
resp.EnsureSuccessStatusCode(); resp.EnsureSuccessStatusCode();
return await resp.Content.ReadAsStringAsync(ct); var content = await resp.Content.ReadAsStringAsync(ct);
// Cloudflare チャレンジ画面の場合は Windows 環境であれば curl.exe で再試行
if (OperatingSystem.IsWindows() && IsCloudflareChallenge(content))
{
this._logger.LogInformation("Cloudflareチャレンジを検知したためcurl.exeでの取得を試行します: {Url}", url);
return await this.GetHtmlViaCurlAsync(url, referer, ct);
}
return content;
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "HTTPリクエストに失敗しました: {Url}", url); if (OperatingSystem.IsWindows())
{
try
{
this._logger.LogInformation("HttpClientリクエスト失敗のためcurl.exeでの取得を試行します: {Url}", url);
return await this.GetHtmlViaCurlAsync(url, referer, ct);
}
catch (Exception curlEx)
{
this._logger.LogWarning(curlEx, "curl.exeでのフォールバック取得にも失敗しました: {Url}", url);
}
}
this._logger.LogError(ex, "HTTPリクエストに失敗しました: {Url}", url);
throw; throw;
} }
} }
@@ -65,30 +92,66 @@ public class UnifiedHttpHelper
/// </summary> /// </summary>
private async Task<string> GetHtmlViaFlareSolverrAsync(string url, CancellationToken ct) private async Task<string> GetHtmlViaFlareSolverrAsync(string url, CancellationToken ct)
{ {
var configuredEndpoint = _configuration["FlareSolverr:Endpoint"] ?? "http://127.0.0.1/v1";
var hostHeader = _configuration["FlareSolverr:HostHeader"] ?? "udukipc-flaresolverr.armonica-vps.work";
var timeoutMs = int.TryParse(_configuration["FlareSolverr:TimeoutMs"], out var t) ? t : 60000;
// 試行先エンドポイントリスト(設定値 -> 公開HTTPSエンドポイント -> ローカルホスト)
var candidates = new List<(string Endpoint, string? Host)>
{
(configuredEndpoint, hostHeader),
("https://udukipc-flaresolverr.armonica-vps.work/v1", null),
("http://127.0.0.1:8191/v1", null)
};
var payload = new var payload = new
{ {
cmd = "request.get", cmd = "request.get",
url = url, url = url,
maxTimeout = 30000 maxTimeout = timeoutMs
}; };
var content = new StringContent( var contentString = JsonSerializer.Serialize(payload);
JsonSerializer.Serialize(payload),
System.Text.Encoding.UTF8,
"application/json");
using var resp = await _httpClient.PostAsync(FlareSolverrUrl, content, ct); Exception? lastEx = null;
resp.EnsureSuccessStatusCode(); foreach (var (endpoint, host) in candidates.DistinctBy(c => c.Endpoint))
{
try
{
using var req = new HttpRequestMessage(HttpMethod.Post, endpoint)
{
Content = new StringContent(contentString, System.Text.Encoding.UTF8, "application/json")
};
if (!string.IsNullOrWhiteSpace(host))
{
req.Headers.Host = host;
}
using var resp = await _httpClient.SendAsync(req, ct);
if (!resp.IsSuccessStatusCode)
{
continue;
}
var json = await resp.Content.ReadAsStringAsync(ct); var json = await resp.Content.ReadAsStringAsync(ct);
using var doc = JsonDocument.Parse(json); using var doc = JsonDocument.Parse(json);
if (doc.RootElement.TryGetProperty("solution", out var sol) && var root = doc.RootElement;
if (root.TryGetProperty("status", out var statusProp) && statusProp.GetString() == "ok" &&
root.TryGetProperty("solution", out var sol) &&
sol.TryGetProperty("response", out var respHtml)) sol.TryGetProperty("response", out var respHtml))
{ {
return respHtml.GetString() ?? string.Empty; return respHtml.GetString() ?? string.Empty;
} }
}
catch (Exception ex)
{
lastEx = ex;
_logger.LogDebug(ex, "FlareSolverrエンドポイント({Endpoint})へのリクエストに失敗しました", endpoint);
}
}
throw new InvalidOperationException("FlareSolverrのレスポンスに有効なHTMLが含まれていませんでした。"); throw lastEx ?? new InvalidOperationException("すべてのFlareSolverrエンドポイントからの取得に失敗しました。");
} }
/// <summary> /// <summary>
@@ -109,4 +172,70 @@ public class UnifiedHttpHelper
var contentType = resp.Content.Headers.ContentType?.MediaType ?? "image/jpeg"; var contentType = resp.Content.Headers.ContentType?.MediaType ?? "image/jpeg";
return (data, contentType); return (data, contentType);
} }
/// <summary>
/// レスポンス文字列がCloudflareのチャレンジ画面であるかを判定します。
/// </summary>
private static bool IsCloudflareChallenge(string? html)
{
if (string.IsNullOrWhiteSpace(html))
{
return false;
}
return html.Contains("<title>Attention Required! | Cloudflare</title>", StringComparison.OrdinalIgnoreCase) ||
html.Contains("<title>Just a moment...</title>", StringComparison.OrdinalIgnoreCase) ||
html.Contains("cf-browser-verification", StringComparison.OrdinalIgnoreCase) ||
html.Contains("cf_chl_prog", StringComparison.OrdinalIgnoreCase);
}
/// <summary>
/// Windows標準のcurl.exeを利用して、Cloudflare TLSフィンガープリント保護下のHTMLを取得します。
/// </summary>
private async Task<string> GetHtmlViaCurlAsync(string url, string? referer, CancellationToken ct)
{
var curlPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "curl.exe");
if (!File.Exists(curlPath))
{
curlPath = "curl.exe";
}
var psi = new ProcessStartInfo
{
FileName = curlPath,
UseShellExecute = false,
RedirectStandardOutput = true,
RedirectStandardError = true,
CreateNoWindow = true,
StandardOutputEncoding = Encoding.UTF8
};
psi.ArgumentList.Add("-s");
psi.ArgumentList.Add("-L");
psi.ArgumentList.Add("-A");
psi.ArgumentList.Add("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36");
psi.ArgumentList.Add("-m");
psi.ArgumentList.Add("15");
if (!string.IsNullOrEmpty(referer))
{
psi.ArgumentList.Add("-e");
psi.ArgumentList.Add(referer);
}
psi.ArgumentList.Add(url);
using var process = new Process { StartInfo = psi };
process.Start();
var output = await process.StandardOutput.ReadToEndAsync(ct);
await process.WaitForExitAsync(ct);
if (process.ExitCode == 0 && !string.IsNullOrWhiteSpace(output))
{
return output;
}
throw new HttpRequestException($"curl exited with code {process.ExitCode}");
}
} }
File diff suppressed because it is too large. Load diff
@@ -1,4 +1,4 @@
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Text.Json; using System.Text.Json;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using HtmlAgilityPack; using HtmlAgilityPack;
@@ -102,26 +102,37 @@ public class UnifiedEHentaiScraper : BaseUnifiedScraper
}; };
} }
// 4. 2ページ目以降の画像 URL を showpage API で並列取得 // 4. 2ページ目以降の画像 URL を showpage API で並列取得(3桁ページでもレート制限で抜けないよう並列数制御+リトライ)
var remainingEntries = pageEntries.Skip(1).ToList(); var remainingEntries = pageEntries.Skip(1).ToList();
if (remainingEntries.Count > 0 && !string.IsNullOrWhiteSpace(showkey)) if (remainingEntries.Count > 0 && !string.IsNullOrWhiteSpace(showkey))
{ {
using var semaphore = new SemaphoreSlim(10); using var semaphore = new SemaphoreSlim(4);
var tasks = remainingEntries.Select(async entry => var tasks = remainingEntries.Select(async entry =>
{ {
await semaphore.WaitAsync(ct); await semaphore.WaitAsync(ct);
try
{
for (int attempt = 1; attempt <= 3; attempt++)
{
try try
{ {
var imgInfo = await FetchImageViaShowpageApiAsync(gid, entry.Page, entry.ImgKey, showkey, entry.ThumbUrl, item.Title, ct); var imgInfo = await FetchImageViaShowpageApiAsync(gid, entry.Page, entry.ImgKey, showkey, entry.ThumbUrl, item.Title, ct);
if (imgInfo != null) if (imgInfo != null)
{ {
images[entry.Page] = imgInfo; images[entry.Page] = imgInfo;
break;
} }
} }
catch (Exception ex) catch (Exception ex) when (attempt == 3)
{ {
Logger.LogWarning(ex, "[{SiteName}] ページ {Page} の画像URL取得に失敗しました", SiteName, entry.Page); Logger.LogWarning(ex, "[{SiteName}] ページ {Page} の画像URL取得に失敗しました", SiteName, entry.Page);
} }
catch
{
await Task.Delay(attempt * 500, ct);
}
}
}
finally finally
{ {
semaphore.Release(); semaphore.Release();
@@ -229,7 +240,7 @@ public class UnifiedEHentaiScraper : BaseUnifiedScraper
int pageIndex = 0; int pageIndex = 0;
int maxPages = totalFiles > 0 ? (int)Math.Ceiling(totalFiles / 20.0) : 5; int maxPages = totalFiles > 0 ? (int)Math.Ceiling(totalFiles / 20.0) : 5;
while (pageIndex < maxPages && pageIndex < 20) while (pageIndex < maxPages && pageIndex < 100)
{ {
var pageUrl = $"{BaseUrl}/g/{gid}/{token}/?p={pageIndex}"; var pageUrl = $"{BaseUrl}/g/{gid}/{token}/?p={pageIndex}";
var doc = await LoadHtmlDocumentAsync(pageUrl, ct: ct); var doc = await LoadHtmlDocumentAsync(pageUrl, ct: ct);
@@ -36,8 +36,23 @@ public class UnifiedHentaiPawScraper : BaseUnifiedScraper
var viewerUrl = $"{BaseUrl}/viewer?articleId={articleId}&page=1"; var viewerUrl = $"{BaseUrl}/viewer?articleId={articleId}&page=1";
Logger.LogInformation("[{SiteName}] スクレイピング開始 - ID: {Id}", SiteName, articleId); Logger.LogInformation("[{SiteName}] スクレイピング開始 - ID: {Id}", SiteName, articleId);
// 1. まず本編画像URLを含むビュワーページをFlareSolverr経由で取得
var viewerDoc = await LoadHtmlDocumentAsync(viewerUrl, useFlareSolverr: true, ct: ct); var viewerDoc = await LoadHtmlDocumentAsync(viewerUrl, useFlareSolverr: true, ct: ct);
var articleDoc = await LoadHtmlDocumentAsync(articleUrl, useFlareSolverr: true, ct: ct);
// 2. 記事詳細ページ(メタデータ用)の取得
// まず通常取得を試み、失敗した場合のみFlareSolverrを使用
HtmlDocument? articleDoc = null;
try
{
articleDoc = await LoadHtmlDocumentAsync(articleUrl, useFlareSolverr: false, ct: ct);
}
catch { }
// ビュワーが取得できず詳細も通常取得できなかった場合は詳細をFlareSolverrで試行
if (viewerDoc == null && articleDoc == null)
{
articleDoc = await LoadHtmlDocumentAsync(articleUrl, useFlareSolverr: true, ct: ct);
}
if (viewerDoc == null && articleDoc == null) if (viewerDoc == null && articleDoc == null)
{ {
@@ -81,6 +96,13 @@ public class UnifiedHentaiPawScraper : BaseUnifiedScraper
} }
ExtractImages(viewerDoc, articleDoc, galleryItem, articleId); ExtractImages(viewerDoc, articleDoc, galleryItem, articleId);
if (galleryItem.Images.Count == 0)
{
Logger.LogWarning("[{SiteName}] 画像URLの抽出に失敗しました: ID={Id}", SiteName, articleId);
return null;
}
return galleryItem; return galleryItem;
} }
@@ -130,7 +152,7 @@ public class UnifiedHentaiPawScraper : BaseUnifiedScraper
if (viewerDoc?.DocumentNode != null) if (viewerDoc?.DocumentNode != null)
{ {
var rawHtml = viewerDoc.DocumentNode.OuterHtml; var rawHtml = viewerDoc.DocumentNode.OuterHtml;
var pattern = $@"https://cdn\.imagedeliveries\.com/{Regex.Escape(articleId)}/[a-f0-9]{{32,64}}/(?<page>\d+)\.webp"; var pattern = $@"https?://cdn\.imagedeliveries\.com/{Regex.Escape(articleId)}/[a-f0-9]{{32,64}}/(?<page>\d+)\.(?:webp|jpg|png|jpeg)";
var matches = Regex.Matches(rawHtml, pattern, RegexOptions.IgnoreCase); var matches = Regex.Matches(rawHtml, pattern, RegexOptions.IgnoreCase);
var pageMap = new Dictionary<int, string>(); var pageMap = new Dictionary<int, string>();
@@ -164,7 +186,7 @@ public class UnifiedHentaiPawScraper : BaseUnifiedScraper
if (collectedImages.Count == 0 && articleDoc?.DocumentNode != null) if (collectedImages.Count == 0 && articleDoc?.DocumentNode != null)
{ {
var rawHtml = articleDoc.DocumentNode.OuterHtml; var rawHtml = articleDoc.DocumentNode.OuterHtml;
var thumbPattern = $@"https://cdn\.imagedeliveries\.com/{Regex.Escape(articleId)}/thumbnails/(?<page>\d+)\.webp"; var thumbPattern = $@"https?://cdn\.imagedeliveries\.com/{Regex.Escape(articleId)}/thumbnails/(?<page>\d+)\.(?:webp|jpg|png|jpeg)";
var matches = Regex.Matches(rawHtml, thumbPattern, RegexOptions.IgnoreCase); var matches = Regex.Matches(rawHtml, thumbPattern, RegexOptions.IgnoreCase);
var pages = new SortedSet<int>(); var pages = new SortedSet<int>();
@@ -115,7 +115,8 @@ public class UnifiedHitomiScraper : BaseUnifiedScraper
if (string.IsNullOrWhiteSpace(hash)) continue; if (string.IsNullOrWhiteSpace(hash)) continue;
var rawImageUrl = BuildWebpImageUrl(hash, ggData); var rawImageUrl = BuildWebpImageUrl(hash, ggData);
var rawThumbUrl = BuildThumbnailUrl(hash, ggData); // 1ページ目は大サムネイル(webpbigtn)、2ページ目以降は通常サムネイル(webpsmalltn)
var rawThumbUrl = BuildThumbnailUrl(hash, ggData, isBig: pageNum == 1);
var referer = $"{BaseUrl}/reader/{galleryId}.html"; var referer = $"{BaseUrl}/reader/{galleryId}.html";
var proxyImageUrl = $"/api/proxy-image?url={UrlEncoder.Default.Encode(rawImageUrl)}&referer={UrlEncoder.Default.Encode(referer)}"; var proxyImageUrl = $"/api/proxy-image?url={UrlEncoder.Default.Encode(rawImageUrl)}&referer={UrlEncoder.Default.Encode(referer)}";
var proxyThumbUrl = $"/api/proxy-image?url={UrlEncoder.Default.Encode(rawThumbUrl)}&referer={UrlEncoder.Default.Encode(referer)}"; var proxyThumbUrl = $"/api/proxy-image?url={UrlEncoder.Default.Encode(rawThumbUrl)}&referer={UrlEncoder.Default.Encode(referer)}";
@@ -180,11 +181,30 @@ public class UnifiedHitomiScraper : BaseUnifiedScraper
const string cacheKey = "unified_hitomi_gg_data"; const string cacheKey = "unified_hitomi_gg_data";
if (_cache.TryGetValue(cacheKey, out GgData? cached) && cached != null) return cached; if (_cache.TryGetValue(cacheKey, out GgData? cached) && cached != null) return cached;
// フォールバック用の正時タイムスタンプ(UTC毎正時秒 + 1)
var nowSec = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
var fallbackB = $"{nowSec / 3600 * 3600 + 1}/";
try try
{ {
var ggJs = await HttpHelper.GetHtmlAsync($"{LtnDomain}/gg.js", ct: ct); var ggJs = await HttpHelper.GetHtmlAsync($"{LtnDomain}/gg.js", ct: ct);
var bMatch = Regex.Match(ggJs, @"b:\s*['""]([^'""]+)['""]"); var bMatch = Regex.Match(ggJs, @"b:\s*['""]([^'""]+)['""]");
var b = bMatch.Success ? bMatch.Groups[1].Value : "1788710402/"; var b = bMatch.Success ? bMatch.Groups[1].Value : fallbackB;
// gg.js の m(g) 関数内の初期値とcaseマッチ時の値をパース(Hitomi側の仕様変更に動的追従)
int defaultO = 0;
var defaultMatch = Regex.Match(ggJs, @"var\s+o\s*=\s*(\d+)");
if (defaultMatch.Success && int.TryParse(defaultMatch.Groups[1].Value, out var dVal))
{
defaultO = dVal;
}
int matchedO = 1;
var matchedMatch = Regex.Match(ggJs, @"o\s*=\s*(\d+);\s*break;");
if (matchedMatch.Success && int.TryParse(matchedMatch.Groups[1].Value, out var mVal))
{
matchedO = mVal;
}
var cases = new HashSet<int>(); var cases = new HashSet<int>();
foreach (Match m in Regex.Matches(ggJs, @"case\s+(\d+):")) foreach (Match m in Regex.Matches(ggJs, @"case\s+(\d+):"))
@@ -192,13 +212,21 @@ public class UnifiedHitomiScraper : BaseUnifiedScraper
if (int.TryParse(m.Groups[1].Value, out var c)) cases.Add(c); if (int.TryParse(m.Groups[1].Value, out var c)) cases.Add(c);
} }
var result = new GgData(b, cases); var result = new GgData(b, cases, defaultO, matchedO);
_cache.Set(cacheKey, result, GgCacheDuration);
// 次の正時(0分)までの残り時間、または最大15分でキャッシュ
var nextHour = DateTimeOffset.FromUnixTimeSeconds((nowSec / 3600 + 1) * 3600);
var cacheDuration = nextHour - DateTimeOffset.UtcNow;
if (cacheDuration > GgCacheDuration) cacheDuration = GgCacheDuration;
if (cacheDuration < TimeSpan.FromSeconds(30)) cacheDuration = TimeSpan.FromSeconds(30);
_cache.Set(cacheKey, result, cacheDuration);
return result; return result;
} }
catch catch (Exception ex)
{ {
return new GgData("1788710402/", new HashSet<int>()); Logger.LogWarning(ex, "[{SiteName}] gg.js の取得・パースに失敗したため、動的フォールバック値を使用します", SiteName);
return new GgData(fallbackB, new HashSet<int>(), 0, 1);
} }
} }
@@ -208,19 +236,25 @@ public class UnifiedHitomiScraper : BaseUnifiedScraper
var m1 = hash.Substring(hash.Length - 3, 2); var m1 = hash.Substring(hash.Length - 3, 2);
var m2 = hash.Substring(hash.Length - 1, 1); var m2 = hash.Substring(hash.Length - 1, 1);
var g = int.Parse(m2 + m1, NumberStyles.HexNumber); var g = int.Parse(m2 + m1, NumberStyles.HexNumber);
var subNum = 1 + (gg.Cases.Contains(g) ? 0 : 1); // gg.js の m(g) ロジック: caseに一致した場合は MatchedO、不一致なら DefaultO
var mVal = gg.Cases.Contains(g) ? gg.MatchedO : gg.DefaultO;
var subNum = 1 + mVal;
return $"https://w{subNum}.{ContentDomain}/{gg.B}{g}/{hash}.webp"; return $"https://w{subNum}.{ContentDomain}/{gg.B}{g}/{hash}.webp";
} }
private static string BuildThumbnailUrl(string hash, GgData gg) private static string BuildThumbnailUrl(string hash, GgData gg, bool isBig = false)
{ {
if (hash.Length < 3) return ""; if (hash.Length < 3) return "";
var m1 = hash.Substring(hash.Length - 3, 2); var m1 = hash.Substring(hash.Length - 3, 2);
var m2 = hash.Substring(hash.Length - 1, 1); var m2 = hash.Substring(hash.Length - 1, 1);
var g = int.Parse(m2 + m1, NumberStyles.HexNumber); var g = int.Parse(m2 + m1, NumberStyles.HexNumber);
var subLet = (char)('a' + (gg.Cases.Contains(g) ? 0 : 1)); // gg.js の m(g) ロジック: caseに一致した場合は MatchedO、不一致なら DefaultO
return $"https://{subLet}tn.{ContentDomain}/webpbigtn/{m2}/{m1}/{hash}.webp"; var mVal = gg.Cases.Contains(g) ? gg.MatchedO : gg.DefaultO;
var subLet = (char)('a' + mVal);
// 1ページ目(カバー)は webpbigtn、2ページ目以降のサムネイルは webpsmalltn
var tnDir = isBig ? "webpbigtn" : "webpsmalltn";
return $"https://{subLet}tn.{ContentDomain}/{tnDir}/{m2}/{m1}/{hash}.webp";
} }
private record GgData(string B, HashSet<int> Cases); private record GgData(string B, HashSet<int> Cases, int DefaultO, int MatchedO);
} }
@@ -406,11 +406,11 @@ public class UnifiedAuraHentaiScraper : BaseUnifiedScraper
/// </summary> /// </summary>
public class UnifiedMangalearScraper : BaseUnifiedScraper public class UnifiedMangalearScraper : BaseUnifiedScraper
{ {
private const string BaseUrl = "https://mangalear.com"; private const string BaseUrl = "https://www.mangalear.blog";
public override string SiteName => "Mangalear"; public override string SiteName => "Mangalear";
public override string SiteKey => "mangalear"; public override string SiteKey => "mangalear";
public override IReadOnlyList<string> SupportedDomains => new[] { "mangalear.com", "mangalear" }; public override IReadOnlyList<string> SupportedDomains => new[] { "mangalear.blog", "www.mangalear.blog", "mangalear.com", "mangalear" };
public UnifiedMangalearScraper(UnifiedHttpHelper httpHelper, ILogger<UnifiedMangalearScraper> logger) public UnifiedMangalearScraper(UnifiedHttpHelper httpHelper, ILogger<UnifiedMangalearScraper> logger)
: base(httpHelper, logger) : base(httpHelper, logger)
@@ -528,12 +528,13 @@ public class UnifiedMangalearScraper : BaseUnifiedScraper
trimmed.StartsWith("https://", StringComparison.OrdinalIgnoreCase)) trimmed.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
{ {
var uri = new Uri(trimmed); var uri = new Uri(trimmed);
var hostBase = uri.GetLeftPart(UriPartial.Authority);
var query = System.Web.HttpUtility.ParseQueryString(uri.Query); var query = System.Web.HttpUtility.ParseQueryString(uri.Query);
var pVal = query.Get("p"); var pVal = query.Get("p");
if (!string.IsNullOrWhiteSpace(pVal)) if (!string.IsNullOrWhiteSpace(pVal))
{ {
normalizedId = pVal.Trim(); normalizedId = pVal.Trim();
return ($"{BaseUrl}/?p={normalizedId}", normalizedId, resolvedCategory); return ($"{hostBase}/?p={normalizedId}", normalizedId, resolvedCategory);
} }
var segments = uri.AbsolutePath.Split('/', StringSplitOptions.RemoveEmptyEntries); var segments = uri.AbsolutePath.Split('/', StringSplitOptions.RemoveEmptyEntries);
@@ -551,7 +552,7 @@ public class UnifiedMangalearScraper : BaseUnifiedScraper
normalizedId = trimmed; normalizedId = trimmed;
} }
return ($"{BaseUrl}/{resolvedCategory}/{normalizedId}/", normalizedId, resolvedCategory); return ($"{hostBase}/{resolvedCategory}/{normalizedId}/", normalizedId, resolvedCategory);
} }
return ($"{BaseUrl}/{resolvedCategory}/{trimmed}/", trimmed, resolvedCategory); return ($"{BaseUrl}/{resolvedCategory}/{trimmed}/", trimmed, resolvedCategory);
@@ -1,4 +1,4 @@
using WebImageViewer.Class.Unified.Models; using WebImageViewer.Class.Unified.Models;
namespace WebImageViewer.Class.Unified.Services; namespace WebImageViewer.Class.Unified.Services;
@@ -27,7 +27,9 @@ public static class DomainClassifier
{ "ja.hentaipaw.com", ("hentaipaw", "エロモフ (HentaiPaw)") }, { "ja.hentaipaw.com", ("hentaipaw", "エロモフ (HentaiPaw)") },
{ "momon-ga.com", ("momonga", "モモンガ") }, { "momon-ga.com", ("momonga", "モモンガ") },
{ "aurahentai.com", ("aurahentai", "AuraHentai") }, { "aurahentai.com", ("aurahentai", "AuraHentai") },
{ "mangalear.com", ("mangalear", "Mangalear") } { "mangalear.com", ("mangalear", "Mangalear") },
{ "mangalear.blog", ("mangalear", "同人まんがりあ") },
{ "www.mangalear.blog", ("mangalear", "同人まんがりあ") }
}; };
// 動画サイトのドメイン定義 // 動画サイトのドメイン定義
@@ -37,12 +39,20 @@ public static class DomainClassifier
{ "missav.com", ("missav", "MissAV") }, { "missav.com", ("missav", "MissAV") },
{ "missav.ws", ("missav", "MissAV") }, { "missav.ws", ("missav", "MissAV") },
{ "missav.net", ("missav", "MissAV") }, { "missav.net", ("missav", "MissAV") },
{ "85po.com", ("85po", "85PO") },
{ "www.85po.com", ("85po", "85PO") },
{ "85ro.com", ("85po", "85RO") },
{ "www.85ro.com", ("85po", "85RO") },
{ "85po.net", ("85po", "85PO") },
{ "www.85po.net", ("85po", "85PO") },
{ "spankbang.com", ("spankbang", "SpankBang") }, { "spankbang.com", ("spankbang", "SpankBang") },
{ "jp.spankbang.com", ("spankbang", "SpankBang") }, { "jp.spankbang.com", ("spankbang", "SpankBang") },
{ "spankbang.party", ("spankbang", "SpankBang") }, { "spankbang.party", ("spankbang", "SpankBang") },
{ "movie.eroterest.net", ("eroterest", "動画エロタレスト") }, { "movie.eroterest.net", ("eroterest", "動画エロタレスト") },
{ "do-ga.eroterest.net", ("doga", "エロタレドーガ") }, { "do-ga.eroterest.net", ("doga", "エロタレドーガ") },
{ "123av.com", ("123av", "123av") }, { "123av.com", ("123av", "123av") },
{ "123av.me", ("123av", "123av") },
{ "jav-master", ("123av", "123av") },
{ "vjav.com", ("vjav", "VJAV") }, { "vjav.com", ("vjav", "VJAV") },
{ "video.laxd.com", ("laxd", "LAXD") }, { "video.laxd.com", ("laxd", "LAXD") },
{ "laxd.com", ("laxd", "LAXD") }, { "laxd.com", ("laxd", "LAXD") },
@@ -59,10 +69,28 @@ public static class DomainClassifier
{ "hdzog.com", ("hdzog", "HDZog") }, { "hdzog.com", ("hdzog", "HDZog") },
{ "upornia.com", ("upornia", "Upornia") }, { "upornia.com", ("upornia", "Upornia") },
{ "youjizz.com", ("youjizz", "YouJizz") }, { "youjizz.com", ("youjizz", "YouJizz") },
// まとめブログ系(内部の実動画へ解決) { "www.youjizz.com", ("youjizz", "YouJizz") },
{ "hotmovs.com", ("txxx", "HotMovs") },
{ "javynow.com", ("javynow", "JavyNow") },
// まとめブログ・アンテナ系(記事内から実動画へ自動解決)
{ "galgaldoga.blogterest.net", ("blog", "GalGalドーガ") }, { "galgaldoga.blogterest.net", ("blog", "GalGalドーガ") },
{ "blogterest.net", ("blog", "まとめブログ") }, { "blogterest.net", ("blog", "まとめブログ") },
{ "blog.2nt.com", ("blog", "2NTブログ") } { "blog.2nt.com", ("blog", "2NTブログ") },
{ "adult-c.com", ("blog", "アダルト動画まとめ") },
{ "ero-gu.com", ("blog", "エログ") },
{ "erometu.icu", ("blog", "エロ滅") },
{ "free-douga-search.com", ("blog", "無料動画サーチ") },
{ "gorilla-sene.com", ("blog", "ゴリラセネ") },
{ "iroharuka.net", ("blog", "いろはるか") },
{ "mann.tikann.com", ("blog", "痴漢動画まとめ") },
{ "minero-antenna.com", ("blog", "ミネロアンテナ") },
{ "minsuke-academy.com", ("blog", "みんすけアカデミー") },
{ "otakara.silyugoi.cfbx.jp", ("blog", "お宝動画") },
{ "otimpohametaro.com", ("blog", "おちんぽはめたろう") },
{ "rengougensen.cyou", ("blog", "連合厳選動画") },
{ "shokking-movies.tokyo", ("blog", "ショッキングムービー") },
{ "fetishavinfo.com", ("blog", "フェチAVインフォ") },
{ "www.fetishavinfo.com", ("blog", "フェチAVインフォ") }
}; };
/// <summary> /// <summary>
@@ -85,9 +113,24 @@ public static class DomainClassifier
} }
else else
{ {
// ドメイン名直接入力などの救済 // ドメイン名直接入力・相対パスなどの救済
var slashIdx = trimmed.IndexOf('/'); var clean = trimmed.TrimStart('/');
host = (slashIdx >= 0 ? trimmed[..slashIdx] : trimmed).ToLowerInvariant(); var slashIdx = clean.IndexOf('/');
host = (slashIdx >= 0 ? clean[..slashIdx] : clean).ToLowerInvariant();
}
// 0. サイトキー直接指定の救済(例: 123av/xxx, missav/xxx 等)
if (string.Equals(host, "123av", StringComparison.OrdinalIgnoreCase) || host.Contains("123av"))
{
return new DomainClassificationResult(MediaType.Video, "123av", "123av", host);
}
if (string.Equals(host, "85po", StringComparison.OrdinalIgnoreCase) || host.Contains("85po") || host.Contains("85ro"))
{
return new DomainClassificationResult(MediaType.Video, "85po", "85PO", host);
}
if (string.Equals(host, "missav", StringComparison.OrdinalIgnoreCase) || host.Contains("missav"))
{
return new DomainClassificationResult(MediaType.Video, "missav", "MissAV", host);
} }
// 1. 完全一致チェック // 1. 完全一致チェック
@@ -118,15 +161,28 @@ public static class DomainClassifier
} }
} }
// 3. まとめブログ系のドメインチェック // 3. まとめブログ系・ブログサービスのドメインチェック
if (host.Contains("blogterest.net", StringComparison.OrdinalIgnoreCase) || if (host.Contains("blogterest.net", StringComparison.OrdinalIgnoreCase) ||
host.Contains("blog.2nt.com", StringComparison.OrdinalIgnoreCase) || host.Contains("blog.2nt.com", StringComparison.OrdinalIgnoreCase) ||
(host.Contains("fc2.com", StringComparison.OrdinalIgnoreCase) && host.Contains("blog", StringComparison.OrdinalIgnoreCase)) ||
host.Contains("galgal", StringComparison.OrdinalIgnoreCase)) host.Contains("galgal", StringComparison.OrdinalIgnoreCase))
{ {
return new DomainClassificationResult(MediaType.Video, "blog", "まとめブログ", host); return new DomainClassificationResult(MediaType.Video, "blog", "まとめブログ", host);
} }
// 4. URLパス・キーワードによるフォールバック推定 // 4. 直接メディアファイル(動画・画像直リンク)の判定
var pathOnly = uri != null ? uri.AbsolutePath.ToLowerInvariant() : trimmed.Split('?')[0].ToLowerInvariant();
if (pathOnly.EndsWith(".mp4") || pathOnly.EndsWith(".m3u8") || pathOnly.EndsWith(".webm") || host.Contains("sb-cd.com", StringComparison.OrdinalIgnoreCase))
{
return new DomainClassificationResult(MediaType.Video, "direct_video", "動画ファイル", host);
}
if (pathOnly.EndsWith(".webp") || pathOnly.EndsWith(".jpg") || pathOnly.EndsWith(".jpeg") || pathOnly.EndsWith(".png") || pathOnly.EndsWith(".gif") || host.Contains("gold-usergeneratedcontent.net", StringComparison.OrdinalIgnoreCase))
{
return new DomainClassificationResult(MediaType.Gallery, "direct_image", "画像ファイル", host);
}
// 5. URLパス・キーワードによるフォールバック推定
var lower = trimmed.ToLowerInvariant(); var lower = trimmed.ToLowerInvariant();
if (lower.Contains("/video") || lower.Contains("/watch") || lower.Contains("/embed") || lower.Contains("/movie") || lower.Contains("play")) if (lower.Contains("/video") || lower.Contains("/watch") || lower.Contains("/embed") || lower.Contains("/movie") || lower.Contains("play"))
{ {
File diff suppressed because it is too large. Load diff
@@ -28,8 +28,22 @@ public class UnifiedViewerService
/// 入力されたURLまたはIDを自動解析し、動画または画像ギャラリーの解決結果を返します。 /// 入力されたURLまたはIDを自動解析し、動画または画像ギャラリーの解決結果を返します。
/// </summary> /// </summary>
public async Task<UnifiedViewerResult> ResolveAsync(string urlOrInput, CancellationToken ct = default) public async Task<UnifiedViewerResult> ResolveAsync(string urlOrInput, CancellationToken ct = default)
{
return await ResolveAsync(urlOrInput, null, null, ct);
}
/// <summary>
/// 入力されたURLまたはID、および補助パラメータ(play/stream)を考慮して動画または画像ギャラリーの解決結果を返します。
/// </summary>
public async Task<UnifiedViewerResult> ResolveAsync(string urlOrInput, string? play = null, string? stream = null, CancellationToken ct = default)
{ {
if (string.IsNullOrWhiteSpace(urlOrInput)) if (string.IsNullOrWhiteSpace(urlOrInput))
{
if (!string.IsNullOrWhiteSpace(play) || !string.IsNullOrWhiteSpace(stream))
{
urlOrInput = play ?? stream ?? "";
}
else
{ {
return new UnifiedViewerResult return new UnifiedViewerResult
{ {
@@ -39,8 +53,22 @@ public class UnifiedViewerService
StatusCode = 400 StatusCode = 400
}; };
} }
}
var trimmed = urlOrInput.Trim(); var trimmed = urlOrInput.Trim();
// urlOrInput自体にplayやstreamが含まれている場合の救済
if (string.IsNullOrWhiteSpace(play) && trimmed.Contains("play=", StringComparison.OrdinalIgnoreCase))
{
var mPlay = System.Text.RegularExpressions.Regex.Match(trimmed, @"[?&]play=([^&]+)", System.Text.RegularExpressions.RegexOptions.IgnoreCase);
if (mPlay.Success) play = Uri.UnescapeDataString(mPlay.Groups[1].Value);
}
if (string.IsNullOrWhiteSpace(stream) && trimmed.Contains("stream=", StringComparison.OrdinalIgnoreCase))
{
var mStream = System.Text.RegularExpressions.Regex.Match(trimmed, @"[?&]stream=([^&]+)", System.Text.RegularExpressions.RegexOptions.IgnoreCase);
if (mStream.Success) stream = Uri.UnescapeDataString(mStream.Groups[1].Value);
}
var classification = DomainClassifier.Classify(trimmed); var classification = DomainClassifier.Classify(trimmed);
_logger.LogInformation("URL解析結果: Host={Host}, SiteKey={SiteKey}, Type={MediaType}", _logger.LogInformation("URL解析結果: Host={Host}, SiteKey={SiteKey}, Type={MediaType}",
classification.Host, classification.SiteKey, classification.MediaType); classification.Host, classification.SiteKey, classification.MediaType);
@@ -48,7 +76,7 @@ public class UnifiedViewerService
// 1. 動画サイト判定の場合 // 1. 動画サイト判定の場合
if (classification.MediaType == MediaType.Video) if (classification.MediaType == MediaType.Video)
{ {
var video = await _videoExtractor.ResolveAsync(trimmed, ct); var video = await _videoExtractor.ResolveAsync(trimmed, play, stream, ct);
return new UnifiedViewerResult return new UnifiedViewerResult
{ {
Type = MediaType.Video, Type = MediaType.Video,
@@ -62,6 +90,38 @@ public class UnifiedViewerService
// 2. 画像ギャラリーサイト判定の場合 // 2. 画像ギャラリーサイト判定の場合
if (classification.MediaType == MediaType.Gallery) if (classification.MediaType == MediaType.Gallery)
{ {
// 直接画像URL(WebP/JPG/PNG等の直リンク)の即時構築
if (string.Equals(classification.SiteKey, "direct_image", StringComparison.OrdinalIgnoreCase))
{
var directGallery = new UnifiedGalleryItem
{
Id = "direct",
Title = "画像ビューアー",
SourceSite = "Direct Image",
SourceUrl = trimmed,
ThumbnailUrl = trimmed,
Images = new List<UnifiedImageInfo>
{
new()
{
PageNumber = 1,
ImageUrl = trimmed,
ThumbnailUrl = trimmed,
AltText = "画像"
}
}
};
return new UnifiedViewerResult
{
Type = MediaType.Gallery,
OriginalUrl = trimmed,
Gallery = directGallery,
IsSuccess = true,
StatusCode = 200
};
}
var scraper = _scrapers.FirstOrDefault(s => s.CanHandle(trimmed)); var scraper = _scrapers.FirstOrDefault(s => s.CanHandle(trimmed));
if (scraper != null) if (scraper != null)
{ {
@@ -80,7 +140,7 @@ public class UnifiedViewerService
} }
// 画像サイトとしての取得に失敗した場合、動画の可能性もフォールバック試行 // 画像サイトとしての取得に失敗した場合、動画の可能性もフォールバック試行
var fallbackVideo = await _videoExtractor.ResolveAsync(trimmed, ct); var fallbackVideo = await _videoExtractor.ResolveAsync(trimmed, play, stream, ct);
if (fallbackVideo.HasPlayableContent) if (fallbackVideo.HasPlayableContent)
{ {
return new UnifiedViewerResult return new UnifiedViewerResult
@@ -104,7 +164,7 @@ public class UnifiedViewerService
} }
// 3. 不明・汎用URLの場合: まず動画の埋め込み・ストリーム検出を試行 // 3. 不明・汎用URLの場合: まず動画の埋め込み・ストリーム検出を試行
var unknownVideo = await _videoExtractor.ResolveAsync(trimmed, ct); var unknownVideo = await _videoExtractor.ResolveAsync(trimmed, play, stream, ct);
if (unknownVideo.HasPlayableContent) if (unknownVideo.HasPlayableContent)
{ {
return new UnifiedViewerResult return new UnifiedViewerResult
@@ -1,3 +1,4 @@
using System.Net;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using HtmlAgilityPack; using HtmlAgilityPack;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@@ -24,54 +25,95 @@ public class VideoEmbedExtractor
/// URLを解析し、埋め込まれた状態の動画情報を取得・構築します。 /// URLを解析し、埋め込まれた状態の動画情報を取得・構築します。
/// </summary> /// </summary>
public async Task<UnifiedVideoItem> ResolveAsync(string url, CancellationToken ct = default) public async Task<UnifiedVideoItem> ResolveAsync(string url, CancellationToken ct = default)
{
return await ResolveAsync(url, null, null, ct);
}
/// <summary>
/// URLおよび任意の再生・ストリームURL(旧パラメータ等)を考慮して動画情報を取得・構築します。
/// </summary>
public async Task<UnifiedVideoItem> ResolveAsync(
string url,
string? customPlayUrl = null,
string? customStreamUrl = null,
CancellationToken ct = default)
{ {
if (string.IsNullOrWhiteSpace(url)) if (string.IsNullOrWhiteSpace(url))
{ {
if (!string.IsNullOrWhiteSpace(customPlayUrl) || !string.IsNullOrWhiteSpace(customStreamUrl))
{
return new UnifiedVideoItem
{
Site = "video",
VideoId = "custom",
Title = "動画プレイヤー",
OriginalUrl = customPlayUrl ?? customStreamUrl ?? "",
EmbedUrl = customPlayUrl,
StreamUrl = customStreamUrl
};
}
return new UnifiedVideoItem { Title = "無効なURL", OriginalUrl = url }; return new UnifiedVideoItem { Title = "無効なURL", OriginalUrl = url };
} }
var trimmedUrl = url.Trim(); var trimmedUrl = url.Trim();
var domainInfo = DomainClassifier.Classify(trimmedUrl); var domainInfo = DomainClassifier.Classify(trimmedUrl);
UnifiedVideoItem? resolvedItem = null;
// 1. 各サイト固有の埋め込み解決処理 // 1. 各サイト固有の埋め込み解決処理
try try
{ {
switch (domainInfo.SiteKey.ToLowerInvariant()) switch (domainInfo.SiteKey.ToLowerInvariant())
{ {
case "missav": case "missav":
return await ResolveMissAvAsync(trimmedUrl, ct); resolvedItem = await ResolveMissAvAsync(trimmedUrl, ct);
break;
case "85po":
resolvedItem = await this.Resolve85PoAsync(trimmedUrl, ct);
break;
case "spankbang": case "spankbang":
return ResolveSpankBang(trimmedUrl); resolvedItem = ResolveSpankBang(trimmedUrl);
break;
case "123av": case "123av":
return Resolve123Av(trimmedUrl); resolvedItem = await Resolve123AvAsync(trimmedUrl, customPlayUrl, ct);
break;
case "fc2": case "fc2":
return ResolveFc2(trimmedUrl); resolvedItem = ResolveFc2(trimmedUrl);
break;
case "laxd": case "laxd":
return ResolveLaxd(trimmedUrl); resolvedItem = ResolveLaxd(trimmedUrl);
break;
case "vjav": case "vjav":
return ResolveVjav(trimmedUrl); resolvedItem = ResolveVjav(trimmedUrl);
break;
case "xvideos": case "xvideos":
return ResolveXvideos(trimmedUrl); resolvedItem = ResolveXvideos(trimmedUrl);
break;
case "inporn": case "inporn":
return ResolveInporn(trimmedUrl); resolvedItem = ResolveInporn(trimmedUrl);
break;
case "bdsmx": case "bdsmx":
return ResolveBdsmx(trimmedUrl); resolvedItem = ResolveBdsmx(trimmedUrl);
break;
case "doga": case "doga":
return await ResolveEroterestDogaAsync(trimmedUrl, ct); resolvedItem = await ResolveEroterestDogaAsync(trimmedUrl, ct);
break;
case "eroterest": case "eroterest":
case "blog": case "blog":
// まとめブログやエロタレスト記事から実動画の埋め込みを再帰探索 // まとめブログやエロタレスト記事から実動画の埋め込みを再帰探索
return await ResolveFromArticlePageAsync(trimmedUrl, null, 1, ct); resolvedItem = await ResolveFromArticlePageAsync(trimmedUrl, null, 1, ct);
break;
case "senzuri": case "senzuri":
case "txxx": case "txxx":
@@ -79,7 +121,46 @@ public class VideoEmbedExtractor
case "hdzog": case "hdzog":
case "upornia": case "upornia":
case "youjizz": case "youjizz":
return ResolveGenericTube(domainInfo.SiteKey, trimmedUrl); case "hotmovs":
resolvedItem = ResolveGenericTube(domainInfo.SiteKey, trimmedUrl);
break;
case "javynow":
var matchJavy = Regex.Match(trimmedUrl, @"(?:video/|v/)(?<id>[0-9]+)", RegexOptions.IgnoreCase);
var javyId = matchJavy.Success ? matchJavy.Groups["id"].Value : "video";
resolvedItem = new UnifiedVideoItem
{
Site = "javynow",
VideoId = javyId,
Title = $"JavyNow ({javyId})",
OriginalUrl = trimmedUrl,
EmbedUrl = $"https://javynow.com/embed/{javyId}"
};
break;
case "direct_video":
resolvedItem = new UnifiedVideoItem
{
Site = "direct",
VideoId = "video",
Title = "動画プレイヤー",
OriginalUrl = trimmedUrl,
StreamUrl = trimmedUrl
};
break;
}
if (resolvedItem != null)
{
if (!string.IsNullOrWhiteSpace(customPlayUrl) && string.IsNullOrWhiteSpace(resolvedItem.EmbedUrl))
{
resolvedItem.EmbedUrl = customPlayUrl;
}
if (!string.IsNullOrWhiteSpace(customStreamUrl) && string.IsNullOrWhiteSpace(resolvedItem.StreamUrl))
{
resolvedItem.StreamUrl = customStreamUrl;
}
return resolvedItem;
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -90,7 +171,16 @@ public class VideoEmbedExtractor
// 2. 未知の動画サイトまたは汎用ページからの動的埋め込み抽出 // 2. 未知の動画サイトまたは汎用ページからの動的埋め込み抽出
try try
{ {
return await ExtractGenericEmbedFromHtmlAsync(trimmedUrl, ct); resolvedItem = await ExtractGenericEmbedFromHtmlAsync(trimmedUrl, ct);
if (!string.IsNullOrWhiteSpace(customPlayUrl) && string.IsNullOrWhiteSpace(resolvedItem.EmbedUrl))
{
resolvedItem.EmbedUrl = customPlayUrl;
}
if (!string.IsNullOrWhiteSpace(customStreamUrl) && string.IsNullOrWhiteSpace(resolvedItem.StreamUrl))
{
resolvedItem.StreamUrl = customStreamUrl;
}
return resolvedItem;
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -108,73 +198,354 @@ public class VideoEmbedExtractor
#region 各サイト別リゾルバー #region 各サイト別リゾルバー
/// <summary> /// <summary>
/// MissAV の埋め込み・HLSストリームを解決します。 /// 85PO (85po.com / 85ro.com / 85po.net) の動画および埋め込みプレイヤー情報を解決します。
/// </summary> /// </summary>
private async Task<UnifiedVideoItem> ResolveMissAvAsync(string url, CancellationToken ct) /// <param name="url">入力されたURLまたはID文字列</param>
/// <param name="ct">キャンセレーショントークン</param>
/// <returns>解決された統一動画情報</returns>
private async Task<UnifiedVideoItem> Resolve85PoAsync(string url, CancellationToken ct)
{ {
var match = Regex.Match(url, @"(?:missav\.[a-z]+/(?:ja/)?|missav/)(?<id>[^/?#]+)", RegexOptions.IgnoreCase); // 1. URLから動画IDを抽出(例: /v/37405.html, /embed/37405, 37405 等)
var id = match.Success ? match.Groups["id"].Value : "video"; var matchId = Regex.Match(url, @"(?:/v/|/embed/|/videos/|^)(?<id>\d+)(?:\.html)?", RegexOptions.IgnoreCase);
string videoId = matchId.Success ? matchId.Groups["id"].Value : "";
var item = new UnifiedVideoItem // ホスト名の取得(85po.com / 85ro.com / 85po.net)
string host = "www.85po.com";
if (Uri.TryCreate(url, UriKind.Absolute, out var parsedUri) && !string.IsNullOrWhiteSpace(parsedUri.Host))
{ {
Site = "missav", host = parsedUri.Host.ToLowerInvariant();
VideoId = id, }
Title = $"MissAV ({id})",
OriginalUrl = url
};
// HTMLを取得して Dean Edwards packer スクリプトおよび m3u8 を探索 // 言語プレフィックスの抽出 (/ja/, /en/ 等)
string langPrefix = "";
if (url.Contains("/ja/", StringComparison.OrdinalIgnoreCase))
{
langPrefix = "/ja";
}
else if (url.Contains("/en/", StringComparison.OrdinalIgnoreCase))
{
langPrefix = "/en";
}
// メタデータ取得用URLの決定
// 85POの公式埋め込みプレイヤーURLは言語プレフィックスなしの /embed/{id}
string targetFetchUrl = !string.IsNullOrEmpty(videoId)
? $"https://{host}/embed/{videoId}"
: (url.StartsWith("http", StringComparison.OrdinalIgnoreCase) ? url : $"https://{host}/");
string originalPageUrl = !string.IsNullOrEmpty(videoId)
? $"https://{host}{langPrefix}/v/{videoId}.html"
: url;
string? title = null;
string? posterUrl = null;
// 2. ページHTMLを取得してタイトル・サムネイルを抽出
// もし動画IDが抽出できていない場合、トップページ等と判定して先頭動画リンクを探索
try try
{ {
var html = await _httpHelper.GetHtmlAsync(url, ct: ct); var html = await this._httpHelper.GetHtmlAsync(targetFetchUrl, useFlareSolverr: false, referer: $"https://{host}/", ct: ct);
if (!string.IsNullOrWhiteSpace(html)) if (!string.IsNullOrWhiteSpace(html))
{ {
var doc = new HtmlDocument();
doc.LoadHtml(html);
// ID未取得の場合、ページ内の動画リンクを探す
if (string.IsNullOrEmpty(videoId))
{
var linkNode = doc.DocumentNode.SelectSingleNode("//a[contains(@href, '/v/') and contains(@href, '.html')]");
if (linkNode != null)
{
var href = linkNode.GetAttributeValue("href", "");
var m = Regex.Match(href, @"/v/(?<id>\d+)\.html", RegexOptions.IgnoreCase);
if (m.Success)
{
videoId = m.Groups["id"].Value;
originalPageUrl = $"https://{host}/v/{videoId}.html";
}
}
}
// タイトル抽出 // タイトル抽出
var titleMatch = Regex.Match(html, @"<meta property=""og:title"" content=""([^""]+)"""); var ogTitle = doc.DocumentNode.SelectSingleNode("//meta[@property='og:title']")?.GetAttributeValue("content", null);
if (titleMatch.Success) item.Title = CleanText(titleMatch.Groups[1].Value); if (!string.IsNullOrWhiteSpace(ogTitle))
// ポスター画像抽出
var posterMatch = Regex.Match(html, @"<meta property=""og:image"" content=""([^""]+)""");
if (posterMatch.Success) item.PosterUrl = posterMatch.Groups[1].Value;
// 1. surrit.com の直接m3u8探索
var directM3u8 = Regex.Match(html, @"https://surrit\.com/[a-f0-9\-]+/(?:playlist|\d+p/video)\.m3u8");
if (directM3u8.Success)
{ {
item.StreamUrl = directM3u8.Value; title = WebUtility.HtmlDecode(ogTitle).Trim();
return item;
} }
else
// 2. Dean Edwards Packer のアンパック試行
var packerMatch = Regex.Match(html, @"eval\(function\(p,a,c,k,e,d\)\{.+?\.split\('\|'\),\d+,\{\}\)\)");
if (packerMatch.Success)
{ {
var unpacked = UnpackDeanEdwards(packerMatch.Value); var titleNode = doc.DocumentNode.SelectSingleNode("//title");
var m3u8Match = Regex.Match(unpacked, @"https://surrit\.com/[a-f0-9\-]+/(?:playlist|\d+p/video)\.m3u8"); if (titleNode != null)
if (m3u8Match.Success)
{ {
item.StreamUrl = m3u8Match.Value; var rawTitle = WebUtility.HtmlDecode(titleNode.InnerText).Trim();
return item; title = Regex.Replace(rawTitle, @"\s*[-|–]\s*85PO.*$", "", RegexOptions.IgnoreCase).Trim();
}
else
{
var mTitle = Regex.Match(html, @"video_title:\s*['""]([^'""]+)['""]", RegexOptions.IgnoreCase);
if (mTitle.Success)
{
title = WebUtility.HtmlDecode(mTitle.Groups[1].Value).Trim();
}
} }
} }
// 3. 一般的な UUID パターンから surrit.com m3u8 を推測復元 // サムネイル抽出
var uuidMatch = Regex.Match(html, @"[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}"); var ogImage = doc.DocumentNode.SelectSingleNode("//meta[@property='og:image']")?.GetAttributeValue("content", null);
if (uuidMatch.Success) if (!string.IsNullOrWhiteSpace(ogImage))
{ {
item.StreamUrl = $"https://surrit.com/{uuidMatch.Value}/playlist.m3u8"; posterUrl = ogImage.Trim();
return item; }
else
{
var mPreview = Regex.Match(html, @"preview_url:\s*['""]([^'""]+)['""]", RegexOptions.IgnoreCase);
if (mPreview.Success)
{
posterUrl = mPreview.Groups[1].Value.Trim();
}
} }
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogWarning(ex, "MissAV の HTML からの m3u8 抽出に失敗しました: {Url}", url); this._logger.LogWarning(ex, "85PO HTMLの取得に失敗しました。フォールバックで構築します: {Url}", url);
}
// フォールバックIDの確定
if (string.IsNullOrEmpty(videoId))
{
videoId = "video";
}
if (string.IsNullOrWhiteSpace(title))
{
title = $"85PO ({videoId})";
}
// サムネイルのフォールバック
if (string.IsNullOrWhiteSpace(posterUrl) && int.TryParse(videoId, out var numId))
{
int folderId = (numId / 1000) * 1000;
posterUrl = $"https://{host}/contents/videos_screenshots/{folderId}/{videoId}/preview.jpg";
}
var embedUrl = $"https://{host}/embed/{videoId}";
return new UnifiedVideoItem
{
Site = "85po",
VideoId = videoId,
Title = title,
OriginalUrl = originalPageUrl,
EmbedUrl = embedUrl,
PosterUrl = posterUrl
};
}
/// <summary>
/// MissAV の埋め込み・HLSストリームを解決します。
/// Cloudflare保護を通過し、surrit.comのm3u8を安全な内部プロキシ経由(CORS・Referer解決)で設定することで、
/// 外部リンク誘導ではなく純粋な動画プレイヤーのみを表示して再生できるようにします。
/// </summary>
private async Task<UnifiedVideoItem> ResolveMissAvAsync(string url, CancellationToken ct)
{
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 = videoId,
Title = $"MissAV ({videoId})",
OriginalUrl = canonicalUrl
};
// 1. 通常HTTPで取得を試み、Cloudflareチャレンジまたはエラー時はFlareSolverr経由で再取得
string? html = null;
try
{
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
{
html = await this._httpHelper.GetHtmlAsync(canonicalUrl, useFlareSolverr: true, referer: "https://missav.ai/", ct: ct);
}
catch (Exception flareEx)
{
this._logger.LogWarning(flareEx, "MissAVのFlareSolverr取得に失敗しました: {Url}", canonicalUrl);
}
}
if (string.IsNullOrWhiteSpace(html))
{
// HTMLが取得できない場合でも、外部リンク誘導ボタンではなくインライン埋め込み用としてEmbedUrlをセット
item.EmbedUrl = canonicalUrl;
return item;
}
try
{
// タイトル抽出 (og:title または title タグ)
var titleMatch = Regex.Match(html, @"<meta\s+property=[""']og:title[""']\s+content=[""']([^""']+)[""']", RegexOptions.IgnoreCase);
if (titleMatch.Success)
{
item.Title = CleanText(System.Net.WebUtility.HtmlDecode(titleMatch.Groups[1].Value));
}
else
{
var docTitleMatch = Regex.Match(html, @"<title>([^<]+)</title>", RegexOptions.IgnoreCase);
if (docTitleMatch.Success)
{
item.Title = CleanText(System.Net.WebUtility.HtmlDecode(docTitleMatch.Groups[1].Value));
}
}
// ポスター画像抽出 (og:image)
var posterMatch = Regex.Match(html, @"<meta\s+property=[""']og:image[""']\s+content=[""']([^""']+)[""']", RegexOptions.IgnoreCase);
if (posterMatch.Success)
{
item.PosterUrl = posterMatch.Groups[1].Value;
}
else
{
item.PosterUrl = $"https://fourhoi.com/{videoId}/cover-n.jpg";
}
string? rawStreamUrl = null;
// 1. Dean Edwards Packer のアンパック試行 (複数ある場合も走査)
var packerMatches = Regex.Matches(html, @"eval\(function\(p,a,c,k,e,d\)\{.+?\.split\('\|'\),\d+,\{\}\)\)", RegexOptions.Singleline);
foreach (Match pm in packerMatches)
{
var unpacked = UnpackDeanEdwards(pm.Value);
if (!string.IsNullOrEmpty(unpacked))
{
unpacked = unpacked.Replace("\\", "");
var m3u8Match = Regex.Match(unpacked, @"https://surrit\.com/[a-f0-9\-]+/(?:playlist|\d+p/video)\.m3u8", RegexOptions.IgnoreCase);
if (m3u8Match.Success)
{
rawStreamUrl = m3u8Match.Value;
break;
}
}
}
// 2. surrit.com の直接m3u8探索
if (string.IsNullOrEmpty(rawStreamUrl))
{
var directM3u8 = Regex.Match(html, @"https://surrit\.com/[a-f0-9\-]+/(?:playlist|\d+p/video)\.m3u8", RegexOptions.IgnoreCase);
if (directM3u8.Success)
{
rawStreamUrl = directM3u8.Value;
}
}
// 3. 一般的な UUID パターンから surrit.com m3u8 を推測復元
if (string.IsNullOrEmpty(rawStreamUrl))
{
var uuidMatch = Regex.Match(html, @"[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}", RegexOptions.IgnoreCase);
if (uuidMatch.Success)
{
rawStreamUrl = $"https://surrit.com/{uuidMatch.Value}/playlist.m3u8";
}
}
// 4. ストリームURLが抽出された場合、内部プロキシ経由のURLに変換
if (!string.IsNullOrWhiteSpace(rawStreamUrl))
{
// surrit.com は Referer: https://missav.ai/ が必須かつブラウザ直接アクセスでは CORS 制限があるため、
// WebImageViewer のプロキシ (/api/proxy-embed-req) 経由にルーティング
item.StreamUrl = $"/api/proxy-embed-req?url={Uri.EscapeDataString(rawStreamUrl)}&referer={Uri.EscapeDataString(canonicalUrl)}";
}
else
{
// m3u8が抽出できなかった場合でも、外部リンク誘導を回避するためEmbedUrlにセット
item.EmbedUrl = canonicalUrl;
}
}
catch (Exception ex)
{
this._logger.LogWarning(ex, "MissAV の HTML からの m3u8 抽出に失敗しました: {Url}", canonicalUrl);
item.EmbedUrl = canonicalUrl;
} }
return item; return item;
} }
/// <summary>
/// 入力URLまたは識別文字列からMissAVの動画IDを抽出します。
/// </summary>
/// <param name="url">入力URLまたはID文字列</param>
/// <returns>抽出された動画ID。判定できない場合は null</returns>
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/)(?<id>[^/?#]+)",
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;
}
/// <summary>
/// 指定されたパスセグメントが言語コードやプレフィックス等の予約語であるかを判定します。
/// </summary>
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";
}
/// <summary> /// <summary>
/// SpankBang の公式埋め込みプレイヤーを解決します。 /// SpankBang の公式埋め込みプレイヤーを解決します。
/// </summary> /// </summary>
@@ -194,21 +565,220 @@ public class VideoEmbedExtractor
} }
/// <summary> /// <summary>
/// 123av の公式埋め込みプレイヤーを解決します。 /// 123av の埋め込みプレイヤーを動的解決します。
/// ページHTML内の player(JSON.parse(...)) 等から最新の埋め込みプレイヤーURL(jav-master等)を抽出し、
/// 定期的に出現する透明なリンクエリア(オーバーレイ広告)および外部リンク処理を除去するクリーン埋め込みURLに変換します。
/// </summary> /// </summary>
private static UnifiedVideoItem Resolve123Av(string url) /// <param name="url">対象ページのURL</param>
/// <param name="customPlayUrl">明示指定された再生URL(任意)</param>
/// <param name="ct">キャンセルトークン</param>
/// <returns>解決された動画アイテム</returns>
private async Task<UnifiedVideoItem> Resolve123AvAsync(string url, string? customPlayUrl = null, CancellationToken ct = default)
{ {
var match = Regex.Match(url, @"video/([a-zA-Z0-9_-]+)", RegexOptions.IgnoreCase); // 0. 直接 jav-master 等の埋め込みプレイヤーURLが指定された場合の即時対応
var id = match.Success ? match.Groups[1].Value : "video"; if (url.Contains("jav-master", StringComparison.OrdinalIgnoreCase))
{
var matchId = Regex.Match(url, @"/e/([a-zA-Z0-9_-]+)");
var vId = matchId.Success ? matchId.Groups[1].Value : "video";
return new UnifiedVideoItem return new UnifiedVideoItem
{
Site = "123av",
VideoId = vId,
Title = $"123av 動画 ({vId})",
OriginalUrl = url,
EmbedUrl = UnifiedEmbedSanitizer.ToCleanEmbedUrl(url, "https://123av.com/")
};
}
// 1. IDの抽出
string id = "video";
var idMatch = Regex.Match(url, @"(?:123av\.[a-z]+/(?:[a-z]{2}/)?(?:v|video)/|^/?123av/)(?<id>[^/?#]+)", RegexOptions.IgnoreCase);
if (idMatch.Success)
{
id = idMatch.Groups["id"].Value;
}
else
{
var vMatch = Regex.Match(url, @"(?:/v/|/video/)(?<id>[^/?#]+)", RegexOptions.IgnoreCase);
if (vMatch.Success)
{
id = vMatch.Groups["id"].Value;
}
else
{
var clean = url.Split('?')[0].Split('#')[0].TrimEnd('/');
var lastSlash = clean.LastIndexOf('/');
if (lastSlash >= 0)
{
id = clean[(lastSlash + 1)..];
}
else if (!string.IsNullOrWhiteSpace(clean) && !clean.StartsWith("http", StringComparison.OrdinalIgnoreCase))
{
id = clean;
}
}
}
var canonicalUrl = $"https://123av.com/ja/v/{id}";
var item = new UnifiedVideoItem
{ {
Site = "123av", Site = "123av",
VideoId = id, VideoId = id,
Title = $"123av ({id})", Title = $"123av ({id})",
OriginalUrl = url, OriginalUrl = canonicalUrl
EmbedUrl = $"https://javplayer.cc/v/{id}"
}; };
// URL自身に play= クエリが含まれる場合は customPlayUrl として救済
if (string.IsNullOrWhiteSpace(customPlayUrl) && url.Contains("play=", StringComparison.OrdinalIgnoreCase))
{
var matchPlay = Regex.Match(url, @"[?&]play=([^&]+)", RegexOptions.IgnoreCase);
if (matchPlay.Success)
{
customPlayUrl = Uri.UnescapeDataString(matchPlay.Groups[1].Value);
}
}
if (!string.IsNullOrWhiteSpace(customPlayUrl))
{
item.EmbedUrl = customPlayUrl;
}
// 2. 123av 公式ページHTMLを取得して実プレイヤーURLおよびタイトル・サムネイルを動的抽出
try
{
string? html = null;
try
{
html = await this._httpHelper.GetHtmlAsync(canonicalUrl, useFlareSolverr: false, ct: ct);
if (string.IsNullOrWhiteSpace(html) ||
html.Contains("<title>Just a moment...</title>", StringComparison.OrdinalIgnoreCase) ||
(html.Contains("challenge-platform", StringComparison.OrdinalIgnoreCase) && !html.Contains("watch__title", StringComparison.OrdinalIgnoreCase)))
{
html = await this._httpHelper.GetHtmlAsync(canonicalUrl, useFlareSolverr: true, ct: ct);
}
}
catch
{
html = await this._httpHelper.GetHtmlAsync(canonicalUrl, useFlareSolverr: true, ct: ct);
}
if (!string.IsNullOrWhiteSpace(html))
{
// タイトル抽出
var titleMatch = Regex.Match(html, @"<h1[^>]*class=""[^""]*watch__title[^""]*""[^>]*>(?<title>.*?)</h1>", RegexOptions.IgnoreCase | RegexOptions.Singleline);
if (titleMatch.Success)
{
item.Title = CleanText(Regex.Replace(titleMatch.Groups["title"].Value, @"<[^>]+>", ""));
}
else
{
var ogTitle = Regex.Match(html, @"<meta property=""og:title"" content=""([^""]+)""");
if (ogTitle.Success)
{
item.Title = CleanText(ogTitle.Groups[1].Value);
}
}
// ポスター画像抽出
var posterMatch = Regex.Match(html, @"<meta property=""og:image"" content=""([^""]+)""");
if (posterMatch.Success)
{
item.PosterUrl = posterMatch.Groups[1].Value;
}
else
{
var coverMatch = Regex.Match(html, @"(https?://[^""']+/cover\.jpg[^""']*)");
if (coverMatch.Success)
{
item.PosterUrl = coverMatch.Groups[1].Value;
}
}
// (A) player(JSON.parse('...')) から jav-master 等の埋め込みURLを抽出
var playerJsonMatch = Regex.Match(html, @"player\(JSON\.parse\('(?<json>[^']+)'\)");
if (playerJsonMatch.Success)
{
var rawJson = playerJsonMatch.Groups["json"].Value;
rawJson = Regex.Unescape(rawJson);
try
{
using var doc = System.Text.Json.JsonDocument.Parse(rawJson);
if (doc.RootElement.ValueKind == System.Text.Json.JsonValueKind.Array)
{
foreach (var ep in doc.RootElement.EnumerateArray())
{
if (ep.TryGetProperty("url", out var urlProp))
{
var extractedUrl = urlProp.GetString();
if (!string.IsNullOrWhiteSpace(extractedUrl))
{
item.EmbedUrl = extractedUrl;
break;
}
}
}
}
}
catch (Exception ex)
{
this._logger.LogWarning(ex, "123av の player JSON 解析エラー: {Json}", rawJson);
}
}
// (B) v-scope="Movie({id: ...})" から ajax/v/{movieId}/videos 経由で埋め込みURLを抽出
if (string.IsNullOrWhiteSpace(item.EmbedUrl))
{
var movieScopeMatch = Regex.Match(html, @"v-scope=""Movie\(\{[^""]*?\bid\s*:\s*(?<movieId>\d+)", RegexOptions.IgnoreCase);
if (movieScopeMatch.Success)
{
var movieId = movieScopeMatch.Groups["movieId"].Value;
var ajaxUrl = $"https://123av.com/ja/ajax/v/{movieId}/videos";
try
{
var ajaxJson = await this._httpHelper.GetHtmlAsync(ajaxUrl, useFlareSolverr: false, referer: canonicalUrl, ct: ct);
var ajaxUrlMatch = Regex.Match(ajaxJson, @"""url""\s*:\s*""(?<uUrl>https?:[^""]+)""");
if (ajaxUrlMatch.Success)
{
item.EmbedUrl = ajaxUrlMatch.Groups["uUrl"].Value.Replace(@"\/", "/");
}
}
catch (Exception ajaxEx)
{
this._logger.LogDebug(ajaxEx, "123av ajax/v/{MovieId}/videos の取得に失敗しました", movieId);
}
}
}
// (C) JSONで見つからなかった場合、iframeタグのsrcをフォールバック探索
if (string.IsNullOrWhiteSpace(item.EmbedUrl))
{
var iframeMatch = Regex.Match(html, @"<iframe[^>]+src=""([^""]+)""");
if (iframeMatch.Success && !iframeMatch.Groups[1].Value.Contains("challenge-platform"))
{
item.EmbedUrl = iframeMatch.Groups[1].Value;
}
}
}
}
catch (Exception ex)
{
this._logger.LogWarning(ex, "123av ページ({Url})の取得に失敗しました。フォールバック処理を継続します。", canonicalUrl);
}
// customPlayUrl が指定されていて HTML から埋め込みが取得できなかった場合は customPlayUrl を確実に採用
if (string.IsNullOrWhiteSpace(item.EmbedUrl) && !string.IsNullOrWhiteSpace(customPlayUrl))
{
item.EmbedUrl = customPlayUrl;
}
// 3. 123av接続時は、定期的に出現する透明なリンクエリア(オーバーレイ広告)および外部リンク処理を除去するクリーン埋め込みURLに変換
if (!string.IsNullOrWhiteSpace(item.EmbedUrl))
{
item.EmbedUrl = UnifiedEmbedSanitizer.ToCleanEmbedUrl(item.EmbedUrl, canonicalUrl);
}
return item;
} }
/// <summary> /// <summary>
@@ -384,6 +954,7 @@ public class VideoEmbedExtractor
"hdzog" => "https://www.hdzog.com/embed/", "hdzog" => "https://www.hdzog.com/embed/",
"upornia" => "https://upornia.com/embed/", "upornia" => "https://upornia.com/embed/",
"youjizz" => "https://www.youjizz.com/embed/", "youjizz" => "https://www.youjizz.com/embed/",
"hotmovs" => "https://hotmovs.com/embed/",
_ => $"https://{host}.com/embed/" _ => $"https://{host}.com/embed/"
}; };
@@ -518,6 +1089,8 @@ public class VideoEmbedExtractor
href.Contains("hdzog.com/videos/", StringComparison.OrdinalIgnoreCase) || href.Contains("hdzog.com/videos/", StringComparison.OrdinalIgnoreCase) ||
href.Contains("upornia.com/videos/", StringComparison.OrdinalIgnoreCase) || href.Contains("upornia.com/videos/", StringComparison.OrdinalIgnoreCase) ||
href.Contains("youjizz.com/videos/", StringComparison.OrdinalIgnoreCase) || href.Contains("youjizz.com/videos/", StringComparison.OrdinalIgnoreCase) ||
href.Contains("hotmovs.com/videos/", StringComparison.OrdinalIgnoreCase) ||
href.Contains("javynow.com/video/", StringComparison.OrdinalIgnoreCase) ||
href.Contains("do-ga.eroterest.net/video/", StringComparison.OrdinalIgnoreCase) || href.Contains("do-ga.eroterest.net/video/", StringComparison.OrdinalIgnoreCase) ||
href.Contains("spankbang.com/", StringComparison.OrdinalIgnoreCase) || href.Contains("spankbang.com/", StringComparison.OrdinalIgnoreCase) ||
href.Contains("missav", StringComparison.OrdinalIgnoreCase) || href.Contains("missav", StringComparison.OrdinalIgnoreCase) ||
@@ -1,3 +1,5 @@
using System.Net;
using System.Runtime.Versioning;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using WebImageViewer.Class.Unified.Common; using WebImageViewer.Class.Unified.Common;
using WebImageViewer.Class.Unified.Scrapers; using WebImageViewer.Class.Unified.Scrapers;
@@ -5,15 +7,30 @@ using WebImageViewer.Class.Unified.Services;
namespace WebImageViewer.Class.Unified; namespace WebImageViewer.Class.Unified;
/// <summary>
/// 新アーキテクチャ(Unified)用のDIサービス登録拡張クラス
/// </summary>
public static class UnifiedServiceExtensions public static class UnifiedServiceExtensions
{ {
#region □メソッド(Public)
/// <summary> /// <summary>
/// 新アーキテクチャ(Unified)のサービス群をDIコンテナに登録します。 /// 新アーキテクチャ(Unified)のサービス群をDIコンテナに登録します。
/// </summary> /// </summary>
/// <param name="services">サービスコレクション</param>
/// <returns>登録後のサービスコレクション</returns>
public static IServiceCollection AddUnifiedServices(this IServiceCollection services) public static IServiceCollection AddUnifiedServices(this IServiceCollection services)
{ {
// HTTP通信ヘルパー // HTTP通信ヘルパー(Cloudflare TLSフィンガープリント対策としてWindows環境ではWinHttpHandlerを適用)
if (OperatingSystem.IsWindows())
{
services.AddHttpClient<UnifiedHttpHelper>()
.ConfigurePrimaryHttpMessageHandler(CreateWinHttpHandler);
}
else
{
services.AddHttpClient<UnifiedHttpHelper>(); services.AddHttpClient<UnifiedHttpHelper>();
}
// 画像スクレイパー群 // 画像スクレイパー群
services.AddScoped<IUnifiedScraper, UnifiedHitomiScraper>(); services.AddScoped<IUnifiedScraper, UnifiedHitomiScraper>();
@@ -23,6 +40,9 @@ public static class UnifiedServiceExtensions
services.AddScoped<IUnifiedScraper, UnifiedAuraHentaiScraper>(); services.AddScoped<IUnifiedScraper, UnifiedAuraHentaiScraper>();
services.AddScoped<IUnifiedScraper, UnifiedMangalearScraper>(); services.AddScoped<IUnifiedScraper, UnifiedMangalearScraper>();
// 123av等の透明リンクエリア・外部広告除去サニタイザー
services.AddScoped<UnifiedEmbedSanitizer>();
// 動画埋め込み抽出エンジン // 動画埋め込み抽出エンジン
services.AddScoped<VideoEmbedExtractor>(); services.AddScoped<VideoEmbedExtractor>();
@@ -31,4 +51,23 @@ public static class UnifiedServiceExtensions
return services; return services;
} }
#endregion
#region □メソッド(Private)
/// <summary>
/// Windows環境専用のWinHttpHandlerインスタンスを生成・構成します。
/// </summary>
/// <returns>構成済みのHttpMessageHandler</returns>
[SupportedOSPlatform("windows")]
private static HttpMessageHandler CreateWinHttpHandler()
{
return new WinHttpHandler
{
AutomaticDecompression = DecompressionMethods.All
};
}
#endregion
} }
+247 -6
View File
@@ -1,3 +1,4 @@
using System.IO.Compression;
using Microsoft.AspNetCore.HttpOverrides; using Microsoft.AspNetCore.HttpOverrides;
using WebImageViewer.Class.Legacy; using WebImageViewer.Class.Legacy;
using WebImageViewer.Class.Unified; using WebImageViewer.Class.Unified;
@@ -46,16 +47,16 @@ app.UseForwardedHeaders();
// ========================================== // ==========================================
// 統一アクセス方式 (/?url=[各ページURL]) // 統一アクセス方式 (/?url=[各ページURL])
// ========================================== // ==========================================
app.MapGet("/", async (string? url, UnifiedViewerService viewerService, CancellationToken ct) => app.MapGet("/", async (string? url, string? play, string? stream, string? view, UnifiedViewerService viewerService, CancellationToken ct) =>
{ {
// URLパラメータが未指定の場合は統一トップページを表示 // URLパラメータが未指定(かつplay/streamも未指定)の場合は統一トップページを表示
if (string.IsNullOrWhiteSpace(url)) if (string.IsNullOrWhiteSpace(url) && string.IsNullOrWhiteSpace(play) && string.IsNullOrWhiteSpace(stream))
{ {
return Results.Content(UnifiedHtmlRenderer.RenderHomePage(), "text/html; charset=utf-8"); return Results.Content(UnifiedHtmlRenderer.RenderHomePage(), "text/html; charset=utf-8");
} }
// ドメイン自動判定およびメディア(動画 / 画像)解決を実行 // ドメイン自動判定およびメディア(動画 / 画像)解決を実行
var result = await viewerService.ResolveAsync(url, ct); var result = await viewerService.ResolveAsync(url ?? play ?? stream ?? "", play, stream, ct);
if (!result.IsSuccess) if (!result.IsSuccess)
{ {
@@ -71,9 +72,13 @@ app.MapGet("/", async (string? url, UnifiedViewerService viewerService, Cancella
return Results.Content(UnifiedHtmlRenderer.RenderVideoViewer(result.Video), "text/html; charset=utf-8"); return Results.Content(UnifiedHtmlRenderer.RenderVideoViewer(result.Video), "text/html; charset=utf-8");
} }
// 画像の場合はギャラリービューアー画面を同一URLのままレンダリング // 画像の場合はギャラリービューアー画面またはサムネイル一覧画面をレンダリング
if (result.Type == MediaType.Gallery && result.Gallery != null) if (result.Type == MediaType.Gallery && result.Gallery != null)
{ {
if (string.Equals(view, "thumbnails", StringComparison.OrdinalIgnoreCase))
{
return Results.Content(UnifiedHtmlRenderer.RenderThumbnailGridPage(result.Gallery), "text/html; charset=utf-8");
}
return Results.Content(UnifiedHtmlRenderer.RenderGalleryViewer(result.Gallery), "text/html; charset=utf-8"); return Results.Content(UnifiedHtmlRenderer.RenderGalleryViewer(result.Gallery), "text/html; charset=utf-8");
} }
@@ -83,10 +88,135 @@ app.MapGet("/", async (string? url, UnifiedViewerService viewerService, Cancella
statusCode: 404); statusCode: 404);
}); });
// ==========================================
// 全ページサムネイル一覧画面エンドポイント
// ==========================================
app.MapGet("/thumbnails", async (string? url, UnifiedViewerService viewerService, CancellationToken ct) =>
{
if (string.IsNullOrWhiteSpace(url))
{
return Results.Redirect("/");
}
var result = await viewerService.ResolveAsync(url, null, null, ct);
if (!result.IsSuccess || result.Gallery == null)
{
return Results.Content(
UnifiedHtmlRenderer.RenderErrorPage(result.ErrorMessage ?? "ギャラリーを読み込めませんでした。", result.StatusCode),
"text/html; charset=utf-8",
statusCode: result.StatusCode);
}
return Results.Content(UnifiedHtmlRenderer.RenderThumbnailGridPage(result.Gallery), "text/html; charset=utf-8");
});
// ==========================================
// 全ページZIP一括ダウンロードAPI
// ==========================================
app.MapGet("/api/download-zip", async (
string url,
UnifiedViewerService viewerService,
UnifiedHttpHelper httpHelper,
HttpContext httpContext,
ILoggerFactory loggerFactory,
CancellationToken ct) =>
{
if (string.IsNullOrWhiteSpace(url))
{
return Results.BadRequest("URL is required");
}
var logger = loggerFactory.CreateLogger("ZipDownload");
var result = await viewerService.ResolveAsync(url, null, null, ct);
if (!result.IsSuccess || result.Gallery == null || result.Gallery.Images.Count == 0)
{
return Results.NotFound(new { error = result.ErrorMessage ?? "ギャラリー画像を取得できませんでした。" });
}
var gallery = result.Gallery;
// ファイル名として使用できない文字を除去
var invalidChars = Path.GetInvalidFileNameChars();
var cleanTitle = string.Concat(gallery.Title.Select(c => invalidChars.Contains(c) ? '_' : c)).Trim();
if (string.IsNullOrWhiteSpace(cleanTitle)) cleanTitle = "gallery";
var zipFileName = $"{cleanTitle}.zip";
httpContext.Response.ContentType = "application/zip";
httpContext.Response.Headers.ContentDisposition = $"attachment; filename=\"{Uri.EscapeDataString(zipFileName)}\"; filename*=UTF-8''{Uri.EscapeDataString(zipFileName)}";
// サーバーメモリを圧迫しないよう一時ファイルを使用して安全にZIPストリーミング生成
var tempZipPath = Path.GetTempFileName();
try
{
using (var fileStream = new FileStream(tempZipPath, FileMode.Create, FileAccess.ReadWrite, FileShare.None, 4096, FileOptions.DeleteOnClose))
{
using (var archive = new ZipArchive(fileStream, ZipArchiveMode.Create, leaveOpen: true))
{
// 最大4並列で各ページの画像データを取得
using var semaphore = new SemaphoreSlim(4);
var downloadTasks = gallery.Images.Select(async img =>
{
await semaphore.WaitAsync(ct);
try
{
var (data, contentType) = await FetchImageBytesForZipAsync(img.ImageUrl, gallery.SourceUrl, httpHelper, ct);
return (img.PageNumber, img.ImageUrl, Data: data, ContentType: contentType);
}
finally
{
semaphore.Release();
}
}).ToList();
var downloadResults = await Task.WhenAll(downloadTasks);
foreach (var item in downloadResults.OrderBy(r => r.PageNumber))
{
if (item.Data == null || item.Data.Length == 0)
{
logger.LogWarning("ページ {Page} の画像ダウンロードをスキップしました (データなし)", item.PageNumber);
continue;
}
var ext = DetermineImageExtensionForZip(item.ContentType, item.ImageUrl);
var entryName = $"{item.PageNumber:D3}{ext}";
var entry = archive.CreateEntry(entryName, CompressionLevel.Fastest);
using var entryStream = entry.Open();
await entryStream.WriteAsync(item.Data, ct);
}
}
fileStream.Position = 0;
await fileStream.CopyToAsync(httpContext.Response.Body, ct);
}
return Results.Empty;
}
catch (OperationCanceledException)
{
logger.LogInformation("ZIPダウンロードがクライアントによりキャンセルされました: {Url}", url);
return Results.Empty;
}
catch (Exception ex)
{
logger.LogError(ex, "ZIPアーカイブ生成エラー: {Url}", url);
return Results.Problem(detail: ex.Message, statusCode: 500);
}
finally
{
if (File.Exists(tempZipPath))
{
try { File.Delete(tempZipPath); } catch { }
}
}
});
// ========================================== // ==========================================
// 画像プロキシAPI (Referer制限回避・高速キャッシュ配信) // 画像プロキシAPI (Referer制限回避・高速キャッシュ配信)
// ========================================== // ==========================================
app.MapGet("/api/proxy-image", async (string url, string? referer, UnifiedHttpHelper httpHelper, ILoggerFactory loggerFactory, CancellationToken ct) => app.MapGet("/api/proxy-image", async (string url, string? referer, HttpContext httpContext, UnifiedHttpHelper httpHelper, ILoggerFactory loggerFactory, CancellationToken ct) =>
{ {
if (string.IsNullOrWhiteSpace(url)) if (string.IsNullOrWhiteSpace(url))
{ {
@@ -96,8 +226,16 @@ app.MapGet("/api/proxy-image", async (string url, string? referer, UnifiedHttpHe
try try
{ {
var (data, contentType) = await httpHelper.GetBinaryAsync(url, referer, ct); var (data, contentType) = await httpHelper.GetBinaryAsync(url, referer, ct);
// クライアント側(ブラウザ)での無駄な再リクエストを防ぐためキャッシュヘッダーを設定
httpContext.Response.Headers.CacheControl = "public, max-age=86400";
return Results.File(data, contentType); return Results.File(data, contentType);
} }
catch (HttpRequestException ex) when (ex.StatusCode == System.Net.HttpStatusCode.NotFound)
{
var logger = loggerFactory.CreateLogger("ProxyImage");
logger.LogWarning("画像が見つかりません (404): URL={Url}, Referer={Referer}", url, referer);
return Results.NotFound(new { detail = ex.Message });
}
catch (Exception ex) catch (Exception ex)
{ {
var logger = loggerFactory.CreateLogger("ProxyImage"); var logger = loggerFactory.CreateLogger("ProxyImage");
@@ -106,10 +244,113 @@ app.MapGet("/api/proxy-image", async (string url, string? referer, UnifiedHttpHe
} }
}); });
// ==========================================
// 123av等の動画プレイヤー透明リンクエリア・外部リンク除去プロキシAPI
// ==========================================
app.MapGet("/api/clean-embed", async (string? url, string? referer, UnifiedEmbedSanitizer embedSanitizer, CancellationToken ct) =>
{
if (string.IsNullOrWhiteSpace(url))
{
return Results.BadRequest("url is required");
}
var sanitizedHtml = await embedSanitizer.GetSanitizedEmbedHtmlAsync(url, referer, ct);
return Results.Content(sanitizedHtml, "text/html; charset=utf-8");
});
app.MapMethods("/api/proxy-embed-req", new[] { "GET", "POST", "HEAD" }, async (string? url, string? referer, HttpContext httpContext, UnifiedEmbedSanitizer embedSanitizer, CancellationToken ct) =>
{
return await embedSanitizer.ProxyEmbedRequestAsync(httpContext, url, referer, ct);
});
// ========================================== // ==========================================
// 旧バージョン(Legacy)のエンドポイント登録 // 旧バージョン(Legacy)のエンドポイント登録
// (/view, /video, /{site}/{id}, /spankbang/{id}, 旧API等を過去互換用として保持) // (/view, /video, /{site}/{id}, /spankbang/{id}, 旧API等を過去互換用として保持)
// ========================================== // ==========================================
app.MapLegacyEndpoints(); app.MapLegacyEndpoints();
// ==========================================
// ZIPダウンロード用画像バイナリ取得ヘルパー
// ==========================================
static async Task<(byte[]? Data, string? ContentType)> FetchImageBytesForZipAsync(
string imageUrl,
string defaultReferer,
UnifiedHttpHelper httpHelper,
CancellationToken ct)
{
string targetUrl = imageUrl;
string? targetReferer = defaultReferer;
// /api/proxy-image?... 形式の場合は内部パラメータを展開して直接取得
if (imageUrl.StartsWith("/api/proxy-image", StringComparison.OrdinalIgnoreCase))
{
var qIndex = imageUrl.IndexOf('?');
if (qIndex >= 0)
{
var qs = Microsoft.AspNetCore.WebUtilities.QueryHelpers.ParseQuery(imageUrl.Substring(qIndex));
if (qs.TryGetValue("url", out var u) && !string.IsNullOrEmpty(u))
{
targetUrl = u.ToString();
}
if (qs.TryGetValue("referer", out var r) && !string.IsNullOrEmpty(r))
{
targetReferer = r.ToString();
}
}
}
// 最大3回リトライを行い、一時的なネットワーク揺らぎによるページ抜けを徹底防止
for (int attempt = 1; attempt <= 3; attempt++)
{
try
{
var (data, contentType) = await httpHelper.GetBinaryAsync(targetUrl, targetReferer, ct);
if (data != null && data.Length > 0)
{
return (data, contentType);
}
}
catch (OperationCanceledException)
{
throw;
}
catch
{
if (attempt == 3) break;
try
{
await Task.Delay(attempt * 1000, ct);
}
catch (OperationCanceledException)
{
throw;
}
}
}
return (null, null);
}
static string DetermineImageExtensionForZip(string? contentType, string imageUrl)
{
if (!string.IsNullOrWhiteSpace(contentType))
{
var ctLower = contentType.ToLowerInvariant();
if (ctLower.Contains("png")) return ".png";
if (ctLower.Contains("webp")) return ".webp";
if (ctLower.Contains("gif")) return ".gif";
if (ctLower.Contains("jpeg") || ctLower.Contains("jpg")) return ".jpg";
if (ctLower.Contains("avif")) return ".avif";
}
var cleanUrl = imageUrl.Split('?')[0];
var ext = Path.GetExtension(cleanUrl);
if (!string.IsNullOrWhiteSpace(ext) && ext.Length <= 5)
{
return ext.ToLowerInvariant();
}
return ".jpg";
}
app.Run(); app.Run();
+2 -1
View File
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net10.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
@@ -8,6 +8,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.13.0" /> <PackageReference Include="HtmlAgilityPack" Version="1.13.0" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="10.0.14" />
</ItemGroup> </ItemGroup>
</Project> </Project>