like-thread 1.0.2 → 1.0.3

package/index.js

@@ -53,10 +53,12 @@ module.exports = class Thread {
     this.isGenerator = !!entrypoint[2]
 
     this.worker = new Worker(WORKER_SCRIPT, { eval: true, workerData, argv: opts.argv || null })
+    this._online = promiseWithResolvers()
 
-    this.id = 1
+    this.id = 0
     this.requests = new Map()
 
+    this.worker.on('online', this._onOnline.bind(this))
     this.worker.on('message', this._onMessage.bind(this))
 
     this.promise = new Promise((resolve, reject) => {
@@ -75,6 +77,8 @@ module.exports = class Thread {
           }
         }
 
+        this._online.resolve(false)
+
         reject(err)
       })
 
@@ -93,6 +97,8 @@ module.exports = class Thread {
           }
         }
 
+        this._online.resolve(false)
+
         const success = exitCode === 0 || exitCode === 130 || signal === 'SIGINT' || signal === 'SIGTERM' || signal === 'SIGHUP'
 
         if (success) {
@@ -104,6 +110,34 @@ module.exports = class Thread {
     })
 
     this.promise.catch(noop)
+
+    this.closing = null
+
+    this.opened = false
+    this.opening = this.ready()
+    this.opening.then(() => {
+      this.opened = true
+    }).catch(noop)
+  }
+
+  async ready () {
+    if (this.opening) return this.opening
+
+    await this._online.promise
+  }
+
+  async close () {
+    if (this.closing) return this.closing
+
+    this.closing = Promise.resolve()
+
+    this.worker.postMessage({ command: 'exit' })
+
+    await this.promise.catch(noop)
+  }
+
+  _onOnline () {
+    this._online.resolve(true)
   }
 
   _onMessage (msg) {
@@ -113,12 +147,18 @@ module.exports = class Thread {
       return
     }
 
-    // console.log('_onMessage', msg, !!req.iterator ? 'iterator' : 'promise')
-
     if (msg.error) {
       this.requests.delete(msg.id)
 
-      const err = new Error(msg.error)
+      const err = new Error(msg.error.message)
+
+      if (msg.error.name) {
+        err.name = msg.error.name
+      }
+
+      if (typeof msg.error.code !== 'undefined') {
+        err.code = msg.error.code
+      }
 
       if (req.resolver) {
         req.resolver.reject(err)
@@ -158,11 +198,15 @@ module.exports = class Thread {
   }
 
   call (...args) {
+    if (this.closing) {
+      return Promise.reject(new Error('Thread is closed'))
+    }
+
     if (this.id === 0xffffffff) {
-      this.id = 1
+      this.id = 0
     }
 
-    const id = this.id++
+    const id = ++this.id
 
     const sab = new SharedArrayBuffer(4)
     const control = new Int32Array(sab)
@@ -241,19 +285,15 @@ module.exports = class Thread {
         return item
       },
 
-      return: () => {
-        iterator.closed = true
-
+      async return () {
         Atomics.store(control, 0, 2)
         Atomics.notify(control, 0, 1)
 
-        // this.worker.postMessage({ id, command: 'stop' })
-        // return
-
-        // iterator.queue.length = 0
-        // iterator.resolver.resolve()
+        try {
+          await iterator.resolver.promise
+        } catch {}
 
-        return Promise.resolve({ done: true })
+        return { done: true }
       }
     }
   }
@@ -285,12 +325,6 @@ module.exports = class Thread {
   finally (onFinally) {
     return this.promise.finally(onFinally)
   }
-
-  async close () {
-    this.worker.postMessage({ command: 'exit' })
-
-    await this.promise.catch(noop)
-  }
 }
 
 function noop () {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "like-thread",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "",
   "main": "index.js",
   "files": [

package/worker.js

@@ -9,6 +9,11 @@ const functionArgs = entrypoint[4] || ''
 
 const fn = workerData.fn.replace(entrypoint[0], (isAsync ? 'async ' : '') + 'function ' + (isGenerator ? '* ' : '') + functionName + ' (' + (functionArgs) + ')')
 
+// TODO: We can avoid re-creating the func inside the func by using prototypes
+const source = fn + '\n\nreturn ' + functionName + '(...args)'
+
+const wrap = new Function('require', '__dirname', '__filename', 'module', 'exports', 'parentPort', 'args', source) // eslint-disable-line no-new-func
+
 parentPort.on('message', async (msg) => {
   if (msg.command === 'exit') {
     process.exit()
@@ -16,21 +21,16 @@ parentPort.on('message', async (msg) => {
   }
 
   try {
-    // TODO: Optimize by creating the function only once by fixing the args
-    const source = fn + '\n\nmodule.exports = ' + functionName + '(...' + JSON.stringify(msg.args || []) + ')'
-
-    const wrap = new Function('require', '__dirname', '__filename', 'module', 'exports', 'parentPort', source) // eslint-disable-line no-new-func
-
     const mod = { exports: {} }
 
-    wrap(require, __dirname, __filename, mod, mod.exports, parentPort)
-
-    const out = mod.exports
+    const out = wrap(require, __dirname, __filename, mod, mod.exports, parentPort, msg.args || [])
 
     if (isGenerator) {
       const control = new Int32Array(msg.sab)
       const it = out[Symbol.asyncIterator] ? out[Symbol.asyncIterator]() : out[Symbol.iterator]()
 
+      let end = false
+
       while (true) {
         while (Atomics.load(control, 0) === 0) {
           const res = Atomics.waitAsync(control, 0, 0)
@@ -51,6 +51,7 @@ parentPort.on('message', async (msg) => {
         Atomics.store(control, 0, 0)
 
         if (done) {
+          end = true
           parentPort.postMessage({ id: msg.id, done: true })
           break
         }
@@ -59,6 +60,10 @@ parentPort.on('message', async (msg) => {
         parentPort.postMessage({ id: msg.id, value, v: true })
       }
 
+      if (!end) {
+        parentPort.postMessage({ id: msg.id, done: true })
+      }
+
       return
     }
 
@@ -72,6 +77,6 @@ parentPort.on('message', async (msg) => {
 
     parentPort.postMessage({ id: msg.id, value: out, v: true })
   } catch (err) {
-    parentPort.postMessage({ id: msg.id, error: err })
+    parentPort.postMessage({ id: msg.id, error: { name: err.name, code: err.code, message: err.message } })
   }
 })