universal-parcel-scraper 0.55.0-main.706 → 0.55.0-main.708

package/dist/carriers/swiss-post-cargo/adapter.js

@@ -15,6 +15,8 @@ const PROVIDER = 'Swiss Post Cargo';
 const ZONE = 'Europe/Zurich';
 const DEFAULT_TIMEOUT_MS = 15_000;
 const MAX_RESPONSE_BYTES = 2_000_000;
+/** The delivery photo and signature rows: proof of a delivery, not scans of their own. */
+const DELIVERY_PROOF_CODES = new Set(['IMG', 'SIG']);
 /**
  * The endpoint sends Swiss wall-clock ISO-8601 without an offset
  * (`2026-08-30T12:30:00.777`). It is read in Europe/Zurich, never in the
@@ -99,6 +101,7 @@ export function parseSwissPostCargoResponse(payload, rawTrackingNumber, now = Da
     for (const shipment of shipments.slice(0, 100)) {
         if (!Array.isArray(shipment.History))
             continue;
+        const rows = [];
         for (const candidate of shipment.History.slice(0, 500)) {
             if (!isRecord(candidate))
                 continue;
@@ -106,13 +109,22 @@ export function parseSwissPostCargoResponse(payload, rawTrackingNumber, now = Da
             const description = cleanScalar(candidate.Description);
             if (!time || !description)
                 continue;
-            const location = cleanScalar(candidate.City, 120);
             const code = cleanScalar(candidate.Status, 32).toLocaleUpperCase('en-US');
+            rows.push({
+                time, description, code, location: cleanScalar(candidate.City, 120),
+                classified: statusFor(code, description), proof: DELIVERY_PROOF_CODES.has(code),
+            });
+        }
+        // A barcode's photo and signature are part of its delivery scan: folded
+        // into it, they never stand on top of it.
+        const deliveryScan = rows.some((row) => !row.proof && row.classified.stage === 'delivered');
+        for (const { time, description, code, location, classified, proof } of rows) {
+            if (proof && deliveryScan)
+                continue;
             const identity = JSON.stringify([time.iso, location, description, code]);
             if (seen.has(identity))
                 continue;
             seen.add(identity);
-            const classified = statusFor(code, description);
             parsedEvents.push({
                 event: {
                     time: time.iso,
@@ -123,12 +135,16 @@ export function parseSwissPostCargoResponse(payload, rawTrackingNumber, now = Da
                 },
                 status: classified.status,
                 timestamp: time.timestamp,
+                proof,
                 index,
             });
             index += 1;
         }
     }
-    parsedEvents.sort((left, right) => right.timestamp - left.timestamp || left.index - right.index);
+    // Ties keep the carrier's order, except that a photo or signature never
+    // passes a scan made at the same instant.
+    parsedEvents.sort((left, right) => right.timestamp - left.timestamp
+        || Number(left.proof) - Number(right.proof) || left.index - right.index);
     const events = parsedEvents.slice(0, 100);
     if (events.length === 0) {
         throw new SchemaError(PROVIDER, 'Swiss Post Cargo returned no usable tracking events');

package/dist/carriers/swiss-post-cargo/statuses.json

@@ -4,8 +4,8 @@
     { "code": "DLV", "stage": "delivered", "confirmedBy": "fixture", "firstSeen": "2026-08-30", "note": "Delivery scan; appears with the wording 'Delivered'." },
     { "code": "POD", "wording": "DELIVERED SCANNED", "language": "en", "stage": "delivered", "confirmedBy": "live", "firstSeen": "2026-08-30", "note": "Proof-of-delivery scan; seen live with the delivery wording." },
     { "code": "P40", "stage": "delivered", "confirmedBy": "prior-art", "firstSeen": "2026-08-30", "note": "Proof-of-delivery family carried over from the adapter's original map; not re-confirmed against a capture." },
-    { "code": "IMG", "wording": "IMAGE", "language": "en", "stage": "delivered", "confirmedBy": "live", "firstSeen": "2026-08-30", "note": "A delivery picture: live histories show it just before the delivery scan. The picture itself is never retained." },
-    { "code": "SIG", "wording": "SIGNATURE", "language": "en", "stage": "delivered", "confirmedBy": "live", "firstSeen": "2026-08-30", "note": "Signed for, at the instant of the delivery scan; the signature itself is never retained." },
+    { "code": "IMG", "wording": "IMAGE", "language": "en", "stage": "delivered", "confirmedBy": "live", "firstSeen": "2026-08-30", "note": "A delivery picture: live histories show it at or just before the delivery scan's instant, listed ahead of it. Folded into the barcode's delivery scan; the picture itself is never retained." },
+    { "code": "SIG", "wording": "SIGNATURE", "language": "en", "stage": "delivered", "confirmedBy": "live", "firstSeen": "2026-08-30", "note": "Signed for, at the instant of the delivery scan. Folded into the barcode's delivery scan; the signature itself is never retained." },
     { "code": "SCA", "wording": "Loaded for Delivery", "language": "en", "stage": "out_for_delivery", "confirmedBy": "live", "firstSeen": "2026-08-30", "note": "Delivery-round scan." },
     { "code": "NTF", "wording": "Data entry POST", "language": "en", "stage": "registered", "confirmedBy": "live", "firstSeen": "2026-08-30", "note": "Shipment announced." },
     { "code": "RFS", "wording": "Received warehouse POST", "language": "en", "stage": "accepted", "confirmedBy": "live", "firstSeen": "2026-08-30", "note": "Accompanies the wording 'Shipment accepted'." },

package/dist/core/status/language.js

@@ -107,6 +107,32 @@ const HOLD = String.raw `\b(?:on hold|held|hold|holding|retenu(?:e|s|es)?|en att
 const RECIPIENT_HOLD = new RegExp(`${HOLD}${SENTENCE}*?${RECIPIENT_REQUEST}|${RECIPIENT_REQUEST}${SENTENCE}*?${HOLD}`);
 /** Where a held parcel waits for the recipient to collect it. */
 const COUNTER = /post office|postal outlet|pick ?up|collection|counter|retail (?:location|outlet)|bureau de poste|point (?:de )?retrait|point relais|filiale|abholung|ufficio postale|ritiro|oficina|recogida|levantamento|agencia/;
