universal-parcel-scraper 0.862.0-main.4623 → 0.862.2-main.4627

package/dist/carriers/amazon-shipping/adapter.js

@@ -6,7 +6,7 @@ import { ChallengeError, IndeterminateError, InvalidInputError, NotFoundError, S
 import { listsNewestFirst } from '../../core/result/order.js';
 import { cleanScalar, decodeText, fetchBounded, parseJsonBytes, userAgentOf } from '../../core/transport/index.js';
 import { isRecord } from '../../core/types.js';
-import { classifyStatus, statusKey } from './status.js';
+import { classifyStatus, DELAYED, statusKey } from './status.js';
 const PROVIDER = 'Amazon Shipping';
 const DEFAULT_TIMEOUT_MS = 15_000;
 const MAX_RESPONSE_BYTES = 2_000_000;
@@ -266,7 +266,10 @@ export function parseAmazonShippingTrackingResponse(payload, zone = 'Europe/Pari
     // that had just left their pickup site and went on being scanned for another day.
     const unscannedDelivery = current.stage === 'delivered' && latestKnown !== undefined
         && !parsedEvents.some((item) => item.classified.stage === 'delivered');
-    const active = current.status !== 'unknown' && !echoesNewest && !unscannedDelivery ? current : latestKnown?.classified;
+    // A delay moves nothing: a parcel whose scans show only its label keeps that stage, with the delay as its text.
+    const unmovedDelay = current === DELAYED && latestKnown?.classified.stage === 'registered';
+    const active = unmovedDelay ? { ...latestKnown.classified, description: DELAYED.description }
+        : current.status !== 'unknown' && !echoesNewest && !unscannedDelivery ? current : latestKnown?.classified;
     if (!active) {
         throw new SchemaError(PROVIDER, 'Amazon Shipping returned incomplete tracking details');
     }

package/dist/carriers/amazon-shipping/status.d.ts

@@ -20,6 +20,8 @@ export interface ClassifiedStatus {
     description: string;
 }
 export declare const UNKNOWN_STATUS: ClassifiedStatus;
+/** A late delivery: no exception, and no movement of its own. */
+export declare const DELAYED: ClassifiedStatus;
 /** Fold any provider signal into the comparison key: lower case, letters and digits only. */
 export declare function statusKey(value: unknown): string;
 /** Classify one or more provider signals; the first matching rule wins. */

package/dist/carriers/amazon-shipping/status.js

@@ -3,6 +3,12 @@ export const UNKNOWN_STATUS = {
     stage: 'in_transit',
     description: 'Amazon Shipping update',
 };
+/** A late delivery: no exception, and no movement of its own. */
+export const DELAYED = {
+    status: 'in_transit',
+    stage: 'in_transit',
+    description: 'Delivery delayed',
+};
 /** Fold any provider signal into the comparison key: lower case, letters and digits only. */
 export function statusKey(value) {
     if (typeof value !== 'string' && typeof value !== 'number')
@@ -48,9 +54,8 @@ export function classifyStatus(...values) {
     ])) {
         return { status: 'exception', stage: 'failed_attempt', description: 'Delivery issue' };
     }
-    if (includesAny(key, ['delayed', 'late'])) {
-        return { status: 'in_transit', stage: 'in_transit', description: 'Delivery delayed' };
-    }
+    if (includesAny(key, ['delayed', 'late']))
+        return DELAYED;
     if (includesAny(key, ['delivered'])) {
         return { status: 'delivered', stage: 'delivered', description: 'Delivered' };
     }

package/dist/carriers/gzyl/hualei.d.ts

@@ -50,6 +50,14 @@ export interface HualeiTenant {
      * tracking number it shows is the delivery carrier's.
      */
     readonly pageEcho?: true;
+    /**
+     * The tenant's own numbers. Once the delivery carrier's number has taken
+     * `trackingNumber`, the track interface still finds an order by its own
+     * number but returns it in no field: a lone record that holds none of the
+     * number then answers it, unless its tracking number is another of the
+     * tenant's own. A tracking number of another shape is the delivery carrier's.
+     */
+    readonly ownNumber?: RegExp;
 }
 /**
  * The zone of the trackers' own clock: it decides when a row written ahead is

package/dist/carriers/gzyl/hualei.js

@@ -266,16 +266,20 @@ function trackRow(raw, provider) {
 /**
  * The delivery carrier and its number: the channel's transfer number, else the
  * tracking number, which some lines fill with the delivery carrier's. Without
- * a channel, only the transfer number of a carrier the tenant hands to.
+ * a channel, only the transfer number, or the tracking number a tenant's own
+ * number shape marks as the delivery carrier's, of a carrier the tenant hands to.
  */
-function partnerOf(record, destination, tenant) {
+function partnerOf(record, destination, tenant, downstream = '') {
     const { provider } = tenant;
     const label = text(record, 'channel_name', provider, 100);
     if (!label) {
-        const number = identity(text(record, 'business_channeltransfercode', provider, 64));
-        const detected = number ? detectCarrierMatch(number) : undefined;
-        const carrier = detected?.confidence === 'high' ? detected.carrier : undefined;
-        return carrier && tenant.unlabelledPartners?.includes(carrier) ? { carrier, number } : undefined;
+        for (const number of [identity(text(record, 'business_channeltransfercode', provider, 64)), downstream]) {
+            const detected = number ? detectCarrierMatch(number) : undefined;
+            const carrier = detected?.confidence === 'high' ? detected.carrier : undefined;
+            if (carrier && tenant.unlabelledPartners?.includes(carrier))
+                return { carrier, number };
+        }
+        return undefined;
     }
     for (const key of ['business_channeltransfercode', 'trackingNumber']) {
         const number = identity(text(record, key, provider, 64));
@@ -314,6 +318,8 @@ export function parseHualeiTrack(payload, raw, tenant, readAt = Date.now()) {
     });
     // The service matches a number in any of the record's own fields; a reference two orders share is no answer.
     const bound = records.filter((record) => IDENTITY_FIELDS.some((key) => identity(text(record, key, provider, 64)) === identity(number)));
+    const own = (value) => Boolean(tenant.ownNumber?.test(value));
+    const trackingOf = (record) => identity(text(record, 'trackingNumber', provider, 64));
     if (!bound.length) {
         // The names of the fields that still carry the number, a list such as a child parcel's included, or eight
         // characters or more of it, never their values, tell a number the platform moved from another shipment or wrote
@@ -324,14 +330,21 @@ export function parseHualeiTrack(payload, raw, tenant, readAt = Date.now()) {
                 .map(([key]) => key.slice(0, 40))))].slice(0, 4);
         const whole = fields((value) => value.includes(identity(number)), true);
         const part = whole.length ? [] : fields((value) => value.length >= 8 && identity(number).includes(value));
-        const shapes = whole.length || part.length ? [] : [...new Set(records.flatMap((record) => IDENTITY_FIELDS
-                .map((key) => [key, text(record, key, provider, 64)])
-                .filter(([, value]) => value)
-                .map(([key, value]) => `${key} ${numberShape(value)}`)))].slice(0, 4);
-        throw new IndeterminateError(provider, `${provider} answered with another shipment${whole.length ? `; its ${whole.join(', ')} holds the number`
-            : part.length ? `; its ${part.join(', ')} holds part of the number` : shapes.length ? `; its numbers read ${shapes.join(', ')}` : ''}`);
+        // A tenant's own number the record holds nowhere is the one the interface found it by, once the delivery
+        // carrier's number has taken its tracking number.
+        if (own(number) && records.length === 1 && !whole.length && !part.length && !own(trackingOf(records[0]))) {
+            bound.push(records[0]);
+        }
+        else {
+            const shapes = whole.length || part.length ? [] : [...new Set(records.flatMap((record) => IDENTITY_FIELDS
+                    .map((key) => [key, text(record, key, provider, 64)])
+                    .filter(([, value]) => value)
+                    .map(([key, value]) => `${key} ${numberShape(value)}`)))].slice(0, 4);
+            throw new IndeterminateError(provider, `${provider} answered with another shipment${whole.length ? `; its ${whole.join(', ')} holds the number`
+                : part.length ? `; its ${part.join(', ')} holds part of the number` : shapes.length ? `; its numbers read ${shapes.join(', ')}` : ''}`);
+        }
     }
-    if (new Set(bound.map((record) => identity(text(record, 'trackingNumber', provider, 64)))).size > 1) {
+    if (new Set(bound.map(trackingOf)).size > 1) {
         throw new IndeterminateError(provider, `${provider} holds several shipments under the number`);
     }
     const record = bound[0];
@@ -339,9 +352,12 @@ export function parseHualeiTrack(payload, raw, tenant, readAt = Date.now()) {
     if (!Array.isArray(details) || details.length > MAX_ROWS)
         throw new SchemaError(provider, `${provider} returned an invalid history`);
     const destination = text(record, 'consigneeCountry', provider, 8).toUpperCase();
+    const tracking = trackingOf(record);
+    // On a tenant that names its own numbers, a tracking number of another shape is the delivery carrier's.
+    const downstream = tenant.ownNumber && tracking && !own(tracking) ? tracking : '';
     return result(details.map((row) => trackRow(row, provider)), {
-        number, destination, partner: partnerOf(record, destination, tenant),
-        tracking: identity(text(record, 'trackingNumber', provider, 64)),
+        number, destination, partner: partnerOf(record, destination, tenant, downstream),
+        tracking: downstream ? '' : tracking, ...(downstream ? { downstream } : {}),
         service: text(record, 'productKindName', provider, 100) || undefined,
     }, tenant, readAt);
 }

package/dist/carriers/jrt/parser.js

@@ -2,9 +2,12 @@ import { normalizeHualeiNumber, parseHualeiPage, parseHualeiTrack } from '../gzy
 import { isJrtUpsRow, jrtEnglish, jrtStage } from './status.js';
 export const PROVIDER = 'JRT';
 export const JRT_ORIGIN = 'http://106.53.64.22:8082';
+// Once JRT hands a parcel over, the record's tracking number is the delivering carrier's, as
+// DHL's into Europe, and JRT's own number, which still finds the order, is in no field.
 export const JRT = {
     carrier: 'jrt', provider: PROVIDER, origin: JRT_ORIGIN, stage: jrtStage, english: jrtEnglish,
     clock: ({ content, location }) => (isJrtUpsRow(content, location) ? 'wall' : 'platform'),
+    ownNumber: /^JRT\d{10}[A-Z]{2}$/, unlabelledPartners: ['dhl'],
 };
 export const normalizeJrtNumber = (raw) => normalizeHualeiNumber(raw, PROVIDER);
 /** The track interface's reply, or null when it holds no row for the number. */

package/dist/server/openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Universal Parcel Scraper",
-    "version": "0.862.0-main.4623"
+    "version": "0.862.2-main.4627"
   },
   "paths": {
     "/health": {

package/package.json

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