universal-parcel-scraper 0.969.3-main.5259 → 0.969.5-main.5263

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,928 such statuses, each filed under one stage.
+The carrier folders record 18,933 such statuses, each filed under one stage.
 <!-- /GENERATED:stages -->
 
 Wording nobody recorded yet goes through a classifier that reads seven European languages.

package/dist/carriers/first-line/identity.d.ts

@@ -0,0 +1,2 @@
+import type { SameInstantIdentityPolicy } from '../../core/catalog/eventIdentity.js';
+export declare const sameInstantIdentityPolicy: SameInstantIdentityPolicy;

package/dist/carriers/first-line/identity.js

@@ -0,0 +1,7 @@
+import { matchesRereadLocation } from '../../core/catalog/locationIdentity.js';
+import { firstLinePlace } from './place.js';
+// A row stored with GOFO's town and state said twice is taken over by the scan that names them once.
+export const sameInstantIdentityPolicy = {
+    sourceCarrierId: 'first-line', storedSources: ['first-line'], requireProviderCode: false, matchEachScan: true,
+    matches: (incoming, stored) => matchesRereadLocation(incoming, stored, firstLinePlace),
+};

package/dist/carriers/first-line/parser.js

@@ -7,6 +7,7 @@ import { normalizeStatusWording } from '../../core/status/statusMap.js';
 import { firstOccurrence } from '../../core/time/index.js';
 import { textFromHtml } from '../../core/transport/index.js';
 import { FIRST_LINE_CHINA_ZONE, firstLineInChina } from './clock.js';
+import { firstLinePlace } from './place.js';
 import { firstLineStage } from './status.js';
 export const PROVIDER = 'FIRST LINE';
 // A long history is a few kilobytes; the tracking page is about twelve.
@@ -43,10 +44,6 @@ export function parseFirstLinePage(html) {
         throw new ChallengeError(PROVIDER, 'FIRST LINE answered its tracking page with a browser check');
     throw new SchemaError(PROVIDER, 'FIRST LINE’s tracking page holds no lookup address');
 }