+/** The recipient's side by its role, not a service desk or an agent acting for it. */
+const RECIPIENT = String.raw `(?:recipient|addressee|consignee|customer|receiver)s?\b(?!'| (?:service|care|support)\b)`;
+/**
+ * Where only a recipient collects a parcel. Parcel shops, service points and
+ * access points also take in the drop-offs a courier then collects ("Picked
+ * up at parcelshop", "collected from the ServicePoint"), so a collection there
+ * has to name the recipient.
+ */
+const COLLECTION_PLACE = String.raw `(?:pick ?up (?:point|station|parcel ?shop|locker)|collection point|(?:parcel )?lockers?|packstation|(?:post office |postal )?counter)\b`;
+const COLLECTED = String.raw `(?:picked up|collected)`;
+/**
+ * A parcel collected from its pickup point: by the recipient, the consignee or
+ * the customer, or from a pickup point, locker or counter, in each language.
+ */
+const RECIPIENT_COLLECTED = new RegExp([
+    String.raw `\b${COLLECTED}(?: [\w'-]+){0,6}? by (?:the |a |an |its |your )?${RECIPIENT}|\b${RECIPIENT} (?:has |have )?(?:already )?${COLLECTED}\b|\b${COLLECTED} (?:from|at|in) (?:the |a |an |its |your |our )?(?:[\w-]+ ){0,2}?${COLLECTION_PLACE}`,
+    String.raw `\bretire(?:e|s|es)?\b${SENTENCE}*? par (?:le |la |l'|son |sa )?(?:destinataire|cliente?)\b|\b(?:destinataire|cliente?) a retire\b|\bretire(?:e|s|es)? (?:au |en |dans (?:le |la |l'|un |une |votre |son )|a la |a l')(?:point (?:de )?retrait|point relais|relais|consigne|locker|bureau de poste)\b`,
+    String.raw `\b(?:vom|von (?:der|dem)|durch (?:den|die)) (?:empfanger(?:in)?|kunden|kundin|adressaten|adressatin)\b${SENTENCE}*?\babgeholt\b|\b(?:empfanger(?:in)?|kunde|kundin) hat\b${SENTENCE}*?\babgeholt\b|\b(?:in|aus) (?:der|dem|einer|einem|ihrer|ihrem) (?:[\w-]+ )?(?:filiale|postfiliale|packstation|paketstation|abholstation|postamt)\b${SENTENCE}*?\babgeholt\b`,
+    String.raw `\britirat[oaie]\b${SENTENCE}*? dal(?:la)? (?:destinatari[oa]|cliente)\b|\b(?:destinatari[oa]|cliente) ha ritirato\b|\britirat[oaie] (?:presso|in|al|nel|nella) (?:il |la |lo |l')?(?:punto (?:di )?ritiro|locker|ufficio postale)\b`,
+    String.raw `\b(?:recogid|retirad)[oa]s? por (?:el |la )?destinatari[oa]\b|\bdestinatari[oa] (?:ya )?ha (?:recogido|retirado)\b|\b(?:levantad|retirad)[oa]s? pel[oa] destinatari[oa]\b|\bodebran[aeoy] przez (?:odbiorce|adresata)\b`,
+].join('|'));
+const COLLECT_VERB = String.raw `(?:picked up|collected|retire|abgeholt|ritirat|recogid|retirad|levantad|odebran)`;
+/** A collection negated, still to come or made a condition, in each language. */
+const COLLECTION_PENDING = new RegExp(String.raw `(?:\b(?:not|never|nothing|non|pas|jamais|nicht|nao|nie)\b|n't)${SENTENCE}*?${COLLECT_VERB}|\bno (?:(?:ha|han|fue|sido|se) )*(?:recogid|retirad)|\b(?:be|being|once|when|until|till|if|unless|before|etre|sera|seront|serait|essere|sara|saranno|verra|verranno)(?: [\w']+){0,3}? ${COLLECT_VERB}|\babgeholt (?:werden|wird)\b|\b(?:wird|werden|kann|konnen|muss|soll)\b${SENTENCE}*?\babgeholt\b`);
+/** A courier, a driver or the sender's side collecting it, in each language. */
+const COLLECTED_BY_CARRIER = new RegExp(String.raw `\b(?:by|from|par|de|du|vom|von|beim|dal|dalla|dallo|por|del|pelo|przez) (?:the |a |an |our |your |le |la |l'|den |der |dem |il |lo |el |o )?(?:[\w-]+ )?(?:couriers?|drivers?|carriers?|senders?|shippers?|sellers?|merchants?|consignors?|chauffeur|livreur|transporteur|coursier|expediteur|\w*(?:fahrer|kurier|zusteller|boten?)|absender|corriere|autista|vettore|mittente|repartidor|mensajero|transportista|remitente|motorista|estafeta|remetente|kuriera|nadawcy)\b(?!')`);
 /**
  * A shipment, order or label cancelled, and nothing else in the scan, in each
  * language and Turkish ("İptal Edildi"). A cancelled return, pickup or hold,
@@ -193,6 +219,11 @@ export function trackingLanguageStage(description) {
     // admisión", a parcel the sender dropped in a CityPaq locker.
     if (/\bpara (?:su )?(?:admision|admissao)\b|\b(?:deposited|dropped off)\b(?: [\w']+){0,8}? for (?:admission|acceptance)\b/.test(text))
         return 'registered';
+    // The recipient collecting the parcel ends the delivery, ahead of the drop-off
+    // at the pickup point the scan may also name; the courier's or the sender's
+    // collection is an acceptance below.
+    if (RECIPIENT_COLLECTED.test(text) && !COLLECTION_PENDING.test(text) && !COLLECTED_BY_CARRIER.test(text))
+        return 'delivered';
     // "Delivered to" a pickup point or an intermediary is not delivery to the
     // recipient; a parcel already waiting at its pickup point outranks the
     // "sera remis" (will be handed over) that follows in La Poste's sentence.
@@ -266,7 +297,7 @@ export function trackingLanguageStage(description) {
     // A delivery still to come ("una vez entregado", "que se entregue", "quando
     // for entregue") is not one; Spanish "entregue" is also a subjunctive.
     if (!/\b(?:una vez|cuando|hasta que|antes de que|para que|en cuanto|tan pronto como|uma vez|quando|assim que|ate que|logo que)\b[^.;:]*\bentreg/.test(text)
-        && /(?<!\b(?:sea|sean|fuera|fuese|ser|seja|sejam|fosse|for|forem|que|se) )\b(?:entregad[oa]s?|entregues?)\b|\bentrega (?:realizada|efectuada|efetuada|completada|concluida|finalizada)\b|\brecogid[oa] por (?:el |la )?destinatari[oa]\b|\b(?:levantad|retirad)[oa] pelo destinatario\b/.test(text))
+        && /(?<!\b(?:sea|sean|fuera|fuese|ser|seja|sejam|fosse|for|forem|que|se) )\b(?:entregad[oa]s?|entregues?)\b|\bentrega (?:realizada|efectuada|efetuada|completada|concluida|finalizada)\b/.test(text))
         return 'delivered';
     // A handover to another network, a carrier or a courier set apart, takes the parcel on.
     if (HANDED_TO_NETWORK.test(text))

package/package.json

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