update

toyobayashi · May 13, 2024 · c024ead · c024ead
1 parent f33a75d
commit c024ead
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 20 deletions.
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -29,7 +29,6 @@ export type {
 } from './load'
 
 export type {
-  InstantiatePayload,
   MessageHandlerOptions
 } from './worker'
 

diff --git a/packages/core/src/worker.ts b/packages/core/src/worker.ts
@@ -1,16 +1,16 @@
 import {
   ThreadMessageHandler,
   type ThreadMessageHandlerOptions,
-  type InstantiatePayload
+  type LoadPayload
 } from '@emnapi/wasi-threads'
 import type { NapiModule } from './emnapi/index'
 import type { InstantiatedSource } from './load'
 
-export type { ThreadMessageHandlerOptions, InstantiatePayload }
+export type { ThreadMessageHandlerOptions, LoadPayload }
 
 /** @public */
 export interface MessageHandlerOptions extends ThreadMessageHandlerOptions {
-  onLoad: (data: InstantiatePayload) => InstantiatedSource | PromiseLike<InstantiatedSource>
+  onLoad: (data: LoadPayload) => InstantiatedSource | PromiseLike<InstantiatedSource>
 }
 
 /** @public */
@@ -25,7 +25,7 @@ export class MessageHandler extends ThreadMessageHandler {
     this.napiModule = undefined
   }
 
