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

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/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.565",
+  "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",