@helia/verified-fetch 4.1.1 → 5.0.0

package/dist/src/utils/get-e-tag.js

@@ -1,30 +1,16 @@
-const getPrefix = ({ weak, reqFormat }) => {
-    if (reqFormat === 'tar' || reqFormat === 'car' || reqFormat === 'ipns-record' || weak === true) {
-        return 'W/';
-    }
-    return '';
-};
-const getFormatSuffix = ({ reqFormat }) => {
-    if (reqFormat == null) {
-        return '';
-    }
-    if (reqFormat === 'tar') {
-        return '.x-tar';
-    }
-    return `.${reqFormat}`;
-};
 /**
- * etag
- * you need to wrap cid  with ""
- * we use strong Etags for immutable responses and weak one (prefixed with W/ ) for mutable/generated ones (ipns, car, tar, and generated HTML).
- * block and car responses should have different etag than deserialized one, so you can add some prefix like we do in existing gateway
+ * We use strong Etags for immutable responses and weak ones (prefixed with W/ )
+ * for mutable/generated ones (ipns, car, tar, and generated HTML).
+ *
+ * Block and car responses should have different etags to deserialized ones, so
+ * you can add a prefix like we do in the existing gateway.
  *
  * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag
  * @see https://specs.ipfs.tech/http-gateways/path-gateway/#etag-response-header
  */
