bare-worker 2.0.1 → 3.0.1

package/README.md

@@ -8,17 +8,15 @@ npm i bare-worker
 
 ## Usage
 
-``` js
+```js
 const Worker = require('bare-worker')
 
 if (Worker.isMainThread) {
   const worker = new Worker(__filename)
 
-  worker
-    .on('message', console.log)
-    .on('exit', (code) => {
-      console.log('Worker exited with code', code)
-    })
+  worker.on('message', console.log).on('exit', (code) => {
+    console.log('Worker exited with code', code)
+  })
 } else {
   Worker.parentPort.postMessage('Hello worker')
 }

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')
@@ -6,7 +5,7 @@ const constants = require('./lib/constants')
 const { Thread } = Bare
 
 module.exports = exports = class Worker extends MessagePort {
-  constructor (filename, opts = {}) {
+  constructor(filename, opts = {}) {
     const channel = new Channel({ interfaces: [MessagePort] })
 
     super(channel)
@@ -17,18 +16,21 @@ module.exports = exports = class Worker extends MessagePort {
       data: {
         channel: channel.handle,
         filename,
-        data: opts.workerData
+        data: opts.workerData,
+        imports: module.imports
       }
     })
 
-    this.start()
+    this._exitCode = 0
+
+    this.on('close', this._onexit).start()
   }
 
-  terminate () {
+  terminate() {
     this._terminate()
   }
 
-  [Symbol.for('bare.inspect')] () {
+  [Symbol.for('bare.inspect')]() {
     return {
       __proto__: { constructor: Worker },
 
@@ -36,24 +38,9 @@ module.exports = exports = class Worker extends MessagePort {
     }
   }
 
-  async _ononline () {
-    await super._ononline()
-
-    this.emit('online')
-  }
-
-  async _onexit (exitCode) {
-    await super._onexit()
-
+  _onexit() {
     this._thread.join()
-
-    this.emit('exit', exitCode)
-  }
-
-  async _onerror (err) {
-    await super._onerror()
-
-    this.emit('error', err)
+    this.emit('exit', this._exitCode)
   }
 }
 

package/lib/constants.js

@@ -4,14 +4,13 @@ module.exports = {
     STARTED: 0x2,
     TERMINATING: 0x4,
     CLOSED: 0x8,
-    EXITED: 0x10,
-    DETACHED: 0x20,
-    REFED: 0x40
+    DETACHED: 0x10,
+    REFED: 0x20
   },
   message: {
     MESSAGE: 0,
     ONLINE: 1,
-    EXIT: 2,
+    BEFORE_EXIT: 2,
     ERROR: 3,
     TERMINATE: 4
   }

package/lib/errors.js

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

package/lib/message-channel.js

@@ -2,7 +2,7 @@ const Channel = require('bare-channel')
 const MessagePort = require('./message-port')
 
 module.exports = class MessageChannel {
-  constructor () {
+  constructor() {
     const channel = new Channel({ interfaces: [MessagePort] })
 
     this.port1 = new MessagePort(channel)

package/lib/message-port.js

@@ -1,28 +1,29 @@
-/* global Bare */
 const EventEmitter = require('bare-events')
 const Channel = require('bare-channel')
 const constants = require('./constants')
 const errors = require('./errors')
 
 module.exports = exports = class MessagePort extends EventEmitter {
-  constructor (channel) {
+  constructor(channel) {
     super()
 
     this._state = 0
     this._inflight = 0
     this._channel = channel
     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 () {
+  get detached() {
     return (this._state & constants.state.DETACHED) !== 0
   }
 
-  start () {
+  start() {
     if (this._state & constants.state.STARTED) return
 
     this._state |= constants.state.STARTED
@@ -42,25 +43,28 @@ module.exports = exports = class MessagePort extends EventEmitter {
     MessagePort._ports.add(this)
   }
 
-  postMessage (message, transferList) {
-    this._write({ type: constants.message.MESSAGE, value: message }, { transfer: transferList })
+  postMessage(message, transferList) {
+    this._write(
+      { type: constants.message.MESSAGE, value: message },
+      { transfer: transferList }
+    )
   }
 
-  close () {
+  close() {
     this._close()
   }
 
-  ref () {
+  ref() {
     this._state |= constants.state.REFED
     this._ref()
   }
 
-  unref () {
+  unref() {
     this._state &= ~constants.state.REFED
     this._unref()
   }
 
-  [Symbol.for('bare.inspect')] () {
+  [Symbol.for('bare.inspect')]() {
     return {
       __proto__: { constructor: MessagePort },
 
@@ -68,9 +72,11 @@ module.exports = exports = class MessagePort extends EventEmitter {
     }
   }
 
-  [Symbol.for('bare.detach')] () {
+  [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
@@ -82,17 +88,17 @@ module.exports = exports = class MessagePort extends EventEmitter {
     return handle
   }
 
-  static [Symbol.for('bare.attach')] (handle) {
+  static [Symbol.for('bare.attach')](handle) {
     return new MessagePort(Channel.from(handle, { interfaces: [MessagePort] }))
   }
 
-  _close () {
+  _close() {
     if (this._port === null) this.start()
 
     this._port.close()
   }
 
-  _ref () {
+  _ref() {
     if (this._port === null) return
 
     if (this._inflight > 0 || (this._state & constants.state.REFED) !== 0) {
@@ -100,7 +106,7 @@ module.exports = exports = class MessagePort extends EventEmitter {
     }
   }
 
-  _unref () {
+  _unref() {
     if (this._port === null) return
 
     if (this._inflight === 0 && (this._state & constants.state.REFED) === 0) {
@@ -108,7 +114,7 @@ module.exports = exports = class MessagePort extends EventEmitter {
     }
   }
 
-  async _write (data, opts = {}) {
+  async _write(data, opts = {}) {
     if (this._port === null) this.start()
 
     this._inflight++
@@ -120,7 +126,7 @@ module.exports = exports = class MessagePort extends EventEmitter {
     this._unref()
   }
 
-  async _online () {
+  async _online() {
     if (this._state & constants.state.ONLINE) return
 
     this._state |= constants.state.ONLINE
@@ -128,15 +134,15 @@ module.exports = exports = class MessagePort extends EventEmitter {
     await this._write({ type: constants.message.ONLINE })
   }
 
-  async _exit (exitCode) {
-    await this._write({ type: constants.message.EXIT, exitCode })
+  async _error(error) {
+    await this._write({ type: constants.message.ERROR, error })
   }
 
-  async _error (error) {
-    await this._write({ type: constants.message.ERROR, error })
+  async _beforeExit(exitCode) {
+    await this._write({ type: constants.message.BEFORE_EXIT, exitCode })
   }
 
-  async _terminate () {
+  async _terminate() {
     if (this._state & constants.state.TERMINATING) return
 
     this._state |= constants.state.TERMINATING
@@ -144,28 +150,28 @@ module.exports = exports = class MessagePort extends EventEmitter {
     await this._write({ type: constants.message.TERMINATE })
   }
 
-  async _read () {
+  async _read() {
     for await (const message of this._port) {
       switch (message.type) {
         case constants.message.MESSAGE:
-          await this._onmessage(message.value)
+          this._onmessage(message.value)
           break
         case constants.message.ONLINE:
-          await this._ononline()
-          break
-        case constants.message.EXIT:
-          await this._onexit(message.exitCode)
+          this._ononline()
           break
         case constants.message.ERROR:
-          await this._onerror(message.error)
+          this._onerror(message.error)
+          break
+        case constants.message.BEFORE_EXIT:
+          this._onbeforeexit(message.exitCode)
           break
         case constants.message.TERMINATE:
-          await this._onterminate()
+          this._onterminate()
       }
     }
   }
 
-  _onnewlistener (name) {
+  _onnewlistener(name) {
     if (name !== 'message') return
 
     if (this.listenerCount('message') === 0) {
@@ -174,45 +180,45 @@ module.exports = exports = class MessagePort extends EventEmitter {
     }
   }
 
-  _onremovelistener (name) {
+  _onremovelistener(name) {
     if (name !== 'message') return
 
     if (this.listenerCount('message') === 0) this.unref()
   }
 
-  _onclose () {
-    this._state |= constants.state.CLOSED
-
+  _onclose() {
     MessagePort._ports.delete(this)
 
+    this._state |= constants.state.CLOSED
     this.emit('close')
   }
 
-  async _onmessage (message) {
+  _onmessage(message) {
     this.emit('message', message)
   }
 
-  async _ononline () {
+  _ononline() {
     this._state |= constants.state.ONLINE
+    this.emit('online')
   }
 
-  async _onexit () {
-    await this._port.close()
-
-    this._state |= constants.state.EXITED
+  _onerror(err) {
+    this._exitCode = 1
+    this._terminate()
+    this.emit('error', err)
   }
 
-  async _onerror () {}
+  _onbeforeexit(exitCode) {
+    this._exitCode = exitCode
+  }
 
-  async _onterminate () {
+  _onterminate() {
     Bare.exit()
   }
 
   static _ports = new Set()
 }
 
-Bare.on('exit', (exitCode) => {
-  for (const port of exports._ports) {
-    port._exit(exitCode)
-  }
+Bare.on('beforeExit', (exitCode) => {
+  for (const port of exports._ports) port._beforeExit(exitCode)
 })

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,16 +6,11 @@ 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] })
 
-Bare
-  .on('newListener', onnewlistener)
+Bare.on('newListener', onnewlistener)
   .on('removeListener', onremovelistener)
   .on('uncaughtException', onerror)
   .on('unhandledRejection', onerror)
@@ -26,9 +20,14 @@ 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) {
+function onnewlistener(name, fn) {
   if (fn === onremovelistener || fn === onerror) return
 
   switch (name) {
@@ -38,7 +37,7 @@ function onnewlistener (name, fn) {
   }
 }
 
-function onremovelistener (name, fn) {
+function onremovelistener(name, fn) {
   if (fn === onremovelistener || fn === onerror) return
 
   switch (name) {
@@ -48,8 +47,8 @@ function onremovelistener (name, fn) {
   }
 }
 
-async function onerror (error) {
+async function onerror(error) {
   await worker.parentPort._error(error)
 
-  Bare.exit(1)
+  Bare.exitCode = 1
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-worker",
-  "version": "2.0.1",
+  "version": "3.0.1",
   "description": "Higher-level worker threads for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -15,7 +15,7 @@
     "lib"
   ],
   "scripts": {
-    "test": "standard && bare test.js"
+    "test": "prettier . --check && bare test.js"
   },
   "repository": {
     "type": "git",
@@ -27,18 +27,16 @@
     "url": "https://github.com/holepunchto/bare-worker/issues"
   },
   "homepage": "https://github.com/holepunchto/bare-worker#readme",
-  "engines": {
-    "bare": ">=1.2.0"
-  },
   "dependencies": {
-    "bare-channel": "^4.1.0",
+    "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"
   },
   "devDependencies": {
     "brittle": "^3.2.1",
-    "standard": "^17.0.0"
+    "prettier": "^3.4.1",
+    "prettier-config-standard": "^7.0.0"
   }
 }