universal-parcel-scraper 0.49.2-main.563 → 0.49.2-main.567

package/dist/carriers/australia-post/adapter.js

@@ -45,6 +45,24 @@ function abroadZone(location, abroad) {
         return canadaProvinceTimeZone(region);
     return countryTimeZone(abroad);
 }
+/** Scans that leave the parcel at an Australian post office or parcel locker for collection. */
+const COLLECTION_SCANS = new Set(['DD-ER4', 'NT-ER4']);
+/** Deliveries left in a safe place, at the door. */
+const SAFE_PLACE = new Set(['DD-ER15', 'DD-ER38']);
+/**
+ * The post office or locker its awaiting-collection scan names: the newest scan while the
+ * parcel waits there, or the scan just before its delivery once it is collected there. A
+ * delivery left in a safe place was not collected.
+ */
+function collectionPoint(stage, events) {
+    const index = events.findIndex((event) => event.stage !== 'delivered');
+    const placed = stage === 'ready_for_pickup' ? index === 0
+        : stage === 'delivered' && index > 0 && !events.slice(0, index).some((event) => SAFE_PLACE.has(String(event.provider_code)));
+    const scan = placed ? events[index] : undefined;
+    if (!scan || !COLLECTION_SCANS.has(String(scan.provider_code)))
+        return undefined;
+    return /^Awaiting collection at (.+)$/i.exec(scan.description ?? '')?.[1]?.trim() || undefined;
+}
 /** The one lookup entry and article must independently match the submitted reference. */
 export function parse(payload, trackingNumber) {
     const number = normalizeAustraliaPostNumber(trackingNumber);
@@ -153,9 +171,8 @@ export function parse(payload, trackingNumber) {
     const latest = events[0];
     const status = australiaPostStatus(summary) ?? latest.classified;
     const deliveredAt = status?.status === 'delivered' ? events.find(({ event }) => event.stage === 'delivered')?.event.time : null;
-    // The post office or locker holding the parcel, as its newest scan names it.
-    const pickup = status?.stage === 'ready_for_pickup' && ['DD-ER4', 'NT-ER4'].includes(String(latest.event.provider_code))
-        ? /^Awaiting collection at (.+)$/i.exec(latest.event.description ?? '')?.[1]?.trim() : undefined;
+    // The reply names the point but gives no address for it.
+    const pickup = collectionPoint(status?.stage, events.map(({ event }) => event));
     // Summary modification/milestone timestamps are not scan times. In the
     // observed reply they differed from the delivery event by about ten hours.
     return {

package/dist/carriers/bring-posten/parser.js

@@ -2,7 +2,7 @@ import { DateTime } from 'luxon';
 import { isValidS10TrackingNumber, normalizeTrackingNumber } from '../../core/detection/index.js';
 import { IndeterminateError, InvalidInputError, SchemaError } from '../../core/errors/index.js';
 import { calendarDay, explicitOffsetTime } from '../../core/time/index.js';
-import { clean } from '../../core/transport/index.js';
+import { clean, cleanScalar } from '../../core/transport/index.js';
 import { isRecord } from '../../core/types.js';
 import { bringStatus, bringWording } from './status.js';
 /**
@@ -64,6 +64,18 @@ function estimatedDay(domain) {
     const day = /^(\d{4})-(\d{2})-(\d{2})(?:$|T)/.exec(eta.dateOfEstimatedDeliveryIso);
     return day ? calendarDay(Number(day[1]), Number(day[2]), Number(day[3])) : null;
 }
+/**
+ * Whether the parcel was collected at the pickup point the portal names: the
+ * delivery, and the movement before it that made the parcel ready for pickup,
+ * were scanned at that point's unit. Notices prove no movement.
+ */
+function collectedAt(rows, pickupUnit) {
+    const unit = cleanScalar(pickupUnit, 32);
+    const moves = rows.filter(row => bringStatus(String(row.status), text(row.lmCauseCode, 8)));
+    const index = moves.findIndex(row => row.status !== 'DELIVERED');
+    return Boolean(unit) && index > 0 && moves[index].status === 'READY_FOR_PICKUP'
+        && moves.slice(0, index + 1).every(row => cleanScalar(row.unitId, 32) === unit);
+}
 export function parseBring(payload, rawNumber) {
     const number = normalizeBringNumber(rawNumber);
     if (!isRecord(payload))
@@ -126,8 +138,9 @@ export function parseBring(payload, rawNumber) {
     const sender = text(consignment.senderName, 200) || text(parcel.senderName, 200);
     const pickupInfo = isRecord(parcel.domain.deliveryType) && isRecord(parcel.domain.deliveryType.pickupPointInfo)
         ? parcel.domain.deliveryType.pickupPointInfo : {};
-    const pickup = current?.stage === 'ready_for_pickup'
-        ? text(parcel.expectedPickupUnitName, 200) || text(pickupInfo.expectedPickupUnitName, 200) : '';
+    const atPickupPoint = current?.stage === 'ready_for_pickup'
+        || (current?.stage === 'delivered' && collectedAt(parcel.eventSet.filter(isRecord), parcel.expectedPickupUnitId));
+    const pickup = atPickupPoint ? text(parcel.expectedPickupUnitName, 200) || text(pickupInfo.expectedPickupUnitName, 200) : '';
     const country = isRecord(consignment.recipientAddress) ? consignment.recipientAddress.countryCode : undefined;
     const active = current && ['pending', 'in_transit', 'out_for_delivery'].includes(current.status) && current.stage !== 'ready_for_pickup';
     return { status: current?.status ?? 'unknown', ...(current ? { current_stage: current.stage } : {}),

package/dist/carriers/dhl-ecommerce-es/parser.js

@@ -38,6 +38,19 @@ function scanClock(date, time) {
     const iso = day && calendarDay(Number(day[3]), Number(day[2]), Number(day[1]));
     return iso && clock && Number(clock[1]) < 24 && Number(clock[2]) < 60 ? { local_time: `${iso}T${clock[1]}:${clock[2]}:00` } : {};
 }
+/**
+ * The ServicePoint's name, then its street and "postcode town", as the page's
+ * ServicePoint card shows them. The name alone when the street or town is missing.
+ */
+function servicePoint(raw) {
+    const point = isRecord(raw) ? raw : {};
+    const name = clean(point.Name, 120);
+    const street = clean(point.Address, 120);
+    const town = clean(point.Location, 80);
+    if (!name || !street || !town)
+        return name;
+    return [name, street, [clean(point.ZipCode, 16), town].filter(Boolean).join(' ')].join('\n');
+}
 function code(value) {
     if (value === undefined || value === null || value === '')
         return undefined;
@@ -80,8 +93,10 @@ export function parseDhlEcommerceEs(payload, rawNumber) {
     const current = final >= 0 && !reopened ? events[final] : latest;
     const stage = current.stage ?? dhlEcommerceEsSummaryStage(payload.Status);
     const weight = weightKg(payload.Weight);
-    // The ServicePoint is where the parcel waits only while it is ready there.
-    const point = stage === 'ready_for_pickup' && isRecord(payload.ServicePoint) ? clean(payload.ServicePoint.Name, 120) : '';
+    // The ServicePoint is where the parcel waits while it is ready there, and where it was
+    // collected when the shipment says it was delivered there and the recipient picked it up.
+    const collected = stage === 'delivered' && current.provider_code === 'RS' && payload.DeliveredInServicePoint === true;
+    const point = stage === 'ready_for_pickup' || collected ? servicePoint(payload.ServicePoint) : '';
     // CTT Express delivers DHL's consumer parcels in Spain under its own label code.
     const partner = typeof payload.ShippingCode === 'string' ? payload.ShippingCode.trim() : '';
     return {

package/dist/carriers/postnord/parser.js

@@ -11,6 +11,36 @@ export function normalizePostnordNumber(raw) {
     }
     return number;
 }
+/**
+ * The scan that made the parcel available at its service point, while it waits
+ * there or once it is collected there: the delivery, scanned at that same point,
+ * came right after it. A parcel taken back out for delivery has a movement between.
+ */
+function atPickupPoint(stage, events) {
+    if (stage === 'ready_for_pickup')
+        return events.find((event) => event.stage === 'ready_for_pickup');
+    if (stage !== 'delivered')
+        return undefined;
+    const index = events.findIndex((event) => event.stage !== 'delivered');
+    const ready = events[index];
+    return index > 0 && ready?.stage === 'ready_for_pickup' && ready.location
+        && events.slice(0, index).every((event) => event.location === ready.location) ? ready : undefined;
+}
+/**
+ * The service point's name, then its street and "postcode town", from the point
+ * record the tracking widget shows under a parcel ready for pickup. Without that
+ * record the scan's name stands alone. The receiver's address is a separate record.
+ */
+function pickupPoint(raw, scanned) {
+    const point = isRecord(raw) ? raw : {};
+    const address = isRecord(point.address) ? point.address : {};
+    const name = clean(point.name, 160);
+    if (!name)
+        return scanned;
+    const street = clean(address.street, 120);
+    const town = clean(address.city, 80);
+    return street && town ? [name, street, [clean(address.postalCode, 16), town].filter(Boolean).join(' ')].join('\n') : name;
+}
 export function parsePostnord(payload, number) {
     const requested = normalizePostnordNumber(number);
     if (!isRecord(payload) || payload.shipmentId !== requested || payload.actualReturnedId !== requested
@@ -69,8 +99,8 @@ export function parsePostnord(payload, number) {
     // The portal names the sender, usually the shop; of the receiver's address only the country is read.
     const sender = isRecord(payload.sender) ? clean(payload.sender.name, 200) : '';
     const country = isRecord(payload.receiver) && isRecord(payload.receiver.address) ? payload.receiver.address.countryCode : undefined;
-    // The service point holding the parcel, as the scan that made it available names it.
-    const pickup = mapped?.stage === 'ready_for_pickup' ? events.find((event) => event.stage === 'ready_for_pickup')?.location : undefined;
+    const pickupScan = atPickupPoint(mapped?.stage, events);
+    const pickup = pickupScan ? pickupPoint(payload.servicePoint, pickupScan.location ?? '') : '';
     return { status: mapped?.status ?? 'unknown', ...(mapped ? { current_stage: mapped.stage } : {}),
         last_status_text: header || events[0].description, last_update: events[0].time,
         expected_delivery: null, ...(delivery?.time ? { delivered_at: delivery.time } : {}),

package/package.json

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