@atproto-labs/fetch 0.0.1 → 0.1.1

package/CHANGELOG.md

@@ -1,10 +1,22 @@
 # @atproto-labs/fetch
 
-## 0.0.1
+## 0.1.1
 
 ### Patch Changes
 
-- [`e134c79a0`](https://github.com/bluesky-social/atproto/commit/e134c79a0ffb000b2cb36437815673fa6bda664b) Thanks [@devinivy](https://github.com/devinivy)! - Initial publish of experimental oauth packages to @atproto-labs
+- [#2770](https://github.com/bluesky-social/atproto/pull/2770) [`a07b21151`](https://github.com/bluesky-social/atproto/commit/a07b21151f1850340c4b7797ebb11521b1a6cdf3) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Expose extractUrl utility
 
-- Updated dependencies [[`e134c79a0`](https://github.com/bluesky-social/atproto/commit/e134c79a0ffb000b2cb36437815673fa6bda664b)]:
-  - @atproto-labs/transformer@0.0.1
+- [#2770](https://github.com/bluesky-social/atproto/pull/2770) [`a07b21151`](https://github.com/bluesky-social/atproto/commit/a07b21151f1850340c4b7797ebb11521b1a6cdf3) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Add redirectCheckRequestTransform utility to prevent request redirects
+
+- [#2770](https://github.com/bluesky-social/atproto/pull/2770) [`a07b21151`](https://github.com/bluesky-social/atproto/commit/a07b21151f1850340c4b7797ebb11521b1a6cdf3) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Allow customizing fetch logging function
+
+## 0.1.0
+
+### Minor Changes
+
+- [#2482](https://github.com/bluesky-social/atproto/pull/2482) [`a8d6c1123`](https://github.com/bluesky-social/atproto/commit/a8d6c112359f5c4c0cfbe2df63443ed275f2a646) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Add OAuth provider capability & support for DPoP signed tokens
+
+### Patch Changes
+
+- Updated dependencies [[`a8d6c1123`](https://github.com/bluesky-social/atproto/commit/a8d6c112359f5c4c0cfbe2df63443ed275f2a646)]:
+  - @atproto-labs/pipe@0.1.0

package/dist/fetch-error.d.ts

@@ -1,16 +1,5 @@
-import { Transformer } from '@atproto-labs/transformer';
-export type FetchErrorOptions = {
-    cause?: unknown;
-    request?: Request;
-    response?: Response;
-};
 export declare class FetchError extends Error {
     readonly statusCode: number;
-    readonly request?: Request;
-    readonly response?: Response;
-    constructor(statusCode: number, message?: string, { cause, request, response }?: FetchErrorOptions);
-    static from(err: unknown): Promise<FetchError>;
+    constructor(statusCode?: number, message?: string, options?: ErrorOptions);
 }
-export declare const fetchFailureHandler: Transformer<unknown, never>;
-export declare function extractInfo(err: unknown): [statusCode: number, message: string];
 //# sourceMappingURL=fetch-error.d.ts.map

package/dist/fetch-error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-error.d.ts","sourceRoot":"","sources":["../src/fetch-error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAEvD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACpB,CAAA;AAED,qBAAa,UAAW,SAAQ,KAAK;aAKjB,UAAU,EAAE,MAAM;IAJpC,SAAgB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjC,SAAgB,QAAQ,CAAC,EAAE,QAAQ,CAAA;gBAGjB,UAAU,EAAE,MAAM,EAClC,OAAO,CAAC,EAAE,MAAM,EAChB,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAE,iBAAsB;WAOzC,IAAI,CAAC,GAAG,EAAE,OAAO;CAI/B;AAED,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,OAAO,EAAE,KAAK,CAI3D,CAAA;AAgBD,wBAAgB,WAAW,CACzB,GAAG,EAAE,OAAO,GACX,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CA0BvC"}
+{"version":3,"file":"fetch-error.d.ts","sourceRoot":"","sources":["../src/fetch-error.ts"],"names":[],"mappings":"AAAA,qBAAa,UAAW,SAAQ,KAAK;IACnC,SAAgB,UAAU,EAAE,MAAM,CAAA;gBAEtB,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY;CAW1E"}

package/dist/fetch-error.js

@@ -1,73 +1,58 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractInfo = exports.fetchFailureHandler = exports.FetchError = void 0;
+exports.FetchError = void 0;
 class FetchError extends Error {
-    constructor(statusCode, message, { cause, request, response } = {}) {
-        super(message, { cause });
+    constructor(statusCode, message, options) {
+        if (statusCode == null || !message) {
+            const info = extractInfo(extractRootCause(options?.cause));
+            statusCode = statusCode ?? info[0];
+            message = message || info[1];
+        }
+        super(message, options);
         Object.defineProperty(this, "statusCode", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: statusCode
-        });
-        Object.defineProperty(this, "request", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "response", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.request = request;
-        this.response = response;
-    }
-    static async from(err) {
-        const cause = extractCause(err);
-        return new FetchError(...extractInfo(cause), { cause });
+        this.statusCode = statusCode;
     }
 }
 exports.FetchError = FetchError;
-const fetchFailureHandler = async (err) => {
-    throw await FetchError.from(err);
-};
-exports.fetchFailureHandler = fetchFailureHandler;
-function extractCause(err) {
+function extractRootCause(err) {
     // 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;
     }
     return err;
 }
 function extractInfo(err) {
     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];
 }
-exports.extractInfo = extractInfo;
 //# sourceMappingURL=fetch-error.js.map

package/dist/fetch-error.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-error.js","sourceRoot":"","sources":["../src/fetch-error.ts"],"names":[],"mappings":";;;AAQA,MAAa,UAAW,SAAQ,KAAK;IAInC,YACkB,UAAkB,EAClC,OAAgB,EAChB,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,KAAwB,EAAE;QAEpD,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAJzB;;;;mBAAgB,UAAU;WAAQ;QAJpB;;;;;WAAiB;QACjB;;;;;WAAmB;QAQjC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAY;QAC5B,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;QAC/B,OAAO,IAAI,UAAU,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;IACzD,CAAC;CACF;AAlBD,gCAkBC;AAEM,MAAM,mBAAmB,GAAgC,KAAK,EACnE,GAAY,EACZ,EAAE;IACF,MAAM,MAAM,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAClC,CAAC,CAAA;AAJY,QAAA,mBAAmB,uBAI/B;AAED,SAAS,YAAY,CAAC,GAAY;IAChC,qFAAqF;IACrF,kHAAkH;IAClH,IACE,GAAG,YAAY,SAAS;QACxB,GAAG,CAAC,OAAO,KAAK,cAAc;QAC9B,GAAG,CAAC,KAAK,YAAY,KAAK,EAC1B,CAAC;QACD,OAAO,GAAG,CAAC,KAAK,CAAA;IAClB,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,SAAgB,WAAW,CACzB,GAAY;IAEZ,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9C,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACnB,CAAC;IAED,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAA;IACjC,CAAC;IAED,IAAI,MAAM,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAClD,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,GAAG,CAAC,IAAI,KAAK,WAAW;gBAC3B,OAAO,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAA;YAClC,KAAK,GAAG,CAAC,IAAI,KAAK,cAAc;gBAC9B,OAAO,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAA;YACpC,KAAK,GAAG,CAAC,IAAI,KAAK,6BAA6B;gBAC7C,OAAO,CAAC,GAAG,EAAE,yBAAyB,CAAC,CAAA;YACzC,KAAK,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;gBACjC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;YAC3B,KAAK,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBAC/B,OAAO,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAA;QACpC,CAAC;IACH,CAAC;IAED,0DAA0D;IAC1D,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;AAC3B,CAAC;AA5BD,kCA4BC"}
+{"version":3,"file":"fetch-error.js","sourceRoot":"","sources":["../src/fetch-error.ts"],"names":[],"mappings":";;;AAAA,MAAa,UAAW,SAAQ,KAAK;IAGnC,YAAY,UAAmB,EAAE,OAAgB,EAAE,OAAsB;QACvE,IAAI,UAAU,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACnC,MAAM,IAAI,GAAG,WAAW,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;YAC1D,UAAU,GAAG,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,CAAA;YAClC,OAAO,GAAG,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAA;QAC9B,CAAC;QAED,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QATT;;;;;WAAkB;QAWhC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;CACF;AAdD,gCAcC;AAED,SAAS,gBAAgB,CAAC,GAAY;IACpC,qFAAqF;IACrF,kHAAkH;IAClH,IACE,GAAG,YAAY,SAAS;QACxB,GAAG,CAAC,OAAO,KAAK,cAAc;QAC9B,GAAG,CAAC,KAAK,KAAK,SAAS,EACvB,CAAC;QACD,OAAO,GAAG,CAAC,KAAK,CAAA;IAClB,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,SAAS,WAAW,CAAC,GAAY;IAC/B,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9C,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACnB,CAAC;IAED,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAA;IACjC,CAAC;IAED,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;IACxB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,IAAI,KAAK,WAAW;gBACvB,OAAO,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAA;YAClC,KAAK,IAAI,KAAK,cAAc;gBAC1B,OAAO,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAA;YACpC,KAAK,IAAI,KAAK,6BAA6B;gBACzC,OAAO,CAAC,GAAG,EAAE,yBAAyB,CAAC,CAAA;YACzC,KAAK,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;gBAC7B,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;YAC3B,KAAK,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBAC3B,OAAO,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAA;YAClC;gBACE,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,QAAQ,CAAC,CAAA;QACjC,CAAC;IACH,CAAC;IAED,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;AAC3B,CAAC"}

package/dist/fetch-request.d.ts

@@ -1,7 +1,24 @@
-import { Transformer } from '@atproto-labs/transformer';
-export type RequestTranformer = Transformer<Request>;
-export declare function protocolCheckRequestTransform(protocols: Iterable<string>): RequestTranformer;
-export declare function requireHostHeaderTranform(): RequestTranformer;
+import { FetchError } from './fetch-error.js';
+import { asRequest } from './fetch.js';
+export declare class FetchRequestError extends FetchError {
+    readonly request: Request;
+    constructor(request: Request, statusCode?: number, message?: string, options?: ErrorOptions);
+    static from(request: Request, cause: unknown): FetchRequestError;
+}
+export declare function protocolCheckRequestTransform(protocols: {
+    'about:'?: boolean;
+    'blob:'?: boolean;
+    'data:'?: boolean;
+    'file:'?: boolean;
+    'http:'?: boolean | {
+        allowCustomPort: boolean;
+    };
+    'https:'?: boolean | {
+        allowCustomPort: boolean;
+    };
+}): (input: Request | string | URL, init?: RequestInit) => Request;
+export declare function redirectCheckRequestTransform(): (input: Request | string | URL, init?: RequestInit) => Request;
+export declare function requireHostHeaderTransform(): (input: Request | string | URL, init?: RequestInit) => Request;
 export declare const DEFAULT_FORBIDDEN_DOMAIN_NAMES: string[];
-export declare function forbiddenDomainNameRequestTransform(denyList?: Iterable<string>): RequestTranformer;
+export declare function forbiddenDomainNameRequestTransform(denyList?: Iterable<string>): typeof asRequest | ((input: Request | string | URL, init?: RequestInit) => Promise<Request>);
 //# sourceMappingURL=fetch-request.d.ts.map

package/dist/fetch-request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-request.d.ts","sourceRoot":"","sources":["../src/fetch-request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAKvD,MAAM,MAAM,iBAAiB,GAAG,WAAW,CAAC,OAAO,CAAC,CAAA;AAEpD,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,iBAAiB,CAYnB;AAED,wBAAgB,yBAAyB,IAAI,iBAAiB,CAkB7D;AAED,eAAO,MAAM,8BAA8B,UAS1C,CAAA;AAED,wBAAgB,mCAAmC,CACjD,QAAQ,GAAE,QAAQ,CAAC,MAAM,CAAkC,GAC1D,iBAAiB,CA6BnB"}
+{"version":3,"file":"fetch-request.d.ts","sourceRoot":"","sources":["../src/fetch-request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAGtC,qBAAa,iBAAkB,SAAQ,UAAU;aAE7B,OAAO,EAAE,OAAO;gBAAhB,OAAO,EAAE,OAAO,EAChC,UAAU,CAAC,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,YAAY;IAKxB,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,iBAAiB;CAIjE;AAED,wBAAgB,6BAA6B,CAAC,SAAS,EAAE;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,OAAO,GAAG;QAAE,eAAe,EAAE,OAAO,CAAA;KAAE,CAAA;IAChD,QAAQ,CAAC,EAAE,OAAO,GAAG;QAAE,eAAe,EAAE,OAAO,CAAA;KAAE,CAAA;CAClD,WACgB,OAAO,GAAG,MAAM,GAAG,GAAG,SAAS,WAAW,aA0B1D;AAED,wBAAgB,6BAA6B,YAC5B,OAAO,GAAG,MAAM,GAAG,GAAG,SAAS,WAAW,aAa1D;AAED,wBAAgB,0BAA0B,YACzB,OAAO,GAAG,MAAM,GAAG,GAAG,SAAS,WAAW,aAuB1D;AAED,eAAO,MAAM,8BAA8B,UAS1C,CAAA;AAED,wBAAgB,mCAAmC,CACjD,QAAQ,GAAE,QAAQ,CAAC,MAAM,CAAkC,+BAUtC,OAAO,GAAG,MAAM,GAAG,GAAG,SAAS,WAAW,uBAsBhE"}

package/dist/fetch-request.js

@@ -1,35 +1,71 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.forbiddenDomainNameRequestTransform = exports.DEFAULT_FORBIDDEN_DOMAIN_NAMES = exports.requireHostHeaderTranform = exports.protocolCheckRequestTransform = void 0;
+exports.forbiddenDomainNameRequestTransform = exports.DEFAULT_FORBIDDEN_DOMAIN_NAMES = exports.requireHostHeaderTransform = exports.redirectCheckRequestTransform = exports.protocolCheckRequestTransform = exports.FetchRequestError = void 0;
 const fetch_error_js_1 = require("./fetch-error.js");
+const fetch_js_1 = require("./fetch.js");
 const util_js_1 = require("./util.js");
+class FetchRequestError extends fetch_error_js_1.FetchError {
+    constructor(request, statusCode, message, options) {
+        super(statusCode, message, options);
+        Object.defineProperty(this, "request", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: request
+        });
+    }
+    static from(request, cause) {
+        if (cause instanceof FetchRequestError)
+            return cause;
+        return new FetchRequestError(request, undefined, undefined, { cause });
+    }
+}
+exports.FetchRequestError = FetchRequestError;
 function protocolCheckRequestTransform(protocols) {
-    const allowedProtocols = new Set(protocols);
-    return async (request) => {
-        const { protocol } = new URL(request.url);
-        if (!allowedProtocols.has(protocol)) {
-            throw new fetch_error_js_1.FetchError(400, `${protocol} is not allowed`, { request });
+    return (input, init) => {
+        const { protocol, port } = (0, util_js_1.extractUrl)(input);
+        const request = (0, fetch_js_1.asRequest)(input, init);
+        const config = 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 request;
     };
 }
 exports.protocolCheckRequestTransform = protocolCheckRequestTransform;
-function requireHostHeaderTranform() {
-    return async (request) => {
+function redirectCheckRequestTransform() {
+    return (input, init) => {
+        const request = (0, fetch_js_1.asRequest)(input, init);
+        if (request.redirect === 'follow') {
+            throw new FetchRequestError(request, 500, 'Request redirect must be "error" or "manual"');
+        }
+        return request;
+    };
+}
+exports.redirectCheckRequestTransform = redirectCheckRequestTransform;
+function requireHostHeaderTransform() {
+    return (input, init) => {
         // 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 } = (0, util_js_1.extractUrl)(input);
+        const request = (0, fetch_js_1.asRequest)(input, init);
         // "Host" header only makes sense in the context of an HTTP request
-        if (protocol !== 'http:' && protocol !== 'https') {
-            throw new fetch_error_js_1.FetchError(400, `Forbidden protocol ${protocol}`, { request });
+        if (protocol !== 'http:' && protocol !== 'https:') {
+            throw new FetchRequestError(request, 400, `"${protocol}" requests are not allowed`);
         }
         if (!hostname || (0, util_js_1.isIp)(hostname)) {
-            throw new fetch_error_js_1.FetchError(400, 'Invalid hostname', { request });
+            throw new FetchRequestError(request, 400, 'Invalid hostname');
         }
         return request;
     };
 }
-exports.requireHostHeaderTranform = requireHostHeaderTranform;
+exports.requireHostHeaderTransform = requireHostHeaderTransform;
 exports.DEFAULT_FORBIDDEN_DOMAIN_NAMES = [
     'example.com',
     '*.example.com',
@@ -45,20 +81,21 @@ function forbiddenDomainNameRequestTransform(denyList = exports.DEFAULT_FORBIDDE
     // Optimization: if no forbidden domain names are provided, we can skip the
     // check entirely.
     if (denySet.size === 0) {
-        return async (request) => request;
+        return fetch_js_1.asRequest;
     }
-    return async (request) => {
-        const { hostname } = new URL(request.url);
+    return async (input, init) => {
+        const { hostname } = (0, util_js_1.extractUrl)(input);
+        const request = (0, fetch_js_1.asRequest)(input, init);
         // Full domain name check
         if (denySet.has(hostname)) {
-            throw new fetch_error_js_1.FetchError(403, 'Forbidden hostname', { request });
+            throw new FetchRequestError(request, 403, 'Forbidden hostname');
         }
         // Sub domain name check
         let curDot = hostname.indexOf('.');
         while (curDot !== -1) {
             const subdomain = hostname.slice(curDot + 1);
             if (denySet.has(`*.${subdomain}`)) {
-                throw new fetch_error_js_1.FetchError(403, 'Forbidden hostname', { request });
+                throw new FetchRequestError(request, 403, 'Forbidden hostname');
             }
             curDot = hostname.indexOf('.', curDot + 1);
         }

package/dist/fetch-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-request.js","sourceRoot":"","sources":["../src/fetch-request.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetch-request.js","sourceRoot":"","sources":["../src/fetch-request.ts"],"names":[],"mappings":"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"}

package/dist/fetch-response.d.ts

@@ -1,24 +1,42 @@
-import { Transformer } from '@atproto-labs/transformer';
-import { z } from 'zod';
-import { FetchError, FetchErrorOptions } from './fetch-error.js';
+import { Transformer } from '@atproto-labs/pipe';
+import type { ZodTypeAny, ParseParams, TypeOf } from 'zod';
+import { FetchError } from './fetch-error.js';
 import { Json } from './util.js';
 export type ResponseTranformer = Transformer<Response>;
 export type ResponseMessageGetter = Transformer<Response, string | undefined>;
 export declare class FetchResponseError extends FetchError {
-    constructor(response: Response, statusCode?: number, message?: string, options?: Omit<FetchErrorOptions, 'response'>);
-    static from(response: Response, statusCode?: number, customMessage?: string | ResponseMessageGetter, options?: Omit<FetchErrorOptions, 'response'>): Promise<FetchResponseError>;
+    readonly response: Response;
+    constructor(response: Response, statusCode?: number, message?: string, options?: ErrorOptions);
+    static from(response: Response, customMessage?: string | ResponseMessageGetter, statusCode?: number, options?: ErrorOptions): Promise<FetchResponseError>;
 }
+export declare function peekJson(response: Response, maxSize?: number): Promise<undefined | Json>;
+export declare function checkLength(response: Response, maxBytes: number): number | undefined;
+export declare function extractLength(response: Response): number | undefined;
+export declare function extractMime(response: Response): string | undefined;
+/**
+ * If the transformer results in an error, ensure that the response body is
+ * consumed as, in some environments (Node 👀), the response will not
+ * automatically be GC'd.
+ *
+ * @see {@link https://undici.nodejs.org/#/?id=garbage-collection}
+ * @param [onCancellationError] - Callback to handle any async body cancelling
+ * error. Defaults to logging the error. Do not use `null` if the request is
+ * cloned.
+ */
+export declare function cancelBodyOnError<T>(transformer: Transformer<Response, T>, onCancellationError?: null | ((err: unknown) => void)): (response: Response) => Promise<T>;
 export declare function fetchOkProcessor(customMessage?: string | ResponseMessageGetter): ResponseTranformer;
+export declare function fetchOkTransformer(response: Response, customMessage?: string | ResponseMessageGetter): Promise<Response>;
 export declare function fetchMaxSizeProcessor(maxBytes: number): ResponseTranformer;
-export declare function fetchResponseMaxSize(response: Response, maxBytes: number): Promise<Response>;
-export type ContentTypeCheckFn = (contentType: string) => boolean;
-export type ContentTypeCheck = string | RegExp | ContentTypeCheckFn;
-export declare function fetchTypeProcessor(expectedType: ContentTypeCheck, contentTypeRequired?: boolean): ResponseTranformer;
+export declare function fetchResponseMaxSizeChecker(response: Response, maxBytes: number): Response;
+export type MimeTypeCheckFn = (mimeType: string) => boolean;
+export type MimeTypeCheck = string | RegExp | MimeTypeCheckFn;
+export declare function fetchTypeProcessor(expectedMime: MimeTypeCheck, contentTypeRequired?: boolean): ResponseTranformer;
+export declare function fetchResponseTypeChecker(response: Response, isExpectedMime: MimeTypeCheckFn, contentTypeRequired?: boolean): Promise<Response>;
 export type ParsedJsonResponse<T = Json> = {
     response: Response;
     json: T;
 };
-export declare function jsonTranformer<T = Json>(response: Response): Promise<ParsedJsonResponse<T>>;
-export declare function fetchJsonProcessor<T = Json>(contentType?: ContentTypeCheck, contentTypeRequired?: boolean): Transformer<Response, ParsedJsonResponse<T>>;
-export declare function fetchJsonZodProcessor<S extends z.ZodTypeAny>(schema: S, params?: Partial<z.ParseParams>): Transformer<ParsedJsonResponse, z.infer<S>>;
+export declare function fetchResponseJsonTranformer<T = Json>(response: Response): Promise<ParsedJsonResponse<T>>;
+export declare function fetchJsonProcessor<T = Json>(expectedMime?: MimeTypeCheck, contentTypeRequired?: boolean): Transformer<Response, ParsedJsonResponse<T>>;
+export declare function fetchJsonZodProcessor<S extends ZodTypeAny>(schema: S, params?: Partial<ParseParams>): Transformer<ParsedJsonResponse, TypeOf<S>>;
 //# sourceMappingURL=fetch-response.d.ts.map

package/dist/fetch-response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-response.d.ts","sourceRoot":"","sources":["../src/fetch-response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAW,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,IAAI,EAAsB,MAAM,WAAW,CAAA;AAGpD,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAA;AACtD,MAAM,MAAM,qBAAqB,GAAG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;AAmC7E,qBAAa,kBAAmB,SAAQ,UAAU;gBAE9C,QAAQ,EAAE,QAAQ,EAClB,UAAU,GAAE,MAAwB,EACpC,OAAO,GAAE,MAA4B,EACrC,OAAO,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC;WAKlC,IAAI,CACf,QAAQ,EAAE,QAAQ,EAClB,UAAU,SAAkB,EAC5B,aAAa,GAAE,MAAM,GAAG,qBAA8C,EACtE,OAAO,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC;CAehD;AAED,wBAAgB,gBAAgB,CAC9B,aAAa,CAAC,EAAE,MAAM,GAAG,qBAAqB,GAC7C,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,CAM1E;AAED,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,CAAC,CA8BnB;AAED,MAAM,MAAM,kBAAkB,GAAG,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAA;AACjE,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,MAAM,GAAG,kBAAkB,CAAA;AAEnE,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,gBAAgB,EAC9B,mBAAmB,UAAO,GACzB,kBAAkB,CAgCpB;AAED,MAAM,MAAM,kBAAkB,CAAC,CAAC,GAAG,IAAI,IAAI;IACzC,QAAQ,EAAE,QAAQ,CAAA;IAClB,IAAI,EAAE,CAAC,CAAA;CACR,CAAA;AAED,wBAAsB,cAAc,CAAC,CAAC,GAAG,IAAI,EAC3C,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAoBhC;AAED,wBAAgB,kBAAkB,CAAC,CAAC,GAAG,IAAI,EACzC,WAAW,GAAE,gBAAoD,EACjE,mBAAmB,UAAO,GACzB,WAAW,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAK9C;AAED,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,CAAC,CAAC,UAAU,EAC1D,MAAM,EAAE,CAAC,EACT,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,GAC9B,WAAW,CAAC,kBAAkB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAG7C"}
+{"version":3,"file":"fetch-response.d.ts","sourceRoot":"","sources":["../src/fetch-response.ts"],"names":[],"mappings":"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"}