universal-parcel-scraper 0.48.0-main.487 → 0.48.0-main.489

package/dist/carriers/chronopost/parser.js

@@ -57,11 +57,19 @@ function appointmentWindow(start, end) {
     const clocks = ends.map(match => match ? `${match[4]}:${match[5]}` : '');
     return days[0] && days[0] === days[1] && clocks[0] < clocks[1] ? `${days[0]} ${clocks[0]}–${clocks[1]}` : null;
 }
-/** The relay or locker name is the first part of its address; the rest is never read. */
-function pickupName(point) {
-    const parts = point.split(' - ');
-    const name = clean(parts[0], 200);
-    return parts.length >= 3 && /\p{L}/u.test(name) && /^[\p{L}\p{M}\p{N} .,'’&()/-]+$/u.test(name) ? name : '';
+/**
+ * A relay or locker, given as `name - street - postcode - city - country`: its name, then its
+ * street and town on their own lines when the address has that layout.
+ */
+function relayPoint(point) {
+    const parts = point.split(' - ').map(part => clean(part, 200));
+    const name = parts[0];
+    if (parts.length < 3 || !/\p{L}/u.test(name) || !/^[\p{L}\p{M}\p{N} .,'’&()/-]+$/u.test(name))
+        return '';
+    const street = parts.slice(1, -3).join(' - ');
+    const [postcode, city] = parts.slice(-3, -1);
+    return /\p{L}/u.test(street) && /^(?=.*\d)[A-Z\d][A-Z\d -]{1,9}$/.test(postcode) && /\p{L}/u.test(city)
+        ? `${name}\n${street}\n${postcode} ${city}` : name;
 }
 /** The calendar day of a scan's own clock, or '' without one. */
 const clockDay = (event) => {
@@ -125,6 +133,7 @@ export function parseChronopostTrackingXml(xml, rawNumber) {
         let end;
         let collection = '';
         let point = '';
+        let relay = '';
         for (const extra of extras) {
             const name = scalar(extra, 'name');
             const value = scalar(extra, 'value');
@@ -138,6 +147,8 @@ export function parseChronopostTrackingXml(xml, rawNumber) {
                 end = value;
             if (name === 'Type de retrait')
                 collection = value;
+            if (name === 'Point de retrait')
+                relay = value;
             if (name === 'Numéro partenaire') {
                 const match = /^(?:GEO\/)?([A-Z0-9]{4,40})$/.exec(value.toUpperCase());
                 if (match) {
@@ -147,7 +158,7 @@ export function parseChronopostTrackingXml(xml, rawNumber) {
                 }
             }
             if (name === 'Point de livraison') {
-                // Only the terminal country and a pickup point's name are projected.
+                // Only the terminal country and a pickup point are projected.
                 point = value;
                 const country = countryCode(/ - ([A-Z]{2})$/.exec(value)?.[1]);
                 if (country)
@@ -163,7 +174,9 @@ export function parseChronopostTrackingXml(xml, rawNumber) {
         const mapped = chronopostStage(code, description);
         return { event, mapped, notification: isChronopostNotification(description), index, redelivery,
             appointment: start === undefined && end === undefined ? undefined : appointmentWindow(start ?? '', end ?? ''),
-            dropOff: isPickupDropOff(code, description), pickup: collection && point ? pickupName(point) : '' };
+            dropOff: isPickupDropOff(code, description),
+            // A delivery point is a relay only when the scan names how it is collected.
+            pickup: relay ? relayPoint(relay) : collection && point ? relayPoint(point) : '' };
     });
     // The operation returns oldest first. Reorder only when all scan clocks
     // establish instants, so mixed local clocks cannot create a guessed order.

package/dist/carriers/dpd-de/app.d.ts

@@ -18,8 +18,14 @@ export declare const DPD_DE_APP_RAIL: Readonly<Record<string, ClassifiedStatus>>
  * whole; a variable date is recorded as an ellipsis.
  */
 export declare const DPD_DE_APP_SCANS: Readonly<Record<string, Stage>>;
-/** Scans arrive oldest first, with a facility's wall clock and no offset. */
-export declare function parseDpdDeApp(data: XmlNode, scans: XmlNode, number: string): CarrierResult;
+/**
+ * Scans arrive oldest first, with a facility's wall clock and no offset. `shop` is the PUDO id of
+ * the shop the result names as its pickup point, else empty.
+ */
+export declare function parseDpdDeApp(data: XmlNode, scans: XmlNode, number: string): {
+    result: CarrierResult;
+    shop: string;
+};
 /**
  * The German app's SOAP service. Tracking needs an anonymous device session, which the
  * service takes tens of seconds to open and then accepts for hours: one is kept per client.
@@ -44,6 +50,8 @@ export declare class DpdDeAppClient {
         sessionWaitMs?: number;
         postcode?: string;
     }): Promise<CarrierResult>;
+    /** The shop's street and town, or nothing: the parcel is found, and its pickup point keeps its name without them. */
+    private shopAddress;
     /**
      * One session for every lookup. The opening runs while a lookup that asked for it is still
      * running, even one that stopped waiting; each lookup waits until its signal or `waitMs` ends.

package/dist/carriers/dpd-de/app.js

@@ -148,12 +148,26 @@ function statusOf(stage) {
         return 'pending';
     return stage ? 'in_transit' : 'unknown';
 }
-/** The shop a scan names, as `<shop id>|<shop name>` under additional code 999. */
+/** The shop a scan names, as `<PUDO id>|<shop name>` under additional code 999. */
 function shopOf(row) {
-    const named = children(row, 'TrackingScanAdditionalList').flatMap(list => children(list, 'TrackingScanAdditionalType'))
-        .filter(entry => scalar(entry, 'AdditionalCode', 8) === '999')
-        .map(entry => /^[A-Z]{2}\d{1,12}\|(.{1,120})$/.exec(scalar(entry, 'Description', 200))?.[1]?.trim() ?? '');
-    return named.find(Boolean) ?? '';
+    for (const entry of children(row, 'TrackingScanAdditionalList').flatMap(list => children(list, 'TrackingScanAdditionalType'))) {
+        const named = scalar(entry, 'AdditionalCode', 8) === '999' && /^([A-Z]{2}\d{1,12})\|(.{1,120})$/.exec(scalar(entry, 'Description', 200));
+        if (named && named[2].trim())
+            return { id: named[1], name: named[2].trim() };
+    }
+    return undefined;
+}
+/** The street and town of the shop that `getParcelShopByID` returns, a line each, if it is the requested one. */
+function addressOf(result, id) {
+    const shop = one(result, 'ParcelShop');
+    if (scalar(shop, 'PUDOID', 40) !== id)
+        return '';
+    const address = one(shop, 'ShopAddress');
+    const street = scalar(address, 'Street', 120);
+    const city = scalar(address, 'City', 80);
+    if (!street || !city)
+        return '';
+    return `${[street, scalar(address, 'HouseNo', 20)].filter(Boolean).join(' ')}\n${[scalar(address, 'ZipCode', 16), city].filter(Boolean).join(' ')}`;
 }
 /** The measured length, width and height, in millimetres; the shipper's own figures are not read. */
 function dimensionsOf(order) {
@@ -162,7 +176,10 @@ function dimensionsOf(order) {
         return null;
     return `${sides.map(side => Number(side) / 10).join(' × ')} cm`;
 }
-/** Scans arrive oldest first, with a facility's wall clock and no offset. */
+/**
+ * Scans arrive oldest first, with a facility's wall clock and no offset. `shop` is the PUDO id of
+ * the shop the result names as its pickup point, else empty.
+ */
 export function parseDpdDeApp(data, scans, number) {
     const tracking = one(data, 'TrackingData');
     if (scalar(tracking, 'ParcelNo', 40) !== number)
@@ -174,7 +191,7 @@ export function parseDpdDeApp(data, scans, number) {
     const seen = new Set();
     let placed = '';
     let announced = null;
-    let shop = '';
+    let shop;
     for (const row of rows) {
         const wording = scalar(row, 'StatusText', 500);
         if (!wording)
@@ -232,7 +249,9 @@ export function parseDpdDeApp(data, scans, number) {
     const kilograms = Number(scalar(order, 'Weight', 16).replace(',', '.'));
     const dimensions = dimensionsOf(order);
     const deliveredAt = status === 'delivered' ? events.find(event => event.stage === 'delivered')?.time : undefined;
-    return {
+    // The shop holding the parcel, while it waits there.
+    const pickup = stage === 'ready_for_pickup' ? shop : undefined;
+    const result = {
         status, ...(stage ? { current_stage: stage, current_stage_source: 'carrier_map' } : {}),
         last_status_text: current.description ?? null, last_update: current.time ?? null,
         expected_delivery: affirmative(scalar(tracking, 'Delivered', 8)) || status === 'delivered' || status === 'exception'
@@ -241,10 +260,10 @@ export function parseDpdDeApp(data, scans, number) {
         ...(Number.isFinite(kilograms) && kilograms > 0 ? { weight_kg: kilograms } : {}),
         ...(dimensions ? { dimensions_text: dimensions } : {}),
         ...(deliveredAt ? { delivered_at: deliveredAt } : {}),
-        // The shop holding the parcel, while it waits there.
-        ...(stage === 'ready_for_pickup' && shop ? { pickup_point: shop } : {}),
+        ...(pickup ? { pickup_point: pickup.name } : {}),
         events: events.slice(0, 100),
     };
+    return { result, shop: pickup?.id ?? '' };
 }
 /**
  * The German app's SOAP service. Tracking needs an anonymous device session, which the
@@ -301,7 +320,13 @@ export class DpdDeAppClient {
                     }
                     const scans = await this.call('getTrackingScanList', { SessionToken: session, ParcelNo: number,
                         DeliveryZipCode: verified ? postcode : '' }, options.signal, left());
-                    const result = parseDpdDeApp(data, scans, number);
+                    const { result, shop } = parseDpdDeApp(data, scans, number);
+                    // The scans name the shop without its address, which the shop's own record adds.
+                    if (shop) {
+                        const address = await this.shopAddress(session, shop, options.signal, left());
+                        if (address)
+                            result.pickup_point = `${result.pickup_point}\n${address}`;
+                    }
                     if (verified !== undefined)
                         result.dpd_postcode_verified = verified;
                     return result;
@@ -325,6 +350,17 @@ export class DpdDeAppClient {
             throw new TransportError('DPD Germany', 'DPD Germany app request failed');
         }
     }
+    /** The shop's street and town, or nothing: the parcel is found, and its pickup point keeps its name without them. */
+    async shopAddress(session, id, signal, timeoutMs) {
+        try {
+            return addressOf(await this.call('getParcelShopByID', { SessionToken: session, ParcelShopID: '0', PudoID: id,
+                ParcelShopOnly: 'false' }, signal, timeoutMs), id);
+        }
+        catch {
+            signal.throwIfAborted();
+            return '';
+        }
+    }
     /**
      * One session for every lookup. The opening runs while a lookup that asked for it is still
      * running, even one that stopped waiting; each lookup waits until its signal or `waitMs` ends.

package/package.json

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