universal-parcel-scraper 0.956.0-main.5145 → 0.956.2-main.5151

package/README.md

@@ -163,7 +163,7 @@ the command line's `track --source ParcelsApp` does the same.
 <!-- GENERATED:stages -->
 <img src="docs/assets/stages.svg" alt="DHL: Die Sendung wurde in das Zustellfahrzeug geladen.; Mondial Relay: En cours de livraison; Correios Brazil: Objeto saiu para entrega ao destinatário; Correos Express: EN REPARTO; Yamato Transport: 配達中; La Poste / Colissimo: DISTOU. All are filed under out_for_delivery." width="760">
 
-The carrier folders record 18,654 such statuses, each filed under one stage.
+The carrier folders record 18,656 such statuses, each filed under one stage.
 <!-- /GENERATED:stages -->
 
 Wording nobody recorded yet goes through a classifier that reads seven European languages.

package/dist/browser/scraper.js

@@ -46102,6 +46102,7 @@ function cd(e, t, n) {
 		for (let e of sd) n[e] === void 0 ? delete r[e] : Object.assign(r, { [e]: n[e] });
 		i = n.current_stage;
 	}
+	Xu.has(i ?? "") && (r.expected_delivery != null && (r.expected_delivery = null), delete r.expected_delivery_from);
 	for (let e of od) if (!(e[0] === "expected_delivery" && Xu.has(i ?? "")) && !(e[0] === "pickup_point" && Wc({
 		...t,
 		current_stage: i

package/dist/carriers/aliexpress/adapter.js

@@ -158,6 +158,15 @@ function recordedInBeijing(scan, wall) {
     const beijing = new Date(epoch + BEIJING_OFFSET_MS);
     return Number.isFinite(beijing.getTime()) && beijing.toISOString().slice(0, 19).replace('T', ' ') === wall;
 }
+// Epoch milliseconds from 2001 to 2286, as an estimate's bounds are written.
+const EPOCH_MS = /^\d{13}$/;
+/** The day of one of the estimate's bounds, or null for anything but epoch milliseconds. */
+function etaDay(value) {
+    const millis = typeof value === 'number' ? value : typeof value === 'string' && EPOCH_MS.test(value.trim()) ? Number(value) : Number.NaN;
+    if (!Number.isSafeInteger(millis) || millis < 1e12 || millis >= 1e13)
+        return null;
+    return new Date(millis).toISOString().slice(0, 10);
+}
 /** The module of a `detail.json` payload for the number asked; any other shipment is refused. */
 function trackingModuleOf(value, trackingNumber) {
     const payload = record(value);
@@ -251,13 +260,11 @@ export function parseCainiaoTrackingResponse(value, trackingNumber) {
         else if (event.stage)
             previous = event.stage;
     }
+    // The estimate's bounds, epoch milliseconds as a number or as digits; a window
+    // with one bound is that day.
     const eta = record(trackingModule.globalEtaInfo);
-    const toMillis = (value_) => (typeof value_ === 'number' && Number.isFinite(value_) ? value_ : null);
-    const deliveryMinTime = toMillis(eta.deliveryMinTime);
-    const deliveryMaxTime = toMillis(eta.deliveryMaxTime);
-    const toDate = (millis) => (millis == null ? null : new Date(millis).toISOString().slice(0, 10));
-    const expected = toDate(deliveryMaxTime);
-    const expectedFrom = toDate(deliveryMinTime);
+    const expectedFrom = etaDay(eta.deliveryMinTime);
+    const expected = etaDay(eta.deliveryMaxTime) ?? expectedFrom;
     const handoff = cainiaoHandoffNumber(trackingModule);
     // Cainiao can follow the country with the recipient's town, "France,Town": only the country is read.
     const destination = text(trackingModule.destCountry).split(',')[0].trim().slice(0, 80);

package/dist/carriers/brt/parser.d.ts

@@ -32,7 +32,8 @@ export declare function readBrt(html: string, raw: string, parcelList?: string):
  * to 14 hours ahead of UTC, so a scan before one is dated more than 14 hours
  * before its reading as UTC. These scans and BRT's shipping data follow BRT's other
  * scans, in time order when all are dated. While BRT has only the shipping
- * data, the partner's newer scan gives the current status.
+ * data, the partner's newer scan gives the current status. The partner's
+ * delivery estimate stands while BRT's scans have not overtaken it.
  */
 export declare function withOriginLeg(result: CarrierResult, partner: CarrierResult): CarrierResult;
 /**

package/dist/carriers/brt/parser.js

@@ -320,6 +320,30 @@ export function readBrt(html, raw, parcelList) {
 }
 // The fields of a result's current status.
 const STATUS_FIELDS = ['status', 'current_stage', 'current_stage_source', 'last_status_text', 'last_update', 'last_update_local', 'delivered_at'];
+// The fields of a result's delivery estimate.
+const ESTIMATE_FIELDS = ['expected_delivery', 'expected_delivery_from'];
+/** The fields of `answer` that `fields` names and it gives. */
+function picked(answer, fields) {
+    return Object.fromEntries(fields.flatMap((field) => answer[field] === undefined ? [] : [[field, answer[field]]]));
+}
+/** The calendar day a clock or an estimate opens with, or ''. */
+function dayOf(value) {
+    return typeof value === 'string' ? /^\d{4}-\d{2}-\d{2}/.exec(value)?.[0] ?? '' : '';
+}
+/**
+ * BRT's page gives no delivery estimate. The partner's stands for a shipment BRT has not
+ * delivered, returned or left at a pickup point, until BRT scans the parcel on a later day:
+ * DPD's guest service answers for the whole group and dates the delivery in Italy.
+ */
+function withPartnerEstimate(result, partner) {
+    const expected = dayOf(partner.expected_delivery);
+    const newest = result.events?.[0];
+    if (!expected || result.expected_delivery || result.status === 'delivered'
+        || ['delivered', 'returned', 'ready_for_pickup'].includes(String(result.current_stage))
+        || expected < dayOf(newest?.time ?? newest?.local_time))
+        return result;
+    return { ...result, ...picked(partner, ESTIMATE_FIELDS) };
+}
 /**
  * The shipment with the leg its partner carried it on before BRT: the
  * partner's dated scans before BRT's first scan beyond the shipping data it was
@@ -327,9 +351,13 @@ const STATUS_FIELDS = ['status', 'current_stage', 'current_stage_source', 'last_
  * to 14 hours ahead of UTC, so a scan before one is dated more than 14 hours
  * before its reading as UTC. These scans and BRT's shipping data follow BRT's other
  * scans, in time order when all are dated. While BRT has only the shipping
- * data, the partner's newer scan gives the current status.
+ * data, the partner's newer scan gives the current status. The partner's
+ * delivery estimate stands while BRT's scans have not overtaken it.
  */
 export function withOriginLeg(result, partner) {
+    return withPartnerEstimate(originLeg(result, partner), partner);
+}
+function originLeg(result, partner) {
     const events = result.events ?? [];
     let handover = events.length - 1;
     while (handover >= 0 && events[handover].stage === 'registered')
@@ -349,7 +377,7 @@ export function withOriginLeg(result, partner) {
         return merged;
     for (const field of STATUS_FIELDS)
         delete merged[field];
-    return { ...merged, ...Object.fromEntries(STATUS_FIELDS.flatMap((field) => partner[field] === undefined ? [] : [[field, partner[field]]])) };
+    return { ...merged, ...picked(partner, STATUS_FIELDS) };
 }
 // A place in Italy as the partners write it: Chronopost's "Town - IT (depot 82)", DPD's "Town, IT".
 const ITALIAN_PLACE = /(?:^|, | - )(?:IT|Italy|Italia)(?: \(depot \d{1,6}\))?$/;
@@ -364,8 +392,7 @@ export function partnerShipment(partner) {
     if (!events.length || (partner.destination_country !== 'IT'
         && !events.some((event) => ITALIAN_PLACE.test(event.location ?? ''))))
         return null;
-    return { ...Object.fromEntries(STATUS_FIELDS.flatMap((field) => partner[field] === undefined ? [] : [[field, partner[field]]])),
-        destination_country: 'IT', events: events.slice(0, 100) };
+    return { ...picked(partner, [...STATUS_FIELDS, ...ESTIMATE_FIELDS]), destination_country: 'IT', events: events.slice(0, 100) };
 }
 /**
  * The DPD group's guest reply for a BRTcode it places in Italy, where the group's network is BRT:

package/dist/carriers/dhl/adapter.js

@@ -26,11 +26,11 @@ import { carrierIdFromPartnerLinks } from '../../core/catalog/hints.js';
 import { DELIVERY_POSTCODE, deliveryPostcodeText } from '../../core/catalog/postcode.js';
 import { runSteps, singleFlight, takeTurn } from '../../core/runner/index.js';
 import { NOOP_RECORDER } from '../../core/telemetry/index.js';
-import { countryCode, isoTime } from '../../core/time/index.js';
+import { countryCode, explicitOffsetTime, isoTime } from '../../core/time/index.js';
 import { clean as cleanText, fetchBounded, parseJsonBytes, UpstreamHttpError, UpstreamNetworkError, } from '../../core/transport/index.js';
 import { isRecord } from '../../core/types.js';
 import { withoutPartnerLink } from './identity.js';
-import { BOOKED_OPTION, stageForText, statusForStage } from './status.js';
+import { BOOKED_OPTION, movedParcel, preAdvice, stageForText, statusForStage } from './status.js';
 const PROVIDER = 'DHL';
 const TIMEZONE = 'Europe/Berlin';
 const ORIGIN = 'https://www.dhl.de';
@@ -62,9 +62,8 @@ export function dhlTrackingUrl(number) {
     return url.toString();
 }
 /**
- * DHL timestamps carry their own offset and its delivery window is a calendar
- * day; both are kept verbatim rather than normalized, so `core/time` is used
- * to validate them in the German zone only.
+ * DHL timestamps carry their own offset, and are kept verbatim rather than
+ * normalized, so `core/time` is used to validate them in the German zone only.
  */
 function date(value) {
     const raw = clean(value, 64);
@@ -72,6 +71,27 @@ function date(value) {
         return '';
     return isoTime(raw, TIMEZONE) ? raw : '';
 }
+/**
+ * DHL's delivery window, `zustellzeitfensterVon` to `zustellzeitfensterBis`, kept as
+ * DHL states it when both ends carry an offset, in order, on one German day.
+ * Otherwise it is the calendar day of either end, or the days from one end to
+ * the other when they fall on two.
+ */
+function deliveryWindow(delivery) {
+    const from = date(delivery.zustellzeitfensterVon);
+    const to = date(delivery.zustellzeitfensterBis);
+    const start = explicitOffsetTime(from);
+    const end = explicitOffsetTime(to);
+    const day = (timestamp) => DateTime.fromMillis(timestamp, { zone: TIMEZONE }).toISODate();
+    if (start && end && start.timestamp < end.timestamp && day(start.timestamp) === day(end.timestamp)) {
+        return { expected_delivery_from: from, expected_delivery: to };
+    }
+    const first = from.slice(0, 10) || to.slice(0, 10);
+    const last = to.slice(0, 10);
+    if (first && last && first < last)
+        return { expected_delivery_from: first, expected_delivery: last };
+    return first ? { expected_delivery: first } : {};
+}
 function millis(value) {
     return isoTime(value, TIMEZONE)?.timestamp ?? 0;
 }
@@ -184,7 +204,11 @@ export function parseDHLTrackingResponse(payload, trackingNumber) {
     });
     if (listsNewestFirst(scans) === false)
         scans.reverse();
-    const events = scans.sort((left, right) => millis(right.time) - millis(left.time)).slice(0, 100)
+    // A pre-advice dated after a scan that moved the parcel is a notice, not movement: it is left
+    // out, so the stage cannot move back. One dated first, or with the first move, stays registered.
+    const firstMove = Math.min(...scans.filter((scan) => scan.time && movedParcel(scan.description)).map((scan) => millis(scan.time)));
+    const events = scans.filter((scan) => !(scan.time && preAdvice(scan.description) && millis(scan.time) > firstMove))
+        .sort((left, right) => millis(right.time) - millis(left.time)).slice(0, 100)
         .map(({ time, ...event }) => ({ ...event, ...clock(time, event.location) }));
     const summary = withoutPartnerLink(clean(timeline.status));
     if (!events.length && !summary && details.istZugestellt !== true) {
@@ -192,13 +216,14 @@ export function parseDHLTrackingResponse(payload, trackingNumber) {
             return noData();
         throw new SchemaError(PROVIDER, 'DHL returned no usable tracking status');
     }
-    const currentText = summary || events[0]?.description || 'Delivered';
+    // Nor is a pre-advice DHL gives as its summary once a scan moved the parcel: the newest scan is.
+    const currentText = (preAdvice(summary) && Number.isFinite(firstMove) ? '' : summary) || events[0]?.description || 'Delivered';
     const fallback = Number(timeline.fortschritt) <= 1 ? 'registered' : String(events[0]?.stage || 'in_transit');
     const stage = details.istZugestellt === true
         ? details.ruecksendung === true ? 'returned' : 'delivered'
         : stageForText(currentText, fallback);
     const delivery = isRecord(details.zustellung) ? details.zustellung : {};
-    const expected = date(delivery.zustellzeitfensterVon) || date(delivery.zustellzeitfensterBis);
+    const window = ['delivered', 'returned'].includes(stage) ? {} : deliveryWindow(delivery);
     const stated = date(timeline.datumAktuellerStatus);
     const newest = events[0];
     // The status DHL dates as its newest scan abroad keeps that scan's wall clock.
@@ -209,7 +234,8 @@ export function parseDHLTrackingResponse(payload, trackingNumber) {
         last_status_text: currentText,
         last_update: local ? null : stated || newest?.time || null,
         ...(local ? { last_update_local: local } : {}),
-        expected_delivery: ['delivered', 'returned'].includes(stage) ? null : expected.slice(0, 10) || null,
+        expected_delivery: window.expected_delivery ?? null,
+        ...(window.expected_delivery_from ? { expected_delivery_from: window.expected_delivery_from } : {}),
         timezone: TIMEZONE, events,
         ...(deliveryCarrier ? { delivery_carrier: deliveryCarrier } : {}),
         ...destination(details),

package/dist/carriers/dhl/status.d.ts

@@ -19,6 +19,14 @@ import type { CarrierStatusMap } from '../../core/status/statusMap.js';
  * Germany's booked delivery day; read as unmapped wording, it came as transit.
  */
 export declare const BOOKED_OPTION: RegExp;
+/**
+ * DHL's pre-advice: the sender's electronic data ("Die Sendung wurde elektronisch angekündigt.",
+ * "The instruction data … provided … electronically"). Listed after a scan that moved the parcel,
+ * it is a notice, not movement, and the parser leaves it out.
+ */
+export declare function preAdvice(text: string): boolean;
+/** Whether the wording reads as a step that moved the parcel; unknown wording does not. */
+export declare function movedParcel(text: string): boolean;
 export declare function stageForText(text: string, fallback?: string): string;
 export declare function statusForStage(stage: string): CarrierStatus;
 /**

package/dist/carriers/dhl/status.js

@@ -6,6 +6,19 @@ import { nonterminalEnglishReturn } from '../../core/status/language.js';
  * Germany's booked delivery day; read as unmapped wording, it came as transit.
  */
 export const BOOKED_OPTION = /\bals empfangsoption vorgemerkt\b/i;
+/**
+ * DHL's pre-advice: the sender's electronic data ("Die Sendung wurde elektronisch angekündigt.",
+ * "The instruction data … provided … electronically"). Listed after a scan that moved the parcel,
+ * it is a notice, not movement, and the parser leaves it out.
+ */
+export function preAdvice(text) {
+    return /\belectronically\b|\belektronisch\b/i.test(text) && stageForText(text, '') === 'registered';
+}
+const MOVED = new Set(['accepted', 'in_transit', 'out_for_delivery', 'failed_attempt', 'ready_for_pickup', 'delivered', 'returned']);
+/** Whether the wording reads as a step that moved the parcel; unknown wording does not. */
+export function movedParcel(text) {
+    return MOVED.has(stageForText(text, ''));
+}
 export function stageForText(text, fallback = 'in_transit') {
     const value = text.toLowerCase();
     // A return still to come or under way, such as a parcel left uncollected past its storage period:

package/dist/carriers/dhl/statuses.json

@@ -3,6 +3,7 @@
   "entries": [
     { "wording": "The instruction data for this shipment have been provided by the sender to DHL electronically", "language": "en", "stage": "registered", "confirmedBy": "fixture", "firstSeen": "2026-09-12", "note": "Pre-advice; matched on \"electronically\"." },
     { "wording": "Die Sendung wurde vom Absender elektronisch angekündigt.", "language": "de", "stage": "registered", "confirmedBy": "fixture", "firstSeen": "2026-09-12", "note": "German pre-advice; matched on \"elektronisch\"." },
+    { "wording": "Die Sendung wurde elektronisch angekündigt. Sobald die Sendung von uns bearbeitet wurde, erhalten Sie weitere Informationen.", "language": "de", "stage": "registered", "confirmedBy": "live", "firstSeen": "2026-11-03", "note": "Pre-advice. Seen after a processing scan; dated after a scan that moved the parcel, it is left out of the history." },
     { "wording": "Für diese Sendung wurde ein Liefertag als Empfangsoption vorgemerkt.", "language": "de", "confirmedBy": "live", "firstSeen": "2026-11-03", "note": "The recipient booked a delivery day; deliberately not mapped and left out of the history, like Hermes Germany's booked day, so it is not read as transit." },
     { "wording": "Pick-up has been scheduled for the next working day and the information has been sent to the delivery person", "language": "en", "stage": "registered", "confirmedBy": "live", "firstSeen": "2026-10-19", "note": "A booked collection, before \"Pick-up was successful.\"." },
     { "wording": "Pick-up was successful.", "language": "en", "stage": "accepted", "confirmedBy": "live", "firstSeen": "2026-10-19", "note": "" },

package/dist/carriers/dhl-express/adapter.js

@@ -94,6 +94,14 @@ export function parseUnifiedPiece(payload, raw) {
         throw new SchemaError(PROVIDER, 'DHL returned no waybill for the piece');
     return { ...unifiedResult(shipment), canonical_tracking_number: shipment.id };
 }
+/**
+ * The day of DHL's delivery estimate (`estimatedTimeOfDelivery`), as its own clock writes it.
+ * The date alone is kept, as for DHL eCommerce's reply of the same shape.
+ */
+function estimatedDay(value) {
+    const match = /^(\d{4}-\d{2}-\d{2})(?:T|$)/.exec(clean(value, 64));
+    return match && DateTime.fromISO(match[1]).isValid ? match[1] : null;
+}
 function unifiedResult(shipment) {
     if (!Array.isArray(shipment.events) || shipment.events.length > 1000)
         throw new SchemaError(PROVIDER, 'DHL returned invalid events');
@@ -117,8 +125,9 @@ function unifiedResult(shipment) {
         : ['exception', 'failed_attempt', 'returned'].includes(current.stage) ? 'exception'
             : ['pending', 'registered'].includes(current.stage) ? 'pending' : 'in_transit';
     const destination = isRecord(shipment.destination) && isRecord(shipment.destination.address) ? shipment.destination.address : {};
+    const expected = ['delivered', 'returned'].includes(current.stage) ? null : estimatedDay(shipment.estimatedTimeOfDelivery);
     return { status, current_stage: current.stage, current_stage_source: current.stage_source,
-        last_status_text: current.description, last_update: current.time ?? null, events,
+        last_status_text: current.description, last_update: current.time ?? null, expected_delivery: expected, events,
         ...(typeof destination.countryCode === 'string' && /^[A-Z]{2}$/.test(destination.countryCode) ? { destination_country: destination.countryCode } : {}) };
 }
 /**

package/dist/carriers/dhl-express/carrier.json

@@ -32,7 +32,8 @@
   },
   "capabilities": [
     "history",
-    "location"
+    "location",
+    "eta"
   ],
   "portal": {
     "url": "https://mydhl.express.dhl/gb/en/tracking.html#/results?id={trackingNumber}",
@@ -43,12 +44,14 @@
       "status",
       "history",
       "location",
+      "eta",
       "signature"
     ],
     "scraped": [
       "status",
       "history",
-      "location"
+      "location",
+      "eta"
     ],
     "discarded": [
       "signature"

package/dist/carriers/dhlink/carrier.json

@@ -33,6 +33,7 @@
   "capabilities": [
     "history",
     "location",
+    "eta",
     "provider_code",
     "destination_country",
     "delivery_partner",
@@ -52,7 +53,8 @@
       "destination_country",
       "tracking_alias",
       "delivery_tracking_number",
-      "order_reference"
+      "order_reference",
+      "eta"
     ],
     "scraped": [
       "status",
@@ -61,7 +63,8 @@
       "provider_code",
       "destination_country",
       "delivery_partner",
-      "delivery_tracking_number"
+      "delivery_tracking_number",
+      "eta"
     ],
     "discarded": [
       "progress_rail",
@@ -71,7 +74,6 @@
       "order_reference"
     ],
     "unavailable": [
-      "eta",
       "offset_timestamps",
       "delivered_at",
       "service_name",

package/dist/carriers/dhlink/parser.js

@@ -1,6 +1,7 @@
 import { DateTime, FixedOffsetZone } from 'luxon';
 import { normalizeTrackingNumber } from '../../core/detection/index.js';
 import { IndeterminateError, InvalidInputError, NotFoundError, SchemaError } from '../../core/errors/index.js';
+import { uspsRoundDelivery } from '../../core/result/round.js';
 import { languageStageStatus } from '../../core/status/index.js';
 import { countryCode, firstOccurrence, isoTime, usStateTimeZone } from '../../core/time/index.js';
 import { cleanScalar } from '../../core/transport/text.js';
@@ -182,6 +183,10 @@ function outranks(left, right) {
     const index = left.findIndex((value, position) => value !== right[position]);
     return index >= 0 && left[index] > right[index];
 }
+/** The delivery a relayed USPS round promises on its scan's day. */
+function roundDelivery(event) {
+    return typeof event.time === 'string' ? uspsRoundDelivery(event.description ?? '', event.time.slice(0, 10)) : null;
+}
 /** The last leg, when its number's whole layout is one the table maps. */
 function lastLeg(entry) {
     const number = normalizeTrackingNumber(text(entry, 'lastTurnNo', 64));
@@ -261,7 +266,8 @@ export function parseDhlink(payload, raw, readAt = Date.now()) {
         && other.scan.event.description === scan.event.description && usClockCopy(scan.stamp, other.time.timestamp))) : [];
     // A place naming only the destination country is the parcel's, not the scan's: a Canada line's
     // airline hand-over in China reads "Canada".
-    const events = dated.filter((entry) => !copies.includes(entry))
+    const kept = dated.filter((entry) => !copies.includes(entry));
+    const events = kept
         .map(({ scan, time }) => {
         const { location, ...event } = scan.event;
         const placed = location && !(destination && countryCode(location) === destination) ? { location } : {};
@@ -288,13 +294,16 @@ export function parseDhlink(payload, raw, readAt = Date.now()) {
         stage = 'delivered';
         source = 'carrier_map';
     }
+    // The round the parcel is on, when it is the current scan and is read on the destination's clock.
+    const round = stage === 'out_for_delivery' && current?.stage === 'out_for_delivery'
+        && ![null, RECORD_ZONE].includes(kept[events.indexOf(current)].zone) ? roundDelivery(current) : null;
     return {
         status: stage ? languageStageStatus(stage) : 'unknown',
         ...(stage ? { current_stage: stage, current_stage_source: source } : {}),
         last_status_text: newest.description,
         last_update: newest.time ?? null,
         ...(newest.local_time ? { last_update_local: newest.local_time } : {}),
-        expected_delivery: null,
+        expected_delivery: round,
         ...(stage === 'delivered' && newest.stage === 'delivered' && newest.time ? { delivered_at: newest.time } : {}),
         ...(last && ![number, tracking, own].includes(last.number) ? { delivery_carrier: last.leg.carrier, delivery_tracking_number: last.number } : {}),
         ...(COUNTRY.test(destination) ? { destination_country: destination } : {}),

package/dist/carriers/dpd-pt/carrier.json

@@ -32,6 +32,7 @@
   "capabilities": [
     "history",
     "provider_code",
+    "eta_window",
     "pickup_point"
   ],
   "portal": {
@@ -54,12 +55,12 @@
       "status",
       "history",
       "provider_code",
+      "eta_window",
       "pickup_point"
     ],
     "discarded": [
       "progress_rail",
       "coordinates",
-      "eta_window",
       "depot_code",
       "signatory",
       "proof_of_delivery"

package/dist/carriers/dpd-pt/parser.js

@@ -5,7 +5,7 @@ import { normalizeTrackingNumber } from '../../core/detection/index.js';
 import { ChallengeError, IndeterminateError, InvalidInputError, NoHistoryError, NotFoundError, SchemaError } from '../../core/errors/index.js';
 import { languageStageStatus } from '../../core/status/index.js';
 import { clean } from '../../core/transport/index.js';
-import { DPD_PT_COLLECTION, DPD_PT_DELIVERY, DPD_PT_FORECAST, DPD_PT_POINT_RECEIPT, DPD_PT_RETURN, dpdPtStage, isDpdPtNotice } from './status.js';
+import { DPD_PT_COLLECTION, DPD_PT_DELIVERY, DPD_PT_FORECAST, DPD_PT_POINT_RECEIPT, DPD_PT_RETURN, DPD_PT_WINDOW, dpdPtStage, isDpdPtNotice, } from './status.js';
 export const PROVIDER = 'DPD Portugal';
 // The page is under 50 kB with a long history.
 export const DPD_PT_MAX_BYTES = 1024 * 1024;
@@ -16,6 +16,8 @@ const HEADERS = ['Código', 'Data', 'Hora', 'Descrição', 'Comentário', 'Local
 const CODE = /^[A-Z0-9]{1,8}$/;
 const DATE = /^(\d{2})-(\d{2})-(\d{4})$/;
 const CLOCK = /^(\d{2}):(\d{2})$/;
+// The delivery window a message to the recipient gives, as "10:45 - 11:45".
+const WINDOW = /^((?:[01]\d|2[0-3]):[0-5]\d)\s*-\s*((?:[01]\d|2[0-3]):[0-5]\d)$/;
 const MAX_ROWS = 500;
 const MAX_EVENTS = 100;
 /** A DPD parcel number: fourteen digits, or fourteen and their matching check character, looked up by the digits. */
@@ -62,6 +64,25 @@ function pickupPoint(newestFirst) {
     }
     return null;
 }
+/**
+ * The hour DPD's message gives the recipient on the delivery day (code 706), while that delivery
+ * is still ahead: the message is the day's, and nothing after it but the van's scans and other
+ * messages. A failed attempt, a return to the depot or a later day ends it.
+ */
+function deliveryWindow(newestFirst, stage) {
+    if (stage !== 'in_transit' && stage !== 'out_for_delivery')
+        return null;
+    const at = newestFirst.findIndex(scan => scan.code === DPD_PT_WINDOW);
+    if (at < 0)
+        return null;
+    const message = newestFirst[at];
+    const hours = WINDOW.exec(message.comment);
+    const day = message.event.local_time.slice(0, 10);
+    if (!hours || hours[2] <= hours[1] || newestFirst[0].event.local_time.slice(0, 10) !== day)
+        return null;
+    const ahead = newestFirst.slice(0, at).every(({ event }) => event.stage_source === 'none' || event.stage === 'out_for_delivery');
+    return ahead ? `${day} ${hours[1]}–${hours[2]}` : null;
+}
 /**
  * The tracker's page for one reference: a heading naming the reference asked,
  * then either its not-found notice or the scans, newest first, in a table of
@@ -118,8 +139,9 @@ export function parseDpdPt(html, raw) {
         if (code === DPD_PT_FORECAST)
             continue;
         // The comment column mixes the receiver's name, delivery windows, depot
-        // and pickup point codes and references; only a pickup point's name is read.
-        const comment = code === DPD_PT_POINT_RECEIPT ? clean(cells.eq(4).text(), 120) : '';
+        // and pickup point codes and references; only a pickup point's name and a
+        // window message's hours are read.
+        const comment = code === DPD_PT_POINT_RECEIPT || code === DPD_PT_WINDOW ? clean(cells.eq(4).text(), 120) : '';
         const key = JSON.stringify([local_time, code, description]);
         // The page lists some scans twice.
         if (seen.has(key))
@@ -161,7 +183,7 @@ export function parseDpdPt(html, raw) {
         last_status_text: (decider ?? events[0]).description,
         last_update: null,
         last_update_local: events[0].local_time,
-        expected_delivery: null,
+        expected_delivery: deliveryWindow(scans, stage),
         ...(point ? { pickup_point: point } : {}),
         events: events.slice(0, MAX_EVENTS),
         ...(events.length > MAX_EVENTS ? { history_truncated: true } : {}),

package/dist/carriers/dpd-pt/status.d.ts

@@ -8,6 +8,8 @@ export declare const DPD_PT_DELIVERY = "POD";
 export declare const DPD_PT_RETURN = "424";
 /** The pickup point's own scan; its comment names the point. */
 export declare const DPD_PT_POINT_RECEIPT = "002";
+/** The message giving the recipient the delivery's hour on its day; the comment column holds the window. */
+export declare const DPD_PT_WINDOW = "706";
 /** The expected delivery day, dated when DPD set it rather than with the day: the history leaves it out. */
 export declare const DPD_PT_FORECAST = "714";
 /** The stage DPD Portugal's code gives a scan, if any, read without the scans before it. */

package/dist/carriers/dpd-pt/status.js

@@ -40,6 +40,8 @@ export const DPD_PT_DELIVERY = 'POD';
 export const DPD_PT_RETURN = '424';
 /** The pickup point's own scan; its comment names the point. */
 export const DPD_PT_POINT_RECEIPT = '002';
+/** The message giving the recipient the delivery's hour on its day; the comment column holds the window. */
+export const DPD_PT_WINDOW = '706';
 /** The expected delivery day, dated when DPD set it rather than with the day: the history leaves it out. */
 export const DPD_PT_FORECAST = '714';
 // Messages to the recipient and requests for a new delivery or address: no

package/dist/carriers/fedex/adapter.js

@@ -191,6 +191,36 @@ function expectedDelivery(value) {
     const match = /^(\d{4}-\d{2}-\d{2})/.exec(cleanScalar(value, 64));
     return match ? match[1] : null;
 }
+function windowEnd(value) {
+    const raw = cleanScalar(value, 64);
+    const match = /^(\d{4})-(\d{2})-(\d{2})(?:T([01]\d|2[0-3]):([0-5]\d)(?::[0-5]\d(?:\.\d+)?)?)?/.exec(raw);
+    const day = match ? calendarDay(Number(match[1]), Number(match[2]), Number(match[3])) : null;
+    if (!match || !day)
+        return null;
+    const clock = match[4] && `${match[4]}:${match[5]}` !== '00:00' ? `${match[4]}:${match[5]}` : '';
+    return { day, clock, instant: clock ? explicitOffsetTime(raw) : null };
+}
+/**
+ * A window's two ends: two instants when both carry an offset, a slot on one day when
+ * they carry wall clocks alone, and a range of days when both are days.
+ */
+function windowEstimate(beginsValue, endsValue) {
+    const begins = windowEnd(beginsValue);
+    const ends = windowEnd(endsValue);
+    if (!begins || !ends)
+        return null;
+    if (begins.instant && ends.instant) {
+        return begins.instant.timestamp < ends.instant.timestamp
+            ? { expected_delivery_from: begins.instant.iso, expected_delivery: ends.instant.iso } : null;
+    }
+    if (begins.clock && ends.clock) {
+        return begins.day === ends.day && begins.clock < ends.clock
+            ? { expected_delivery: `${begins.day} ${begins.clock}–${ends.clock}` } : null;
+    }
+    if (begins.clock || ends.clock)
+        return null;
+    return begins.day < ends.day ? { expected_delivery_from: begins.day, expected_delivery: ends.day } : null;
+}
 /** A delivered-at instant; offset-less or unparsable values are dropped. */
 function deliveredAt(value) {
     return explicitOffsetTime(value)?.iso ?? null;
@@ -302,7 +332,7 @@ function shipmentResult(shipment, number) {
     const stage = afterCutoff ? 'accepted' : FEDEX_CODE_STAGE[keyStatusCD] ?? wording ?? undefined;
     const status = afterCutoff ? 'in_transit' : fedexStatus(keyStatusCD, `${keyStatus} ${statusDetails}`, trimmed.length > 0);
     const delivered = stage === 'delivered';
-    const estimate = delivered ? null : expectedDelivery(shipment.estimate);
+    const estimate = delivered ? null : shipment.estimate;
     const pickupPoint = stage === 'ready_for_pickup' ? shipment.holdLocation : '';
     const postal = uspsHandoff(shipment.scans, number);
     // A host starts a scan dated by its day alone at midnight on the result's zone, else the catalog's
@@ -317,7 +347,8 @@ function shipmentResult(shipment, number) {
         // A newest scan dated by its day alone has no instant, only that day.
         ...(!newest?.time && typeof newest?.local_time === 'string' ? { last_update_local: newest.local_time } : {}),
         ...(dayZone ? { timezone: dayZone } : {}),
-        expected_delivery: estimate,
+        expected_delivery: estimate?.expected_delivery ?? null,
+        ...(estimate?.expected_delivery_from ? { expected_delivery_from: estimate.expected_delivery_from } : {}),
         ...(delivered && deliveredAt(shipment.deliveredAt)
             ? { delivered_at: deliveredAt(shipment.deliveredAt) } : {}),
         ...(pickupPoint ? { pickup_point: pickupPoint } : {}),
@@ -378,7 +409,7 @@ export function parseFedExTrackingResponse(payload, trackingNumber, readAt = Dat
         statusText: keyStatus,
         statusCode: keyStatusCD,
         statusDetails,
-        estimate: shipment.estDeliveryDt,
+        estimate: { expected_delivery: expectedDelivery(shipment.estDeliveryDt) },
         deliveredAt: shipment.actDeliveryDt,
         holdLocation: holdLocation(shipment.halCmpnyName, shipment.halAddress, shipment.halresidential === true),
     }, number);
@@ -393,6 +424,21 @@ function apiDate(result, ...types) {
     }
     return undefined;
 }
+/**
+ * The API's estimate: the day of `ESTIMATED_DELIVERY`, which FedEx dates at midnight, and
+ * `estimatedDeliveryTimeWindow` when it falls on that day or FedEx gives no such date.
+ * A window without both ends still gives its end's day.
+ */
+function apiEstimate(result) {
+    const day = expectedDelivery(apiDate(result, 'ESTIMATED_DELIVERY'));
+    const window = isRecord(result.estimatedDeliveryTimeWindow) && isRecord(result.estimatedDeliveryTimeWindow.window)
+        ? result.estimatedDeliveryTimeWindow.window : {};
+    const range = windowEstimate(window.begins, window.ends);
+    const onDay = (value) => !value || value.slice(0, 10) === day;
+    if (range && (!day || (onDay(range.expected_delivery_from) && onDay(range.expected_delivery))))
+        return range;
+    return { expected_delivery: day ?? expectedDelivery(window.ends) };
+}
 /**
  * The official Track API's answer (`POST /track/v1/trackingnumbers`). It reads
  * the scans, the latest status, the delivery dates and the hold location; the
@@ -431,8 +477,6 @@ export function parseFedExApiResponse(payload, trackingNumber, readAt = Date.now
         ? latest.ancillaryDetails.filter(isRecord).map((detail) => clean(detail.reasonDescription)).filter(Boolean) : [];
     const hold = isRecord(result.holdAtLocation) ? result.holdAtLocation : {};
     const held = isRecord(hold.locationContactAndAddress) ? hold.locationContactAndAddress : {};
-    const estimateWindow = isRecord(result.estimatedDeliveryTimeWindow) && isRecord(result.estimatedDeliveryTimeWindow.window)
-        ? result.estimatedDeliveryTimeWindow.window : {};
     return shipmentResult({
         scans: scans.slice(0, MAX_EVENTS_TO_INSPECT).map((raw) => ({
             description: scanDescription(clean(raw.eventDescription), clean(raw.exceptionDescription)),
@@ -445,7 +489,7 @@ export function parseFedExApiResponse(payload, trackingNumber, readAt = Date.now
         statusText,
         statusCode,
         statusDetails: reasons.join(' '),
-        estimate: apiDate(result, 'ESTIMATED_DELIVERY') ?? estimateWindow.ends,
+        estimate: apiEstimate(result),
         deliveredAt: apiDate(result, 'ACTUAL_DELIVERY'),
         holdLocation: holdLocation(isRecord(held.contact) ? held.contact.companyName : undefined, held.address, false),
     }, number);