bare-worker 4.1.5 → 4.1.8

package/index.js

@@ -1,18 +1,24 @@
 const Thread = require('bare-thread')
 const Channel = require('bare-channel')
 const WorkerState = require('./lib/worker-state')
+const MessageChannel = require('./lib/message-channel')
+const MessagePort = require('./lib/message-port')
 const constants = require('./lib/constants')
-const preloads = require('./lib/preloads')
 
-let MessageChannel
-let MessagePort
+const preloads = new Map()
+
+let environmentData = new Map()
+let parentPort = null
+let workerData = null
 
 if (WorkerState.parent) {
-  MessageChannel = WorkerState.parent.MessageChannel
-  MessagePort = WorkerState.parent.MessagePort
-} else {
-  MessageChannel = require('./lib/message-channel')
-  MessagePort = require('./lib/message-port')
+  for (const [entry, source] of WorkerState.parent.preloads) {
+    preloads.set(entry, source)
+  }
+
+  parentPort = WorkerState.parent.port
+  workerData = WorkerState.parent.data
+  environmentData = WorkerState.parent.environmentData
 }
 
 const worker = Thread.prepare(require.resolve('./lib/worker-thread'), { shared: true })
@@ -32,7 +38,8 @@ module.exports = exports = class Worker extends MessagePort {
         source: Thread.prepare(entry, { shared: true }),
         channel: channel.handle,
         data: workerData,
-        preloads
+        preloads,
+        environmentData
       }
     })
 
@@ -55,6 +62,10 @@ module.exports = exports = class Worker extends MessagePort {
     return this._terminating.promise
   }
 
+  async [Symbol.asyncDispose]() {
+    await this.terminate()
+  }
+
   [Symbol.for('bare.inspect')]() {
     return {
       __proto__: { constructor: Worker },
@@ -74,21 +85,24 @@ module.exports = exports = class Worker extends MessagePort {
   }
 }
 
+exports.setEnvironmentData = function setEnvironmentData(key, value) {
+  environmentData.set(key, value)
+}
+
+exports.getEnvironmentData = function getEnvironmentData(key) {
+  return environmentData.get(key)
+}
+
 exports.Worker = exports
 
 exports.MessageChannel = MessageChannel
 exports.MessagePort = MessagePort
 
+exports.parentPort = parentPort
+exports.workerData = workerData
+
 exports.isMainThread = Thread.isMainThread
 
 exports.preload = function preload(entry) {
   preloads.set(entry, Thread.prepare(entry, { shared: true }))
 }
-
-if (WorkerState.parent) {
-  exports.parentPort = WorkerState.parent.port
-  exports.workerData = WorkerState.parent.data
-} else {
-  exports.parentPort = null
-  exports.workerData = null
-}

package/lib/message-channel.js

@@ -1,4 +1,5 @@
 const Channel = require('bare-channel')
+const WorkerState = require('./worker-state')
 const MessagePort = require('./message-port')
 
 module.exports = class MessageChannel {
@@ -9,3 +10,5 @@ module.exports = class MessageChannel {
     this.port2 = new MessagePort(channel)
   }
 }
+
+if (WorkerState.parent) module.exports = WorkerState.parent.MessageChannel

package/lib/message-port.js

@@ -1,5 +1,6 @@
 const EventEmitter = require('bare-events')
 const Channel = require('bare-channel')
+const WorkerState = require('./worker-state')
 const constants = require('./constants')
 const errors = require('./errors')
 
@@ -58,6 +59,10 @@ module.exports = exports = class MessagePort extends EventEmitter {
     this._unref()
   }
 
+  hasRef() {
+    return (this._state & constants.state.REFED) !== 0
+  }
+
   [Symbol.for('bare.inspect')]() {
     return {
       __proto__: { constructor: MessagePort },
@@ -214,6 +219,8 @@ module.exports = exports = class MessagePort extends EventEmitter {
   static _ports = new Set()
 }
 
+if (WorkerState.parent) module.exports = WorkerState.parent.MessagePort
+
 Bare.on('beforeExit', (exitCode) => {
   for (const port of exports._ports) port._beforeExit(exitCode)
 })

package/lib/worker-state.js

@@ -1,6 +1,4 @@
 const Channel = require('bare-channel')
-const MessageChannel = require('./message-channel')
-const MessagePort = require('./message-port')
 
 const state = Symbol.for('bare.worker.state')
 const kind = Symbol.for('bare.worker.state.kind')
@@ -11,15 +9,19 @@ class WorkerState {
   }
 
   constructor() {
-    const { source, preloads, data, channel: handle } = Bare.Thread.self.data
+    this._MessageChannel = require('./message-channel')
+    this._MessagePort = require('./message-port')
+
+    const { source, preloads, data, environmentData, channel: handle } = Bare.Thread.self.data
 
     this.source = source
     this.preloads = preloads
     this.data = Bare.Thread.self.data = data
+    this.environmentData = environmentData
 
-    const channel = Channel.from(handle, { interfaces: [MessagePort] })
+    const channel = Channel.from(handle, { interfaces: [this._MessagePort] })
 
-    this.port = new MessagePort(channel)
+    this.port = new this._MessagePort(channel)
     this.port._online()
 
     global[state] = this
@@ -30,11 +32,11 @@ class WorkerState {
   }
 
   get MessageChannel() {
-    return MessageChannel
+    return this._MessageChannel
   }
 
   get MessagePort() {
-    return MessagePort
+    return this._MessagePort
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-worker",
-  "version": "4.1.5",
+  "version": "4.1.8",
   "description": "Higher-level worker threads for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -17,7 +17,9 @@
     "lib"
   ],
   "scripts": {
-    "test": "prettier . --check && bare test.js"
+    "format": "prettier --write . && lunte --fix",
+    "lint": "prettier --check . && lunte",
+    "test": "brittle-bare --coverage test.js"
   },
   "repository": {
     "type": "git",
@@ -33,10 +35,11 @@
     "bare-channel": "^5.1.5",
     "bare-events": "^2.2.1",
     "bare-module": "^6.0.1",
-    "bare-thread": "^1.1.3"
+    "bare-thread": "^1.2.2"
   },
   "devDependencies": {
     "brittle": "^3.2.1",
+    "lunte": "^1.8.0",
     "prettier": "^3.4.1",
     "prettier-config-holepunch": "^2.0.0"
   }

package/lib/preloads.js

@@ -1,11 +0,0 @@
-const WorkerState = require('./worker-state')
-
-const preloads = new Map()
-
-if (WorkerState.parent) {
-  for (const [entry, source] of WorkerState.parent.preloads) {
-    preloads.set(entry, source)
-  }
-}
-
-module.exports = preloads