bare-worker 4.1.6 → 4.1.9

package/index.js

@@ -7,6 +7,7 @@ const constants = require('./lib/constants')
 
 const preloads = new Map()
 
+let environmentData = new Map()
 let parentPort = null
 let workerData = null
 
@@ -17,6 +18,7 @@ if (WorkerState.parent) {
 
   parentPort = WorkerState.parent.port
   workerData = WorkerState.parent.data
+  environmentData = WorkerState.parent.environmentData
 }
 
 const worker = Thread.prepare(require.resolve('./lib/worker-thread'), { shared: true })
@@ -36,7 +38,8 @@ module.exports = exports = class Worker extends MessagePort {
         source: Thread.prepare(entry, { shared: true }),
         channel: channel.handle,
         data: workerData,
-        preloads
+        preloads,
+        environmentData
       }
     })
 
@@ -59,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 },
@@ -78,6 +85,14 @@ 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

package/lib/message-channel.js

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

package/lib/message-port.js

@@ -1,6 +1,5 @@
 const EventEmitter = require('bare-events')
 const Channel = require('bare-channel')
-const WorkerState = require('./worker-state')
 const constants = require('./constants')
 const errors = require('./errors')
 
@@ -59,6 +58,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 },
@@ -215,8 +218,6 @@ 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,21 +1,31 @@
 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')
 
-class WorkerState {
+module.exports = class WorkerState {
   static get [kind]() {
     return 0 // Compatibility version
   }
 
+  static get parent() {
+    const parent = global[state]
+
+    if (typeof parent === 'object' && parent !== null && parent[kind] === WorkerState[kind]) {
+      return parent
+    }
+
+    return null
+  }
+
   constructor() {
-    const { source, preloads, data, channel: handle } = Bare.Thread.self.data
+    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] })
 
@@ -28,24 +38,4 @@ class WorkerState {
   get [kind]() {
     return WorkerState[kind]
   }
-
-  get MessageChannel() {
-    return MessageChannel
-  }
-
-  get MessagePort() {
-    return MessagePort
-  }
-}
-
-module.exports = exports = WorkerState
-
-if (
-  typeof global[state] === 'object' &&
-  global[state] !== null &&
-  global[state][kind] === WorkerState[kind]
-) {
-  exports.parent = global[state]
-} else {
-  exports.parent = null
 }

package/lib/worker-thread.js

@@ -8,17 +8,11 @@ Bare.on('newListener', onnewlistener)
   .on('uncaughtException', onerror)
   .on('unhandledRejection', onerror)
 
-const cache = Object.create(null)
-
 for (const [, source] of state.preloads) {
-  Module.load(
-    new URL(`bare:/worker/preload-${Math.random().toString(16).slice(2)}.bundle`),
-    source,
-    { cache }
-  )
+  Module.load(new URL(`bare:/worker/preload-${Math.random().toString(16).slice(2)}.bundle`), source)
 }
 
-Module.load(new URL('bare:/worker.bundle'), state.source, { cache })
+Module.load(new URL('bare:/worker.bundle'), state.source)
 
 function onnewlistener(name, fn) {
   if (fn === onremovelistener || fn === onerror) return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-worker",
-  "version": "4.1.6",
+  "version": "4.1.9",
   "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"
   }