emnapi 1.11.0 → 1.11.1

package/dist/library_napi.js

@@ -5858,7 +5858,7 @@ var emnapiTSFN = {
                 var payload = __emnapi__.payload;
                 if (type === 'tsfn-send') {
                     var pendng = payload.tsfn + emnapiTSFN.offset.async_pending;
-                    if (Atomics.load(new Int32Array(wasmMemory.buffer), pendng >>> 2) !== 0) {
+                    if (Atomics.load(new Int32Array(emnapiTSFN.ensureBufferFor(pendng + 4)), pendng >>> 2) !== 0) {
                         emnapiTSFN.enqueue(payload.tsfn);
                     }
                 }
@@ -5882,13 +5882,28 @@ var emnapiTSFN = {
         }
         return true;
     },
+    /**
+     * When another thread grows the shared WebAssembly.Memory, this agent's
+     * cached `wasmMemory.buffer` may still have the old shorter length
+     * (V8 refreshes it lazily). If a pointer derived from shared memory lies
+     * beyond the cached length, `wasmMemory.grow(0)` forces the agent to
+     * observe the current memory size and refreshes the buffer.
+     */
+    ensureBufferFor: function (end) {
+        var buffer = wasmMemory.buffer;
+        if (end > buffer.byteLength) {
+            wasmMemory.grow(0);
+            buffer = wasmMemory.buffer;
+        }
+        return buffer;
+    },
     initQueue: function (func) {
         var size = 2 * {{{ POINTER_SIZE }}};
         var queue = _malloc({{{ to64('size') }}});
         if (!queue)
             return false;
         {{{ from64('queue') }}};
-        new Uint8Array(wasmMemory.buffer, queue, size).fill(0);
+        new Uint8Array(emnapiTSFN.ensureBufferFor(queue + size), queue, size).fill(0);
         emnapiTSFN.storeSizeTypeValue(func + emnapiTSFN.offset.queue, queue, false);
         return true;
     },
@@ -5995,7 +6010,7 @@ var emnapiTSFN = {
         var mutex = {
             lock: function () {
                 var isBrowserMain = typeof window !== 'undefined' && typeof document !== 'undefined' && !ENVIRONMENT_IS_NODE;
-                var i32a = new Int32Array(wasmMemory.buffer, index, 1);
+                var i32a = new Int32Array(emnapiTSFN.ensureBufferFor(index + 4), index, 1);
                 if (isBrowserMain) {
                     while (true) {
                         var oldValue = Atomics.compareExchange(i32a, 0, 0, 10);
@@ -6018,7 +6033,7 @@ var emnapiTSFN = {
               return new Promise<void>(resolve => {
                 const again = (): void => { fn() }
                 const fn = (): void => {
-                  const i32a = new Int32Array(wasmMemory.buffer, index, 1)
+                  const i32a = new Int32Array(emnapiTSFN.ensureBufferFor(index + 4), index, 1)
                   const oldValue = Atomics.compareExchange(i32a, 0, 0, 10)
                   if (oldValue === 0) {
                     resolve()
@@ -6030,7 +6045,7 @@ var emnapiTSFN = {
               })
             }, */
             unlock: function () {
-                var i32a = new Int32Array(wasmMemory.buffer, index, 1);
+                var i32a = new Int32Array(emnapiTSFN.ensureBufferFor(index + 4), index, 1);
                 var oldValue = Atomics.compareExchange(i32a, 0, 10, 0);
                 if (oldValue !== 10) {
                     throw new Error('Tried to unlock while not holding the mutex');
@@ -6064,14 +6079,14 @@ var emnapiTSFN = {
         var mutex = emnapiTSFN.getMutex(func);
         var cond = {
             wait: function () {
-                var i32a = new Int32Array(wasmMemory.buffer, index, 1);
+                var i32a = new Int32Array(emnapiTSFN.ensureBufferFor(index + 4), index, 1);
                 var value = Atomics.load(i32a, 0);
                 mutex.unlock();
                 Atomics.wait(i32a, 0, value);
                 mutex.lock();
             },
             /* waitAsync () {
-              const i32a = new Int32Array(wasmMemory.buffer, index, 1)
+              const i32a = new Int32Array(emnapiTSFN.ensureBufferFor(index + 4), index, 1)
               const value = Atomics.load(i32a, 0)
               mutex.unlock()
               const lock = (): Promise<void> => mutex.lockAsync()
@@ -6082,7 +6097,7 @@ var emnapiTSFN = {
               }
             }, */
             signal: function () {
-                var i32a = new Int32Array(wasmMemory.buffer, index, 1);
+                var i32a = new Int32Array(emnapiTSFN.ensureBufferFor(index + 4), index, 1);
                 Atomics.add(i32a, 0, 1);
                 Atomics.notify(i32a, 0, 1);
             }
@@ -6096,10 +6111,10 @@ var emnapiTSFN = {
         var offset = emnapiTSFN.offset.queue_size;
         var arr, index;
 #if MEMORY64
-        arr = new BigUint64Array(wasmMemory.buffer);
+        arr = new BigUint64Array(emnapiTSFN.ensureBufferFor(func + offset + 8));
         index = (func + offset) >>> 3;
 #else
-        arr = new Uint32Array(wasmMemory.buffer);
+        arr = new Uint32Array(emnapiTSFN.ensureBufferFor(func + offset + 4));
         index = (func + offset) >>> 2;
 #endif
         Atomics.add(arr, index, {{{ to64('1') }}});
@@ -6108,10 +6123,10 @@ var emnapiTSFN = {
         var offset = emnapiTSFN.offset.queue_size;
         var arr, index;
 #if MEMORY64
-        arr = new BigUint64Array(wasmMemory.buffer);
+        arr = new BigUint64Array(emnapiTSFN.ensureBufferFor(func + offset + 8));
         index = (func + offset) >>> 3;
 #else
-        arr = new Uint32Array(wasmMemory.buffer);
+        arr = new Uint32Array(emnapiTSFN.ensureBufferFor(func + offset + 4));
         index = (func + offset) >>> 2;
 #endif
         Atomics.sub(arr, index, {{{ to64('1') }}});
@@ -6123,10 +6138,10 @@ var emnapiTSFN = {
         var offset = emnapiTSFN.offset.thread_count;
         var arr, index;
 #if MEMORY64
-        arr = new BigUint64Array(wasmMemory.buffer);
+        arr = new BigUint64Array(emnapiTSFN.ensureBufferFor(func + offset + 8));
         index = (func + offset) >>> 3;
 #else
-        arr = new Uint32Array(wasmMemory.buffer);
+        arr = new Uint32Array(emnapiTSFN.ensureBufferFor(func + offset + 4));
         index = (func + offset) >>> 2;
 #endif
         Atomics.add(arr, index, {{{ to64('1') }}});
@@ -6135,28 +6150,28 @@ var emnapiTSFN = {
         var offset = emnapiTSFN.offset.thread_count;
         var arr, index;
 #if MEMORY64
-        arr = new BigUint64Array(wasmMemory.buffer);
+        arr = new BigUint64Array(emnapiTSFN.ensureBufferFor(func + offset + 8));
         index = (func + offset) >>> 3;
 #else
-        arr = new Uint32Array(wasmMemory.buffer);
+        arr = new Uint32Array(emnapiTSFN.ensureBufferFor(func + offset + 4));
         index = (func + offset) >>> 2;
 #endif
         Atomics.sub(arr, index, {{{ to64('1') }}});
     },
     getState: function (func) {
-        return Atomics.load(new Int32Array(wasmMemory.buffer), (func + emnapiTSFN.offset.state) >>> 2);
+        return Atomics.load(new Int32Array(emnapiTSFN.ensureBufferFor(func + emnapiTSFN.offset.state + 4)), (func + emnapiTSFN.offset.state) >>> 2);
     },
     setState: function (func, value) {
-        Atomics.store(new Int32Array(wasmMemory.buffer), (func + emnapiTSFN.offset.state) >>> 2, value);
+        Atomics.store(new Int32Array(emnapiTSFN.ensureBufferFor(func + emnapiTSFN.offset.state + 4)), (func + emnapiTSFN.offset.state) >>> 2, value);
     },
     getHandlesClosing: function (func) {
-        return Atomics.load(new Int8Array(wasmMemory.buffer), (func + emnapiTSFN.offset.handles_closing));
+        return Atomics.load(new Int8Array(emnapiTSFN.ensureBufferFor(func + emnapiTSFN.offset.handles_closing + 1)), (func + emnapiTSFN.offset.handles_closing));
     },
     setHandlesClosing: function (func, value) {
-        Atomics.store(new Int8Array(wasmMemory.buffer), (func + emnapiTSFN.offset.handles_closing), value);
+        Atomics.store(new Int8Array(emnapiTSFN.ensureBufferFor(func + emnapiTSFN.offset.handles_closing + 1)), (func + emnapiTSFN.offset.handles_closing), value);
     },
     getDispatchState: function (func) {
-        return Atomics.load(new Uint32Array(wasmMemory.buffer), (func + emnapiTSFN.offset.dispatch_state) >>> 2);
+        return Atomics.load(new Uint32Array(emnapiTSFN.ensureBufferFor(func + emnapiTSFN.offset.dispatch_state + 4)), (func + emnapiTSFN.offset.dispatch_state) >>> 2);
     },
     getContext: function (func) {
         return emnapiTSFN.loadSizeTypeValue(func + emnapiTSFN.offset.context, false);
@@ -6187,20 +6202,20 @@ var emnapiTSFN = {
         var arr;
         if (unsigned) {
 #if MEMORY64
-            arr = new BigUint64Array(wasmMemory.buffer);
+            arr = new BigUint64Array(emnapiTSFN.ensureBufferFor(offset + 8));
             ret = Number(Atomics.load(arr, offset >>> 3));
 #else
-            arr = new Uint32Array(wasmMemory.buffer);
+            arr = new Uint32Array(emnapiTSFN.ensureBufferFor(offset + 4));
             ret = Atomics.load(arr, offset >>> 2);
 #endif
             return ret;
         }
         else {
 #if MEMORY64
-            arr = new BigInt64Array(wasmMemory.buffer);
+            arr = new BigInt64Array(emnapiTSFN.ensureBufferFor(offset + 8));
             ret = Number(Atomics.load(arr, offset >>> 3));
 #else
-            arr = new Int32Array(wasmMemory.buffer);
+            arr = new Int32Array(emnapiTSFN.ensureBufferFor(offset + 4));
             ret = Atomics.load(arr, offset >>> 2);
 #endif
             return ret;
@@ -6210,20 +6225,20 @@ var emnapiTSFN = {
         var arr;
         if (unsigned) {
 #if MEMORY64
-            arr = new BigUint64Array(wasmMemory.buffer);
+            arr = new BigUint64Array(emnapiTSFN.ensureBufferFor(offset + 8));
             Atomics.store(arr, offset >>> 3, BigInt(value));
 #else
-            arr = new Uint32Array(wasmMemory.buffer);
+            arr = new Uint32Array(emnapiTSFN.ensureBufferFor(offset + 4));
             Atomics.store(arr, offset >>> 2, value);
 #endif
             return undefined;
         }
         else {
 #if MEMORY64
-            arr = new BigInt64Array(wasmMemory.buffer);
+            arr = new BigInt64Array(emnapiTSFN.ensureBufferFor(offset + 8));
             Atomics.store(arr, offset >>> 3, BigInt(value >>> 0));
 #else
-            arr = new Int32Array(wasmMemory.buffer);
+            arr = new Int32Array(emnapiTSFN.ensureBufferFor(offset + 4));
             Atomics.store(arr, offset >>> 2, value >>> 0);
 #endif
             return undefined;
@@ -6240,18 +6255,20 @@ var emnapiTSFN = {
             }
             var resource = emnapiTSFN.getResource(func);
             emnapiCtx.refStore.get(resource).dispose();
+            emnapiTSFN.ensureBufferFor(func + emnapiTSFN.offset.is_some + 1);
             {{{ makeSetValue('func', 'emnapiTSFN.offset.is_some', '0', 'i8') }}};
             emnapiCtx.removeCleanupHook(envObject, emnapiTSFN.cleanup, func);
             envObject.unref();
-            var asyncRefOffset = (func + emnapiTSFN.offset.async_ref) >>> 2;
-            var arr = new Uint32Array(wasmMemory.buffer);
+            var asyncRefAddress = func + emnapiTSFN.offset.async_ref;
+            var asyncRefOffset = asyncRefAddress >>> 2;
+            var arr = new Uint32Array(emnapiTSFN.ensureBufferFor(asyncRefAddress + 4));
             if (Atomics.load(arr, asyncRefOffset) > 0) {
                 Atomics.store(arr, asyncRefOffset, 0);
                 __emnapi_runtime_keepalive_pop();
                 emnapiCtx.decreaseWaitingRequestCounter();
             }
             if (emnapiNodeBinding) {
-                var view = new DataView(wasmMemory.buffer);
+                var view = new DataView(emnapiTSFN.ensureBufferFor(func + emnapiTSFN.offset.trigger_async_id + 8));
                 var asyncId = view.getFloat64(func + emnapiTSFN.offset.async_id, true);
                 var triggerAsyncId = view.getFloat64(func + emnapiTSFN.offset.trigger_async_id, true);
                 __emnapi_node_emit_async_destroy(asyncId, triggerAsyncId);
@@ -6316,7 +6333,7 @@ var emnapiTSFN = {
                     var resource = emnapiTSFN.getResource(func);
                     var resource_value = emnapiCtx.refStore.get(resource).get();
                     var resourceObject = emnapiCtx.handleStore.get(resource_value).value;
-                    var view = new DataView(wasmMemory.buffer);
+                    var view = new DataView(emnapiTSFN.ensureBufferFor(func + emnapiTSFN.offset.trigger_async_id + 8));
                     var asyncId = view.getFloat64(func + emnapiTSFN.offset.async_id, true);
                     var triggerAsyncId = view.getFloat64(func + emnapiTSFN.offset.trigger_async_id, true);
                     emnapiNodeBinding.node.makeCallback(resourceObject, f, [], {
@@ -6354,7 +6371,7 @@ var emnapiTSFN = {
                 return;
             }
             emnapiTSFN.setHandlesClosing(func, 1);
-            Atomics.store(new Int32Array(wasmMemory.buffer), (func + emnapiTSFN.offset.async_pending) >>> 2, 1);
+            Atomics.store(new Int32Array(emnapiTSFN.ensureBufferFor(func + emnapiTSFN.offset.async_pending + 4)), (func + emnapiTSFN.offset.async_pending) >>> 2, 1);
             emnapiCtx.feature.setImmediate(function () {
                 emnapiTSFN.finalize(func);
             });
@@ -6426,7 +6443,7 @@ var emnapiTSFN = {
                     var resource = emnapiTSFN.getResource(func);
                     var resource_value = emnapiCtx.refStore.get(resource).get();
                     var resourceObject = emnapiCtx.handleStore.get(resource_value).value;
-                    var view = new DataView(wasmMemory.buffer);
+                    var view = new DataView(emnapiTSFN.ensureBufferFor(func + emnapiTSFN.offset.trigger_async_id + 8));
                     emnapiNodeBinding.node.makeCallback(resourceObject, f, [], {
                         asyncId: view.getFloat64(func + emnapiTSFN.offset.async_id, true),
                         triggerAsyncId: view.getFloat64(func + emnapiTSFN.offset.trigger_async_id, true)
@@ -6445,8 +6462,9 @@ var emnapiTSFN = {
     dispatch: function (func) {
         var has_more = true;
         var iterations_left = 1000;
-        var ui32a = new Uint32Array(wasmMemory.buffer);
-        var index = (func + emnapiTSFN.offset.dispatch_state) >>> 2;
+        var dispatchStateAddress = func + emnapiTSFN.offset.dispatch_state;
+        var ui32a = new Uint32Array(emnapiTSFN.ensureBufferFor(dispatchStateAddress + 4));
+        var index = dispatchStateAddress >>> 2;
         while (has_more && --iterations_left !== 0) {
             Atomics.store(ui32a, index, 1);
             has_more = emnapiTSFN.dispatchOne(func);
@@ -6465,7 +6483,7 @@ var emnapiTSFN = {
         // `scheduled` prevents queueing the same main-thread drain chain more than
         // once while a previous wakeup is still in flight.
         var scheduled = func + emnapiTSFN.offset.async_u_fd;
-        var i32a = new Int32Array(wasmMemory.buffer);
+        var i32a = new Int32Array(emnapiTSFN.ensureBufferFor(Math.max(pending, scheduled) + 4));
         if (Atomics.exchange(i32a, scheduled >>> 2, 1) !== 0) {
             return;
         }
@@ -6509,17 +6527,18 @@ var emnapiTSFN = {
         });
     },
     send: function (func) {
-        var current_state = Atomics.or(new Uint32Array(wasmMemory.buffer), (func + emnapiTSFN.offset.dispatch_state) >>> 2, 1 << 1);
+        var dispatchStateAddress = func + emnapiTSFN.offset.dispatch_state;
+        var current_state = Atomics.or(new Uint32Array(emnapiTSFN.ensureBufferFor(dispatchStateAddress + 4)), dispatchStateAddress >>> 2, 1 << 1);
         if ((current_state & 1) === 1) {
             return;
         }
         var pendng = func + emnapiTSFN.offset.async_pending;
         // A wakeup is already pending, so this send only needs to leave the queued
         // work in the TSFN queue and let the existing drain pick it up.
-        if (Atomics.load(new Int32Array(wasmMemory.buffer), pendng >>> 2) !== 0) {
+        if (Atomics.load(new Int32Array(emnapiTSFN.ensureBufferFor(pendng + 4)), pendng >>> 2) !== 0) {
             return;
         }
-        if (Atomics.exchange(new Int32Array(wasmMemory.buffer), pendng >>> 2, 1) === 0) {
+        if (Atomics.exchange(new Int32Array(emnapiTSFN.ensureBufferFor(pendng + 4)), pendng >>> 2, 1) === 0) {
             if ((typeof ENVIRONMENT_IS_PTHREAD !== 'undefined') && ENVIRONMENT_IS_PTHREAD) {
                 // Worker threads only post a wakeup token. Main-thread draining is
                 // serialized by enqueue() once the message is received.
@@ -6602,7 +6621,7 @@ function _napi_create_threadsafe_function(env, func, async_resource, async_resou
     if (!tsfn)
         return envObject.setLastError(9 /* napi_status.napi_generic_failure */);
     {{{ from64('tsfn') }}};
-    new Uint8Array(wasmMemory.buffer).subarray(tsfn, tsfn + sizeofTSFN).fill(0);
+    new Uint8Array(emnapiTSFN.ensureBufferFor(tsfn + sizeofTSFN)).subarray(tsfn, tsfn + sizeofTSFN).fill(0);
     var resourceRef = emnapiCtx.createReference(envObject, resource, 1, 1 /* ReferenceOwnership.kUserland */);
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var resource_ = resourceRef.id;
@@ -6715,8 +6734,9 @@ function _napi_unref_threadsafe_function(env, func) {
         return 1 /* napi_status.napi_invalid_arg */;
     }
     {{{ from64('func') }}};
-    var asyncRefOffset = (func + emnapiTSFN.offset.async_ref) >>> 2;
-    var arr = new Uint32Array(wasmMemory.buffer);
+    var asyncRefAddress = func + emnapiTSFN.offset.async_ref;
+    var asyncRefOffset = asyncRefAddress >>> 2;
+    var arr = new Uint32Array(emnapiTSFN.ensureBufferFor(asyncRefAddress + 4));
     var currentValue = Atomics.load(arr, asyncRefOffset);
     if (currentValue > 0) {
         Atomics.store(arr, asyncRefOffset, currentValue - 1);
@@ -6734,8 +6754,9 @@ function _napi_ref_threadsafe_function(env, func) {
         return 1 /* napi_status.napi_invalid_arg */;
     }
     {{{ from64('func') }}};
-    var asyncRefOffset = (func + emnapiTSFN.offset.async_ref) >>> 2;
-    var arr = new Uint32Array(wasmMemory.buffer);
+    var asyncRefAddress = func + emnapiTSFN.offset.async_ref;
+    var asyncRefOffset = asyncRefAddress >>> 2;
+    var arr = new Uint32Array(emnapiTSFN.ensureBufferFor(asyncRefAddress + 4));
     var currentValue = Atomics.load(arr, asyncRefOffset);
     if (!currentValue) {
         __emnapi_runtime_keepalive_push();

package/include/node/emnapi.h

@@ -7,7 +7,7 @@
 
 #define EMNAPI_MAJOR_VERSION 1
 #define EMNAPI_MINOR_VERSION 11
-#define EMNAPI_PATCH_VERSION 0
+#define EMNAPI_PATCH_VERSION 1
 
 typedef enum {
   emnapi_runtime,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emnapi",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "Node-API implementation for Emscripten",
   "main": "index.js",
   "gypfile": false,