universal-parcel-scraper 0.993.0-main.5345 → 0.993.2-main.5350

package/dist/carriers/dhlink/clock.d.ts

@@ -5,3 +5,5 @@ export declare const DHLINK_RECORD_ZONE = "Asia/Shanghai";
  * gives that instant.
  */
 export declare function usClockCopy(wall: string, timestamp: number): boolean;
+/** The US zone, the state's first, on whose clock `wall` strikes at `timestamp`; null when none does. */
+export declare function usClockZone(wall: string, timestamp: number, state?: string | null): string | null;

package/dist/carriers/dhlink/clock.js

@@ -10,5 +10,9 @@ const US_ZONES = ['America/New_York', 'America/Chicago', 'America/Denver', 'Amer
  * gives that instant.
  */
 export function usClockCopy(wall, timestamp) {
-    return US_ZONES.some((zone) => isoTime(wall, zone)?.timestamp === timestamp);
+    return usClockZone(wall, timestamp) !== null;
+}
+/** The US zone, the state's first, on whose clock `wall` strikes at `timestamp`; null when none does. */
+export function usClockZone(wall, timestamp, state) {
+    return [...(state ? [state] : []), ...US_ZONES].find((zone) => isoTime(wall, zone)?.timestamp === timestamp) ?? null;
 }

package/dist/carriers/dhlink/parser.js

@@ -7,7 +7,7 @@ import { countryCode, firstOccurrence, isoTime, usStateTimeZone } from '../../co
 import { cleanScalar } from '../../core/transport/text.js';
 import { isRecord } from '../../core/types.js';
 import { countryZones } from '../../places/zones.js';
-import { DHLINK_RECORD_ZONE as RECORD_ZONE, usClockCopy } from './clock.js';
+import { DHLINK_RECORD_ZONE as RECORD_ZONE, usClockCopy, usClockZone } from './clock.js';
 import { dhlinkEnglish, dhlinkStage, FLIGHT_BOOKED } from './status.js';
 export const PROVIDER = 'DHLink';
 // A long history is a few dozen kilobytes.
@@ -179,6 +179,10 @@ function projectRow(row, readAt) {
     return { stamp: local, event, rank, china, state, hub: usStateTimeZone(hub) !== null,
         recorded: Math.min(recordedAt(row) ?? readAt, readAt) };
 }
+/** A relayed wording without the town and state a US partner can write before it ("Sampletown IL, "). */
+function unplaced(description) {
+    return (description ?? '').replace(/^[A-Z][A-Za-z .'-]{0,40} [A-Z]{2}, /, '');
+}
 function outranks(left, right) {
     const index = left.findIndex((value, position) => value !== right[position]);
     return index >= 0 && left[index] > right[index];
@@ -259,6 +263,29 @@ export function parseDhlink(payload, raw, readAt = Date.now()) {
         const zone = scanZone(scan, destination, last?.leg.beijingClock === true && !(scan.hub && last.leg.hubClockPickup));
         return { scan, zone, time: zone ? isoTime(scan.stamp, zone) : null };
     });
+    // A US partner's scan can come twice, as UniUni's do: on its hub's wall clock, often after the
+    // hub's town, and on UTC. The UTC copy's clock is the other's on a US reading, to the second,
+    // before DHLink recorded either: one scan, on that US clock.
+    const utcCopies = new Set();
+    if (destination === 'US') {
+        for (const local of dated) {
+            if (utcCopies.has(local))
+                continue;
+            const wording = unplaced(local.scan.event.description);
+            const copy = dated.find((other) => {
+                if (other === local || utcCopies.has(other) || unplaced(other.scan.event.description) !== wording)
+                    return false;
+                const instant = isoTime(other.scan.stamp, 'UTC')?.timestamp;
+                return instant !== undefined && instant <= Math.min(local.scan.recorded, other.scan.recorded) + CLOCK_SKEW_MS
+                    && usClockZone(local.scan.stamp, instant, local.scan.state) !== null;
+            });
+            if (!copy)
+                continue;
+            const zone = usClockZone(local.scan.stamp, isoTime(copy.scan.stamp, 'UTC').timestamp, local.scan.state);
+            Object.assign(local, { zone, time: isoTime(local.scan.stamp, zone) });
+            utcCopies.add(copy);
+        }
+    }
     // Beside DHLink's own record of a partner's scan on Beijing time, the partner's copy can come
     // on its US wall clock: the same wording, at the instant of DHLink's row on a US reading.
     // Without a partner known to be relayed on Beijing time, DHLink's row must be read on it.
@@ -266,7 +293,7 @@ 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 kept = dated.filter((entry) => !copies.includes(entry));
+    const kept = dated.filter((entry) => !copies.includes(entry) && !utcCopies.has(entry));
     const events = kept
         .map(({ scan, time }) => {
         const { location, ...event } = scan.event;

package/dist/providers/parcelsapp/adapter.js

@@ -207,9 +207,12 @@ const WALL_CLOCKS = new Set(['usps', 'canadapost', 'gofoexpress', 'speedpak', 'e
  * USPS's own rows read "Shipping Label Created, USPS Awaiting Item". Its date
  * is the instant: read on its place's clock, a label came eight hours after
  * ParcelsApp first returned it, and Juxi Express's rows of this shape fall
- * between 17TRACK's instants of the same warehouse's steps as labeled.
+ * between 17TRACK's instants of the same warehouse's steps as labeled. Only a
+ * label or a shipping partner's step is such a row: USPS's own scans can come
+ * with their place after them too ("USPS picked up item, EXAMPLE CITY, KY
+ * 12345"), and USPS's own tracker dates them on their place's clock.
  */
-const USPS_PARTNER_ROW = /,[^,]+,\s*[A-Z]{2}\s+\d{5}(?:-\d{4})?$/;
+const USPS_PARTNER_ROW = /^(?:shipping label created|[^,]*\bshipping partner\b[^,]*),[^,]+,\s*[A-Z]{2}\s+\d{5}(?:-\d{4})?$/i;
 const uspsPartnerRow = (name, status) => nameKey(name) === 'usps' && USPS_PARTNER_ROW.test(status.trim());
 // Known clocks that are the destination or origin country's (`knownClock`).
 const DESTINATION = 'destination';

package/dist/providers/seventeentrack/adapter.js

@@ -16,7 +16,7 @@ import { runSteps } from '../../core/runner/index.js';
 import { countryTimeZone, firstOccurrence } from '../../core/time/index.js';
 import { isRecord } from '../../core/types.js';
 import { trackingPlace } from '../../places/trackingLocation.js';
-import { chinaPostEnglish, chinaPostLabelPlace } from '../../carriers/china-post/status.js';
+import { chinaPostDestinationScan, chinaPostEnglish, chinaPostLabelPlace } from '../../carriers/china-post/status.js';
 import { agencyIntake, cttSiteZone, isCttExpressAgency } from '../../carriers/ctt/clock.js';
 import { correosOriginZone } from '../../carriers/correos-spain/clock.js';
 import { daiPostRelayZone } from '../../carriers/dai-post/clock.js';
@@ -553,6 +553,10 @@ export function parse17TrackResponse(payload, trackingNumber, postcode = null) {
             ? nzPostAbroad(provider.events, number, nzPostDestination(shipment, tracking.providers)) : new Map();
         const origin = reported.key === CHINA_POST ? originZone(number) : reported.key === JAPAN_POST ? japanPostOriginZone(number) : null;
         const outward = reported.key === JAPAN_POST ? OUTWARD_SCAN : ORIGIN_EXCHANGE;
+        // China Post's copies of the destination post's own scans keep that post's wall clock, as China Post's adapter
+        // reads them, and 17TRACK labels them with China's offset: Correos's arrival at its exchange office at 09:25
+        // Madrid time showed in China Post's leg at 09:25 +08:00, seven hours before Correos's own row of it.
+        const inbound = reported.key === CHINA_POST ? countryTimeZone(recipientCountry(shipment)) : null;
         const salvador = reported.key === CORREO_EL_SALVADOR;
         const sender = salvador && isValidS10TrackingNumber(number) ? countryTimeZone(number.slice(-2)) : null;
         const bound = reported.key === SWISS_POST ? recipientCountry(shipment) : null;
@@ -581,6 +585,7 @@ export function parse17TrackResponse(payload, trackingNumber, postcode = null) {
             if (undatedScan(raw))
                 undated++;
             const exchange = origin !== null && outward.test(text(raw.description).trim());
+            const arrived = inbound !== null && chinaPostDestinationScan(text(raw.description));
             const own = !salvador ? null : OUTBOUND.test(text(raw.description)) ? sender : 'UTC';
             // The destination post's scan Swiss Post relays, its wall clock under Swiss Post's offset, or Huiyi Logistics' row in China under "+00:00".
             const relayed = bound ? swissPostDestinationZone(text(raw.description), text(raw.location), bound)
@@ -597,15 +602,15 @@ export function parse17TrackResponse(payload, trackingNumber, postcode = null) {
             const site = !ctt ? null : cttSiteZone(text(raw.location), countries)
                 ?? (!text(raw.location) && agencyIntake(wallMillis(raw), agencyScans) ? 'Europe/Madrid' : null);
             // A facility's clock, CTT's, A1's UTC, NZ Post's, Poland Post's, FIC's partner's, Correos de El Salvador's, Correos de Chile's, Shiprocket's, DAI Post's, Quick Rabbit's or an origin post's, on which 17TRACK puts one offset for the whole parcel.
-            const read = facility || site || relaysFacilityClock(name) || utc || nz || polish || handed || exchange || own || chile || shiprocket || daiPost || quickRabbit
-                || sent !== undefined;
+            const read = facility || site || relaysFacilityClock(name) || utc || nz || polish || handed || exchange || arrived || own || chile || shiprocket || daiPost
+                || quickRabbit || sent !== undefined;
             // Any other row 17TRACK labelled with its zone's offset on the day it looks, not on the scan's.
             const season = relayed || hywl || read || poland ? null : seasonZone(raw, labelled, now);
             const wall = relayed || hywl ? rawClock(raw) : read || season ? facilityWall(raw) : null;
             // A label its mailer wrote on UTC, as USPS's adapter reads it.
             const scanned = facility && wall ? uspsRowZone(wall, facility, text(raw.description), now.toMillis()) : facility;
             const zone = !wall ? null : season ?? (hywl ? relayed : relayed ?? scanned ?? site ?? own ?? (sent !== undefined ? sent : abroad.has(index) ? abroad.get(index) ?? null
-                : exchange ? origin : utc ? 'UTC' : polish ? polish : handed ? handed
+                : exchange ? origin : arrived ? inbound : utc ? 'UTC' : polish ? polish : handed ? handed
                     : nz ? 'Pacific/Auckland' : quickRabbit ? 'Europe/Madrid' : chile ? facilityZone(text(raw.location)) ?? 'America/Santiago'
                         : shiprocket ? (placedInIndia(text(raw.location)) ? 'Asia/Kolkata' : null)
                             : daiPost ? daiPostRelayZone(text(raw.description), text(raw.location)) : facilityZone(text(raw.location))));

package/dist/server/openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Universal Parcel Scraper",
-    "version": "0.993.0-main.5345"
+    "version": "0.993.2-main.5350"
   },
   "paths": {
     "/health": {

package/package.json

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