universal-parcel-scraper 0.76.0-main.934 → 0.78.0-main.939

package/README.md

@@ -13,7 +13,7 @@ The engine behind [Peek](https://peektracker.com) ([GitHub](https://github.com/p
 [![License: Apache-2.0](https://img.shields.io/badge/core-Apache--2.0-blue.svg)](LICENSE)
 
 <!-- GENERATED:summary -->
-**3,500+ carriers** through **132 dedicated adapters** and **5 universal fallbacks**
+**3,500+ carriers** through **135 dedicated adapters** and **5 universal fallbacks**
 
 <sub>207 catalog entries · 66 countries represented</sub>
 <!-- /GENERATED:summary -->
@@ -155,7 +155,7 @@ createTracker({ providers: ['ParcelsApp', 'Ship24', '17TRACK', 'Postal Ninja', '
 <!-- 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 3,704 such statuses, each filed under one stage.
+The carrier folders record 3,852 such statuses, each filed under one stage.
 <!-- /GENERATED:stages -->
 
 Wording nobody recorded yet goes through a classifier that reads seven European languages.

package/data/catalog.json

@@ -5480,7 +5480,9 @@
     "timezone": "Europe/Dublin",
     "tracking": {
       "mode": "automatic",
-      "adapter": "universal"
+      "adapter": "dpd-ie",
+      "recognitionRank": 62,
+      "localClocks": true
     },
     "canaryUrl": "https://www.dpd.ie/tracking/",
     "trackingUrlTemplate": "https://www.dpd.ie/tracking/?consignmentNumber={trackingNumber}",
@@ -7192,7 +7194,8 @@
     "timezone": "Europe/Tallinn",
     "tracking": {
       "mode": "automatic",
-      "adapter": "universal"
+      "adapter": "omniva",
+      "recognitionRank": 64
     },
     "canaryUrl": "https://minu.omniva.ee/track",
     "trackingUrlTemplate": "https://minu.omniva.ee/track/{trackingNumber}",
@@ -7228,6 +7231,12 @@
       {
         "pattern": "^JJEE[A-Z]{3}\\d{11}$",
         "confidence": "high"
+      },
+      {
+        "pattern": "^[A-Z]{2}\\d{9}EE$",
+        "confidence": "low",
+        "checksum": "s10",
+        "preferred": true
       }
     ]
   },
@@ -8008,7 +8017,9 @@
     "timezone": "Europe/Vilnius",
     "tracking": {
       "mode": "automatic",
-      "adapter": "universal"
+      "adapter": "venipak",
+      "recognitionRank": 63,
+      "localClocks": true
     },
     "canaryUrl": "https://venipak.com/lt/en/parcel-tracking/",
     "trackingUrlTemplate": "https://venipak.com/lt/en/tracking/track/{trackingNumber}",

package/data/coverage-summary.json

@@ -1,6 +1,6 @@
 {
   "catalog": 207,
-  "activeAdapters": 132,
+  "activeAdapters": 135,
   "countries": 66,
   "referenceCarriers": 100,
   "comparison": {

package/data/detection-golden.json

@@ -25371,6 +25371,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -25382,6 +25383,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -25599,6 +25601,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -25634,6 +25637,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -25653,6 +25657,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -25683,6 +25688,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -26573,6 +26579,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -26724,6 +26731,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -30508,6 +30516,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -32984,6 +32993,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -33006,6 +33016,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -33017,6 +33028,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -33424,6 +33436,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -33435,6 +33448,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -33446,6 +33460,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -33457,6 +33472,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },
@@ -33468,6 +33484,7 @@
       "intl-post"
     ],
     "asked": [
+      "omniva",
       "chronopost"
     ]
   },

package/dist/browser/scraper.js

@@ -4443,7 +4443,9 @@ var ye = {
 		timezone: "Europe/Dublin",
 		tracking: {
 			mode: "automatic",
-			adapter: "universal"
+			adapter: "dpd-ie",
+			recognitionRank: 62,
+			localClocks: !0
 		},
 		canaryUrl: "https://www.dpd.ie/tracking/",
 		trackingUrlTemplate: "https://www.dpd.ie/tracking/?consignmentNumber={trackingNumber}",
@@ -5713,7 +5715,8 @@ var ye = {
 		timezone: "Europe/Tallinn",
 		tracking: {
 			mode: "automatic",
-			adapter: "universal"
+			adapter: "omniva",
+			recognitionRank: 64
 		},
 		canaryUrl: "https://minu.omniva.ee/track",
 		trackingUrlTemplate: "https://minu.omniva.ee/track/{trackingNumber}",
@@ -5733,13 +5736,22 @@ var ye = {
 			pathPattern: "^/(?:era/jalgimine|abi/jalgimine|verslo/siuntos_sekimas)/?$",
 			params: ["barcode"]
 		}],
-		detectionRules: [{
-			pattern: "^JJEE\\d{17}$",
-			confidence: "high"
-		}, {
-			pattern: "^JJEE[A-Z]{3}\\d{11}$",
-			confidence: "high"
-		}]
+		detectionRules: [
+			{
+				pattern: "^JJEE\\d{17}$",
+				confidence: "high"
+			},
+			{
+				pattern: "^JJEE[A-Z]{3}\\d{11}$",
+				confidence: "high"
+			},
+			{
+				pattern: "^[A-Z]{2}\\d{9}EE$",
+				confidence: "low",
+				checksum: "s10",
+				preferred: !0
+			}
+		]
 	},
 	"orlen-paczka": {
 		displayName: "ORLEN Paczka",
@@ -6320,7 +6332,9 @@ var ye = {
 		timezone: "Europe/Vilnius",
 		tracking: {
 			mode: "automatic",
-			adapter: "universal"
+			adapter: "venipak",
+			recognitionRank: 63,
+			localClocks: !0
 		},
 		canaryUrl: "https://venipak.com/lt/en/parcel-tracking/",
 		trackingUrlTemplate: "https://venipak.com/lt/en/tracking/track/{trackingNumber}",
@@ -6972,7 +6986,11 @@ var ye = {
 	nationex: [],
 	"nova-poshta": ["nova-poshta-domestic"],
 	omgo: ["omgo-1"],
-	omniva: ["omniva-1", "omniva-2"],
+	omniva: [
+		"omniva-1",
+		"omniva-2",
+		"omniva-s10"
+	],
 	"orlen-paczka": ["orlen-paczka-1"],
 	"osm-worldwide": ["osm-worldwide-1"],
 	paquetexpress: [],
@@ -11710,6 +11728,7 @@ var _c = {
 	"dhl-express": 75,
 	dpd: 70,
 	"dpd-de": 65,
+	"dpd-ie": 62,
 	"dpd-pl": 8,
 	econt: 56,
 	elta: 55,
@@ -11733,6 +11752,7 @@ var _c = {
 	"ninja-van": 28,
 	"nz-post": 32,
 	omgo: 1,
+	omniva: 64,
 	ontrac: 21,
 	"orlen-paczka": 49,
 	"poczta-polska": 31,
@@ -11751,7 +11771,8 @@ var _c = {
 	tipsa: 24,
 	tnt: 44,
 	ukrposhta: 5,
-	uniuni: 33
+	uniuni: 33,
+	venipak: 63
 }, vc = 5;
 function yc(e) {
 	let t = y(e);

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

@@ -0,0 +1,14 @@
+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';
+export declare class DpdIeTracker {
+    private readonly options;
+    constructor(options?: {
+        fetcher?: typeof fetch;
+        recorder?: StepRecorder;
+        userAgent?: string;
+    });
+    fetch(raw: string, context?: TrackingContext): Promise<CarrierResult>;
+    private lookup;
+}
+export declare const adapter: AdapterFactory;

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

@@ -0,0 +1,100 @@
+import { accepted, recognizeFromLookup } from '../../core/adapter/index.js';
+import { BudgetExceededError, ChallengeError, IndeterminateError, SchemaError } from '../../core/errors/index.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';
+// 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';
+// Where the tracker sends a consignment it does not have.
+const ABSENT = '/Custom500.html?aspxerrorpath=/Home/SearchResult';
+// The result page is about 10 kB.
+const MAX_BYTES = 512 * 1024;
+const REDIRECTS = [301, 302, 303, 307, 308];
+const COOKIE = /^(ASP\.NET_SessionId|__cf_bm)=([A-Za-z0-9._~:=+/-]{1,512})(?:;|$)/;
+/** The anonymous session the search opens; the result page reads the consignment from it. */
+function sessionCookie(response) {
+    const cookies = new Map();
+    for (const header of response.headers.getSetCookie()) {
+        const match = COOKIE.exec(header);
+        if (match)
+            cookies.set(match[1], `${match[1]}=${match[2]}`);
+    }
+    return cookies.has('ASP.NET_SessionId') ? [...cookies.values()].join('; ') : null;
+}
+/** A redirect's target on the tracker's own host, as a path with its query, or null. */
+function redirectPath(response) {
+    const location = response.headers.get('location');
+    if (!location)
+        return null;
+    try {
+        const target = new URL(location, `${ORIGIN}/`);
+        return target.origin === ORIGIN ? target.pathname + target.search : null;
+    }
+    catch {
+        return null;
+    }
+}
+export class DpdIeTracker {
+    options;
+    constructor(options = {}) {
+        this.options = options;
+    }
+    async fetch(raw, context = {}) {
+        const number = normalizeDpdIeNumber(raw);
+        const budgetMs = context.budgetMs ?? 15_000;
+        // A request that fails to reach DPD Ireland, or hangs, gets one more try
+        // with a new session: the first gets half of the budget.
+        return runSteps({ carrier: 'dpd-ie', budgetMs, signal: context.signal, recorder: this.options.recorder ?? NOOP_RECORDER }, [
+            { id: 'direct', run: ({ signal, remainingMs }) => this.lookup(number, signal, firstAttemptMs(remainingMs), budgetMs) },
+            networkRetryStep(({ signal, remainingMs }) => this.lookup(number, signal, remainingMs, budgetMs)),
+        ]);
+    }
+    async lookup(number, signal, timeoutMs, budgetMs) {
+        const deadline = performance.now() + timeoutMs;
+        const userAgent = userAgentOf(this.options.userAgent);
+        const read = async (path, cookie) => {
+            const left = deadline - performance.now();
+            if (left <= 0)
+                throw new BudgetExceededError(PROVIDER, budgetMs);
+            signal.throwIfAborted();
+            const { response, bytes } = await fetchBounded(`${ORIGIN}${path}`, { signal, headers: {
+                    'User-Agent': userAgent, Accept: 'text/html', ...(cookie ? { Cookie: cookie } : {}),
+                } }, { provider: PROVIDER, timeoutMs: Math.max(1, Math.floor(left)), maxBytes: MAX_BYTES, redirect: 'manual',
+                allowHttpStatuses: [...REDIRECTS, 404, 410], fetcher: this.options.fetcher });
+            signal.throwIfAborted();
+            // A missing page says nothing about the consignment.
+            if (response.status === 404 || response.status === 410)
+                throw new IndeterminateError(PROVIDER, 'DPD Ireland tracking is unavailable');
+            return { response, html: decodeText(bytes) };
+        };
+        // The search stores the number in a new session and sends the browser to the result page.
+        const search = await read(`/?${new URLSearchParams({ deviceType: '5', consignmentNumber: number })}`);
+        if (!REDIRECTS.includes(search.response.status)) {
+            if (isDpdIeChallenge(search.html))
+                throw new ChallengeError(PROVIDER, 'DPD Ireland asked for a browser check');
+            throw new SchemaError(PROVIDER, 'DPD Ireland did not accept the consignment number');
+        }
+        const cookie = sessionCookie(search.response);
+        if (redirectPath(search.response) !== RESULT || !cookie) {
+            throw new IndeterminateError(PROVIDER, 'DPD Ireland did not open a tracking session');
+        }
+        const result = await read(RESULT, cookie);
+        if (REDIRECTS.includes(result.response.status)) {
+            if (redirectPath(result.response) !== ABSENT)
+                throw new IndeterminateError(PROVIDER, 'DPD Ireland did not keep the tracking session');
+            return parseDpdIeAbsence((await read(ABSENT)).html);
+        }
+        return parseDpdIe(result.html, number);
+    }
+}
+export const adapter = environment => {
+    const tracker = new DpdIeTracker({ fetcher: environment.fetcher, recorder: environment.recorder, userAgent: environment.userAgent });
+    return {
+        id: 'dpd-ie', recordsSteps: true, steps: ['direct', 'retry'],
+        track: (input, context) => tracker.fetch(input.number, context),
+        recognize: (number, context) => recognizeFromLookup(() => tracker.fetch(number, context), () => accepted(() => normalizeDpdIeNumber(number))),
+    };
+};

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

@@ -16,18 +16,50 @@
   "timezone": "Europe/Dublin",
   "tracking": {
     "mode": "automatic",
-    "adapter": "universal",
-    "steps": []
+    "adapter": "dpd-ie",
+    "steps": [
+      "direct",
+      "retry"
+    ],
+    "recognition": {
+      "rank": 62
+    },
+    "localClocks": true
   },
-  "capabilities": [],
+  "capabilities": [
+    "history",
+    "location",
+    "eta",
+    "delivered_at"
+  ],
   "portal": {
     "url": "https://www.dpd.ie/tracking/?consignmentNumber={trackingNumber}",
     "searchUrl": "https://www.dpd.ie/tracking/",
     "canaryUrl": "https://www.dpd.ie/tracking/",
-    "shows": [],
-    "scraped": [],
-    "discarded": [],
-    "unavailable": []
+    "shows": [
+      "status",
+      "history",
+      "location",
+      "eta",
+      "eta_window",
+      "parcel_count"
+    ],
+    "scraped": [
+      "status",
+      "history",
+      "location",
+      "eta",
+      "eta_window",
+      "delivered_at"
+    ],
+    "discarded": [
+      "parcel_count"
+    ],
+    "unavailable": [
+      "weight",
+      "sender_name",
+      "offset_timestamps"
+    ]
   },
   "links": [
     {

package/dist/carriers/dpd-ie/numbers.json

@@ -244,13 +244,13 @@
         "access": "indexed_excerpt"
       },
       "context": {
-        "assessment": "candidate"
+        "assessment": "confirmed"
       },
       "expect": {
         "carrier": "unknown",
         "confidence": "none"
       },
-      "note": "Looked up on DPD Ireland's own tracker, as an archived address shows; the capture was not opened."
+      "note": "Looked up on DPD Ireland's own tracker, as an archived address shows. DPD Ireland's tracker returns its history."
     }
   ]
 }

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

@@ -0,0 +1,19 @@
+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. */
+export declare function normalizeDpdIeNumber(raw: string): string;
+/** 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;
+/**
+ * The page the tracker sends an unknown consignment to. A redirect to it is
+ * the tracker's only answer for a number it does not have, so its notice must
+ * be the not-found one.
+ */
+export declare function parseDpdIeAbsence(html: string): never;
+/**
+ * The tracker's result for one consignment: its scans, oldest first, and a
+ * headline with the current status. A consignment of several parcels repeats
+ * each scan once per parcel.
+ */
+export declare function parseDpdIe(html: string, raw: string): CarrierResult;