mirror of
https://github.com/alexhopeoconnor/bom-local-service.git
synced 2026-10-03 21:21:59 +10:00
alex
12dd0eedad
Major architectural changes: - Replace monolithic ScrapingService with workflow-based system - Extract scraping logic into discrete, testable steps - Add configuration-driven selectors, JavaScript templates, and text patterns - Implement step registry and workflow factory for extensibility - Add PageState tracking and step dependencies - Make IWorkflow generic to support different response types New components: - Scraping steps organized by category (Navigation, Search, Map, Metadata, Capture) - BaseScrapingStep base class with common dependencies - ScrapingContext for shared state between steps - RadarScrapingWorkflow orchestrating step execution - SelectorService for configurable element selection - Configuration models (SelectorConfig, TextPatternsConfig, JavaScriptTemplatesConfig) Performance and monitoring: - Add step-level timing metrics with historical tracking - Log step durations and compare to averages - Warn on slow steps/workflows (50%+ slower than average) - Integrate metrics with CacheService Configuration improvements: - Externalize all selectors to appsettings.json - Externalize JavaScript templates to appsettings.json - Externalize text patterns to appsettings.json - Support Docker configuration via mounted appsettings.json - Remove hardcoded waits, use configurable timeouts Bug fixes: - Fix DebugService collection modification exception - Fix ResetToFirstFrameStep click interception with JavaScript fallback - Remove minutes ago fallback, use timestamp parsing only - Update timestamp parsing for new BOM website format Documentation: - Update README with new architecture details - Add configuration section with Docker guidance - Add development guidelines for extending scraping system - Add performance monitoring documentation
74 lines
2.9 KiB
C#
74 lines
2.9 KiB
C#
using BomLocalService.Services.Interfaces;
|
|
using BomLocalService.Services.Scraping;
|
|
using Microsoft.Playwright;
|
|
|
|
namespace BomLocalService.Services.Scraping.Steps.Map;
|
|
|
|
public class WaitForMapReadyStep : BaseScrapingStep
|
|
{
|
|
private readonly int _tileRenderWaitMs;
|
|
|
|
public override string Name => "WaitForMapReady";
|
|
public override string[] Prerequisites => new[] { "ClickRadarLink" };
|
|
|
|
public WaitForMapReadyStep(
|
|
ILogger<WaitForMapReadyStep> logger,
|
|
ISelectorService selectorService,
|
|
IDebugService debugService,
|
|
IConfiguration configuration)
|
|
: base(logger, selectorService, debugService, configuration)
|
|
{
|
|
_tileRenderWaitMs = configuration.GetValue<int>("Screenshot:TileRenderWaitMs", 5000);
|
|
}
|
|
|
|
public override bool CanExecute(ScrapingContext context)
|
|
{
|
|
return context.IsRadarPageLoaded;
|
|
}
|
|
|
|
public override async Task<ScrapingStepResult> ExecuteAsync(ScrapingContext context, CancellationToken cancellationToken)
|
|
{
|
|
try
|
|
{
|
|
Logger.LogInformation("Step {Step}: Waiting for weather map page to load", Name);
|
|
|
|
await context.Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded, new PageWaitForLoadStateOptions { Timeout = 15000 });
|
|
|
|
Logger.LogInformation("Step {Step}: Waiting for map canvas element to render", Name);
|
|
var mapCanvas = SelectorService.GetLocator(context.Page, Selectors.MapCanvas);
|
|
await mapCanvas.WaitForAsync(new LocatorWaitForOptions { Timeout = 15000 });
|
|
|
|
await context.Page.WaitForFunctionAsync(
|
|
JavaScriptTemplates.WaitForMapCanvas,
|
|
new PageWaitForFunctionOptions { Timeout = 15000 });
|
|
|
|
Logger.LogInformation("Step {Step}: Map canvas is ready - waiting for map to render", Name);
|
|
|
|
try
|
|
{
|
|
await context.Page.WaitForFunctionAsync(
|
|
JavaScriptTemplates.WaitForEsriView,
|
|
new PageWaitForFunctionOptions { Timeout = 30000 });
|
|
Logger.LogInformation("Step {Step}: Esri map view is ready", Name);
|
|
}
|
|
catch
|
|
{
|
|
Logger.LogInformation("Step {Step}: Esri view ready check timed out, continuing with fixed wait", Name);
|
|
}
|
|
|
|
await context.Page.WaitForTimeoutAsync(_tileRenderWaitMs);
|
|
await SaveDebugAsync(context, 7, "weather_map_ready", cancellationToken);
|
|
|
|
context.CurrentState = PageState.MapReady;
|
|
return ScrapingStepResult.Successful();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Logger.LogError(ex, "Step {Step} failed", Name);
|
|
await SaveErrorDebugAsync(context, $"Failed to wait for map ready: {ex.Message}", cancellationToken);
|
|
return ScrapingStepResult.Failed($"Failed to wait for map ready: {ex.Message}");
|
|
}
|
|
}
|
|
}
|
|
|