@tailwindcss/oxide-wasm32-wasi 0.0.0-insiders.bd9cf92 → 0.0.0-insiders.bdcd708

package/node_modules/@emnapi/wasi-threads/dist/wasi-threads.mjs

@@ -123,7 +123,6 @@ class ThreadManager {
     constructor(options) {
         var _a;
         this.unusedWorkers = [];
-        this.runningWorkers = [];
         this.pthreads = Object.create(null);
         this.wasmModule = null;
         this.wasmMemory = null;
@@ -148,6 +147,7 @@ class ThreadManager {
             this._beforeLoad = options.beforeLoad;
         }
         this.printErr = (_a = options.printErr) !== null && _a !== void 0 ? _a : console.error.bind(console);
+        this.threadSpawn = options.threadSpawn;
     }
     init() {
         if (!this._childThread) {
@@ -220,7 +220,6 @@ class ThreadManager {
             delete this.pthreads[tid];
         }
         this.unusedWorkers.push(worker);
-        this.runningWorkers.splice(this.runningWorkers.indexOf(worker), 1);
         delete worker.__emnapi_tid;
         if (ENVIRONMENT_IS_NODE) {
             worker.unref();
@@ -238,12 +237,17 @@ class ThreadManager {
                 if (worker.__emnapi_tid !== undefined) {
                     message = 'worker (tid = ' + worker.__emnapi_tid + ') sent an error!';
                 }
-                err(message + ' ' + e.message);
-                if (e.message.indexOf('RuntimeError') !== -1 || e.message.indexOf('unreachable') !== -1) {
-                    try {
-                        _this.terminateAllThreads();
+                if ('message' in e) {
+                    err(message + ' ' + e.message);
+                    if (e.message.indexOf('RuntimeError') !== -1 || e.message.indexOf('unreachable') !== -1) {
+                        try {
+                            _this.terminateAllThreads();
+                        }
+                        catch (_) { }
                     }
-                    catch (_) { }
+                }
+                else {
+                    err(message);
                 }
                 reject(e);
                 throw e;
@@ -264,6 +268,12 @@ class ThreadManager {
                             this.cleanThread(worker, payload.tid);
                         }
                     }
+                    else if (type === 'spawn-thread') {
+                        this.threadSpawn(payload.startArg, payload.errorOrTid);
+                    }
+                    else if (type === 'terminate-all-threads') {
+                        this.terminateAllThreads();
+                    }
                 }
             };
             worker.onmessage = (e) => {
@@ -336,10 +346,6 @@ class ThreadManager {
         }
         else {
             delete this.pthreads[tid];
-            const index = this.runningWorkers.indexOf(worker);
-            if (index !== -1) {
-                this.runningWorkers.splice(index, 1);
-            }
             this.terminateWorker(worker);
             delete worker.__emnapi_tid;
         }
@@ -358,14 +364,14 @@ class ThreadManager {
         };
     }
     terminateAllThreads() {
-        for (let i = 0; i < this.runningWorkers.length; ++i) {
-            this.terminateWorker(this.runningWorkers[i]);
+        const runningWorkers = Object.values(this.pthreads);
+        for (let i = 0; i < runningWorkers.length; ++i) {
+            this.terminateWorker(runningWorkers[i]);
         }
         for (let i = 0; i < this.unusedWorkers.length; ++i) {
             this.terminateWorker(this.unusedWorkers[i]);
         }
         this.unusedWorkers = [];
-        this.runningWorkers = [];
         this.pthreads = Object.create(null);
         this.preparePool();
     }
@@ -507,18 +513,6 @@ class WASIThreads {
         }
         this.postMessage = postMessage;
         const wasm64 = Boolean(options.wasm64);
-        const onMessage = (e) => {
-            if (e.data.__emnapi__) {
-                const type = e.data.__emnapi__.type;
-                const payload = e.data.__emnapi__.payload;
-                if (type === 'spawn-thread') {
-                    threadSpawn(payload.startArg, payload.errorOrTid);
-                }
-                else if (type === 'terminate-all-threads') {
-                    this.terminateAllThreads();
-                }
-            }
-        };
         const threadSpawn = (startArg, errorOrTid) => {
             var _a;
             const EAGAIN = 6;
@@ -536,12 +530,12 @@ class WASIThreads {
                     return 1;
                 }
                 else {
-                    return -6;
+                    return -EAGAIN;
                 }
             }
             if (!isNewABI) {
                 const malloc = this.wasmInstance.exports.malloc;
-                errorOrTid = wasm64 ? Number(malloc(BigInt(8))) : malloc(8);
+                errorOrTid = wasm64 ? Number(malloc(BigInt(8))) : (malloc(8) >>> 0);
                 if (!errorOrTid) {
                     return -48;
                 }
@@ -579,10 +573,9 @@ class WASIThreads {
                 if (!worker) {
                     throw new Error('failed to get new worker');
                 }
-                PThread.addMessageEventListener(worker, onMessage);
                 tid = PThread.markId(worker);
                 if (ENVIRONMENT_IS_NODE) {
-                    worker.ref();
+                    worker.unref();
                 }
                 worker.postMessage(createMessage('start', {
                     tid,
@@ -593,10 +586,6 @@ class WASIThreads {
                     if (typeof waitThreadStart === 'number') {
                         const waitResult = Atomics.wait(sab, 0, 0, waitThreadStart);
                         if (waitResult === 'timed-out') {
-                            try {
-                                PThread.cleanThread(worker, tid, true);
-                            }
-                            catch (_) { }
                             throw new Error('Spawning thread timed out. Please check if the worker is created successfully and if message is handled properly in the worker.');
                         }
                     }
@@ -605,15 +594,17 @@ class WASIThreads {
                     }
                     const r = Atomics.load(sab, 0);
                     if (r > 1) {
-                        try {
-                            PThread.cleanThread(worker, tid, true);
-                        }
-                        catch (_) { }
                         throw deserizeErrorFromBuffer(sab.buffer);
                     }
                 }
             }
             catch (e) {
+                if (worker !== undefined && tid !== undefined) {
+                    try {
+                        PThread.cleanThread(worker, tid, true);
+                    }
+                    catch (_) { }
+                }
                 Atomics.store(struct, 0, 1);
                 Atomics.store(struct, 1, EAGAIN);
                 Atomics.notify(struct, 1);
@@ -622,12 +613,11 @@ class WASIThreads {
                     return 1;
                 }
                 free(errorOrTid);
-                return -6;
+                return -EAGAIN;
             }
             Atomics.store(struct, 0, 0);
             Atomics.store(struct, 1, tid);
             Atomics.notify(struct, 1);
-            PThread.runningWorkers.push(worker);
             if (!shouldWait) {
                 worker.whenLoaded.catch((err) => {
                     delete worker.whenLoaded;
@@ -642,6 +632,9 @@ class WASIThreads {
             return tid;
         };
         this.threadSpawn = threadSpawn;
+        if (this.PThread) {
+            this.PThread.threadSpawn = threadSpawn;
+        }
     }
     getImportObject() {
         return {
@@ -724,19 +717,21 @@ function patchWasiInstance(wasiThreads, wasi) {
             return proc_exit.call(this, code);
         };
     }
-    const start = wasi.start;
-    if (typeof start === 'function') {
-        wasi.start = function (instance) {
-            try {
-                return start.call(this, instance);
-            }
-            catch (err) {
-                if (isTrapError(err)) {
-                    _this.terminateAllThreads();
+    if (!_this.childThread) {
+        const start = wasi.start;
+        if (typeof start === 'function') {
+            wasi.start = function (instance) {
+                try {
+                    return start.call(this, instance);
                 }
-                throw err;
-            }
-        };
+                catch (err) {
+                    if (isTrapError(err)) {
+                        _this.terminateAllThreads();
+                    }
+                    throw err;
+                }
+            };
+        }
     }
     patched.add(wasi);
 }
@@ -767,6 +762,7 @@ class ThreadMessageHandler {
         }
         this.postMessage = postMsg;
         this.onLoad = options === null || options === void 0 ? void 0 : options.onLoad;
+        this.onError = typeof (options === null || options === void 0 ? void 0 : options.onError) === 'function' ? options.onError : (_type, err) => { throw err; };
         this.instance = undefined;
         this.messagesBeforeLoad = [];
     }
@@ -781,13 +777,18 @@ class ThreadMessageHandler {
         if ((_a = e === null || e === void 0 ? void 0 : e.data) === null || _a === void 0 ? void 0 : _a.__emnapi__) {
             const type = e.data.__emnapi__.type;
             const payload = e.data.__emnapi__.payload;
-            if (type === 'load') {
-                this._load(payload);
+            try {
+                if (type === 'load') {
+                    this._load(payload);
+                }
+                else if (type === 'start') {
+                    this.handleAfterLoad(e, () => {
+                        this._start(payload);
+                    });
+                }
             }
-            else if (type === 'start') {
-                this.handleAfterLoad(e, () => {
-                    this._start(payload);
-                });
+            catch (err) {
+                this.onError(err, type);
             }
         }
     }
@@ -811,7 +812,8 @@ class ThreadMessageHandler {
         }
     }
     _start(payload) {
-        if (typeof this.instance.exports.wasi_thread_start !== 'function') {
+        const wasi_thread_start = this.instance.exports.wasi_thread_start;
+        if (typeof wasi_thread_start !== 'function') {
             const err = new TypeError('wasi_thread_start is not exported');
             notifyPthreadCreateResult(payload.sab, 2, err);
             throw err;
@@ -821,13 +823,15 @@ class ThreadMessageHandler {
         const startArg = payload.arg;
         notifyPthreadCreateResult(payload.sab, 1);
         try {
-            this.instance.exports.wasi_thread_start(tid, startArg);
+            wasi_thread_start(tid, startArg);
         }
         catch (err) {
-            if (isTrapError(err)) {
-                postMessage(createMessage('terminate-all-threads', {}));
+            if (err !== 'unwind') {
+                throw err;
+            }
+            else {
+                return;
             }
-            throw err;
         }
         postMessage(createMessage('cleanup-thread', { tid }));
     }

package/node_modules/@emnapi/wasi-threads/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emnapi/wasi-threads",
-  "version": "1.0.2",
+  "version": "1.2.2",
   "description": "WASI threads proposal implementation in JavaScript",
   "main": "index.js",
   "module": "./dist/wasi-threads.esm-bundler.js",

package/node_modules/@napi-rs/wasm-runtime/dist/fs-proxy.cjs

@@ -0,0 +1,299 @@
+'use strict';
+
+// @ts-check
+
+/**
+ * @param {unknown} value
+ */
+const getType = (value) => {
+  if (value === undefined) return 0
+  if (value === null) return 1
+  const t = typeof value;
+  if (t === 'boolean') return 2
+  if (t === 'number') return 3
+  if (t === 'string') return 4
+  if (t === 'object') return 6
+  if (t === 'bigint') return 9
+  return -1
+};
+
+const RESPONSE_HEADER_SIZE = 16;
+const RESPONSE_PAYLOAD_SIZE = 10240;
+const RESPONSE_BUFFER_SIZE = RESPONSE_HEADER_SIZE + RESPONSE_PAYLOAD_SIZE;
+
+/**
+ * @param {Int32Array} sab
+ * @param {Uint8Array} payload
+ */
+const writeResponsePayload = (sab, payload) => {
+  if (payload.length > RESPONSE_PAYLOAD_SIZE) {
+    throw new RangeError('payload overflow')
+  }
+  new Uint8Array(sab.buffer).set(payload, RESPONSE_HEADER_SIZE);
+};
+
+/**
+ * @param {import('memfs').IFs} memfs
+ * @param {any} value
+ * @param {ReturnType<typeof getType>} type
+ * @returns {Uint8Array}
+ */
+const encodeValue = (memfs, value, type) => {
+  switch (type) {
+    case 0:
+    case 1:
+      return new Uint8Array(0)
+    case 2: {
+      const view = new Int32Array(1);
+      view[0] = value ? 1 : 0;
+      return new Uint8Array(view.buffer)
+    }
+    case 3: {
+      const view = new Float64Array(1);
+      view[0] = value;
+      return new Uint8Array(view.buffer)
+    }
+    case 4: {
+      const view = new TextEncoder().encode(value);
+      return view
+    }
+    case 6: {
+      function storeConstructor(obj, memfs, processed = new WeakSet()) {
+        if (!obj || typeof obj !== 'object') {
+          return
+        }
+
+        if (processed.has(obj)) {
+          return
+        }
+
+        processed.add(obj);
+
+        const [entry] =
+          Object.entries(memfs).filter(([_, v]) => v === obj.constructor)[0] ??
+          [];
+        if (entry) {
+          Object.defineProperty(obj, '__constructor__', {
+            configurable: true,
+            writable: true,
+            enumerable: true,
+            value: entry,
+          });
+        }
+
+        for (const value of Object.values(obj)) {
+          storeConstructor(value, memfs, processed);
+        }
+      }
+
+      storeConstructor(value, memfs);
+
+      const json = JSON.stringify(value, (_, value) => {
+        if (typeof value === 'bigint') {
+          return `BigInt(${String(value)})`
+        }
+        if (value instanceof Error) {
+          return {
+            ...value,
+            message: value.message,
+            stack: value.stack,
+            __error__: value.constructor.name,
+          }
+        }
+        return value
+      });
+      const view = new TextEncoder().encode(json);
+      return view
+    }
+    case 9: {
+      return new TextEncoder().encode(String(value))
+    }
+    case -1:
+    default:
+      throw new Error('unsupported data')
+  }
+};
+
+/**
+ * @param {typeof import('memfs')} memfs
+ * @param {Uint8Array} payload
+ * @param {number} type
+ * @returns {any}
+ */
+const decodeValue = (memfs, payload, type) => {
+  if (type === 0) return undefined
+  if (type === 1) return null
+  if (type === 2)
+    return Boolean(new Int32Array(payload.buffer, payload.byteOffset, 1)[0])
+  if (type === 3)
+    return new Float64Array(payload.buffer, payload.byteOffset, 1)[0]
+  if (type === 4) return new TextDecoder().decode(payload.slice())
+  if (type === 6) {
+    const obj = JSON.parse(
+      new TextDecoder().decode(payload.slice()),
+      (_key, value) => {
+        if (typeof value === 'string') {
+          const matched = value.match(/^BigInt\((-?\d+)\)$/);
+          if (matched && matched[1]) {
+            return BigInt(matched[1])
+          }
+        }
+        return value
+      },
+    );
+
+    function loadConstructor(obj, memfs, processed = new WeakSet()) {
+      if (!obj || typeof obj !== 'object') {
+        return
+      }
+
+      if (processed.has(obj)) {
+        return
+      }
+
+      processed.add(obj);
+
+      if (obj.__constructor__) {
+        const ctor = obj.__constructor__;
+        delete obj.__constructor__;
+        Object.setPrototypeOf(obj, memfs[ctor].prototype);
+      }
+
+      for (const value of Object.values(obj)) {
+        loadConstructor(value, memfs, processed);
+      }
+    }
+
+    loadConstructor(obj, memfs);
+
+    if (obj.__error__) {
+      const name = obj.__error__;
+      const ErrorConstructor = globalThis[name] || Error;
+      delete obj.__error__;
+      const err = new ErrorConstructor(obj.message);
+      Object.defineProperty(err, 'stack', {
+        configurable: true,
+        enumerable: false,
+        writable: true,
+        value: err.stack,
+      });
+      Object.defineProperty(err, Symbol.toStringTag, {
+        configurable: true,
+        enumerable: false,
+        writable: true,
+        value: name,
+      });
+      for (const [k, v] of Object.entries(obj)) {
+        if (k === 'message' || k === 'stack') continue
+        err[k] = v;
+      }
+      return err
+    }
+    return obj
+  }
+  if (type === 9) {
+    return BigInt(new TextDecoder().decode(payload.slice()))
+  }
+  throw new Error('unsupported data')
+};
+
+/**
+ * @param {import('memfs').IFs} fs
+ * @returns {(e: { data: { __fs__: { sab: Int32Array, type: keyof import('memfs').IFs, payload: any[] } } }) => void}
+ */
+// oxlint-disable-next-line no-unused-vars -- fixed in an upcoming release
+const createOnMessage = (fs) =>
+  function onMessage(e) {
+    if (e.data.__fs__) {
+      /**
+       * 0..4                    status(int32_t):        21(waiting) 0(success) 1(error)
+       * 5..8                    type(napi_valuetype):   0(undefined) 1(null) 2(boolean) 3(number) 4(string) 6(jsonstring) 9(bigint) -1(unsupported)
+       * 9..16                   payload_size(uint32_t)  <= 10240
+       * 16..16 + payload_size   payload_content
+       */
+      const { sab, type, payload } = e.data.__fs__;
+      const fn = fs[type];
+      try {
+        const ret = fn.apply(fs, payload);
+        const t = getType(ret);
+        Atomics.store(sab, 1, t);
+        const v = encodeValue(fs, ret, t);
+        Atomics.store(sab, 2, v.length);
+        writeResponsePayload(sab, v);
+        Atomics.store(sab, 0, 0); // success
+      } catch (/** @type {any} */ err) {
+        let t = getType(err);
+        let v;
+        try {
+          if (t === -1) {
+            throw new Error('unsupported data')
+          }
+          v = encodeValue(fs, err, t);
+        } catch {
+          const fallback = (() => {
+            try {
+              return String(err)
+            } catch {
+              return 'Unserializable thrown value'
+            }
+          })();
+          t = getType(fallback);
+          v = encodeValue(fs, fallback, t);
+        }
+        if (v.length > RESPONSE_PAYLOAD_SIZE) {
+          const overflowErr = new RangeError('payload overflow');
+          t = getType(overflowErr);
+          v = encodeValue(fs, overflowErr, t);
+        }
+        Atomics.store(sab, 1, t);
+        Atomics.store(sab, 2, v.length);
+        writeResponsePayload(sab, v);
+        Atomics.store(sab, 0, 1); // error
+      } finally {
+        Atomics.notify(sab, 0);
+      }
+    }
+  };
+
+/**
+ * @param {typeof import('memfs')} memfs
+ */
+const createFsProxy = (memfs) =>
+  new Proxy(
+    {},
+    {
+      get(_target, p, _receiver) {
+        /**
+         * @param {any[]} args
+         */
+        return function (...args) {
+          const sab = new SharedArrayBuffer(RESPONSE_BUFFER_SIZE);
+          const i32arr = new Int32Array(sab);
+          Atomics.store(i32arr, 0, 21);
+
+          postMessage({
+            __fs__: {
+              sab: i32arr,
+              type: p,
+              payload: args,
+            },
+          });
+
+          Atomics.wait(i32arr, 0, 21);
+
+          const status = Atomics.load(i32arr, 0);
+          const type = Atomics.load(i32arr, 1);
+          const size = Atomics.load(i32arr, 2);
+          const content = new Uint8Array(sab, RESPONSE_HEADER_SIZE, size);
+          const value = decodeValue(memfs, content, type);
+          if (status === 1) {
+            throw value
+          }
+          return value
+        }
+      },
+    },
+  );
+
+exports.createFsProxy = createFsProxy;
+exports.createOnMessage = createOnMessage;