libfw-client 0.4.0 → 0.4.2

package/index.d.ts

@@ -36,6 +36,17 @@ export interface UploadEntry {
   mtime: number;
 }
 
+/**
+ * A `File` together with a caller-provided virtual path override. Passed
+ * verbatim to `options.resolveUploadPath`; when no resolver is configured,
+ * `relPath` itself is used as the upload path.
+ */
+export interface UploadFileEntry {
+  file: File;
+  /** Virtual path (POSIX separators) to upload the file as. */
+  relPath?: string;
+}
+
 /** Adaptive-tuning parameters the engine is currently tuned to. */
 export interface TuningParams {
   /** Cross-file transfer concurrency. */
@@ -171,6 +182,30 @@ export interface LibfwClientOptions {
   tuneTtlMs?: number;
   /** Optional progress/state listener. Tuning updates arrive as `{ type: 'tuning', phase, params, stats }`. */
   onEvent?: (event: LibfwEvent | LibfwTuningEvent) => void;
+  /**
+   * Pre-selected directory handle (or a resolver returning one) used instead
+   * of `showDirectoryPicker()` for every fs-mode download/upload.
+   */
+  directoryHandle?:
+    | FileSystemDirectoryHandle
+    | (() => FileSystemDirectoryHandle | Promise<FileSystemDirectoryHandle>);
+  /**
+   * Map a virtual server path to the display name used for fs-mode on-disk
+   * paths (directories/files created in the picked download folder),
+   * browser downloads, `.zip` entry names and the `.zip` archive name. May
+   * be async; returned values are still validated against zip-slip.
+   */
+  resolveDisplayName?: (path: string) => string | Promise<string>;
+  /**
+   * Map an upload entry to its virtual path on the server. `entry` is the
+   * original item passed to `upload()` (a bare `File` or an
+   * `UploadFileEntry` wrapper). `defaultPath` is
+   * `entry.relPath || file.webkitRelativePath || file.name`. May be async.
+   */
+  resolveUploadPath?: (
+    entry: File | UploadFileEntry,
+    defaultPath: string
+  ) => string | Promise<string>;
 }
 
 /**
@@ -204,9 +239,12 @@ export declare class LibfwClient {
    *
    * @param token bearer token
    * @param filePath virtual server path of the file to download
+   * @param opts optional overrides; `fileName` is the local name the file is
+   *        saved as (leaf name only — parent directories of `filePath` still
+   *        apply in fs mode).
    * @returns total bytes written
    */
-  downloadFile(token: string, filePath: string): Promise<number>;
+  downloadFile(token: string, filePath: string, opts?: { fileName?: string }): Promise<number>;
 
   /**
    * Upload files to the server.
@@ -220,7 +258,7 @@ export declare class LibfwClient {
    */
   upload(
     token: string,
-    files?: FileList | File[] | UploadEntry[],
+    files?: FileList | File[] | UploadFileEntry[] | UploadEntry[],
   ): Promise<number>;
 
   /** Pause the active transfer. */

package/index.js

@@ -245,6 +245,26 @@ export class LibfwClient {
    * @param {(event: {type: string, done: number, total: number, path?: string, error?: string}) => void} [options.onEvent]
    *        optional progress/state listener. Tuning updates arrive as
    *        `{ type: 'tuning', phase, params, stats }` events.
+   * @param {FileSystemDirectoryHandle|(() => FileSystemDirectoryHandle|Promise<FileSystemDirectoryHandle>)} [options.directoryHandle]
+   *        pre-selected directory handle (or a resolver returning one) used
+   *        instead of popping `showDirectoryPicker()` for every fs-mode
+   *        download/upload. Callers that already hold a handle (e.g. from a
+   *        picker of their own, or a persisted handle) can inject it here.
+   * @param {(path: string) => string|Promise<string>} [options.resolveDisplayName]
+   *        optional mapping from a virtual server path to the display name
+   *        used for fs-mode on-disk paths (`_ensureFileHandle` — the
+   *        directories/files actually created in the picked folder), browser
+   *        downloads (`_downloadName`), `.zip` entry names (fallback folder
+   *        downloads) and the `.zip` archive name. The resolver may be sync
+   *        or async (return a `Promise`); returned values are still validated
+   *        against zip-slip/path traversal.
+   * @param {(entry: File|{file: File, relPath?: string}, defaultPath: string) => string|Promise<string>} [options.resolveUploadPath]
+   *        optional mapping from an upload entry to its virtual path on the
+   *        server. `entry` is the ORIGINAL item passed to `upload()` — either
+   *        a bare `File` or a caller wrapper such as `{ file, relPath }` — so
+   *        custom metadata survives into the resolver. `defaultPath` is
+   *        `entry.relPath || file.webkitRelativePath || file.name`. The
+   *        resolver may be sync or async (return a `Promise`).
    */
   constructor(options = {}) {
     this._options = {
@@ -265,6 +285,9 @@ export class LibfwClient {
       autoTune: false,
       tuneTtlMs: 3600000,
       onEvent: null,
+      directoryHandle: null,
+      resolveDisplayName: null,
+      resolveUploadPath: null,
       ...options,
     };
     /** @type {WasmEngine|null} */
@@ -283,9 +306,11 @@ export class LibfwClient {
     this._uploadPlan = [];
     /**
      * Active browser-download fallback state, or `null`.
-     * @type {{isFolder:boolean, buffers:Map<string,Uint8Array[]>, order:string[], sizes:Map<string,number>}|null}
+     * @type {{isFolder:boolean, buffers:Map<string,Uint8Array[]>, order:string[], sizes:Map<string,number>, total:number, buffered:number}|null}
      */
     this._fallback = null;
+    /** Leaf-name override for the current single-file download, or `null`. */
+    this._singleFileName = null;
   }
 
   // ------------------------------------------------------------------ setup
@@ -434,6 +459,22 @@ export class LibfwClient {
     );
   }
 
+  /**
+   * Obtain the destination directory handle for fs-mode transfers: the
+   * injected `directoryHandle` option (a handle or a resolver function)
+   * wins; otherwise `showDirectoryPicker()` is popped.
+   * @returns {Promise<FileSystemDirectoryHandle>}
+   * @private
+   */
+  async _pickDirectory() {
+    const provided = this._options.directoryHandle;
+    if (provided) {
+      const handle = typeof provided === 'function' ? await provided() : provided;
+      if (handle) return handle;
+    }
+    return window.showDirectoryPicker();
+  }
+
   /**
    * Resolve the effective download mode from the `downloadMode` option:
    * an explicit `'fs'`/`'browser'` wins; `'auto'` falls back to the browser
@@ -469,7 +510,7 @@ export class LibfwClient {
     if (this._effectiveMode() === 'browser') {
       return this._downloadViaBrowser(engine, token, dirPath, true);
     }
-    this._dirHandle = await window.showDirectoryPicker();
+    this._dirHandle = await this._pickDirectory();
     this._fileHandles.clear();
     try {
       return await engine.download_folder(this._options.baseUrl, token, dirPath);
@@ -491,22 +532,35 @@ export class LibfwClient {
    *
    * @param {string} token bearer token
    * @param {string} filePath virtual server path of the file to download
+   * @param {{fileName?: string}} [opts] optional overrides; `fileName` is the
+   *        local name the file is saved as (leaf name only — parent
+   *        directories of `filePath` still apply in fs mode).
    * @returns {Promise<number>} total bytes transferred
    * @throws {LibfwError}
    */
-  async downloadFile(token, filePath) {
+  async downloadFile(token, filePath, opts = {}) {
     const engine = await this._ready();
     if (!filePath) throw new LibfwError('downloadFile requires a file path', 'path');
-    if (this._effectiveMode() === 'browser') {
-      return this._downloadViaBrowser(engine, token, filePath, false);
+    if (opts.fileName !== undefined) {
+      const name = String(opts.fileName);
+      // Reject anything that could escape the destination directory (the
+      // FS Access API would throw a raw TypeError anyway; fail uniformly).
+      if (!name || name === '.' || name === '..' || /[/\\]/.test(name)) {
+        throw new LibfwError(`invalid fileName: ${name}`, 'path');
+      }
     }
-    this._dirHandle = await window.showDirectoryPicker();
-    this._fileHandles.clear();
+    this._singleFileName = opts.fileName ? String(opts.fileName) : null;
     try {
+      if (this._effectiveMode() === 'browser') {
+        return await this._downloadViaBrowser(engine, token, filePath, false);
+      }
+      this._dirHandle = await this._pickDirectory();
+      this._fileHandles.clear();
       return await engine.download_file(this._options.baseUrl, token, filePath);
     } catch (err) {
       throw toLibfwError(err);
     } finally {
+      this._singleFileName = null;
       await this._flushWritables();
       await this._syncResumeOffsets();
     }
@@ -531,7 +585,7 @@ export class LibfwClient {
    * @private
    */
   async _downloadViaBrowser(engine, token, path, isFolder) {
-    this._fallback = { isFolder, buffers: new Map(), order: [], sizes: new Map(), total: 0 };
+    this._fallback = { isFolder, buffers: new Map(), order: [], sizes: new Map(), total: 0, buffered: 0 };
     try {
       const total = isFolder
         ? await engine.download_folder(this._options.baseUrl, token, path)
@@ -539,22 +593,36 @@ export class LibfwClient {
       const { buffers, order, sizes } = this._fallback;
       if (isFolder) {
         const entries = [];
+        // Distinct virtual paths may map to the same display name (a custom
+        // `resolveDisplayName` is not required to be injective); duplicate
+        // names would silently shadow each other on extraction.
+        const names = new Set();
+        const pushEntry = (name, data) => {
+          if (names.has(name)) {
+            throw new LibfwError(`duplicate download entry name: ${name}`, 'path');
+          }
+          names.add(name);
+          entries.push({ name, data });
+        };
         for (const p of order) {
-          entries.push({
-            name: this._safeEntryName(p),
-            data: this._concatBuffers(buffers.get(p)?.chunks || []),
-          });
+          pushEntry(
+            await this._safeEntryName(p),
+            this._concatBuffers(buffers.get(p)?.chunks || [])
+          );
         }
         // Include files that were announced but produced no bytes (empty).
         for (const p of sizes.keys()) {
           if (!buffers.has(p)) {
-            entries.push({ name: this._safeEntryName(p), data: new Uint8Array(0) });
+            pushEntry(await this._safeEntryName(p), new Uint8Array(0));
           }
         }
-        this._triggerBrowserDownload(createZip(entries), this._archiveName(path));
+        this._triggerBrowserDownload(createZip(entries), await this._archiveName(path));
       } else {
         const data = this._concatBuffers(buffers.get(path)?.chunks || []);
-        this._triggerBrowserDownload(new Blob([data], { type: 'application/octet-stream' }), this._downloadName(path));
+        this._triggerBrowserDownload(
+          new Blob([data], { type: 'application/octet-stream' }),
+          this._singleFileName || (await this._downloadName(path))
+        );
       }
       return total;
     } catch (err) {
@@ -584,25 +652,36 @@ export class LibfwClient {
   }
 
   /**
-   * Strip a leading `/` so an entry path is archive/OS friendly.
+   * Strip a leading `/` so an entry path is archive/OS/disk friendly,
+   * applying the `resolveDisplayName` option when configured. The resolver
+   * may be sync or async (return a `Promise`); both fs-mode on-disk paths
+   * (`_ensureFileHandle`) and browser-fallback archive/file names go
+   * through here, so a display-name mapping applies uniformly to every
+   * download destination.
    * @param {string} path
-   * @returns {string}
+   * @returns {Promise<string>}
    * @private
    */
-  _cleanPath(path) {
-    return String(path).replace(/^\/+/, '');
+  async _cleanPath(path) {
+    const resolve = this._options.resolveDisplayName;
+    let resolved = null;
+    if (typeof resolve === 'function') {
+      resolved = await resolve(String(path));
+    }
+    return String(resolved != null ? resolved : path).replace(/^\/+/, '');
   }
 
   /**
-   * Validate a virtual path for use as a ZIP entry name, rejecting any
-   * traversal (`..`), absolute/drive-letter prefixes or Windows-style
-   * separators that could escape the archive on extraction (zip-slip).
+   * Validate a virtual path for use as a ZIP entry name or an on-disk
+   * fs-mode path, rejecting any traversal (`..`), absolute/drive-letter
+   * prefixes or Windows-style separators that could escape the archive on
+   * extraction (zip-slip) or the picked download directory.
    * @param {string} path
-   * @returns {string}
+   * @returns {Promise<string>}
    * @private
    */
-  _safeEntryName(path) {
-    const cleaned = this._cleanPath(path);
+  async _safeEntryName(path) {
+    const cleaned = await this._cleanPath(path);
     const segs = String(cleaned).split('/');
     if (segs.some((seg) => seg === '..' || seg.includes('\\') || /^[a-zA-Z]:/.test(seg))) {
       throw new LibfwError(`unsafe path in download: ${path}`, 'path');
@@ -623,22 +702,22 @@ export class LibfwClient {
   /**
    * Derive a safe file name from a virtual path.
    * @param {string} path
-   * @returns {string}
+   * @returns {Promise<string>}
    * @private
    */
-  _downloadName(path) {
-    const name = this._cleanPath(path).split('/').pop();
+  async _downloadName(path) {
+    const name = (await this._cleanPath(path)).split('/').pop();
     return name || 'download';
   }
 
   /**
    * Derive the `.zip` archive name for a folder download.
    * @param {string} path
-   * @returns {string}
+   * @returns {Promise<string>}
    * @private
    */
-  _archiveName(path) {
-    const base = this._cleanPath(path).split('/').pop() || 'download';
+  async _archiveName(path) {
+    const base = (await this._cleanPath(path)).split('/').pop() || 'download';
     return `${base.replace(/[^\w.\- ]+/g, '_') || 'download'}.zip`;
   }
 
@@ -703,6 +782,18 @@ export class LibfwClient {
       }
       buf.chunks.push(data);
       buf.len += data.length;
+      // Runtime backstop for the in-memory cap: `onFileStart` pre-checks use
+      // the engine's declared size; an under-reported size (or a skipped
+      // fileStart on an unusual path) must still fail instead of growing the
+      // buffer unbounded.
+      this._fallback.buffered += data.length;
+      const max = this._maxFallbackBytes();
+      if (max > 0 && this._fallback.buffered > max) {
+        throw new LibfwError(
+          `browser download buffered more than the ${max}-byte in-memory limit`,
+          'too-large'
+        );
+      }
       return;
     }
     let entry = this._writables.get(path);
@@ -797,7 +888,9 @@ export class LibfwClient {
    * @private
    */
   async _ensureFileHandle(path) {
-    const segments = splitPath(path);
+    // Map through the display-name resolver (sync or async) so fs-mode
+    // streaming lands under the same names the browser fallback would use.
+    const segments = splitPath(await this._safeEntryName(path));
     if (segments.length === 0) {
       throw new LibfwError(`invalid download path: ${path}`, 'path');
     }
@@ -805,7 +898,7 @@ export class LibfwClient {
     for (let i = 0; i < segments.length - 1; i += 1) {
       dir = await dir.getDirectoryHandle(segments[i], { create: true });
     }
-    const name = segments[segments.length - 1];
+    const name = this._singleFileName || segments[segments.length - 1];
     const handle = await dir.getFileHandle(name, { create: true });
     return { dir, name, handle };
   }
@@ -836,7 +929,9 @@ export class LibfwClient {
   async _resolveFileHandle(path) {
     if (!this._dirHandle) return null;
     try {
-      const segments = splitPath(path);
+      // Same display-name mapping as `_ensureFileHandle` so a resume finds
+      // the file previously written under its resolved (display) name.
+      const segments = splitPath(await this._safeEntryName(path));
       if (segments.length === 0) return null;
       let dir = this._dirHandle;
       for (let i = 0; i < segments.length - 1; i += 1) {
@@ -945,12 +1040,14 @@ export class LibfwClient {
    *
    * If `files` is omitted, `showDirectoryPicker()` is used to select a
    * local folder whose structure is mirrored on the server. Otherwise
-   * `files` may be a `FileList`, an array of `File`s, or an array of
+   * `files` may be a `FileList`, an array of `File`s, an array of
+   * `{ file, relPath }` wrappers (custom per-file virtual paths, passed
+   * verbatim to `resolveUploadPath`), or an array of
    * `{ path, size, mtime }` plan entries (when you want to drive reading
    * yourself).
    *
    * @param {string} token bearer token
-   * @param {FileList|File[]|Array<{path:string,size:number,mtime:number}>} [files]
+   * @param {FileList|File[]|Array<{file:File,relPath?:string}>|Array<{path:string,size:number,mtime:number}>} [files]
    * @returns {Promise<number>} total bytes uploaded
    * @throws {LibfwError}
    */
@@ -977,7 +1074,7 @@ export class LibfwClient {
       if (typeof window === 'undefined' || typeof window.showDirectoryPicker !== 'function') {
         throw new LibfwError('File System Access API is not available in this browser', 'unsupported');
       }
-      const dir = await window.showDirectoryPicker();
+      const dir = await this._pickDirectory();
       this._dirHandle = dir;
       this._uploadPlan = await this._collectDirectoryFiles(dir, '');
     } else {
@@ -1031,9 +1128,35 @@ export class LibfwClient {
     }
     const list = Array.from(files || []);
     const plan = [];
-    for (const file of list) {
-      if (!(file instanceof File)) continue;
-      const path = file.webkitRelativePath || file.name;
+    const resolve = this._options.resolveUploadPath;
+    const seen = new Set();
+    for (const entry of list) {
+      // Accept bare `File`s as well as wrappers like `{ file, relPath }`;
+      // the resolver receives the ORIGINAL entry so caller-side metadata
+      // (e.g. a custom `relPath`) is visible without WeakMap workarounds.
+      const file = entry instanceof File ? entry : entry && entry.file instanceof File ? entry.file : null;
+      if (!file) continue;
+      // A wrapper-provided `relPath` is the most specific default; fall
+      // back to the browser-provided relative path, then the file name.
+      const defaultPath =
+        (entry && typeof entry === 'object' && typeof entry.relPath === 'string' && entry.relPath
+          ? entry.relPath
+          : null) ||
+        file.webkitRelativePath ||
+        file.name;
+      // The resolver may be async; a `null`/`undefined` mapping falls back
+      // to the default path (same leniency as `resolveDisplayName`).
+      let path = defaultPath;
+      if (typeof resolve === 'function') {
+        const mapped = await resolve(entry, defaultPath);
+        if (mapped != null) path = String(mapped);
+      }
+      // A mapping that collides would silently shadow one File with another
+      // (_uploadFiles keeps only the last) and upload the same path twice.
+      if (seen.has(path)) {
+        throw new LibfwError(`duplicate upload path: ${path}`, 'path');
+      }
+      seen.add(path);
       this._uploadFiles.set(path, file);
       plan.push({ path, size: file.size, mtime: Math.floor(file.lastModified / 1000) });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libfw-client",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "High-performance streaming file & folder transfer SDK for the browser (libfw WASM engine + File System Access API + IndexedDB resume).",
   "license": "MIT",
   "type": "module",

package/pkg/libfw_client.d.ts

@@ -17,14 +17,10 @@ export class LibfwClient {
     done_bytes(): number;
     /**
      * Download a single file at `file_path` into the chosen local directory.
-     *
-     * Resolves with the number of bytes written.
      */
     download_file(base_url: string, token: string, file_path: string): Promise<any>;
     /**
      * Download every file under the virtual `dirPath` (empty = root).
-     *
-     * Resolves with the number of bytes written.
      */
     download_folder(base_url: string, token: string, dir_path: string): Promise<any>;
     /**
@@ -74,8 +70,6 @@ export class LibfwClient {
     tune_state(): any;
     /**
      * Upload the files reported by the JS `getFileList` callback.
-     *
-     * Resolves with the number of bytes uploaded.
      */
     upload(base_url: string, token: string): Promise<any>;
 }
@@ -109,10 +103,11 @@ export interface InitOutput {
     readonly libfwclient_tune_state: (a: number) => any;
     readonly libfwclient_upload: (a: number, b: number, c: number, d: number, e: number) => any;
     readonly start: () => void;
-    readonly wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___wasm_bindgen_1e05ddb24c0b7df4___JsValue__core_9b3796e30d99ddb7___result__Result_____wasm_bindgen_1e05ddb24c0b7df4___JsError___true_: (a: number, b: number, c: any) => [number, number];
-    readonly wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___js_sys_bb6c79d0abe11c10___Function_fn_wasm_bindgen_1e05ddb24c0b7df4___JsValue_____wasm_bindgen_1e05ddb24c0b7df4___sys__Undefined___js_sys_bb6c79d0abe11c10___Function_fn_wasm_bindgen_1e05ddb24c0b7df4___JsValue_____wasm_bindgen_1e05ddb24c0b7df4___sys__Undefined_______true_: (a: number, b: number, c: any, d: any) => void;
-    readonly wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___web_sys_cda36541fa15086d___features__gen_ProgressEvent__ProgressEvent______true_: (a: number, b: number, c: any) => void;
-    readonly wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke_______true_: (a: number, b: number) => void;
+    readonly wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue__core_ed718c3d60ebd546___result__Result_____wasm_bindgen_b2c787b844a3ac79___JsError___true_: (a: number, b: number, c: any) => [number, number];
+    readonly wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___js_sys_209827a80d159db4___Function_fn_wasm_bindgen_b2c787b844a3ac79___JsValue_____wasm_bindgen_b2c787b844a3ac79___sys__Undefined___js_sys_209827a80d159db4___Function_fn_wasm_bindgen_b2c787b844a3ac79___JsValue_____wasm_bindgen_b2c787b844a3ac79___sys__Undefined_______true_: (a: number, b: number, c: any, d: any) => void;
+    readonly wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue______true_: (a: number, b: number, c: any) => void;
+    readonly wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue______true__2: (a: number, b: number, c: any) => void;
+    readonly wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke_______true_: (a: number, b: number) => void;
     readonly __wbindgen_malloc: (a: number, b: number) => number;
     readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
     readonly __wbindgen_exn_store: (a: number) => void;

package/pkg/libfw_client.js

@@ -30,8 +30,6 @@ export class LibfwClient {
     }
     /**
      * Download a single file at `file_path` into the chosen local directory.
-     *
-     * Resolves with the number of bytes written.
      * @param {string} base_url
      * @param {string} token
      * @param {string} file_path
@@ -49,8 +47,6 @@ export class LibfwClient {
     }
     /**
      * Download every file under the virtual `dirPath` (empty = root).
-     *
-     * Resolves with the number of bytes written.
      * @param {string} base_url
      * @param {string} token
      * @param {string} dir_path
@@ -157,8 +153,6 @@ export class LibfwClient {
     }
     /**
      * Upload the files reported by the JS `getFileList` callback.
-     *
-     * Resolves with the number of bytes uploaded.
      * @param {string} base_url
      * @param {string} token
      * @returns {Promise<any>}
@@ -250,6 +244,9 @@ function __wbg_get_imports() {
         __wbg_abort_4426bc6bd4153680: function() { return handleError(function (arg0) {
             arg0.abort();
         }, arguments); },
+        __wbg_abort_8bae0f33e7833997: function(arg0) {
+            arg0.abort();
+        },
         __wbg_apply_3ac86a26fdb56c05: function() { return handleError(function (arg0, arg1, arg2) {
             const ret = arg0.apply(arg1, arg2);
             return ret;
@@ -270,9 +267,16 @@ function __wbg_get_imports() {
             const ret = arg0.call(arg1, arg2);
             return ret;
         }, arguments); },
+        __wbg_catch_c1a60df4c30d76d3: function(arg0, arg1) {
+            const ret = arg0.catch(arg1);
+            return ret;
+        },
         __wbg_clearInterval_2e2069e95ad09d4f: function(arg0, arg1) {
             arg0.clearInterval(arg1);
         },
+        __wbg_clearTimeout_8f80437be2324e09: function(arg0, arg1) {
+            arg0.clearTimeout(arg1);
+        },
         __wbg_encodeURIComponent_d0140ae6e13eb27b: function(arg0, arg1) {
             const ret = encodeURIComponent(getStringFromWasm0(arg0, arg1));
             return ret;
@@ -384,6 +388,10 @@ function __wbg_get_imports() {
             const ret = new Array();
             return ret;
         },
+        __wbg_new_4339b2a2675a03e3: function() { return handleError(function () {
+            const ret = new AbortController();
+            return ret;
+        }, arguments); },
         __wbg_new_6b1dd7bed0e5462c: function() { return handleError(function () {
             const ret = new XMLHttpRequest();
             return ret;
@@ -395,7 +403,7 @@ function __wbg_get_imports() {
                     const a = state0.a;
                     state0.a = 0;
                     try {
-                        return wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___js_sys_bb6c79d0abe11c10___Function_fn_wasm_bindgen_1e05ddb24c0b7df4___JsValue_____wasm_bindgen_1e05ddb24c0b7df4___sys__Undefined___js_sys_bb6c79d0abe11c10___Function_fn_wasm_bindgen_1e05ddb24c0b7df4___JsValue_____wasm_bindgen_1e05ddb24c0b7df4___sys__Undefined_______true_(a, state0.b, arg0, arg1);
+                        return wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___js_sys_209827a80d159db4___Function_fn_wasm_bindgen_b2c787b844a3ac79___JsValue_____wasm_bindgen_b2c787b844a3ac79___sys__Undefined___js_sys_209827a80d159db4___Function_fn_wasm_bindgen_b2c787b844a3ac79___JsValue_____wasm_bindgen_b2c787b844a3ac79___sys__Undefined_______true_(a, state0.b, arg0, arg1);
                     } finally {
                         state0.a = a;
                     }
@@ -429,7 +437,7 @@ function __wbg_get_imports() {
                     const a = state0.a;
                     state0.a = 0;
                     try {
-                        return wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___js_sys_bb6c79d0abe11c10___Function_fn_wasm_bindgen_1e05ddb24c0b7df4___JsValue_____wasm_bindgen_1e05ddb24c0b7df4___sys__Undefined___js_sys_bb6c79d0abe11c10___Function_fn_wasm_bindgen_1e05ddb24c0b7df4___JsValue_____wasm_bindgen_1e05ddb24c0b7df4___sys__Undefined_______true_(a, state0.b, arg0, arg1);
+                        return wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___js_sys_209827a80d159db4___Function_fn_wasm_bindgen_b2c787b844a3ac79___JsValue_____wasm_bindgen_b2c787b844a3ac79___sys__Undefined___js_sys_209827a80d159db4___Function_fn_wasm_bindgen_b2c787b844a3ac79___JsValue_____wasm_bindgen_b2c787b844a3ac79___sys__Undefined_______true_(a, state0.b, arg0, arg1);
                     } finally {
                         state0.a = a;
                     }
@@ -448,10 +456,6 @@ function __wbg_get_imports() {
             const ret = Date.now();
             return ret;
         },
-        __wbg_of_5f1b88183ddb5d94: function(arg0, arg1) {
-            const ret = Array.of(arg0, arg1);
-            return ret;
-        },
         __wbg_open_90286a4ce0ae2098: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5) {
             arg0.open(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4), arg5 !== 0);
         }, arguments); },
@@ -469,10 +473,6 @@ function __wbg_get_imports() {
         __wbg_queueMicrotask_6a09b7bc46549209: function(arg0) {
             queueMicrotask(arg0);
         },
-        __wbg_race_ac5c7b465abcfa15: function(arg0) {
-            const ret = Promise.race(arg0);
-            return ret;
-        },
         __wbg_read_8afa15f12a160ef8: function(arg0) {
             const ret = arg0.read();
             return ret;
@@ -501,10 +501,6 @@ function __wbg_get_imports() {
         __wbg_setRequestHeader_fe390ff50d349432: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
             arg0.setRequestHeader(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
         }, arguments); },
-        __wbg_setTimeout_725a27c387d005c7: function() { return handleError(function (arg0, arg1, arg2, arg3) {
-            const ret = arg0.setTimeout(arg1, arg2, arg3);
-            return ret;
-        }, arguments); },
         __wbg_setTimeout_cfa2cf195c3738db: function() { return handleError(function (arg0, arg1, arg2) {
             const ret = arg0.setTimeout(arg1, arg2);
             return ret;
@@ -537,6 +533,13 @@ function __wbg_get_imports() {
         __wbg_set_onreadystatechange_14ce44725c7e0789: function(arg0, arg1) {
             arg0.onreadystatechange = arg1;
         },
+        __wbg_set_signal_c4ef8faddb4c1446: function(arg0, arg1) {
+            arg0.signal = arg1;
+        },
+        __wbg_signal_dad7cb35193abd31: function(arg0) {
+            const ret = arg0.signal;
+            return ret;
+        },
         __wbg_stack_3b0d974bbf31e44f: function(arg0, arg1) {
             const ret = arg1.stack;
             const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -576,6 +579,10 @@ function __wbg_get_imports() {
             const ret = arg0.then(arg1);
             return ret;
         },
+        __wbg_then_e0960b859f3ff223: function(arg0, arg1) {
+            const ret = arg0.then(arg1);
+            return ret;
+        },
         __wbg_total_21672ff1bd8d23ea: function(arg0) {
             const ret = arg0.total;
             return ret;
@@ -585,26 +592,31 @@ function __wbg_get_imports() {
             return ret;
         }, arguments); },
         __wbindgen_cast_0000000000000001: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 198, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___wasm_bindgen_1e05ddb24c0b7df4___JsValue__core_9b3796e30d99ddb7___result__Result_____wasm_bindgen_1e05ddb24c0b7df4___JsError___true_);
+            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 209, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue__core_ed718c3d60ebd546___result__Result_____wasm_bindgen_b2c787b844a3ac79___JsError___true_);
             return ret;
         },
         __wbindgen_cast_0000000000000002: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("ProgressEvent")], shim_idx: 5, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___web_sys_cda36541fa15086d___features__gen_ProgressEvent__ProgressEvent______true_);
+            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 5, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue______true_);
             return ret;
         },
         __wbindgen_cast_0000000000000003: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 7, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke_______true_);
+            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("ProgressEvent")], shim_idx: 5, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue______true__2);
+            return ret;
+        },
+        __wbindgen_cast_0000000000000004: function(arg0, arg1) {
+            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 8, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke_______true_);
             return ret;
         },
-        __wbindgen_cast_0000000000000004: function(arg0) {
+        __wbindgen_cast_0000000000000005: function(arg0) {
             // Cast intrinsic for `F64 -> Externref`.
             const ret = arg0;
             return ret;
         },
-        __wbindgen_cast_0000000000000005: function(arg0, arg1) {
+        __wbindgen_cast_0000000000000006: function(arg0, arg1) {
             // Cast intrinsic for `Ref(String) -> Externref`.
             const ret = getStringFromWasm0(arg0, arg1);
             return ret;
@@ -625,23 +637,27 @@ function __wbg_get_imports() {
     };
 }
 
-function wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke_______true_(arg0, arg1) {
-    wasm.wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke_______true_(arg0, arg1);
+function wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke_______true_(arg0, arg1) {
+    wasm.wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke_______true_(arg0, arg1);
+}
+
+function wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue______true_(arg0, arg1, arg2) {
+    wasm.wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue______true_(arg0, arg1, arg2);
 }
 
-function wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___web_sys_cda36541fa15086d___features__gen_ProgressEvent__ProgressEvent______true_(arg0, arg1, arg2) {
-    wasm.wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___web_sys_cda36541fa15086d___features__gen_ProgressEvent__ProgressEvent______true_(arg0, arg1, arg2);
+function wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue______true__2(arg0, arg1, arg2) {
+    wasm.wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue______true__2(arg0, arg1, arg2);
 }
 
-function wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___wasm_bindgen_1e05ddb24c0b7df4___JsValue__core_9b3796e30d99ddb7___result__Result_____wasm_bindgen_1e05ddb24c0b7df4___JsError___true_(arg0, arg1, arg2) {
-    const ret = wasm.wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___wasm_bindgen_1e05ddb24c0b7df4___JsValue__core_9b3796e30d99ddb7___result__Result_____wasm_bindgen_1e05ddb24c0b7df4___JsError___true_(arg0, arg1, arg2);
+function wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue__core_ed718c3d60ebd546___result__Result_____wasm_bindgen_b2c787b844a3ac79___JsError___true_(arg0, arg1, arg2) {
+    const ret = wasm.wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue__core_ed718c3d60ebd546___result__Result_____wasm_bindgen_b2c787b844a3ac79___JsError___true_(arg0, arg1, arg2);
     if (ret[1]) {
         throw takeFromExternrefTable0(ret[0]);
     }
 }
 
-function wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___js_sys_bb6c79d0abe11c10___Function_fn_wasm_bindgen_1e05ddb24c0b7df4___JsValue_____wasm_bindgen_1e05ddb24c0b7df4___sys__Undefined___js_sys_bb6c79d0abe11c10___Function_fn_wasm_bindgen_1e05ddb24c0b7df4___JsValue_____wasm_bindgen_1e05ddb24c0b7df4___sys__Undefined_______true_(arg0, arg1, arg2, arg3) {
-    wasm.wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___js_sys_bb6c79d0abe11c10___Function_fn_wasm_bindgen_1e05ddb24c0b7df4___JsValue_____wasm_bindgen_1e05ddb24c0b7df4___sys__Undefined___js_sys_bb6c79d0abe11c10___Function_fn_wasm_bindgen_1e05ddb24c0b7df4___JsValue_____wasm_bindgen_1e05ddb24c0b7df4___sys__Undefined_______true_(arg0, arg1, arg2, arg3);
+function wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___js_sys_209827a80d159db4___Function_fn_wasm_bindgen_b2c787b844a3ac79___JsValue_____wasm_bindgen_b2c787b844a3ac79___sys__Undefined___js_sys_209827a80d159db4___Function_fn_wasm_bindgen_b2c787b844a3ac79___JsValue_____wasm_bindgen_b2c787b844a3ac79___sys__Undefined_______true_(arg0, arg1, arg2, arg3) {
+    wasm.wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___js_sys_209827a80d159db4___Function_fn_wasm_bindgen_b2c787b844a3ac79___JsValue_____wasm_bindgen_b2c787b844a3ac79___sys__Undefined___js_sys_209827a80d159db4___Function_fn_wasm_bindgen_b2c787b844a3ac79___JsValue_____wasm_bindgen_b2c787b844a3ac79___sys__Undefined_______true_(arg0, arg1, arg2, arg3);
 }
 
 const LibfwClientFinalization = (typeof FinalizationRegistry === 'undefined')

package/pkg/libfw_client_bg.wasm.d.ts

@@ -19,10 +19,11 @@ export const libfwclient_total_bytes: (a: number) => number;
 export const libfwclient_tune_state: (a: number) => any;
 export const libfwclient_upload: (a: number, b: number, c: number, d: number, e: number) => any;
 export const start: () => void;
-export const wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___wasm_bindgen_1e05ddb24c0b7df4___JsValue__core_9b3796e30d99ddb7___result__Result_____wasm_bindgen_1e05ddb24c0b7df4___JsError___true_: (a: number, b: number, c: any) => [number, number];
-export const wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___js_sys_bb6c79d0abe11c10___Function_fn_wasm_bindgen_1e05ddb24c0b7df4___JsValue_____wasm_bindgen_1e05ddb24c0b7df4___sys__Undefined___js_sys_bb6c79d0abe11c10___Function_fn_wasm_bindgen_1e05ddb24c0b7df4___JsValue_____wasm_bindgen_1e05ddb24c0b7df4___sys__Undefined_______true_: (a: number, b: number, c: any, d: any) => void;
-export const wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke___web_sys_cda36541fa15086d___features__gen_ProgressEvent__ProgressEvent______true_: (a: number, b: number, c: any) => void;
-export const wasm_bindgen_1e05ddb24c0b7df4___convert__closures_____invoke_______true_: (a: number, b: number) => void;
+export const wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue__core_ed718c3d60ebd546___result__Result_____wasm_bindgen_b2c787b844a3ac79___JsError___true_: (a: number, b: number, c: any) => [number, number];
+export const wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___js_sys_209827a80d159db4___Function_fn_wasm_bindgen_b2c787b844a3ac79___JsValue_____wasm_bindgen_b2c787b844a3ac79___sys__Undefined___js_sys_209827a80d159db4___Function_fn_wasm_bindgen_b2c787b844a3ac79___JsValue_____wasm_bindgen_b2c787b844a3ac79___sys__Undefined_______true_: (a: number, b: number, c: any, d: any) => void;
+export const wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue______true_: (a: number, b: number, c: any) => void;
+export const wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke___wasm_bindgen_b2c787b844a3ac79___JsValue______true__2: (a: number, b: number, c: any) => void;
+export const wasm_bindgen_b2c787b844a3ac79___convert__closures_____invoke_______true_: (a: number, b: number) => void;
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_exn_store: (a: number) => void;

package/pkg/package.json

@@ -2,7 +2,7 @@
   "name": "libfw-client",
   "type": "module",
   "description": "WASM engine + JS SDK for libfw browser clients",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "license": "MIT",
   "repository": {
     "type": "git",

package/zip.js

@@ -51,8 +51,21 @@ export function createZip(entries) {
   const central = [];
   let offset = 0;
 
+  // This writer uses classic 32-bit ZIP fields (no ZIP64): entry sizes, the
+  // local-header offset, the central-directory size/offset and the entry
+  // count are all stored as u32/u16. Exceeding any of them would silently
+  // corrupt the archive, so fail loudly instead.
+  const MAX_U32 = 0xffffffff;
+  const MAX_U16 = 0xffff;
+  if (entries.length > MAX_U16) {
+    throw new Error(`too many zip entries: ${entries.length} > ${MAX_U16}`);
+  }
+
   for (const entry of entries) {
     const nameBytes = encoder.encode(entry.name);
+    if (nameBytes.length > MAX_U16) {
+      throw new Error(`zip entry name too long: ${entry.name.slice(0, 64)}…`);
+    }
     const data = entry.data;
     const crc = crc32(data);
 
@@ -75,6 +88,9 @@ export function createZip(entries) {
     body.push(local, data);
     central.push({ nameBytes, crc, size: data.length, offset });
     offset += local.length + data.length;
+    if (offset > MAX_U32) {
+      throw new Error('zip archive exceeds the 4 GiB limit of this writer');
+    }
   }
 
   // Central directory.
@@ -104,6 +120,9 @@ export function createZip(entries) {
     dir.push(cd);
     cdSize += cd.length;
   }
+  if (cdSize > MAX_U32) {
+    throw new Error('zip central directory exceeds the 4 GiB limit of this writer');
+  }
 
   const cdOffset = offset;