Compare commits

..
4 Commits
10 changed files with 733 additions and 254 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)
if (target != null && target.StartsWith("http", StringComparison.OrdinalIgnoreCase) && string.IsNullOrWhiteSpace(play) && string.IsNullOrWhiteSpace(stream))
{ {
var resolved = await resolver.ResolveAsync(target, title, ct); redirectUrl += $"&stream={Uri.EscapeDataString(stream)}";
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))) return Results.Redirect(redirectUrl, permanent: true);
{
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) =>
{
var rawId = id ?? "";
var decoded = TryDecodeBase64Url(rawId);
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) =>
{
if (string.IsNullOrWhiteSpace(id))
{ {
return Results.Content(HtmlRenderer.RenderVideoPlayer("123av", id, null, null, $"https://123av.com/ja/video/{id}", $"123av 動画 ({id})"), "text/html; charset=utf-8"); // 末尾スラッシュ付き2階層URL(例: /hentaipaw/4207932/)の救済
} var canonical2 = BuildCanonicalUrl(site, category, null);
if (string.Equals(site, "missav", StringComparison.OrdinalIgnoreCase)) return Results.Redirect($"/?url={Uri.EscapeDataString(canonical2)}", permanent: true);
{
return Results.Content(HtmlRenderer.RenderVideoPlayer("missav", id, null, null, $"https://missav.ai/ja/{id}", $"missav 動画 ({id})"), "text/html; charset=utf-8");
}
if (string.Equals(site, "spankbang", StringComparison.OrdinalIgnoreCase))
{
return Results.Redirect($"/spankbang/{id}");
} }
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;
@@ -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,5 +1,6 @@
using System.Net; using System.Net;
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 +12,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");
@@ -65,30 +68,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))
var json = await resp.Content.ReadAsStringAsync(ct);
using var doc = JsonDocument.Parse(json);
if (doc.RootElement.TryGetProperty("solution", out var sol) &&
sol.TryGetProperty("response", out var respHtml))
{ {
return respHtml.GetString() ?? string.Empty; 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);
using var doc = JsonDocument.Parse(json);
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))
{
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>
@@ -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);
@@ -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", "同人まんがりあ") }
}; };
// 動画サイトのドメイン定義 // 動画サイトのドメイン定義
@@ -43,6 +45,8 @@ public static class DomainClassifier
{ "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 +63,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 +107,20 @@ 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, "missav", StringComparison.OrdinalIgnoreCase) || host.Contains("missav"))
{
return new DomainClassificationResult(MediaType.Video, "missav", "MissAV", host);
} }
// 1. 完全一致チェック // 1. 完全一致チェック
@@ -118,15 +151,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"))
{ {
@@ -28,19 +28,47 @@ 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))
{ {
return new UnifiedViewerResult if (!string.IsNullOrWhiteSpace(play) || !string.IsNullOrWhiteSpace(stream))
{ {
Type = MediaType.Unknown, urlOrInput = play ?? stream ?? "";
IsSuccess = false, }
ErrorMessage = "URLまたはIDが入力されていません。", else
StatusCode = 400 {
}; return new UnifiedViewerResult
{
Type = MediaType.Unknown,
IsSuccess = false,
ErrorMessage = "URLまたはIDが入力されていません。",
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
@@ -24,54 +24,91 @@ 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 "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 +116,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 +166,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)
{ {
@@ -194,21 +279,164 @@ public class VideoEmbedExtractor
} }
/// <summary> /// <summary>
/// 123av の公式埋め込みプレイヤーを解決します。 /// 123av の埋め込みプレイヤーを動的解決します。
/// ページHTML内の player(JSON.parse(...)) から最新の埋め込みプレイヤーURL(jav-master等)を抽出します。
/// </summary> /// </summary>
private static UnifiedVideoItem Resolve123Av(string url) 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
{
Site = "123av",
VideoId = vId,
Title = $"123av 動画 ({vId})",
OriginalUrl = url,
EmbedUrl = url
};
}
return new UnifiedVideoItem // 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
{
var html = await _httpHelper.GetHtmlAsync(canonicalUrl, 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;
}
// 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 = System.Text.RegularExpressions.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)
{
_logger.LogWarning(ex, "123av の player JSON 解析エラー: {Json}", rawJson);
}
}
// 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)
{
_logger.LogWarning(ex, "123av ページ({Url})の取得に失敗しました。フォールバック処理を継続します。", canonicalUrl);
}
// customPlayUrl が指定されていて HTML から埋め込みが取得できなかった場合は customPlayUrl を確実に採用
if (string.IsNullOrWhiteSpace(item.EmbedUrl) && !string.IsNullOrWhiteSpace(customPlayUrl))
{
item.EmbedUrl = customPlayUrl;
}
return item;
} }
/// <summary> /// <summary>
@@ -384,6 +612,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 +747,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) ||
+13 -5
View File
@@ -46,16 +46,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, 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)
{ {
@@ -86,7 +86,7 @@ app.MapGet("/", async (string? url, UnifiedViewerService viewerService, Cancella
// ========================================== // ==========================================
// 画像プロキシ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 +96,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");