universal-parcel-scraper 0.577.3-main.2713 → 0.579.0-main.2719

package/dist/carriers/canada-post/parser.js

@@ -185,12 +185,14 @@ export function parseCanadaPostTrackingResponse(payload, trackingNumber) {
         const country = isRecord(raw.locationAddr) ? textField(raw.locationAddr, 'countryCd', 8).toUpperCase() : '';
         const location = isRecord(raw.locationAddr)
             ? [textField(raw.locationAddr, 'city', 160), region].filter(Boolean).join(', ') : '';
-        const stage = type === 'Signature' || code === SIGNATURE_CODE ? null : canadaPostScanStage(code, description) ?? canadaPostStage(description);
+        // The signature row can come without its type.
+        const signature = type === 'Signature' || code === SIGNATURE_CODE;
+        const stage = signature ? null : canadaPostScanStage(code, description) ?? canadaPostStage(description);
         const relayed = relayedClock(code, country, region);
         const clock = eventClock(raw.datetime, relayed);
         const event = { ...clock, description: stage === 'delivered' ? 'Delivered' : description,
             provider_code: code, ...(stage ? { stage } : {}), ...(location ? { location } : {}) };
-        return { event, type, region, country, sourceDate: isRecord(raw.datetime) ? calendarDate(raw.datetime.date) : null,
+        return { event, type, signature, region, country, sourceDate: isRecord(raw.datetime) ? calendarDate(raw.datetime.date) : null,
             returnCue: returnStarted(description) || type === 'RtsLabelProc', guessed: relayed?.zone === null && 'time' in clock };
     });
     // Native detail history is newest first. Compare instants only when every
