additional fix for #204

Author: toyobayashi

.github/workflows/main.yml

@@ -40,7 +40,7 @@ env:
 
 jobs:
   build:
-    timeout-minutes: 15
+    timeout-minutes: 20
     name: Build
     runs-on: ubuntu-latest
     env:

packages/emnapi/src/core/async-work.ts

@@ -359,6 +359,7 @@ export var napi_create_async_work = singleThreadAsyncWork
     const resourceName = String(emnapiCtx.jsValueFromNapiValue(resource_name)!)
 
     const id = emnapiAWST.create(env, resourceObject, resourceName, execute, complete, data)
+    from64('result')
     makeSetValue('result', 0, 'id', '*')
     return envObject.clearLastError()
   }

packages/emnapi/src/emscripten/async-work.ts

@@ -1,4 +1,4 @@
-import { makeSetValue } from 'emscripten:parse-tools'
+import { from64, makeSetValue } from 'emscripten:parse-tools'
 import { emnapiAWST } from '../async-work'
 import { $CHECK_ARG, $CHECK_ENV, $CHECK_ENV_NOT_IN_GC } from '../macro'
 
@@ -27,6 +27,7 @@ export function napi_create_async_work (env: napi_env, resource: napi_value, res
   const resourceName = String(emnapiCtx.jsValueFromNapiValue(resource_name)!)
 
   const id = emnapiAWST.create(env, resourceObject, resourceName, execute, complete, data)
+  from64('result')
   makeSetValue('result', 0, 'id', '*')
   return envObject.clearLastError()
 }

packages/emnapi/src/threadsafe-function.ts

@@ -356,7 +356,7 @@ const emnapiTSFN = {
     let arr: any, index: number
 // #if MEMORY64
     arr = new BigUint64Array(wasmMemory.buffer)
-    index = (func + offset) >> 3
+    index = (func + offset) >>> 3
 // #else
     arr = new Uint32Array(wasmMemory.buffer)
     index = (func + offset) >>> 2
@@ -368,7 +368,7 @@ const emnapiTSFN = {
     let arr: any, index: number
 // #if MEMORY64
     arr = new BigUint64Array(wasmMemory.buffer)
-    index = (func + offset) >> 3
+    index = (func + offset) >>> 3
 // #else
     arr = new Uint32Array(wasmMemory.buffer)
     index = (func + offset) >>> 2
@@ -383,7 +383,7 @@ const emnapiTSFN = {
     let arr: any, index: number
 // #if MEMORY64
     arr = new BigUint64Array(wasmMemory.buffer)
-    index = (func + offset) >> 3
+    index = (func + offset) >>> 3
 // #else
     arr = new Uint32Array(wasmMemory.buffer)
     index = (func + offset) >>> 2
@@ -395,7 +395,7 @@ const emnapiTSFN = {
     let arr: any, index: number
 // #if MEMORY64
     arr = new BigUint64Array(wasmMemory.buffer)
-    index = (func + offset) >> 3
+    index = (func + offset) >>> 3
 // #else
     arr = new Uint32Array(wasmMemory.buffer)
     index = (func + offset) >>> 2
@@ -447,7 +447,7 @@ const emnapiTSFN = {
     if (unsigned) {
 // #if MEMORY64
       arr = new BigUint64Array(wasmMemory.buffer)
-      ret = Number(Atomics.load(arr, offset >> 3))
+      ret = Number(Atomics.load(arr, offset >>> 3))
 // #else
       arr = new Uint32Array(wasmMemory.buffer)
       ret = Atomics.load(arr, offset >>> 2)
@@ -456,7 +456,7 @@ const emnapiTSFN = {
     } else {
 // #if MEMORY64
       arr = new BigInt64Array(wasmMemory.buffer)
-      ret = Number(Atomics.load(arr, offset >> 3))
+      ret = Number(Atomics.load(arr, offset >>> 3))
 // #else
       arr = new Int32Array(wasmMemory.buffer)
       ret = Atomics.load(arr, offset >>> 2)
@@ -469,7 +469,7 @@ const emnapiTSFN = {
     if (unsigned) {
 // #if MEMORY64
       arr = new BigUint64Array(wasmMemory.buffer)
-      Atomics.store(arr, offset >> 3, BigInt(value) as any)
+      Atomics.store(arr, offset >>> 3, BigInt(value) as any)
 // #else
       arr = new Uint32Array(wasmMemory.buffer)
       Atomics.store(arr, offset >>> 2, value)
@@ -478,7 +478,7 @@ const emnapiTSFN = {
     } else {
 // #if MEMORY64
       arr = new BigInt64Array(wasmMemory.buffer)
-      Atomics.store(arr, offset >> 3, BigInt(value >>> 0) as any)
+      Atomics.store(arr, offset >>> 3, BigInt(value >>> 0) as any)
 // #else
       arr = new Int32Array(wasmMemory.buffer)
       Atomics.store(arr, offset >>> 2, value >>> 0)