bare-worker 3.0.0 → 3.1.0

package/index.js

@@ -1,4 +1,3 @@
-/* global Bare */
 const Channel = require('bare-channel')
 const MessageChannel = require('./lib/message-channel')
 const MessagePort = require('./lib/message-port')
@@ -17,17 +16,28 @@ module.exports = exports = class Worker extends MessagePort {
       data: {
         channel: channel.handle,
         filename,
-        data: opts.workerData
+        data: opts.workerData,
+        imports: module.imports
       }
     })
 
     this._exitCode = 0
+    this._terminating = null
 
     this.on('close', this._onexit).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')]() {
@@ -40,6 +50,9 @@ module.exports = exports = class Worker extends MessagePort {
 
   _onexit() {
     this._thread.join()
+
+    if (this._terminating !== null) this._terminating.resolve(this._exitCode)
+
     this.emit('exit', this._exitCode)
   }
 }

package/lib/message-port.js

@@ -1,4 +1,3 @@
-/* global Bare */
 const EventEmitter = require('bare-events')
 const Channel = require('bare-channel')
 const constants = require('./constants')

package/lib/worker-thread.js

@@ -1,4 +1,3 @@
-/* global Bare */
 const Channel = require('bare-channel')
 const Module = require('bare-module')
 const os = require('bare-os')
@@ -7,7 +6,7 @@ const MessagePort = require('./message-port')
 const worker = require('..')
 const { Thread } = Bare
 
-const { channel: handle, filename, data } = Thread.self.data
+const { channel: handle, filename, data, imports } = Thread.self.data
 
 const channel = Channel.from(handle, { interfaces: [MessagePort] })
 
@@ -21,7 +20,12 @@ worker.parentPort._online()
 
 worker.workerData = data
 
-Module.load(Module.resolve(filename, url.pathToFileURL(os.cwd() + '/')))
+Module.load(
+  Module.resolve(filename, url.pathToFileURL(os.cwd() + '/'), {
+    imports
+  }),
+  { imports }
+)
 
 function onnewlistener(name, fn) {
   if (fn === onremovelistener || fn === onerror) return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-worker",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Higher-level worker threads for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -28,9 +28,9 @@
   },
   "homepage": "https://github.com/holepunchto/bare-worker#readme",
   "dependencies": {
-    "bare-channel": "^5.0.1",
+    "bare-channel": "^5.0.5",
     "bare-events": "^2.2.1",
-    "bare-module": "^4.0.0",
+    "bare-module": "^5.0.0",
     "bare-os": "^3.0.1",
     "bare-url": "^2.0.1"
   },