Compare commits
11
Commits
211da2a9d4
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
22a6f74184 | ||
|
|
bec51879c7 | ||
|
|
cd202a1719 | ||
|
|
bc8bce8de4 | ||
|
|
ab8216b38e | ||
|
|
b9a316254b | ||
|
|
60c2648add | ||
|
|
6ec727e9c5 | ||
|
|
210543ba1f | ||
|
|
0e805184d9 | ||
|
|
373169d697 |
No files matched your search
@@ -1,4 +1,4 @@
|
|||||||
using System.Text.Encodings.Web;
|
using System.Text.Encodings.Web;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using WebImageViewer.Class.Legacy.Models;
|
using WebImageViewer.Class.Legacy.Models;
|
||||||
|
|
||||||
@@ -1720,8 +1720,6 @@ public static class HtmlRenderer
|
|||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
""";
|
""";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2106,7 +2104,6 @@ public static class HtmlRenderer
|
|||||||
playerUrl ??= $"https://video.fc2.com/a/embed/player/{safeId}/";
|
playerUrl ??= $"https://video.fc2.com/a/embed/player/{safeId}/";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
siteDisplayName = !string.IsNullOrWhiteSpace(site) ? site.ToUpperInvariant() : "動画プレイヤー";
|
siteDisplayName = !string.IsNullOrWhiteSpace(site) ? site.ToUpperInvariant() : "動画プレイヤー";
|
||||||
badgeText = "WEB VIDEO";
|
badgeText = "WEB VIDEO";
|
||||||
@@ -2117,10 +2114,19 @@ public static class HtmlRenderer
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool is123Av = string.Equals(normalizedSite, "123av", StringComparison.OrdinalIgnoreCase) ||
|
||||||
|
(!string.IsNullOrWhiteSpace(originalUrl) && originalUrl.Contains("123av.", StringComparison.OrdinalIgnoreCase)) ||
|
||||||
|
(!string.IsNullOrWhiteSpace(playerUrl) && (playerUrl.Contains("123av.", StringComparison.OrdinalIgnoreCase) || playerUrl.Contains("jav-master", StringComparison.OrdinalIgnoreCase) || playerUrl.Contains("javplayer.cc", StringComparison.OrdinalIgnoreCase) || playerUrl.Contains("sadie-shop.site", StringComparison.OrdinalIgnoreCase)));
|
||||||
|
|
||||||
|
var effectivePlayerUrl = (!string.IsNullOrWhiteSpace(playerUrl) && is123Av && !playerUrl.StartsWith("/api/clean-embed", StringComparison.OrdinalIgnoreCase))
|
||||||
|
? $"/api/clean-embed?url={Uri.EscapeDataString(playerUrl.Trim())}&referer={Uri.EscapeDataString(!string.IsNullOrWhiteSpace(originalUrl) ? originalUrl.Trim() : defaultOrigUrl)}"
|
||||||
|
: (playerUrl ?? "");
|
||||||
|
|
||||||
var safeTitle = !string.IsNullOrWhiteSpace(title) ? Encoder.Encode(title) : $"{siteDisplayName} 動画プレイヤー ({safeId})";
|
var safeTitle = !string.IsNullOrWhiteSpace(title) ? Encoder.Encode(title) : $"{siteDisplayName} 動画プレイヤー ({safeId})";
|
||||||
var safeOriginalUrl = !string.IsNullOrWhiteSpace(originalUrl) ? Encoder.Encode(originalUrl) : defaultOrigUrl;
|
var safeOriginalUrl = !string.IsNullOrWhiteSpace(originalUrl) ? Encoder.Encode(originalUrl) : defaultOrigUrl;
|
||||||
var safePlayerUrl = !string.IsNullOrWhiteSpace(playerUrl) ? Encoder.Encode(playerUrl) : "";
|
var safePlayerUrl = !string.IsNullOrWhiteSpace(effectivePlayerUrl) ? Encoder.Encode(effectivePlayerUrl) : "";
|
||||||
var safeStreamUrl = !string.IsNullOrWhiteSpace(streamUrl) ? Encoder.Encode(streamUrl) : "";
|
var safeStreamUrl = !string.IsNullOrWhiteSpace(streamUrl) ? Encoder.Encode(streamUrl) : "";
|
||||||
|
var sandboxAttr = is123Av ? """sandbox="allow-scripts allow-same-origin allow-forms allow-presentation" """ : "";
|
||||||
|
|
||||||
bool hasStream = !string.IsNullOrEmpty(safeStreamUrl);
|
bool hasStream = !string.IsNullOrEmpty(safeStreamUrl);
|
||||||
bool hasPlayer = !string.IsNullOrEmpty(safePlayerUrl);
|
bool hasPlayer = !string.IsNullOrEmpty(safePlayerUrl);
|
||||||
@@ -2413,7 +2419,7 @@ public static class HtmlRenderer
|
|||||||
<iframe
|
<iframe
|
||||||
id="videoIframe"
|
id="videoIframe"
|
||||||
src="{{safePlayerUrl}}"
|
src="{{safePlayerUrl}}"
|
||||||
class="player-iframe"
|
{{sandboxAttr}}class="player-iframe"
|
||||||
frameborder="0"
|
frameborder="0"
|
||||||
scrolling="no"
|
scrolling="no"
|
||||||
referrerpolicy="no-referrer-when-downgrade"
|
referrerpolicy="no-referrer-when-downgrade"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using HtmlAgilityPack;
|
using HtmlAgilityPack;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using WebImageViewer.Class.Legacy.Common;
|
using WebImageViewer.Class.Legacy.Common;
|
||||||
@@ -155,6 +155,24 @@ public class VideoUrlResolver
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 85PO
|
||||||
|
if (url.Contains("85po.com", StringComparison.OrdinalIgnoreCase) ||
|
||||||
|
url.Contains("85ro.com", StringComparison.OrdinalIgnoreCase) ||
|
||||||
|
url.Contains("85po.net", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
var match = Regex.Match(url, @"(?:/v/|/embed/|/videos/|^)(?<id>[0-9]+)", RegexOptions.IgnoreCase);
|
||||||
|
var id = match.Success ? match.Groups["id"].Value : "video";
|
||||||
|
return new ResolvedVideoResult
|
||||||
|
{
|
||||||
|
Site = "85po",
|
||||||
|
VideoId = id,
|
||||||
|
PlayerUrl = $"https://www.85po.com/embed/{id}",
|
||||||
|
OriginalUrl = url,
|
||||||
|
Title = title ?? $"85PO 動画 ({id})",
|
||||||
|
IsSuccess = true
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
// HDZog
|
// HDZog
|
||||||
if (url.Contains("hdzog.com", StringComparison.OrdinalIgnoreCase))
|
if (url.Contains("hdzog.com", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
@@ -514,4 +532,3 @@ public class VideoUrlResolver
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1,4 +1,6 @@
|
|||||||
|
using System.Diagnostics;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
|
using System.Text;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
@@ -52,13 +54,35 @@ public class UnifiedHttpHelper
|
|||||||
req.Headers.Referrer = new Uri(referer);
|
req.Headers.Referrer = new Uri(referer);
|
||||||
}
|
}
|
||||||
|
|
||||||
using var resp = await _httpClient.SendAsync(req, ct);
|
using var resp = await this._httpClient.SendAsync(req, ct);
|
||||||
resp.EnsureSuccessStatusCode();
|
resp.EnsureSuccessStatusCode();
|
||||||
return await resp.Content.ReadAsStringAsync(ct);
|
var content = await resp.Content.ReadAsStringAsync(ct);
|
||||||
|
|
||||||
|
// Cloudflare チャレンジ画面の場合は Windows 環境であれば curl.exe で再試行
|
||||||
|
if (OperatingSystem.IsWindows() && IsCloudflareChallenge(content))
|
||||||
|
{
|
||||||
|
this._logger.LogInformation("Cloudflareチャレンジを検知したためcurl.exeでの取得を試行します: {Url}", url);
|
||||||
|
return await this.GetHtmlViaCurlAsync(url, referer, ct);
|
||||||
|
}
|
||||||
|
|
||||||
|
return content;
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "HTTPリクエストに失敗しました: {Url}", url);
|
if (OperatingSystem.IsWindows())
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
this._logger.LogInformation("HttpClientリクエスト失敗のためcurl.exeでの取得を試行します: {Url}", url);
|
||||||
|
return await this.GetHtmlViaCurlAsync(url, referer, ct);
|
||||||
|
}
|
||||||
|
catch (Exception curlEx)
|
||||||
|
{
|
||||||
|
this._logger.LogWarning(curlEx, "curl.exeでのフォールバック取得にも失敗しました: {Url}", url);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this._logger.LogError(ex, "HTTPリクエストに失敗しました: {Url}", url);
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -148,4 +172,70 @@ public class UnifiedHttpHelper
|
|||||||
var contentType = resp.Content.Headers.ContentType?.MediaType ?? "image/jpeg";
|
var contentType = resp.Content.Headers.ContentType?.MediaType ?? "image/jpeg";
|
||||||
return (data, contentType);
|
return (data, contentType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// レスポンス文字列がCloudflareのチャレンジ画面であるかを判定します。
|
||||||
|
/// </summary>
|
||||||
|
private static bool IsCloudflareChallenge(string? html)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(html))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return html.Contains("<title>Attention Required! | Cloudflare</title>", StringComparison.OrdinalIgnoreCase) ||
|
||||||
|
html.Contains("<title>Just a moment...</title>", StringComparison.OrdinalIgnoreCase) ||
|
||||||
|
html.Contains("cf-browser-verification", StringComparison.OrdinalIgnoreCase) ||
|
||||||
|
html.Contains("cf_chl_prog", StringComparison.OrdinalIgnoreCase);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Windows標準のcurl.exeを利用して、Cloudflare TLSフィンガープリント保護下のHTMLを取得します。
|
||||||
|
/// </summary>
|
||||||
|
private async Task<string> GetHtmlViaCurlAsync(string url, string? referer, CancellationToken ct)
|
||||||
|
{
|
||||||
|
var curlPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "curl.exe");
|
||||||
|
if (!File.Exists(curlPath))
|
||||||
|
{
|
||||||
|
curlPath = "curl.exe";
|
||||||
|
}
|
||||||
|
|
||||||
|
var psi = new ProcessStartInfo
|
||||||
|
{
|
||||||
|
FileName = curlPath,
|
||||||
|
UseShellExecute = false,
|
||||||
|
RedirectStandardOutput = true,
|
||||||
|
RedirectStandardError = true,
|
||||||
|
CreateNoWindow = true,
|
||||||
|
StandardOutputEncoding = Encoding.UTF8
|
||||||
|
};
|
||||||
|
|
||||||
|
psi.ArgumentList.Add("-s");
|
||||||
|
psi.ArgumentList.Add("-L");
|
||||||
|
psi.ArgumentList.Add("-A");
|
||||||
|
psi.ArgumentList.Add("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36");
|
||||||
|
psi.ArgumentList.Add("-m");
|
||||||
|
psi.ArgumentList.Add("15");
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(referer))
|
||||||
|
{
|
||||||
|
psi.ArgumentList.Add("-e");
|
||||||
|
psi.ArgumentList.Add(referer);
|
||||||
|
}
|
||||||
|
|
||||||
|
psi.ArgumentList.Add(url);
|
||||||
|
|
||||||
|
using var process = new Process { StartInfo = psi };
|
||||||
|
process.Start();
|
||||||
|
|
||||||
|
var output = await process.StandardOutput.ReadToEndAsync(ct);
|
||||||
|
await process.WaitForExitAsync(ct);
|
||||||
|
|
||||||
|
if (process.ExitCode == 0 && !string.IsNullOrWhiteSpace(output))
|
||||||
|
{
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new HttpRequestException($"curl exited with code {process.ExitCode}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -1,4 +1,4 @@
|
|||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using HtmlAgilityPack;
|
using HtmlAgilityPack;
|
||||||
@@ -102,26 +102,37 @@ public class UnifiedEHentaiScraper : BaseUnifiedScraper
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// 4. 2ページ目以降の画像 URL を showpage API で並列取得
|
// 4. 2ページ目以降の画像 URL を showpage API で並列取得(3桁ページでもレート制限で抜けないよう並列数制御+リトライ)
|
||||||
var remainingEntries = pageEntries.Skip(1).ToList();
|
var remainingEntries = pageEntries.Skip(1).ToList();
|
||||||
if (remainingEntries.Count > 0 && !string.IsNullOrWhiteSpace(showkey))
|
if (remainingEntries.Count > 0 && !string.IsNullOrWhiteSpace(showkey))
|
||||||
{
|
{
|
||||||
using var semaphore = new SemaphoreSlim(10);
|
using var semaphore = new SemaphoreSlim(4);
|
||||||
var tasks = remainingEntries.Select(async entry =>
|
var tasks = remainingEntries.Select(async entry =>
|
||||||
{
|
{
|
||||||
await semaphore.WaitAsync(ct);
|
await semaphore.WaitAsync(ct);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
for (int attempt = 1; attempt <= 3; attempt++)
|
||||||
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var imgInfo = await FetchImageViaShowpageApiAsync(gid, entry.Page, entry.ImgKey, showkey, entry.ThumbUrl, item.Title, ct);
|
var imgInfo = await FetchImageViaShowpageApiAsync(gid, entry.Page, entry.ImgKey, showkey, entry.ThumbUrl, item.Title, ct);
|
||||||
if (imgInfo != null)
|
if (imgInfo != null)
|
||||||
{
|
{
|
||||||
images[entry.Page] = imgInfo;
|
images[entry.Page] = imgInfo;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex) when (attempt == 3)
|
||||||
{
|
{
|
||||||
Logger.LogWarning(ex, "[{SiteName}] ページ {Page} の画像URL取得に失敗しました", SiteName, entry.Page);
|
Logger.LogWarning(ex, "[{SiteName}] ページ {Page} の画像URL取得に失敗しました", SiteName, entry.Page);
|
||||||
}
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
await Task.Delay(attempt * 500, ct);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
semaphore.Release();
|
semaphore.Release();
|
||||||
@@ -229,7 +240,7 @@ public class UnifiedEHentaiScraper : BaseUnifiedScraper
|
|||||||
int pageIndex = 0;
|
int pageIndex = 0;
|
||||||
int maxPages = totalFiles > 0 ? (int)Math.Ceiling(totalFiles / 20.0) : 5;
|
int maxPages = totalFiles > 0 ? (int)Math.Ceiling(totalFiles / 20.0) : 5;
|
||||||
|
|
||||||
while (pageIndex < maxPages && pageIndex < 20)
|
while (pageIndex < maxPages && pageIndex < 100)
|
||||||
{
|
{
|
||||||
var pageUrl = $"{BaseUrl}/g/{gid}/{token}/?p={pageIndex}";
|
var pageUrl = $"{BaseUrl}/g/{gid}/{token}/?p={pageIndex}";
|
||||||
var doc = await LoadHtmlDocumentAsync(pageUrl, ct: ct);
|
var doc = await LoadHtmlDocumentAsync(pageUrl, ct: ct);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using WebImageViewer.Class.Unified.Models;
|
using WebImageViewer.Class.Unified.Models;
|
||||||
|
|
||||||
namespace WebImageViewer.Class.Unified.Services;
|
namespace WebImageViewer.Class.Unified.Services;
|
||||||
|
|
||||||
@@ -39,6 +39,12 @@ public static class DomainClassifier
|
|||||||
{ "missav.com", ("missav", "MissAV") },
|
{ "missav.com", ("missav", "MissAV") },
|
||||||
{ "missav.ws", ("missav", "MissAV") },
|
{ "missav.ws", ("missav", "MissAV") },
|
||||||
{ "missav.net", ("missav", "MissAV") },
|
{ "missav.net", ("missav", "MissAV") },
|
||||||
|
{ "85po.com", ("85po", "85PO") },
|
||||||
|
{ "www.85po.com", ("85po", "85PO") },
|
||||||
|
{ "85ro.com", ("85po", "85RO") },
|
||||||
|
{ "www.85ro.com", ("85po", "85RO") },
|
||||||
|
{ "85po.net", ("85po", "85PO") },
|
||||||
|
{ "www.85po.net", ("85po", "85PO") },
|
||||||
{ "spankbang.com", ("spankbang", "SpankBang") },
|
{ "spankbang.com", ("spankbang", "SpankBang") },
|
||||||
{ "jp.spankbang.com", ("spankbang", "SpankBang") },
|
{ "jp.spankbang.com", ("spankbang", "SpankBang") },
|
||||||
{ "spankbang.party", ("spankbang", "SpankBang") },
|
{ "spankbang.party", ("spankbang", "SpankBang") },
|
||||||
@@ -118,6 +124,10 @@ public static class DomainClassifier
|
|||||||
{
|
{
|
||||||
return new DomainClassificationResult(MediaType.Video, "123av", "123av", host);
|
return new DomainClassificationResult(MediaType.Video, "123av", "123av", host);
|
||||||
}
|
}
|
||||||
|
if (string.Equals(host, "85po", StringComparison.OrdinalIgnoreCase) || host.Contains("85po") || host.Contains("85ro"))
|
||||||
|
{
|
||||||
|
return new DomainClassificationResult(MediaType.Video, "85po", "85PO", host);
|
||||||
|
}
|
||||||
if (string.Equals(host, "missav", StringComparison.OrdinalIgnoreCase) || host.Contains("missav"))
|
if (string.Equals(host, "missav", StringComparison.OrdinalIgnoreCase) || host.Contains("missav"))
|
||||||
{
|
{
|
||||||
return new DomainClassificationResult(MediaType.Video, "missav", "MissAV", host);
|
return new DomainClassificationResult(MediaType.Video, "missav", "MissAV", host);
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -1,3 +1,4 @@
|
|||||||
|
using System.Net;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using HtmlAgilityPack;
|
using HtmlAgilityPack;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
@@ -68,6 +69,10 @@ public class VideoEmbedExtractor
|
|||||||
resolvedItem = await ResolveMissAvAsync(trimmedUrl, ct);
|
resolvedItem = await ResolveMissAvAsync(trimmedUrl, ct);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case "85po":
|
||||||
|
resolvedItem = await this.Resolve85PoAsync(trimmedUrl, ct);
|
||||||
|
break;
|
||||||
|
|
||||||
case "spankbang":
|
case "spankbang":
|
||||||
resolvedItem = ResolveSpankBang(trimmedUrl);
|
resolvedItem = ResolveSpankBang(trimmedUrl);
|
||||||
break;
|
break;
|
||||||
@@ -193,73 +198,354 @@ public class VideoEmbedExtractor
|
|||||||
#region 各サイト別リゾルバー
|
#region 各サイト別リゾルバー
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// MissAV の埋め込み・HLSストリームを解決します。
|
/// 85PO (85po.com / 85ro.com / 85po.net) の動画および埋め込みプレイヤー情報を解決します。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private async Task<UnifiedVideoItem> ResolveMissAvAsync(string url, CancellationToken ct)
|
/// <param name="url">入力されたURLまたはID文字列</param>
|
||||||
|
/// <param name="ct">キャンセレーショントークン</param>
|
||||||
|
/// <returns>解決された統一動画情報</returns>
|
||||||
|
private async Task<UnifiedVideoItem> Resolve85PoAsync(string url, CancellationToken ct)
|
||||||
{
|
{
|
||||||
var match = Regex.Match(url, @"(?:missav\.[a-z]+/(?:ja/)?|missav/)(?<id>[^/?#]+)", RegexOptions.IgnoreCase);
|
// 1. URLから動画IDを抽出(例: /v/37405.html, /embed/37405, 37405 等)
|
||||||
var id = match.Success ? match.Groups["id"].Value : "video";
|
var matchId = Regex.Match(url, @"(?:/v/|/embed/|/videos/|^)(?<id>\d+)(?:\.html)?", RegexOptions.IgnoreCase);
|
||||||
|
string videoId = matchId.Success ? matchId.Groups["id"].Value : "";
|
||||||
|
|
||||||
var item = new UnifiedVideoItem
|
// ホスト名の取得(85po.com / 85ro.com / 85po.net)
|
||||||
|
string host = "www.85po.com";
|
||||||
|
if (Uri.TryCreate(url, UriKind.Absolute, out var parsedUri) && !string.IsNullOrWhiteSpace(parsedUri.Host))
|
||||||
{
|
{
|
||||||
Site = "missav",
|
host = parsedUri.Host.ToLowerInvariant();
|
||||||
VideoId = id,
|
}
|
||||||
Title = $"MissAV ({id})",
|
|
||||||
OriginalUrl = url
|
|
||||||
};
|
|
||||||
|
|
||||||
// HTMLを取得して Dean Edwards packer スクリプトおよび m3u8 を探索
|
// 言語プレフィックスの抽出 (/ja/, /en/ 等)
|
||||||
|
string langPrefix = "";
|
||||||
|
if (url.Contains("/ja/", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
langPrefix = "/ja";
|
||||||
|
}
|
||||||
|
else if (url.Contains("/en/", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
langPrefix = "/en";
|
||||||
|
}
|
||||||
|
|
||||||
|
// メタデータ取得用URLの決定
|
||||||
|
// 85POの公式埋め込みプレイヤーURLは言語プレフィックスなしの /embed/{id}
|
||||||
|
string targetFetchUrl = !string.IsNullOrEmpty(videoId)
|
||||||
|
? $"https://{host}/embed/{videoId}"
|
||||||
|
: (url.StartsWith("http", StringComparison.OrdinalIgnoreCase) ? url : $"https://{host}/");
|
||||||
|
string originalPageUrl = !string.IsNullOrEmpty(videoId)
|
||||||
|
? $"https://{host}{langPrefix}/v/{videoId}.html"
|
||||||
|
: url;
|
||||||
|
string? title = null;
|
||||||
|
string? posterUrl = null;
|
||||||
|
|
||||||
|
// 2. ページHTMLを取得してタイトル・サムネイルを抽出
|
||||||
|
// もし動画IDが抽出できていない場合、トップページ等と判定して先頭動画リンクを探索
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var html = await _httpHelper.GetHtmlAsync(url, ct: ct);
|
var html = await this._httpHelper.GetHtmlAsync(targetFetchUrl, useFlareSolverr: false, referer: $"https://{host}/", ct: ct);
|
||||||
if (!string.IsNullOrWhiteSpace(html))
|
if (!string.IsNullOrWhiteSpace(html))
|
||||||
{
|
{
|
||||||
|
var doc = new HtmlDocument();
|
||||||
|
doc.LoadHtml(html);
|
||||||
|
|
||||||
|
// ID未取得の場合、ページ内の動画リンクを探す
|
||||||
|
if (string.IsNullOrEmpty(videoId))
|
||||||
|
{
|
||||||
|
var linkNode = doc.DocumentNode.SelectSingleNode("//a[contains(@href, '/v/') and contains(@href, '.html')]");
|
||||||
|
if (linkNode != null)
|
||||||
|
{
|
||||||
|
var href = linkNode.GetAttributeValue("href", "");
|
||||||
|
var m = Regex.Match(href, @"/v/(?<id>\d+)\.html", RegexOptions.IgnoreCase);
|
||||||
|
if (m.Success)
|
||||||
|
{
|
||||||
|
videoId = m.Groups["id"].Value;
|
||||||
|
originalPageUrl = $"https://{host}/v/{videoId}.html";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// タイトル抽出
|
// タイトル抽出
|
||||||
var titleMatch = Regex.Match(html, @"<meta property=""og:title"" content=""([^""]+)""");
|
var ogTitle = doc.DocumentNode.SelectSingleNode("//meta[@property='og:title']")?.GetAttributeValue("content", null);
|
||||||
if (titleMatch.Success) item.Title = CleanText(titleMatch.Groups[1].Value);
|
if (!string.IsNullOrWhiteSpace(ogTitle))
|
||||||
|
|
||||||
// ポスター画像抽出
|
|
||||||
var posterMatch = Regex.Match(html, @"<meta property=""og:image"" content=""([^""]+)""");
|
|
||||||
if (posterMatch.Success) item.PosterUrl = posterMatch.Groups[1].Value;
|
|
||||||
|
|
||||||
// 1. surrit.com の直接m3u8探索
|
|
||||||
var directM3u8 = Regex.Match(html, @"https://surrit\.com/[a-f0-9\-]+/(?:playlist|\d+p/video)\.m3u8");
|
|
||||||
if (directM3u8.Success)
|
|
||||||
{
|
{
|
||||||
item.StreamUrl = directM3u8.Value;
|
title = WebUtility.HtmlDecode(ogTitle).Trim();
|
||||||
return item;
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
// 2. Dean Edwards Packer のアンパック試行
|
|
||||||
var packerMatch = Regex.Match(html, @"eval\(function\(p,a,c,k,e,d\)\{.+?\.split\('\|'\),\d+,\{\}\)\)");
|
|
||||||
if (packerMatch.Success)
|
|
||||||
{
|
{
|
||||||
var unpacked = UnpackDeanEdwards(packerMatch.Value);
|
var titleNode = doc.DocumentNode.SelectSingleNode("//title");
|
||||||
var m3u8Match = Regex.Match(unpacked, @"https://surrit\.com/[a-f0-9\-]+/(?:playlist|\d+p/video)\.m3u8");
|
if (titleNode != null)
|
||||||
if (m3u8Match.Success)
|
|
||||||
{
|
{
|
||||||
item.StreamUrl = m3u8Match.Value;
|
var rawTitle = WebUtility.HtmlDecode(titleNode.InnerText).Trim();
|
||||||
return item;
|
title = Regex.Replace(rawTitle, @"\s*[-|–]\s*85PO.*$", "", RegexOptions.IgnoreCase).Trim();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var mTitle = Regex.Match(html, @"video_title:\s*['""]([^'""]+)['""]", RegexOptions.IgnoreCase);
|
||||||
|
if (mTitle.Success)
|
||||||
|
{
|
||||||
|
title = WebUtility.HtmlDecode(mTitle.Groups[1].Value).Trim();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. 一般的な UUID パターンから surrit.com m3u8 を推測復元
|
// サムネイル抽出
|
||||||
var uuidMatch = Regex.Match(html, @"[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}");
|
var ogImage = doc.DocumentNode.SelectSingleNode("//meta[@property='og:image']")?.GetAttributeValue("content", null);
|
||||||
if (uuidMatch.Success)
|
if (!string.IsNullOrWhiteSpace(ogImage))
|
||||||
{
|
{
|
||||||
item.StreamUrl = $"https://surrit.com/{uuidMatch.Value}/playlist.m3u8";
|
posterUrl = ogImage.Trim();
|
||||||
return item;
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var mPreview = Regex.Match(html, @"preview_url:\s*['""]([^'""]+)['""]", RegexOptions.IgnoreCase);
|
||||||
|
if (mPreview.Success)
|
||||||
|
{
|
||||||
|
posterUrl = mPreview.Groups[1].Value.Trim();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogWarning(ex, "MissAV の HTML からの m3u8 抽出に失敗しました: {Url}", url);
|
this._logger.LogWarning(ex, "85PO HTMLの取得に失敗しました。フォールバックで構築します: {Url}", url);
|
||||||
|
}
|
||||||
|
|
||||||
|
// フォールバックIDの確定
|
||||||
|
if (string.IsNullOrEmpty(videoId))
|
||||||
|
{
|
||||||
|
videoId = "video";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(title))
|
||||||
|
{
|
||||||
|
title = $"85PO ({videoId})";
|
||||||
|
}
|
||||||
|
|
||||||
|
// サムネイルのフォールバック
|
||||||
|
if (string.IsNullOrWhiteSpace(posterUrl) && int.TryParse(videoId, out var numId))
|
||||||
|
{
|
||||||
|
int folderId = (numId / 1000) * 1000;
|
||||||
|
posterUrl = $"https://{host}/contents/videos_screenshots/{folderId}/{videoId}/preview.jpg";
|
||||||
|
}
|
||||||
|
|
||||||
|
var embedUrl = $"https://{host}/embed/{videoId}";
|
||||||
|
|
||||||
|
return new UnifiedVideoItem
|
||||||
|
{
|
||||||
|
Site = "85po",
|
||||||
|
VideoId = videoId,
|
||||||
|
Title = title,
|
||||||
|
OriginalUrl = originalPageUrl,
|
||||||
|
EmbedUrl = embedUrl,
|
||||||
|
PosterUrl = posterUrl
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// MissAV の埋め込み・HLSストリームを解決します。
|
||||||
|
/// Cloudflare保護を通過し、surrit.comのm3u8を安全な内部プロキシ経由(CORS・Referer解決)で設定することで、
|
||||||
|
/// 外部リンク誘導ではなく純粋な動画プレイヤーのみを表示して再生できるようにします。
|
||||||
|
/// </summary>
|
||||||
|
private async Task<UnifiedVideoItem> ResolveMissAvAsync(string url, CancellationToken ct)
|
||||||
|
{
|
||||||
|
var videoId = ExtractMissAvId(url) ?? "fc2-ppv-4968519";
|
||||||
|
var canonicalUrl = url.Trim();
|
||||||
|
if (!canonicalUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase) ||
|
||||||
|
canonicalUrl.EndsWith("missav.ai", StringComparison.OrdinalIgnoreCase) ||
|
||||||
|
canonicalUrl.EndsWith("missav.ai/", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
canonicalUrl = $"https://missav.ai/ja/{videoId}";
|
||||||
|
}
|
||||||
|
|
||||||
|
var item = new UnifiedVideoItem
|
||||||
|
{
|
||||||
|
Site = "missav",
|
||||||
|
VideoId = videoId,
|
||||||
|
Title = $"MissAV ({videoId})",
|
||||||
|
OriginalUrl = canonicalUrl
|
||||||
|
};
|
||||||
|
|
||||||
|
// 1. 通常HTTPで取得を試み、Cloudflareチャレンジまたはエラー時はFlareSolverr経由で再取得
|
||||||
|
string? html = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
html = await this._httpHelper.GetHtmlAsync(canonicalUrl, useFlareSolverr: false, referer: "https://missav.ai/", ct: ct);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
this._logger.LogInformation(ex, "MissAVの通常HTTP取得に失敗しました。FlareSolverrを試行します: {Url}", canonicalUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(html) || UnifiedEmbedSanitizer.IsCloudflareChallengeHtml(html))
|
||||||
|
{
|
||||||
|
this._logger.LogInformation("MissAVがCloudflare保護下のためFlareSolverr経由で再取得します: {Url}", canonicalUrl);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
html = await this._httpHelper.GetHtmlAsync(canonicalUrl, useFlareSolverr: true, referer: "https://missav.ai/", ct: ct);
|
||||||
|
}
|
||||||
|
catch (Exception flareEx)
|
||||||
|
{
|
||||||
|
this._logger.LogWarning(flareEx, "MissAVのFlareSolverr取得に失敗しました: {Url}", canonicalUrl);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(html))
|
||||||
|
{
|
||||||
|
// HTMLが取得できない場合でも、外部リンク誘導ボタンではなくインライン埋め込み用としてEmbedUrlをセット
|
||||||
|
item.EmbedUrl = canonicalUrl;
|
||||||
|
return item;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// タイトル抽出 (og:title または title タグ)
|
||||||
|
var titleMatch = Regex.Match(html, @"<meta\s+property=[""']og:title[""']\s+content=[""']([^""']+)[""']", RegexOptions.IgnoreCase);
|
||||||
|
if (titleMatch.Success)
|
||||||
|
{
|
||||||
|
item.Title = CleanText(System.Net.WebUtility.HtmlDecode(titleMatch.Groups[1].Value));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var docTitleMatch = Regex.Match(html, @"<title>([^<]+)</title>", RegexOptions.IgnoreCase);
|
||||||
|
if (docTitleMatch.Success)
|
||||||
|
{
|
||||||
|
item.Title = CleanText(System.Net.WebUtility.HtmlDecode(docTitleMatch.Groups[1].Value));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ポスター画像抽出 (og:image)
|
||||||
|
var posterMatch = Regex.Match(html, @"<meta\s+property=[""']og:image[""']\s+content=[""']([^""']+)[""']", RegexOptions.IgnoreCase);
|
||||||
|
if (posterMatch.Success)
|
||||||
|
{
|
||||||
|
item.PosterUrl = posterMatch.Groups[1].Value;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
item.PosterUrl = $"https://fourhoi.com/{videoId}/cover-n.jpg";
|
||||||
|
}
|
||||||
|
|
||||||
|
string? rawStreamUrl = null;
|
||||||
|
|
||||||
|
// 1. Dean Edwards Packer のアンパック試行 (複数ある場合も走査)
|
||||||
|
var packerMatches = Regex.Matches(html, @"eval\(function\(p,a,c,k,e,d\)\{.+?\.split\('\|'\),\d+,\{\}\)\)", RegexOptions.Singleline);
|
||||||
|
foreach (Match pm in packerMatches)
|
||||||
|
{
|
||||||
|
var unpacked = UnpackDeanEdwards(pm.Value);
|
||||||
|
if (!string.IsNullOrEmpty(unpacked))
|
||||||
|
{
|
||||||
|
unpacked = unpacked.Replace("\\", "");
|
||||||
|
var m3u8Match = Regex.Match(unpacked, @"https://surrit\.com/[a-f0-9\-]+/(?:playlist|\d+p/video)\.m3u8", RegexOptions.IgnoreCase);
|
||||||
|
if (m3u8Match.Success)
|
||||||
|
{
|
||||||
|
rawStreamUrl = m3u8Match.Value;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. surrit.com の直接m3u8探索
|
||||||
|
if (string.IsNullOrEmpty(rawStreamUrl))
|
||||||
|
{
|
||||||
|
var directM3u8 = Regex.Match(html, @"https://surrit\.com/[a-f0-9\-]+/(?:playlist|\d+p/video)\.m3u8", RegexOptions.IgnoreCase);
|
||||||
|
if (directM3u8.Success)
|
||||||
|
{
|
||||||
|
rawStreamUrl = directM3u8.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. 一般的な UUID パターンから surrit.com m3u8 を推測復元
|
||||||
|
if (string.IsNullOrEmpty(rawStreamUrl))
|
||||||
|
{
|
||||||
|
var uuidMatch = Regex.Match(html, @"[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}", RegexOptions.IgnoreCase);
|
||||||
|
if (uuidMatch.Success)
|
||||||
|
{
|
||||||
|
rawStreamUrl = $"https://surrit.com/{uuidMatch.Value}/playlist.m3u8";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. ストリームURLが抽出された場合、内部プロキシ経由のURLに変換
|
||||||
|
if (!string.IsNullOrWhiteSpace(rawStreamUrl))
|
||||||
|
{
|
||||||
|
// surrit.com は Referer: https://missav.ai/ が必須かつブラウザ直接アクセスでは CORS 制限があるため、
|
||||||
|
// WebImageViewer のプロキシ (/api/proxy-embed-req) 経由にルーティング
|
||||||
|
item.StreamUrl = $"/api/proxy-embed-req?url={Uri.EscapeDataString(rawStreamUrl)}&referer={Uri.EscapeDataString(canonicalUrl)}";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// m3u8が抽出できなかった場合でも、外部リンク誘導を回避するためEmbedUrlにセット
|
||||||
|
item.EmbedUrl = canonicalUrl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
this._logger.LogWarning(ex, "MissAV の HTML からの m3u8 抽出に失敗しました: {Url}", canonicalUrl);
|
||||||
|
item.EmbedUrl = canonicalUrl;
|
||||||
}
|
}
|
||||||
|
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 入力URLまたは識別文字列からMissAVの動画IDを抽出します。
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="url">入力URLまたはID文字列</param>
|
||||||
|
/// <returns>抽出された動画ID。判定できない場合は null</returns>
|
||||||
|
private static string? ExtractMissAvId(string url)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(url))
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var clean = url.Trim();
|
||||||
|
|
||||||
|
// 1. missav.ai/{lang}/{id} や missav/{id} 等の正規表現マッチング
|
||||||
|
var match = Regex.Match(
|
||||||
|
clean,
|
||||||
|
@"(?:missav\.[a-z]+(?:/dm\d+)?/(?:(?:ja|en|cn|zh|zh-Hant|zh-Hans|ko|ms|th|de|fr|vi|es|it|ru|pt)/)?|^missav/)(?<id>[^/?#]+)",
|
||||||
|
RegexOptions.IgnoreCase);
|
||||||
|
|
||||||
|
if (match.Success)
|
||||||
|
{
|
||||||
|
var id = match.Groups["id"].Value.Trim().TrimEnd('/');
|
||||||
|
if (!IsMissAvReservedWord(id))
|
||||||
|
{
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. URI パスセグメントからの抽出フォールバック
|
||||||
|
if (Uri.TryCreate(clean, UriKind.Absolute, out var uri))
|
||||||
|
{
|
||||||
|
var segments = uri.AbsolutePath.Trim('/').Split('/', StringSplitOptions.RemoveEmptyEntries);
|
||||||
|
if (segments.Length > 0)
|
||||||
|
{
|
||||||
|
var last = segments[^1].Trim();
|
||||||
|
if (!IsMissAvReservedWord(last))
|
||||||
|
{
|
||||||
|
return last;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 指定されたパスセグメントが言語コードやプレフィックス等の予約語であるかを判定します。
|
||||||
|
/// </summary>
|
||||||
|
private static bool IsMissAvReservedWord(string segment)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(segment))
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
var lower = segment.ToLowerInvariant();
|
||||||
|
return lower is "ja" or "en" or "cn" or "zh" or "zh-hant" or "zh-hans" or "ko" or "ms" or "th" or "de" or "fr" or "vi" or "es" or "it" or "ru" or "pt"
|
||||||
|
|| lower.StartsWith("dm", StringComparison.Ordinal)
|
||||||
|
|| lower is "video" or "sample" or "search" or "genres" or "actresses" or "makers" or "directors" or "tags";
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// SpankBang の公式埋め込みプレイヤーを解決します。
|
/// SpankBang の公式埋め込みプレイヤーを解決します。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -280,8 +566,13 @@ public class VideoEmbedExtractor
|
|||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 123av の埋め込みプレイヤーを動的解決します。
|
/// 123av の埋め込みプレイヤーを動的解決します。
|
||||||
/// ページHTML内の player(JSON.parse(...)) から最新の埋め込みプレイヤーURL(jav-master等)を抽出します。
|
/// ページHTML内の player(JSON.parse(...)) 等から最新の埋め込みプレイヤーURL(jav-master等)を抽出し、
|
||||||
|
/// 定期的に出現する透明なリンクエリア(オーバーレイ広告)および外部リンク処理を除去するクリーン埋め込みURLに変換します。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <param name="url">対象ページのURL</param>
|
||||||
|
/// <param name="customPlayUrl">明示指定された再生URL(任意)</param>
|
||||||
|
/// <param name="ct">キャンセルトークン</param>
|
||||||
|
/// <returns>解決された動画アイテム</returns>
|
||||||
private async Task<UnifiedVideoItem> Resolve123AvAsync(string url, string? customPlayUrl = null, CancellationToken ct = default)
|
private async Task<UnifiedVideoItem> Resolve123AvAsync(string url, string? customPlayUrl = null, CancellationToken ct = default)
|
||||||
{
|
{
|
||||||
// 0. 直接 jav-master 等の埋め込みプレイヤーURLが指定された場合の即時対応
|
// 0. 直接 jav-master 等の埋め込みプレイヤーURLが指定された場合の即時対応
|
||||||
@@ -295,7 +586,7 @@ public class VideoEmbedExtractor
|
|||||||
VideoId = vId,
|
VideoId = vId,
|
||||||
Title = $"123av 動画 ({vId})",
|
Title = $"123av 動画 ({vId})",
|
||||||
OriginalUrl = url,
|
OriginalUrl = url,
|
||||||
EmbedUrl = url
|
EmbedUrl = UnifiedEmbedSanitizer.ToCleanEmbedUrl(url, "https://123av.com/")
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -356,7 +647,22 @@ public class VideoEmbedExtractor
|
|||||||
// 2. 123av 公式ページHTMLを取得して実プレイヤーURLおよびタイトル・サムネイルを動的抽出
|
// 2. 123av 公式ページHTMLを取得して実プレイヤーURLおよびタイトル・サムネイルを動的抽出
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var html = await _httpHelper.GetHtmlAsync(canonicalUrl, ct: ct);
|
string? html = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
html = await this._httpHelper.GetHtmlAsync(canonicalUrl, useFlareSolverr: false, ct: ct);
|
||||||
|
if (string.IsNullOrWhiteSpace(html) ||
|
||||||
|
html.Contains("<title>Just a moment...</title>", StringComparison.OrdinalIgnoreCase) ||
|
||||||
|
(html.Contains("challenge-platform", StringComparison.OrdinalIgnoreCase) && !html.Contains("watch__title", StringComparison.OrdinalIgnoreCase)))
|
||||||
|
{
|
||||||
|
html = await this._httpHelper.GetHtmlAsync(canonicalUrl, useFlareSolverr: true, ct: ct);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
html = await this._httpHelper.GetHtmlAsync(canonicalUrl, useFlareSolverr: true, ct: ct);
|
||||||
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(html))
|
if (!string.IsNullOrWhiteSpace(html))
|
||||||
{
|
{
|
||||||
// タイトル抽出
|
// タイトル抽出
|
||||||
@@ -368,7 +674,10 @@ public class VideoEmbedExtractor
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
var ogTitle = Regex.Match(html, @"<meta property=""og:title"" content=""([^""]+)""");
|
var ogTitle = Regex.Match(html, @"<meta property=""og:title"" content=""([^""]+)""");
|
||||||
if (ogTitle.Success) item.Title = CleanText(ogTitle.Groups[1].Value);
|
if (ogTitle.Success)
|
||||||
|
{
|
||||||
|
item.Title = CleanText(ogTitle.Groups[1].Value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ポスター画像抽出
|
// ポスター画像抽出
|
||||||
@@ -380,15 +689,18 @@ public class VideoEmbedExtractor
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
var coverMatch = Regex.Match(html, @"(https?://[^""']+/cover\.jpg[^""']*)");
|
var coverMatch = Regex.Match(html, @"(https?://[^""']+/cover\.jpg[^""']*)");
|
||||||
if (coverMatch.Success) item.PosterUrl = coverMatch.Groups[1].Value;
|
if (coverMatch.Success)
|
||||||
|
{
|
||||||
|
item.PosterUrl = coverMatch.Groups[1].Value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// player(JSON.parse('...')) から jav-master 等の埋め込みURLを抽出
|
// (A) player(JSON.parse('...')) から jav-master 等の埋め込みURLを抽出
|
||||||
var playerJsonMatch = Regex.Match(html, @"player\(JSON\.parse\('(?<json>[^']+)'\)");
|
var playerJsonMatch = Regex.Match(html, @"player\(JSON\.parse\('(?<json>[^']+)'\)");
|
||||||
if (playerJsonMatch.Success)
|
if (playerJsonMatch.Success)
|
||||||
{
|
{
|
||||||
var rawJson = playerJsonMatch.Groups["json"].Value;
|
var rawJson = playerJsonMatch.Groups["json"].Value;
|
||||||
rawJson = System.Text.RegularExpressions.Regex.Unescape(rawJson);
|
rawJson = Regex.Unescape(rawJson);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using var doc = System.Text.Json.JsonDocument.Parse(rawJson);
|
using var doc = System.Text.Json.JsonDocument.Parse(rawJson);
|
||||||
@@ -410,11 +722,35 @@ public class VideoEmbedExtractor
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogWarning(ex, "123av の player JSON 解析エラー: {Json}", rawJson);
|
this._logger.LogWarning(ex, "123av の player JSON 解析エラー: {Json}", rawJson);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// JSONで見つからなかった場合、iframeタグのsrcをフォールバック探索
|
// (B) v-scope="Movie({id: ...})" から ajax/v/{movieId}/videos 経由で埋め込みURLを抽出
|
||||||
|
if (string.IsNullOrWhiteSpace(item.EmbedUrl))
|
||||||
|
{
|
||||||
|
var movieScopeMatch = Regex.Match(html, @"v-scope=""Movie\(\{[^""]*?\bid\s*:\s*(?<movieId>\d+)", RegexOptions.IgnoreCase);
|
||||||
|
if (movieScopeMatch.Success)
|
||||||
|
{
|
||||||
|
var movieId = movieScopeMatch.Groups["movieId"].Value;
|
||||||
|
var ajaxUrl = $"https://123av.com/ja/ajax/v/{movieId}/videos";
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var ajaxJson = await this._httpHelper.GetHtmlAsync(ajaxUrl, useFlareSolverr: false, referer: canonicalUrl, ct: ct);
|
||||||
|
var ajaxUrlMatch = Regex.Match(ajaxJson, @"""url""\s*:\s*""(?<uUrl>https?:[^""]+)""");
|
||||||
|
if (ajaxUrlMatch.Success)
|
||||||
|
{
|
||||||
|
item.EmbedUrl = ajaxUrlMatch.Groups["uUrl"].Value.Replace(@"\/", "/");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ajaxEx)
|
||||||
|
{
|
||||||
|
this._logger.LogDebug(ajaxEx, "123av ajax/v/{MovieId}/videos の取得に失敗しました", movieId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// (C) JSONで見つからなかった場合、iframeタグのsrcをフォールバック探索
|
||||||
if (string.IsNullOrWhiteSpace(item.EmbedUrl))
|
if (string.IsNullOrWhiteSpace(item.EmbedUrl))
|
||||||
{
|
{
|
||||||
var iframeMatch = Regex.Match(html, @"<iframe[^>]+src=""([^""]+)""");
|
var iframeMatch = Regex.Match(html, @"<iframe[^>]+src=""([^""]+)""");
|
||||||
@@ -427,7 +763,7 @@ public class VideoEmbedExtractor
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogWarning(ex, "123av ページ({Url})の取得に失敗しました。フォールバック処理を継続します。", canonicalUrl);
|
this._logger.LogWarning(ex, "123av ページ({Url})の取得に失敗しました。フォールバック処理を継続します。", canonicalUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
// customPlayUrl が指定されていて HTML から埋め込みが取得できなかった場合は customPlayUrl を確実に採用
|
// customPlayUrl が指定されていて HTML から埋め込みが取得できなかった場合は customPlayUrl を確実に採用
|
||||||
@@ -436,6 +772,12 @@ public class VideoEmbedExtractor
|
|||||||
item.EmbedUrl = customPlayUrl;
|
item.EmbedUrl = customPlayUrl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 3. 123av接続時は、定期的に出現する透明なリンクエリア(オーバーレイ広告)および外部リンク処理を除去するクリーン埋め込みURLに変換
|
||||||
|
if (!string.IsNullOrWhiteSpace(item.EmbedUrl))
|
||||||
|
{
|
||||||
|
item.EmbedUrl = UnifiedEmbedSanitizer.ToCleanEmbedUrl(item.EmbedUrl, canonicalUrl);
|
||||||
|
}
|
||||||
|
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Runtime.Versioning;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using WebImageViewer.Class.Unified.Common;
|
using WebImageViewer.Class.Unified.Common;
|
||||||
using WebImageViewer.Class.Unified.Scrapers;
|
using WebImageViewer.Class.Unified.Scrapers;
|
||||||
@@ -5,15 +7,30 @@ using WebImageViewer.Class.Unified.Services;
|
|||||||
|
|
||||||
namespace WebImageViewer.Class.Unified;
|
namespace WebImageViewer.Class.Unified;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 新アーキテクチャ(Unified)用のDIサービス登録拡張クラス
|
||||||
|
/// </summary>
|
||||||
public static class UnifiedServiceExtensions
|
public static class UnifiedServiceExtensions
|
||||||
{
|
{
|
||||||
|
#region □メソッド(Public)
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 新アーキテクチャ(Unified)のサービス群をDIコンテナに登録します。
|
/// 新アーキテクチャ(Unified)のサービス群をDIコンテナに登録します。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <param name="services">サービスコレクション</param>
|
||||||
|
/// <returns>登録後のサービスコレクション</returns>
|
||||||
public static IServiceCollection AddUnifiedServices(this IServiceCollection services)
|
public static IServiceCollection AddUnifiedServices(this IServiceCollection services)
|
||||||
{
|
{
|
||||||
// HTTP通信ヘルパー
|
// HTTP通信ヘルパー(Cloudflare TLSフィンガープリント対策としてWindows環境ではWinHttpHandlerを適用)
|
||||||
|
if (OperatingSystem.IsWindows())
|
||||||
|
{
|
||||||
|
services.AddHttpClient<UnifiedHttpHelper>()
|
||||||
|
.ConfigurePrimaryHttpMessageHandler(CreateWinHttpHandler);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
services.AddHttpClient<UnifiedHttpHelper>();
|
services.AddHttpClient<UnifiedHttpHelper>();
|
||||||
|
}
|
||||||
|
|
||||||
// 画像スクレイパー群
|
// 画像スクレイパー群
|
||||||
services.AddScoped<IUnifiedScraper, UnifiedHitomiScraper>();
|
services.AddScoped<IUnifiedScraper, UnifiedHitomiScraper>();
|
||||||
@@ -23,6 +40,9 @@ public static class UnifiedServiceExtensions
|
|||||||
services.AddScoped<IUnifiedScraper, UnifiedAuraHentaiScraper>();
|
services.AddScoped<IUnifiedScraper, UnifiedAuraHentaiScraper>();
|
||||||
services.AddScoped<IUnifiedScraper, UnifiedMangalearScraper>();
|
services.AddScoped<IUnifiedScraper, UnifiedMangalearScraper>();
|
||||||
|
|
||||||
|
// 123av等の透明リンクエリア・外部広告除去サニタイザー
|
||||||
|
services.AddScoped<UnifiedEmbedSanitizer>();
|
||||||
|
|
||||||
// 動画埋め込み抽出エンジン
|
// 動画埋め込み抽出エンジン
|
||||||
services.AddScoped<VideoEmbedExtractor>();
|
services.AddScoped<VideoEmbedExtractor>();
|
||||||
|
|
||||||
@@ -31,4 +51,23 @@ public static class UnifiedServiceExtensions
|
|||||||
|
|
||||||
return services;
|
return services;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region □メソッド(Private)
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Windows環境専用のWinHttpHandlerインスタンスを生成・構成します。
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>構成済みのHttpMessageHandler</returns>
|
||||||
|
[SupportedOSPlatform("windows")]
|
||||||
|
private static HttpMessageHandler CreateWinHttpHandler()
|
||||||
|
{
|
||||||
|
return new WinHttpHandler
|
||||||
|
{
|
||||||
|
AutomaticDecompression = DecompressionMethods.All
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
}
|
}
|
||||||
+235
-2
@@ -1,3 +1,4 @@
|
|||||||
|
using System.IO.Compression;
|
||||||
using Microsoft.AspNetCore.HttpOverrides;
|
using Microsoft.AspNetCore.HttpOverrides;
|
||||||
using WebImageViewer.Class.Legacy;
|
using WebImageViewer.Class.Legacy;
|
||||||
using WebImageViewer.Class.Unified;
|
using WebImageViewer.Class.Unified;
|
||||||
@@ -46,7 +47,7 @@ app.UseForwardedHeaders();
|
|||||||
// ==========================================
|
// ==========================================
|
||||||
// 統一アクセス方式 (/?url=[各ページURL])
|
// 統一アクセス方式 (/?url=[各ページURL])
|
||||||
// ==========================================
|
// ==========================================
|
||||||
app.MapGet("/", async (string? url, string? play, string? stream, UnifiedViewerService viewerService, CancellationToken ct) =>
|
app.MapGet("/", async (string? url, string? play, string? stream, string? view, UnifiedViewerService viewerService, CancellationToken ct) =>
|
||||||
{
|
{
|
||||||
// URLパラメータが未指定(かつplay/streamも未指定)の場合は統一トップページを表示
|
// URLパラメータが未指定(かつplay/streamも未指定)の場合は統一トップページを表示
|
||||||
if (string.IsNullOrWhiteSpace(url) && string.IsNullOrWhiteSpace(play) && string.IsNullOrWhiteSpace(stream))
|
if (string.IsNullOrWhiteSpace(url) && string.IsNullOrWhiteSpace(play) && string.IsNullOrWhiteSpace(stream))
|
||||||
@@ -71,9 +72,13 @@ app.MapGet("/", async (string? url, string? play, string? stream, UnifiedViewerS
|
|||||||
return Results.Content(UnifiedHtmlRenderer.RenderVideoViewer(result.Video), "text/html; charset=utf-8");
|
return Results.Content(UnifiedHtmlRenderer.RenderVideoViewer(result.Video), "text/html; charset=utf-8");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 画像の場合はギャラリービューアー画面を同一URLのままレンダリング
|
// 画像の場合はギャラリービューアー画面またはサムネイル一覧画面をレンダリング
|
||||||
if (result.Type == MediaType.Gallery && result.Gallery != null)
|
if (result.Type == MediaType.Gallery && result.Gallery != null)
|
||||||
{
|
{
|
||||||
|
if (string.Equals(view, "thumbnails", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return Results.Content(UnifiedHtmlRenderer.RenderThumbnailGridPage(result.Gallery), "text/html; charset=utf-8");
|
||||||
|
}
|
||||||
return Results.Content(UnifiedHtmlRenderer.RenderGalleryViewer(result.Gallery), "text/html; charset=utf-8");
|
return Results.Content(UnifiedHtmlRenderer.RenderGalleryViewer(result.Gallery), "text/html; charset=utf-8");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,6 +88,131 @@ app.MapGet("/", async (string? url, string? play, string? stream, UnifiedViewerS
|
|||||||
statusCode: 404);
|
statusCode: 404);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// 全ページサムネイル一覧画面エンドポイント
|
||||||
|
// ==========================================
|
||||||
|
app.MapGet("/thumbnails", async (string? url, UnifiedViewerService viewerService, CancellationToken ct) =>
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(url))
|
||||||
|
{
|
||||||
|
return Results.Redirect("/");
|
||||||
|
}
|
||||||
|
|
||||||
|
var result = await viewerService.ResolveAsync(url, null, null, ct);
|
||||||
|
if (!result.IsSuccess || result.Gallery == null)
|
||||||
|
{
|
||||||
|
return Results.Content(
|
||||||
|
UnifiedHtmlRenderer.RenderErrorPage(result.ErrorMessage ?? "ギャラリーを読み込めませんでした。", result.StatusCode),
|
||||||
|
"text/html; charset=utf-8",
|
||||||
|
statusCode: result.StatusCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Results.Content(UnifiedHtmlRenderer.RenderThumbnailGridPage(result.Gallery), "text/html; charset=utf-8");
|
||||||
|
});
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// 全ページZIP一括ダウンロードAPI
|
||||||
|
// ==========================================
|
||||||
|
app.MapGet("/api/download-zip", async (
|
||||||
|
string url,
|
||||||
|
UnifiedViewerService viewerService,
|
||||||
|
UnifiedHttpHelper httpHelper,
|
||||||
|
HttpContext httpContext,
|
||||||
|
ILoggerFactory loggerFactory,
|
||||||
|
CancellationToken ct) =>
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(url))
|
||||||
|
{
|
||||||
|
return Results.BadRequest("URL is required");
|
||||||
|
}
|
||||||
|
|
||||||
|
var logger = loggerFactory.CreateLogger("ZipDownload");
|
||||||
|
var result = await viewerService.ResolveAsync(url, null, null, ct);
|
||||||
|
if (!result.IsSuccess || result.Gallery == null || result.Gallery.Images.Count == 0)
|
||||||
|
{
|
||||||
|
return Results.NotFound(new { error = result.ErrorMessage ?? "ギャラリー画像を取得できませんでした。" });
|
||||||
|
}
|
||||||
|
|
||||||
|
var gallery = result.Gallery;
|
||||||
|
|
||||||
|
// ファイル名として使用できない文字を除去
|
||||||
|
var invalidChars = Path.GetInvalidFileNameChars();
|
||||||
|
var cleanTitle = string.Concat(gallery.Title.Select(c => invalidChars.Contains(c) ? '_' : c)).Trim();
|
||||||
|
if (string.IsNullOrWhiteSpace(cleanTitle)) cleanTitle = "gallery";
|
||||||
|
var zipFileName = $"{cleanTitle}.zip";
|
||||||
|
|
||||||
|
httpContext.Response.ContentType = "application/zip";
|
||||||
|
httpContext.Response.Headers.ContentDisposition = $"attachment; filename=\"{Uri.EscapeDataString(zipFileName)}\"; filename*=UTF-8''{Uri.EscapeDataString(zipFileName)}";
|
||||||
|
|
||||||
|
// サーバーメモリを圧迫しないよう一時ファイルを使用して安全にZIPストリーミング生成
|
||||||
|
var tempZipPath = Path.GetTempFileName();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using (var fileStream = new FileStream(tempZipPath, FileMode.Create, FileAccess.ReadWrite, FileShare.None, 4096, FileOptions.DeleteOnClose))
|
||||||
|
{
|
||||||
|
using (var archive = new ZipArchive(fileStream, ZipArchiveMode.Create, leaveOpen: true))
|
||||||
|
{
|
||||||
|
// 最大4並列で各ページの画像データを取得
|
||||||
|
using var semaphore = new SemaphoreSlim(4);
|
||||||
|
var downloadTasks = gallery.Images.Select(async img =>
|
||||||
|
{
|
||||||
|
await semaphore.WaitAsync(ct);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var (data, contentType) = await FetchImageBytesForZipAsync(img.ImageUrl, gallery.SourceUrl, httpHelper, ct);
|
||||||
|
return (img.PageNumber, img.ImageUrl, Data: data, ContentType: contentType);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
semaphore.Release();
|
||||||
|
}
|
||||||
|
}).ToList();
|
||||||
|
|
||||||
|
var downloadResults = await Task.WhenAll(downloadTasks);
|
||||||
|
|
||||||
|
foreach (var item in downloadResults.OrderBy(r => r.PageNumber))
|
||||||
|
{
|
||||||
|
if (item.Data == null || item.Data.Length == 0)
|
||||||
|
{
|
||||||
|
logger.LogWarning("ページ {Page} の画像ダウンロードをスキップしました (データなし)", item.PageNumber);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var ext = DetermineImageExtensionForZip(item.ContentType, item.ImageUrl);
|
||||||
|
var entryName = $"{item.PageNumber:D3}{ext}";
|
||||||
|
var entry = archive.CreateEntry(entryName, CompressionLevel.Fastest);
|
||||||
|
|
||||||
|
using var entryStream = entry.Open();
|
||||||
|
await entryStream.WriteAsync(item.Data, ct);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fileStream.Position = 0;
|
||||||
|
await fileStream.CopyToAsync(httpContext.Response.Body, ct);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Results.Empty;
|
||||||
|
}
|
||||||
|
catch (OperationCanceledException)
|
||||||
|
{
|
||||||
|
logger.LogInformation("ZIPダウンロードがクライアントによりキャンセルされました: {Url}", url);
|
||||||
|
return Results.Empty;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "ZIPアーカイブ生成エラー: {Url}", url);
|
||||||
|
return Results.Problem(detail: ex.Message, statusCode: 500);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
if (File.Exists(tempZipPath))
|
||||||
|
{
|
||||||
|
try { File.Delete(tempZipPath); } catch { }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// ==========================================
|
// ==========================================
|
||||||
// 画像プロキシAPI (Referer制限回避・高速キャッシュ配信)
|
// 画像プロキシAPI (Referer制限回避・高速キャッシュ配信)
|
||||||
// ==========================================
|
// ==========================================
|
||||||
@@ -114,10 +244,113 @@ app.MapGet("/api/proxy-image", async (string url, string? referer, HttpContext h
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// 123av等の動画プレイヤー透明リンクエリア・外部リンク除去プロキシAPI
|
||||||
|
// ==========================================
|
||||||
|
app.MapGet("/api/clean-embed", async (string? url, string? referer, UnifiedEmbedSanitizer embedSanitizer, CancellationToken ct) =>
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(url))
|
||||||
|
{
|
||||||
|
return Results.BadRequest("url is required");
|
||||||
|
}
|
||||||
|
|
||||||
|
var sanitizedHtml = await embedSanitizer.GetSanitizedEmbedHtmlAsync(url, referer, ct);
|
||||||
|
return Results.Content(sanitizedHtml, "text/html; charset=utf-8");
|
||||||
|
});
|
||||||
|
|
||||||
|
app.MapMethods("/api/proxy-embed-req", new[] { "GET", "POST", "HEAD" }, async (string? url, string? referer, HttpContext httpContext, UnifiedEmbedSanitizer embedSanitizer, CancellationToken ct) =>
|
||||||
|
{
|
||||||
|
return await embedSanitizer.ProxyEmbedRequestAsync(httpContext, url, referer, ct);
|
||||||
|
});
|
||||||
|
|
||||||
// ==========================================
|
// ==========================================
|
||||||
// 旧バージョン(Legacy)のエンドポイント登録
|
// 旧バージョン(Legacy)のエンドポイント登録
|
||||||
// (/view, /video, /{site}/{id}, /spankbang/{id}, 旧API等を過去互換用として保持)
|
// (/view, /video, /{site}/{id}, /spankbang/{id}, 旧API等を過去互換用として保持)
|
||||||
// ==========================================
|
// ==========================================
|
||||||
app.MapLegacyEndpoints();
|
app.MapLegacyEndpoints();
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// ZIPダウンロード用画像バイナリ取得ヘルパー
|
||||||
|
// ==========================================
|
||||||
|
static async Task<(byte[]? Data, string? ContentType)> FetchImageBytesForZipAsync(
|
||||||
|
string imageUrl,
|
||||||
|
string defaultReferer,
|
||||||
|
UnifiedHttpHelper httpHelper,
|
||||||
|
CancellationToken ct)
|
||||||
|
{
|
||||||
|
string targetUrl = imageUrl;
|
||||||
|
string? targetReferer = defaultReferer;
|
||||||
|
|
||||||
|
// /api/proxy-image?... 形式の場合は内部パラメータを展開して直接取得
|
||||||
|
if (imageUrl.StartsWith("/api/proxy-image", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
var qIndex = imageUrl.IndexOf('?');
|
||||||
|
if (qIndex >= 0)
|
||||||
|
{
|
||||||
|
var qs = Microsoft.AspNetCore.WebUtilities.QueryHelpers.ParseQuery(imageUrl.Substring(qIndex));
|
||||||
|
if (qs.TryGetValue("url", out var u) && !string.IsNullOrEmpty(u))
|
||||||
|
{
|
||||||
|
targetUrl = u.ToString();
|
||||||
|
}
|
||||||
|
if (qs.TryGetValue("referer", out var r) && !string.IsNullOrEmpty(r))
|
||||||
|
{
|
||||||
|
targetReferer = r.ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 最大3回リトライを行い、一時的なネットワーク揺らぎによるページ抜けを徹底防止
|
||||||
|
for (int attempt = 1; attempt <= 3; attempt++)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var (data, contentType) = await httpHelper.GetBinaryAsync(targetUrl, targetReferer, ct);
|
||||||
|
if (data != null && data.Length > 0)
|
||||||
|
{
|
||||||
|
return (data, contentType);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (OperationCanceledException)
|
||||||
|
{
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
if (attempt == 3) break;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await Task.Delay(attempt * 1000, ct);
|
||||||
|
}
|
||||||
|
catch (OperationCanceledException)
|
||||||
|
{
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
static string DetermineImageExtensionForZip(string? contentType, string imageUrl)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrWhiteSpace(contentType))
|
||||||
|
{
|
||||||
|
var ctLower = contentType.ToLowerInvariant();
|
||||||
|
if (ctLower.Contains("png")) return ".png";
|
||||||
|
if (ctLower.Contains("webp")) return ".webp";
|
||||||
|
if (ctLower.Contains("gif")) return ".gif";
|
||||||
|
if (ctLower.Contains("jpeg") || ctLower.Contains("jpg")) return ".jpg";
|
||||||
|
if (ctLower.Contains("avif")) return ".avif";
|
||||||
|
}
|
||||||
|
|
||||||
|
var cleanUrl = imageUrl.Split('?')[0];
|
||||||
|
var ext = Path.GetExtension(cleanUrl);
|
||||||
|
if (!string.IsNullOrWhiteSpace(ext) && ext.Length <= 5)
|
||||||
|
{
|
||||||
|
return ext.ToLowerInvariant();
|
||||||
|
}
|
||||||
|
|
||||||
|
return ".jpg";
|
||||||
|
}
|
||||||
|
|
||||||
app.Run();
|
app.Run();
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net10.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
@@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="HtmlAgilityPack" Version="1.13.0" />
|
<PackageReference Include="HtmlAgilityPack" Version="1.13.0" />
|
||||||
|
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="10.0.14" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
Reference in new issue
Block a user