@helia/verified-fetch 7.2.12 → 7.2.14

package/src/plugins/plugin-handle-car.ts

@@ -6,9 +6,9 @@ import toBrowserReadableStream from 'it-to-browser-readablestream'
 import { CONTENT_TYPE_CAR, MEDIA_TYPE_CAR } from '../utils/content-types.ts'
 import { getContentDispositionFilename } from '../utils/get-content-disposition-filename.ts'
 import { entityBytesToOffsetAndLength } from '../utils/get-offset-and-length.ts'
-import { badRequestResponse, notAcceptableResponse, okResponse } from '../utils/responses.js'
-import { BasePlugin } from './plugin-base.js'
-import type { PluginContext } from '../index.js'
+import { badRequestResponse, notAcceptableResponse, okResponse } from '../utils/responses.ts'
+import { BasePlugin } from './plugin-base.ts'
+import type { PluginContext } from '../index.ts'
 import type { ExportCarOptions, UnixFSExporterOptions } from '@helia/car'
 
 function getFilename (ipfsPath: string): string {

package/src/plugins/plugin-handle-ipld.ts

@@ -9,8 +9,8 @@ import { CODEC_CBOR } from '../constants.ts'
 import { getContentTypesForCid, MEDIA_TYPE_CBOR, MEDIA_TYPE_DAG_CBOR, MEDIA_TYPE_DAG_JSON, MEDIA_TYPE_JSON } from '../utils/content-types.ts'
 import { convertOutput } from '../utils/convert-output.ts'
 import { getContentDispositionFilename } from '../utils/get-content-disposition-filename.ts'
-import { notAcceptableResponse, okResponse, partialContentResponse } from '../utils/responses.js'
-import { BasePlugin } from './plugin-base.js'
+import { notAcceptableResponse, okResponse, partialContentResponse } from '../utils/responses.ts'
+import { BasePlugin } from './plugin-base.ts'
 import type { ContentType, PluginContext } from '../index.ts'
 
 /**

package/src/plugins/plugin-handle-ipns-record.ts

@@ -2,9 +2,9 @@ import { peerIdFromString } from '@libp2p/peer-id'
 import { marshalIPNSRecord } from 'ipns'
 import { CONTENT_TYPE_IPNS, MEDIA_TYPE_IPNS_RECORD } from '../utils/content-types.ts'
 import { getContentDispositionFilename } from '../utils/get-content-disposition-filename.ts'
-import { badRequestResponse, okResponse } from '../utils/responses.js'
-import { BasePlugin } from './plugin-base.js'
-import type { PluginContext } from '../index.js'
+import { badRequestResponse, okResponse } from '../utils/responses.ts'
+import { BasePlugin } from './plugin-base.ts'
+import type { PluginContext } from '../index.ts'
 import type { PeerId } from '@libp2p/interface'
 
 /**

package/src/plugins/plugin-handle-raw.ts

@@ -2,8 +2,8 @@ import { isPromise } from '@libp2p/utils'
 import toBuffer from 'it-to-buffer'
 import { MEDIA_TYPE_OCTET_STREAM, MEDIA_TYPE_RAW } from '../utils/content-types.ts'
 import { getContentDispositionFilename } from '../utils/get-content-disposition-filename.ts'
-import { okResponse, partialContentResponse } from '../utils/responses.js'
-import { BasePlugin } from './plugin-base.js'
+import { okResponse, partialContentResponse } from '../utils/responses.ts'
+import { BasePlugin } from './plugin-base.ts'
 import type { PluginContext } from '../index.ts'
 
 /**

package/src/plugins/plugin-handle-tar.ts

@@ -4,10 +4,10 @@ import toBrowserReadableStream from 'it-to-browser-readablestream'
 import { code as rawCode } from 'multiformats/codecs/raw'
 import { MEDIA_TYPE_TAR } from '../utils/content-types.ts'
 import { getContentDispositionFilename } from '../utils/get-content-disposition-filename.ts'
-import { tarStream } from '../utils/get-tar-stream.js'
-import { badRequestResponse, okResponse } from '../utils/responses.js'
-import { BasePlugin } from './plugin-base.js'
-import type { PluginContext } from '../index.js'
+import { tarStream } from '../utils/get-tar-stream.ts'
+import { badRequestResponse, okResponse } from '../utils/responses.ts'
+import { BasePlugin } from './plugin-base.ts'
+import type { PluginContext } from '../index.ts'
 
 /**
  * Accepts a UnixFS `CID` and returns a `.tar` file containing the file or

package/src/plugins/plugin-handle-unixfs.ts

@@ -8,9 +8,9 @@ import toBuffer from 'it-to-buffer'
 import * as raw from 'multiformats/codecs/raw'
 import { MEDIA_TYPE_OCTET_STREAM, MEDIA_TYPE_DAG_PB } from '../utils/content-types.ts'
 import { getContentDispositionFilename } from '../utils/get-content-disposition-filename.ts'
-import { badGatewayResponse, movedPermanentlyResponse, partialContentResponse, okResponse } from '../utils/responses.js'
-import { BasePlugin } from './plugin-base.js'
-import type { PluginContext, Resource } from '../index.js'
+import { badGatewayResponse, movedPermanentlyResponse, partialContentResponse, okResponse } from '../utils/responses.ts'
+import { BasePlugin } from './plugin-base.ts'
+import type { PluginContext, Resource } from '../index.ts'
 import type { RangeHeader } from '../utils/get-range-header.ts'
 import type { AbortOptions } from '@libp2p/interface'
 import type { IdentityNode, RawNode, UnixFSEntry, UnixFSFile } from 'ipfs-unixfs-exporter'
@@ -62,7 +62,7 @@ export class UnixFSPlugin extends BasePlugin {
     let entry: UnixFSEntry
 
     try {
-      entry = await exporter(terminalElement.cid, blockstore, context)
+      entry = await exporter(`/ipfs/${terminalElement.cid}`, blockstore, context)
     } catch (err: any) {
       // throw abort error if signal was aborted
       context?.signal?.throwIfAborted()

package/src/singleton.ts

@@ -1,5 +1,5 @@
-import { createVerifiedFetch } from './index.js'
-import type { Resource, VerifiedFetch, VerifiedFetchInit } from './index.js'
+import { createVerifiedFetch } from './index.ts'
+import type { Resource, VerifiedFetch, VerifiedFetchInit } from './index.ts'
 
 let impl: VerifiedFetch | undefined
 

package/src/utils/content-type-parser.ts

@@ -67,7 +67,9 @@ export async function contentTypeParser (bytes: Uint8Array, fileName?: string):
     case 'html':
       return 'text/html; charset=utf-8'
     case 'js':
-      return 'application/javascript'
+    case 'mjs':
+    case 'cjs':
+      return 'text/javascript'
     case 'json':
       return 'application/json'
     case 'txt':

package/src/utils/error-to-response.ts

@@ -1,5 +1,5 @@
-import { badGatewayResponse, badRequestResponse, gatewayTimeoutResponse, internalServerErrorResponse, notFoundResponse, preconditionFailedResponse } from './responses.js'
-import type { Resource } from '../index.js'
+import { badGatewayResponse, badRequestResponse, gatewayTimeoutResponse, internalServerErrorResponse, notFoundResponse, preconditionFailedResponse } from './responses.ts'
+import type { Resource } from '../index.ts'
 
 export function errorToResponse (resource: Resource | string, err: any, init?: RequestInit): Response {
   // throw an AbortError if the passed signal has aborted

package/src/utils/get-content-type.ts

@@ -1,6 +1,6 @@
-import { defaultMimeType } from './content-type-parser.js'
-import { isPromise } from './type-guards.js'
-import type { ContentTypeParser } from '../index.js'
+import { defaultMimeType } from './content-type-parser.ts'
+import { isPromise } from './type-guards.ts'
+import type { ContentTypeParser } from '../index.ts'
 import type { Logger } from '@libp2p/interface'
 
 export interface GetContentTypeOptions {

package/src/utils/libp2p-defaults.browser.ts

@@ -1,7 +1,7 @@
 import { webRTCDirect } from '@libp2p/webrtc'
 import { webSockets } from '@libp2p/websockets'
 import { libp2pDefaults } from 'helia'
-import type { ServiceFactoryMap } from './libp2p-types.js'
+import type { ServiceFactoryMap } from './libp2p-types.ts'
 import type { DefaultLibp2pServices } from 'helia'
 import type { Libp2pOptions } from 'libp2p'
 

package/src/utils/libp2p-defaults.ts

@@ -2,7 +2,7 @@ import { kadDHT } from '@libp2p/kad-dht'
 import { libp2pDefaults } from 'helia'
 import { ipnsSelector } from 'ipns/selector'
 import { ipnsValidator } from 'ipns/validator'
-import type { ServiceFactoryMap } from './libp2p-types.js'
+import type { ServiceFactoryMap } from './libp2p-types.ts'
 import type { DefaultLibp2pServices } from 'helia'
 import type { Libp2pOptions } from 'libp2p'
 

package/src/utils/response-headers.ts

@@ -1,4 +1,4 @@
-import { InvalidRangeError } from '../errors.js'
+import { InvalidRangeError } from '../errors.ts'
 
 interface CacheControlHeaderOptions {
   /**

package/src/utils/responses.ts

@@ -3,7 +3,7 @@ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { errorToObject } from './error-to-object.ts'
 import { rangeToOffsetAndLength } from './get-offset-and-length.ts'
 import { getContentRangeHeader } from './response-headers.ts'
-import type { SupportedBodyTypes, ContentType, Resource } from '../index.js'
+import type { SupportedBodyTypes, ContentType, Resource } from '../index.ts'
 import type { Range, RangeHeader } from './get-range-header.ts'
 
 function setField (response: Response, name: string, value: string | boolean): void {
@@ -38,12 +38,56 @@ function setRedirected (response: Response): void {
   setField(response, 'redirected', true)
 }
 
+function isArrayBufferBacked (buf: Uint8Array): buf is Uint8Array<ArrayBuffer> {
+  return buf.buffer instanceof ArrayBuffer
+}
+
+function withArrayBuffer (buf: Uint8Array): Uint8Array<ArrayBuffer> {
+  if (isArrayBufferBacked(buf)) {
+    return buf
+  }
+
+  const arr = new ArrayBuffer(buf.byteLength)
+  const u8a = new Uint8Array(arr)
+  u8a.set(buf)
+
+  return u8a
+}
+
+function isReadableStream <T> (obj?: any): obj is ReadableStream<T> {
+  if (obj == null) {
+    return false
+  }
+
+  return typeof obj.pipeThrough === 'function' && typeof obj.getReader === 'function'
+}
+
+function normalizeBody (body?: SupportedBodyTypes): string | Uint8Array<ArrayBuffer> | ArrayBuffer | Blob | ReadableStream<Uint8Array<ArrayBuffer>> | null | undefined {
+  if (body == null) {
+    return body
+  }
+
+  if (body instanceof Uint8Array) {
+    return withArrayBuffer(body)
+  }
+
+  if (isReadableStream(body)) {
+    return body.pipeThrough(new TransformStream({
+      transform (chunk, controller) {
+        controller.enqueue(withArrayBuffer(chunk))
+      }
+    }))
+  }
+
+  return body
+}
+
 export interface ResponseOptions extends ResponseInit {
   redirected?: boolean
 }
 
 export function okResponse (url: Resource, body?: SupportedBodyTypes, init?: ResponseOptions): Response {
-  const response = new Response(body, {
+  const response = new Response(normalizeBody(body), {
     ...(init ?? {}),
     status: 200,
     statusText: 'OK'
@@ -81,7 +125,7 @@ export function internalServerErrorResponse (url: Resource, err: Error, init?: R
  * A 504 Gateway Timeout for when a request made to an upstream server timed out
  */
 export function gatewayTimeoutResponse (url: Resource, body?: SupportedBodyTypes, init?: ResponseInit): Response {
-  const response = new Response(body, {
+  const response = new Response(normalizeBody(body), {
     ...(init ?? {}),
     status: 504,
     statusText: 'Gateway Timeout'
@@ -98,7 +142,7 @@ export function gatewayTimeoutResponse (url: Resource, body?: SupportedBodyTypes
  * upstream server.
  */
 export function badGatewayResponse (url: Resource, body?: SupportedBodyTypes, init?: ResponseInit): Response {
-  const response = new Response(body, {
+  const response = new Response(normalizeBody(body), {
     ...(init ?? {}),
     status: 502,
     statusText: 'Bad Gateway'
@@ -111,7 +155,7 @@ export function badGatewayResponse (url: Resource, body?: SupportedBodyTypes, in
 }
 
 export function notImplementedResponse (url: Resource, body?: SupportedBodyTypes, init?: ResponseInit): Response {
-  const response = new Response(body, {
+  const response = new Response(normalizeBody(body), {
     ...(init ?? {}),
     status: 501,
     statusText: 'Not Implemented'
@@ -145,7 +189,7 @@ export function notAcceptableResponse (url: Resource, requested: Array<Pick<Cont
 }
 
 export function notFoundResponse (url: Resource, body?: SupportedBodyTypes, init?: ResponseInit): Response {
-  const response = new Response(body, {
+  const response = new Response(normalizeBody(body), {
     ...(init ?? {}),
     status: 404,
     statusText: 'Not Found'

package/src/verified-fetch.ts

@@ -5,25 +5,25 @@ import { CID } from 'multiformats/cid'
 import { CustomProgressEvent } from 'progress-events'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { CarPlugin } from './plugins/plugin-handle-car.js'
-import { IpldPlugin } from './plugins/plugin-handle-ipld.js'
-import { IpnsRecordPlugin } from './plugins/plugin-handle-ipns-record.js'
+import { CarPlugin } from './plugins/plugin-handle-car.ts'
+import { IpldPlugin } from './plugins/plugin-handle-ipld.ts'
+import { IpnsRecordPlugin } from './plugins/plugin-handle-ipns-record.ts'
 import { RawPlugin } from './plugins/plugin-handle-raw.ts'
-import { TarPlugin } from './plugins/plugin-handle-tar.js'
-import { UnixFSPlugin } from './plugins/plugin-handle-unixfs.js'
+import { TarPlugin } from './plugins/plugin-handle-tar.ts'
+import { UnixFSPlugin } from './plugins/plugin-handle-unixfs.ts'
 import { URLResolver } from './url-resolver.ts'
 import { abbreviate, abbreviateAddress } from './utils/abbreviate.ts'
-import { contentTypeParser } from './utils/content-type-parser.js'
+import { contentTypeParser } from './utils/content-type-parser.ts'
 import { getContentType, getSupportedContentTypes, CONTENT_TYPE_OCTET_STREAM, MEDIA_TYPE_IPNS_RECORD, CONTENT_TYPE_IPNS } from './utils/content-types.ts'
 import { errorToObject } from './utils/error-to-object.ts'
 import { errorToResponse } from './utils/error-to-response.ts'
-import { getETag, ifNoneMatches } from './utils/get-e-tag.js'
+import { getETag, ifNoneMatches } from './utils/get-e-tag.ts'
 import { getRangeHeader } from './utils/get-range-header.ts'
 import { stringToIpfsUrl } from './utils/parse-resource.ts'
-import { setCacheControlHeader } from './utils/response-headers.js'
-import { notAcceptableResponse, notImplementedResponse, notModifiedResponse } from './utils/responses.js'
-import { ServerTiming } from './utils/server-timing.js'
-import type { AcceptHeader, CIDDetail, ContentTypeParser, CreateVerifiedFetchOptions, Resource, ResourceDetail, VerifiedFetchInit as VerifiedFetchOptions, VerifiedFetchPlugin, PluginContext, PluginOptions } from './index.js'
+import { setCacheControlHeader } from './utils/response-headers.ts'
+import { notAcceptableResponse, notImplementedResponse, notModifiedResponse } from './utils/responses.ts'
+import { ServerTiming } from './utils/server-timing.ts'
+import type { AcceptHeader, CIDDetail, ContentTypeParser, CreateVerifiedFetchOptions, Resource, ResourceDetail, VerifiedFetchInit as VerifiedFetchOptions, VerifiedFetchPlugin, PluginContext, PluginOptions } from './index.ts'
 import type { DNSLink } from '@helia/dnslink'
 import type { Helia } from '@helia/interface'
 import type { IPNSResolver } from '@helia/ipns'