bare-worker 3.0.1 → 3.1.1

package/index.js

@@ -22,12 +22,22 @@ module.exports = exports = class Worker extends MessagePort {
     })
 
     this._exitCode = 0
+    this._terminating = null
 
-    this.on('close', this._onexit).start()
+    this.start()
   }
 
   terminate() {
+    if (this._terminating !== null) return this._terminating.promise
+
+    if (this._state & constants.state.CLOSED) {
+      return Promise.resolve(this._exitCode)
+    }
+
+    this._terminating = Promise.withResolvers()
     this._terminate()
+
+    return this._terminating.promise
   }
 
   [Symbol.for('bare.inspect')]() {
@@ -38,8 +48,13 @@ module.exports = exports = class Worker extends MessagePort {
     }
   }
 
-  _onexit() {
+  _onclose() {
+    super._onclose()
+
     this._thread.join()
+
+    if (this._terminating !== null) this._terminating.resolve(this._exitCode)
+
     this.emit('exit', this._exitCode)
   }
 }

package/lib/message-port.js

@@ -190,6 +190,7 @@ module.exports = exports = class MessagePort extends EventEmitter {
     MessagePort._ports.delete(this)
 
     this._state |= constants.state.CLOSED
+
     this.emit('close')
   }
 
@@ -199,12 +200,14 @@ module.exports = exports = class MessagePort extends EventEmitter {
 
   _ononline() {
     this._state |= constants.state.ONLINE
+
     this.emit('online')
   }
 
   _onerror(err) {
     this._exitCode = 1
     this._terminate()
+
     this.emit('error', err)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-worker",
-  "version": "3.0.1",
+  "version": "3.1.1",
   "description": "Higher-level worker threads for JavaScript",
   "exports": {
     ".": "./index.js",