generic-filehandle2 2.1.7 → 2.1.9

package/README.md

@@ -63,5 +63,5 @@ https://github.com/GMOD/generic-filehandle
 Actions.
 
 ```bash
-npm version patch  # or minor/major
+pnpm version patch  # or minor/major
 ```

package/dist/blobFile.d.ts

@@ -9,14 +9,10 @@ export default class BlobFile implements GenericFilehandle {
     private blob;
     constructor(blob: Blob);
     read(length: number, position?: number): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(options: BufferEncoding): Promise<string>;
-    readFile<T extends undefined>(options: Omit<FilehandleOptions, 'encoding'> | (Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    })): Promise<Uint8Array<ArrayBuffer>>;
-    readFile<T extends BufferEncoding>(options: Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    }): Promise<string>;
+    readFile(options?: Omit<FilehandleOptions, 'encoding'>): Promise<Uint8Array<ArrayBuffer>>;
+    readFile(options: BufferEncoding | (Omit<FilehandleOptions, 'encoding'> & {
+        encoding: BufferEncoding;
+    })): Promise<string>;
     stat(): Promise<Stats>;
     close(): Promise<void>;
 }

package/dist/blobFile.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const util_ts_1 = require("./util.js");
 /**
  * Blob of binary data fetched from a local file (with FileReader).
  *
@@ -14,14 +15,10 @@ class BlobFile {
     async read(length, position = 0) {
         // short-circuit a read of 0 bytes here, because browsers actually sometimes
         // crash if you try to read 0 bytes from a local file!
-        if (!length) {
+        if (length === 0) {
             return new Uint8Array(0);
         }
-        const slice = this.blob.slice(position, position + length);
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        return slice.bytes
-            ? slice.bytes()
-            : new Uint8Array(await slice.arrayBuffer());
+        return (0, util_ts_1.toBytes)(this.blob.slice(position, position + length));
     }
     async readFile(options) {
         const encoding = typeof options === 'string' ? options : options?.encoding;
@@ -32,10 +29,7 @@ class BlobFile {
             throw new Error(`unsupported encoding: ${encoding}`);
         }
         else {
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-            return this.blob.bytes
-                ? this.blob.bytes()
-                : new Uint8Array(await this.blob.arrayBuffer());
+            return (0, util_ts_1.toBytes)(this.blob);
         }
     }
     stat() {

package/dist/blobFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"blobFile.js","sourceRoot":"","sources":["../src/blobFile.ts"],"names":[],"mappings":";;AAOA;;;;;GAKG;AACH,MAAqB,QAAQ;IACnB,IAAI,CAAM;IAElB,YAAmB,IAAU;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAEM,KAAK,CAAC,IAAI,CACf,MAAc,EACd,QAAQ,GAAG,CAAC;QAEZ,4EAA4E;QAC5E,sDAAsD;QACtD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC,CAAA;QAC1D,uEAAuE;QACvE,OAAO,KAAK,CAAC,KAAK;YAChB,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE;YACf,CAAC,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;IAC/C,CAAC;IAYM,KAAK,CAAC,QAAQ,CACnB,OAA4C;QAE5C,MAAM,QAAQ,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAA;QAC1E,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;QACzB,CAAC;aAAM,IAAI,QAAQ,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAA;QACtD,CAAC;aAAM,CAAC;YACN,uEAAuE;YACvE,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK;gBACpB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBACnB,CAAC,CAAC,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;QACnD,CAAC;IACH,CAAC;IAEM,IAAI;QACT,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IAClD,CAAC;IAEM,KAAK;QACV,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;IAC1B,CAAC;CACF;AAzDD,2BAyDC"}
+{"version":3,"file":"blobFile.js","sourceRoot":"","sources":["../src/blobFile.ts"],"names":[],"mappings":";;AAAA,uCAAmC;AASnC;;;;;GAKG;AACH,MAAqB,QAAQ;IACnB,IAAI,CAAM;IAElB,YAAmB,IAAU;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAEM,KAAK,CAAC,IAAI,CACf,MAAc,EACd,QAAQ,GAAG,CAAC;QAEZ,4EAA4E;QAC5E,sDAAsD;QACtD,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YACjB,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;QAED,OAAO,IAAA,iBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAA;IAC9D,CAAC;IAUM,KAAK,CAAC,QAAQ,CACnB,OAA4C;QAE5C,MAAM,QAAQ,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAA;QAC1E,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;QACzB,CAAC;aAAM,IAAI,QAAQ,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAA;QACtD,CAAC;aAAM,CAAC;YACN,OAAO,IAAA,iBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC3B,CAAC;IACH,CAAC;IAEM,IAAI;QACT,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IAClD,CAAC;IAEM,KAAK;QACV,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;IAC1B,CAAC;CACF;AAhDD,2BAgDC"}

package/dist/browser.d.ts

@@ -2,8 +2,8 @@ export * from './filehandle.ts';
 export { default as BlobFile } from './blobFile.ts';
 export { default as RemoteFile } from './remoteFile.ts';
 export declare class LocalFile {
-    readFile(): void;
-    read(): void;
-    close(): void;
+    readFile(): Promise<never>;
+    read(): Promise<never>;
+    stat(): Promise<never>;
+    close(): Promise<never>;
 }
-export { type GenericFilehandle } from './filehandle.ts';

package/dist/browser.js

@@ -26,13 +26,16 @@ var remoteFile_ts_1 = require("./remoteFile.js");
 Object.defineProperty(exports, "RemoteFile", { enumerable: true, get: function () { return __importDefault(remoteFile_ts_1).default; } });
 class LocalFile {
     readFile() {
-        throw new Error('unimplemented');
+        return Promise.reject(new Error('unimplemented'));
     }
     read() {
-        throw new Error('unimplemented');
+        return Promise.reject(new Error('unimplemented'));
+    }
+    stat() {
+        return Promise.reject(new Error('unimplemented'));
     }
     close() {
-        throw new Error('unimplemented');
+        return Promise.reject(new Error('unimplemented'));
     }
 }
 exports.LocalFile = LocalFile;

package/dist/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,6DAA6D;AAC7D,kDAA+B;AAE/B,6CAAmD;AAA1C,wHAAA,OAAO,OAAY;AAC5B,iDAAuD;AAA9C,4HAAA,OAAO,OAAc;AAE9B,MAAa,SAAS;IACpB,QAAQ;QACN,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;IAClC,CAAC;IACD,IAAI;QACF,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;IAClC,CAAC;IACD,KAAK;QACH,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;IAClC,CAAC;CACF;AAVD,8BAUC"}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,6DAA6D;AAC7D,kDAA+B;AAE/B,6CAAmD;AAA1C,wHAAA,OAAO,OAAY;AAC5B,iDAAuD;AAA9C,4HAAA,OAAO,OAAc;AAE9B,MAAa,SAAS;IACpB,QAAQ;QACN,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAA;IACnD,CAAC;IACD,IAAI;QACF,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAA;IACnD,CAAC;IACD,IAAI;QACF,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAA;IACnD,CAAC;IACD,KAAK;QACH,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAA;IACnD,CAAC;CACF;AAbD,8BAaC"}

package/dist/filehandle.d.ts

@@ -12,17 +12,10 @@ export interface Stats {
 }
 export interface GenericFilehandle {
     read(length: number, position: number, opts?: FilehandleOptions): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(options: BufferEncoding): Promise<string>;
-    readFile<T extends undefined>(options: Omit<FilehandleOptions, 'encoding'> | (Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    })): Promise<Uint8Array<ArrayBuffer>>;
-    readFile<T extends BufferEncoding>(options: Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    }): Promise<string>;
-    readFile<T extends BufferEncoding>(options: Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    }): T extends BufferEncoding ? Promise<string> : Promise<Uint8Array<ArrayBuffer>>;
+    readFile(options?: Omit<FilehandleOptions, 'encoding'>): Promise<Uint8Array<ArrayBuffer>>;
+    readFile(options: BufferEncoding | (Omit<FilehandleOptions, 'encoding'> & {
+        encoding: BufferEncoding;
+    })): Promise<string>;
     stat(): Promise<Stats>;
     close(): Promise<void>;
 }

package/dist/localFile.d.ts

@@ -3,17 +3,10 @@ export default class LocalFile implements GenericFilehandle {
     private filename;
     constructor(source: string);
     read(length: number, position?: number): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(options: BufferEncoding): Promise<string>;
-    readFile<T extends undefined>(options: Omit<FilehandleOptions, 'encoding'> | (Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    })): Promise<Uint8Array<ArrayBuffer>>;
-    readFile<T extends BufferEncoding>(options: Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    }): Promise<string>;
-    readFile<T extends BufferEncoding>(options: Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    }): T extends BufferEncoding ? Promise<string> : Promise<Uint8Array<ArrayBuffer>>;
+    readFile(options?: Omit<FilehandleOptions, 'encoding'>): Promise<Uint8Array<ArrayBuffer>>;
+    readFile(options: BufferEncoding | (Omit<FilehandleOptions, 'encoding'> & {
+        encoding: BufferEncoding;
+    })): Promise<string>;
     stat(): Promise<Stats>;
     close(): Promise<void>;
 }

package/dist/localFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"localFile.js","sourceRoot":"","sources":["../src/localFile.ts"],"names":[],"mappings":";;AAAA,0CAAkD;AASlD,MAAqB,SAAS;IACpB,QAAQ,CAAQ;IAExB,YAAmB,MAAc;QAC/B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,QAAQ,GAAG,CAAC;QAC5C,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YACjB,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAA;QAClC,IAAI,EAAE,CAAA;QACN,IAAI,CAAC;YACH,EAAE,GAAG,MAAM,IAAA,eAAI,EAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;YACnC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;YACnD,OAAO,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,CAAA;QAC9C,CAAC;gBAAS,CAAC;YACT,IAAI,EAAE,EAAE,CAAC;gBACP,IAAI,CAAC;oBACH,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;gBAClB,CAAC;gBAAC,MAAM,CAAC;oBACP,sEAAsE;oBACtE,oDAAoD;gBACtD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAiBM,KAAK,CAAC,QAAQ,CACnB,OAA4C;QAE5C,OAAO,IAAA,mBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACzC,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,OAAO,IAAA,eAAI,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC5B,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,gBAAgB;IAClB,CAAC;CACF;AAzDD,4BAyDC"}
+{"version":3,"file":"localFile.js","sourceRoot":"","sources":["../src/localFile.ts"],"names":[],"mappings":";;AAAA,0CAAkD;AASlD,MAAqB,SAAS;IACpB,QAAQ,CAAQ;IAExB,YAAmB,MAAc;QAC/B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,QAAQ,GAAG,CAAC;QAC5C,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YACjB,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAA;QAClC,IAAI,EAAE,CAAA;QACN,IAAI,CAAC;YACH,EAAE,GAAG,MAAM,IAAA,eAAI,EAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;YACnC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;YACnD,OAAO,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,CAAA;QAC9C,CAAC;gBAAS,CAAC;YACT,IAAI,EAAE,EAAE,CAAC;gBACP,IAAI,CAAC;oBACH,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;gBAClB,CAAC;gBAAC,MAAM,CAAC;oBACP,sEAAsE;oBACtE,oDAAoD;gBACtD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAUM,KAAK,CAAC,QAAQ,CACnB,OAA4C;QAE5C,OAAO,IAAA,mBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACzC,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,OAAO,IAAA,eAAI,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC5B,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,gBAAgB;IAClB,CAAC;CACF;AAlDD,4BAkDC"}

package/dist/remoteFile.d.ts

@@ -6,19 +6,13 @@ export default class RemoteFile implements GenericFilehandle {
     private baseHeaders;
     private baseOverrides;
     constructor(source: string, opts?: FilehandleOptions);
+    private buildRequest;
     fetch(input: RequestInfo, init: RequestInit | undefined): Promise<Response>;
     read(length: number, position: number, opts?: FilehandleOptions): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(options: BufferEncoding): Promise<string>;
-    readFile<T extends undefined>(options: Omit<FilehandleOptions, 'encoding'> | (Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    })): Promise<Uint8Array<ArrayBuffer>>;
-    readFile<T extends BufferEncoding>(options: Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    }): Promise<string>;
-    readFile<T extends BufferEncoding>(options: Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    }): T extends BufferEncoding ? Promise<string> : Promise<Uint8Array<ArrayBuffer>>;
+    readFile(options?: Omit<FilehandleOptions, 'encoding'>): Promise<Uint8Array<ArrayBuffer>>;
+    readFile(options: BufferEncoding | (Omit<FilehandleOptions, 'encoding'> & {
+        encoding: BufferEncoding;
+    })): Promise<string>;
     stat(): Promise<Stats>;
     close(): Promise<void>;
 }

package/dist/remoteFile.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const util_ts_1 = require("./util.js");
 function getMessage(e) {
     const r = typeof e === 'object' &&
         e !== null &&
@@ -7,6 +8,7 @@ function getMessage(e) {
         typeof e.message === 'string'
         ? e.message
         : `${e}`;
+    // strip trailing period so the wrapped form `${msg} fetching ${url}` reads cleanly
     return r.replace(/\.$/, '');
 }
 class RemoteFile {
@@ -19,9 +21,18 @@ class RemoteFile {
         this.url = source;
         this.baseHeaders = opts.headers ?? {};
         this.baseOverrides = opts.overrides ?? {};
-        this.fetchImplementation =
-            opts.fetch ??
-                ((input, init) => globalThis.fetch(input, init));
+        this.fetchImplementation = opts.fetch ?? globalThis.fetch.bind(globalThis);
+    }
+    buildRequest(opts, extraHeaders) {
+        return {
+            ...this.baseOverrides,
+            ...opts.overrides,
+            headers: { ...this.baseHeaders, ...opts.headers, ...extraHeaders },
+            method: 'GET',
+            redirect: 'follow',
+            mode: 'cors',
+            signal: opts.signal,
+        };
     }
     async fetch(input, init) {
         const wrapError = (e) => new Error(`${getMessage(e)} fetching ${input}`, { cause: e });
@@ -59,17 +70,9 @@ class RemoteFile {
         if (Number.isNaN(length) || Number.isNaN(position)) {
             throw new TypeError(`read() called with NaN length or position (length=${length}, position=${position}). The index file may be corrupt.`);
         }
-        const { headers = {}, signal, overrides = {} } = opts;
-        headers.range = `bytes=${position}-${position + length - 1}`;
-        const res = await this.fetch(this.url, {
-            ...this.baseOverrides,
-            ...overrides,
-            headers: { ...this.baseHeaders, ...headers },
-            method: 'GET',
-            redirect: 'follow',
-            mode: 'cors',
-            signal,
-        });
+        const res = await this.fetch(this.url, this.buildRequest(opts, {
+            range: `bytes=${position}-${position + length - 1}`,
+        }));
         if (!res.ok) {
             throw new Error(`HTTP ${res.status} fetching ${this.url}`);
         }
@@ -82,10 +85,12 @@ class RemoteFile {
                     size: parseInt(sizeMatch[1], 10),
                 };
             }
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-            const resData = res.bytes
-                ? await res.bytes()
-                : new Uint8Array(await res.arrayBuffer());
+            const resData = await (0, util_ts_1.toBytes)(res);
+            // server didn't honor the range request and returned the full file —
+            // the body length is the actual file size
+            if (!this._stat && res.status === 200) {
+                this._stat = { size: resData.byteLength };
+            }
             return resData.byteLength <= length
                 ? resData
                 : resData.subarray(0, length);
@@ -97,16 +102,7 @@ class RemoteFile {
     async readFile(options = {}) {
         const encoding = typeof options === 'string' ? options : options.encoding;
         const opts = typeof options === 'string' ? {} : options;
-        const { headers = {}, signal, overrides = {} } = opts;
-        const res = await this.fetch(this.url, {
-            ...this.baseOverrides,
-            ...overrides,
-            headers: { ...this.baseHeaders, ...headers },
-            method: 'GET',
-            redirect: 'follow',
-            mode: 'cors',
-            signal,
-        });
+        const res = await this.fetch(this.url, this.buildRequest(opts));
         if (!res.ok) {
             throw new Error(`HTTP ${res.status} fetching ${this.url}`);
         }
@@ -117,8 +113,7 @@ class RemoteFile {
             throw new Error(`unsupported encoding: ${encoding}`);
         }
         else {
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-            return res.bytes ? res.bytes() : new Uint8Array(await res.arrayBuffer());
+            return (0, util_ts_1.toBytes)(res);
         }
     }
     async stat() {

package/dist/remoteFile.js.map

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

package/dist/util.d.ts

@@ -0,0 +1 @@
+export declare function toBytes(src: Response | Blob): Promise<Uint8Array<ArrayBuffer>>;

package/dist/util.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toBytes = toBytes;
+// Response.bytes() / Blob.bytes() is widely available but not yet in all
+// lib.dom.d.ts versions, so the optional-chain check is load-bearing for older
+// runtimes despite TS thinking it's always defined.
+async function toBytes(src) {
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    return src.bytes ? src.bytes() : new Uint8Array(await src.arrayBuffer());
+}
+//# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;AAGA,0BAKC;AARD,yEAAyE;AACzE,+EAA+E;AAC/E,oDAAoD;AAC7C,KAAK,UAAU,OAAO,CAC3B,GAAoB;IAEpB,uEAAuE;IACvE,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC,CAAA;AAC1E,CAAC"}

package/esm/blobFile.d.ts

@@ -9,14 +9,10 @@ export default class BlobFile implements GenericFilehandle {
     private blob;
     constructor(blob: Blob);
     read(length: number, position?: number): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(options: BufferEncoding): Promise<string>;
-    readFile<T extends undefined>(options: Omit<FilehandleOptions, 'encoding'> | (Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    })): Promise<Uint8Array<ArrayBuffer>>;
-    readFile<T extends BufferEncoding>(options: Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    }): Promise<string>;
+    readFile(options?: Omit<FilehandleOptions, 'encoding'>): Promise<Uint8Array<ArrayBuffer>>;
+    readFile(options: BufferEncoding | (Omit<FilehandleOptions, 'encoding'> & {
+        encoding: BufferEncoding;
+    })): Promise<string>;
     stat(): Promise<Stats>;
     close(): Promise<void>;
 }

package/esm/blobFile.js

@@ -1,3 +1,4 @@
+import { toBytes } from "./util.js";
 /**
  * Blob of binary data fetched from a local file (with FileReader).
  *
@@ -12,14 +13,10 @@ export default class BlobFile {
     async read(length, position = 0) {
         // short-circuit a read of 0 bytes here, because browsers actually sometimes
         // crash if you try to read 0 bytes from a local file!
-        if (!length) {
+        if (length === 0) {
             return new Uint8Array(0);
         }
-        const slice = this.blob.slice(position, position + length);
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        return slice.bytes
-            ? slice.bytes()
-            : new Uint8Array(await slice.arrayBuffer());
+        return toBytes(this.blob.slice(position, position + length));
     }
     async readFile(options) {
         const encoding = typeof options === 'string' ? options : options?.encoding;
@@ -30,10 +27,7 @@ export default class BlobFile {
             throw new Error(`unsupported encoding: ${encoding}`);
         }
         else {
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-            return this.blob.bytes
-                ? this.blob.bytes()
-                : new Uint8Array(await this.blob.arrayBuffer());
+            return toBytes(this.blob);
         }
     }
     stat() {

package/esm/blobFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"blobFile.js","sourceRoot":"","sources":["../src/blobFile.ts"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,QAAQ;IACnB,IAAI,CAAM;IAElB,YAAmB,IAAU;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAEM,KAAK,CAAC,IAAI,CACf,MAAc,EACd,QAAQ,GAAG,CAAC;QAEZ,4EAA4E;QAC5E,sDAAsD;QACtD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC,CAAA;QAC1D,uEAAuE;QACvE,OAAO,KAAK,CAAC,KAAK;YAChB,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE;YACf,CAAC,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;IAC/C,CAAC;IAYM,KAAK,CAAC,QAAQ,CACnB,OAA4C;QAE5C,MAAM,QAAQ,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAA;QAC1E,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;QACzB,CAAC;aAAM,IAAI,QAAQ,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAA;QACtD,CAAC;aAAM,CAAC;YACN,uEAAuE;YACvE,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK;gBACpB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBACnB,CAAC,CAAC,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;QACnD,CAAC;IACH,CAAC;IAEM,IAAI;QACT,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IAClD,CAAC;IAEM,KAAK;QACV,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;IAC1B,CAAC;CACF"}
+{"version":3,"file":"blobFile.js","sourceRoot":"","sources":["../src/blobFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AASnC;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,QAAQ;IACnB,IAAI,CAAM;IAElB,YAAmB,IAAU;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAEM,KAAK,CAAC,IAAI,CACf,MAAc,EACd,QAAQ,GAAG,CAAC;QAEZ,4EAA4E;QAC5E,sDAAsD;QACtD,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YACjB,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;QAED,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAA;IAC9D,CAAC;IAUM,KAAK,CAAC,QAAQ,CACnB,OAA4C;QAE5C,MAAM,QAAQ,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAA;QAC1E,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;QACzB,CAAC;aAAM,IAAI,QAAQ,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAA;QACtD,CAAC;aAAM,CAAC;YACN,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC3B,CAAC;IACH,CAAC;IAEM,IAAI;QACT,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IAClD,CAAC;IAEM,KAAK;QACV,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;IAC1B,CAAC;CACF"}

package/esm/browser.d.ts

@@ -2,8 +2,8 @@ export * from './filehandle.ts';
 export { default as BlobFile } from './blobFile.ts';
 export { default as RemoteFile } from './remoteFile.ts';
 export declare class LocalFile {
-    readFile(): void;
-    read(): void;
-    close(): void;
+    readFile(): Promise<never>;
+    read(): Promise<never>;
+    stat(): Promise<never>;
+    close(): Promise<never>;
 }
-export { type GenericFilehandle } from './filehandle.ts';

package/esm/browser.js

@@ -4,13 +4,16 @@ export { default as BlobFile } from "./blobFile.js";
 export { default as RemoteFile } from "./remoteFile.js";
 export class LocalFile {
     readFile() {
-        throw new Error('unimplemented');
+        return Promise.reject(new Error('unimplemented'));
     }
     read() {
-        throw new Error('unimplemented');
+        return Promise.reject(new Error('unimplemented'));
+    }
+    stat() {
+        return Promise.reject(new Error('unimplemented'));
     }
     close() {
-        throw new Error('unimplemented');
+        return Promise.reject(new Error('unimplemented'));
     }
 }
 //# sourceMappingURL=browser.js.map

package/esm/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,cAAc,iBAAiB,CAAA;AAE/B,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEvD,MAAM,OAAO,SAAS;IACpB,QAAQ;QACN,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;IAClC,CAAC;IACD,IAAI;QACF,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;IAClC,CAAC;IACD,KAAK;QACH,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;IAClC,CAAC;CACF"}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,cAAc,iBAAiB,CAAA;AAE/B,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEvD,MAAM,OAAO,SAAS;IACpB,QAAQ;QACN,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAA;IACnD,CAAC;IACD,IAAI;QACF,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAA;IACnD,CAAC;IACD,IAAI;QACF,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAA;IACnD,CAAC;IACD,KAAK;QACH,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAA;IACnD,CAAC;CACF"}

package/esm/filehandle.d.ts

@@ -12,17 +12,10 @@ export interface Stats {
 }
 export interface GenericFilehandle {
     read(length: number, position: number, opts?: FilehandleOptions): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(options: BufferEncoding): Promise<string>;
-    readFile<T extends undefined>(options: Omit<FilehandleOptions, 'encoding'> | (Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    })): Promise<Uint8Array<ArrayBuffer>>;
-    readFile<T extends BufferEncoding>(options: Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    }): Promise<string>;
-    readFile<T extends BufferEncoding>(options: Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    }): T extends BufferEncoding ? Promise<string> : Promise<Uint8Array<ArrayBuffer>>;
+    readFile(options?: Omit<FilehandleOptions, 'encoding'>): Promise<Uint8Array<ArrayBuffer>>;
+    readFile(options: BufferEncoding | (Omit<FilehandleOptions, 'encoding'> & {
+        encoding: BufferEncoding;
+    })): Promise<string>;
     stat(): Promise<Stats>;
     close(): Promise<void>;
 }

package/esm/localFile.d.ts

@@ -3,17 +3,10 @@ export default class LocalFile implements GenericFilehandle {
     private filename;
     constructor(source: string);
     read(length: number, position?: number): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(options: BufferEncoding): Promise<string>;
-    readFile<T extends undefined>(options: Omit<FilehandleOptions, 'encoding'> | (Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    })): Promise<Uint8Array<ArrayBuffer>>;
-    readFile<T extends BufferEncoding>(options: Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    }): Promise<string>;
-    readFile<T extends BufferEncoding>(options: Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    }): T extends BufferEncoding ? Promise<string> : Promise<Uint8Array<ArrayBuffer>>;
+    readFile(options?: Omit<FilehandleOptions, 'encoding'>): Promise<Uint8Array<ArrayBuffer>>;
+    readFile(options: BufferEncoding | (Omit<FilehandleOptions, 'encoding'> & {
+        encoding: BufferEncoding;
+    })): Promise<string>;
     stat(): Promise<Stats>;
     close(): Promise<void>;
 }

package/esm/localFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"localFile.js","sourceRoot":"","sources":["../src/localFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AASlD,MAAM,CAAC,OAAO,OAAO,SAAS;IACpB,QAAQ,CAAQ;IAExB,YAAmB,MAAc;QAC/B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,QAAQ,GAAG,CAAC;QAC5C,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YACjB,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAA;QAClC,IAAI,EAAE,CAAA;QACN,IAAI,CAAC;YACH,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;YACnC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;YACnD,OAAO,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,CAAA;QAC9C,CAAC;gBAAS,CAAC;YACT,IAAI,EAAE,EAAE,CAAC;gBACP,IAAI,CAAC;oBACH,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;gBAClB,CAAC;gBAAC,MAAM,CAAC;oBACP,sEAAsE;oBACtE,oDAAoD;gBACtD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAiBM,KAAK,CAAC,QAAQ,CACnB,OAA4C;QAE5C,OAAO,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACzC,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC5B,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,gBAAgB;IAClB,CAAC;CACF"}
+{"version":3,"file":"localFile.js","sourceRoot":"","sources":["../src/localFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AASlD,MAAM,CAAC,OAAO,OAAO,SAAS;IACpB,QAAQ,CAAQ;IAExB,YAAmB,MAAc;QAC/B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,QAAQ,GAAG,CAAC;QAC5C,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YACjB,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAA;QAClC,IAAI,EAAE,CAAA;QACN,IAAI,CAAC;YACH,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;YACnC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;YACnD,OAAO,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,CAAA;QAC9C,CAAC;gBAAS,CAAC;YACT,IAAI,EAAE,EAAE,CAAC;gBACP,IAAI,CAAC;oBACH,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;gBAClB,CAAC;gBAAC,MAAM,CAAC;oBACP,sEAAsE;oBACtE,oDAAoD;gBACtD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAUM,KAAK,CAAC,QAAQ,CACnB,OAA4C;QAE5C,OAAO,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACzC,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC5B,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,gBAAgB;IAClB,CAAC;CACF"}

package/esm/remoteFile.d.ts

@@ -6,19 +6,13 @@ export default class RemoteFile implements GenericFilehandle {
     private baseHeaders;
     private baseOverrides;
     constructor(source: string, opts?: FilehandleOptions);
+    private buildRequest;
     fetch(input: RequestInfo, init: RequestInit | undefined): Promise<Response>;
     read(length: number, position: number, opts?: FilehandleOptions): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(): Promise<Uint8Array<ArrayBuffer>>;
-    readFile(options: BufferEncoding): Promise<string>;
-    readFile<T extends undefined>(options: Omit<FilehandleOptions, 'encoding'> | (Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    })): Promise<Uint8Array<ArrayBuffer>>;
-    readFile<T extends BufferEncoding>(options: Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    }): Promise<string>;
-    readFile<T extends BufferEncoding>(options: Omit<FilehandleOptions, 'encoding'> & {
-        encoding: T;
-    }): T extends BufferEncoding ? Promise<string> : Promise<Uint8Array<ArrayBuffer>>;
+    readFile(options?: Omit<FilehandleOptions, 'encoding'>): Promise<Uint8Array<ArrayBuffer>>;
+    readFile(options: BufferEncoding | (Omit<FilehandleOptions, 'encoding'> & {
+        encoding: BufferEncoding;
+    })): Promise<string>;
     stat(): Promise<Stats>;
     close(): Promise<void>;
 }

package/esm/remoteFile.js

@@ -1,3 +1,4 @@
+import { toBytes } from "./util.js";
 function getMessage(e) {
     const r = typeof e === 'object' &&
         e !== null &&
@@ -5,6 +6,7 @@ function getMessage(e) {
         typeof e.message === 'string'
         ? e.message
         : `${e}`;
+    // strip trailing period so the wrapped form `${msg} fetching ${url}` reads cleanly
     return r.replace(/\.$/, '');
 }
 export default class RemoteFile {
@@ -17,9 +19,18 @@ export default class RemoteFile {
         this.url = source;
         this.baseHeaders = opts.headers ?? {};
         this.baseOverrides = opts.overrides ?? {};
-        this.fetchImplementation =
-            opts.fetch ??
-                ((input, init) => globalThis.fetch(input, init));
+        this.fetchImplementation = opts.fetch ?? globalThis.fetch.bind(globalThis);
+    }
+    buildRequest(opts, extraHeaders) {
+        return {
+            ...this.baseOverrides,
+            ...opts.overrides,
+            headers: { ...this.baseHeaders, ...opts.headers, ...extraHeaders },
+            method: 'GET',
+            redirect: 'follow',
+            mode: 'cors',
+            signal: opts.signal,
+        };
     }
     async fetch(input, init) {
         const wrapError = (e) => new Error(`${getMessage(e)} fetching ${input}`, { cause: e });
@@ -57,17 +68,9 @@ export default class RemoteFile {
         if (Number.isNaN(length) || Number.isNaN(position)) {
             throw new TypeError(`read() called with NaN length or position (length=${length}, position=${position}). The index file may be corrupt.`);
         }
-        const { headers = {}, signal, overrides = {} } = opts;
-        headers.range = `bytes=${position}-${position + length - 1}`;
-        const res = await this.fetch(this.url, {
-            ...this.baseOverrides,
-            ...overrides,
-            headers: { ...this.baseHeaders, ...headers },
-            method: 'GET',
-            redirect: 'follow',
-            mode: 'cors',
-            signal,
-        });
+        const res = await this.fetch(this.url, this.buildRequest(opts, {
+            range: `bytes=${position}-${position + length - 1}`,
+        }));
         if (!res.ok) {
             throw new Error(`HTTP ${res.status} fetching ${this.url}`);
         }
@@ -80,10 +83,12 @@ export default class RemoteFile {
                     size: parseInt(sizeMatch[1], 10),
                 };
             }
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-            const resData = res.bytes
-                ? await res.bytes()
-                : new Uint8Array(await res.arrayBuffer());
+            const resData = await toBytes(res);
+            // server didn't honor the range request and returned the full file —
+            // the body length is the actual file size
+            if (!this._stat && res.status === 200) {
+                this._stat = { size: resData.byteLength };
+            }
             return resData.byteLength <= length
                 ? resData
                 : resData.subarray(0, length);
@@ -95,16 +100,7 @@ export default class RemoteFile {
     async readFile(options = {}) {
         const encoding = typeof options === 'string' ? options : options.encoding;
         const opts = typeof options === 'string' ? {} : options;
-        const { headers = {}, signal, overrides = {} } = opts;
-        const res = await this.fetch(this.url, {
-            ...this.baseOverrides,
-            ...overrides,
-            headers: { ...this.baseHeaders, ...headers },
-            method: 'GET',
-            redirect: 'follow',
-            mode: 'cors',
-            signal,
-        });
+        const res = await this.fetch(this.url, this.buildRequest(opts));
         if (!res.ok) {
             throw new Error(`HTTP ${res.status} fetching ${this.url}`);
         }
@@ -115,8 +111,7 @@ export default class RemoteFile {
             throw new Error(`unsupported encoding: ${encoding}`);
         }
         else {
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-            return res.bytes ? res.bytes() : new Uint8Array(await res.arrayBuffer());
+            return toBytes(res);
         }
     }
     async stat() {

package/esm/remoteFile.js.map

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

package/esm/util.d.ts

@@ -0,0 +1 @@
+export declare function toBytes(src: Response | Blob): Promise<Uint8Array<ArrayBuffer>>;

package/esm/util.js

@@ -0,0 +1,8 @@
+// Response.bytes() / Blob.bytes() is widely available but not yet in all
+// lib.dom.d.ts versions, so the optional-chain check is load-bearing for older
+// runtimes despite TS thinking it's always defined.
+export async function toBytes(src) {
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    return src.bytes ? src.bytes() : new Uint8Array(await src.arrayBuffer());
+}
+//# sourceMappingURL=util.js.map

package/esm/util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,+EAA+E;AAC/E,oDAAoD;AACpD,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,GAAoB;IAEpB,uEAAuE;IACvE,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC,CAAA;AAC1E,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "generic-filehandle2",
   "description": "uniform interface for accessing binary data from local files, remote HTTP resources, and browser Blob data",
-  "version": "2.1.7",
+  "version": "2.1.9",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -49,10 +49,10 @@
   ],
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@types/node": "^25.6.0",
+    "@types/node": "^25.8.0",
     "@types/range-parser": "^1.2.7",
-    "@vitest/coverage-v8": "^4.1.5",
-    "eslint": "^10.2.1",
+    "@vitest/coverage-v8": "^4.1.6",
+    "eslint": "^10.4.0",
     "eslint-plugin-import-x": "^4.16.2",
     "eslint-plugin-unicorn": "^64.0.0",
     "prettier": "^3.8.3",
@@ -60,8 +60,8 @@
     "rimraf": "^6.1.3",
     "standard-changelog": "^7.0.1",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.59.0",
-    "vitest": "^4.1.5"
+    "typescript-eslint": "^8.59.3",
+    "vitest": "^4.1.6"
   },
   "publishConfig": {
     "access": "public"

package/src/blobFile.ts

@@ -1,3 +1,5 @@
+import { toBytes } from './util.ts'
+
 import type {
   BufferEncoding,
   FilehandleOptions,
@@ -24,26 +26,20 @@ export default class BlobFile implements GenericFilehandle {
   ): Promise<Uint8Array<ArrayBuffer>> {
     // short-circuit a read of 0 bytes here, because browsers actually sometimes
     // crash if you try to read 0 bytes from a local file!
-    if (!length) {
+    if (length === 0) {
       return new Uint8Array(0)
     }
 
-    const slice = this.blob.slice(position, position + length)
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    return slice.bytes
-      ? slice.bytes()
-      : new Uint8Array(await slice.arrayBuffer())
+    return toBytes(this.blob.slice(position, position + length))
   }
 
-  public async readFile(): Promise<Uint8Array<ArrayBuffer>>
-  public async readFile(options: BufferEncoding): Promise<string>
-  public async readFile<T extends undefined>(
-    options:
-      | Omit<FilehandleOptions, 'encoding'>
-      | (Omit<FilehandleOptions, 'encoding'> & { encoding: T }),
+  public async readFile(
+    options?: Omit<FilehandleOptions, 'encoding'>,
   ): Promise<Uint8Array<ArrayBuffer>>
-  public async readFile<T extends BufferEncoding>(
-    options: Omit<FilehandleOptions, 'encoding'> & { encoding: T },
+  public async readFile(
+    options:
+      | BufferEncoding
+      | (Omit<FilehandleOptions, 'encoding'> & { encoding: BufferEncoding }),
   ): Promise<string>
   public async readFile(
     options?: FilehandleOptions | BufferEncoding,
@@ -54,10 +50,7 @@ export default class BlobFile implements GenericFilehandle {
     } else if (encoding) {
       throw new Error(`unsupported encoding: ${encoding}`)
     } else {
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-      return this.blob.bytes
-        ? this.blob.bytes()
-        : new Uint8Array(await this.blob.arrayBuffer())
+      return toBytes(this.blob)
     }
   }
 

package/src/browser.ts

@@ -5,15 +5,16 @@ export { default as BlobFile } from './blobFile.ts'
 export { default as RemoteFile } from './remoteFile.ts'
 
 export class LocalFile {
-  readFile() {
-    throw new Error('unimplemented')
+  readFile(): Promise<never> {
+    return Promise.reject(new Error('unimplemented'))
   }
-  read() {
-    throw new Error('unimplemented')
+  read(): Promise<never> {
+    return Promise.reject(new Error('unimplemented'))
   }
-  close() {
-    throw new Error('unimplemented')
+  stat(): Promise<never> {
+    return Promise.reject(new Error('unimplemented'))
+  }
+  close(): Promise<never> {
+    return Promise.reject(new Error('unimplemented'))
   }
 }
-
-export { type GenericFilehandle } from './filehandle.ts'

package/src/filehandle.ts

@@ -37,21 +37,14 @@ export interface GenericFilehandle {
     opts?: FilehandleOptions,
   ): Promise<Uint8Array<ArrayBuffer>>
 
-  readFile(): Promise<Uint8Array<ArrayBuffer>>
-  readFile(options: BufferEncoding): Promise<string>
-  readFile<T extends undefined>(
-    options:
-      | Omit<FilehandleOptions, 'encoding'>
-      | (Omit<FilehandleOptions, 'encoding'> & { encoding: T }),
+  readFile(
+    options?: Omit<FilehandleOptions, 'encoding'>,
   ): Promise<Uint8Array<ArrayBuffer>>
-  readFile<T extends BufferEncoding>(
-    options: Omit<FilehandleOptions, 'encoding'> & { encoding: T },
+  readFile(
+    options:
+      | BufferEncoding
+      | (Omit<FilehandleOptions, 'encoding'> & { encoding: BufferEncoding }),
   ): Promise<string>
-  readFile<T extends BufferEncoding>(
-    options: Omit<FilehandleOptions, 'encoding'> & { encoding: T },
-  ): T extends BufferEncoding
-    ? Promise<string>
-    : Promise<Uint8Array<ArrayBuffer>>
   stat(): Promise<Stats>
   close(): Promise<void>
 }

package/src/localFile.ts

@@ -36,21 +36,14 @@ export default class LocalFile implements GenericFilehandle {
     }
   }
 
-  public async readFile(): Promise<Uint8Array<ArrayBuffer>>
-  public async readFile(options: BufferEncoding): Promise<string>
-  public async readFile<T extends undefined>(
-    options:
-      | Omit<FilehandleOptions, 'encoding'>
-      | (Omit<FilehandleOptions, 'encoding'> & { encoding: T }),
+  public async readFile(
+    options?: Omit<FilehandleOptions, 'encoding'>,
   ): Promise<Uint8Array<ArrayBuffer>>
-  public async readFile<T extends BufferEncoding>(
-    options: Omit<FilehandleOptions, 'encoding'> & { encoding: T },
+  public async readFile(
+    options:
+      | BufferEncoding
+      | (Omit<FilehandleOptions, 'encoding'> & { encoding: BufferEncoding }),
   ): Promise<string>
-  readFile<T extends BufferEncoding>(
-    options: Omit<FilehandleOptions, 'encoding'> & { encoding: T },
-  ): T extends BufferEncoding
-    ? Promise<string>
-    : Promise<Uint8Array<ArrayBuffer>>
   public async readFile(
     options?: FilehandleOptions | BufferEncoding,
   ): Promise<Uint8Array<ArrayBuffer> | string> {

package/src/remoteFile.ts

@@ -1,3 +1,5 @@
+import { toBytes } from './util.ts'
+
 import type {
   BufferEncoding,
   Fetcher,
@@ -14,6 +16,7 @@ function getMessage(e: unknown) {
     typeof e.message === 'string'
       ? e.message
       : `${e}`
+  // strip trailing period so the wrapped form `${msg} fetching ${url}` reads cleanly
   return r.replace(/\.$/, '')
 }
 
@@ -28,10 +31,22 @@ export default class RemoteFile implements GenericFilehandle {
     this.url = source
     this.baseHeaders = opts.headers ?? {}
     this.baseOverrides = opts.overrides ?? {}
-    this.fetchImplementation =
-      opts.fetch ??
-      ((input: RequestInfo, init?: RequestInit) =>
-        globalThis.fetch(input, init))
+    this.fetchImplementation = opts.fetch ?? globalThis.fetch.bind(globalThis)
+  }
+
+  private buildRequest(
+    opts: FilehandleOptions,
+    extraHeaders?: Record<string, string>,
+  ): RequestInit {
+    return {
+      ...this.baseOverrides,
+      ...opts.overrides,
+      headers: { ...this.baseHeaders, ...opts.headers, ...extraHeaders },
+      method: 'GET',
+      redirect: 'follow',
+      mode: 'cors',
+      signal: opts.signal,
+    }
   }
 
   public async fetch(
@@ -41,7 +56,7 @@ export default class RemoteFile implements GenericFilehandle {
     const wrapError = (e: unknown) =>
       new Error(`${getMessage(e)} fetching ${input}`, { cause: e })
 
-    let response
+    let response: Response
     try {
       response = await this.fetchImplementation(input, init)
     } catch (e) {
@@ -81,17 +96,12 @@ export default class RemoteFile implements GenericFilehandle {
         `read() called with NaN length or position (length=${length}, position=${position}). The index file may be corrupt.`,
       )
     }
-    const { headers = {}, signal, overrides = {} } = opts
-    headers.range = `bytes=${position}-${position + length - 1}`
-    const res = await this.fetch(this.url, {
-      ...this.baseOverrides,
-      ...overrides,
-      headers: { ...this.baseHeaders, ...headers },
-      method: 'GET',
-      redirect: 'follow',
-      mode: 'cors',
-      signal,
-    })
+    const res = await this.fetch(
+      this.url,
+      this.buildRequest(opts, {
+        range: `bytes=${position}-${position + length - 1}`,
+      }),
+    )
 
     if (!res.ok) {
       throw new Error(`HTTP ${res.status} fetching ${this.url}`)
@@ -107,10 +117,12 @@ export default class RemoteFile implements GenericFilehandle {
         }
       }
 
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-      const resData = res.bytes
-        ? await res.bytes()
-        : new Uint8Array(await res.arrayBuffer())
+      const resData = await toBytes(res)
+      // server didn't honor the range request and returned the full file —
+      // the body length is the actual file size
+      if (!this._stat && res.status === 200) {
+        this._stat = { size: resData.byteLength }
+      }
       return resData.byteLength <= length
         ? resData
         : resData.subarray(0, length)
@@ -123,36 +135,20 @@ export default class RemoteFile implements GenericFilehandle {
     )
   }
 
-  public async readFile(): Promise<Uint8Array<ArrayBuffer>>
-  public async readFile(options: BufferEncoding): Promise<string>
-  public async readFile<T extends undefined>(
-    options:
-      | Omit<FilehandleOptions, 'encoding'>
-      | (Omit<FilehandleOptions, 'encoding'> & { encoding: T }),
+  public async readFile(
+    options?: Omit<FilehandleOptions, 'encoding'>,
   ): Promise<Uint8Array<ArrayBuffer>>
-  public async readFile<T extends BufferEncoding>(
-    options: Omit<FilehandleOptions, 'encoding'> & { encoding: T },
+  public async readFile(
+    options:
+      | BufferEncoding
+      | (Omit<FilehandleOptions, 'encoding'> & { encoding: BufferEncoding }),
   ): Promise<string>
-  readFile<T extends BufferEncoding>(
-    options: Omit<FilehandleOptions, 'encoding'> & { encoding: T },
-  ): T extends BufferEncoding
-    ? Promise<string>
-    : Promise<Uint8Array<ArrayBuffer>>
   public async readFile(
     options: FilehandleOptions | BufferEncoding = {},
   ): Promise<Uint8Array<ArrayBuffer> | string> {
     const encoding = typeof options === 'string' ? options : options.encoding
     const opts = typeof options === 'string' ? {} : options
-    const { headers = {}, signal, overrides = {} } = opts
-    const res = await this.fetch(this.url, {
-      ...this.baseOverrides,
-      ...overrides,
-      headers: { ...this.baseHeaders, ...headers },
-      method: 'GET',
-      redirect: 'follow',
-      mode: 'cors',
-      signal,
-    })
+    const res = await this.fetch(this.url, this.buildRequest(opts))
     if (!res.ok) {
       throw new Error(`HTTP ${res.status} fetching ${this.url}`)
     }
@@ -161,8 +157,7 @@ export default class RemoteFile implements GenericFilehandle {
     } else if (encoding) {
       throw new Error(`unsupported encoding: ${encoding}`)
     } else {
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-      return res.bytes ? res.bytes() : new Uint8Array(await res.arrayBuffer())
+      return toBytes(res)
     }
   }
 

package/src/util.ts

@@ -0,0 +1,9 @@
+// Response.bytes() / Blob.bytes() is widely available but not yet in all
+// lib.dom.d.ts versions, so the optional-chain check is load-bearing for older
+// runtimes despite TS thinking it's always defined.
+export async function toBytes(
+  src: Response | Blob,
+): Promise<Uint8Array<ArrayBuffer>> {
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+  return src.bytes ? src.bytes() : new Uint8Array(await src.arrayBuffer())
+}