bare-worker 4.0.0 → 4.1.1

package/global.js

@@ -0,0 +1,4 @@
+const { MessageChannel, MessagePort } = require('.')
+
+global.MessageChannel = MessageChannel
+global.MessagePort = MessagePort

package/index.js

@@ -1,24 +1,27 @@
+const Thread = require('bare-thread')
 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
+
+const worker = Thread.prepare(require.resolve('./lib/worker-thread'), { shared: true })
 
 module.exports = exports = class Worker extends MessagePort {
-  constructor(filename, opts = {}) {
+  constructor(entry, opts = {}) {
+    const { workerData } = opts
+
     const channel = new Channel({ interfaces: [MessagePort] })
 
     super(channel)
 
     this._state = constants.state.REFED
 
-    this._thread = new Thread(require.resolve('./lib/worker-thread'), {
+    this._thread = new Thread(worker, {
       data: {
+        source: Thread.prepare(entry, { shared: true }),
         channel: channel.handle,
-        filename,
-        data: opts.workerData,
-        imports: module.imports,
+        workerData,
         preloads
       }
     })
@@ -72,6 +75,6 @@ exports.parentPort = null
 
 exports.workerData = null
 
-exports.preload = function preload(filename) {
-  preloads.add(filename)
+exports.preload = function preload(entry) {
+  preloads.set(entry, Thread.prepare(entry, { shared: true }))
 }

package/lib/errors.js

@@ -1,11 +1,10 @@
 module.exports = class WorkerError extends Error {
-  constructor(msg, code, fn = WorkerError) {
+  constructor(msg, fn = WorkerError, code = fn.name) {
     super(`${code}: ${msg}`)
+
     this.code = code
 
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, fn)
-    }
+    if (Error.captureStackTrace) Error.captureStackTrace(this, fn)
   }
 
   get name() {
@@ -13,6 +12,6 @@ module.exports = class WorkerError extends Error {
   }
 
   static ALREADY_STARTED(msg) {
-    return new WorkerError(msg, 'ALREADY_STARTED', WorkerError.ALREADY_STARTED)
+    return new WorkerError(msg, WorkerError.ALREADY_STARTED)
   }
 }

package/lib/message-port.js

@@ -13,10 +13,7 @@ module.exports = exports = class MessagePort extends EventEmitter {
     this._port = null
     this._exitCode = 0
 
-    this.on('newListener', this._onnewlistener).on(
-      'removeListener',
-      this._onremovelistener
-    )
+    this.on('newListener', this._onnewlistener).on('removeListener', this._onremovelistener)
   }
 
   get detached() {
@@ -44,10 +41,7 @@ module.exports = exports = class MessagePort extends EventEmitter {
   }
 
   postMessage(message, transferList) {
-    this._write(
-      { type: constants.message.MESSAGE, value: message },
-      { transfer: transferList }
-    )
+    this._write({ type: constants.message.MESSAGE, value: message }, { transfer: transferList })
   }
 
   close() {
@@ -74,9 +68,7 @@ module.exports = exports = class MessagePort extends EventEmitter {
 
   [Symbol.for('bare.detach')]() {
     if (this._state & constants.state.STARTED) {
-      throw errors.ALREADY_STARTED(
-        'Worker has already started receiving messages'
-      )
+      throw errors.ALREADY_STARTED('Worker has already started receiving messages')
     }
 
     this._state |= constants.state.DETACHED

package/lib/preloads.js

@@ -1,6 +1,6 @@
-const { Thread } = Bare
+const Thread = require('bare-thread')
 
-const preloads = new Set()
+const preloads = new Map()
 
 if (
   Thread.self &&
@@ -9,7 +9,9 @@ if (
   typeof Thread.self.data.preloads === 'object' &&
   Thread.self.data.preloads !== null
 ) {
-  for (const filename of Thread.self.data.preloads) preloads.add(filename)
+  for (const [entry, source] of Thread.self.data.preloads) {
+    preloads.set(entry, source)
+  }
 }
 
 module.exports = preloads

package/lib/worker-thread.js

@@ -1,33 +1,48 @@
 const Channel = require('bare-channel')
 const Module = require('bare-module')
-const os = require('bare-os')
-const url = require('bare-url')
-const MessagePort = require('./message-port')
-const worker = require('..')
-const { Thread } = Bare
+const Bundle = require('bare-bundle')
 
-const { channel: handle, filename, data, imports, preloads } = Thread.self.data
+const { source, channel: handle, workerData, preloads } = Bare.Thread.self.data
 
-for (const preload of preloads) require(preload)
+const bundle = Bundle.from(source)
 
-const channel = Channel.from(handle, { interfaces: [MessagePort] })
+const protocol = module.protocol.extend({
+  postresolve(context, url) {
+    return bundle.exists(url.href) ? url : context.postresolve(url)
+  },
+
+  exists(context, url, type) {
+    return bundle.exists(url.href) || context.exists(url, type)
+  },
+
+  read(context, url) {
+    return bundle.read(url.href) || context.read(url)
+  }
+})
+
+const { main, imports, resolutions } = bundle
+
+const resolved = Module.resolve('bare-worker', new URL(main), { protocol, imports, resolutions })
+
+const cache = Object.create(null)
+
+const Worker = Module.load(resolved, { protocol, cache }).exports
+
+const channel = Channel.from(handle, { interfaces: [Worker.MessagePort] })
+
+Worker.parentPort = new Worker.MessagePort(channel)
+Worker.parentPort._online()
+
+Worker.workerData = Bare.Thread.self.data = workerData
 
 Bare.on('newListener', onnewlistener)
   .on('removeListener', onremovelistener)
   .on('uncaughtException', onerror)
   .on('unhandledRejection', onerror)
 
-worker.parentPort = new MessagePort(channel)
-worker.parentPort._online()
-
-worker.workerData = data
+for (const [entry, source] of preloads) Module.load(new URL(entry), source, { cache })
 
-Module.load(
-  Module.resolve(filename, url.pathToFileURL(os.cwd() + '/'), {
-    imports
-  }),
-  { imports }
-)
+Module.load(new URL('bare:/worker.bundle'), bundle, { cache })
 
 function onnewlistener(name, fn) {
   if (fn === onremovelistener || fn === onerror) return
@@ -50,7 +65,7 @@ function onremovelistener(name, fn) {
 }
 
 async function onerror(error) {
-  await worker.parentPort._error(error)
+  await Worker.parentPort._error(error)
 
   Bare.exitCode = 1
 }

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "bare-worker",
-  "version": "4.0.0",
+  "version": "4.1.1",
   "description": "Higher-level worker threads for JavaScript",
   "exports": {
     ".": "./index.js",
     "./package": "./package.json",
+    "./global": "./global.js",
     "./constants": "./lib/constants.js",
     "./errors": "./lib/errors.js",
     "./message-channel": "./lib/message-channel.js",
@@ -12,6 +13,7 @@
   },
   "files": [
     "index.js",
+    "global.js",
     "lib"
   ],
   "scripts": {
@@ -31,12 +33,11 @@
     "bare-channel": "^5.1.5",
     "bare-events": "^2.2.1",
     "bare-module": "^6.0.1",
-    "bare-os": "^3.0.1",
-    "bare-url": "^2.0.1"
+    "bare-thread": "^1.1.3"
   },
   "devDependencies": {
     "brittle": "^3.2.1",
     "prettier": "^3.4.1",
-    "prettier-config-standard": "^7.0.0"
+    "prettier-config-holepunch": "^2.0.0"
   }
 }