refactor!: redesign runtime and context API (#141)

Author: toyobayashi

packages/emnapi/cmake/wasm32.cmake

@@ -1,8 +1,5 @@
 # Cmake toolchain description file for the Makefile
 
-# This is arbitrary, AFAIK, for now.
-cmake_minimum_required(VERSION 3.4.0)
-
 set(CMAKE_SYSTEM_NAME WASM)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR wasm32)

packages/emnapi/src/async-work.ts

@@ -6,7 +6,7 @@ export interface AsyncWork {
   resource: object
   asyncId: number
   triggerAsyncId: number
-  env: number
+  env: napi_env
   data: number
   execute: number
   complete: number
@@ -91,7 +91,7 @@ export var emnapiAWST = {
     const data = work.data
     const callback = (): void => {
       if (!complete) return
-      const envObject = emnapiCtx.envStore.get(env)!
+      const envObject = emnapiCtx.getEnv(env)!
       const scope = emnapiCtx.openScope(envObject)
       try {
         (envObject as NodeEnv).callbackIntoModule(true, () => {
@@ -126,12 +126,12 @@ export var emnapiAWST = {
       const data = work.data
       const execute = work.execute
       work.status = 2
-      emnapiCtx.feature.setImmediate(() => {
+      emnapiCtx.features.setImmediate(() => {
         makeDynCall('vpp', 'execute')(env, data)
         emnapiAWST.queued.delete(id)
         work.status = 3
 
-        emnapiCtx.feature.setImmediate(() => {
+        emnapiCtx.features.setImmediate(() => {
           emnapiAWST.callComplete(work, napi_status.napi_ok)
         })
 
@@ -152,7 +152,7 @@ export var emnapiAWST = {
         work.status = 4
         emnapiAWST.pending.splice(index, 1)
 
-        emnapiCtx.feature.setImmediate(() => {
+        emnapiCtx.features.setImmediate(() => {
           emnapiAWST.callComplete(work, napi_status.napi_cancelled)
         })
 

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

@@ -188,7 +188,7 @@ var emnapiAWMT = {
     if (index !== -1) {
       emnapiAWMT.workQueue.splice(index, 1)
 
-      emnapiCtx.feature.setImmediate(() => {
+      emnapiCtx.features.setImmediate(() => {
         _emnapi_runtime_keepalive_pop()
         emnapiCtx.decreaseWaitingRequestCounter()
         emnapiAWMT.checkIdleWorker()
@@ -203,7 +203,7 @@ var emnapiAWMT = {
     const complete = emnapiAWMT.getComplete(work)
     const env = emnapiAWMT.getEnv(work)
     const data = emnapiAWMT.getData(work)
-    const envObject = emnapiCtx.envStore.get(env)!
+    const envObject = emnapiCtx.getEnv(env)!
     const scope = emnapiCtx.openScope(envObject)
     const callback = (): void => {
       if (!complete) return
@@ -215,8 +215,8 @@ var emnapiAWMT = {
     try {
       if (emnapiNodeBinding) {
         const resource = emnapiAWMT.getResource(work)
-        const resource_value = emnapiCtx.refStore.get(resource)!.get()
-        const resourceObject = emnapiCtx.handleStore.get(resource_value)!.value
+        const resource_value = emnapiCtx.getRef(resource)!.get()
+        const resourceObject = emnapiCtx.jsValueFromNapiValue(resource_value)!
         const view = new DataView(wasmMemory.buffer)
         const asyncId = view.getFloat64(work + emnapiAWMT.offset.async_id, true)
         const triggerAsyncId = view.getFloat64(work + emnapiAWMT.offset.trigger_async_id, true)
@@ -242,14 +242,14 @@ export var napi_create_async_work = singleThreadAsyncWork
 
     let resourceObject: any
     if (resource) {
-      resourceObject = Object(emnapiCtx.handleStore.get(resource)!.value)
+      resourceObject = Object(emnapiCtx.jsValueFromNapiValue(resource)!)
     } else {
       resourceObject = {}
     }
 
     $CHECK_ARG!(envObject, resource_name)
 
-    const resourceName = String(emnapiCtx.handleStore.get(resource_name)!.value)
+    const resourceName = String(emnapiCtx.jsValueFromNapiValue(resource_name)!)
 
     const id = emnapiAWST.create(env, resourceObject, resourceName, execute, complete, data)
     makeSetValue('result', 0, 'id', '*')
@@ -262,23 +262,24 @@ export var napi_create_async_work = singleThreadAsyncWork
 
     let resourceObject: any
     if (resource) {
-      resourceObject = Object(emnapiCtx.handleStore.get(resource)!.value)
+      resourceObject = Object(emnapiCtx.jsValueFromNapiValue(resource)!)
     } else {
       resourceObject = {}
     }
 
     $CHECK_ARG!(envObject, resource_name)
 
     const sizeofAW = emnapiAWMT.offset.end
-    const aw = _malloc(to64('sizeofAW'))
+    let aw = _malloc(to64('sizeofAW') as size_t)
     if (!aw) return envObject.setLastError(napi_status.napi_generic_failure)
-    new Uint8Array(wasmMemory.buffer).subarray(aw, aw + sizeofAW).fill(0)
-    const s = envObject.ensureHandleId(resourceObject)
+    from64('aw')
+    new Uint8Array(wasmMemory.buffer).subarray(aw as number, aw as number + sizeofAW).fill(0)
+    const s = emnapiCtx.napiValueFromJsValue(resourceObject)
     const resourceRef = emnapiCtx.createReference(envObject, s, 1, ReferenceOwnership.kUserland as any)
 
     const resource_ = resourceRef.id
     makeSetValue('aw', 0, 'resource_', '*')
-    _emnapi_node_emit_async_init(s, resource_name, -1, aw + emnapiAWMT.offset.async_id)
+    _emnapi_node_emit_async_init(s, resource_name, -1, aw as number + emnapiAWMT.offset.async_id)
     makeSetValue('aw', 'emnapiAWMT.offset.env', 'env', '*')
     makeSetValue('aw', 'emnapiAWMT.offset.execute', 'execute', '*')
     makeSetValue('aw', 'emnapiAWMT.offset.complete', 'complete', '*')
@@ -302,7 +303,7 @@ export var napi_delete_async_work = singleThreadAsyncWork
     $CHECK_ARG!(envObject, work)
 
     const resource = emnapiAWMT.getResource(work)
-    emnapiCtx.refStore.get(resource)!.dispose()
+    emnapiCtx.getRef(resource)!.dispose()
 
     if (emnapiNodeBinding) {
       const view = new DataView(wasmMemory.buffer)
@@ -319,15 +320,15 @@ export var napi_delete_async_work = singleThreadAsyncWork
 export var napi_queue_async_work = singleThreadAsyncWork
   ? function (env: napi_env, work: number): napi_status {
     $CHECK_ENV!(env)
-    const envObject = emnapiCtx.envStore.get(env)!
+    const envObject = emnapiCtx.getEnv(env)!
     $CHECK_ARG!(envObject, work)
 
     emnapiAWST.queue(work)
     return envObject.clearLastError()
   }
   : function (env: napi_env, work: number): napi_status {
     $CHECK_ENV!(env)
-    const envObject = emnapiCtx.envStore.get(env)!
+    const envObject = emnapiCtx.getEnv(env)!
     $CHECK_ARG!(envObject, work)
 
     emnapiAWMT.scheduleWork(work)
@@ -338,7 +339,7 @@ export var napi_queue_async_work = singleThreadAsyncWork
 export var napi_cancel_async_work = singleThreadAsyncWork
   ? function (env: napi_env, work: number): napi_status {
     $CHECK_ENV!(env)
-    const envObject = emnapiCtx.envStore.get(env)!
+    const envObject = emnapiCtx.getEnv(env)!
     $CHECK_ARG!(envObject, work)
 
     const status = emnapiAWST.cancel(work)
@@ -347,7 +348,7 @@ export var napi_cancel_async_work = singleThreadAsyncWork
   }
   : function (env: napi_env, work: number): napi_status {
     $CHECK_ENV!(env)
-    const envObject = emnapiCtx.envStore.get(env)!
+    const envObject = emnapiCtx.getEnv(env)!
     $CHECK_ARG!(envObject, work)
 
     const status = emnapiAWMT.cancelWork(work)

packages/emnapi/src/core/init.ts

@@ -41,8 +41,8 @@ export var wasmMemory: WebAssembly.Memory
 
 export var wasmTable: WebAssembly.Table
 
-export var _malloc: any
-export var _free: any
+export var _malloc: (size: number | bigint) => void_p
+export var _free: (ptr: void_p) => void
 
 export function abort (msg?: string): never {
   if (typeof WebAssembly.RuntimeError === 'function') {
@@ -91,8 +91,8 @@ export var napiModule: INapiModule = {
     wasmTable = table
     if (typeof exports.malloc !== 'function') throw new TypeError('malloc is not exported')
     if (typeof exports.free !== 'function') throw new TypeError('free is not exported')
-    _malloc = exports.malloc
-    _free = exports.free
+    _malloc = exports.malloc as (size: number | bigint) => void_p
+    _free = exports.free as (ptr: void_p) => void
 
     if (!napiModule.childThread) {
       // main thread only
@@ -117,8 +117,8 @@ export var napiModule: INapiModule = {
           const exports = napiModule.exports
           const exportsHandle = scope.add(exports)
           const napi_register_wasm_v1 = instance.exports.napi_register_wasm_v1 as Function
-          const napiValue = napi_register_wasm_v1(to64('_envObject.id'), to64('exportsHandle.id'))
-          napiModule.exports = (!napiValue) ? exports : emnapiCtx.handleStore.get(napiValue)!.value
+          const napiValue = napi_register_wasm_v1(to64('_envObject.id'), to64('exportsHandle'))
+          napiModule.exports = (!napiValue) ? exports : emnapiCtx.jsValueFromNapiValue(napiValue)!
         })
       } finally {
         emnapiCtx.closeScope(envObject, scope)

packages/emnapi/src/core/memory.ts

@@ -11,7 +11,7 @@ export function napi_adjust_external_memory (
   adjusted_value: number
 ): napi_status {
   $CHECK_ENV!(env)
-  const envObject = emnapiCtx.envStore.get(env)!
+  const envObject = emnapiCtx.getEnv(env)!
   $CHECK_ARG!(envObject, adjusted_value)
 
   const change_in_bytes_number = Number(change_in_bytes)
@@ -28,7 +28,7 @@ export function napi_adjust_external_memory (
   }
 
   from64('adjusted_value')
-  if (emnapiCtx.feature.supportBigInt) {
+  if (emnapiCtx.features.BigInt) {
     makeSetValue('adjusted_value', 0, 'wasmMemory.buffer.byteLength', 'i64')
   } else {
     emnapiSetValueI64(adjusted_value, wasmMemory.buffer.byteLength)