bare-worker 3.1.0 → 3.2.0

package/index.js

@@ -2,6 +2,7 @@ const Channel = require('bare-channel')
 const MessageChannel = require('./lib/message-channel')
 const MessagePort = require('./lib/message-port')
 const constants = require('./lib/constants')
+const preloads = require('./lib/preloads')
 const { Thread } = Bare
 
 module.exports = exports = class Worker extends MessagePort {
@@ -17,14 +18,15 @@ module.exports = exports = class Worker extends MessagePort {
         channel: channel.handle,
         filename,
         data: opts.workerData,
-        imports: module.imports
+        imports: module.imports,
+        preloads
       }
     })
 
     this._exitCode = 0
     this._terminating = null
 
-    this.on('close', this._onexit).start()
+    this.start()
   }
 
   terminate() {
@@ -48,7 +50,9 @@ module.exports = exports = class Worker extends MessagePort {
     }
   }
 
-  _onexit() {
+  _onclose() {
+    super._onclose()
+
     this._thread.join()
 
     if (this._terminating !== null) this._terminating.resolve(this._exitCode)
@@ -67,3 +71,7 @@ exports.isMainThread = Thread.isMainThread
 exports.parentPort = null
 
 exports.workerData = null
+
+exports.preload = function preload(filename) {
+  preloads.add(filename)
+}

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/lib/preloads.js

@@ -0,0 +1,15 @@
+const { Thread } = Bare
+
+const preloads = new Set()
+
+if (
+  Thread.self &&
+  typeof Thread.self.data === 'object' &&
+  Thread.self.data !== null &&
+  typeof Thread.self.data.preloads === 'object' &&
+  Thread.self.data.preloads !== null
+) {
+  for (const filename of Thread.self.data.preloads) preloads.add(filename)
+}
+
+module.exports = preloads

package/lib/worker-thread.js

@@ -6,7 +6,9 @@ const MessagePort = require('./message-port')
 const worker = require('..')
 const { Thread } = Bare
 
-const { channel: handle, filename, data, imports } = Thread.self.data
+const { channel: handle, filename, data, imports, preloads } = Thread.self.data
+
+for (const preload of preloads) require(preload)
 
 const channel = Channel.from(handle, { interfaces: [MessagePort] })
 

package/package.json

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