Refactor downloaders to use ByteDocument and add options builders
Replaces generic RawType with ByteDocument in downloaders and context classes, simplifying type usage. Adds builder classes for FailurePredicateOptions, FragmentOptions, SkipPredicateOptions, and UnitDownloaderOptions to improve configuration flexibility. Introduces DownloadTarget enum and SkipPredicate delegate for more granular download control. Refactors Fluent API interfaces and implementations to remove RawType generics and streamline usage. Adds Playwright and Stealth download strategies for extensibility.
This commit is contained in:
@@ -9,18 +9,27 @@ using System.Threading.Tasks;
|
||||
using Beam.Abstractions;
|
||||
using Beam.Downloaders;
|
||||
using Beam.Models;
|
||||
using Beam.Stealth.Strategies;
|
||||
|
||||
namespace Beam.Stealth {
|
||||
using File = System.IO.File;
|
||||
|
||||
public class StealthUnitDownloader<RawType, OutType> : UnitDownloader<RawType, OutType> where RawType : IDocument {
|
||||
public class StealthUnitDownloader<OutType> : UnitDownloader<OutType> {
|
||||
public StealthConfig Config { get; }
|
||||
public StealthAsyncManipulator Manipulator { get; }
|
||||
private ILogger? Logger => Config.Logger;
|
||||
|
||||
public StealthUnitDownloader(UnitDownloaderOptions<RawType, OutType> options, StealthConfig config, StealthAsyncManipulator manipulator) : base(options) {
|
||||
private IDownloadStrategy _downloadStrategy { get; }
|
||||
|
||||
public StealthUnitDownloader(UnitDownloaderOptions<OutType> options, StealthConfig config, StealthAsyncManipulator manipulator) : base(options) {
|
||||
Config = config;
|
||||
Manipulator = manipulator;
|
||||
|
||||
_downloadStrategy = options.Target switch {
|
||||
DownloadTarget.URL or DownloadTarget.InURL => new PageDownloadStrategy(),
|
||||
DownloadTarget.Complex => new WaitingDownloadStrategy(),
|
||||
_ => throw new NotSupportedException() // TODO add an exception message
|
||||
};
|
||||
}
|
||||
|
||||
protected override async Task DownloadToStream(string url, int bufferSize, Stream destinationStream,
|
||||
@@ -29,76 +38,7 @@ namespace Beam.Stealth {
|
||||
await driver.Navigate().GoToUrlAsync(url);
|
||||
await Manipulator(driver);
|
||||
|
||||
await using var stream = await WaitForDownloadAsync(url, progress, Stopwatch.StartNew(), ct);
|
||||
await (stream?.CopyToAsync(destinationStream, ct) ?? Task.CompletedTask);
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
private async Task<Stream?> WaitForDownloadAsync(
|
||||
string link, IProgress<IDownloadReport> progress, Stopwatch sw, CancellationToken ct) {
|
||||
const int PollDelayMs = 250; // how often we look
|
||||
const int StableDelayMs = 1000; // size-unchanged window
|
||||
|
||||
string dir = Config.DownloadsDirectory;
|
||||
string? finalPath = null;
|
||||
long lastSize = -1;
|
||||
DateTime lastChange = DateTime.UtcNow;
|
||||
|
||||
bool IsTemp(string p) =>
|
||||
p.EndsWith(".crdownload", StringComparison.OrdinalIgnoreCase) ||
|
||||
p.EndsWith(".part", StringComparison.OrdinalIgnoreCase);
|
||||
|
||||
Logger?.LogDebug("Polling {Dir} for download files", dir);
|
||||
|
||||
while (sw.Elapsed < Config.TimeOut && !ct.IsCancellationRequested) {
|
||||
// current files in the directory
|
||||
var files = Directory.EnumerateFiles(dir, "*", SearchOption.TopDirectoryOnly).ToArray();
|
||||
|
||||
// ignore temp names; pick (or re-pick) the first real candidate
|
||||
finalPath ??= files.FirstOrDefault(f => !IsTemp(f));
|
||||
|
||||
// still nothing but temps – keep waiting
|
||||
if (finalPath is null) {
|
||||
await Task.Delay(PollDelayMs, ct);
|
||||
continue;
|
||||
}
|
||||
|
||||
// track growth
|
||||
long size = new FileInfo(finalPath).Length;
|
||||
if (size == 0 || size != lastSize) {
|
||||
progress?.Report(new DownloadReport() {
|
||||
BytesDownloaded = size - lastSize,
|
||||
});
|
||||
lastSize = size;
|
||||
lastChange = DateTime.UtcNow;
|
||||
await Task.Delay(PollDelayMs, ct);
|
||||
continue;
|
||||
}
|
||||
|
||||
// size stable long enough *and* no temp files left?
|
||||
bool tempsRemain = files.Any(IsTemp);
|
||||
if ((DateTime.UtcNow - lastChange).TotalMilliseconds < StableDelayMs || tempsRemain) {
|
||||
await Task.Delay(PollDelayMs, ct);
|
||||
continue;
|
||||
}
|
||||
|
||||
// wait until writer releases lock
|
||||
while (true) {
|
||||
try {
|
||||
using FileStream _ =
|
||||
File.Open(finalPath, FileMode.Open, FileAccess.Read, FileShare.None);
|
||||
break;
|
||||
} catch (IOException) {
|
||||
await Task.Delay(200, ct);
|
||||
}
|
||||
}
|
||||
|
||||
return File.OpenRead(finalPath);
|
||||
}
|
||||
|
||||
Logger?.LogWarning("Download timed out after {Elapsed}", sw.Elapsed);
|
||||
return null;
|
||||
await _downloadStrategy.DownloadToStream(url, bufferSize, destinationStream, progress, Config, Logger, ct);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user