ropegeo-common 1.18.0 → 1.18.2

package/README.md

@@ -273,7 +273,7 @@ Abstract classes live under `minimap/abstract/`, concrete under `minimap/concret
 
 ### Download orchestration (`src/download/`)
 
-Import from **`ropegeo-common/download`**. Platform I/O (Expo FileSystem, Mapbox, AsyncStorage) is implemented by Mobile via `DownloadPlatformHarness`; Common owns job planning and task logic only.
+Import from **`ropegeo-common/download`**. Platform I/O (Expo FileSystem, Mapbox, AsyncStorage) is implemented by Mobile via `DownloadPlatformHarness`; Common owns job planning and task logic only. List/page JSON fetches inside download tasks use `downloadHttpRequest` (global `fetch` only), not `httpRequest` (Lambda proxy / undici).
 
 | Name | Description | Import |
 | --- | --- | --- |

package/dist/download/helpers/downloadHttpRequest.d.ts

@@ -0,0 +1,10 @@
+/**
+ * HTTP client for download tasks. Uses global `fetch` only (no undici / Lambda proxy)
+ * so the download module graph is safe for React Native Metro bundling.
+ */
+/**
+ * Send a single HTTP request for download list/page JSON fetches.
+ * Aborts when `abortSignal` fires or after 30 seconds. Throws on non-OK responses.
+ */
+export declare function downloadHttpRequest(url: string | URL, abortSignal?: AbortSignal, init?: RequestInit): Promise<Response>;
+//# sourceMappingURL=downloadHttpRequest.d.ts.map

package/dist/download/helpers/downloadHttpRequest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"downloadHttpRequest.d.ts","sourceRoot":"","sources":["../../../src/download/helpers/downloadHttpRequest.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA8CH;;;GAGG;AACH,wBAAsB,mBAAmB,CACrC,GAAG,EAAE,MAAM,GAAG,GAAG,EACjB,WAAW,CAAC,EAAE,WAAW,EACzB,IAAI,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,QAAQ,CAAC,CAwCnB"}

package/dist/download/helpers/downloadHttpRequest.js

@@ -0,0 +1,78 @@
+"use strict";
+/**
+ * HTTP client for download tasks. Uses global `fetch` only (no undici / Lambda proxy)
+ * so the download module graph is safe for React Native Metro bundling.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.downloadHttpRequest = downloadHttpRequest;
+const networkRequestPolicy_1 = require("../../helpers/network/networkRequestPolicy");
+const DEFAULT_HEADERS = {
+    Accept: 'application/json, text/html, application/xml, */*',
+    'Accept-Language': 'en-US,en;q=0.9',
+};
+const DOWNLOAD_HTTP_REQUEST_TIMEOUT_MS = 30000;
+const buildNonOkMessage = async (response, requestUrl) => {
+    const finalUrl = response.url;
+    const server = response.headers.get('server') ?? response.headers.get('x-powered-by') ?? '(none)';
+    let bodyText = '';
+    try {
+        bodyText = await response.clone().text();
+    }
+    catch {
+        bodyText = '(failed to read body)';
+    }
+    const bodyPreview = bodyText.length > 2000 ? `${bodyText.slice(0, 2000)}...` : bodyText;
+    return (`downloadHttpRequest non-OK: status=${response.status} statusText=${response.statusText} ` +
+        `requestUrl=${requestUrl} finalUrl=${finalUrl} server=${server} responseBody=${bodyPreview}`);
+};
+function abortSignalAfterMs(ms) {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => {
+        if (!controller.signal.aborted) {
+            controller.abort();
+        }
+    }, ms);
+    return {
+        signal: controller.signal,
+        dispose: () => {
+            clearTimeout(timeoutId);
+        },
+    };
+}
+/**
+ * Send a single HTTP request for download list/page JSON fetches.
+ * Aborts when `abortSignal` fires or after 30 seconds. Throws on non-OK responses.
+ */
+async function downloadHttpRequest(url, abortSignal, init) {
+    const requestUrl = typeof url === 'string' ? url : url.toString();
+    if (abortSignal?.aborted) {
+        const err = abortSignal.reason instanceof Error
+            ? abortSignal.reason
+            : new Error(String(abortSignal.reason));
+        throw new Error(`downloadHttpRequest aborted: requestUrl=${requestUrl} error=${err.message}`);
+    }
+    const deadline = abortSignal != null
+        ? (0, networkRequestPolicy_1.mergeParentSignalWithDeadline)(abortSignal, DOWNLOAD_HTTP_REQUEST_TIMEOUT_MS)
+        : null;
+    const timeoutOnly = deadline == null ? abortSignalAfterMs(DOWNLOAD_HTTP_REQUEST_TIMEOUT_MS) : null;
+    const requestSignal = deadline?.signal ?? timeoutOnly.signal;
+    let response;
+    try {
+        response = await globalThis.fetch(requestUrl, {
+            headers: DEFAULT_HEADERS,
+            signal: requestSignal,
+            ...init,
+        });
+    }
+    catch (error) {
+        throw new Error(`downloadHttpRequest failed: requestUrl=${requestUrl} error=${error}`);
+    }
+    finally {
+        deadline?.dispose();
+        timeoutOnly?.dispose();
+    }
+    if (!response.ok) {
+        throw new Error(await buildNonOkMessage(response, requestUrl));
+    }
+    return response;
+}

package/dist/download/tasks/fetchPageJsonTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchPageJsonTask.d.ts","sourceRoot":"","sources":["../../../src/download/tasks/fetchPageJsonTask.ts"],"names":[],"mappings":"AACA,OAAO,mDAAmD,CAAC;AAK3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAGrH,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AActD,qBAAa,iBAAkB,SAAQ,YAAY;IAC/C,QAAQ,CAAC,QAAQ,mBAAmB;IACpC,QAAQ,CAAC,cAAc,6BAAmD;IAC1E,KAAK,EAAE,MAAM,CAAC;gBAEF,SAAS,SAAI,EAAE,KAAK,SAAI;IAK9B,OAAO,CACT,GAAG,EAAE,kBAAkB,EACvB,gBAAgB,EAAE,uBAAuB,EACzC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,cAAc,CAAC;IAkC1B,aAAa,IAAI,uBAAuB;IAQxC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,iBAAiB;CAI1D"}
+{"version":3,"file":"fetchPageJsonTask.d.ts","sourceRoot":"","sources":["../../../src/download/tasks/fetchPageJsonTask.ts"],"names":[],"mappings":"AACA,OAAO,mDAAmD,CAAC;AAK3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAGrH,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AActD,qBAAa,iBAAkB,SAAQ,YAAY;IAC/C,QAAQ,CAAC,QAAQ,mBAAmB;IACpC,QAAQ,CAAC,cAAc,6BAAmD;IAC1E,KAAK,EAAE,MAAM,CAAC;gBAEF,SAAS,SAAI,EAAE,KAAK,SAAI;IAK9B,OAAO,CACT,GAAG,EAAE,kBAAkB,EACvB,gBAAgB,EAAE,uBAAuB,EACzC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,cAAc,CAAC;IA+B1B,aAAa,IAAI,uBAAuB;IAQxC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,iBAAiB;CAI1D"}

package/dist/download/tasks/fetchPageJsonTask.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FetchPageJsonTask = void 0;
-const httpRequest_1 = require("../../helpers/httpRequest");
+const downloadHttpRequest_1 = require("../helpers/downloadHttpRequest");
 require("../../models/api/results/registerAllResultParsers");
 const result_1 = require("../../models/api/results/result");
 const downloadDependencyKeys_1 = require("../dependencies/downloadDependencyKeys");
@@ -30,7 +30,10 @@ class FetchPageJsonTask extends abstractDownloadTask_1.DownloadTask {
             return { done: true };
         }
         const dep = this.requireDependency(ctx, downloadDependencyKeys_1.DownloadDependencyKeys.FetchPageJson);
-        const response = await (0, httpRequest_1.httpRequest)(dep.pageUrl, 5, signal, { method: 'GET', headers: { Accept: 'application/json' } }, false);
+        const response = await (0, downloadHttpRequest_1.downloadHttpRequest)(dep.pageUrl, signal, {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+        });
         const text = await response.text();
         const parsedResponse = result_1.Result.fromResponseBody(unwrapData(JSON.parse(text)));
         const view = parsedResponse.result;

package/dist/download/tasks/fetchRegionRouteListTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchRegionRouteListTask.d.ts","sourceRoot":"","sources":["../../../src/download/tasks/fetchRegionRouteListTask.ts"],"names":[],"mappings":"AACA,OAAO,mDAAmD,CAAC;AAU3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AACrH,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AActD,qBAAa,wBAAyB,SAAQ,YAAY;IACtD,QAAQ,CAAC,QAAQ,0BAA0B;IAC3C,QAAQ,CAAC,cAAc,oCAA0D;IACjF,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,MAAM,EAAE,SAAS,SAAI;IAKlC,OAAO,CACT,GAAG,EAAE,kBAAkB,EACvB,eAAe,EAAE,uBAAuB,EACxC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,cAAc,CAAC;YA4CZ,cAAc;YAgCd,SAAS;IAsBvB,aAAa,IAAI,uBAAuB;IAQxC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,wBAAwB;CAIjE"}
+{"version":3,"file":"fetchRegionRouteListTask.d.ts","sourceRoot":"","sources":["../../../src/download/tasks/fetchRegionRouteListTask.ts"],"names":[],"mappings":"AACA,OAAO,mDAAmD,CAAC;AAU3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AACrH,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AActD,qBAAa,wBAAyB,SAAQ,YAAY;IACtD,QAAQ,CAAC,QAAQ,0BAA0B;IAC3C,QAAQ,CAAC,cAAc,oCAA0D;IACjF,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,MAAM,EAAE,SAAS,SAAI;IAKlC,OAAO,CACT,GAAG,EAAE,kBAAkB,EACvB,eAAe,EAAE,uBAAuB,EACxC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,cAAc,CAAC;YA4CZ,cAAc;YAgCd,SAAS;IAmBvB,aAAa,IAAI,uBAAuB;IAQxC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,wBAAwB;CAIjE"}

package/dist/download/tasks/fetchRegionRouteListTask.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FetchRegionRouteListTask = void 0;
-const httpRequest_1 = require("../../helpers/httpRequest");
+const downloadHttpRequest_1 = require("../helpers/downloadHttpRequest");
 require("../../models/api/results/registerAllResultParsers");
 const paginationResults_1 = require("../../models/api/results/paginationResults");
 const routeGeojson_1 = require("../../models/api/results/routeGeojson");
@@ -74,7 +74,10 @@ class FetchRegionRouteListTask extends abstractDownloadTask_1.DownloadTask {
         const params = dep.routesParams.withPage(page);
         const query = params.toQueryString();
         const url = new URL(query.length > 0 ? `/routes?${query}` : '/routes', ctx.config.webScraperBaseUrl);
-        const response = await (0, httpRequest_1.httpRequest)(url.toString(), 5, signal, { method: 'GET', headers: { Accept: 'application/json' } }, false);
+        const response = await (0, downloadHttpRequest_1.downloadHttpRequest)(url.toString(), signal, {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+        });
         const text = await response.text();
         const parsed = paginationResults_1.PaginationResults.fromResponseBody(unwrapData(JSON.parse(text)));
         const results = parsed.results.map((item) => routeGeoJsonFeature_1.RouteGeoJsonFeature.fromResult(item));

package/dist/download/tasks/fetchRopeGeoTileListTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchRopeGeoTileListTask.d.ts","sourceRoot":"","sources":["../../../src/download/tasks/fetchRopeGeoTileListTask.ts"],"names":[],"mappings":"AACA,OAAO,mDAAmD,CAAC;AAM3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AACrH,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAoBtD,qBAAa,wBAAyB,SAAQ,YAAY;IACtD,QAAQ,CAAC,QAAQ,0BAA0B;IAC3C,QAAQ,CAAC,cAAc,oCAA0D;IACjF,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,MAAM,EAAE,SAAS,SAAI;IAKlC,OAAO,CACT,GAAG,EAAE,kBAAkB,EACvB,gBAAgB,EAAE,uBAAuB,EACzC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,cAAc,CAAC;YA2DZ,SAAS;IAmCvB,aAAa,IAAI,uBAAuB;IAQxC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,wBAAwB;CAIjE"}
+{"version":3,"file":"fetchRopeGeoTileListTask.d.ts","sourceRoot":"","sources":["../../../src/download/tasks/fetchRopeGeoTileListTask.ts"],"names":[],"mappings":"AACA,OAAO,mDAAmD,CAAC;AAM3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AACrH,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAoBtD,qBAAa,wBAAyB,SAAQ,YAAY;IACtD,QAAQ,CAAC,QAAQ,0BAA0B;IAC3C,QAAQ,CAAC,cAAc,oCAA0D;IACjF,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,MAAM,EAAE,SAAS,SAAI;IAKlC,OAAO,CACT,GAAG,EAAE,kBAAkB,EACvB,gBAAgB,EAAE,uBAAuB,EACzC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,cAAc,CAAC;YA2DZ,SAAS;IAgCvB,aAAa,IAAI,uBAAuB;IAQxC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,wBAAwB;CAIjE"}

package/dist/download/tasks/fetchRopeGeoTileListTask.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FetchRopeGeoTileListTask = void 0;
-const httpRequest_1 = require("../../helpers/httpRequest");
+const downloadHttpRequest_1 = require("../helpers/downloadHttpRequest");
 require("../../models/api/results/registerAllResultParsers");
 const paginationResults_1 = require("../../models/api/results/paginationResults");
 const downloadDependencyKeys_1 = require("../dependencies/downloadDependencyKeys");
@@ -66,7 +66,10 @@ class FetchRopeGeoTileListTask extends abstractDownloadTask_1.DownloadTask {
         const url = new URL(`/mapdata/${encodeURIComponent(dep.mapDataId)}/tiles`, ctx.config.webScraperBaseUrl);
         url.searchParams.set('page', String(page));
         url.searchParams.set('limit', String(dep.listPageLimit));
-        const response = await (0, httpRequest_1.httpRequest)(url.toString(), 5, signal, { method: 'GET', headers: { Accept: 'application/json' } }, false);
+        const response = await (0, downloadHttpRequest_1.downloadHttpRequest)(url.toString(), signal, {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+        });
         const text = await response.text();
         const parsedBody = unwrapData(JSON.parse(text));
         const pageResult = paginationResults_1.PaginationResults.fromResponseBody(parsedBody);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ropegeo-common",
-    "version": "1.18.0",
+    "version": "1.18.2",
     "description": "Shared domain models and helpers for RopeGeo and WebScraper",
     "license": "ISC",
     "repository": {