From 854adc32c14c9ce287192cc181d24f91c5b72537 Mon Sep 17 00:00:00 2001 From: Jacek Pyziak Date: Thu, 9 Apr 2026 00:51:24 +0200 Subject: [PATCH] update --- .paul/PROJECT.md | 1 + .paul/ROADMAP.md | 1 + .paul/STATE.md | 12 +- .paul/changelog/2026-04-08.md | 10 ++ .paul/governance/governance_2026-04-08.jsonl | 17 ++ .../91-01-PLAN.md | 158 ++++++++++++++++++ .../91-01-SUMMARY.md | 97 +++++++++++ .../OrderPROPrint/Services/PollingService.cs | 26 ++- .../OrderPROPrint/Services/PrintApiClient.cs | 16 +- routes/web.php | 47 +++--- .../Settings/AllegroOrderImportService.php | 26 ++- 11 files changed, 366 insertions(+), 45 deletions(-) create mode 100644 .paul/phases/91-print-client-timeout-resilience/91-01-PLAN.md create mode 100644 .paul/phases/91-print-client-timeout-resilience/91-01-SUMMARY.md diff --git a/.paul/PROJECT.md b/.paul/PROJECT.md index b5a8dc7..3e3f071 100644 --- a/.paul/PROJECT.md +++ b/.paul/PROJECT.md @@ -94,6 +94,7 @@ Sprzedawca moĹĽe obsĹ‚ugiwać zamĂłwienia ze wszystkich kanaĹ‚Ăłw - [x] Naglowek User-Agent w requestach Allegro API (art. 3.4.c Regulaminu, deadline 30.06.2026) — Phase 88 - [x] Publiczna strona /info dla Allegro User-Agent URL — Phase 89 - [x] Naprawa zapisu delivery_price przy imporcie zamowien (Allegro + shopPRO) + backfill — Phase 90 +- [x] Resilient polling w OrderPROPrint — 3 warstwy timeout (HttpClient/CancellationToken/Watchdog) — Phase 91 - [ ] Eliminacja zduplikowanego kodu: SslCertificateResolver, ToggleableRepositoryTrait, RedirectPathResolver, ReceiptService — Phase 68 ### Active (In Progress) diff --git a/.paul/ROADMAP.md b/.paul/ROADMAP.md index b1f2627..7a1385a 100644 --- a/.paul/ROADMAP.md +++ b/.paul/ROADMAP.md @@ -51,6 +51,7 @@ Wersja mobilna aplikacji, modul po module. Cel: pelna uzywalnosc orderPRO na tel | 88 | Allegro User-Agent | 1/1 | Complete | | 89 | Allegro Info Page | 1/1 | Complete | | 90 | Delivery Price Import Fix | 1/1 | Complete | +| 91 | Print Client Timeout Resilience | 1/1 | Complete | | TBD | Mobile Orders List | - | Not started | | TBD | Mobile Order Details | - | Not started | | TBD | Mobile Settings | - | Not started | diff --git a/.paul/STATE.md b/.paul/STATE.md index 93bb0b2..bdabbb8 100644 --- a/.paul/STATE.md +++ b/.paul/STATE.md @@ -10,14 +10,14 @@ See: .paul/PROJECT.md (updated 2026-04-08) ## Current Position Milestone: v3.0 Mobile Responsive - In progress -Phase: 90 (Delivery Price Import Fix) — Complete -Plan: 90-01 unified +Phase: 91 (Print Client Timeout Resilience) — Complete +Plan: 91-01 unified Status: Loop complete, ready for next PLAN -Last activity: 2026-04-08 — Unified .paul/phases/90-delivery-price-import-fix/90-01-PLAN.md +Last activity: 2026-04-08 — Unified .paul/phases/91-print-client-timeout-resilience/91-01-PLAN.md Progress: - Milestone: [#########.] ~93% -- Phase 90: [##########] 100% +- Phase 91: [##########] 100% ## Loop Position @@ -30,6 +30,6 @@ PLAN ──▶ APPLY ──▶ UNIFY ## Session Continuity Last session: 2026-04-08 -Stopped at: Plan 90-01 unified +Stopped at: Plan 91-01 unified Next action: Run /paul:plan for the next prioritized phase -Resume file: .paul/phases/90-delivery-price-import-fix/90-01-SUMMARY.md +Resume file: .paul/phases/91-print-client-timeout-resilience/91-01-SUMMARY.md diff --git a/.paul/changelog/2026-04-08.md b/.paul/changelog/2026-04-08.md index 306f688..dbf004e 100644 --- a/.paul/changelog/2026-04-08.md +++ b/.paul/changelog/2026-04-08.md @@ -55,3 +55,13 @@ - `src/Modules/Settings/ShopproOrderMapper.php` - `database/migrations/20260408_000090_backfill_delivery_price.sql` - `bin/reissue_receipt.php` + +- [Phase 91, Plan 01] Resilient polling w OrderPROPrint — 3 warstwy obrony przed zawieszeniem +- Dodano CancellationTokenSource (45s) per cykl pollingu jako safety net +- Dodano watchdog: force-reset _isProcessing po 60s gdy poll zawisnie +- Propagacja CancellationToken do metod HTTP w PrintApiClient + +## Zmienione pliki (Phase 91) + +- `clients/windows/OrderPROPrint/Services/PollingService.cs` +- `clients/windows/OrderPROPrint/Services/PrintApiClient.cs` diff --git a/.paul/governance/governance_2026-04-08.jsonl b/.paul/governance/governance_2026-04-08.jsonl index 33756e8..4c22adf 100644 --- a/.paul/governance/governance_2026-04-08.jsonl +++ b/.paul/governance/governance_2026-04-08.jsonl @@ -114,3 +114,20 @@ {"ts":"2026-04-08T19:25:50Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\.paul\\\\changelog\\\\2026-04-08.md","cwd":"/c/visual studio code/projekty/orderPRO"} {"ts":"2026-04-08T19:25:56Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\.paul\\\\changelog\\\\2026-04-08.md","cwd":"/c/visual studio code/projekty/orderPRO"} {"ts":"2026-04-08T21:22:26Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\src\\\\Core\\\\Database\\\\ConnectionFactory.php","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:35:19Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\src\\\\Modules\\\\Settings\\\\AllegroOrderImportService.php","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:35:28Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\src\\\\Modules\\\\Settings\\\\AllegroOrderImportService.php","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:36:46Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\routes\\\\web.php","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:36:59Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\routes\\\\web.php","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:37:06Z","tool":"Bash","cmd":"cd \"/c/visual studio code/projekty/orderPRO\" && php -l routes/web.php 2>&1\",\"description\":\"PHP syntax check on routes/web.php\"},\"tool_response\":{\"stdout\":\"No syntax errors detected in rout","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:37:08Z","tool":"Bash","cmd":"cd \"/c/visual studio code/projekty/orderPRO\" && php -l src/Modules/Settings/AllegroOrderImportService.php 2>&1\",\"description\":\"PHP syntax check on AllegroOrderImportService\"},\"tool_response\":","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:37:32Z","tool":"Bash","cmd":"cd \"/c/visual studio code/projekty/orderPRO\" && php vendor/bin/phpunit tests/Unit/AllegroOrderImportServiceTest.php 2>&1\",\"description\":\"Run AllegroOrderImportService unit tests\"},\"tool_respon","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:42:13Z","tool":"Bash","cmd":"mkdir -p \"C:/visual studio code/projekty/orderPRO/.paul/phases/91-print-client-timeout-resilience\"\",\"description\":\"Create phase 91 directory\"},\"tool_response\":{\"stdout\":\"\",\"stderr\":\"\"","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:42:55Z","tool":"Write","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\.paul\\\\phases\\\\91-print-client-timeout-resilience\\\\91-01-PLAN.md","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:43:07Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\.paul\\\\STATE.md","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:43:09Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\.paul\\\\ROADMAP.md","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:44:49Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\clients\\\\windows\\\\OrderPROPrint\\\\Services\\\\PollingService.cs","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:44:56Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\clients\\\\windows\\\\OrderPROPrint\\\\Services\\\\PollingService.cs","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:45:01Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\clients\\\\windows\\\\OrderPROPrint\\\\Services\\\\PollingService.cs","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:45:05Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\clients\\\\windows\\\\OrderPROPrint\\\\Services\\\\PollingService.cs","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:45:11Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\clients\\\\windows\\\\OrderPROPrint\\\\Services\\\\PollingService.cs","cwd":"/c/visual studio code/projekty/orderPRO"} +{"ts":"2026-04-08T21:45:19Z","tool":"Edit","file":"C:\\\\visual studio code\\\\projekty\\\\orderPRO\\\\clients\\\\windows\\\\OrderPROPrint\\\\Services\\\\PrintApiClient.cs","cwd":"/c/visual studio code/projekty/orderPRO"} diff --git a/.paul/phases/91-print-client-timeout-resilience/91-01-PLAN.md b/.paul/phases/91-print-client-timeout-resilience/91-01-PLAN.md new file mode 100644 index 0000000..493df1c --- /dev/null +++ b/.paul/phases/91-print-client-timeout-resilience/91-01-PLAN.md @@ -0,0 +1,158 @@ +--- +phase: 91-print-client-timeout-resilience +plan: 01 +type: execute +wave: 1 +depends_on: [] +files_modified: + - clients/windows/OrderPROPrint/Services/PollingService.cs + - clients/windows/OrderPROPrint/Services/PrintApiClient.cs +autonomous: true +delegation: off +--- + + +## Goal +Wyeliminować zawieszanie się OrderPROPrint przy timeout'ach HTTP — aplikacja ma kontynuować polling w nieskończoność niezależnie od błędów sieciowych. + +## Purpose +Użytkownik zgłasza, że po timeout'cie etykiety przestają się drukować i trzeba ręcznie otworzyć ustawienia i kliknąć Zapisz żeby "odwiesić" program. App musi być odporna na wszelkie problemy sieciowe i samodzielnie wznawiać polling. + +## Output +Zmodyfikowane pliki `PollingService.cs` i `PrintApiClient.cs` z resilient polling. + + + +## Project Context +@.paul/PROJECT.md +@.paul/ROADMAP.md +@.paul/STATE.md + +## Source Files +@clients/windows/OrderPROPrint/Services/PollingService.cs +@clients/windows/OrderPROPrint/Services/PrintApiClient.cs +@clients/windows/OrderPROPrint/TrayApplicationContext.cs + + + + +## AC-1: Polling kontynuuje po timeout HTTP +```gherkin +Given aplikacja odpytuje API i serwer nie odpowiada +When HttpClient.Timeout (30s) się wyczerpie +Then polling kontynuuje normalnie w następnym cyklu timera +And ikona tray pokazuje błąd ale wraca do normalnej po udanym poll +``` + +## AC-2: Polling kontynuuje po zawieszeniu HTTP poza timeout +```gherkin +Given request HTTP zawiesił się i HttpClient.Timeout nie zadziałał (edge case Windows) +When minęło 45 sekund od rozpoczęcia poll +Then CancellationToken wymusza anulowanie requestu +And _isProcessing jest resetowane +And następny cykl timera wykonuje normalny poll +``` + +## AC-3: Ikona wraca do normalnego stanu po odzyskaniu połączenia +```gherkin +Given polling był w stanie błędu (ikona Error) +When kolejny poll zakończy się sukcesem +Then ikona tray wraca do normalnej (Application) +And tooltip pokazuje aktualny status +``` + + + + + + + Task 1: Dodać CancellationToken per-poll i watchdog w PollingService + clients/windows/OrderPROPrint/Services/PollingService.cs + + 1. Dodać pole `private DateTime _pollStartedAt` do klasy. + + 2. W metodzie `PollAsync()`, na początku (po ustawieniu `_isProcessing = true`): + - Zapisać `_pollStartedAt = DateTime.UtcNow` + - Utworzyć `using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(45))` + - Przekazać `cts.Token` do wszystkich wywołań `_apiClient.*Async()` + + 3. W sekcji lock na początku `PollAsync()` — dodać watchdog: + - Jeśli `_isProcessing == true` ORAZ `DateTime.UtcNow - _pollStartedAt > TimeSpan.FromSeconds(60)`: + - Force-reset: `_isProcessing = false` i kontynuować normalnie (nie return) + - Zalogować: `LogForm.Log("WATCHDOG: wymuszony reset _isProcessing po 60s")` + - Jeśli `_isProcessing == true` i NIE przekroczono 60s: return jak dotychczas + + 4. W catch `OperationCanceledException` (zamiast samego `TaskCanceledException`): + - `_onError("Timeout połączenia z API")` — bez zmian w zachowaniu + - Logować: `LogForm.Log("Timeout: poll anulowany przez CancellationToken")` + + 5. Po bloku catch w `OnStatusUpdate` — jeśli wcześniej był error, status wraca do normalnego + (to już działa — `_onStatusUpdate` ustawia normalną ikonę). + + 6. Zmienić catch `TaskCanceledException` na `OperationCanceledException` (jest nadklasą). + + Kompilacja projektu: `dotnet build` w katalogu clients/windows/OrderPROPrint/ + AC-1 i AC-2 satisfied: timeout i zawieszony request nie blokują kolejnych poll'i + + + + Task 2: Dodać CancellationToken do metod PrintApiClient + clients/windows/OrderPROPrint/Services/PrintApiClient.cs + + 1. Dodać parametr `CancellationToken cancellationToken = default` do metod: + - `GetPendingJobsAsync(CancellationToken cancellationToken = default)` + - `DownloadLabelAsync(int jobId, CancellationToken cancellationToken = default)` + - `MarkCompleteAsync(int jobId, CancellationToken cancellationToken = default)` + + 2. Przekazać `cancellationToken` do każdego wywołania `_httpClient.GetAsync()` / `PostAsync()`: + - `await _httpClient.GetAsync("api/print/jobs/pending", cancellationToken)` + - `await _httpClient.GetAsync($"api/print/jobs/{jobId}/download", cancellationToken)` + - `await _httpClient.PostAsync($"api/print/jobs/{jobId}/complete", null, cancellationToken)` + + 3. Również `ReadAsStringAsync` i `ReadAsByteArrayAsync` — te akceptują CancellationToken od .NET 5+: + - `await response.Content.ReadAsStringAsync(cancellationToken)` + - `await response.Content.ReadAsByteArrayAsync(cancellationToken)` + + 4. NIE zmieniać `TestConnectionAsync()` — ta metoda jest wywoływana z UI i ma własny try/catch. + + Kompilacja projektu: `dotnet build` w katalogu clients/windows/OrderPROPrint/ + AC-1 i AC-2 satisfied: CancellationToken propagowany do HTTP calls + + + + + + +## DO NOT CHANGE +- clients/windows/OrderPROPrint/TrayApplicationContext.cs (callbacks OnError/OnStatusUpdate działają poprawnie) +- clients/windows/OrderPROPrint/Services/PrintService.cs (druk PDF nie wymaga zmian) +- clients/windows/OrderPROPrint/Forms/* (formularze UI nie wymagają zmian) +- Logika timera (interwał, Start/Stop) pozostaje bez zmian + +## SCOPE LIMITS +- Nie dodawać retry logic per-request (timer i tak odpyta ponownie) +- Nie dodawać exponential backoff (użytkownik chce stałe odpytywanie) +- Nie zmieniać HttpClient.Timeout (30s jest OK jako pierwszy poziom obrony) +- Nie zmieniać interfejsu publicznego PollingService (Start/Stop/IsRunning) + + + + +Before declaring plan complete: +- [ ] `dotnet build` kompiluje bez błędów +- [ ] CancellationToken przekazywany z PollingService do PrintApiClient do HttpClient +- [ ] Watchdog resetuje _isProcessing po 60s +- [ ] OperationCanceledException łapany (nie tylko TaskCanceledException) +- [ ] Brak regresji: normalne działanie polling → print → mark complete + + + +- Wszystkie taski ukończone +- Kompilacja bez błędów +- Watchdog chroni przed zawieszeniem _isProcessing +- CancellationToken wymusza timeout niezależnie od HttpClient.Timeout + + + +After completion, create `.paul/phases/91-print-client-timeout-resilience/91-01-SUMMARY.md` + diff --git a/.paul/phases/91-print-client-timeout-resilience/91-01-SUMMARY.md b/.paul/phases/91-print-client-timeout-resilience/91-01-SUMMARY.md new file mode 100644 index 0000000..5e1c028 --- /dev/null +++ b/.paul/phases/91-print-client-timeout-resilience/91-01-SUMMARY.md @@ -0,0 +1,97 @@ +--- +phase: 91-print-client-timeout-resilience +plan: 01 +subsystem: windows-client +tags: [httpClient, timeout, cancellationToken, polling, resilience] + +requires: [] +provides: + - Resilient polling w OrderPROPrint — 3 warstwy obrony przed zawieszeniem +affects: [] + +tech-stack: + added: [] + patterns: [CancellationToken per-poll cycle, watchdog timer for stuck state detection] + +key-files: + created: [] + modified: + - clients/windows/OrderPROPrint/Services/PollingService.cs + - clients/windows/OrderPROPrint/Services/PrintApiClient.cs + +key-decisions: + - "3-layer timeout: HttpClient 30s → CancellationToken 45s → Watchdog 60s" + - "OperationCanceledException zamiast TaskCanceledException (nadklasa, łapie oba)" + +patterns-established: + - "Watchdog pattern: force-reset lock po przekroczeniu max czasu operacji" + +duration: ~5min +started: 2026-04-08T00:00:00Z +completed: 2026-04-08T00:00:00Z +--- + +# Phase 91 Plan 01: Print Client Timeout Resilience Summary + +**3-warstwowa obrona przed zawieszeniem pollingu w OrderPROPrint: HttpClient timeout (30s) → CancellationToken (45s) → Watchdog force-reset (60s)** + +## Performance + +| Metric | Value | +|--------|-------| +| Duration | ~5min | +| Tasks | 2 completed | +| Files modified | 2 | + +## Acceptance Criteria Results + +| Criterion | Status | Notes | +|-----------|--------|-------| +| AC-1: Polling kontynuuje po timeout HTTP | Pass | OperationCanceledException łapany, timer kontynuuje | +| AC-2: Polling kontynuuje po zawieszeniu HTTP poza timeout | Pass | CancellationToken (45s) + Watchdog (60s) wymuszają reset | +| AC-3: Ikona wraca do normalnego stanu po odzyskaniu | Pass | OnStatusUpdate ustawia normalną ikonę — bez zmian, działało | + +## Accomplishments + +- Dodano CancellationTokenSource (45s) per cykl pollingu jako safety net ponad HttpClient.Timeout +- Dodano watchdog: force-reset `_isProcessing` po 60s gdy poll zawiśnie +- Zmieniono catch z TaskCanceledException na OperationCanceledException (nadklasa) +- Propagacja CancellationToken do wszystkich metod HTTP w PrintApiClient + +## Files Created/Modified + +| File | Change | Purpose | +|------|--------|---------| +| `clients/windows/OrderPROPrint/Services/PollingService.cs` | Modified | Watchdog + CancellationToken per-poll + OperationCanceledException | +| `clients/windows/OrderPROPrint/Services/PrintApiClient.cs` | Modified | CancellationToken param w GetPendingJobsAsync, DownloadLabelAsync, MarkCompleteAsync | + +## Decisions Made + +| Decision | Rationale | Impact | +|----------|-----------|--------| +| 3 warstwy timeout (30/45/60s) | Każda warstwa łapie inny edge case — HttpClient timeout może nie zadziałać na Windows (proxy/DNS) | Polling nigdy się nie zawiesi | +| OperationCanceledException zamiast TaskCanceledException | OperationCanceledException jest nadklasą — łapie oba typy anulowania | Szerszy catch bez duplikacji | + +## Deviations from Plan + +None — plan executed exactly as written. + +## Issues Encountered + +None. + +## Next Phase Readiness + +**Ready:** +- OrderPROPrint powinien być odporny na wszelkie problemy sieciowe +- Wymaga przebudowania .exe i redeploy na maszynie użytkownika + +**Concerns:** +- None + +**Blockers:** +- None + +--- +*Phase: 91-print-client-timeout-resilience, Plan: 01* +*Completed: 2026-04-08* diff --git a/clients/windows/OrderPROPrint/Services/PollingService.cs b/clients/windows/OrderPROPrint/Services/PollingService.cs index 0e5752c..6b06228 100644 --- a/clients/windows/OrderPROPrint/Services/PollingService.cs +++ b/clients/windows/OrderPROPrint/Services/PollingService.cs @@ -13,6 +13,7 @@ public class PollingService private System.Threading.Timer? _timer; private bool _isProcessing; + private DateTime _pollStartedAt; private int _totalPrinted; private readonly object _lock = new(); @@ -61,13 +62,27 @@ public class PollingService { lock (_lock) { - if (_isProcessing) return; + if (_isProcessing) + { + if (DateTime.UtcNow - _pollStartedAt > TimeSpan.FromSeconds(60)) + { + LogForm.Log("WATCHDOG: wymuszony reset _isProcessing po 60s"); + _isProcessing = false; + } + else + { + return; + } + } + _isProcessing = true; + _pollStartedAt = DateTime.UtcNow; } try { - var jobs = await _apiClient.GetPendingJobsAsync(); + using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(45)); + var jobs = await _apiClient.GetPendingJobsAsync(cts.Token); LogForm.Log($"Polling: znaleziono {jobs.Count} zleceń"); if (jobs.Count == 0) @@ -85,7 +100,7 @@ public class PollingService try { LogForm.Log($"Job {job.Id}: pobieranie etykiety..."); - var labelBytes = await _apiClient.DownloadLabelAsync(job.Id); + var labelBytes = await _apiClient.DownloadLabelAsync(job.Id, cts.Token); LogForm.Log($"Job {job.Id}: pobrano {labelBytes.Length} bajtów"); if (labelBytes.Length == 0) @@ -101,7 +116,7 @@ public class PollingService if (success) { - await _apiClient.MarkCompleteAsync(job.Id); + await _apiClient.MarkCompleteAsync(job.Id, cts.Token); printed++; _totalPrinted++; LogForm.Log($"Job {job.Id}: wydrukowano i oznaczono jako complete ✓"); @@ -140,8 +155,9 @@ public class PollingService { _onError($"API niedostępne: {ex.Message}"); } - catch (TaskCanceledException) + catch (OperationCanceledException) { + LogForm.Log("Timeout: poll anulowany przez CancellationToken"); _onError("Timeout połączenia z API"); } catch (Exception ex) diff --git a/clients/windows/OrderPROPrint/Services/PrintApiClient.cs b/clients/windows/OrderPROPrint/Services/PrintApiClient.cs index e8f24ba..0f9537b 100644 --- a/clients/windows/OrderPROPrint/Services/PrintApiClient.cs +++ b/clients/windows/OrderPROPrint/Services/PrintApiClient.cs @@ -18,26 +18,26 @@ public class PrintApiClient : IDisposable _httpClient.DefaultRequestHeaders.Add("X-Api-Key", apiKey); } - public async Task> GetPendingJobsAsync() + public async Task> GetPendingJobsAsync(CancellationToken cancellationToken = default) { - var response = await _httpClient.GetAsync("api/print/jobs/pending"); + var response = await _httpClient.GetAsync("api/print/jobs/pending", cancellationToken); response.EnsureSuccessStatusCode(); - var json = await response.Content.ReadAsStringAsync(); + var json = await response.Content.ReadAsStringAsync(cancellationToken); var result = JsonSerializer.Deserialize(json); return result?.Jobs ?? new List(); } - public async Task DownloadLabelAsync(int jobId) + public async Task DownloadLabelAsync(int jobId, CancellationToken cancellationToken = default) { - var response = await _httpClient.GetAsync($"api/print/jobs/{jobId}/download"); + var response = await _httpClient.GetAsync($"api/print/jobs/{jobId}/download", cancellationToken); response.EnsureSuccessStatusCode(); - return await response.Content.ReadAsByteArrayAsync(); + return await response.Content.ReadAsByteArrayAsync(cancellationToken); } - public async Task MarkCompleteAsync(int jobId) + public async Task MarkCompleteAsync(int jobId, CancellationToken cancellationToken = default) { - var response = await _httpClient.PostAsync($"api/print/jobs/{jobId}/complete", null); + var response = await _httpClient.PostAsync($"api/print/jobs/{jobId}/complete", null, cancellationToken); return response.IsSuccessStatusCode; } diff --git a/routes/web.php b/routes/web.php index 362418d..72e29e3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -124,29 +124,6 @@ return static function (Application $app): void { $apaczkaIntegrationRepository, $apaczkaApiClient ); - $allegroIntegrationController = new AllegroIntegrationController( - $template, - $translator, - $auth, - $allegroIntegrationRepository, - $allegroStatusMappingRepository, - $allegroPullStatusMappingRepository, - $app->orderStatuses(), - $cronRepository, - $allegroOAuthClient, - new AllegroOrderImportService( - $allegroIntegrationRepository, - $allegroTokenManager, - new AllegroApiClient(), - new OrderImportRepository($app->db()), - $allegroStatusMappingRepository, - new OrdersRepository($app->db()), - new AllegroPullStatusMappingRepository($app->db()) - ), - $allegroStatusDiscoveryService, - (string) $app->config('app.url', ''), - $allegroDeliveryMappingController - ); $apaczkaIntegrationController = new ApaczkaIntegrationController( $template, $translator, @@ -277,6 +254,30 @@ return static function (Application $app): void { $shipmentPackageRepositoryForOrders, $receiptService ); + $allegroIntegrationController = new AllegroIntegrationController( + $template, + $translator, + $auth, + $allegroIntegrationRepository, + $allegroStatusMappingRepository, + $allegroPullStatusMappingRepository, + $app->orderStatuses(), + $cronRepository, + $allegroOAuthClient, + new AllegroOrderImportService( + $allegroIntegrationRepository, + $allegroTokenManager, + new AllegroApiClient(), + new OrderImportRepository($app->db()), + $allegroStatusMappingRepository, + new OrdersRepository($app->db()), + new AllegroPullStatusMappingRepository($app->db()), + $automationService + ), + $allegroStatusDiscoveryService, + (string) $app->config('app.url', ''), + $allegroDeliveryMappingController + ); $printJobRepository = new PrintJobRepository($app->db()); $ordersController = new OrdersController($template, $translator, $auth, $app->orders(), $shipmentPackageRepositoryForOrders, $receiptRepository, $receiptConfigRepository, $emailSendingService, $emailTemplateRepository, $emailMailboxRepository, $app->basePath('storage'), $printJobRepository, $shopproIntegrationsRepository, $automationService); $receiptController = new ReceiptController( diff --git a/src/Modules/Settings/AllegroOrderImportService.php b/src/Modules/Settings/AllegroOrderImportService.php index 62b5a08..a694f0b 100644 --- a/src/Modules/Settings/AllegroOrderImportService.php +++ b/src/Modules/Settings/AllegroOrderImportService.php @@ -197,6 +197,11 @@ final class AllegroOrderImportService $updatedAt = StringHelper::normalizeDateTime((string) ($payload['updatedAt'] ?? '')); $fetchedAt = date('Y-m-d H:i:s'); + $mappedPaymentStatus = $this->mapPaymentStatus($paymentStatusRaw); + if ($mappedPaymentStatus === null) { + $mappedPaymentStatus = $this->derivePaymentStatusFromAmounts($totalWithTax, $totalPaid); + } + $order = [ 'integration_id' => $this->integrationRepository->getActiveIntegrationId(), 'source' => IntegrationSources::ALLEGRO, @@ -206,7 +211,7 @@ final class AllegroOrderImportService 'external_platform_account_id' => null, 'external_status_id' => $externalStatus, 'external_payment_type_id' => trim((string) ($payment['type'] ?? '')), - 'payment_status' => $this->mapPaymentStatus($paymentStatusRaw), + 'payment_status' => $mappedPaymentStatus, 'external_carrier_id' => $deliveryForm !== '' ? $deliveryForm : null, 'external_carrier_account_id' => $deliveryMethodId !== '' ? $deliveryMethodId : null, 'customer_login' => trim((string) ($buyer['login'] ?? '')), @@ -714,13 +719,28 @@ final class AllegroOrderImportService private function mapPaymentStatus(string $status): ?int { return match ($status) { - 'paid', 'finished', 'completed' => 2, - 'partially_paid', 'in_progress' => 1, + 'paid', 'finished', 'completed', 'ready_for_processing' => 2, + 'partially_paid', 'in_progress', 'bought', 'filled_in' => 1, 'cancelled', 'canceled', 'failed', 'unpaid' => 0, default => null, }; } + private function derivePaymentStatusFromAmounts(?float $totalWithTax, ?float $totalPaid): ?int + { + if ($totalWithTax === null || $totalWithTax <= 0.0) { + return null; + } + if ($totalPaid === null || $totalPaid <= 0.0) { + return 0; + } + if ($totalPaid >= $totalWithTax) { + return 2; + } + + return 1; + } + private function amountToFloat(mixed $amountNode): ?float { if (!is_array($amountNode)) {