refactor(legacy): 旧/viewエンドポイントの新/?url=統一とProgram配線を更新
This commit is contained in:
1 parent
d3ef4fe04f
commit
211da2a9d4
2 files changed
+185
-165
No files matched your search
@@ -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;
|
||||||
|
|||||||
@@ -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");
|
||||||
|
|||||||
Reference in new issue
Block a user