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

package/dist/carriers/bpost/carrier.json

@@ -52,7 +52,7 @@
     "discarded": [
       "recipient",
       "sender",
-      "addresses",
+      "recipient_address",
       "contact_details",
       "delivery_preferences",
       "proof_of_delivery"

package/dist/carriers/bpost/parser.js

@@ -16,12 +16,32 @@ function countryCode(value) {
     const code = clean(value, 8).toUpperCase();
     return /^[A-Z]{2}$/.test(code) ? code : '';
 }
-/** The pickup point's name, in the first language bpost provides. Its address is never read. */
-function pickupPointName(point) {
-    if (!isRecord(point) || !isRecord(point.name))
+const LANGUAGES = ['en', 'fr', 'nl', 'de'];
+/** A field bpost gives per language, in the first of these languages it provides. */
+function localized(field, maxLength, languages = LANGUAGES) {
+    return isRecord(field) ? languages.map((language) => clean(field[language], maxLength)).find(Boolean) ?? '' : '';
+}
+// The steps for which bpost's tracker shows "Collected" at the delivery point
+// instead of "Delivered to" the recipient's address.
+const COLLECTED_STEPS = new Set(['PICKED_UP_IN_POST_OFFICE', 'PICKED_UP_IN_POST_POINT', 'PICKED_UP_IN_KARIBOO_POINT',
+    'PICKED_UP_IN_PARCEL_LOCKER', 'PICKED_UP_IN_SHOP', 'PICKED_UP_IN_PICKUP_POINT_INTERNATIONAL']);
+/**
+ * The pickup point's name, then its street and number, then "postcode town",
+ * in one language. The name alone when the street or town is missing. Its code
+ * and opening hours are not read.
+ */
+function pickupPoint(point) {
+    if (!isRecord(point))
         return '';
-    const names = point.name;
-    return ['en', 'fr', 'nl', 'de'].map((language) => clean(names[language], 160)).find(Boolean) ?? '';
+    const name = localized(point.name, 160);
+    const language = LANGUAGES.find((code) => localized(point.street, 120, [code]) && localized(point.municipality, 80, [code]));
+    if (!name || !language)
+        return name;
+    // A number or postcode reads the same in every language.
+    const any = [language, ...LANGUAGES];
+    const street = [localized(point.street, 120, [language]), localized(point.streetNumber, 16, any)].filter(Boolean).join(' ');
+    const town = [localized(point.postcode, 16, any), localized(point.municipality, 80, [language])].filter(Boolean).join(' ');
+    return [name, street, town].join('\n');
 }
 export function parseBpost(payload, number) {
     const requested = normalizeBpostNumber(number);
@@ -84,7 +104,12 @@ export function parseBpost(payload, number) {
     const mapped = classifyBpostStatus(latest.description);
     const current = returnDelivery && mapped?.stage === 'delivered' ? { status: 'exception', stage: 'returned' } : mapped;
     const destination = isRecord(item.receiver) ? countryCode(item.receiver.countryCode) : '';
-    const pickupPoint = current?.stage === 'ready_for_pickup' ? pickupPointName(item.deliveryPoint) : '';
+    // The delivery point is the pickup point itself, apart from the receiver: bpost's
+    // tracker shows it with opening hours and directions from its own coordinates.
+    // It stays once the parcel is collected there, never after a door delivery.
+    const collected = current?.stage === 'delivered' && isRecord(item.activeStep)
+        && typeof item.activeStep.knownProcessStep === 'string' && COLLECTED_STEPS.has(item.activeStep.knownProcessStep);
+    const point = current?.stage === 'ready_for_pickup' || collected ? pickupPoint(item.deliveryPoint) : '';
     // The sender's barcode is kept only when it is an S10 number other than the one searched.
     const senderBarcode = clean(item.senderBarcode, 32).toUpperCase();
     const international = senderBarcode !== requested && isValidS10TrackingNumber(senderBarcode) ? senderBarcode : '';
@@ -97,7 +122,7 @@ export function parseBpost(payload, number) {
         ...(typeof grams === 'number' && Number.isFinite(grams) && grams > 0 ? { weight_kg: grams / 1000 } : {}),
         ...(dimensionMatch && dimensionMatch.slice(1).every((value) => Number(value) > 0)
             ? { dimensions_text: `${dimensionMatch.slice(1).join(' × ')} cm` } : {}),
-        ...(pickupPoint ? { pickup_point: pickupPoint } : {}),
+        ...(point ? { pickup_point: point } : {}),
         ...(destination ? { destination_country: destination } : {}),
         ...(international ? { international_tracking_number: international } : {}),
         events: events.slice(0, 100) };

package/dist/carriers/posti/adapter.js

@@ -70,6 +70,18 @@ function pickupPoint(raw) {
     }
     return [name, city].filter(Boolean).join('\n');
 }
+/**
+ * Whether the parcel waits at its pickup point, or was collected there: its
+ * last movement before the delivery made it ready for pickup. Notices prove
+ * no movement.
+ */
+function atPickupPoint(stage, events) {
+    if (stage === 'ready_for_pickup')
+        return true;
+    if (stage !== 'delivered')
+        return false;
+    return events.find((event) => !['pending', 'delivered'].includes(event.stage ?? ''))?.stage === 'ready_for_pickup';
+}
 function measurement(raw, units) {
     if (!isRecord(raw) || typeof raw.unit !== 'string' || !Object.hasOwn(units, raw.unit.toLowerCase()))
         return null;
@@ -130,7 +142,7 @@ export function parse(payload, trackingNumber) {
         weight_kg: measurement(measurements.weight, { kg: 1, g: 0.001 }),
         dimensions_text: dimensions.every((value) => value !== null) ? `${dimensions.join(' × ')} cm` : null,
         // Posti's tracker shows the point at any status, a planned one in transit included.
-        pickup_point: current?.stage === 'ready_for_pickup' ? pickupPoint(hit.pickupPoint) : null,
+        pickup_point: atPickupPoint(current?.stage, events) ? pickupPoint(hit.pickupPoint) : null,
         timezone: 'Europe/Helsinki',
         events,
     };

package/package.json

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