-  public override instantiate (data: InstantiatePayload): InstantiatedSource | PromiseLike<InstantiatedSource> {
+  public override instantiate (data: LoadPayload): InstantiatedSource | PromiseLike<InstantiatedSource> {
     const source = this.onLoad!(data) as InstantiatedSource | PromiseLike<InstantiatedSource>
     const then = (source as PromiseLike<InstantiatedSource>).then
     if (typeof then === 'function') {

diff --git a/packages/wasi-threads/src/index.ts b/packages/wasi-threads/src/index.ts
@@ -3,6 +3,7 @@ export { ThreadManager } from './thread-manager'
 
 export type {
   WASIInstance,
+  StartResult,
   WASIThreadsOptions,
   MainThreadOptions,
   ChildThreadOptions,
@@ -15,8 +16,10 @@ export type {
 export { WASIThreads } from './wasi-threads'
 
 export { ThreadMessageHandler } from './worker'
-export type { InstantiatePayload, ThreadMessageHandlerOptions } from './worker'
+export type { ThreadMessageHandlerOptions } from './worker'
 
 export { createInstanceProxy } from './proxy'
 
 export { isTrapError } from './util'
+
+export type { LoadPayload } from './command'
diff --git a/packages/wasi-threads/src/proxy.ts b/packages/wasi-threads/src/proxy.ts
@@ -1,8 +1,12 @@
+export const kIsProxy = Symbol('kIsProxy')
+
 /** @public */
 export function createInstanceProxy (
   instance: WebAssembly.Instance,
   memory?: WebAssembly.Memory | (() => WebAssembly.Memory)
 ): WebAssembly.Instance {
+  if ((instance as any)[kIsProxy]) return instance
+
   // https://github.com/nodejs/help/issues/4102
   const originalExports = instance.exports
   const createHandler = function (target: WebAssembly.Exports): ProxyHandler<WebAssembly.Exports> {
@@ -57,6 +61,9 @@ export function createInstanceProxy (
       if (p === 'exports') {
         return exportsProxy
       }
+      if (p === kIsProxy) {
+        return true
+      }
       return Reflect.get(target, p, receiver)
     }
   })

diff --git a/packages/wasi-threads/src/wasi-threads.ts b/packages/wasi-threads/src/wasi-threads.ts
@@ -49,6 +49,12 @@ export interface WASIThreadsImports {
   'thread-spawn': (startArg: number, errorOrTid?: number) => number
 }
 
+/** @public */
+export interface StartResult {
+  exitCode: number
+  instance: WebAssembly.Instance
+}
+
 const patchedWasiInstances = new WeakMap<WASIThreads, WeakSet<WASIInstance>>()
 
 /** @public */
@@ -276,6 +282,17 @@ export class WASIThreads {
     return instance
   }
 
+  public start (instance: WebAssembly.Instance, module: WebAssembly.Module, memory?: WebAssembly.Memory): StartResult {
+    const exports = instance.exports
+    memory ??= exports.memory as WebAssembly.Memory
+    if (this.childThread) {
+      instance = createInstanceProxy(instance, memory)
+    }
+    this!.setup(instance, module, memory)
+    const exitCode = this.wasi.start(instance)
+    return { exitCode, instance }
+  }
+
   public terminateAllThreads (): void {
     if (!this.childThread) {
       this.PThread?.terminateAllThreads()
@@ -290,7 +307,6 @@ function patchWasiInstance (wasiThreads: WASIThreads, wasi: WASIInstance): void
   if (patched.has(wasi)) {
     return
   }
-  patched.add(wasi)
 
   const _this = wasiThreads
   const wasiImport = wasi.wasiImport
@@ -314,6 +330,7 @@ function patchWasiInstance (wasiThreads: WASIThreads, wasi: WASIInstance): void
       }
     }
   }
+  patched.add(wasi)
 }
 
 function getWasiSymbol (wasi: WASIInstance, description: string): symbol | undefined

diff --git a/packages/wasi-threads/src/worker.ts b/packages/wasi-threads/src/worker.ts
@@ -1,14 +1,7 @@
-import { createMessage } from './command'
+import { type LoadPayload, createMessage } from './command'
 import type { WorkerMessageEvent } from './thread-manager'
 import { getPostMessage, isTrapError, serizeErrorToBuffer } from './util'
 
-/** @public */
-export interface InstantiatePayload {
-  wasmModule: WebAssembly.Module
-  wasmMemory: WebAssembly.Memory
-  sab?: Int32Array
-}
-
 export interface OnStartData {
   tid: number
   arg: number
@@ -17,7 +10,7 @@ export interface OnStartData {
 
 /** @public */
 export interface ThreadMessageHandlerOptions {
-  onLoad?: (data: InstantiatePayload) => WebAssembly.WebAssemblyInstantiatedSource | PromiseLike<WebAssembly.WebAssemblyInstantiatedSource>
+  onLoad?: (data: LoadPayload) => WebAssembly.WebAssemblyInstantiatedSource | PromiseLike<WebAssembly.WebAssemblyInstantiatedSource>
   postMessage?: (message: any) => void
 }
 
@@ -26,7 +19,7 @@ export class ThreadMessageHandler {
   protected instance: WebAssembly.Instance | undefined
   private messagesBeforeLoad: any[]
   protected postMessage: (message: any) => void
-  protected onLoad?: (data: InstantiatePayload) => WebAssembly.WebAssemblyInstantiatedSource | PromiseLike<WebAssembly.WebAssemblyInstantiatedSource>
+  protected onLoad?: (data: LoadPayload) => WebAssembly.WebAssemblyInstantiatedSource | PromiseLike<WebAssembly.WebAssemblyInstantiatedSource>
 
   public constructor (options?: ThreadMessageHandlerOptions) {
     const postMsg = getPostMessage(options)
@@ -41,7 +34,7 @@ export class ThreadMessageHandler {
   }
 
   /** @virtual */
-  public instantiate (data: InstantiatePayload): WebAssembly.WebAssemblyInstantiatedSource | PromiseLike<WebAssembly.WebAssemblyInstantiatedSource> {
+  public instantiate (data: LoadPayload): WebAssembly.WebAssemblyInstantiatedSource | PromiseLike<WebAssembly.WebAssemblyInstantiatedSource> {
     if (typeof this.onLoad === 'function') {
       return this.onLoad(data)
     }
@@ -64,7 +57,7 @@ export class ThreadMessageHandler {
     }
   }
 
-  private _load (payload: InstantiatePayload): void {
+  private _load (payload: LoadPayload): void {
     if (this.instance !== undefined) return
     let source: WebAssembly.WebAssemblyInstantiatedSource | PromiseLike<WebAssembly.WebAssemblyInstantiatedSource>
     try {
@@ -107,7 +100,7 @@ export class ThreadMessageHandler {
     postMessage(createMessage('cleanup-thread', { tid }))
   }
 
-  protected _loaded (err: Error | null, source: WebAssembly.WebAssemblyInstantiatedSource | null, payload: InstantiatePayload): void {
+  protected _loaded (err: Error | null, source: WebAssembly.WebAssemblyInstantiatedSource | null, payload: LoadPayload): void {
     if (err) {
       notifyPthreadCreateResult(payload.sab, 2, err)
       throw err