@atproto-labs/fetch-node 0.0.1 → 0.1.0

package/CHANGELOG.md

@@ -1,11 +1,13 @@
 # @atproto-labs/fetch-node
 
-## 0.0.1
+## 0.1.0
 
-### Patch Changes
+### 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
 
-- [`e134c79a0`](https://github.com/bluesky-social/atproto/commit/e134c79a0ffb000b2cb36437815673fa6bda664b) Thanks [@devinivy](https://github.com/devinivy)! - Initial publish of experimental oauth packages to @atproto-labs
+### Patch Changes
 
-- Updated dependencies [[`e134c79a0`](https://github.com/bluesky-social/atproto/commit/e134c79a0ffb000b2cb36437815673fa6bda664b)]:
-  - @atproto-labs/transformer@0.0.1
-  - @atproto-labs/fetch@0.0.1
+- Updated dependencies [[`a8d6c1123`](https://github.com/bluesky-social/atproto/commit/a8d6c112359f5c4c0cfbe2df63443ed275f2a646)]:
+  - @atproto-labs/fetch@0.1.0
+  - @atproto-labs/pipe@0.1.0

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+export * from '@atproto-labs/fetch';
 export * from './safe.js';
 export * from './ssrf.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AAEnC,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA"}

package/dist/index.js

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@atproto-labs/fetch"), exports);
 __exportStar(require("./safe.js"), exports);
 __exportStar(require("./ssrf.js"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,4CAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAmC;AAEnC,4CAAyB;AACzB,4CAAyB"}

package/dist/safe.d.ts

@@ -4,7 +4,8 @@ export type SafeFetchWrapOptions = NonNullable<Parameters<typeof safeFetchWrap>[
  * Wrap a fetch function with safety checks so that it can be safely used
  * with user provided input (URL).
  */
-export declare const safeFetchWrap: ({ fetch, responseMaxSize, allowHttp, allowData, ssrfProtection, timeout, forbiddenDomainNames, }?: {
+export declare function safeFetchWrap({ fetch, responseMaxSize, // 512kB
+allowHttp, allowData, ssrfProtection, timeout, forbiddenDomainNames, }?: {
     fetch?: Fetch | undefined;
     responseMaxSize?: number | undefined;
     allowHttp?: boolean | undefined;
@@ -12,5 +13,5 @@ export declare const safeFetchWrap: ({ fetch, responseMaxSize, allowHttp, allowD
     ssrfProtection?: boolean | undefined;
     timeout?: number | undefined;
     forbiddenDomainNames?: Iterable<string> | undefined;
-}) => Fetch;
+}): Fetch<unknown>;
 //# sourceMappingURL=safe.d.ts.map

package/dist/safe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"safe.d.ts","sourceRoot":"","sources":["../src/safe.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EAMN,MAAM,qBAAqB,CAAA;AAK5B,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAC5C,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,CACpC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,aAAa;;;;;;;;MAQjB,KA4CN,CAAA"}
+{"version":3,"file":"safe.d.ts","sourceRoot":"","sources":["../src/safe.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EAON,MAAM,qBAAqB,CAAA;AAK5B,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAC5C,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,CACpC,CAAA;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,EAC5B,KAAiC,EACjC,eAA4B,EAAE,QAAQ;AACtC,SAAiB,EACjB,SAAiB,EACjB,cAAqB,EACrB,OAAc,EACd,oBAAyE,GAC1E;;;;;;;;CAAK,GAAG,KAAK,CAAC,OAAO,CAAC,CA+CtB"}

package/dist/safe.js

@@ -2,48 +2,48 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.safeFetchWrap = void 0;
 const fetch_1 = require("@atproto-labs/fetch");
-const transformer_1 = require("@atproto-labs/transformer");
+const pipe_1 = require("@atproto-labs/pipe");
 const ssrf_js_1 = require("./ssrf.js");
 /**
  * Wrap a fetch function with safety checks so that it can be safely used
  * with user provided input (URL).
  */
-const safeFetchWrap = ({ fetch = globalThis.fetch, responseMaxSize = 512 * 1024, // 512kB
-allowHttp = false, allowData = false, ssrfProtection = true, timeout = 10e3, forbiddenDomainNames = fetch_1.DEFAULT_FORBIDDEN_DOMAIN_NAMES, } = {}) => (0, transformer_1.compose)(
-/**
- * Prevent using http:, file: or data: protocols.
- */
-(0, fetch_1.protocolCheckRequestTransform)(['https:']
-    .concat(allowHttp ? ['http:'] : [])
-    .concat(allowData ? ['data:'] : [])), 
-/**
- * Only requests that will be issued with a "Host" header are allowed.
- */
-(0, fetch_1.requireHostHeaderTranform)(), 
-/**
- * Disallow fetching from domains we know are not atproto/OIDC client
- * implementation. Note that other domains can be blocked by providing a
- * custom fetch function combined with another
- * forbiddenDomainNameRequestTransform.
- */
-(0, fetch_1.forbiddenDomainNameRequestTransform)(forbiddenDomainNames), 
-/**
- * Since we will be fetching from the network based on user provided
- * input, let's mitigate resource exhaustion attacks by setting a timeout.
- */
-(0, fetch_1.timeoutFetchWrap)({
-    timeout,
+function safeFetchWrap({ fetch = globalThis.fetch, responseMaxSize = 512 * 1024, // 512kB
+allowHttp = false, allowData = false, ssrfProtection = true, timeout = 10e3, forbiddenDomainNames = fetch_1.DEFAULT_FORBIDDEN_DOMAIN_NAMES, } = {}) {
+    return (0, fetch_1.toRequestTransformer)((0, pipe_1.pipe)(
+    /**
+     * Prevent using http:, file: or data: protocols.
+     */
+    (0, fetch_1.protocolCheckRequestTransform)(['https:']
+        .concat(allowHttp ? ['http:'] : [])
+        .concat(allowData ? ['data:'] : [])), 
+    /**
+     * Only requests that will be issued with a "Host" header are allowed.
+     */
+    (0, fetch_1.requireHostHeaderTranform)(), 
+    /**
+     * Disallow fetching from domains we know are not atproto/OIDC client
+     * implementation. Note that other domains can be blocked by providing a
+     * custom fetch function combined with another
+     * forbiddenDomainNameRequestTransform.
+     */
+    (0, fetch_1.forbiddenDomainNameRequestTransform)(forbiddenDomainNames), 
+    /**
+     * Since we will be fetching from the network based on user provided
+     * input, let's mitigate resource exhaustion attacks by setting a timeout.
+     */
+    (0, fetch_1.timedFetch)(timeout, 
     /**
      * Since we will be fetching from the network based on user provided
      * input, we need to make sure that the request is not vulnerable to SSRF
      * attacks.
      */
-    fetch: ssrfProtection ? (0, ssrf_js_1.ssrfFetchWrap)({ fetch }) : fetch,
-}), 
-/**
- * Since we will be fetching user owned data, we need to make sure that an
- * attacker cannot force us to download a large amounts of data.
- */
-(0, fetch_1.fetchMaxSizeProcessor)(responseMaxSize));
+    ssrfProtection ? (0, ssrf_js_1.ssrfFetchWrap)({ fetch }) : fetch), 
+    /**
+     * Since we will be fetching user owned data, we need to make sure that an
+     * attacker cannot force us to download a large amounts of data.
+     */
+    (0, fetch_1.fetchMaxSizeProcessor)(responseMaxSize)));
+}
 exports.safeFetchWrap = safeFetchWrap;
 //# sourceMappingURL=safe.js.map

package/dist/safe.js.map

@@ -1 +1 @@
-{"version":3,"file":"safe.js","sourceRoot":"","sources":["../src/safe.ts"],"names":[],"mappings":";;;AAAA,+CAQ4B;AAC5B,2DAAmD;AAEnD,uCAAyC;AAMzC;;;GAGG;AACI,MAAM,aAAa,GAAG,CAAC,EAC5B,KAAK,GAAG,UAAU,CAAC,KAAc,EACjC,eAAe,GAAG,GAAG,GAAG,IAAI,EAAE,QAAQ;AACtC,SAAS,GAAG,KAAK,EACjB,SAAS,GAAG,KAAK,EACjB,cAAc,GAAG,IAAI,EACrB,OAAO,GAAG,IAAc,EACxB,oBAAoB,GAAG,sCAAkD,MACvE,EAAE,EAAS,EAAE,CACf,IAAA,qBAAO;AACL;;GAEG;AACH,IAAA,qCAA6B,EAC3B,CAAC,QAAQ,CAAC;KACP,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAClC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CACtC;AAED;;GAEG;AACH,IAAA,iCAAyB,GAAE;AAE3B;;;;;GAKG;AACH,IAAA,2CAAmC,EAAC,oBAAoB,CAAC;AAEzD;;;GAGG;AACH,IAAA,wBAAgB,EAAC;IACf,OAAO;IAEP;;;;OAIG;IACH,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,IAAA,uBAAa,EAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK;CACzD,CAAC;AAEF;;;GAGG;AACH,IAAA,6BAAqB,EAAC,eAAe,CAAC,CACvC,CAAA;AApDU,QAAA,aAAa,iBAoDvB"}
+{"version":3,"file":"safe.js","sourceRoot":"","sources":["../src/safe.ts"],"names":[],"mappings":";;;AAAA,+CAS4B;AAC5B,6CAAyC;AAEzC,uCAAyC;AAMzC;;;GAGG;AACH,SAAgB,aAAa,CAAC,EAC5B,KAAK,GAAG,UAAU,CAAC,KAAc,EACjC,eAAe,GAAG,GAAG,GAAG,IAAI,EAAE,QAAQ;AACtC,SAAS,GAAG,KAAK,EACjB,SAAS,GAAG,KAAK,EACjB,cAAc,GAAG,IAAI,EACrB,OAAO,GAAG,IAAI,EACd,oBAAoB,GAAG,sCAAkD,MACvE,EAAE;IACJ,OAAO,IAAA,4BAAoB,EACzB,IAAA,WAAI;IACF;;OAEG;IACH,IAAA,qCAA6B,EAC3B,CAAC,QAAQ,CAAC;SACP,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAClC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CACtC;IAED;;OAEG;IACH,IAAA,iCAAyB,GAAE;IAE3B;;;;;OAKG;IACH,IAAA,2CAAmC,EAAC,oBAAoB,CAAC;IAEzD;;;OAGG;IACH,IAAA,kBAAU,EACR,OAAO;IAEP;;;;OAIG;IACH,cAAc,CAAC,CAAC,CAAC,IAAA,uBAAa,EAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAClD;IAED;;;OAGG;IACH,IAAA,6BAAqB,EAAC,eAAe,CAAC,CACvC,CACF,CAAA;AACH,CAAC;AAvDD,sCAuDC"}

package/dist/ssrf.d.ts

@@ -1,6 +1,11 @@
-import { Fetch } from '@atproto-labs/fetch';
-export type SsrfSafeFetchWrapOptions = NonNullable<Parameters<typeof ssrfFetchWrap>[0]>;
-export declare const ssrfFetchWrap: ({ fetch, }?: {
-    fetch?: Fetch | undefined;
-}) => Fetch;
+import { Fetch, FetchContext } from '@atproto-labs/fetch';
+export type SsrfFetchWrapOptions<C = FetchContext> = {
+    allowCustomPort?: boolean;
+    allowUnknownTld?: boolean;
+    fetch?: Fetch<C>;
+};
+/**
+ * @see {@link https://owasp.org/Top10/A10_2021-Server-Side_Request_Forgery_%28SSRF%29/}
+ */
+export declare function ssrfFetchWrap<C = FetchContext>({ allowCustomPort, allowUnknownTld, fetch, }: SsrfFetchWrapOptions<C>): Fetch<C>;
 //# sourceMappingURL=ssrf.d.ts.map

package/dist/ssrf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssrf.d.ts","sourceRoot":"","sources":["../src/ssrf.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAc,MAAM,qBAAqB,CAAA;AAKvD,MAAM,MAAM,wBAAwB,GAAG,WAAW,CAChD,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,CACpC,CAAA;AACD,eAAO,MAAM,aAAa;;MAEjB,KA0CR,CAAA"}
+{"version":3,"file":"ssrf.d.ts","sourceRoot":"","sources":["../src/ssrf.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAA;AAS5B,MAAM,MAAM,oBAAoB,CAAC,CAAC,GAAG,YAAY,IAAI;IACnD,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;CACjB,CAAA;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,CAAC,GAAG,YAAY,EAAE,EAC9C,eAAuB,EACvB,eAAuB,EACvB,KAAwB,GACzB,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAkIpC"}

package/dist/ssrf.js

@@ -1,91 +1,138 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ssrfFetchWrap = void 0;
-const node_dns_1 = __importStar(require("node:dns"));
+const node_dns_1 = __importDefault(require("node:dns"));
 const fetch_1 = require("@atproto-labs/fetch");
 const ipaddr_js_1 = __importDefault(require("ipaddr.js"));
+const psl_1 = require("psl");
+const undici_1 = require("undici");
 const { IPv4, IPv6 } = ipaddr_js_1.default;
-const ssrfFetchWrap = ({ fetch = globalThis.fetch, } = {}) => {
-    const ssrfSafeFetch = async (request) => {
-        const { protocol, hostname } = new URL(request.url);
-        if (protocol === 'http:' || protocol === 'https:') {
+const [NODE_VERSION] = process.versions.node.split('.').map(Number);
+/**
+ * @see {@link https://owasp.org/Top10/A10_2021-Server-Side_Request_Forgery_%28SSRF%29/}
+ */
+function ssrfFetchWrap({ allowCustomPort = false, allowUnknownTld = false, fetch = globalThis.fetch, }) {
+    const ssrfAgent = new undici_1.Agent({ connect: { lookup } });
+    return (0, fetch_1.toRequestTransformer)(async function (request) {
+        const url = new URL(request.url);
+        if (url.protocol === 'data:') {
+            // No SSRF issue
+            return fetch.call(this, request);
+        }
+        if (url.protocol === 'http:' || url.protocol === 'https:') {
+            // @ts-expect-error non-standard option
+            if (request.dispatcher) {
+                throw new fetch_1.FetchRequestError(request, 500, 'SSRF protection cannot be used with a custom request dispatcher');
+            }
+            // Check port (OWASP)
+            if (url.port && !allowCustomPort) {
+                throw new fetch_1.FetchRequestError(request, 400, 'Request port must be omitted or standard when SSRF is enabled');
+            }
+            // Disable HTTP redirections (OWASP)
             if (request.redirect === 'follow') {
-                // TODO: actually implement by calling ssrfSafeFetch recursively (?)
-                throw new fetch_1.FetchError(500, 'Request redirect must be "error" or "manual" when SSRF is enabled', { request });
+                throw new fetch_1.FetchRequestError(request, 500, 'Request redirect must be "error" or "manual" when SSRF is enabled');
             }
-            // Make sure the hostname is a unicast IP address
-            const ip = await hostnameLookup(hostname).catch((cause) => {
-                throw cause?.code === 'ENOTFOUND'
-                    ? new fetch_1.FetchError(400, `Invalid hostname ${hostname}`, {
-                        request,
-                        cause,
-                    })
-                    : new fetch_1.FetchError(500, `Unable resolve DNS for ${hostname}`, {
-                        request,
-                        cause,
-                    });
-            });
-            if (ip.range() !== 'unicast') {
-                throw new fetch_1.FetchError(400, `Invalid hostname IP address ${ip}`, {
-                    request,
+            // If the hostname is an IP address, it must be a unicast address.
+            const ip = parseIpHostname(url.hostname);
+            if (ip) {
+                if (ip.range() !== 'unicast') {
+                    throw new fetch_1.FetchRequestError(request, 400, 'Hostname resolved to non-unicast address');
+                }
+                // No additional check required
+                return fetch.call(this, request);
+            }
+            if (allowUnknownTld !== true && !(0, psl_1.isValid)(url.hostname)) {
+                throw new fetch_1.FetchRequestError(request, 400, 'Hostname is not a public domain');
+            }
+            // Else hostname is a domain name, use DNS lookup to check if it resolves
+            // to a unicast address
+            if (NODE_VERSION < 21) {
+                // Note: due to the issue nodejs/undici#2828 (fixed in undici >=6.7.0,
+                // Node >=21), the "dispatcher" property of the request object will not
+                // be used by fetch(). As a workaround, we pass the dispatcher as second
+                // argument to fetch() here, and make sure it is used (which might not be
+                // the case if a custom fetch() function is used).
+                if (fetch === globalThis.fetch) {
+                    // If the global fetch function is used, we can pass the dispatcher
+                    // singleton directly to the fetch function as we know it will be
+                    // used.
+                    // @ts-expect-error non-standard option
+                    return fetch.call(this, request, { dispatcher: ssrfAgent });
+                }
+                let didLookup = false;
+                const dispatcher = new undici_1.Agent({
+                    connect: {
+                        lookup(...args) {
+                            didLookup = true;
+                            lookup(...args);
+                        },
+                    },
                 });
+                try {
+                    // @ts-expect-error non-standard option
+                    return await fetch.call(this, request, { dispatcher });
+                }
+                finally {
+                    // Free resources (we cannot await here since the response was not
+                    // consumed yet).
+                    void dispatcher.close().catch((err) => {
+                        // No biggie, but let's still log it
+                        console.warn('Failed to close dispatcher', err);
+                    });
+                    if (!didLookup) {
+                        // If you encounter this error, either upgrade to Node.js >=21 or
+                        // make sure that the requestInit object is passed as second
+                        // argument to the global fetch function.
+                        // eslint-disable-next-line no-unsafe-finally
+                        throw new fetch_1.FetchRequestError(request, 500, 'Unable to enforce SSRF protection');
+                    }
+                }
             }
+            // @ts-expect-error non-standard option
+            return fetch(new Request(request, { dispatcher: ssrfAgent }));
         }
-        else if (protocol === 'data:') {
-            // No SSRF issue
-        }
-        else {
-            // blob: about: file: all should be rejected
-            throw new fetch_1.FetchError(400, `Forbidden protocol ${protocol}`, { request });
-        }
-        return fetch(request);
-    };
-    return ssrfSafeFetch;
-};
+        // blob: about: file: all should be rejected
+        throw new fetch_1.FetchRequestError(request, 400, `Forbidden protocol "${url.protocol}"`);
+    });
+}
 exports.ssrfFetchWrap = ssrfFetchWrap;
-async function hostnameLookup(hostname) {
+function parseIpHostname(hostname) {
     if (IPv4.isIPv4(hostname)) {
         return IPv4.parse(hostname);
     }
     if (hostname.startsWith('[') && hostname.endsWith(']')) {
         return IPv6.parse(hostname.slice(1, -1));
     }
-    return domainLookup(hostname);
+    return undefined;
 }
-async function domainLookup(domain) {
-    const addr = await node_dns_1.promises.lookup(domain, {
-        hints: node_dns_1.default.ADDRCONFIG | node_dns_1.default.V4MAPPED,
+function lookup(hostname, options, callback) {
+    node_dns_1.default.lookup(hostname, options, (err, address, family) => {
+        if (err) {
+            callback(err, address, family);
+        }
+        else {
+            const ips = Array.isArray(address)
+                ? address.map(parseLookupAddress)
+                : [parseLookupAddress({ address, family })];
+            if (ips.some((ip) => ip.range() !== 'unicast')) {
+                callback(new Error('Hostname resolved to non-unicast address'), address, family);
+            }
+            else {
+                callback(null, address, family);
+            }
+        }
     });
-    const ip = addr.family === 4 ? IPv4.parse(addr.address) : IPv6.parse(addr.address);
+}
+function parseLookupAddress({ address, family, }) {
+    const ip = family === 4 ? IPv4.parse(address) : IPv6.parse(address);
     if (ip instanceof IPv6 && ip.isIPv4MappedAddress()) {
         return ip.toIPv4Address();
     }
-    return ip;
+    else {
+        return ip;
+    }
 }
 //# sourceMappingURL=ssrf.js.map

package/dist/ssrf.js.map

@@ -1 +1 @@
-{"version":3,"file":"ssrf.js","sourceRoot":"","sources":["../src/ssrf.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ssrf.js","sourceRoot":"","sources":["../src/ssrf.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA6C;AAG7C,+CAK4B;AAC5B,0DAA8B;AAC9B,6BAA8C;AAC9C,mCAA8B;AAE9B,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,mBAAM,CAAA;AAE7B,MAAM,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAQnE;;GAEG;AACH,SAAgB,aAAa,CAAmB,EAC9C,eAAe,GAAG,KAAK,EACvB,eAAe,GAAG,KAAK,EACvB,KAAK,GAAG,UAAU,CAAC,KAAK,GACA;IACxB,MAAM,SAAS,GAAG,IAAI,cAAK,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;IAEpD,OAAO,IAAA,4BAAoB,EAAC,KAAK,WAE/B,OAAO;QAEP,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAEhC,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YAC7B,gBAAgB;YAChB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAClC,CAAC;QAED,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1D,uCAAuC;YACvC,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;gBACvB,MAAM,IAAI,yBAAiB,CACzB,OAAO,EACP,GAAG,EACH,iEAAiE,CAClE,CAAA;YACH,CAAC;YAED,qBAAqB;YACrB,IAAI,GAAG,CAAC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACjC,MAAM,IAAI,yBAAiB,CACzB,OAAO,EACP,GAAG,EACH,+DAA+D,CAChE,CAAA;YACH,CAAC;YAED,oCAAoC;YACpC,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBAClC,MAAM,IAAI,yBAAiB,CACzB,OAAO,EACP,GAAG,EACH,mEAAmE,CACpE,CAAA;YACH,CAAC;YAED,kEAAkE;YAClE,MAAM,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YACxC,IAAI,EAAE,EAAE,CAAC;gBACP,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,SAAS,EAAE,CAAC;oBAC7B,MAAM,IAAI,yBAAiB,CACzB,OAAO,EACP,GAAG,EACH,0CAA0C,CAC3C,CAAA;gBACH,CAAC;gBACD,+BAA+B;gBAC/B,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;YAClC,CAAC;YAED,IAAI,eAAe,KAAK,IAAI,IAAI,CAAC,IAAA,aAAa,EAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC7D,MAAM,IAAI,yBAAiB,CACzB,OAAO,EACP,GAAG,EACH,iCAAiC,CAClC,CAAA;YACH,CAAC;YAED,yEAAyE;YACzE,uBAAuB;YAEvB,IAAI,YAAY,GAAG,EAAE,EAAE,CAAC;gBACtB,sEAAsE;gBACtE,uEAAuE;gBACvE,wEAAwE;gBACxE,yEAAyE;gBACzE,kDAAkD;gBAElD,IAAI,KAAK,KAAK,UAAU,CAAC,KAAK,EAAE,CAAC;oBAC/B,mEAAmE;oBACnE,iEAAiE;oBACjE,QAAQ;oBAER,uCAAuC;oBACvC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAA;gBAC7D,CAAC;gBAED,IAAI,SAAS,GAAG,KAAK,CAAA;gBACrB,MAAM,UAAU,GAAG,IAAI,cAAK,CAAC;oBAC3B,OAAO,EAAE;wBACP,MAAM,CAAC,GAAG,IAAI;4BACZ,SAAS,GAAG,IAAI,CAAA;4BAChB,MAAM,CAAC,GAAG,IAAI,CAAC,CAAA;wBACjB,CAAC;qBACF;iBACF,CAAC,CAAA;gBAEF,IAAI,CAAC;oBACH,uCAAuC;oBACvC,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA;gBACxD,CAAC;wBAAS,CAAC;oBACT,kEAAkE;oBAClE,iBAAiB;oBACjB,KAAK,UAAU,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;wBACpC,oCAAoC;wBACpC,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAA;oBACjD,CAAC,CAAC,CAAA;oBAEF,IAAI,CAAC,SAAS,EAAE,CAAC;wBACf,iEAAiE;wBACjE,4DAA4D;wBAC5D,yCAAyC;wBAEzC,6CAA6C;wBAC7C,MAAM,IAAI,yBAAiB,CACzB,OAAO,EACP,GAAG,EACH,mCAAmC,CACpC,CAAA;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAED,uCAAuC;YACvC,OAAO,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;QAC/D,CAAC;QAED,4CAA4C;QAC5C,MAAM,IAAI,yBAAiB,CACzB,OAAO,EACP,GAAG,EACH,uBAAuB,GAAG,CAAC,QAAQ,GAAG,CACvC,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAtID,sCAsIC;AAED,SAAS,eAAe,CACtB,QAAgB;IAEhB,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC7B,CAAC;IAED,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACvD,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;IAC1C,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,MAAM,CACb,QAAgB,EAChB,OAA0B,EAC1B,QAAuC;IAEvC,kBAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACrD,IAAI,GAAG,EAAE,CAAC;YACR,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;QAChC,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;gBAChC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;gBACjC,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;YAE7C,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,SAAS,CAAC,EAAE,CAAC;gBAC/C,QAAQ,CACN,IAAI,KAAK,CAAC,0CAA0C,CAAC,EACrD,OAAO,EACP,MAAM,CACP,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,EAC1B,OAAO,EACP,MAAM,GACQ;IACd,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAEnE,IAAI,EAAE,YAAY,IAAI,IAAI,EAAE,CAAC,mBAAmB,EAAE,EAAE,CAAC;QACnD,OAAO,EAAE,CAAC,aAAa,EAAE,CAAA;IAC3B,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/fetch-node",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "license": "MIT",
   "description": "SSRF protection for fetch() in Node.js",
   "keywords": [
@@ -12,7 +12,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/bluesky-social/atproto",
-    "directory": "packages/fetch-node"
+    "directory": "packages/internal/fetch-node"
   },
   "type": "commonjs",
   "main": "dist/index.js",
@@ -25,11 +25,13 @@
   },
   "dependencies": {
     "ipaddr.js": "^2.1.0",
-    "tslib": "^2.6.2",
-    "@atproto-labs/fetch": "0.0.1",
-    "@atproto-labs/transformer": "0.0.1"
+    "psl": "^1.9.0",
+    "undici": "^6.14.1",
+    "@atproto-labs/fetch": "0.1.0",
+    "@atproto-labs/pipe": "0.1.0"
   },
   "devDependencies": {
+    "@types/psl": "1.1.3",
     "typescript": "^5.3.3"
   },
   "scripts": {

package/src/index.ts

@@ -1,2 +1,4 @@
+export * from '@atproto-labs/fetch'
+
 export * from './safe.js'
 export * from './ssrf.js'

package/src/safe.ts

@@ -5,9 +5,10 @@ import {
   forbiddenDomainNameRequestTransform,
   protocolCheckRequestTransform,
   requireHostHeaderTranform,
-  timeoutFetchWrap,
+  timedFetch,
+  toRequestTransformer,
 } from '@atproto-labs/fetch'
-import { compose } from '@atproto-labs/transformer'
+import { pipe } from '@atproto-labs/pipe'
 
 import { ssrfFetchWrap } from './ssrf.js'
 
@@ -19,56 +20,59 @@ export type SafeFetchWrapOptions = NonNullable<
  * Wrap a fetch function with safety checks so that it can be safely used
  * with user provided input (URL).
  */
-export const safeFetchWrap = ({
+export function safeFetchWrap({
   fetch = globalThis.fetch as Fetch,
   responseMaxSize = 512 * 1024, // 512kB
   allowHttp = false,
   allowData = false,
   ssrfProtection = true,
-  timeout = 10e3 as number,
+  timeout = 10e3,
   forbiddenDomainNames = DEFAULT_FORBIDDEN_DOMAIN_NAMES as Iterable<string>,
-} = {}): Fetch =>
-  compose(
-    /**
-     * Prevent using http:, file: or data: protocols.
-     */
-    protocolCheckRequestTransform(
-      ['https:']
-        .concat(allowHttp ? ['http:'] : [])
-        .concat(allowData ? ['data:'] : []),
-    ),
-
-    /**
-     * Only requests that will be issued with a "Host" header are allowed.
-     */
-    requireHostHeaderTranform(),
+} = {}): Fetch<unknown> {
+  return toRequestTransformer(
+    pipe(
+      /**
+       * Prevent using http:, file: or data: protocols.
+       */
+      protocolCheckRequestTransform(
+        ['https:']
+          .concat(allowHttp ? ['http:'] : [])
+          .concat(allowData ? ['data:'] : []),
+      ),
 
-    /**
-     * Disallow fetching from domains we know are not atproto/OIDC client
-     * implementation. Note that other domains can be blocked by providing a
-     * custom fetch function combined with another
-     * forbiddenDomainNameRequestTransform.
-     */
-    forbiddenDomainNameRequestTransform(forbiddenDomainNames),
+      /**
+       * Only requests that will be issued with a "Host" header are allowed.
+       */
+      requireHostHeaderTranform(),
 
-    /**
-     * Since we will be fetching from the network based on user provided
-     * input, let's mitigate resource exhaustion attacks by setting a timeout.
-     */
-    timeoutFetchWrap({
-      timeout,
+      /**
+       * Disallow fetching from domains we know are not atproto/OIDC client
+       * implementation. Note that other domains can be blocked by providing a
+       * custom fetch function combined with another
+       * forbiddenDomainNameRequestTransform.
+       */
+      forbiddenDomainNameRequestTransform(forbiddenDomainNames),
 
       /**
        * Since we will be fetching from the network based on user provided
-       * input, we need to make sure that the request is not vulnerable to SSRF
-       * attacks.
+       * input, let's mitigate resource exhaustion attacks by setting a timeout.
        */
-      fetch: ssrfProtection ? ssrfFetchWrap({ fetch }) : fetch,
-    }),
+      timedFetch(
+        timeout,
+
+        /**
+         * Since we will be fetching from the network based on user provided
+         * input, we need to make sure that the request is not vulnerable to SSRF
+         * attacks.
+         */
+        ssrfProtection ? ssrfFetchWrap({ fetch }) : fetch,
+      ),
 
-    /**
-     * Since we will be fetching user owned data, we need to make sure that an
-     * attacker cannot force us to download a large amounts of data.
-     */
-    fetchMaxSizeProcessor(responseMaxSize),
+      /**
+       * Since we will be fetching user owned data, we need to make sure that an
+       * attacker cannot force us to download a large amounts of data.
+       */
+      fetchMaxSizeProcessor(responseMaxSize),
+    ),
   )
+}

package/src/ssrf.ts

@@ -1,62 +1,168 @@
-import dns, { promises as dnsPromises } from 'node:dns'
+import dns, { LookupAddress } from 'node:dns'
+import { LookupFunction } from 'node:net'
 
-import { Fetch, FetchError } from '@atproto-labs/fetch'
+import {
+  Fetch,
+  FetchContext,
+  FetchRequestError,
+  toRequestTransformer,
+} from '@atproto-labs/fetch'
 import ipaddr from 'ipaddr.js'
+import { isValid as isValidDomain } from 'psl'
+import { Agent } from 'undici'
 
 const { IPv4, IPv6 } = ipaddr
 
-export type SsrfSafeFetchWrapOptions = NonNullable<
-  Parameters<typeof ssrfFetchWrap>[0]
->
-export const ssrfFetchWrap = ({
-  fetch = globalThis.fetch as Fetch,
-} = {}): Fetch => {
-  const ssrfSafeFetch: Fetch = async (request) => {
-    const { protocol, hostname } = new URL(request.url)
+const [NODE_VERSION] = process.versions.node.split('.').map(Number)
 
-    if (protocol === 'http:' || protocol === 'https:') {
+export type SsrfFetchWrapOptions<C = FetchContext> = {
+  allowCustomPort?: boolean
+  allowUnknownTld?: boolean
+  fetch?: Fetch<C>
+}
+
+/**
+ * @see {@link https://owasp.org/Top10/A10_2021-Server-Side_Request_Forgery_%28SSRF%29/}
+ */
+export function ssrfFetchWrap<C = FetchContext>({
+  allowCustomPort = false,
+  allowUnknownTld = false,
+  fetch = globalThis.fetch,
+}: SsrfFetchWrapOptions<C>): Fetch<C> {
+  const ssrfAgent = new Agent({ connect: { lookup } })
+
+  return toRequestTransformer(async function (
+    this: C,
+    request,
+  ): Promise<Response> {
+    const url = new URL(request.url)
+
+    if (url.protocol === 'data:') {
+      // No SSRF issue
+      return fetch.call(this, request)
+    }
+
+    if (url.protocol === 'http:' || url.protocol === 'https:') {
+      // @ts-expect-error non-standard option
+      if (request.dispatcher) {
+        throw new FetchRequestError(
+          request,
+          500,
+          'SSRF protection cannot be used with a custom request dispatcher',
+        )
+      }
+
+      // Check port (OWASP)
+      if (url.port && !allowCustomPort) {
+        throw new FetchRequestError(
+          request,
+          400,
+          'Request port must be omitted or standard when SSRF is enabled',
+        )
+      }
+
+      // Disable HTTP redirections (OWASP)
       if (request.redirect === 'follow') {
-        // TODO: actually implement by calling ssrfSafeFetch recursively (?)
-        throw new FetchError(
+        throw new FetchRequestError(
+          request,
           500,
           'Request redirect must be "error" or "manual" when SSRF is enabled',
-          { request },
         )
       }
 
-      // Make sure the hostname is a unicast IP address
-      const ip = await hostnameLookup(hostname).catch((cause) => {
-        throw cause?.code === 'ENOTFOUND'
-          ? new FetchError(400, `Invalid hostname ${hostname}`, {
-              request,
-              cause,
-            })
-          : new FetchError(500, `Unable resolve DNS for ${hostname}`, {
-              request,
-              cause,
-            })
-      })
-      if (ip.range() !== 'unicast') {
-        throw new FetchError(400, `Invalid hostname IP address ${ip}`, {
+      // If the hostname is an IP address, it must be a unicast address.
+      const ip = parseIpHostname(url.hostname)
+      if (ip) {
+        if (ip.range() !== 'unicast') {
+          throw new FetchRequestError(
+            request,
+            400,
+            'Hostname resolved to non-unicast address',
+          )
+        }
+        // No additional check required
+        return fetch.call(this, request)
+      }
+
+      if (allowUnknownTld !== true && !isValidDomain(url.hostname)) {
+        throw new FetchRequestError(
           request,
+          400,
+          'Hostname is not a public domain',
+        )
+      }
+
+      // Else hostname is a domain name, use DNS lookup to check if it resolves
+      // to a unicast address
+
+      if (NODE_VERSION < 21) {
+        // Note: due to the issue nodejs/undici#2828 (fixed in undici >=6.7.0,
+        // Node >=21), the "dispatcher" property of the request object will not
+        // be used by fetch(). As a workaround, we pass the dispatcher as second
+        // argument to fetch() here, and make sure it is used (which might not be
+        // the case if a custom fetch() function is used).
+
+        if (fetch === globalThis.fetch) {
+          // If the global fetch function is used, we can pass the dispatcher
+          // singleton directly to the fetch function as we know it will be
+          // used.
+
+          // @ts-expect-error non-standard option
+          return fetch.call(this, request, { dispatcher: ssrfAgent })
+        }
+
+        let didLookup = false
+        const dispatcher = new Agent({
+          connect: {
+            lookup(...args) {
+              didLookup = true
+              lookup(...args)
+            },
+          },
         })
+
+        try {
+          // @ts-expect-error non-standard option
+          return await fetch.call(this, request, { dispatcher })
+        } finally {
+          // Free resources (we cannot await here since the response was not
+          // consumed yet).
+          void dispatcher.close().catch((err) => {
+            // No biggie, but let's still log it
+            console.warn('Failed to close dispatcher', err)
+          })
+
+          if (!didLookup) {
+            // If you encounter this error, either upgrade to Node.js >=21 or
+            // make sure that the requestInit object is passed as second
+            // argument to the global fetch function.
+
+            // eslint-disable-next-line no-unsafe-finally
+            throw new FetchRequestError(
+              request,
+              500,
+              'Unable to enforce SSRF protection',
+            )
+          }
+        }
       }
-    } else if (protocol === 'data:') {
-      // No SSRF issue
-    } else {
-      // blob: about: file: all should be rejected
-      throw new FetchError(400, `Forbidden protocol ${protocol}`, { request })
-    }
 
-    return fetch(request)
-  }
+      // @ts-expect-error non-standard option
+      return fetch(new Request(request, { dispatcher: ssrfAgent }))
+    }
 
-  return ssrfSafeFetch
+    // blob: about: file: all should be rejected
+    throw new FetchRequestError(
+      request,
+      400,
+      `Forbidden protocol "${url.protocol}"`,
+    )
+  })
 }
 
-async function hostnameLookup(
+function parseIpHostname(
   hostname: string,
-): Promise<ipaddr.IPv4 | ipaddr.IPv6> {
+): ipaddr.IPv4 | ipaddr.IPv6 | undefined {
   if (IPv4.isIPv4(hostname)) {
     return IPv4.parse(hostname)
   }
@@ -65,22 +171,44 @@ async function hostnameLookup(
     return IPv6.parse(hostname.slice(1, -1))
   }
 
-  return domainLookup(hostname)
+  return undefined
 }
 
-async function domainLookup(
-  domain: string,
-): Promise<ipaddr.IPv4 | ipaddr.IPv6> {
-  const addr = await dnsPromises.lookup(domain, {
-    hints: dns.ADDRCONFIG | dns.V4MAPPED,
+function lookup(
+  hostname: string,
+  options: dns.LookupOptions,
+  callback: Parameters<LookupFunction>[2],
+) {
+  dns.lookup(hostname, options, (err, address, family) => {
+    if (err) {
+      callback(err, address, family)
+    } else {
+      const ips = Array.isArray(address)
+        ? address.map(parseLookupAddress)
+        : [parseLookupAddress({ address, family })]
+
+      if (ips.some((ip) => ip.range() !== 'unicast')) {
+        callback(
+          new Error('Hostname resolved to non-unicast address'),
+          address,
+          family,
+        )
+      } else {
+        callback(null, address, family)
+      }
+    }
   })
+}
 
-  const ip =
-    addr.family === 4 ? IPv4.parse(addr.address) : IPv6.parse(addr.address)
+function parseLookupAddress({
+  address,
+  family,
+}: LookupAddress): ipaddr.IPv4 | ipaddr.IPv6 {
+  const ip = family === 4 ? IPv4.parse(address) : IPv6.parse(address)
 
   if (ip instanceof IPv6 && ip.isIPv4MappedAddress()) {
     return ip.toIPv4Address()
+  } else {
+    return ip
   }
-
-  return ip
 }

package/tsconfig.build.json

@@ -0,0 +1,8 @@
+{
+  "extends": ["../../../tsconfig/node.json"],
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src"
+  },
+  "include": ["src"]
+}

package/tsconfig.json

@@ -1,8 +1,4 @@
 {
-  "extends": "../../tsconfig/node.json",
-  "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "src"
-  },
-  "include": ["src"]
+  "include": [],
+  "references": [{ "path": "./tsconfig.build.json" }]
 }