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

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/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/package.json

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