thread-stream 0.11.2 → 0.13.1

package/test/base.test.js

@@ -9,7 +9,7 @@ const { MessageChannel } = require('worker_threads')
 const { once } = require('events')
 
 test('base sync=true', function (t) {
-  t.plan(9)
+  t.plan(15)
 
   const dest = file()
   const stream = new ThreadStream({
@@ -18,35 +18,36 @@ test('base sync=true', function (t) {
     sync: true
   })
 
-  stream.on('drain', () => {
-    t.pass('drain')
-  })
-
-  stream.on('ready', () => {
-    t.pass('ready emitted')
-  })
-
-  t.ok(stream.write('hello world\n'))
-  t.ok(stream.write('something else\n'))
-  t.ok(stream.writable)
-
-  stream.end()
+  t.same(stream.writableObjectMode, false)
 
+  t.same(stream.writableFinished, false)
   stream.on('finish', () => {
+    t.same(stream.writableFinished, true)
     readFile(dest, 'utf8', (err, data) => {
       t.error(err)
       t.equal(data, 'hello world\nsomething else\n')
     })
   })
 
+  t.same(stream.closed, false)
   stream.on('close', () => {
+    t.same(stream.closed, true)
     t.notOk(stream.writable)
     t.pass('close emitted')
   })
+
+  t.same(stream.writableNeedDrain, false)
+  t.ok(stream.write('hello world\n'))
+  t.ok(stream.write('something else\n'))
+  t.ok(stream.writable)
+
+  t.same(stream.writableEnded, false)
+  stream.end()
+  t.same(stream.writableEnded, true)
 })
 
 test('overflow sync=true', function (t) {
-  t.plan(4)
+  t.plan(3)
 
   const dest = file()
   const stream = new ThreadStream({
@@ -56,11 +57,6 @@ test('overflow sync=true', function (t) {
     sync: true
   })
 
-  stream.on('ready', () => {
-    t.pass('ready emitted')
-    write()
-  })
-
   let count = 0
 
   // Write 10 chars, 20 times
@@ -75,6 +71,8 @@ test('overflow sync=true', function (t) {
     setImmediate(write)
   }
 
+  write()
+
   stream.on('finish', () => {
     t.pass('finish emitted')
   })
@@ -96,13 +94,10 @@ test('overflow sync=false', function (t) {
     sync: false
   })
 
-  stream.on('ready', () => {
-    t.pass('ready emitted')
-    write()
-  })
-
   let count = 0
 
+  t.same(stream.writableNeedDrain, false)
+
   // Write 10 chars, 20 times
   function write () {
     if (count++ === 20) {
@@ -111,12 +106,17 @@ test('overflow sync=false', function (t) {
       return
     }
 
-    stream.write('aaaaaaaaaa')
+    if (!stream.write('aaaaaaaaaa')) {
+      t.same(stream.writableNeedDrain, true)
+    }
     // do not wait for drain event
     setImmediate(write)
   }
 
+  write()
+
   stream.on('drain', () => {
+    t.same(stream.writableNeedDrain, false)
     t.pass('drain')
   })
 
@@ -134,7 +134,7 @@ test('overflow sync=false', function (t) {
 })
 
 test('over the bufferSize at startup', function (t) {
-  t.plan(8)
+  t.plan(6)
 
   const dest = file()
   const stream = new ThreadStream({
@@ -144,20 +144,6 @@ test('over the bufferSize at startup', function (t) {
     sync: true
   })
 
-  stream.on('drain', () => {
-    t.pass('drain')
-  })
-
-  stream.on('ready', () => {
-    t.pass('ready emitted')
-  })
-
-  t.ok(stream.write('hello'))
-  t.notOk(stream.write(' world\n'))
-  t.notOk(stream.write('something else\n'))
-
-  stream.end()
-
   stream.on('finish', () => {
     readFile(dest, 'utf8', (err, data) => {
       t.error(err)
@@ -168,10 +154,16 @@ test('over the bufferSize at startup', function (t) {
   stream.on('close', () => {
     t.pass('close emitted')
   })
+
+  t.ok(stream.write('hello'))
+  t.ok(stream.write(' world\n'))
+  t.ok(stream.write('something else\n'))
+
+  stream.end()
 })
 
 test('over the bufferSize at startup (async)', function (t) {
-  t.plan(8)
+  t.plan(6)
 
   const dest = file()
   const stream = new ThreadStream({
@@ -181,14 +173,6 @@ test('over the bufferSize at startup (async)', function (t) {
     sync: false
   })
 
-  stream.on('drain', () => {
-    t.pass('drain')
-  })
-
-  stream.on('ready', () => {
-    t.pass('ready emitted')
-  })
-
   t.ok(stream.write('hello'))
   t.notOk(stream.write(' world\n'))
   t.notOk(stream.write('something else\n'))
@@ -216,15 +200,6 @@ test('flushSync sync=false', function (t) {
     sync: false
   })
 
-  stream.on('ready', () => {
-    t.pass('ready emitted')
-
-    for (let count = 0; count < 20; count++) {
-      stream.write('aaaaaaaaaa')
-    }
-    stream.flushSync()
-  })
-
   stream.on('drain', () => {
     t.pass('drain')
     stream.end()
@@ -241,50 +216,11 @@ test('flushSync sync=false', function (t) {
       t.end()
     })
   })
-})
-
-test('flushSync on ready if sync=true', function (t) {
-  t.plan(4)
-
-  const dest = file()
-  const stream = new ThreadStream({
-    filename: join(__dirname, 'to-file.js'),
-    workerData: { dest },
-    sync: true
-  })
-
-  stream.on('ready', () => {
-    readFile(dest, 'utf8', (err, data) => {
-      t.error(err)
-      t.equal(data, 'hello world\nsomething else\n')
-      stream.end()
-    })
-  })
 
-  t.ok(stream.write('hello world\n'))
-  t.ok(stream.write('something else\n'))
-})
-
-test('flush on ready if sync=false', function (t) {
-  t.plan(4)
-
-  const dest = file()
-  const stream = new ThreadStream({
-    filename: join(__dirname, 'to-file.js'),
-    workerData: { dest },
-    sync: false
-  })
-
-  stream.on('ready', () => {
-    readFile(dest, 'utf8', (err, data) => {
-      t.error(err)
-      t.equal(data, 'hello world\nsomething else\n')
-      stream.end()
-    })
-  })
-
-  t.ok(stream.write('hello world\n'))
-  t.ok(stream.write('something else\n'))
+  for (let count = 0; count < 20; count++) {
+    stream.write('aaaaaaaaaa')
+  }
+  stream.flushSync()
 })
 
 test('pass down MessagePorts', async function (t) {

package/test/bundlers.test.js

@@ -0,0 +1,33 @@
+'use strict'
+
+const { test } = require('tap')
+const { join } = require('path')
+const { file } = require('./helper')
+const ThreadStream = require('..')
+
+test('bundlers support', function (t) {
+  t.plan(1)
+
+  globalThis.__bundlerPathsOverrides = {
+    'thread-stream-worker': join(__dirname, 'custom-worker.js')
+  }
+
+  const dest = file()
+
+  process.on('uncaughtException', error => {
+    console.log(error)
+  })
+
+  const stream = new ThreadStream({
+    filename: join(__dirname, 'to-file.js'),
+    workerData: { dest },
+    sync: true
+  })
+
+  stream.worker.removeAllListeners('message')
+  stream.worker.once('message', message => {
+    t.equal(message.code, 'CUSTOM-WORKER-CALLED')
+  })
+
+  stream.end()
+})

package/test/close-on-gc.js

@@ -15,16 +15,14 @@ function setup () {
 
   worker = stream.worker
 
-  stream.on('ready', function () {
-    stream.write('hello')
-    stream.write(' ')
-    stream.write('world\n')
-    stream.flushSync()
-    stream.unref()
-
-    // the stream object goes out of scope here
-    setImmediate(gc) // eslint-disable-line
-  })
+  stream.write('hello')
+  stream.write(' ')
+  stream.write('world\n')
+  stream.flushSync()
+  stream.unref()
+
+  // the stream object goes out of scope here
+  setImmediate(gc) // eslint-disable-line
 }
 
 setup()

package/test/commonjs-fallback.test.js

@@ -1,12 +1,15 @@
 'use strict'
 
 const { test } = require('tap')
+const { join } = require('path')
+const { MessageChannel } = require('worker_threads')
+const { once } = require('events')
 const ThreadStream = require('..')
 
 const isYarnPnp = process.versions.pnp !== undefined
 
 test('yarn module resolution', { skip: !isYarnPnp }, t => {
-  t.plan(5)
+  t.plan(6)
 
   const modulePath = require.resolve('pino-elasticsearch')
   t.match(modulePath, /.*\.zip.*/)
@@ -17,13 +20,37 @@ test('yarn module resolution', { skip: !isYarnPnp }, t => {
     sync: true
   })
 
+  t.same(stream.writableErrored, null)
   stream.on('error', (err) => {
+    t.same(stream.writableErrored, err)
     t.pass('error emitted')
-    t.equal(err.message, 'Missing node(s) option', 'module custom error')
   })
 
   t.ok(stream.write('hello world\n'))
   t.ok(stream.writable)
-
   stream.end()
 })
+
+test('yarn module resolution for directories with special characters', { skip: !isYarnPnp }, async t => {
+  t.plan(3)
+
+  const { port1, port2 } = new MessageChannel()
+  const stream = new ThreadStream({
+    filename: join(__dirname, 'dir with spaces', 'test-package.zip', 'worker.js'),
+    workerData: { port: port1 },
+    workerOpts: {
+      transferList: [port1]
+    },
+    sync: false
+  })
+  t.teardown(() => {
+    stream.end()
+  })
+
+  t.ok(stream.write('hello world\n'))
+  t.ok(stream.write('something else\n'))
+
+  const [strings] = await once(port2, 'message')
+
+  t.equal(strings, 'hello world\nsomething else\n')
+})

package/test/create-and-exit.js

@@ -9,10 +9,8 @@ const stream = new ThreadStream({
   sync: true
 })
 
-stream.on('ready', function () {
-  stream.write('hello')
-  stream.write(' ')
-  stream.write('world\n')
-  stream.flushSync()
-  stream.unref()
-})
+stream.write('hello')
+stream.write(' ')
+stream.write('world\n')
+stream.flushSync()
+stream.unref()

package/test/custom-worker.js

@@ -0,0 +1,9 @@
+'use strict'
+
+const { parentPort } = require('worker_threads')
+
+parentPort.postMessage({
+  code: 'CUSTOM-WORKER-CALLED'
+})
+
+require('../lib/worker')

package/test/end.test.js

@@ -7,7 +7,7 @@ const { file } = require('./helper')
 const ThreadStream = require('..')
 
 test('destroy support', function (t) {
-  t.plan(9)
+  t.plan(7)
 
   const dest = file()
   const stream = new ThreadStream({
@@ -16,33 +16,25 @@ test('destroy support', function (t) {
     sync: true
   })
 
-  stream.on('drain', () => {
-    t.pass('drain')
+  stream.on('close', () => {
+    t.notOk(stream.writable)
+    t.pass('close emitted')
   })
 
-  stream.on('ready', () => {
-    t.pass('ready emitted')
+  t.ok(stream.write('hello world\n'))
+  t.ok(stream.write('something else\n'))
+  t.ok(stream.writable)
 
-    t.ok(stream.write('hello world\n'))
-    t.ok(stream.write('something else\n'))
-    t.ok(stream.writable)
+  stream.end()
 
-    stream.end()
-
-    readFile(dest, 'utf8', (err, data) => {
-      t.error(err)
-      t.equal(data, 'hello world\nsomething else\n')
-    })
-  })
-
-  stream.on('close', () => {
-    t.notOk(stream.writable)
-    t.pass('close emitted')
+  readFile(dest, 'utf8', (err, data) => {
+    t.error(err)
+    t.equal(data, 'hello world\nsomething else\n')
   })
 })
 
 test('synchronous _final support', function (t) {
-  t.plan(9)
+  t.plan(7)
 
   const dest = file()
   const stream = new ThreadStream({
@@ -51,27 +43,19 @@ test('synchronous _final support', function (t) {
     sync: true
   })
 
-  stream.on('drain', () => {
-    t.pass('drain')
+  stream.on('close', () => {
+    t.notOk(stream.writable)
+    t.pass('close emitted')
   })
 
-  stream.on('ready', () => {
-    t.pass('ready emitted')
+  t.ok(stream.write('hello world\n'))
+  t.ok(stream.write('something else\n'))
+  t.ok(stream.writable)
 
-    t.ok(stream.write('hello world\n'))
-    t.ok(stream.write('something else\n'))
-    t.ok(stream.writable)
+  stream.end()
 
-    stream.end()
-
-    readFile(dest, 'utf8', (err, data) => {
-      t.error(err)
-      t.equal(data, 'hello world\nsomething else\n')
-    })
-  })
-
-  stream.on('close', () => {
-    t.notOk(stream.writable)
-    t.pass('close emitted')
+  readFile(dest, 'utf8', (err, data) => {
+    t.error(err)
+    t.equal(data, 'hello world\nsomething else\n')
   })
 })

package/test/esm.test.mjs

@@ -7,7 +7,7 @@ import { file } from './helper.js'
 
 function basic (text, filename) {
   test(text, function (t) {
-    t.plan(7)
+    t.plan(5)
 
     const dest = file()
     const stream = new ThreadStream({
@@ -16,19 +16,6 @@ function basic (text, filename) {
       sync: true
     })
 
-    stream.on('drain', () => {
-      t.pass('drain')
-    })
-
-    stream.on('ready', () => {
-      t.pass('ready emitted')
-    })
-
-    t.ok(stream.write('hello world\n'))
-    t.ok(stream.write('something else\n'))
-
-    stream.end()
-
     stream.on('finish', () => {
       readFile(dest, 'utf8', (err, data) => {
         t.error(err)
@@ -39,6 +26,11 @@ function basic (text, filename) {
     stream.on('close', () => {
       t.pass('close emitted')
     })
+
+    t.ok(stream.write('hello world\n'))
+    t.ok(stream.write('something else\n'))
+
+    stream.end()
   })
 }
 

package/test/multibyte-chars.test.mjs

@@ -16,17 +16,15 @@ test('break up utf8 multibyte (sync)', (t) => {
     sync: true
   })
 
-  stream.on('ready', function () {
-    stream.write(longString)
-    stream.end()
-  })
-
   stream.on('finish', () => {
     readFile(dest, 'utf8', (err, data) => {
       t.error(err)
       t.equal(data, longString)
     })
   })
+
+  stream.write(longString)
+  stream.end()
 })
 
 test('break up utf8 multibyte (async)', (t) => {
@@ -41,15 +39,13 @@ test('break up utf8 multibyte (async)', (t) => {
     sync: false
   })
 
-  stream.on('ready', function () {
-    stream.write(longString)
-    stream.end()
-  })
-
   stream.on('finish', () => {
     readFile(dest, 'utf8', (err, data) => {
       t.error(err)
       t.equal(data, longString)
     })
   })
+
+  stream.write(longString)
+  stream.end()
 })

package/test/string-limit.test.js

@@ -17,20 +17,6 @@ const stream = new ThreadStream({
 
 let length = 0
 
-stream.on('ready', () => {
-  t.pass('ready emitted')
-
-  const buf = Buffer.alloc(1024).fill('x').toString() // 1 KB
-
-  // This writes 1 GB of data
-  for (let i = 0; i < 1024 * 1024; i++) {
-    length += buf.length
-    stream.write(buf)
-  }
-
-  stream.end()
-})
-
 stream.on('close', () => {
   stat(dest, (err, f) => {
     t.error(err)
@@ -38,3 +24,13 @@ stream.on('close', () => {
     t.end()
   })
 })
+
+const buf = Buffer.alloc(1024).fill('x').toString() // 1 KB
+
+// This writes 1 GB of data
+for (let i = 0; i < 1024 * 1024; i++) {
+  length += buf.length
+  stream.write(buf)
+}
+
+stream.end()

package/test/thread-management.test.js

@@ -25,7 +25,7 @@ test('emit error if thread exits', async function (t) {
     sync: true
   })
 
-  stream.on('ready', function () {
+  stream.on('ready', () => {
     stream.write('hello world\n')
   })
 
@@ -53,7 +53,7 @@ test('emit error if thread exits', async function (t) {
     sync: true
   })
 
-  stream.on('ready', function () {
+  stream.on('ready', () => {
     stream.write('hello world\n')
   })
 
@@ -81,7 +81,7 @@ test('emit error if thread have unhandledRejection', async function (t) {
     sync: true
   })
 
-  stream.on('ready', function () {
+  stream.on('ready', () => {
     stream.write('hello world\n')
   })
 
@@ -109,7 +109,7 @@ test('emit error if worker stream emit error', async function (t) {
     sync: true
   })
 
-  stream.on('ready', function () {
+  stream.on('ready', () => {
     stream.write('hello world\n')
   })
 
@@ -137,7 +137,7 @@ test('emit error if thread have uncaughtException', async function (t) {
     sync: true
   })
 
-  stream.on('ready', function () {
+  stream.on('ready', () => {
     stream.write('hello world\n')
   })