From 826b5ae1f233f81bc04ea9f0e26ddbbcb9b45e1f Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Wed, 10 Sep 2025 15:21:49 +0100 Subject: [PATCH 1/4] feat: support dag-json and dag-cbor preview rendering --- package-lock.json | 54 +++--- package.json | 6 +- src/bindings.d.ts | 2 +- src/handlers/block.js | 127 +++++++++++++- src/handlers/templates/block.handlebars | 164 ++++++++++++++++++ .../templates/unixfs-dir-entries.handlebars | 2 +- .../templates/unixfs-dir-header.handlebars | 16 +- src/handlers/unixfs-dir.js | 22 +-- src/handlers/unixfs.js | 19 +- src/util/handlebars.js | 20 +++ src/util/streams.js | 12 ++ 11 files changed, 387 insertions(+), 57 deletions(-) create mode 100644 src/handlers/templates/block.handlebars create mode 100644 src/util/handlebars.js diff --git a/package-lock.json b/package-lock.json index 840cec9..2ffae8e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,11 @@ "version": "5.1.3", "license": "Apache-2.0 OR MIT", "dependencies": { + "@gct256/hexdump": "^0.1.2", "@httpland/range-parser": "^1.2.0", "@ipld/car": "^5.2.6", + "@ipld/dag-cbor": "^9.2.5", + "@ipld/dag-json": "^10.2.5", "@web3-storage/handlebars": "^1.0.0", "bytes": "^3.1.2", "chardet": "^2.0.0", @@ -23,13 +26,12 @@ "uint8arrays": "^5.0.1" }, "devDependencies": { - "@ipld/dag-cbor": "^9.0.8", "@ipld/dag-pb": "^4.0.8", "@types/bytes": "^3.1.4", "ipfs-unixfs": "^11.1.2", "ipfs-unixfs-exporter": "^13.3.0", "standard": "^17.1.0", - "typescript": "^5.3.3" + "typescript": "^5.9.2" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -99,11 +101,6 @@ "resolved": "https://registry.npmjs.org/it-first/-/it-first-3.0.6.tgz", "integrity": "sha512-ExIewyK9kXKNAplg2GMeWfgjUcfC1FnUXz/RPfAvIXby+w7U4b3//5Lic0NV03gXT8O/isj5Nmp6KiY0d45pIQ==" }, - "node_modules/@achingbrain/nat-port-mapper/node_modules/multiformats": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.1.0.tgz", - "integrity": "sha512-HzdtdBwxsIkzpeXzhQ5mAhhuxcHbjEHH+JQoxt7hG/2HGFjjwyolLo7hbaexcnhoEuV4e0TNJ8kkpMjiEYY4VQ==" - }, "node_modules/@achingbrain/nat-port-mapper/node_modules/uint8-varint": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/uint8-varint/-/uint8-varint-2.0.4.tgz", @@ -360,6 +357,12 @@ "node": ">=14" } }, + "node_modules/@gct256/hexdump": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@gct256/hexdump/-/hexdump-0.1.2.tgz", + "integrity": "sha512-2ffonPjag1lg7h5rggdNTmfOfRs5fRYw1WIKqR4KmaRVk4L6O7WSInOLC2k2VnHGpq00JXGB6BtZkztxL9YyDg==", + "license": "MIT" + }, "node_modules/@handlebars/parser": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@handlebars/parser/-/parser-1.1.0.tgz", @@ -423,12 +426,13 @@ } }, "node_modules/@ipld/dag-cbor": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@ipld/dag-cbor/-/dag-cbor-9.0.8.tgz", - "integrity": "sha512-ETWJ7p7lmGw5X+BuI/7rf4/k56xyOvAOVNUVuQmnGYBdJjObLPgS+vyFxRk4odATlkyZqCq2MLNY52bhE6SlRA==", + "version": "9.2.5", + "resolved": "https://registry.npmjs.org/@ipld/dag-cbor/-/dag-cbor-9.2.5.tgz", + "integrity": "sha512-84wSr4jv30biui7endhobYhXBQzQE4c/wdoWlFrKcfiwH+ofaPg8fwsM8okX9cOzkkrsAsNdDyH3ou+kiLquwQ==", + "license": "Apache-2.0 OR MIT", "dependencies": { "cborg": "^4.0.0", - "multiformats": "^13.0.0" + "multiformats": "^13.1.0" }, "engines": { "node": ">=16.0.0", @@ -436,12 +440,13 @@ } }, "node_modules/@ipld/dag-json": { - "version": "10.1.7", - "resolved": "https://registry.npmjs.org/@ipld/dag-json/-/dag-json-10.1.7.tgz", - "integrity": "sha512-ipraTPMA40sZAtUYwFvjHeQjReDJXWI8V3lrOeyedKxMb9rOOCS0B7eodRoWM3RIS2qMqtnu1oZr8kP+QJEN0Q==", + "version": "10.2.5", + "resolved": "https://registry.npmjs.org/@ipld/dag-json/-/dag-json-10.2.5.tgz", + "integrity": "sha512-Q4Fr3IBDEN8gkpgNefynJ4U/ZO5Kwr7WSUMBDbZx0c37t0+IwQCTM9yJh8l5L4SRFjm31MuHwniZ/kM+P7GQ3Q==", + "license": "Apache-2.0 OR MIT", "dependencies": { "cborg": "^4.0.0", - "multiformats": "^13.0.0" + "multiformats": "^13.1.0" }, "engines": { "node": ">=16.0.0", @@ -1331,11 +1336,6 @@ "npm": ">=7.0.0" } }, - "node_modules/@libp2p/interface/node_modules/multiformats": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.1.0.tgz", - "integrity": "sha512-HzdtdBwxsIkzpeXzhQ5mAhhuxcHbjEHH+JQoxt7hG/2HGFjjwyolLo7hbaexcnhoEuV4e0TNJ8kkpMjiEYY4VQ==" - }, "node_modules/@libp2p/interface/node_modules/uint8-varint": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/uint8-varint/-/uint8-varint-2.0.4.tgz", @@ -6040,9 +6040,10 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/multiformats": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.0.1.tgz", - "integrity": "sha512-bt3R5iXe2O8xpp3wkmQhC73b/lC4S2ihU8Dndwcsysqbydqb8N+bpP116qMcClZ17g58iSIwtXUTcg2zT4sniA==" + "version": "13.4.0", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.4.0.tgz", + "integrity": "sha512-Mkb/QcclrJxKC+vrcIFl297h52QcKh2Az/9A5vbWytbQt4225UWWWmIuSsKksdww9NkIeYcA7DkfftyLuC/JSg==", + "license": "Apache-2.0 OR MIT" }, "node_modules/multipart-byte-range": { "version": "2.0.1", @@ -7407,10 +7408,11 @@ } }, "node_modules/typescript": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", - "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", + "version": "5.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", + "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/package.json b/package.json index 003ad74..6f89fe1 100644 --- a/package.json +++ b/package.json @@ -65,8 +65,11 @@ "author": "Alan Shaw", "license": "Apache-2.0 OR MIT", "dependencies": { + "@gct256/hexdump": "^0.1.2", "@httpland/range-parser": "^1.2.0", "@ipld/car": "^5.2.6", + "@ipld/dag-cbor": "^9.2.5", + "@ipld/dag-json": "^10.2.5", "@web3-storage/handlebars": "^1.0.0", "bytes": "^3.1.2", "chardet": "^2.0.0", @@ -79,13 +82,12 @@ "uint8arrays": "^5.0.1" }, "devDependencies": { - "@ipld/dag-cbor": "^9.0.8", "@ipld/dag-pb": "^4.0.8", "@types/bytes": "^3.1.4", "ipfs-unixfs": "^11.1.2", "ipfs-unixfs-exporter": "^13.3.0", "standard": "^17.1.0", - "typescript": "^5.3.3" + "typescript": "^5.9.2" }, "publishConfig": { "access": "public" diff --git a/src/bindings.d.ts b/src/bindings.d.ts index 3ac3f24..d1f68a3 100644 --- a/src/bindings.d.ts +++ b/src/bindings.d.ts @@ -3,7 +3,7 @@ import type { UnixFSEntry } from 'ipfs-unixfs-exporter' import type { BlockService, DagService, UnixfsService } from 'dagula' import type { TimeoutController } from 'timeout-abort-controller' -export {} +export { TimeoutController } export interface Environment { DEBUG?: string diff --git a/src/handlers/block.js b/src/handlers/block.js index db88108..9acc8d7 100644 --- a/src/handlers/block.js +++ b/src/handlers/block.js @@ -1,10 +1,22 @@ /* eslint-env browser */ +/** + * @import { Block } from 'dagula' + * @import { BlockDecoder } from 'multiformats' + * @import { IpfsUrlContext, BlockContext, UnixfsContext, TimeoutController } from '../bindings.js' + */ +import * as dagJSON from '@ipld/dag-json' +import * as dagCBOR from '@ipld/dag-cbor' +import './templates/bundle.cjs' import { MultipartByteRange } from 'multipart-byte-range' +import { hexdump } from '@gct256/hexdump' +import { CID } from 'multiformats/cid' import { decodeRangeHeader, resolveRange } from '../util/range.js' import { HttpError } from '../util/errors.js' +import { Handlebars, getTemplate, registerHelper } from '../util/handlebars.js' /** - * @typedef {import('../bindings.js').IpfsUrlContext & import('../bindings.js').BlockContext & import('../bindings.js').UnixfsContext & { timeoutController?: import('../bindings.js').TimeoutControllerContext['timeoutController'] }} BlockHandlerContext + * @typedef {IpfsUrlContext & BlockContext & UnixfsContext & { timeoutController?: TimeoutController }} BlockHandlerContext + * @typedef {IpfsUrlContext & { gatewayDomain?: string, block: Block }} BlockHtmlHandlerContext */ /** @type {import('../bindings.js').Handler} */ @@ -125,3 +137,116 @@ const handleMultipartRange = async (blocks, cid, ranges, options) => { }) return new Response(source, { status: 206, headers: { ...options?.headers, ...source.headers } }) } + +/** @type {Record>} */ +const codecs = { + [dagCBOR.code]: dagCBOR, + [dagJSON.code]: dagJSON +} + +/** @type {Record} */ +const codecNames = { + [dagCBOR.code]: 'dag-cbor', + [dagJSON.code]: 'dag-json' +} + +/** @param {unknown} obj */ +const isIpldScalar = obj => { + switch (typeof obj) { + case 'string': + return true + case 'boolean': + return true + case 'number': + return true + case 'object': { + if (obj == null) { + return true + } + if (obj instanceof Uint8Array) { // IPLD bytes + return true + } + if (obj instanceof CID) { + return true + } + break + } + } + return false +} +registerHelper('isIpldScalar', isIpldScalar) + +/** @param {unknown} obj */ +const isIpldList = obj => Array.isArray(obj) +registerHelper('isIpldList', isIpldList) + +/** @param {unknown} obj */ +const isIpldLink = obj => obj instanceof CID +registerHelper('isIpldLink', isIpldLink) + +/** @param {unknown} obj */ +const isIpldMap = obj => { + return obj != null && typeof obj == 'object' && !isIpldScalar(obj) && !isIpldList(obj) +} +registerHelper('isIpldMap', isIpldMap) + +/** @param {unknown} obj */ +const isIpldBytes = obj => obj instanceof Uint8Array +registerHelper('isIpldBytes', isIpldBytes) + +registerHelper('formatIpldScalar', (/** @type {unknown} */ obj) => { + switch (typeof obj) { + case 'string': + return obj + case 'boolean': + return obj ? 'true' : 'false' + case 'number': + return obj.toString() + case 'object': { + if (obj == null) { + return 'NULL' + } + if (obj instanceof Uint8Array) { + return hexdump(obj).join('\n') + } + break + } + } + return 'UNKNOWN' +}) + +/** @type {import('../bindings.js').Handler} */ +export async function handleBlockHtml (request, env, ctx) { + const { dataCid, path, block } = ctx + if (!dataCid) throw new Error('missing data CID') + if (path == null) throw new Error('missing URL pathname') + if (!block) throw new Error('missing block') + + const codec = codecs[block.cid.code] + if (!codec) { + throw new HttpError('unsupported entry type', { status: 501 }) + } + + const headers = { + 'Content-Type': 'text/html' + } + + if (request.method === 'HEAD') { + return new Response(null, { headers }) + } + if (request.method !== 'GET') { + throw new HttpError('method not allowed', { status: 405 }) + } + + const isSubdomain = new URL(request.url).hostname.includes('.ipfs.') + const html = getTemplate('block')({ + gatewayDomain: ctx.gatewayDomain || 'storacha.link', + path: isSubdomain ? ctx.path : `${ctx.dataCid}/${ctx.path}`, + cid: block.cid, + codecName: codecNames[block.cid.code] ?? 'UNKNOWN', + codecHex: `0x${block.cid.code.toString(16)}`, + value: codec.decode(block.bytes) + }) + + return new Response(html) +} diff --git a/src/handlers/templates/block.handlebars b/src/handlers/templates/block.handlebars new file mode 100644 index 0000000..9a191b6 --- /dev/null +++ b/src/handlers/templates/block.handlebars @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + +{{path}} + + + + +
+ +
+
About IPFS
+
Install IPFS
+
About
+
Install
+
+ + + +
+
+
+
+
+
+
+ CID: {{cid}} +
+
+ Codec: {{codecName}} ({{codecHex}}) +
+
+
+
+ + + + + + + + +
+

