universal-parcel-scraper 0.684.0-main.3241 → 0.684.2-main.3245

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -23,6 +23,13 @@ function identity(value, provider) {
23
23
  }
24
24
  return normalizeTrackingNumber(value.trim());
25
25
  }
26
+ /** The shipper's reference is free text the official client shows only when present. */
27
+ function shipperReference(value, provider) {
28
+ if (value != null && typeof value !== 'string')
29
+ throw new SchemaError(provider, 'GOFO returned an invalid shipper reference');
30
+ const text = clean(value, 100);
31
+ return text ? normalizeTrackingNumber(text) : undefined;
32
+ }
26
33
  function scanClock(value, provider) {
27
34
  if (value == null || value === '')
28
35
  return {};
@@ -68,9 +75,9 @@ export function parseRegionalGofo(payload, rawNumber, region, stageOf) {
68
75
  throw new SchemaError(provider, 'GOFO returned ambiguous parcel history');
69
76
  const item = payload.data[0];
70
77
  const waybill = identity(item.waybillNo, provider);
71
- const reference = identity(item.trackingNumber, provider);
72
- if (!isRegionalGofoWaybill(waybill, region) || ![waybill, reference].includes(number)
73
- || /^(?:GF|CI)(?:US|FR|IT|NL|ES)/.test(reference) && (!isRegionalGofoWaybill(reference, region) || reference !== waybill)) {
78
+ const reference = shipperReference(item.trackingNumber, provider);
79
+ if (!isRegionalGofoWaybill(waybill, region) || waybill !== number && reference !== number
80
+ || reference && /^(?:GF|CI)(?:US|FR|IT|NL|ES)/.test(reference) && (!isRegionalGofoWaybill(reference, region) || reference !== waybill)) {
74
81
  throw new SchemaError(provider, 'GOFO returned a different parcel or national network');
75
82
  }
76
83
  if (countryCode(item.toCountry) !== region)
@@ -92,8 +99,8 @@ export function parseRegionalGofo(payload, rawNumber, region, stageOf) {
92
99
  // The regional clients render the latest-first list as returned. Equal or
93
100
  // unresolved clocks keep this order instead of acquiring an invented zone.
94
101
  for (const row of rows) {
95
- if (row.waybillNo != null && identity(row.waybillNo, provider) !== waybill
96
- || row.trackingNumber != null && identity(row.trackingNumber, provider) !== reference) {
102
+ const rowReference = shipperReference(row.trackingNumber, provider);
103
+ if (row.waybillNo != null && identity(row.waybillNo, provider) !== waybill || rowReference && rowReference !== reference) {
97
104
  throw new SchemaError(provider, 'GOFO returned a scan for a different parcel');
98
105
  }
99
106
  const code = cleanScalar(row.processCode, 32);
@@ -2,7 +2,7 @@
2
2
  "openapi": "3.1.0",
3
3
  "info": {
4
4
  "title": "Universal Parcel Scraper",
5
- "version": "0.684.0"
5
+ "version": "0.684.2"
6
6
  },
7
7
  "paths": {
8
8
  "/health": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "universal-parcel-scraper",
3
- "version": "0.684.0-main.3241",
3
+ "version": "0.684.2-main.3245",
4
4
  "description": "Self-hosted parcel tracking: carrier detection, dedicated scrapers and optional universal providers.",
5
5
  "type": "module",
6
6
  "license": "Apache-2.0",