@utoo/web 1.2.0-rc.6 → 1.2.0-rc.7

package/esm/project.js

@@ -81,6 +81,9 @@ export class Project {
     }
     async writeFile(path, content, encoding) {
         await __classPrivateFieldGet(this, _Project_mount, "f");
+        if (content instanceof Uint8Array) {
+            return await this.remote.writeFile(path, comlink.transfer(content, [content.buffer]), encoding);
+        }
         return await this.remote.writeFile(path, content, encoding);
     }
     async copyFile(src, dst) {
@@ -111,11 +114,12 @@ export class Project {
     }
     async gzip(files) {
         await __classPrivateFieldGet(this, _Project_mount, "f");
-        return await this.remote.gzip(files);
+        const buffers = files.map((f) => f.content.buffer);
+        return await this.remote.gzip(comlink.transfer(files, buffers));
     }
     async sigMd5(content) {
         await __classPrivateFieldGet(this, _Project_mount, "f");
-        return await this.remote.sigMd5(content);
+        return await this.remote.sigMd5(comlink.transfer(content, [content.buffer]));
     }
     static fork(channel, eventSource) {
         (eventSource || self).postMessage(Fork, {

package/esm/sabcom.d.ts

@@ -12,11 +12,15 @@ export declare const SAB_OP_COPY_FILE = 7;
 export declare const SAB_OP_STAT = 8;
 export declare const STAT_TYPE_FILE = 0;
 export declare const STAT_TYPE_DIR = 1;
+export declare const SAB_INDEX_STATE = 0;
+export declare const SAB_INDEX_OP = 1;
+export declare const SAB_INDEX_DATA_LEN = 2;
+export declare const SAB_DATA_OFFSET = 12;
 export declare class SabComHost {
     private sab;
     private int32;
     private uint8;
-    statStruct: any;
+    private dataView;
     constructor(sab: SharedArrayBuffer);
     readRequest(): {
         op: number;
@@ -24,17 +28,24 @@ export declare class SabComHost {
     };
     writeResponse(data: Uint8Array | string): void;
     writeError(message: string): void;
-    writeStatResponse(): void;
+    writeStat(type: number, size: bigint, atimeMs: number, mtimeMs: number, ctimeMs: number, birthtimeMs: number): void;
 }
 export declare class SabComClient {
     private sab;
     private notifyHost;
     private int32;
     private uint8;
-    statStruct: any;
+    private dataView;
     constructor(sab: SharedArrayBuffer, notifyHost: () => void);
     call(op: number, data: string): Uint8Array<ArrayBuffer>;
-    callStat(path: string): any;
+    callStat(path: string): {
+        type: number;
+        size: bigint;
+        atimeMs: number;
+        mtimeMs: number;
+        ctimeMs: number;
+        birthtimeMs: number;
+    };
 }
 export interface SabFileSystem {
     read(path: string): Promise<Uint8Array>;

package/esm/sabcom.js

@@ -1,4 +1,3 @@
-import { BigUint64, BufferBackedObject, Float64, Uint8, } from "buffer-backed-object";
 export const SAB_STATE_IDLE = 0;
 export const SAB_STATE_REQUEST = 1;
 export const SAB_STATE_RESPONSE = 2;
@@ -13,14 +12,24 @@ export const SAB_OP_COPY_FILE = 7;
 export const SAB_OP_STAT = 8;
 export const STAT_TYPE_FILE = 0;
 export const STAT_TYPE_DIR = 1;
-const StatDescriptor = {
-    type: Uint8(),
-    size: BigUint64(),
-    atimeMs: Float64(),
-    mtimeMs: Float64(),
-    ctimeMs: Float64(),
-    birthtimeMs: Float64(),
-};
+export const SAB_INDEX_STATE = 0;
+export const SAB_INDEX_OP = 1;
+export const SAB_INDEX_DATA_LEN = 2;
+export const SAB_DATA_OFFSET = 12;
+// Stat struct layout (starts at byte 12)
+// type: Uint8 (1 byte) -> offset 0
+// padding: 7 bytes
+// size: BigUint64 (8 bytes) -> offset 8
+// atimeMs: Float64 (8 bytes) -> offset 16
+// mtimeMs: Float64 (8 bytes) -> offset 24
+// ctimeMs: Float64 (8 bytes) -> offset 32
+// birthtimeMs: Float64 (8 bytes) -> offset 40
+const STAT_OFFSET_TYPE = 0;
+const STAT_OFFSET_SIZE = 8;
+const STAT_OFFSET_ATIME = 16;
+const STAT_OFFSET_MTIME = 24;
+const STAT_OFFSET_CTIME = 32;
+const STAT_OFFSET_BIRTHTIME = 40;
 // Layout:
 // 0: State (Int32)
 // 1: Op (Int32)
@@ -31,14 +40,12 @@ export class SabComHost {
         this.sab = sab;
         this.int32 = new Int32Array(sab);
         this.uint8 = new Uint8Array(sab);
-        this.statStruct = BufferBackedObject(sab, StatDescriptor, {
-            byteOffset: 12,
-        });
+        this.dataView = new DataView(sab);
     }
     readRequest() {
-        const op = this.int32[1];
-        const len = this.int32[2];
-        const data = new TextDecoder().decode(this.uint8.slice(12, 12 + len));
+        const op = this.int32[SAB_INDEX_OP];
+        const len = this.int32[SAB_INDEX_DATA_LEN];
+        const data = new TextDecoder().decode(this.uint8.slice(SAB_DATA_OFFSET, SAB_DATA_OFFSET + len));
         return { op, data };
     }
     writeResponse(data) {
@@ -46,21 +53,28 @@ export class SabComHost {
             data = new TextEncoder().encode(data);
         }
         // TODO: Check size overflow
-        this.int32[2] = data.length;
-        this.uint8.set(data, 12);
-        Atomics.store(this.int32, 0, SAB_STATE_RESPONSE);
-        Atomics.notify(this.int32, 0);
+        this.int32[SAB_INDEX_DATA_LEN] = data.length;
+        this.uint8.set(data, SAB_DATA_OFFSET);
+        Atomics.store(this.int32, SAB_INDEX_STATE, SAB_STATE_RESPONSE);
+        Atomics.notify(this.int32, SAB_INDEX_STATE);
     }
     writeError(message) {
         const data = new TextEncoder().encode(message);
-        this.int32[2] = data.length;
-        this.uint8.set(data, 12);
-        Atomics.store(this.int32, 0, SAB_STATE_ERROR);
-        Atomics.notify(this.int32, 0);
+        this.int32[SAB_INDEX_DATA_LEN] = data.length;
+        this.uint8.set(data, SAB_DATA_OFFSET);
+        Atomics.store(this.int32, SAB_INDEX_STATE, SAB_STATE_ERROR);
+        Atomics.notify(this.int32, SAB_INDEX_STATE);
     }
-    writeStatResponse() {
-        Atomics.store(this.int32, 0, SAB_STATE_RESPONSE);
-        Atomics.notify(this.int32, 0);
+    writeStat(type, size, atimeMs, mtimeMs, ctimeMs, birthtimeMs) {
+        const base = SAB_DATA_OFFSET;
+        this.dataView.setUint8(base + STAT_OFFSET_TYPE, type);
+        this.dataView.setBigUint64(base + STAT_OFFSET_SIZE, size, true);
+        this.dataView.setFloat64(base + STAT_OFFSET_ATIME, atimeMs, true);
+        this.dataView.setFloat64(base + STAT_OFFSET_MTIME, mtimeMs, true);
+        this.dataView.setFloat64(base + STAT_OFFSET_CTIME, ctimeMs, true);
+        this.dataView.setFloat64(base + STAT_OFFSET_BIRTHTIME, birthtimeMs, true);
+        Atomics.store(this.int32, SAB_INDEX_STATE, SAB_STATE_RESPONSE);
+        Atomics.notify(this.int32, SAB_INDEX_STATE);
     }
 }
 export class SabComClient {
@@ -69,42 +83,48 @@ export class SabComClient {
         this.notifyHost = notifyHost;
         this.int32 = new Int32Array(sab);
         this.uint8 = new Uint8Array(sab);
-        this.statStruct = BufferBackedObject(sab, StatDescriptor, {
-            byteOffset: 12,
-        });
+        this.dataView = new DataView(sab);
     }
     call(op, data) {
         const encoded = new TextEncoder().encode(data);
-        this.int32[1] = op;
-        this.int32[2] = encoded.length;
-        this.uint8.set(encoded, 12);
-        Atomics.store(this.int32, 0, SAB_STATE_REQUEST);
+        this.int32[SAB_INDEX_OP] = op;
+        this.int32[SAB_INDEX_DATA_LEN] = encoded.length;
+        this.uint8.set(encoded, SAB_DATA_OFFSET);
+        Atomics.store(this.int32, SAB_INDEX_STATE, SAB_STATE_REQUEST);
         this.notifyHost();
-        Atomics.wait(this.int32, 0, SAB_STATE_REQUEST);
-        const state = Atomics.load(this.int32, 0);
+        Atomics.wait(this.int32, SAB_INDEX_STATE, SAB_STATE_REQUEST);
+        const state = Atomics.load(this.int32, SAB_INDEX_STATE);
         if (state === SAB_STATE_ERROR) {
-            const len = this.int32[2];
-            const msg = new TextDecoder().decode(this.uint8.slice(12, 12 + len));
+            const len = this.int32[SAB_INDEX_DATA_LEN];
+            const msg = new TextDecoder().decode(this.uint8.slice(SAB_DATA_OFFSET, SAB_DATA_OFFSET + len));
             throw new Error(msg);
         }
-        const len = this.int32[2];
-        return this.uint8.slice(12, 12 + len);
+        const len = this.int32[SAB_INDEX_DATA_LEN];
+        return this.uint8.slice(SAB_DATA_OFFSET, SAB_DATA_OFFSET + len);
     }
     callStat(path) {
         const encoded = new TextEncoder().encode(path);
-        this.int32[1] = SAB_OP_STAT;
-        this.int32[2] = encoded.length;
-        this.uint8.set(encoded, 12);
-        Atomics.store(this.int32, 0, SAB_STATE_REQUEST);
+        this.int32[SAB_INDEX_OP] = SAB_OP_STAT;
+        this.int32[SAB_INDEX_DATA_LEN] = encoded.length;
+        this.uint8.set(encoded, SAB_DATA_OFFSET);
+        Atomics.store(this.int32, SAB_INDEX_STATE, SAB_STATE_REQUEST);
         this.notifyHost();
-        Atomics.wait(this.int32, 0, SAB_STATE_REQUEST);
-        const state = Atomics.load(this.int32, 0);
+        Atomics.wait(this.int32, SAB_INDEX_STATE, SAB_STATE_REQUEST);
+        const state = Atomics.load(this.int32, SAB_INDEX_STATE);
         if (state === SAB_STATE_ERROR) {
-            const len = this.int32[2];
-            const msg = new TextDecoder().decode(this.uint8.slice(12, 12 + len));
+            const len = this.int32[SAB_INDEX_DATA_LEN];
+            const msg = new TextDecoder().decode(this.uint8.slice(SAB_DATA_OFFSET, SAB_DATA_OFFSET + len));
             throw new Error(msg);
         }
-        return this.statStruct;
+        const base = SAB_DATA_OFFSET;
+        return {
+            type: this.dataView.getUint8(base + STAT_OFFSET_TYPE),
+            size: this.dataView.getBigUint64(base + STAT_OFFSET_SIZE, true),
+            atimeMs: this.dataView.getFloat64(base + STAT_OFFSET_ATIME, true),
+            mtimeMs: this.dataView.getFloat64(base + STAT_OFFSET_MTIME, true),
+            ctimeMs: this.dataView.getFloat64(base + STAT_OFFSET_CTIME, true),
+            birthtimeMs: this.dataView.getFloat64(base + STAT_OFFSET_BIRTHTIME, true),
+        };
     }
 }
 export const handleSabRequest = async (sabHost, fs) => {
@@ -165,14 +185,13 @@ export const handleSabRequest = async (sabHost, fs) => {
             const json = metadata.toJSON
                 ? metadata.toJSON()
                 : metadata;
-            sabHost.statStruct.type =
-                json.type === "directory" ? STAT_TYPE_DIR : STAT_TYPE_FILE;
-            sabHost.statStruct.size = BigInt(json.file_size || 0);
-            sabHost.statStruct.atimeMs = Number(json.atimeMs || 0);
-            sabHost.statStruct.mtimeMs = Number(json.mtimeMs || 0);
-            sabHost.statStruct.ctimeMs = Number(json.ctimeMs || 0);
-            sabHost.statStruct.birthtimeMs = Number(json.birthtimeMs || 0);
-            sabHost.writeStatResponse();
+            const type = json.type === "directory" ? STAT_TYPE_DIR : STAT_TYPE_FILE;
+            const size = BigInt(json.file_size || 0);
+            const atimeMs = Number(json.atimeMs || 0);
+            const mtimeMs = Number(json.mtimeMs || 0);
+            const ctimeMs = Number(json.ctimeMs || 0);
+            const birthtimeMs = Number(json.birthtimeMs || 0);
+            sabHost.writeStat(type, size, atimeMs, mtimeMs, ctimeMs, birthtimeMs);
         }
         else {
             sabHost.writeError("Unknown op");

package/esm/utoo/index.js

@@ -300,7 +300,7 @@ export function wasm_thread_entry_point(ptr) {
 function __wbg_adapter_4(arg0, arg1, arg2) {
     wasm.__wbindgen_export_6(arg0, arg1, addHeapObject(arg2));
 }
-function __wbg_adapter_9(arg0, arg1) {
+function __wbg_adapter_11(arg0, arg1) {
     wasm.__wbindgen_export_7(arg0, arg1);
 }
 function __wbg_adapter_18(arg0, arg1, arg2) {
@@ -1774,17 +1774,17 @@ function __wbg_get_imports() {
     };
     imports.wbg.__wbindgen_cast_7b3678bd8e0fb80b = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 8626, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 8627, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8626, __wbg_adapter_18);
+        const ret = makeMutClosure(arg0, arg1, 8626, __wbg_adapter_4);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_884165a22f3e9702 = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 8626, function: Function { arguments: [Externref], shim_idx: 8627, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8626, __wbg_adapter_18);
+        const ret = makeMutClosure(arg0, arg1, 8626, __wbg_adapter_4);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_8b2c5f11dff5b9ba = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 8626, function: Function { arguments: [], shim_idx: 599, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8626, __wbg_adapter_9);
+        const ret = makeMutClosure(arg0, arg1, 8626, __wbg_adapter_11);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_9ae0607507abb057 = function (arg0) {
@@ -1794,12 +1794,12 @@ function __wbg_get_imports() {
     };
     imports.wbg.__wbindgen_cast_9f714a98b1af7c37 = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 8610, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 8611, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
-        const ret = makeClosure(arg0, arg1, 8610, __wbg_adapter_4);
+        const ret = makeClosure(arg0, arg1, 8610, __wbg_adapter_18);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_a5ee8c63b746891b = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 598, function: Function { arguments: [], shim_idx: 599, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 598, __wbg_adapter_9);
+        const ret = makeMutClosure(arg0, arg1, 598, __wbg_adapter_11);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_d6cd19b81560fd6e = function (arg0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/web",
-  "version": "1.2.0-rc.6",
+  "version": "1.2.0-rc.7",
   "module": "esm/index.js",
   "types": "esm/index.d.ts",
   "files": [
@@ -13,19 +13,17 @@
     "bindgen-dev": "wasm-bindgen ../../target/wasm32-unknown-unknown/wasm-dev/utoo_wasm.wasm --out-dir src/utoo --out-name index --target web --debug --keep-debug --no-demangle",
     "bindgen-build": "wasm-bindgen ../../target/wasm32-unknown-unknown/release/utoo_wasm.wasm --out-dir src/utoo --out-name index --target web",
     "bindgen-build:local": "wasm-bindgen ../../target/wasm32-unknown-unknown/release-local/utoo_wasm.wasm --out-dir src/utoo --out-name index --target web",
-    "pretsc": "npm run build --workspace @utoo/pack-shared",
-    "tsc": "rm -rf esm && tsc -p ./tsconfig.json",
-    "dev": "npm run build-wasm -- --profile wasm-dev && npm run bindgen-dev && npm run tsc  && npm run build-loaderWorker && cp src/utoo/index_bg.wasm esm/utoo",
+    "tsc": "rm -rf esm && tsc -p ./tsconfig.build.json",
+    "dev": "npm run build-wasm -- --profile wasm-dev && npm run bindgen-dev && npx turbo run tsc --filter=@utoo/web  && npm run build-loaderWorker && cp src/utoo/index_bg.wasm esm/utoo",
     "dev:pm": "npm run build-wasm:pm -- --profile wasm-dev && npm run bindgen-dev && npm run tsc && cp src/utoo/index_bg.wasm esm/utoo",
     "wasm-opt": "wasm-opt src/utoo/index_bg.wasm -o esm/utoo/index_bg.wasm --enable-threads --enable-bulk-memory --enable-nontrapping-float-to-int -Oz",
     "build": "npm run build-wasm -- --release && npm run bindgen-build && npm run tsc && npm run build-loaderWorker && npm run wasm-opt",
     "build:local": "npm run build-wasm -- --profile release-local && npm run bindgen-build:local && npm run tsc && npm run build-loaderWorker && cp src/utoo/index_bg.wasm esm/utoo",
     "build-loaderWorker": "node cli/umd.js -e ./src/webpackLoaders/worker.ts -o ./esm/loaderWorker.js -t webworker",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "turbo run build --filter=@utoo/web"
   },
   "dependencies": {
     "@utoo/pack-shared": "^0.0.7",
-    "buffer-backed-object": "^1.0.1",
     "comlink": "^4.4.2",
     "micromatch": "^4.0.8",
     "systemjs": "^6.15.1"
@@ -33,6 +31,7 @@
   "devDependencies": {
     "@types/micromatch": "^4.0.8",
     "@types/systemjs": "^6.15.1",
+    "binaryen": "^125.0.0",
     "node-stdlib-browser": "^1.3.1",
     "ts-loader": "^9.5.2",
     "typescript": "^5.8.3",