-export function getETag({ cid, reqFormat, weak, rangeStart, rangeEnd, contentPrefix }) {
-    const prefix = getPrefix({ weak, reqFormat });
-    let suffix = getFormatSuffix({ reqFormat });
+export function getETag({ cid, contentType, rangeStart, rangeEnd, contentPrefix }) {
+    const prefix = contentType.immutable ? '' : 'W/';
+    let suffix = contentType.etag;
     if (rangeStart != null || rangeEnd != null) {
         suffix += `.${rangeStart ?? '0'}-${rangeEnd ?? 'N'}`;
     }

package/dist/src/utils/get-e-tag.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-e-tag.js","sourceRoot":"","sources":["../../../src/utils/get-e-tag.ts"],"names":[],"mappings":"AAuBA,MAAM,SAAS,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAAuB,EAAU,EAAE;IACrE,IAAI,SAAS,KAAK,KAAK,IAAI,SAAS,KAAK,KAAK,IAAI,SAAS,KAAK,aAAa,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAC/F,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CAAC,EAAE,SAAS,EAAuB,EAAU,EAAE;IACrE,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;QACtB,OAAO,EAAE,CAAA;IACX,CAAC;IACD,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;QACxB,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,OAAO,IAAI,SAAS,EAAE,CAAA;AACxB,CAAC,CAAA;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,OAAO,CAAE,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAc;IAChG,MAAM,MAAM,GAAG,SAAS,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;IAC7C,IAAI,MAAM,GAAG,eAAe,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;IAC3C,IAAI,UAAU,IAAI,IAAI,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;QAC3C,MAAM,IAAI,IAAI,UAAU,IAAI,GAAG,IAAI,QAAQ,IAAI,GAAG,EAAE,CAAA;IACtD,CAAC;IAED,OAAO,GAAG,MAAM,IAAI,aAAa,IAAI,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE,GAAG,MAAM,GAAG,CAAA;AACtE,CAAC"}
+{"version":3,"file":"get-e-tag.js","sourceRoot":"","sources":["../../../src/utils/get-e-tag.ts"],"names":[],"mappings":"AA8BA;;;;;;;;;GASG;AACH,MAAM,UAAU,OAAO,CAAE,EAAE,GAAG,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAc;IAC5F,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;IAChD,IAAI,MAAM,GAAG,WAAW,CAAC,IAAI,CAAA;IAE7B,IAAI,UAAU,IAAI,IAAI,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;QAC3C,MAAM,IAAI,IAAI,UAAU,IAAI,GAAG,IAAI,QAAQ,IAAI,GAAG,EAAE,CAAA;IACtD,CAAC;IAED,OAAO,GAAG,MAAM,IAAI,aAAa,IAAI,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE,GAAG,MAAM,GAAG,CAAA;AACtE,CAAC"}

package/dist/src/utils/get-offset-and-length.d.ts

@@ -1,5 +1,15 @@
-import type { UnixFSEntry } from 'ipfs-unixfs-exporter';
-export declare function getOffsetAndLength(entry: UnixFSEntry, entityBytes?: string): {
+/**
+ * N.b. Range start (zero indexed, inclusive) and end (inclusive) - this is
+ * different to `Uint8Array.subarray` which is end exclusive.
+ */
+export declare function rangeToOffsetAndLength(size: bigint | number, start?: number | bigint, end?: number | bigint): {
+    offset: number;
+    length: number;
+};
+/**
+ * Translate `from:to` zero-indexed inclusive bytes to offset/length
+ */
+export declare function entityBytesToOffsetAndLength(size: number | bigint, entityBytes?: string | null): {
     offset: number;
     length: number;
 };

package/dist/src/utils/get-offset-and-length.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-offset-and-length.d.ts","sourceRoot":"","sources":["../../../src/utils/get-offset-and-length.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAEvD,wBAAgB,kBAAkB,CAAE,KAAK,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAmDhH"}
+{"version":3,"file":"get-offset-and-length.d.ts","sourceRoot":"","sources":["../../../src/utils/get-offset-and-length.ts"],"names":[],"mappings":"AAcA;;;GAGG;AACH,wBAAgB,sBAAsB,CAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAsCjJ;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAOpI"}

package/dist/src/utils/get-offset-and-length.js

@@ -1,19 +1,61 @@
-export function getOffsetAndLength(entry, entityBytes) {
-    if (entityBytes == null) {
-        return {
-            offset: 0,
-            length: Infinity
-        };
+import { InvalidRangeError } from "../errors.js";
+function downCast({ offset, length }) {
+    return {
+        offset: Number(offset),
+        length: Number(length)
+    };
+}
+/**
+ * N.b. Range start (zero indexed, inclusive) and end (inclusive) - this is
+ * different to `Uint8Array.subarray` which is end exclusive.
+ */
+export function rangeToOffsetAndLength(size, start, end) {
+    size = BigInt(size);
+    if (start != null) {
+        start = BigInt(start);
+        if (start < 0n) {
+            throw new InvalidRangeError('Range start cannot be negative');
+        }
+        if (start >= size) {
+            throw new InvalidRangeError('Range start cannot be larger than total bytes');
+        }
     }
-    const parts = entityBytes.split(':');
-    const start = parseInt(parts[0], 10);
-    const end = parts[1] === '*' ? Infinity : parseInt(parts[1], 10);
-    if (isNaN(start) || isNaN(end)) {
-        throw new Error('Could not parse entity-bytes');
+    if (end != null) {
+        end = BigInt(end);
+        const abs = end > 0n ? end : -end;
+        if (abs >= size) {
+            throw new InvalidRangeError('Range end cannot be larger than total bytes');
+        }
+        if (end < 0n) {
+            if (start == null) {
+                start = size + end;
+                end = size - 1n;
+            }
+            else {
+                throw new InvalidRangeError('Range end cannot be negative');
+            }
+        }
+        // make inclusive end exclusive
+        end += 1n;
     }
-    const entrySize = Number(entry.size);
-    if (start >= 0) {
-        if (end >= 0) {
+    return downCast(toOffsetAndLength(size, start, end));
+}
+/**
+ * Translate `from:to` zero-indexed inclusive bytes to offset/length
+ */
+export function entityBytesToOffsetAndLength(size, entityBytes) {
+    size = BigInt(size);
+    const parts = (entityBytes ?? '0:*').split(':');
+    const start = BigInt(parts[0]);
+    const end = parts[1] === '*' ? size : BigInt(parts[1]);
+    return downCast(toOffsetAndLength(size, start, end));
+}
+/**
+ * Translate `from:to` zero-indexed inclusive bytes to offset/length
+ */
+function toOffsetAndLength(size, start = 0n, end = size) {
+    if (start >= 0n) {
+        if (end >= 0n) {
             return {
                 offset: start,
                 length: end - start
@@ -22,25 +64,25 @@ export function getOffsetAndLength(entry, entityBytes) {
         else {
             return {
                 offset: start,
-                length: (entrySize - start) + end
+                length: (size - start) + end
             };
         }
     }
     // start < 0
-    let offset = entrySize + start;
-    if (Math.abs(start) > entrySize) {
-        offset = 0;
+    let offset = size + start;
+    if (Math.abs(Number(start)) > Number(size)) {
+        offset = 0n;
     }
-    if (end >= 0) {
+    if (end >= 0n) {
         return {
             offset,
-            length: (entrySize - offset) + end
+            length: end - offset
         };
     }
     // end < 0
     return {
         offset,
-        length: (entrySize - offset) + end
+        length: (size - offset) + end
     };
 }
 //# sourceMappingURL=get-offset-and-length.js.map

package/dist/src/utils/get-offset-and-length.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-offset-and-length.js","sourceRoot":"","sources":["../../../src/utils/get-offset-and-length.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,kBAAkB,CAAE,KAAkB,EAAE,WAAoB;IAC1E,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO;YACL,MAAM,EAAE,CAAC;YACT,MAAM,EAAE,QAAQ;SACjB,CAAA;IACH,CAAC;IAED,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IACpC,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAEhE,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;IACjD,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAEpC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QACf,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC;YACb,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE,GAAG,GAAG,KAAK;aACpB,CAAA;QACH,CAAC;aAAM,CAAC;YACN,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE,CAAC,SAAS,GAAG,KAAK,CAAC,GAAG,GAAG;aAClC,CAAA;QACH,CAAC;IACH,CAAC;IAED,YAAY;IACZ,IAAI,MAAM,GAAG,SAAS,GAAG,KAAK,CAAA;IAE9B,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,SAAS,EAAE,CAAC;QAChC,MAAM,GAAG,CAAC,CAAA;IACZ,CAAC;IAED,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC;QACb,OAAO;YACL,MAAM;YACN,MAAM,EAAE,CAAC,SAAS,GAAG,MAAM,CAAC,GAAG,GAAG;SACnC,CAAA;IACH,CAAC;IAED,UAAU;IACV,OAAO;QACL,MAAM;QACN,MAAM,EAAE,CAAC,SAAS,GAAG,MAAM,CAAC,GAAG,GAAG;KACnC,CAAA;AACH,CAAC"}
+{"version":3,"file":"get-offset-and-length.js","sourceRoot":"","sources":["../../../src/utils/get-offset-and-length.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/get-range-header.d.ts

@@ -0,0 +1,22 @@
+/**
+ * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Range
+ */
+export interface Range {
+    /**
+     * Where the range starts, zero indexed
+     */
+    start?: number;
+    /**
+     * Where the range ends, inclusive
+     */
+    end?: number;
+}
+/**
+ * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Range
+ */
+export interface RangeHeader {
+    multipartBoundary: string;
+    ranges: Range[];
+}
+export declare function getRangeHeader(resource: string, headers: Headers): RangeHeader | undefined | Response;
+//# sourceMappingURL=get-range-header.d.ts.map

package/dist/src/utils/get-range-header.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-range-header.d.ts","sourceRoot":"","sources":["../../../src/utils/get-range-header.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,WAAW,KAAK;IACpB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,iBAAiB,EAAE,MAAM,CAAA;IACzB,MAAM,EAAE,KAAK,EAAE,CAAA;CAChB;AAwDD,wBAAgB,cAAc,CAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,GAAG,QAAQ,CA0BtG"}

package/dist/src/utils/get-range-header.js

@@ -0,0 +1,69 @@
+import { InvalidRangeError } from "../errors.js";
+import { badRequestResponse, notSatisfiableResponse } from "./responses.js";
+function parseValue(val) {
+    if (val == null || val === '') {
+        return;
+    }
+    const num = Number(val);
+    if (isNaN(num)) {
+        throw new InvalidRangeError(`Invalid range specification: could not parse "${num}" as number`);
+    }
+    return num;
+}
+function getByteRangeFromHeader(rangeHeader) {
+    if (rangeHeader == null || rangeHeader === '') {
+        return [];
+    }
+    /**
+     * Range: bytes=<start>-<end> | bytes=<start2>- | bytes=-<end2> | bytes=<start1>-<end1>,<start2>-<end2>,...
+     */
+    if (!rangeHeader.startsWith('bytes=')) {
+        throw new InvalidRangeError('Invalid range request');
+    }
+    const rangesStr = rangeHeader.substring(6); // Remove "bytes=" prefix
+    const rangeParts = rangesStr.split(',').map(part => part.trim());
+    const ranges = [];
+    for (const part of rangeParts) {
+        const match = part.match(/^(?<start>\d+)?-(?<end>\d+)?$/);
+        if (match?.groups == null) {
+            throw new InvalidRangeError(`Invalid range specification: ${part}`);
+        }
+        if (part.startsWith('-')) {
+            ranges.push({
+                end: parseValue(part)
+            });
+        }
+        else {
+            const { start, end } = match.groups;
+            ranges.push({
+                start: parseValue(start),
+                end: parseValue(end)
+            });
+        }
+    }
+    return ranges;
+}
+export function getRangeHeader(resource, headers) {
+    const header = headers.get('range');
+    // not a range request
+    if (header == null) {
+        return;
+    }
+    try {
+        const ranges = getByteRangeFromHeader(header);
+        if (ranges.length === 0) {
+            return;
+        }
+        return {
+            multipartBoundary: `multipart_byteranges_${Math.floor(Math.random() * 1_000_000_000)}`,
+            ranges
+        };
+    }
+    catch (e) {
+        if (e.name === 'InvalidRangeError') {
+            return notSatisfiableResponse(resource);
+        }
+        return badRequestResponse(resource, e);
+    }
+}
+//# sourceMappingURL=get-range-header.js.map

package/dist/src/utils/get-range-header.js.map

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

package/dist/src/utils/parse-url-string.d.ts

@@ -1,3 +1,4 @@
+export declare const SUBDOMAIN_GATEWAY_REGEX: RegExp;
 export interface ParsedURL {
     url: URL;
     protocol: 'ipfs' | 'ipns';
@@ -18,5 +19,5 @@ export interface ParsedURL {
  * - http://example.com/ipfs/cid/path
  * - http://example.com/ipns/name/path
  */
-export declare function parseURLString(urlString: string): ParsedURL;
+export declare function parseURLString(urlString: string): URL;
 //# sourceMappingURL=parse-url-string.d.ts.map

package/dist/src/utils/parse-url-string.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-url-string.d.ts","sourceRoot":"","sources":["../../../src/utils/parse-url-string.ts"],"names":[],"mappings":"AA2BA,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,QAAQ,EAAE,MAAM,CAAA;CACjB;AAqED;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAAE,SAAS,EAAE,MAAM,GAAG,SAAS,CA8E5D"}
+{"version":3,"file":"parse-url-string.d.ts","sourceRoot":"","sources":["../../../src/utils/parse-url-string.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,uBAAuB,QAAsE,CAAA;AAmB1G,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,QAAQ,EAAE,MAAM,CAAA;CACjB;AA4FD;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAAE,SAAS,EAAE,MAAM,GAAG,GAAG,CAuBtD"}

package/dist/src/utils/parse-url-string.js

@@ -1,7 +1,10 @@
 import { InvalidParametersError } from '@libp2p/interface';
+import { peerIdFromCID, peerIdFromString } from '@libp2p/peer-id';
+import { CID } from 'multiformats/cid';
 import { decodeDNSLinkLabel, isInlinedDnsLink } from "./dnslink-label.js";
 import { ipfsPathToUrl, ipfsUrlToUrl } from "./ipfs-path-to-url.js";
-const SUBDOMAIN_GATEWAY_REGEX = /^(?<cidOrPeerIdOrDnsLink>[^/?]+)\.(?<protocol>ip[fn]s)\.([^/?]+)$/;
+export const SUBDOMAIN_GATEWAY_REGEX = /^(?<cidOrPeerIdOrDnsLink>[^/?]+)\.(?<protocol>ip[fn]s)\.([^/?]+)$/;
+const CODEC_LIBP2P_KEY = 0x72;
 function matchSubdomainGroupsGuard(groups) {
     const protocol = groups?.protocol;
     if (protocol !== 'ipfs' && protocol !== 'ipns') {
@@ -13,31 +16,6 @@ function matchSubdomainGroupsGuard(groups) {
     }
     return true;
 }
-function toQuery(query) {
-    if (query == null) {
-        return {};
-    }
-    const output = {};
-    for (const [key, value] of query.entries()) {
-        output[key] = value;
-        if (value === 'true') {
-            output[key] = true;
-        }
-        if (value === 'false') {
-            output[key] = false;
-        }
-    }
-    return output;
-}
-function stripLeadingHash(pathname) {
-    return stripLeading(pathname, '#');
-}
-function stripLeading(str, char) {
-    while (str.startsWith(char)) {
-        str = str.substring(1);
-    }
-    return str;
-}
 /**
  * If the caller has passed a case-sensitive identifier (like a base58btc
  * encoded CID or PeerId) in a case-insensitive location (like a subdomain),
@@ -50,7 +28,10 @@ function findOriginalCidOrPeer(needle, haystack) {
     }
     return haystack.substring(start, start + needle.length);
 }
-function toUrl(urlString) {
+function stringToUrl(urlString) {
+    if (urlString instanceof URL) {
+        return urlString;
+    }
     // turn IPFS/IPNS path into gateway URL string
     if (urlString.startsWith('/ipfs/') || urlString.startsWith('/ipns/')) {
         urlString = ipfsPathToUrl(urlString);
@@ -64,21 +45,9 @@ function toUrl(urlString) {
     }
     throw new InvalidParametersError(`Invalid URL: ${urlString}`);
 }
-/**
- * Accepts the following url strings:
- *
- * - /ipfs/Qmfoo/path
- * - /ipns/Qmfoo/path
- * - ipfs://cid/path
- * - ipns://name/path
- * - http://cid.ipfs.example.com/path
- * - http://name.ipns.example.com/path
- * - http://example.com/ipfs/cid/path
- * - http://example.com/ipns/name/path
- */
-export function parseURLString(urlString) {
+function toURL(urlString) {
     // validate url
-    const url = toUrl(urlString);
+    const url = stringToUrl(urlString);
     // test for subdomain gateway URL
     const subdomainMatch = url.hostname.match(SUBDOMAIN_GATEWAY_REGEX);
     if (matchSubdomainGroupsGuard(subdomainMatch?.groups)) {
@@ -93,16 +62,7 @@ export function parseURLString(urlString) {
         // present in the string URL and we need to be able to round-trip the user's
         // input while also maintaining a sane canonical URL for the resource. Phew.
         const wat = new URL(`not-${urlString}`);
-        return {
-            url: new URL(`${groups.protocol}://${cidOrPeerIdOrDnsLink}${wat.pathname}${url.search}${url.hash}`),
-            protocol: groups.protocol,
-            cidOrPeerIdOrDnsLink,
-            path: url.pathname.split('/')
-                .filter(str => str !== '')
-                .map(str => decodeURIComponent(str)),
-            query: toQuery(url.searchParams),
-            fragment: stripLeadingHash(url.hash)
-        };
+        return new URL(`${groups.protocol}://${cidOrPeerIdOrDnsLink}${wat.pathname}${url.search}${url.hash}`);
     }
     // test for IPFS path gateway URL
     if (url.pathname.startsWith('/ipfs/')) {
@@ -111,16 +71,7 @@ export function parseURLString(urlString) {
         if (cid == null) {
             throw new InvalidParametersError(`Path gateway URL ${urlString} had no CID`);
         }
-        return {
-            url: new URL(`ipfs://${cid}${url.pathname.replace(`/ipfs/${cid}`, '')}${url.search}${url.hash}`),
-            protocol: 'ipfs',
-            cidOrPeerIdOrDnsLink: cid,
-            path: parts
-                .filter(str => str !== '')
-                .map(str => decodeURIComponent(str)),
-            query: toQuery(url.searchParams),
-            fragment: stripLeadingHash(url.hash)
-        };
+        return new URL(`ipfs://${cid}${url.pathname.replace(`/ipfs/${cid}`, '')}${url.search}${url.hash}`);
     }
     // test for IPNS path gateway URL
     if (url.pathname.startsWith('/ipns/')) {
@@ -129,17 +80,41 @@ export function parseURLString(urlString) {
         if (name == null) {
             throw new InvalidParametersError(`Path gateway URL ${urlString} had no name`);
         }
-        return {
-            url: new URL(`ipns://${name}${url.pathname.replace(`/ipns/${name}`, '')}${url.search}${url.hash}`),
-            protocol: 'ipns',
-            cidOrPeerIdOrDnsLink: name,
-            path: parts
-                .filter(str => str !== '')
-                .map(str => decodeURIComponent(str)),
-            query: toQuery(url.searchParams),
-            fragment: stripLeadingHash(url.hash)
-        };
+        return new URL(`ipns://${name}${url.pathname.replace(`/ipns/${name}`, '')}${url.search}${url.hash}`);
     }
     throw new TypeError(`Invalid URL: ${urlString}, please use ipfs://, ipns://, or gateway URLs only`);
 }
+/**
+ * Accepts the following url strings:
+ *
+ * - /ipfs/Qmfoo/path
+ * - /ipns/Qmfoo/path
+ * - ipfs://cid/path
+ * - ipns://name/path
+ * - http://cid.ipfs.example.com/path
+ * - http://name.ipns.example.com/path
+ * - http://example.com/ipfs/cid/path
+ * - http://example.com/ipns/name/path
+ */
+export function parseURLString(urlString) {
+    // validate url
+    const url = toURL(urlString);
+    // treat IPNS keys that do not parse as PeerIds as DNSLink
+    if (url.protocol === 'ipns:') {
+        try {
+            peerIdFromString(url.hostname);
+        }
+        catch {
+            url.protocol = 'dnslink:';
+        }
+    }
+    if (url.protocol === 'ipfs:') {
+        const cid = CID.parse(url.hostname);
+        // special case - peer id encoded as a CID
+        if (cid.code === CODEC_LIBP2P_KEY) {
+            return new URL(`ipns://${peerIdFromCID(cid)}${url.pathname}${url.search}${url.hash}`);
+        }
+    }
+    return url;
+}
 //# sourceMappingURL=parse-url-string.js.map

package/dist/src/utils/parse-url-string.js.map

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

package/dist/src/utils/resource-to-cache-key.d.ts

@@ -6,9 +6,9 @@ import { CID } from 'multiformats/cid';
  * E.g.
  *
  * - Qmfoo -> /ipfs/Qmfoo
- * - https://Qmfoo.ipfs.gateway.org -> /ipfs/Qmfoo
- * - https://gateway.org/ipfs/Qmfoo -> /ipfs/Qmfoo
- * - https://gateway.org/ipfs/Qmfoo/bar.txt -> /ipfs/Qmfoo
+ * - https://Qmfoo.ipfs.gateway.org -> ipfs://Qmfoo
+ * - https://gateway.org/ipfs/Qmfoo -> ipfs://Qmfoo
+ * - https://gateway.org/ipfs/Qmfoo/bar.txt -> ipfs://Qmfoo
  * - etc
  */
 export declare function resourceToSessionCacheKey(url: string | CID): string;

package/dist/src/utils/resource-to-cache-key.js

@@ -7,9 +7,9 @@ import { parseURLString } from './parse-url-string.js';
  * E.g.
  *
  * - Qmfoo -> /ipfs/Qmfoo
- * - https://Qmfoo.ipfs.gateway.org -> /ipfs/Qmfoo
- * - https://gateway.org/ipfs/Qmfoo -> /ipfs/Qmfoo
- * - https://gateway.org/ipfs/Qmfoo/bar.txt -> /ipfs/Qmfoo
+ * - https://Qmfoo.ipfs.gateway.org -> ipfs://Qmfoo
+ * - https://gateway.org/ipfs/Qmfoo -> ipfs://Qmfoo
+ * - https://gateway.org/ipfs/Qmfoo/bar.txt -> ipfs://Qmfoo
  * - etc
  */
 export function resourceToSessionCacheKey(url) {
@@ -21,7 +21,7 @@ export function resourceToSessionCacheKey(url) {
         return `ipfs://${CID.parse(url.toString())}`;
     }
     catch { }
-    const { protocol, cidOrPeerIdOrDnsLink } = parseURLString(url.toString());
-    return `${protocol}://${cidOrPeerIdOrDnsLink}`;
+    const { protocol, host } = parseURLString(url.toString());
+    return `${protocol}//${host}`;
 }
 //# sourceMappingURL=resource-to-cache-key.js.map

package/dist/src/utils/resource-to-cache-key.js.map

@@ -1 +1 @@
-{"version":3,"file":"resource-to-cache-key.js","sourceRoot":"","sources":["../../../src/utils/resource-to-cache-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,yBAAyB,CAAE,GAAiB;IAC1D,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAE1B,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAChB,OAAO,UAAU,GAAG,EAAE,CAAA;IACxB,CAAC;IAED,IAAI,CAAC;QACH,OAAO,UAAU,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAA;IAC9C,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;IAEzE,OAAO,GAAG,QAAQ,MAAM,oBAAoB,EAAE,CAAA;AAChD,CAAC"}
+{"version":3,"file":"resource-to-cache-key.js","sourceRoot":"","sources":["../../../src/utils/resource-to-cache-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,yBAAyB,CAAE,GAAiB;IAC1D,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAE1B,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAChB,OAAO,UAAU,GAAG,EAAE,CAAA;IACxB,CAAC;IAED,IAAI,CAAC;QACH,OAAO,UAAU,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAA;IAC9C,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;IAEzD,OAAO,GAAG,QAAQ,KAAK,IAAI,EAAE,CAAA;AAC/B,CAAC"}

package/dist/src/utils/response-headers.d.ts

@@ -1,4 +1,3 @@
-import type { CID } from 'multiformats/cid';
 interface CacheControlHeaderOptions {
     /**
      * This should be seconds as a number.
@@ -18,22 +17,13 @@ interface CacheControlHeaderOptions {
  */
 export declare function setCacheControlHeader({ ttl, protocol, response }: CacheControlHeaderOptions): void;
 /**
- * This function returns the value of the `Content-Range` header for a given range.
+ * This function returns the value of the `Content-Range` header for a given
+ * range.
+ *
  * If you know the total size of the body, pass it as `byteSize`
  *
  * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Range
  */
-export declare function getContentRangeHeader({ byteStart, byteEnd, byteSize }: {
-    byteStart: number | undefined;
-    byteEnd: number | undefined;
-    byteSize: number | undefined;
-}): string;
-/**
- * Sets the `X-Ipfs-Roots` header on the response if it exists.
- *
- * @see https://specs.ipfs.tech/http-gateways/path-gateway/#x-ipfs-roots-response-header
- */
-export declare function setIpfsRoots(response: Response, ipfsRoots?: CID[]): void;
-export declare function getIpfsRoots(ipfsRoots: CID[]): string;
+export declare function getContentRangeHeader(byteSize: number | bigint | string, byteStart?: number | bigint | string, byteEnd?: number | bigint | string): string;
 export {};
 //# sourceMappingURL=response-headers.d.ts.map

package/dist/src/utils/response-headers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"response-headers.d.ts","sourceRoot":"","sources":["../../../src/utils/response-headers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAE3C,UAAU,yBAAyB;IACjC;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,yBAAyB,GAAG,IAAI,CAoBnG;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAE,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;IAAE,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAAG,MAAM,CAmC7K;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAIzE;AAED,wBAAgB,YAAY,CAAE,SAAS,EAAE,GAAG,EAAE,GAAG,MAAM,CAEtD"}
+{"version":3,"file":"response-headers.d.ts","sourceRoot":"","sources":["../../../src/utils/response-headers.ts"],"names":[],"mappings":"AAEA,UAAU,yBAAyB;IACjC;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,yBAAyB,GAAG,IAAI,CAsBnG;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CA8C3J"}