universal-parcel-scraper 0.35.0-main.384 → 0.36.0

package/data/catalog.json

@@ -2439,13 +2439,13 @@
       "recognitionRank": 24
     },
     "canaryUrl": "https://dinapaqweb.tipsa-dinapaq.com/dinapaqweb/detalle_envio.php",
-    "trackingUrlTemplate": "https://www.tip-sa.com/cliente/datos_prestashop.php?id={trackingNumber}",
+    "trackingUrlTemplate": "https://www.tip-sa.com/cliente/datos_env.php?id={trackingNumber}",
     "linkRules": [
       {
         "domains": [
           "tip-sa.com"
         ],
-        "path": "^/cliente/datos(?:_prestashop)?\\.php$",
+        "path": "^/cliente/datos(?:_prestashop|_env)?\\.php$",
         "params": [
           "id"
         ]

package/dist/browser/scraper.js

@@ -1972,10 +1972,10 @@ var ce = {
 			recognitionRank: 24
 		},
 		canaryUrl: "https://dinapaqweb.tipsa-dinapaq.com/dinapaqweb/detalle_envio.php",
-		trackingUrlTemplate: "https://www.tip-sa.com/cliente/datos_prestashop.php?id={trackingNumber}",
+		trackingUrlTemplate: "https://www.tip-sa.com/cliente/datos_env.php?id={trackingNumber}",
 		linkRules: [{
 			domains: ["tip-sa.com"],
-			path: "^/cliente/datos(?:_prestashop)?\\.php$",
+			path: "^/cliente/datos(?:_prestashop|_env)?\\.php$",
 			params: ["id"]
 		}],
 		detectionRules: [{

package/dist/carriers/tipsa/adapter.js

@@ -3,9 +3,10 @@ import { BudgetExceededError, NotFoundError, SchemaError } from '../../core/erro
 import { runSteps } from '../../core/runner/index.js';
 import { NOOP_RECORDER } from '../../core/telemetry/index.js';
 import { decodeText, fetchBounded } from '../../core/transport/index.js';
-import { normalizeTipsaNumber, parseTipsaDetail, tipsaDetailUrl } from './parser.js';
-// The shop link (www.tip-sa.com/cliente/datos_prestashop.php) redirects here.
-const LOOKUP = 'https://aplicaciones.tip-sa.com/cliente/datos_prestashop.php';
+import { normalizeTipsaNumber, parseTipsaDetail, tipsaDetailUrl, tipsaLookupNotFound } from './parser.js';
+// The shop link (www.tip-sa.com/cliente/datos_env.php) redirects here. Unlike
+// datos_prestashop.php, it does not ask for the destination postcode.
+const LOOKUP = 'https://aplicaciones.tip-sa.com/cliente/datos_env.php';
 const USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/154.0.0.0 Safari/537.36';
 const LOOKUP_MAX_BYTES = 20_000;
 const DETAIL_MAX_BYTES = 1_000_000;
@@ -21,12 +22,12 @@ export class TipsaTracker {
         return runSteps({ carrier: 'tipsa', budgetMs, signal: context.signal,
             recorder: this.options.recorder ?? NOOP_RECORDER }, [{ id: 'direct', run: async ({ signal, remainingMs }) => {
                     const deadline = performance.now() + remainingMs;
-                    const read = async (url, maxBytes, encoding) => {
+                    const read = async (url, maxBytes) => {
                         signal.throwIfAborted();
                         const left = deadline - performance.now();
                         if (left <= 0)
                             throw new BudgetExceededError('TIPSA', budgetMs);
-                        const { response, bytes } = await fetchBounded(url, { signal, headers: {
+                        const fetched = await fetchBounded(url, { signal, headers: {
                                 'User-Agent': USER_AGENT,
                                 Accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
                                 'Accept-Language': 'es-ES,es;q=0.9,en;q=0.8',
@@ -34,14 +35,20 @@ export class TipsaTracker {
                             allowHttpStatuses: REDIRECTS, fetcher: this.options.fetcher });
                         if (performance.now() >= deadline)
                             throw new BudgetExceededError('TIPSA', budgetMs);
-                        if (REDIRECTS.includes(response.status))
-                            throw new SchemaError('TIPSA', 'TIPSA tracking page moved');
-                        return decodeText(bytes, encoding);
+                        return fetched;
                     };
-                    const detail = tipsaDetailUrl(await read(`${LOOKUP}?id=${number}`, LOOKUP_MAX_BYTES, 'utf-8'));
-                    if (!detail)
-                        throw new NotFoundError('TIPSA');
-                    return parseTipsaDetail(await read(detail, DETAIL_MAX_BYTES, 'iso-8859-1'), number);
+                    // A known reference redirects to its shipment page; an unknown one
+                    // answers a page that refreshes to TIPSA's not-located page.
+                    const lookup = await read(`${LOOKUP}?id=${number}`, LOOKUP_MAX_BYTES);
+                    if (!REDIRECTS.includes(lookup.response.status)) {
+                        if (tipsaLookupNotFound(decodeText(lookup.bytes, 'utf-8')))
+                            throw new NotFoundError('TIPSA');
+                        throw new SchemaError('TIPSA', 'TIPSA lookup did not name a shipment page');
+                    }
+                    const detail = await read(tipsaDetailUrl(lookup.response.headers.get('location') ?? ''), DETAIL_MAX_BYTES);
+                    if (REDIRECTS.includes(detail.response.status))
+                        throw new SchemaError('TIPSA', 'TIPSA tracking page moved');
+                    return parseTipsaDetail(decodeText(detail.bytes, 'iso-8859-1'), number);
                 } }]);
     }
 }

package/dist/carriers/tipsa/carrier.json

@@ -29,7 +29,7 @@
     "location"
   ],
   "portal": {
-    "url": "https://www.tip-sa.com/cliente/datos_prestashop.php?id={trackingNumber}",
+    "url": "https://www.tip-sa.com/cliente/datos_env.php?id={trackingNumber}",
     "canaryUrl": "https://dinapaqweb.tipsa-dinapaq.com/dinapaqweb/detalle_envio.php",
     "shows": [
       "status",
@@ -70,7 +70,7 @@
       "domains": [
         "tip-sa.com"
       ],
-      "path": "^/cliente/datos(?:_prestashop)?\\.php$",
+      "path": "^/cliente/datos(?:_prestashop|_env)?\\.php$",
       "params": [
         "id"
       ]

package/dist/carriers/tipsa/parser.d.ts

@@ -3,12 +3,15 @@ export declare const TIPSA_ZONE = "Europe/Madrid";
 /** The 22-digit reference: charge agency, origin agency and waybill, six, six and ten digits. */
 export declare function normalizeTipsaNumber(raw: string): string;
 /**
- * The shipment page the lookup's meta refresh names, or null when TIPSA knows
- * no shipment by that reference (it then names the page with empty
- * parameters). Only TIPSA's own detail page with a service id and a
- * `dd/MM/yy` date is followed.
+ * The shipment page a lookup redirects to. Only TIPSA's own detail page with
+ * a service id and a `dd/MM/yy` date is followed.
  */
-export declare function tipsaDetailUrl(html: string): string | null;
+export declare function tipsaDetailUrl(location: string): string;
+/**
+ * Whether a lookup that did not redirect is TIPSA's answer for a reference it
+ * cannot locate: a page that refreshes to its "envío no localizado" page.
+ */
+export declare function tipsaLookupNotFound(html: string): boolean;
 /**
  * The history table of TIPSA's shipment page. Its clock is Madrid's for every
  * agency, Portuguese ones included. Recipient, sender, reference and proof of

package/dist/carriers/tipsa/parser.js

@@ -19,36 +19,32 @@ export function normalizeTipsaNumber(raw) {
     throw new InvalidInputError(PROVIDER, 'TIPSA requires the full 22-digit reference');
 }
 /**
- * The shipment page the lookup's meta refresh names, or null when TIPSA knows
- * no shipment by that reference (it then names the page with empty
- * parameters). Only TIPSA's own detail page with a service id and a
- * `dd/MM/yy` date is followed.
+ * The shipment page a lookup redirects to. Only TIPSA's own detail page with
+ * a service id and a `dd/MM/yy` date is followed.
  */
-export function tipsaDetailUrl(html) {
-    const target = /<meta\s+http-equiv=["']refresh["']\s+content=["']\s*0\s*;\s*URL=([^"'\s]{1,512})["']/i.exec(html)?.[1];
-    if (!target)
-        throw new SchemaError(PROVIDER, 'TIPSA lookup did not name a shipment page');
+export function tipsaDetailUrl(location) {
     let url;
     try {
-        url = new URL(target.replaceAll('&amp;', '&'));
+        url = new URL(location);
     }
     catch {
         throw new SchemaError(PROVIDER, 'TIPSA shipment page address is invalid');
     }
     const keys = [...url.searchParams.keys()];
     if (url.origin !== DETAIL_ORIGIN || url.pathname.toLowerCase() !== DETAIL_PATH || url.username || url.password || url.hash
-        || keys.length !== 2 || !keys.includes('servicio') || !keys.includes('fecha')) {
-        throw new SchemaError(PROVIDER, 'TIPSA shipment page address changed');
-    }
-    const service = url.searchParams.get('servicio');
-    const date = url.searchParams.get('fecha');
-    if (!service && !date)
-        return null;
-    if (!SERVICE.test(service) || !/^\d{2}\/\d{2}\/\d{2}$/.test(date)) {
+        || keys.length !== 2 || !keys.includes('servicio') || !keys.includes('fecha')
+        || !SERVICE.test(url.searchParams.get('servicio')) || !/^\d{2}\/\d{2}\/\d{2}$/.test(url.searchParams.get('fecha'))) {
         throw new SchemaError(PROVIDER, 'TIPSA shipment page address changed');
     }
     return url.toString();
 }
+/**
+ * Whether a lookup that did not redirect is TIPSA's answer for a reference it
+ * cannot locate: a page that refreshes to its "envío no localizado" page.
+ */
+export function tipsaLookupNotFound(html) {
+    return /<meta\s+http-equiv=["']refresh["']\s+content=["']\s*\d+\s*;\s*URL=error_env\.html["']/i.test(html);
+}
 /**
  * The history table of TIPSA's shipment page. Its clock is Madrid's for every
  * agency, Portuguese ones included. Recipient, sender, reference and proof of

package/dist/core/transport/trawl.d.ts

@@ -30,6 +30,8 @@ export interface TrawlCapturedResponse {
     truncated: boolean;
     base64Encoded: boolean;
     error: string | null;
+    /** 17TRACK's matching browser request included the supplied delivery postcode. */
+    postcodeSubmitted?: boolean;
 }
 export interface TrawlScrapeResponse {
     url: string;

package/dist/core/transport/trawl.js

@@ -70,6 +70,7 @@ function captured(value) {
         truncated: entry.truncated === true,
         base64Encoded: entry.base64Encoded === true,
         error: typeof entry.error === 'string' ? entry.error : entry.error ? 'error' : null,
+        ...(entry.postcodeSubmitted === true ? { postcodeSubmitted: true } : {}),
     }));
 }
 /**

package/dist/data/catalog.json

@@ -2439,13 +2439,13 @@
             "recognitionRank": 24
         },
         "canaryUrl": "https://dinapaqweb.tipsa-dinapaq.com/dinapaqweb/detalle_envio.php",
-        "trackingUrlTemplate": "https://www.tip-sa.com/cliente/datos_prestashop.php?id={trackingNumber}",
+        "trackingUrlTemplate": "https://www.tip-sa.com/cliente/datos_env.php?id={trackingNumber}",
         "linkRules": [
             {
                 "domains": [
                     "tip-sa.com"
                 ],
-                "path": "^/cliente/datos(?:_prestashop)?\\.php$",
+                "path": "^/cliente/datos(?:_prestashop|_env)?\\.php$",
                 "params": [
                     "id"
                 ]

package/dist/generated/catalog.d.ts

@@ -1620,10 +1620,10 @@ export declare const CARRIER_CATALOG: {
             readonly recognitionRank: 24;
         };
         readonly canaryUrl: "https://dinapaqweb.tipsa-dinapaq.com/dinapaqweb/detalle_envio.php";
-        readonly trackingUrlTemplate: "https://www.tip-sa.com/cliente/datos_prestashop.php?id={trackingNumber}";
+        readonly trackingUrlTemplate: "https://www.tip-sa.com/cliente/datos_env.php?id={trackingNumber}";
         readonly linkRules: readonly [{
             readonly domains: readonly ["tip-sa.com"];
-            readonly path: "^/cliente/datos(?:_prestashop)?\\.php$";
+            readonly path: "^/cliente/datos(?:_prestashop|_env)?\\.php$";
             readonly params: readonly ["id"];
         }];
         readonly detectionRules: readonly [{

package/dist/generated/catalog.js

@@ -2440,13 +2440,13 @@ export const CARRIER_CATALOG = {
             "recognitionRank": 24
         },
         "canaryUrl": "https://dinapaqweb.tipsa-dinapaq.com/dinapaqweb/detalle_envio.php",
-        "trackingUrlTemplate": "https://www.tip-sa.com/cliente/datos_prestashop.php?id={trackingNumber}",
+        "trackingUrlTemplate": "https://www.tip-sa.com/cliente/datos_env.php?id={trackingNumber}",
         "linkRules": [
             {
                 "domains": [
                     "tip-sa.com"
                 ],
-                "path": "^/cliente/datos(?:_prestashop)?\\.php$",
+                "path": "^/cliente/datos(?:_prestashop|_env)?\\.php$",
                 "params": [
                     "id"
                 ]

package/dist/providers/seventeentrack/adapter.d.ts

@@ -25,7 +25,7 @@ export declare class SeventeenTrackVerificationError extends ChallengeError {
 }
 /** Structured replies without usable history; polling may still produce a later success. */
 export declare function isSeventeenTrackLookupError(error: unknown): error is SeventeenTrackLookupError | SeventeenTrackNoHistoryError | SeventeenTrackVerificationError;
-export declare function parse17TrackResponse(payload: unknown, trackingNumber: string): CarrierResult;
+export declare function parse17TrackResponse(payload: unknown, trackingNumber: string, postcode?: string | null): CarrierResult;
 export interface SeventeenTrackOptions {
     trawl?: TrawlClient | null;
     fetcher?: typeof fetch;
@@ -35,6 +35,6 @@ export interface SeventeenTrackOptions {
 export declare class SeventeenTrackTracker {
     readonly options: SeventeenTrackOptions;
     constructor(options?: SeventeenTrackOptions);
-    fetch(trackingNumber: string, budgetMs?: number, signal?: AbortSignal): Promise<CarrierResult>;
+    fetch(trackingNumber: string, budgetMs?: number, signal?: AbortSignal, postcode?: string | null): Promise<CarrierResult>;
 }
 export declare const adapter: AdapterFactory;

package/dist/providers/seventeentrack/adapter.js

@@ -9,7 +9,7 @@
  * verification wall from an outage.
  */
 import { DateTime } from 'luxon';
-import { ChallengeError, NoHistoryError, NotFoundError, SchemaError, TransportError } from '../../core/errors/index.js';
+import { ChallengeError, InputRequiredError, InvalidInputError, NoHistoryError, NotFoundError, SchemaError, TransportError } from '../../core/errors/index.js';
 import { runSteps } from '../../core/runner/index.js';
 import { isRecord } from '../../core/types.js';
 import { universalCarrierHints } from '../shared/hints.js';
@@ -75,7 +75,13 @@ function facilityWall(raw) {
     return clock && typeof clock.date === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(clock.date)
         && typeof clock.time === 'string' && /^\d{2}:\d{2}:\d{2}$/.test(clock.time) ? `${clock.date}T${clock.time}` : null;
 }
-export function parse17TrackResponse(payload, trackingNumber) {
+function requestsPostcode(shipment) {
+    if (Array.isArray(shipment.params_v2))
+        return shipment.params_v2.some(p => isRecord(p) && p.key === 'postal_code');
+    return (isRecord(shipment.param) && shipment.param.type === 'PostalCode')
+        || (Array.isArray(shipment.params) && shipment.params.some(p => isRecord(p) && p.type === 'PostalCode'));
+}
+export function parse17TrackResponse(payload, trackingNumber, postcode = null) {
     const number = numberOf(trackingNumber);
     if (!isRecord(payload) || !isRecord(payload.meta) || !Number.isInteger(payload.meta.code)) {
         throw new SchemaError(SOURCE, '17TRACK lookup unavailable');
@@ -94,8 +100,11 @@ export function parse17TrackResponse(payload, trackingNumber) {
         const code = Number(matches[0].code);
         // Observed repeatedly for valid references whose other providers have history.
         // Scope this to the matching shipment; envelope errors and unknown shapes remain failures.
-        if (code === 400 && matches[0].shipment === null)
+        if (code === 400 && matches[0].shipment === null) {
+            if (!postcode && requestsPostcode(matches[0]))
+                throw new InputRequiredError(SOURCE, 'postcode');
             throw new SeventeenTrackNoHistoryError();
+        }
         throw new SeventeenTrackLookupError(code === 100 ? 'lookup_pending' : 'lookup_unavailable', code);
     }
     if (matches.length !== 1 || !isRecord(matches[0]) || matches[0].code !== 200 || !isRecord(matches[0].shipment)) {
@@ -156,10 +165,14 @@ export class SeventeenTrackTracker {
     constructor(options = {}) {
         this.options = options;
     }
-    async fetch(trackingNumber, budgetMs = this.options.timeoutMs ?? 30_000, signal) {
+    async fetch(trackingNumber, budgetMs = this.options.timeoutMs ?? 30_000, signal, postcode = null) {
         const number = numberOf(trackingNumber);
+        postcode = postcode?.trim().replace(/\s+/g, ' ').toUpperCase() || null;
+        if (postcode && (postcode.length < 2 || postcode.length > 15 || !/^[A-Z0-9]+(?:[ -][A-Z0-9]+)*$/.test(postcode))) {
+            throw new InvalidInputError(SOURCE, '17TRACK delivery postcode has an invalid format');
+        }
         const spec = (remainingMs, signal) => ({
-            source: SOURCE, url: `https://t.17track.net/en#nums=${number}`, apiUrl: API_URL,
+            source: SOURCE, url: `https://t.17track.net/en#nums=${number}${postcode ? `&trawl-postcode=${encodeURIComponent(postcode)}` : ''}`, apiUrl: API_URL,
             budgetMs: remainingMs, fetcher: this.options.fetcher, signal,
         });
         return runSteps({ carrier: SOURCE, budgetMs, signal, recorder: this.options.recorder }, [{
@@ -170,12 +183,28 @@ export class SeventeenTrackTracker {
                     let pending;
                     for (const body of capturedBodies(page, capture)) {
                         try {
-                            return parse17TrackResponse(JSON.parse(body), number);
+                            const payload = JSON.parse(body);
+                            // Old browser-service builds ignore the private input marker. Never
+                            // report that a supplied postcode was tried without a bound request.
+                            const submitted = page.capturedResponses.some(entry => entry.body === body && entry.postcodeSubmitted === true);
+                            if (postcode && !submitted) {
+                                try {
+                                    return parse17TrackResponse(payload, number);
+                                }
+                                catch (error) {
+                                    if (error instanceof InputRequiredError || error instanceof SeventeenTrackNoHistoryError) {
+                                        throw new TransportError(SOURCE, '17TRACK browser service did not submit the delivery postcode', { reason: 'postcode_not_submitted' });
+                                    }
+                                    throw error;
+                                }
+                            }
+                            return parse17TrackResponse(payload, number, postcode);
                         }
                         catch (error) {
                             // Continue past polling replies and unrelated/demo numbers, but retain
                             // the latest structured failure if no matching history follows.
-                            if (isSeventeenTrackLookupError(error) || error instanceof NotFoundError || error instanceof SchemaError)
+                            if (isSeventeenTrackLookupError(error) || error instanceof NotFoundError || error instanceof SchemaError
+                                || error instanceof InputRequiredError || error instanceof TransportError)
                                 pending ??= error;
                         }
                     }
@@ -191,6 +220,6 @@ export const adapter = (environment) => {
     return {
         id: SOURCE,
         steps: ['trawl'],
-        track: (input, context) => tracker.fetch(input.number, context?.budgetMs, context?.signal),
+        track: (input, context) => tracker.fetch(input.number, context?.budgetMs, context?.signal, input.postcode),
     };
 };

package/dist/providers/universal.d.ts

@@ -55,7 +55,7 @@ export declare class UniversalTracker {
      * Look up one number through the whole chain. `postcode` is the parcel's
      * stored delivery postcode, if the user supplied one: it is forwarded into
      * every provider's track input. ParcelsApp submits it as extra[zipcode] on
-     * its direct API request; the other providers currently do not consume it.
+     * its direct API request; 17TRACK submits it through the browser's postcode form.
      * `countryHint` lets ParcelsApp retry an empty answer with that country.
      * The caller's budget covers the whole chain and its signal ends it.
      */

package/dist/providers/universal.js

@@ -48,7 +48,7 @@ export class UniversalTracker {
      * Look up one number through the whole chain. `postcode` is the parcel's
      * stored delivery postcode, if the user supplied one: it is forwarded into
      * every provider's track input. ParcelsApp submits it as extra[zipcode] on
-     * its direct API request; the other providers currently do not consume it.
+     * its direct API request; 17TRACK submits it through the browser's postcode form.
      * `countryHint` lets ParcelsApp retry an empty answer with that country.
      * The caller's budget covers the whole chain and its signal ends it.
      */

package/dist/server/openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Universal Parcel Scraper",
-    "version": "0.35.0"
+    "version": "0.36.0"
   },
   "paths": {
     "/health": {

package/package.json

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