@@ -216,7 +218,7 @@ export function parseCanadaPostTrackingResponse(payload, trackingNumber) {
     const summaryStage = canadaPostPackageStage(summary);
     const delivery = rows.find(row => row.event.stage === (currentReturn ? 'returned' : 'delivered'));
     const matchingDelivery = delivery?.event.time && latest.event.time === delivery.event.time
-        && (latest === delivery || latest.type === 'Signature') ? delivery : undefined;
+        && (latest === delivery || latest.signature) ? delivery : undefined;
     let current = latest.event.stage ?? summaryStage;
     let snapshot = null;
     if (currentReturn && !explicitReturn) {

package/dist/carriers/dpd-ie/adapter.d.ts

@@ -1,13 +1,23 @@
 import { type AdapterFactory, type TrackingContext } from '../../core/adapter/index.js';
 import type { CarrierResult } from '../../core/result/index.js';
 import { type StepRecorder } from '../../core/telemetry/index.js';
+/** A lookup of a DPD parcel number in DPD's group-wide guest service. */
+export type DpdGroupLookup = (number: string, context: TrackingContext) => Promise<CarrierResult>;
 export declare class DpdIeTracker {
     private readonly options;
     constructor(options?: {
         fetcher?: typeof fetch;
         recorder?: StepRecorder;
         userAgent?: string;
+        group?: DpdGroupLookup;
     });
+    /**
+     * A parcel number's answer from DPD Ireland's tracker and DPD's group-wide
+     * guest service, asked together: the tracker's history when it holds more
+     * scans and is not behind the guest service's milestones, else those. Either
+     * answers when the other fails; not found needs both.
+     */
+    track(raw: string, context?: TrackingContext): Promise<CarrierResult>;
     fetch(raw: string, context?: TrackingContext): Promise<CarrierResult>;
     private lookup;
 }

package/dist/carriers/dpd-ie/adapter.js

@@ -1,10 +1,12 @@
 import { accepted, recognizeFromLookup } from '../../core/adapter/index.js';
-import { BudgetExceededError, ChallengeError, IndeterminateError, SchemaError } from '../../core/errors/index.js';
+import { BudgetExceededError, ChallengeError, IndeterminateError, NotFoundError, SchemaError } from '../../core/errors/index.js';
+import { fillPartialAnswer } from '../../core/result/partial.js';
 import { runSteps } from '../../core/runner/index.js';
 import { firstAttemptMs, networkRetryStep } from '../../core/runner/networkRetry.js';
 import { NOOP_RECORDER } from '../../core/telemetry/index.js';
 import { decodeText, fetchBounded, userAgentOf } from '../../core/transport/index.js';
-import { isDpdIeChallenge, normalizeDpdIeNumber, parseDpdIe, parseDpdIeAbsence, PROVIDER } from './parser.js';
+import { DPDTracker } from '../dpd/adapter.js';
+import { isDpdIeChallenge, isDpdIeParcelNumber, normalizeDpdIeNumber, parseDpdIe, parseDpdIeAbsence, PROVIDER } from './parser.js';
 // The tracker www.dpd.ie/tracking/ shows in a frame, with the frame's device type.
 const ORIGIN = 'https://tracking.dpd.ie';
 const RESULT = '/Home/SearchResult?deviceType=5';
@@ -42,6 +44,27 @@ export class DpdIeTracker {
     constructor(options = {}) {
         this.options = options;
     }
+    /**
+     * A parcel number's answer from DPD Ireland's tracker and DPD's group-wide
+     * guest service, asked together: the tracker's history when it holds more
+     * scans and is not behind the guest service's milestones, else those. Either
+     * answers when the other fails; not found needs both.
+     */
+    async track(raw, context = {}) {
+        const number = normalizeDpdIeNumber(raw);
+        if (!isDpdIeParcelNumber(number) || !this.options.group)
+            return this.fetch(number, context);
+        const shared = { ...context, budgetMs: context.budgetMs ?? 15_000 };
+        const [ireland, group] = await Promise.allSettled([this.fetch(number, shared), this.options.group(number, shared)]);
+        if (ireland.status === 'fulfilled' && group.status === 'fulfilled') {
+            return fillPartialAnswer('dpd-ie', number, group.value, ireland.value) ?? group.value;
+        }
+        if (ireland.status === 'fulfilled')
+            return ireland.value;
+        if (group.status === 'fulfilled')
+            return group.value;
+        throw [group.reason, ireland.reason].find((error) => !(error instanceof NotFoundError)) ?? ireland.reason;
+    }
     async fetch(raw, context = {}) {
         const number = normalizeDpdIeNumber(raw);
         const budgetMs = context.budgetMs ?? 15_000;
@@ -91,10 +114,14 @@ export class DpdIeTracker {
     }
 }
 export const adapter = environment => {
-    const tracker = new DpdIeTracker({ fetcher: environment.fetcher, recorder: environment.recorder, userAgent: environment.userAgent });
+    // DPD's guest service answers for the whole group; Belgium's unit asks it alone.
+    const group = new DPDTracker({ country: 'BE', fetcher: environment.fetcher, userAgent: environment.userAgent });
+    const tracker = new DpdIeTracker({ fetcher: environment.fetcher, recorder: environment.recorder, userAgent: environment.userAgent,
+        group: (number, context) => group.fetch(number, '', context) });
     return {
         id: 'dpd-ie', recordsSteps: true, steps: ['direct', 'retry'],
-        track: (input, context) => tracker.fetch(input.number, context),
+        track: (input, context) => tracker.track(input.number, context),
+        // DPD's group-wide match does not make a parcel Irish: recognition reads DPD Ireland's tracker alone.
         recognize: (number, context) => recognizeFromLookup(() => tracker.fetch(number, context), () => accepted(() => normalizeDpdIeNumber(number))),
     };
 };

package/dist/carriers/dpd-ie/parser.d.ts

@@ -1,8 +1,13 @@
 import type { CarrierResult } from '../../core/result/index.js';
 export declare const PROVIDER = "DPD Ireland";
 export declare const DPD_IE_ZONE = "Europe/Dublin";
-/** A DPD Ireland consignment number: nine or ten digits. */
+/**
+ * A DPD Ireland consignment number, nine or ten digits, or a DPD parcel
+ * number, fourteen digits without the check character labels print after them.
+ */
 export declare function normalizeDpdIeNumber(raw: string): string;
+/** Whether a normalized number is a DPD parcel number rather than a consignment number. */
+export declare function isDpdIeParcelNumber(number: string): boolean;
 /** Cloudflare's challenge page in place of the tracker. Its passive script on ordinary pages is not one. */
 export declare function isDpdIeChallenge(html: string): boolean;
 /**

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

@@ -1,6 +1,7 @@
 import { load } from 'cheerio';
 import { DateTime } from 'luxon';
 import { normalizeTrackingNumber } from '../../core/detection/index.js';
+import { dpdParcelNumber } from '../../core/detection/dpd.js';
 import { ChallengeError, IndeterminateError, InvalidInputError, NoHistoryError, NotFoundError, SchemaError } from '../../core/errors/index.js';
 import { languageStageStatus } from '../../core/status/index.js';
 import { normalizeStatusWording } from '../../core/status/statusMap.js';
@@ -12,13 +13,15 @@ export const DPD_IE_ZONE = 'Europe/Dublin';
 // The consignment numbers DPD Ireland's tracker shows have nine digits;
 // lookups archived from it also use ten.
 const NUMBER = /^\d{9,10}$/;
+// The fourteen-digit parcel number DPD networks print, which the tracker also finds.
+const PARCEL = /^\d{14}$/;
 const HEADERS = ['Status', 'Location', 'Date & Time'];
 // "07/9/2026 at 1:41": day, month without its zero, year, then the hour without its zero.
 const CLOCK = /^(\d{1,2})\/(\d{1,2})\/(\d{4}) at (\d{1,2}):(\d{2})$/;
 // DPD Ireland's own depots, in the Republic and in Northern Ireland, and its
 // head office and website. Their clocks are Irish wall time. Another
 // network's scan names its town and country, as "<town> - <country>".
-const IRISH_PLACE = /^(?:Dpd [A-Za-z][A-Za-z .'-]{0,60}|Head Office|Web)$/i;
+const IRISH_PLACE = /^(?:Dpd [A-Za-z][A-Za-z .&'-]{0,60}|Head Office|Web)$/i;
 // Labels of DPD Ireland's systems rather than places.
 const NOT_PLACES = new Set(['head office', 'web']);
 const VAN = 'Your parcel is on a van and due for delivery';
@@ -29,12 +32,22 @@ const VAN_HEADLINE = new RegExp(`^${VAN}\\. Expected delivery time (\\d{2}):(\\d
 const MAX_ROWS = 500;
 const same = (left, right) => normalizeStatusWording(left) === normalizeStatusWording(right);
 const MAX_EVENTS = 100;
-/** A DPD Ireland consignment number: nine or ten digits. */
+/**
+ * A DPD Ireland consignment number, nine or ten digits, or a DPD parcel
+ * number, fourteen digits without the check character labels print after them.
+ */
 export function normalizeDpdIeNumber(raw) {
     const number = normalizeTrackingNumber(raw);
-    if (!NUMBER.test(number))
-        throw new InvalidInputError(PROVIDER, 'DPD Ireland tracks nine- or ten-digit consignment numbers');
-    return number;
+    if (NUMBER.test(number))
+        return number;
+    const parcel = dpdParcelNumber(number);
+    if (!parcel)
+        throw new InvalidInputError(PROVIDER, 'DPD Ireland tracks nine- or ten-digit consignment numbers and fourteen-digit parcel numbers');
+    return parcel;
+}
+/** Whether a normalized number is a DPD parcel number rather than a consignment number. */
+export function isDpdIeParcelNumber(number) {
+    return PARCEL.test(number);
 }
 /** Cloudflare's challenge page in place of the tracker. Its passive script on ordinary pages is not one. */
 export function isDpdIeChallenge(html) {
@@ -100,7 +113,9 @@ export function parseDpdIe(html, raw) {
         throw new IndeterminateError(PROVIDER, 'DPD Ireland did not return a consignment');
     }
     const info = root.find('.tracking-status-info p').filter((_, node) => /^Consignment\b/.test(clean($(node).text(), 80)));
-    if (info.length !== 1 || info.find('strong').length !== 1 || clean(info.find('strong').text(), 40) !== number) {
+    // A parcel number finds its consignment, which the page names instead.
+    const consignment = clean(info.find('strong').text(), 40);
+    if (info.length !== 1 || info.find('strong').length !== 1 || (isDpdIeParcelNumber(number) ? !NUMBER.test(consignment) : consignment !== number)) {
         throw new SchemaError(PROVIDER, 'DPD Ireland returned a different consignment');
     }
     const lists = root.find('ul.history-list');

package/dist/carriers/vinted-go/parser.js

@@ -18,6 +18,9 @@ const NUMBER = /^1\d{15}$/;
 // `VGS` and fourteen digits, the other number the service answers. They hold
 // no timestamp and no Luhn check digit.
 const VGS_NUMBER = /^VGS\d{14}$/;
+// Sixteen capital letters and digits, letters among them, which the service
+// answers like the others. A VGS number with a digit missing is not one.
+const CODE = /^(?!VGS?\d+$)(?=\d*[A-Z])[A-Z\d]{16}$/;
 // A sorting centre's town and country, the only place a scan's wording names
 // as the parcel's own. "In transit to" names where it is going.
 const SORTING_CENTER = /^(?:Return: )?At sorting center in ([^,]{2,80}), ([A-Z]{2})$/;
@@ -32,8 +35,8 @@ const MAX_EVENTS = 100;
 /** A Vinted Go parcel number; anything else is a number Vinted Go does not issue. */
 export function normalizeVintedGoNumber(raw) {
     const number = raw.length <= 64 ? normalizeTrackingNumber(raw) : '';
-    if (!VGS_NUMBER.test(number) && !(NUMBER.test(number) && hasLuhnCheckDigit(number))) {
-        throw new InvalidInputError(PROVIDER, 'Vinted Go numbers are sixteen digits starting 1 whose last digit passes the Luhn check, or VGS and fourteen digits');
+    if (!VGS_NUMBER.test(number) && !CODE.test(number) && !(NUMBER.test(number) && hasLuhnCheckDigit(number))) {
+        throw new InvalidInputError(PROVIDER, 'Vinted Go numbers are sixteen digits starting 1 whose last digit passes the Luhn check, VGS and fourteen digits, or sixteen capital letters and digits');
     }
     return number;
 }

package/dist/server/openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Universal Parcel Scraper",
-    "version": "0.577.3"
+    "version": "0.579.0"
   },
   "paths": {
     "/health": {

package/package.json

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