You can download this block as:

+ +
+ {{codecName}} Preview +
+ {{> renderIpldValue value=value }} +
+
+ + + +{{#*inline "renderIpldValue" value}} + {{#if (isIpldScalar value)}} + {{#if (isIpldLink value)}} + + {{else}} + {{#if (isIpldBytes value)}} + 
{{formatIpldScalar value}}
+ {{else}} +
{{formatIpldScalar value}}
+ {{/if}} + {{/if}} + {{/if}} + {{#if (isIpldList value)}} +
+ {{#each value}} +
{{@index}}
+ {{> renderIpldValue value=this}} + {{/each}} +
+ {{/if}} + {{#if (isIpldMap value)}} +
+ {{#each value}} +
{{@key}}
+ {{> renderIpldValue value=this}} + {{/each}} +
+ {{/if}} +{{/inline}} + +{{!-- {{ define "value" }} + {{ $root := index . 0 }} + {{ $value := index . 1 }} + {{ if len $value.Values }} +
+ {{ range $index, $key := $value.Keys }} + {{ template "value" (args $root $key) }} + {{ template "value" (args $root (index $value.Values $index)) }} + {{ end }} +
+ {{ else }} + + {{ end }} +{{ end }} --}} \ No newline at end of file diff --git a/src/handlers/templates/unixfs-dir-entries.handlebars b/src/handlers/templates/unixfs-dir-entries.handlebars index 522543a..a17cdf0 100644 --- a/src/handlers/templates/unixfs-dir-entries.handlebars +++ b/src/handlers/templates/unixfs-dir-entries.handlebars @@ -8,7 +8,7 @@ {{#if hash}} - + {{shortHash hash}} {{/if}} diff --git a/src/handlers/templates/unixfs-dir-header.handlebars b/src/handlers/templates/unixfs-dir-header.handlebars index 5d1566b..5cb450f 100644 --- a/src/handlers/templates/unixfs-dir-header.handlebars +++ b/src/handlers/templates/unixfs-dir-header.handlebars @@ -6,27 +6,27 @@ - + - + - + {{path}} - +
-
About IPFS
-
Install IPFS
-
About
-
Install
+
About IPFS
+
Install IPFS
+
About
+
Install
diff --git a/src/handlers/unixfs-dir.js b/src/handlers/unixfs-dir.js index d486063..95fddd0 100644 --- a/src/handlers/unixfs-dir.js +++ b/src/handlers/unixfs-dir.js @@ -1,29 +1,18 @@ /* eslint-env browser */ +/** + * @import { UnixfsEntryContext, IpfsUrlContext, UnixfsContext, TimeoutController } from '../bindings.js' + */ import { fromString } from 'uint8arrays/from-string' -import Handlebars from '@web3-storage/handlebars/runtime.js' import bytes from 'bytes' import './templates/bundle.cjs' import { toReadableStream } from '../util/streams.js' +import { registerHelper, getTemplate } from '../util/handlebars.js' import { handleUnixfsFile } from './unixfs-file.js' import { HttpError } from '../util/errors.js' /** - * @typedef {import('../bindings.js').UnixfsEntryContext & import('../bindings.js').IpfsUrlContext & import('../bindings.js').UnixfsContext & { timeoutController?: import('../bindings.js').TimeoutControllerContext['timeoutController'] }} UnixfsDirectoryHandlerContext - */ - -/** - * @param {string} name - * @param {(v: any) => string} fn - */ -// @ts-ignore missing handlebars types -const registerHelper = (name, fn) => Handlebars.registerHelper(name, fn) - -/** - * @param {string} name - * @returns {(data?: any) => string} + * @typedef {UnixfsEntryContext & IpfsUrlContext & UnixfsContext & { gatewayDomain?: string, timeoutController?: TimeoutController }} UnixfsDirectoryHandlerContext */ -// @ts-ignore missing handlebars types -const getTemplate = (name) => Handlebars.templates[name] registerHelper('encodeIPFSPath', (/** @type {string} */ p) => p.split('/').map(s => encodeURIComponent(s)).join('/')) registerHelper('encodeURIComponent', encodeURIComponent) @@ -90,6 +79,7 @@ export async function handleUnixfsDir (request, env, ctx) { const parts = entry.path.split('/') yield fromString( getTemplate('unixfs-dir-header')({ + gatewayDomain: ctx.gatewayDomain ?? 'storacha.link', path: entryPath(entry.path), name: entry.name, hash: entry.cid.toString(), diff --git a/src/handlers/unixfs.js b/src/handlers/unixfs.js index d18ef87..ebf2bd8 100644 --- a/src/handlers/unixfs.js +++ b/src/handlers/unixfs.js @@ -1,10 +1,18 @@ /* eslint-env browser */ +/** + * @import { IpfsUrlContext, UnixfsContext, TimeoutController } from '../bindings.js' + */ +import * as dagJSON from '@ipld/dag-json' +import * as dagCBOR from '@ipld/dag-cbor' +import { concat } from 'uint8arrays' import { handleUnixfsDir } from './unixfs-dir.js' import { handleUnixfsFile } from './unixfs-file.js' +import { handleBlockHtml } from './block.js' import { HttpError } from '../util/errors.js' +import { collect } from '../util/streams.js' /** - * @typedef {import('../bindings.js').IpfsUrlContext & import('../bindings.js').UnixfsContext & { timeoutController?: import('../bindings.js').TimeoutControllerContext['timeoutController'] }} UnixfsHandlerContext + * @typedef {IpfsUrlContext & UnixfsContext & { timeoutController?: TimeoutController, gatewayDomain?: string }} UnixfsHandlerContext */ /** @type {import('../bindings.js').Handler} */ @@ -14,7 +22,14 @@ export async function handleUnixfs (request, env, ctx) { if (path == null) throw new Error('missing URL pathname') if (!unixfs) throw new Error('missing UnixFS context') - const entry = await unixfs.getUnixfs(`${dataCid}${path}`, { signal: controller?.signal }) + const options = { signal: controller?.signal } + const entry = await unixfs.getUnixfs(`${dataCid}${path}`, options) + + const { cid } = entry + if (cid.code == dagCBOR.code || cid.code == dagJSON.code) { + const block = { cid, bytes: concat(await collect(entry.content(options))) } + return await handleBlockHtml(request, env, { ...ctx, block }) + } if (!['file', 'raw', 'directory', 'hamt-directory', 'identity'].includes(entry.type)) { throw new HttpError('unsupported entry type', { status: 501 }) diff --git a/src/util/handlebars.js b/src/util/handlebars.js new file mode 100644 index 0000000..f74d0a4 --- /dev/null +++ b/src/util/handlebars.js @@ -0,0 +1,20 @@ +import Handlebars from '@web3-storage/handlebars/runtime.js' + +export { Handlebars } + +/** + * @template T + * @template {string|boolean} R + * @param {string} name + * @param {(v: T) => R} fn + */ +// @ts-ignore missing handlebars types +export const registerHelper = (name, fn) => Handlebars.registerHelper(name, fn) + +/** + * @template T + * @param {string} name + * @returns {(data?: T) => string} + */ +// @ts-ignore missing handlebars types +export const getTemplate = (name) => Handlebars.templates[name] diff --git a/src/util/streams.js b/src/util/streams.js index 9942827..a3194d0 100644 --- a/src/util/streams.js +++ b/src/util/streams.js @@ -46,3 +46,15 @@ export function toIterable (readable) { throw new Error('unknown stream') } + +/** + * @template T + * @param {AsyncIterable} source + */ +export const collect = async source => { + const chunks = [] + for await (const chunk of source) { + chunks.push(chunk) + } + return chunks +} From 093c5be7f1f8c29a89bb08407829ba2061a949b0 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Wed, 10 Sep 2025 15:31:00 +0100 Subject: [PATCH 2/4] chore: remove unused commented code --- src/handlers/templates/block.handlebars | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/src/handlers/templates/block.handlebars b/src/handlers/templates/block.handlebars index 9a191b6..67779a7 100644 --- a/src/handlers/templates/block.handlebars +++ b/src/handlers/templates/block.handlebars @@ -139,26 +139,3 @@
{{/if}} {{/inline}} - -{{!-- {{ define "value" }} - {{ $root := index . 0 }} - {{ $value := index . 1 }} - {{ if len $value.Values }} -
- {{ range $index, $key := $value.Keys }} - {{ template "value" (args $root $key) }} - {{ template "value" (args $root (index $value.Values $index)) }} - {{ end }} -
- {{ else }} - - {{ end }} -{{ end }} --}} \ No newline at end of file From 541195c56c29ffe2768f85400aa5b6c3c72c96db Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Wed, 10 Sep 2025 15:32:22 +0100 Subject: [PATCH 3/4] chore: appease linter --- src/handlers/block.js | 4 ++-- src/handlers/unixfs.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/handlers/block.js b/src/handlers/block.js index 9acc8d7..9937f24 100644 --- a/src/handlers/block.js +++ b/src/handlers/block.js @@ -12,7 +12,7 @@ import { hexdump } from '@gct256/hexdump' import { CID } from 'multiformats/cid' import { decodeRangeHeader, resolveRange } from '../util/range.js' import { HttpError } from '../util/errors.js' -import { Handlebars, getTemplate, registerHelper } from '../util/handlebars.js' +import { getTemplate, registerHelper } from '../util/handlebars.js' /** * @typedef {IpfsUrlContext & BlockContext & UnixfsContext & { timeoutController?: TimeoutController }} BlockHandlerContext @@ -186,7 +186,7 @@ registerHelper('isIpldLink', isIpldLink) /** @param {unknown} obj */ const isIpldMap = obj => { - return obj != null && typeof obj == 'object' && !isIpldScalar(obj) && !isIpldList(obj) + return obj != null && typeof obj === 'object' && !isIpldScalar(obj) && !isIpldList(obj) } registerHelper('isIpldMap', isIpldMap) diff --git a/src/handlers/unixfs.js b/src/handlers/unixfs.js index ebf2bd8..13eb9ea 100644 --- a/src/handlers/unixfs.js +++ b/src/handlers/unixfs.js @@ -26,7 +26,7 @@ export async function handleUnixfs (request, env, ctx) { const entry = await unixfs.getUnixfs(`${dataCid}${path}`, options) const { cid } = entry - if (cid.code == dagCBOR.code || cid.code == dagJSON.code) { + if (cid.code === dagCBOR.code || cid.code === dagJSON.code) { const block = { cid, bytes: concat(await collect(entry.content(options))) } return await handleBlockHtml(request, env, { ...ctx, block }) } From 18107576e60263eb14d9fff0dd9eeb5d93fc8e87 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Wed, 10 Sep 2025 15:55:53 +0100 Subject: [PATCH 4/4] fix: use bitwise or incase set to empty string --- src/handlers/unixfs-dir.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/handlers/unixfs-dir.js b/src/handlers/unixfs-dir.js index 95fddd0..388c3b8 100644 --- a/src/handlers/unixfs-dir.js +++ b/src/handlers/unixfs-dir.js @@ -79,7 +79,7 @@ export async function handleUnixfsDir (request, env, ctx) { const parts = entry.path.split('/') yield fromString( getTemplate('unixfs-dir-header')({ - gatewayDomain: ctx.gatewayDomain ?? 'storacha.link', + gatewayDomain: ctx.gatewayDomain || 'storacha.link', path: entryPath(entry.path), name: entry.name, hash: entry.cid.toString(),