universal-parcel-scraper 0.49.2-main.550 → 0.49.2-main.551

package/dist/carriers/paack/adapter.js

@@ -18,12 +18,14 @@
  * e-mail, phone and address, and per-event `variables` that repeat them.
  * `parse()` copies nothing from those objects: each event is rebuilt from its
  * timestamp, our own description and the mapped stage, and the only order-level
- * fields read are the delivery postcode, compared and never copied, and the
- * delivery window.
+ * fields read are the delivery postcode, compared and never copied, the
+ * delivery country, which picks the window's clock, and the delivery window.
  */
 import { load } from 'cheerio';
+import { DateTime } from 'luxon';
 import { lookupBudget } from '../../core/adapter/index.js';
 import { IndeterminateError, InputRequiredError, InvalidInputError, NotFoundError, SchemaError } from '../../core/errors/index.js';
+import { countryCode, countryTimeZone, explicitOffsetTime } from '../../core/time/index.js';
 import { decodeText, fetchBounded, UpstreamHttpError, userAgentOf } from '../../core/transport/index.js';
 import { isRecord } from '../../core/types.js';
 import { classifyPaackEvent } from './status.js';
@@ -32,6 +34,7 @@ const DEFAULT_TIMEOUT_MS = 15_000;
 const MAX_RESPONSE_BYTES = 2_000_000;
 const MAX_EVENTS = 100;
 const MAX_REDIRECTS = 1;
+const DEFAULT_ZONE = 'Europe/Paris';
 const PAACK_HOST = /(?:^|\.)paack\.(?:app|co)$/;
 const NOT_FOUND_PATTERN = /order not found|incorrect order number|commande introuvable|pedido no encontrado/i;
 const NOT_FOUND_PAGE_PATTERN = /order not found|incorrect order number or postal code|commande introuvable|pedido no encontrado/i;
@@ -68,6 +71,34 @@ function normalizedDate(value) {
     }
     return normalizedTimestamp(value)?.iso.slice(0, 10) ?? null;
 }
+/**
+ * The clock the page shows the delivery window on: the delivery country's, and
+ * the Canary Islands' for Spanish postcodes 35 and 38.
+ */
+function deliveryZone(country, postcode) {
+    return countryCode(country) === 'ES' && /^3[58]\d{3}$/.test(postcode)
+        ? 'Atlantic/Canary'
+        : countryTimeZone(country) ?? DEFAULT_ZONE;
+}
+/**
+ * `expected_delivery_ts` as the page shows it: `YYYY-MM-DD HH:MM–HH:MM` on the
+ * delivery clock when both ends are instants within one day, else the day
+ * alone. A window that ended before the newest scan is dropped.
+ */
+function expectedDelivery(window, zone, newest) {
+    const start = explicitOffsetTime(window.start);
+    const end = explicitOffsetTime(window.end) ?? start;
+    if (!end)
+        return normalizedDate(window.end ?? window.start);
+    if (end.timestamp < newest)
+        return null;
+    const clock = (time) => DateTime.fromMillis(time.timestamp, { zone }).toFormat('yyyy-MM-dd HH:mm');
+    const last = clock(end);
+    const first = start ? clock(start) : last;
+    return first.slice(0, 10) === last.slice(0, 10) && first < last
+        ? `${first}–${last.slice(11)}`
+        : last.slice(0, 10);
+}
 function routeData(payload) {
     if (!isRecord(payload))
         throw new SchemaError('Paack', 'Paack returned an invalid tracking response');
@@ -222,16 +253,18 @@ export function parsePaackTrackingResponse(payload, rawPostcode) {
     const activeTime = activeEvent
         ? normalizedTimestamp(activeEvent.timestamp ?? activeEvent.time)
         : null;
-    const expected = isRecord(order.expected_delivery_ts)
-        ? normalizedDate(order.expected_delivery_ts.end ?? order.expected_delivery_ts.start)
+    const zone = deliveryZone(address?.country, postcode);
+    const newest = Math.max(activeTime?.timestamp ?? -Infinity, parsedEvents[0]?.timestamp ?? -Infinity);
+    const expected = isRecord(order.expected_delivery_ts) && !['delivered', 'exception'].includes(current.status)
+        ? expectedDelivery(order.expected_delivery_ts, zone, newest)
         : null;
     return {
         status: current.status,
         current_stage: current.stage,
         last_status_text: current.description,
         last_update: activeTime?.iso ?? events[0]?.time ?? null,
-        expected_delivery: ['delivered', 'exception'].includes(current.status) ? null : expected,
-        timezone: 'Europe/Paris',
+        expected_delivery: expected,
+        timezone: zone,
         events,
     };
 }

package/dist/carriers/paack/carrier.json

@@ -49,6 +49,7 @@
       "status",
       "history",
       "eta",
+      "eta_window",
       "sender_name",
       "recipient_name",
       "recipient_address"
@@ -56,7 +57,8 @@
     "scraped": [
       "status",
       "history",
-      "eta"
+      "eta",
+      "eta_window"
     ],
     "discarded": [
       "sender_name",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "universal-parcel-scraper",
-  "version": "0.49.2-main.550",
+  "version": "0.49.2-main.551",
   "description": "Self-hosted parcel tracking: carrier detection, dedicated scrapers and optional universal providers.",
   "type": "module",
   "license": "Apache-2.0",