-/** A place as the tracker writes it, without a trailing postcode. */
-function placeOf(location) {
-    return location.replace(/\s+\d{4,6}(?:-\d{4})?$/, '').trim();
-}
 function stageOf(description) {
     const mapped = firstLineStage(null, normalizeStatusWording(description));
     if (mapped)
@@ -70,7 +67,7 @@ function projectRow(row, readAt) {
     const description = textFromHtml(match[4]);
     if (!description)
         return null;
-    const location = placeOf(textFromHtml(match[3], 200));
+    const location = firstLinePlace(textFromHtml(match[3], 200));
     const staged = stageOf(description);
     // A row in China or Hong Kong is on Beijing's clock; any other keeps its wall clock.
     const inChina = location ? firstLineInChina(location) : ORDER_DATA.test(description);

package/dist/carriers/first-line/place.d.ts

@@ -0,0 +1,2 @@
+/** A place as the tracker writes it, without a trailing postcode or a US town and state said twice. */
+export declare function firstLinePlace(location: string): string;

package/dist/carriers/first-line/place.js

@@ -0,0 +1,7 @@
+// A US partner's place as the tracker relays GOFO's: its hub's "Town, ST", then the town again and the state,
+// "Melrose Park, IL, Melrose Park IL", or the state alone, "Melrose Park, IL IL".
+const REPEATED_TOWN = /^(\S[^,]{0,80}), ([A-Z]{2})(?:,? \1)? \2$/;
+/** A place as the tracker writes it, without a trailing postcode or a US town and state said twice. */
+export function firstLinePlace(location) {
+    return location.replace(/\s+\d{4,6}(?:-\d{4})?$/, '').trim().replace(REPEATED_TOWN, '$1, $2');
+}

package/dist/carriers/first-line/statuses.json

@@ -18,6 +18,7 @@
     {"wording": "Customs broker picked it up", "language": "en", "stage": "in_transit", "confirmedBy": "live", "firstSeen": "2026-11-03", "note": "The customs broker collecting the parcel after its import release, before the hand-over to the delivery carrier: it is no longer held in customs."},
     {"wording": "The package has been transferred to the service provider", "language": "en", "stage": "in_transit", "confirmedBy": "live", "firstSeen": "2026-11-03", "note": "The hand-over to the delivery carrier after the broker's collection."},
     {"wording": "Arrived at GOFO Regional Hub", "language": "en", "stage": "in_transit", "confirmedBy": "live", "firstSeen": "2026-11-04", "note": "The delivering partner GOFO's sorting hub."},
+    {"wording": "Loaded on Vehicle", "language": "en", "stage": "in_transit", "confirmedBy": "live", "firstSeen": "2026-11-05", "note": "GOFO loading the parcel on the truck at its sorting hub, minutes before the hub's departure scan: not the delivery round."},
     {"wording": "Departed GOFO Regional Hub", "language": "en", "stage": "in_transit", "confirmedBy": "live", "firstSeen": "2026-11-04", "note": "Leaving GOFO's sorting hub for its delivery station."},
     {"wording": "Arrived at GOFO Delivery Station", "language": "en", "stage": "in_transit", "confirmedBy": "live", "firstSeen": "2026-11-04", "note": "GOFO's last-mile station, before its delivery round."}
   ]

package/dist/carriers/js-express/identity.js

@@ -14,11 +14,29 @@ export const sameInstantIdentityPolicy = {
     ...translated,
     // A row stored with a label that names no place, without a letter as the parser reads it, is
     // taken over by the row without it. So is one stored at the tracker's "Array", whatever stage
-    // the map has given its wording since, and an iMile delivery stored with its receiver type.
+    // the map has given its wording since, an iMile delivery stored with its receiver type, and
+    // China Post's scan from the feed that keeps minutes, less than a minute from the other's.
     matches: (incoming, stored) => translated.matches(incoming, stored)
         || matchesDroppedLocation(incoming, stored, (location) => !/\p{L}/u.test(location))
-        || listPlace(incoming, stored) || receiverCut(incoming, stored),
+        || listPlace(incoming, stored) || receiverCut(incoming, stored) || officeCoded(incoming, stored),
+    matchWithinMinute: true,
 };
+// China Post's domestic scans, as the tracker relays them, come from two feeds: one dates them to the
+// minute and places them in the town ("郑州市"), the other to the second, with the office's code after
+// the town ("郑州市 45004400"). The first can word an arrival for the customer, the parcel a 快件 and the
+// centre's slogan after it, where the other has 邮件 and the centre alone.
+const OFFICE_CODE = /^(\S.*?)\s+\d{6,10}$/;
+const POST_SCAN = /^(?:快件|邮件)(到达|离开)(【[^】]{1,80}】)/;
+const postScan = (wording) => POST_SCAN.exec(normalized(wording))?.slice(1).join('');
+function officeCoded(incoming, stored) {
+    const [place, saved] = [incoming.location.trim(), stored.location.trim()];
+    const [coded, savedCoded] = [OFFICE_CODE.exec(place), OFFICE_CODE.exec(saved)];
+    if (!coded === !savedCoded || (coded?.[1] ?? place) !== (savedCoded?.[1] ?? saved))
+        return false;
+    const scan = postScan(incoming.description);
+    return (sameWording(incoming.description, stored.description) || (scan !== undefined && scan === postScan(stored.description)))
+        && (!incoming.providerCode || !stored.providerCode || incoming.providerCode === stored.providerCode);
+}
 function listPlace(incoming, stored) {
     return stored.location.trim() === LIST_PLACE && !incoming.location.trim() && sameWording(incoming.description, stored.description);
 }

package/dist/carriers/yanwen/status.js

@@ -1,6 +1,7 @@
 import { languageStageStatus } from '../../core/status/index.js';
 import { normalizeStatusWording } from '../../core/status/statusMap.js';
 import { chinaPostRelayedStage } from '../china-post/status.js';
+import { jAndTAuMappedStage } from '../j-and-t-au/status.js';
 const WORDING = new Map([
     ['Delivered.', { status: 'delivered', stage: 'delivered' }],
     ['Shipment out for delivery.', { status: 'out_for_delivery', stage: 'out_for_delivery' }],
@@ -136,10 +137,18 @@ const DELIVERY_ICON = 'LM40';
 const withoutPrefix = (description) => description.replace(/^【[^】]*】\s*/, '').replace(/^[a-z]{2}\.(?=\S)/i, '').trim();
 // A partner's postal event can end with its country's code: "Arrival at Destination Post (Country: TR)".
 const bare = (description) => withoutPrefix(description).replace(/\s*\(Country(?: code)?: [a-z]{2}\)$/i, '');
+// J&T Express Australia's scans after Yanwen's batch handover at the destination port, relayed with its customer
+// service line: read as J&T's own map reads them, but its pickup is Yanwen's handover, not the parcel's acceptance.
+const HOTLINE = /[\s.]*customer service\s*[:：]\s*\d[\d\s]*$/i;
+function jAndTAuRelayedStage(wording) {
+    const stage = jAndTAuMappedStage(wording.replace(HOTLINE, '.'));
+    return stage === 'accepted' ? 'in_transit' : stage;
+}
 // China Post's domestic scans, which Yanwen relays in Chinese with the centre in 【】, read as China Post's own
-// map reads them: "邮件离开【…】，正在发往下一站" in transit, the security check's "【…】退回" an exception.
+// map reads them: "邮件离开【…】，正在发往下一站" in transit, the security check's "【…】退回" an exception. Then J&T Australia's.
+const relayedStage = (normalized) => chinaPostRelayedStage(normalized) ?? jAndTAuRelayedStage(normalized);
 function relayedStatus(description) {
-    const stage = chinaPostRelayedStage(normalizeStatusWording(description));
+    const stage = relayedStage(normalizeStatusWording(description));
     return stage ? { status: languageStageStatus(stage), stage } : undefined;
 }
 export function yanwenStatus(description, code) {
@@ -157,7 +166,7 @@ const NOTICES = new Map([
 export const yanwenNotice = (description) => NOTICES.has(normalizeStatusWording(withoutPrefix(description)));
 /** What the map says about one scan by its milestone icon, the only code it keeps, else its wording. */
 export const statusMap = {
-    stage: (code, wording) => (code === DELIVERY_ICON ? 'delivered' : STAGE_BY_WORDING.get(bare(wording)) ?? chinaPostRelayedStage(wording)),
+    stage: (code, wording) => (code === DELIVERY_ICON ? 'delivered' : STAGE_BY_WORDING.get(bare(wording)) ?? relayedStage(wording)),
     gaps: [
         { wording: 'ua.', note: "A partner's scan in Ukraine that Yanwen relays as its country's code alone, without words: it names no stage." },
         ...[...NOTICES].map(([wording, note]) => ({ wording, note })),

package/dist/carriers/yanwen/statuses.json

@@ -675,6 +675,38 @@
       "firstSeen": "2026-11-03",
       "note": "China Post's domestic scan, which Yanwen relays in Chinese with the centre in 【】; read as China Post's map reads it."
     },
+    {
+      "wording": "The parcel has been successfully picked up and is being prepared for transportation.",
+      "language": "en",
+      "stage": "in_transit",
+      "confirmedBy": "live",
+      "firstSeen": "2026-11-05",
+      "note": "J&T Express Australia's pickup from Yanwen's batch handover at the destination port, relayed with J&T's customer service line after it: a handover, not the parcel's acceptance, which J&T's own history reads it as."
+    },
+    {
+      "wording": "The parcel is dispatched from the transit center to the next destination",
+      "language": "en",
+      "stage": "in_transit",
+      "confirmedBy": "live",
+      "firstSeen": "2026-11-05",
+      "note": "J&T Express Australia's scan, which Yanwen relays after its batch handover at the destination port; read as J&T's map reads it."
+    },
+    {
+      "wording": "The parcel arrives at the distribution center and is prepared for transport to the next destination.",
+      "language": "en",
+      "stage": "in_transit",
+      "confirmedBy": "live",
+      "firstSeen": "2026-11-05",
+      "note": "J&T Express Australia's scan, which Yanwen relays after its batch handover at the destination port; read as J&T's map reads it."
+    },
+    {
+      "wording": "Your parcel is out for delivery.",
+      "language": "en",
+      "stage": "out_for_delivery",
+      "confirmedBy": "live",
+      "firstSeen": "2026-11-05",
+      "note": "J&T Express Australia's scan, which Yanwen relays with J&T's courtesy and customer service line after it; read as J&T's map reads it."
+    },
     {
       "wording": "送交出口海关",
       "language": "zh",

package/dist/carriers/yto/wording.d.ts

@@ -0,0 +1,6 @@
+/**
+ * A YTO scan's expanded description without the courier's name and phone and
+ * YTO's hotline, as the adapter keeps neither: its clauses up to the first that
+ * names a contact, without a bracket that gives one. Empty when the first does.
+ */
+export declare function ytoRelayedWording(description: string): string;

package/dist/carriers/yto/wording.js

@@ -0,0 +1,21 @@
+// The website's expanded description, which 17TRACK relays in place of the short label: the
+// scan's own clause, then who collected or delivers the parcel with their phone,
+// "揽收人: <name>（<phone>）", and YTO's hotline in brackets, "【物流问题请致电（专属热线:<number>）更快解决】".
+// A clause or bracket that gives a courier, a signer, a phone, a hotline or a complaint line, as
+// relayed Chinese post scans are read.
+const CONTACT = /电话|手机|致电|联系|电联|热线|投诉|呼叫|姓名|司机|(?:揽收|揽件|揽投|收件|取件|派件|派送|收派|配送|投递|签收|快递|业务)[人员]|(?<![A-Z\d])\d{5,}/i;
+/**
+ * A YTO scan's expanded description without the courier's name and phone and
+ * YTO's hotline, as the adapter keeps neither: its clauses up to the first that
+ * names a contact, without a bracket that gives one. Empty when the first does.
+ */
+export function ytoRelayedWording(description) {
+    const text = description.replace(/【([^【】]*)】/gu, (whole, inner) => (CONTACT.test(inner) ? '' : whole));
+    const kept = [];
+    for (const clause of text.split(/(?<=[，,。；;！!？?])/u)) {
+        if (CONTACT.test(clause))
+            break;
+        kept.push(clause);
+    }
+    return kept.join('').replace(/\s+/gu, ' ').trim().replace(/[\s,，;；:：]+$/u, '');
+}

package/dist/core/catalog/eventIdentity.js

@@ -24,6 +24,7 @@ import { sameInstantIdentityPolicy as dpdPoland } from '../../carriers/dpd-pl/id
 import { sameInstantIdentityPolicy as dpdRomania } from '../../carriers/dpd-ro/identity.js';
 import { sameInstantIdentityPolicy as dpdUk } from '../../carriers/dpd-uk/identity.js';
 import { sameInstantIdentityPolicy as fedex } from '../../carriers/fedex/identity.js';
+import { sameInstantIdentityPolicy as firstLine } from '../../carriers/first-line/identity.js';
 import { sameInstantIdentityPolicy as gofoFrance } from '../../carriers/gofo-fr/identity.js';
 import { sameInstantIdentityPolicy as glsItaly } from '../../carriers/gls-it/identity.js';
 import { sameInstantIdentityPolicy as gofoItaly } from '../../carriers/gofo-it/identity.js';
@@ -75,7 +76,7 @@ import { sameInstantIdentityPolicy as zto } from '../../carriers/zto/identity.js
 import { sameInstantIdentityPolicy as ztoInternational } from '../../carriers/zto-international/identity.js';
 import { sameInstantIdentityPolicy as universal } from '../../providers/shared/app.js';
 import { CARRIER_DEFINITIONS } from './definitions.js';
-const policies = new Map([aliexpress, allegroOne, amazonShipping, australiaPost, austrianPost, brt, canadaPost, chinaPost, chronopost, ciblex, correosExpress, correosSpain, ctt, cttyex, dhl, dhlEcommerce, dhlEcommercePl, dhlExpress, dhlink, dpd, dpdGermany, dpdFrance, dpdPoland, dpdRomania, dpdUk, fedex, glsItaly, gofoFrance, gofoItaly, gzyl, hermesGermany, huayaExpress, imile, indiaPost, inpost, jAndTAu, jcex, jdLogistics, jrt, jsExpress, laPoste, lbcExpress, linhan, mayiyinfu, mondialRelay, mrw, nacex, nzPost, packeta, parcelforce, pitneyBowes, pocztaPolska, posMalaysia, postlogistics, postnord, postaSlovenije, posteItaliane, posti, royalMail, sfExpress, shouwu, speedpak, speedy, spxBr, sunYou, thhy, ups, usps, swissPost, vintedGo, yanwen, yilongLogistics, yto, yunExpress, zto, ztoInternational, universal].map((policy) => [policy.sourceCarrierId, policy]));
+const policies = new Map([aliexpress, allegroOne, amazonShipping, australiaPost, austrianPost, brt, canadaPost, chinaPost, chronopost, ciblex, correosExpress, correosSpain, ctt, cttyex, dhl, dhlEcommerce, dhlEcommercePl, dhlExpress, dhlink, dpd, dpdGermany, dpdFrance, dpdPoland, dpdRomania, dpdUk, fedex, firstLine, glsItaly, gofoFrance, gofoItaly, gzyl, hermesGermany, huayaExpress, imile, indiaPost, inpost, jAndTAu, jcex, jdLogistics, jrt, jsExpress, laPoste, lbcExpress, linhan, mayiyinfu, mondialRelay, mrw, nacex, nzPost, packeta, parcelforce, pitneyBowes, pocztaPolska, posMalaysia, postlogistics, postnord, postaSlovenije, posteItaliane, posti, royalMail, sfExpress, shouwu, speedpak, speedy, spxBr, sunYou, thhy, ups, usps, swissPost, vintedGo, yanwen, yilongLogistics, yto, yunExpress, zto, ztoInternational, universal].map((policy) => [policy.sourceCarrierId, policy]));
 const wording = (scan) => scan.description.replace(/\s+/g, ' ').trim().toLowerCase();
 /** One scan read twice: the same wording and place, and codes that agree when both carry one. */
 function sameScan(incoming, stored) {

package/dist/providers/seventeentrack/adapter.js

@@ -24,6 +24,7 @@ import { HYWL_CHINA_ZONE, hywlInChina } from '../../carriers/hywl/clock.js';
 import { placedInIndia } from '../../carriers/shiprocket/clock.js';
 import { swissPostDestinationZone } from '../../carriers/swiss-post/clock.js';
 import { uspsRowZone, uspsScanZone } from '../../carriers/usps/clock.js';
+import { ytoRelayedWording } from '../../carriers/yto/wording.js';
 import { universalCarrierHints } from '../shared/hints.js';
 import { capturedBodies, captureFailure, loadCapture } from '../shared/capture.js';
 import { facilityZone, LatestScan, relaysFacilityClock } from '../shared/facilityClock.js';
@@ -404,6 +405,8 @@ const CHINA_POST = 3011;
 const CHINA_POST_LABELS = new Set([CHINA_POST, 192049]);
 /** Legs whose English wording ends with the place in brackets: Pengyou (捧友, 191878 in 17TRACK's carrier list). */
 const BRACKETED_PLACES = new Set([191878]);
+/** 17TRACK's carrier 190157, YTO Express, whose scans it relays in the website's expanded wording. */
+const YTO = 190157;
 /** China Post's mirror of the origin post's outward exchange office: "arrived at" or "left the exchange office abroad". */
 const ORIGIN_EXCHANGE = /^(?:到达|离开)境外出口互换局/;
 /**
@@ -608,8 +611,10 @@ export function parse17TrackResponse(payload, trackingNumber, postcode = null) {
                             : daiPost ? daiPostRelayZone(text(raw.description), text(raw.location)) : facilityZone(text(raw.location))));
             const placed = wall && zone ? firstOccurrence(DateTime.fromISO(wall, { zone })) : null;
             let parsed;
+            // YTO's wording without the courier's name and phone and its hotline, as YTO's own result keeps neither.
+            const scan = reported.key === YTO ? { ...raw, description: ytoRelayedWording(text(raw.description)) } : raw;
             try {
-                parsed = seventeenTrackEvent(raw, operator, placed?.isValid ? placed.toUTC().toISO() ?? undefined : undefined);
+                parsed = seventeenTrackEvent(scan, operator, placed?.isValid ? placed.toUTC().toISO() ?? undefined : undefined);
             }
             catch (cause) {
                 throw new SchemaError(SOURCE, '17TRACK returned an invalid tracking event', { cause });

package/dist/providers/shared/app.js

@@ -1,5 +1,6 @@
 import { matchesLocationEnrichment, matchesRereadLocation } from '../../core/catalog/locationIdentity.js';
 import { chinaPostEnglish, chinaPostLabelPlace } from '../../carriers/china-post/status.js';
+import { ytoRelayedWording } from '../../carriers/yto/wording.js';
 import { place, trailingPlace } from './result.js';
 const normalized = (value) => value.replace(/\s+/g, ' ').trim().toLocaleLowerCase('en-US');
 /**
@@ -27,14 +28,25 @@ function matchesTrailingPlace(incoming, stored) {
         && normalized(trailing.place) === normalized(incoming.location)
         && (!incoming.providerCode || !stored.providerCode || incoming.providerCode === stored.providerCode);
 }
+/**
+ * A YTO scan stored with the courier's name and phone or YTO's hotline, before
+ * 17TRACK's copy left them out: the stored wording without them, at the same
+ * location, with provider codes that agree.
+ */
+function matchesYtoContacts(incoming, stored) {
+    const wording = ytoRelayedWording(stored.description);
+    return wording !== '' && normalized(wording) !== normalized(stored.description) && normalized(wording) === normalized(incoming.description)
+        && normalized(incoming.location) === normalized(stored.location)
+        && (!incoming.providerCode || !stored.providerCode || incoming.providerCode === stored.providerCode);
+}
 // A copy may add a place, or drop a label it was once stored with that names
 // no place (Posti's "abroad", a feed's system user) or the words before a
 // depot's town, show a China Post label in English, or take the place from
-// after its wording.
+// after its wording, or leave out a YTO courier's contact.
 export const sameInstantIdentityPolicy = {
     sourceCarrierId: 'unknown', storedSources: ['unknown'], requireProviderCode: false,
     matchEachScan: true,
     matches: (incoming, stored) => matchesLocationEnrichment(incoming, stored)
         || matchesRereadLocation(incoming, stored, place) || matchesChinaPostEnglish(incoming, stored)
-        || matchesTrailingPlace(incoming, stored),
+        || matchesTrailingPlace(incoming, stored) || matchesYtoContacts(incoming, stored),
 };

package/dist/server/openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Universal Parcel Scraper",
-    "version": "0.969.3-main.5259"
+    "version": "0.969.5-main.5263"
   },
   "paths": {
     "/health": {

package/package.json

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