@atproto-labs/fetch 0.0.1 → 0.1.1

package/dist/transformed-response.js

@@ -15,10 +15,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransformedResponse = void 0;
 class TransformedResponse extends Response {
     constructor(response, transform) {
-        if (response.body && response.bodyUsed) {
+        if (!response.body) {
+            throw new TypeError('Response body is not available');
+        }
+        if (response.bodyUsed) {
             throw new TypeError('Response body is already used');
         }
-        super(response.body?.pipeThrough(transform) ?? null, {
+        super(response.body.pipeThrough(transform), {
             status: response.status,
             statusText: response.statusText,
             headers: response.headers,

package/dist/transformed-response.js.map

@@ -1 +1 @@
-{"version":3,"file":"transformed-response.js","sourceRoot":"","sources":["../src/transformed-response.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,MAAa,mBAAoB,SAAQ,QAAQ;IAG/C,YAAY,QAAkB,EAAE,SAA0B;QACxD,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACvC,MAAM,IAAI,SAAS,CAAC,+BAA+B,CAAC,CAAA;QACtD,CAAC;QAED,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,IAAI,IAAI,EAAE;YACnD,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,OAAO,EAAE,QAAQ,CAAC,OAAO;SAC1B,CAAC,CAAA;QAXJ,gDAAmB;QAajB,uBAAA,IAAI,iCAAa,QAAQ,MAAA,CAAA;IAC3B,CAAC;IAED;;OAEG;IACH,IAAI,GAAG;QACL,OAAO,uBAAA,IAAI,qCAAU,CAAC,GAAG,CAAA;IAC3B,CAAC;IACD,IAAI,UAAU;QACZ,OAAO,uBAAA,IAAI,qCAAU,CAAC,UAAU,CAAA;IAClC,CAAC;IACD,IAAI,IAAI;QACN,OAAO,uBAAA,IAAI,qCAAU,CAAC,IAAI,CAAA;IAC5B,CAAC;IACD,IAAI,UAAU;QACZ,OAAO,uBAAA,IAAI,qCAAU,CAAC,UAAU,CAAA;IAClC,CAAC;CACF;AAhCD,kDAgCC"}
+{"version":3,"file":"transformed-response.js","sourceRoot":"","sources":["../src/transformed-response.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,MAAa,mBAAoB,SAAQ,QAAQ;IAG/C,YAAY,QAAkB,EAAE,SAA0B;QACxD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnB,MAAM,IAAI,SAAS,CAAC,gCAAgC,CAAC,CAAA;QACvD,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACtB,MAAM,IAAI,SAAS,CAAC,+BAA+B,CAAC,CAAA;QACtD,CAAC;QAED,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE;YAC1C,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,OAAO,EAAE,QAAQ,CAAC,OAAO;SAC1B,CAAC,CAAA;QAdJ,gDAAmB;QAgBjB,uBAAA,IAAI,iCAAa,QAAQ,MAAA,CAAA;IAC3B,CAAC;IAED;;OAEG;IACH,IAAI,GAAG;QACL,OAAO,uBAAA,IAAI,qCAAU,CAAC,GAAG,CAAA;IAC3B,CAAC;IACD,IAAI,UAAU;QACZ,OAAO,uBAAA,IAAI,qCAAU,CAAC,UAAU,CAAA;IAClC,CAAC;IACD,IAAI,IAAI;QACN,OAAO,uBAAA,IAAI,qCAAU,CAAC,IAAI,CAAA;IAC5B,CAAC;IACD,IAAI,UAAU;QACZ,OAAO,uBAAA,IAAI,qCAAU,CAAC,UAAU,CAAA;IAClC,CAAC;CACF;AAnCD,kDAmCC"}

package/dist/util.d.ts

@@ -6,19 +6,51 @@ export type JsonObject = {
     [key: string]: Json;
 };
 export type JsonArray = Json[];
-declare global {
-    interface JSON {
-        parse(text: string, reviver?: (key: any, value: any) => any): Json;
-    }
-}
+export type ThisParameterOverride<C, Fn extends (...a: any) => any> = Fn extends (...args: infer P) => infer R ? ((this: C, ...args: P) => R) & {
+    bind(context: C): (...args: P) => R;
+} : never;
 export declare function isIp(hostname: string): boolean;
-export declare const ifObject: <V>(v?: V) => (V extends symbol | Function | JsonScalar | JsonArray ? never : V extends Json ? V : {
-    [key: string]: unknown;
-}) | undefined;
-export declare const ifArray: <V>(v?: V) => (V & any[]) | undefined;
-export declare const ifScalar: <V>(v?: V) => (V & string) | (V & number) | (V & boolean) | (V & null) | (V extends JsonScalar ? never : undefined);
-export declare const ifBoolean: <V>(v?: V) => (V & boolean) | undefined;
-export declare const ifString: <V>(v?: V) => (V & string) | undefined;
-export declare const ifNumber: <V>(v?: V) => (V & number) | undefined;
-export declare const ifNull: <V>(v?: V) => V | undefined;
+export declare const ifObject: <V>(v: V) => (V extends symbol | Function | JsonScalar | JsonArray ? never : V extends Json ? V : Record<string, unknown>) | undefined;
+export declare const ifString: <V>(v: V) => (V & string) | undefined;
+export declare class MaxBytesTransformStream extends TransformStream<Uint8Array, Uint8Array> {
+    constructor(maxBytes: number);
+}
+export declare function padLines(input: string, pad: string): string;
+/**
+ * @param [onCancellationError] - Callback that will trigger to asynchronously
+ * handle any error that occurs while cancelling the response body. Providing
+ * this will speed up the process and avoid potential deadlocks. Defaults to
+ * awaiting the cancellation operation. use `"log"` to log the error.
+ * @see {@link https://undici.nodejs.org/#/?id=garbage-collection}
+ * @note awaiting this function's result, when no `onCancellationError` is
+ * provided, might result in a dead lock. Indeed, if the response was cloned(),
+ * the response.body.cancel() method will not resolve until the other response's
+ * body is consumed/cancelled.
+ *
+ * @example
+ * ```ts
+ * // Make sure response was not cloned, or that every cloned response was
+ * // consumed/cancelled before awaiting this function's result.
+ * await cancelBody(response)
+ * ```
+ * @example
+ * ```ts
+ * await cancelBody(response, (err) => {
+ *   // No biggie, let's just log the error
+ *   console.warn('Failed to cancel response body', err)
+ * })
+ * ```
+ * @example
+ * ```ts
+ * // Will generate an "unhandledRejection" if an error occurs while cancelling
+ * // the response body. This will likely crash the process.
+ * await cancelBody(response, (err) => { throw err })
+ * ```
+ */
+export declare function cancelBody(body: Body, onCancellationError?: 'log' | ((err: unknown) => void)): Promise<void>;
+export declare function logCancellationError(err: unknown): void;
+export declare function stringifyMessage(input: Body & {
+    headers: Headers;
+}): Promise<string>;
+export declare const extractUrl: (input: Request | string | URL) => URL;
 //# sourceMappingURL=util.d.ts.map

package/dist/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAA;AACzD,MAAM,MAAM,IAAI,GAAG,UAAU,GAAG,IAAI,EAAE,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAA;CAAE,CAAA;AAC5E,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAA;AAChD,MAAM,MAAM,SAAS,GAAG,IAAI,EAAE,CAAA;AAE9B,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,IAAI;QACZ,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,GAAG,GAAG,IAAI,CAAA;KACnE;CACF;AAED,wBAAgB,IAAI,CAAC,QAAQ,EAAE,MAAM,WAQpC;AAKD,eAAO,MAAM,QAAQ,UAAW,CAAC;;cAehC,CAAA;AAED,eAAO,MAAM,OAAO,UAAW,CAAC,4BAAuC,CAAA;AACvE,eAAO,MAAM,QAAQ,UAAW,CAAC,0GAUhC,CAAA;AACD,eAAO,MAAM,SAAS,UAAW,CAAC,8BAA6C,CAAA;AAC/E,eAAO,MAAM,QAAQ,UAAW,CAAC,6BAA4C,CAAA;AAC7E,eAAO,MAAM,QAAQ,UAAW,CAAC,6BAA4C,CAAA;AAC7E,eAAO,MAAM,MAAM,UAAW,CAAC,kBAAiC,CAAA"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAA;AACzD,MAAM,MAAM,IAAI,GAAG,UAAU,GAAG,IAAI,EAAE,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAA;CAAE,CAAA;AAC5E,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAA;AAChD,MAAM,MAAM,SAAS,GAAG,IAAI,EAAE,CAAA;AAE9B,MAAM,MAAM,qBAAqB,CAC/B,CAAC,EACD,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,GAAG,IAC3B,EAAE,SAAS,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,KAAK,MAAM,CAAC,GACxC,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG;IAC7B,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,CAAA;CACpC,GACD,KAAK,CAAA;AAET,wBAAgB,IAAI,CAAC,QAAQ,EAAE,MAAM,WAQpC;AAGD,eAAO,MAAM,QAAQ,SAAU,CAAC,8HAe/B,CAAA;AAED,eAAO,MAAM,QAAQ,SAAU,CAAC,6BAA4C,CAAA;AAE5E,qBAAa,uBAAwB,SAAQ,eAAe,CAC1D,UAAU,EACV,UAAU,CACX;gBACa,QAAQ,EAAE,MAAM;CAqB7B;AAGD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,UAGlD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,mBAAmB,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC,GACrD,OAAO,CAAC,IAAI,CAAC,CAgBf;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAEvD;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,IAAI,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,mBAQxE;AA2BD,eAAO,MAAM,UAAU,UAAW,OAAO,GAAG,MAAM,GAAG,GAAG,QAK9B,CAAA"}

package/dist/util.js

@@ -1,7 +1,7 @@
 "use strict";
-// TODO: Move to a shared package ?
+// @TODO: Move some of these to a shared package ?
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ifNull = exports.ifNumber = exports.ifString = exports.ifBoolean = exports.ifScalar = exports.ifArray = exports.ifObject = exports.isIp = void 0;
+exports.extractUrl = exports.stringifyMessage = exports.logCancellationError = exports.cancelBody = exports.padLines = exports.MaxBytesTransformStream = exports.ifString = exports.ifObject = exports.isIp = void 0;
 function isIp(hostname) {
     // IPv4
     if (hostname.match(/^\d+\.\d+\.\d+\.\d+$/))
@@ -12,7 +12,6 @@ function isIp(hostname) {
     return false;
 }
 exports.isIp = isIp;
-// TODO: Move to a shared package ?
 const plainObjectProto = Object.prototype;
 const ifObject = (v) => {
     if (typeof v === 'object' && v != null && !Array.isArray(v)) {
@@ -25,27 +24,125 @@ const ifObject = (v) => {
     return undefined;
 };
 exports.ifObject = ifObject;
-const ifArray = (v) => (Array.isArray(v) ? v : undefined);
-exports.ifArray = ifArray;
-const ifScalar = (v) => {
-    switch (typeof v) {
-        case 'string':
-        case 'number':
-        case 'boolean':
-            return v;
-        default:
-            if (v === null)
-                return null;
-            return undefined;
-    }
-};
-exports.ifScalar = ifScalar;
-const ifBoolean = (v) => (typeof v === 'boolean' ? v : undefined);
-exports.ifBoolean = ifBoolean;
 const ifString = (v) => (typeof v === 'string' ? v : undefined);
 exports.ifString = ifString;
-const ifNumber = (v) => (typeof v === 'number' ? v : undefined);
-exports.ifNumber = ifNumber;
-const ifNull = (v) => (v === null ? v : undefined);
-exports.ifNull = ifNull;
+class MaxBytesTransformStream extends TransformStream {
+    constructor(maxBytes) {
+        // Note: negation accounts for invalid value types (NaN, non numbers)
+        if (!(maxBytes >= 0)) {
+            throw new TypeError('maxBytes must be a non-negative number');
+        }
+        let bytesRead = 0;
+        super({
+            transform: (chunk, ctrl) => {
+                if ((bytesRead += chunk.length) <= maxBytes) {
+                    ctrl.enqueue(chunk);
+                }
+                else {
+                    ctrl.error(new Error('Response too large'));
+                }
+            },
+        });
+    }
+}
+exports.MaxBytesTransformStream = MaxBytesTransformStream;
+const LINE_BREAK = /\r?\n/g;
+function padLines(input, pad) {
+    if (!input)
+        return input;
+    return pad + input.replace(LINE_BREAK, `$&${pad}`);
+}
+exports.padLines = padLines;
+/**
+ * @param [onCancellationError] - Callback that will trigger to asynchronously
+ * handle any error that occurs while cancelling the response body. Providing
+ * this will speed up the process and avoid potential deadlocks. Defaults to
+ * awaiting the cancellation operation. use `"log"` to log the error.
+ * @see {@link https://undici.nodejs.org/#/?id=garbage-collection}
+ * @note awaiting this function's result, when no `onCancellationError` is
+ * provided, might result in a dead lock. Indeed, if the response was cloned(),
+ * the response.body.cancel() method will not resolve until the other response's
+ * body is consumed/cancelled.
+ *
+ * @example
+ * ```ts
+ * // Make sure response was not cloned, or that every cloned response was
+ * // consumed/cancelled before awaiting this function's result.
+ * await cancelBody(response)
+ * ```
+ * @example
+ * ```ts
+ * await cancelBody(response, (err) => {
+ *   // No biggie, let's just log the error
+ *   console.warn('Failed to cancel response body', err)
+ * })
+ * ```
+ * @example
+ * ```ts
+ * // Will generate an "unhandledRejection" if an error occurs while cancelling
+ * // the response body. This will likely crash the process.
+ * await cancelBody(response, (err) => { throw err })
+ * ```
+ */
+async function cancelBody(body, onCancellationError) {
+    if (body.body &&
+        !body.bodyUsed &&
+        !body.body.locked &&
+        // Support for alternative fetch implementations
+        typeof body.body.cancel === 'function') {
+        if (typeof onCancellationError === 'function') {
+            void body.body.cancel().catch(onCancellationError);
+        }
+        else if (onCancellationError === 'log') {
+            void body.body.cancel().catch(logCancellationError);
+        }
+        else {
+            await body.body.cancel();
+        }
+    }
+}
+exports.cancelBody = cancelBody;
+function logCancellationError(err) {
+    console.warn('Failed to cancel response body', err);
+}
+exports.logCancellationError = logCancellationError;
+async function stringifyMessage(input) {
+    try {
+        const headers = stringifyHeaders(input.headers);
+        const payload = await stringifyBody(input);
+        return headers && payload ? `${headers}\n${payload}` : headers || payload;
+    }
+    finally {
+        void cancelBody(input, 'log');
+    }
+}
+exports.stringifyMessage = stringifyMessage;
+function stringifyHeaders(headers) {
+    return Array.from(headers)
+        .map(([name, value]) => `${name}: ${value}`)
+        .join('\n');
+}
+async function stringifyBody(body) {
+    try {
+        const blob = await body.blob();
+        if (blob.type?.startsWith('text/')) {
+            const text = await blob.text();
+            return JSON.stringify(text);
+        }
+        if (/application\/(?:\w+\+)?json/.test(blob.type)) {
+            const text = await blob.text();
+            return text.includes('\n') ? JSON.stringify(JSON.parse(text)) : text;
+        }
+        return `[Body size: ${blob.size}, type: ${JSON.stringify(blob.type)} ]`;
+    }
+    catch {
+        return '[Body could not be read]';
+    }
+}
+const extractUrl = (input) => typeof input === 'string'
+    ? new URL(input)
+    : input instanceof URL
+        ? input
+        : new URL(input.url);
+exports.extractUrl = extractUrl;
 //# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";AAAA,mCAAmC;;;AAanC,SAAgB,IAAI,CAAC,QAAgB;IACnC,OAAO;IACP,IAAI,QAAQ,CAAC,KAAK,CAAC,sBAAsB,CAAC;QAAE,OAAO,IAAI,CAAA;IAEvD,OAAO;IACP,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAA;IAEnE,OAAO,KAAK,CAAA;AACd,CAAC;AARD,oBAQC;AAED,mCAAmC;AAEnC,MAAM,gBAAgB,GAAG,MAAM,CAAC,SAAS,CAAA;AAClC,MAAM,QAAQ,GAAG,CAAI,CAAK,EAAE,EAAE;IACnC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAA;QACtC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,gBAAgB,EAAE,CAAC;YACjD,wDAAwD;YACxD,OAAO,CAKyB,CAAA;QAClC,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAfY,QAAA,QAAQ,YAepB;AAEM,MAAM,OAAO,GAAG,CAAI,CAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;AAA1D,QAAA,OAAO,WAAmD;AAChE,MAAM,QAAQ,GAAG,CAAI,CAAK,EAAE,EAAE;IACnC,QAAQ,OAAO,CAAC,EAAE,CAAC;QACjB,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,CAAC,CAAA;QACV;YACE,IAAI,CAAC,KAAK,IAAI;gBAAE,OAAO,IAAgB,CAAA;YACvC,OAAO,SAAqD,CAAA;IAChE,CAAC;AACH,CAAC,CAAA;AAVY,QAAA,QAAQ,YAUpB;AACM,MAAM,SAAS,GAAG,CAAI,CAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;AAAlE,QAAA,SAAS,aAAyD;AACxE,MAAM,QAAQ,GAAG,CAAI,CAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;AAAhE,QAAA,QAAQ,YAAwD;AACtE,MAAM,QAAQ,GAAG,CAAI,CAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;AAAhE,QAAA,QAAQ,YAAwD;AACtE,MAAM,MAAM,GAAG,CAAI,CAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;AAAnD,QAAA,MAAM,UAA6C"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/fetch",
-  "version": "0.0.1",
+  "version": "0.1.1",
   "license": "MIT",
   "description": "Isomorphic wrapper utilities for fetch API",
   "keywords": [
@@ -11,7 +11,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/bluesky-social/atproto",
-    "directory": "packages/fetch"
+    "directory": "packages/internal/fetch"
   },
   "type": "commonjs",
   "main": "dist/index.js",
@@ -23,13 +23,14 @@
     }
   },
   "dependencies": {
-    "tslib": "^2.6.2",
-    "zod": "^3.22.4",
-    "@atproto-labs/transformer": "0.0.1"
+    "@atproto-labs/pipe": "0.1.0"
   },
   "devDependencies": {
     "typescript": "^5.3.3"
   },
+  "optionalDependencies": {
+    "zod": "^3.23.8"
+  },
   "scripts": {
     "build": "tsc --build tsconfig.json"
   }

package/src/fetch-error.ts

@@ -1,44 +1,26 @@
-import { Transformer } from '@atproto-labs/transformer'
-
-export type FetchErrorOptions = {
-  cause?: unknown
-  request?: Request
-  response?: Response
-}
-
 export class FetchError extends Error {
-  public readonly request?: Request
-  public readonly response?: Response
+  public readonly statusCode: number
 
-  constructor(
-    public readonly statusCode: number,
-    message?: string,
-    { cause, request, response }: FetchErrorOptions = {},
-  ) {
-    super(message, { cause })
-    this.request = request
-    this.response = response
-  }
+  constructor(statusCode?: number, message?: string, options?: ErrorOptions) {
+    if (statusCode == null || !message) {
+      const info = extractInfo(extractRootCause(options?.cause))
+      statusCode = statusCode ?? info[0]
+      message = message || info[1]
+    }
 
-  static async from(err: unknown) {
-    const cause = extractCause(err)
-    return new FetchError(...extractInfo(cause), { cause })
-  }
-}
+    super(message, options)
 
-export const fetchFailureHandler: Transformer<unknown, never> = async (
-  err: unknown,
-) => {
-  throw await FetchError.from(err)
+    this.statusCode = statusCode
+  }
 }
 
-function extractCause(err: unknown): unknown {
+function extractRootCause(err: unknown): unknown {
   // Unwrap the Network error from undici (i.e. Node's internal fetch() implementation)
   // https://github.com/nodejs/undici/blob/3274c975947ce11a08508743df026f73598bfead/lib/web/fetch/index.js#L223-L228
   if (
     err instanceof TypeError &&
     err.message === 'fetch failed' &&
-    err.cause instanceof Error
+    err.cause !== undefined
   ) {
     return err.cause
   }
@@ -46,32 +28,32 @@ function extractCause(err: unknown): unknown {
   return err
 }
 
-export function extractInfo(
-  err: unknown,
-): [statusCode: number, message: string] {
+function extractInfo(err: unknown): [statusCode: number, message: string] {
   if (typeof err === 'string' && err.length > 0) {
-    return [502, err]
+    return [500, err]
   }
 
   if (!(err instanceof Error)) {
-    return [502, 'Unable to fetch']
+    return [500, 'Failed to fetch']
   }
 
-  if ('code' in err && typeof err.code === 'string') {
+  const code = err['code']
+  if (typeof code === 'string') {
     switch (true) {
-      case err.code === 'ENOTFOUND':
-        return [404, 'Invalid hostname']
-      case err.code === 'ECONNREFUSED':
+      case code === 'ENOTFOUND':
+        return [400, 'Invalid hostname']
+      case code === 'ECONNREFUSED':
         return [502, 'Connection refused']
-      case err.code === 'DEPTH_ZERO_SELF_SIGNED_CERT':
+      case code === 'DEPTH_ZERO_SELF_SIGNED_CERT':
         return [502, 'Self-signed certificate']
-      case err.code.startsWith('ERR_TLS'):
+      case code.startsWith('ERR_TLS'):
         return [502, 'TLS error']
-      case err.code.startsWith('ECONN'):
+      case code.startsWith('ECONN'):
         return [502, 'Connection error']
+      default:
+        return [500, `${code} error`]
     }
   }
 
-  // Let's assume that other errors are "bad gateway" errors
-  return [502, err.message]
+  return [500, err.message]
 }

package/src/fetch-request.ts

@@ -1,40 +1,95 @@
-import { Transformer } from '@atproto-labs/transformer'
-
 import { FetchError } from './fetch-error.js'
-import { isIp } from './util.js'
+import { asRequest } from './fetch.js'
+import { extractUrl, isIp } from './util.js'
+
+export class FetchRequestError extends FetchError {
+  constructor(
+    public readonly request: Request,
+    statusCode?: number,
+    message?: string,
+    options?: ErrorOptions,
+  ) {
+    super(statusCode, message, options)
+  }
 
-export type RequestTranformer = Transformer<Request>
+  static from(request: Request, cause: unknown): FetchRequestError {
+    if (cause instanceof FetchRequestError) return cause
+    return new FetchRequestError(request, undefined, undefined, { cause })
+  }
+}
 
-export function protocolCheckRequestTransform(
-  protocols: Iterable<string>,
-): RequestTranformer {
-  const allowedProtocols = new Set<string>(protocols)
+export function protocolCheckRequestTransform(protocols: {
+  'about:'?: boolean
+  'blob:'?: boolean
+  'data:'?: boolean
+  'file:'?: boolean
+  'http:'?: boolean | { allowCustomPort: boolean }
+  'https:'?: boolean | { allowCustomPort: boolean }
+}) {
+  return (input: Request | string | URL, init?: RequestInit) => {
+    const { protocol, port } = extractUrl(input)
+
+    const request = asRequest(input, init)
+
+    const config: undefined | boolean | { allowCustomPort?: boolean } =
+      Object.hasOwn(protocols, protocol) ? protocols[protocol] : undefined
+
+    if (!config) {
+      throw new FetchRequestError(
+        request,
+        400,
+        `Forbidden protocol "${protocol}"`,
+      )
+    } else if (config === true) {
+      // Safe to proceed
+    } else if (!config['allowCustomPort'] && port !== '') {
+      throw new FetchRequestError(
+        request,
+        400,
+        `Custom ${protocol} ports not allowed`,
+      )
+    }
 
-  return async (request) => {
-    const { protocol } = new URL(request.url)
+    return request
+  }
+}
+
+export function redirectCheckRequestTransform() {
+  return (input: Request | string | URL, init?: RequestInit) => {
+    const request = asRequest(input, init)
 
-    if (!allowedProtocols.has(protocol)) {
-      throw new FetchError(400, `${protocol} is not allowed`, { request })
+    if (request.redirect === 'follow') {
+      throw new FetchRequestError(
+        request,
+        500,
+        'Request redirect must be "error" or "manual"',
+      )
     }
 
     return request
   }
 }
 
-export function requireHostHeaderTranform(): RequestTranformer {
-  return async (request) => {
+export function requireHostHeaderTransform() {
+  return (input: Request | string | URL, init?: RequestInit) => {
     // Note that fetch() will automatically add the Host header from the URL and
     // discard any Host header manually set in the request.
 
-    const { protocol, hostname } = new URL(request.url)
+    const { protocol, hostname } = extractUrl(input)
+
+    const request = asRequest(input, init)
 
     // "Host" header only makes sense in the context of an HTTP request
-    if (protocol !== 'http:' && protocol !== 'https') {
-      throw new FetchError(400, `Forbidden protocol ${protocol}`, { request })
+    if (protocol !== 'http:' && protocol !== 'https:') {
+      throw new FetchRequestError(
+        request,
+        400,
+        `"${protocol}" requests are not allowed`,
+      )
     }
 
     if (!hostname || isIp(hostname)) {
-      throw new FetchError(400, 'Invalid hostname', { request })
+      throw new FetchRequestError(request, 400, 'Invalid hostname')
     }
 
     return request
@@ -54,21 +109,23 @@ export const DEFAULT_FORBIDDEN_DOMAIN_NAMES = [
 
 export function forbiddenDomainNameRequestTransform(
   denyList: Iterable<string> = DEFAULT_FORBIDDEN_DOMAIN_NAMES,
-): RequestTranformer {
+) {
   const denySet = new Set<string>(denyList)
 
   // Optimization: if no forbidden domain names are provided, we can skip the
   // check entirely.
   if (denySet.size === 0) {
-    return async (request) => request
+    return asRequest
   }
 
-  return async (request) => {
-    const { hostname } = new URL(request.url)
+  return async (input: Request | string | URL, init?: RequestInit) => {
+    const { hostname } = extractUrl(input)
+
+    const request = asRequest(input, init)
 
     // Full domain name check
     if (denySet.has(hostname)) {
-      throw new FetchError(403, 'Forbidden hostname', { request })
+      throw new FetchRequestError(request, 403, 'Forbidden hostname')
     }
 
     // Sub domain name check
@@ -76,7 +133,7 @@ export function forbiddenDomainNameRequestTransform(
     while (curDot !== -1) {
       const subdomain = hostname.slice(curDot + 1)
       if (denySet.has(`*.${subdomain}`)) {
-        throw new FetchError(403, 'Forbidden hostname', { request })
+        throw new FetchRequestError(request, 403, 'Forbidden hostname')
       }
       curDot = hostname.indexOf('.', curDot + 1)
     }