Merge pull request #108 from Puppo/new-major

refactor: issue5.js and update test structure

Author: jsumners

test/fixtures/issue5.js

@@ -2,7 +2,6 @@
 
 const int = setInterval(() => {}, 10)
 process.on('message', () => {
-  process._rawDebug('!!! doit')
   clearInterval(int)
   replication()
 })

test/index.test.js

@@ -3,17 +3,7 @@
 const { after, test } = require('node:test')
 const path = require('node:path')
 const { spawn } = require('node:child_process')
-const { createTcpListener, createUdpListener } = require('./utils')
-
-function withResolvers () {
-  let _resolve
-  let _reject
-  const promise = new Promise((resolve, reject) => {
-    _resolve = resolve
-    _reject = reject
-  })
-  return { promise, resolve: _resolve, reject: _reject }
-}
+const { createTcpListener, createUdpListener, withResolvers } = require('./utils')
 
 // We need this `after` nonsense because no amount of removing listeners
 // or sending termination signals will stop the child processes.

test/issue5.test.js

@@ -1,60 +1,47 @@
 'use strict'
 
-const test = require('node:test')
-const net = require('node:net')
-const path = require('node:path')
-const { fork, spawn } = require('node:child_process')
-const { Transform } = require('node:stream')
+const { test } = require('node:test')
+const net = require('net')
+const path = require('path')
+const { spawn } = require('child_process')
+const { withResolvers } = require('./utils')
 
-const { default: why } = require('why-is-node-running')
-
-// https://github.com/pinojs/pino-socket/issues/5
-test('issue #5', (t, done) => {
+test('issue #5', async function (t) {
   t.plan(2)
+  const {
+    promise: scriptPromise,
+    resolve: scriptResolve
+  } = withResolvers()
+  const {
+    promise: psockPromise,
+    resolve: psockResolve
+  } = withResolvers()
 
   const server = net.createServer()
   server.unref()
   server.listen(() => {
     const { address, port } = server.address()
     const scriptPath = path.join(__dirname, 'fixtures', 'issue5.js')
+    const script = spawn('node', [scriptPath], { stdio: ['pipe', 'pipe', 'pipe', 'ipc'] })
+    script.send('start')
     const psockPath = path.join(__dirname, '..', 'psock.js')
-    const script = fork(scriptPath, {
-      stdio: ['pipe', 'pipe', 'pipe', 'ipc']
-    })
-    const psock = spawn(
-      process.argv0,
-      [psockPath, '-a', address, '-p', port, '-m', 'tcp', '-ne']
-    )
+    const psock = spawn('node', [psockPath, '-a', address, '-p', port, '-m', 'tcp', '-e'])
 
-    script.on('close', (code, signal) => {
-      process._rawDebug('!!! script close', code, signal)
+    script.on('close', (code) => {
       t.assert.equal(code, 1)
+      scriptResolve()
     })
-    // script.stdout.pipe(process.stdout)
-    script.stdout.pipe(psock.stdin)
-    // psock.stdin.pipe(process.stdout)
-    psock.stdin.pipe(
-      new Transform({
-        transform (chunk, enc, cb) {
-          process._rawDebug('!!! psock.stdin', chunk.toString())
-          cb(null, chunk)
-        }
-      })
-    )
 
     let output = ''
-    psock.stdin.on('data', (data) => {
-      process._rawDebug('!!! psock data', data.toString())
-      output += data.toString()
-    })
-    psock.on('close', (code, signal) => {
-      process._rawDebug('!!! psock close', code, signal)
-      t.assert.equal(output.length > 0, true)
-      done()
+    script.stdout.pipe(psock.stdin)
+    psock.stdout.on('data', chunk => {
+      output += chunk.toString()
     })
-
-    script.send('doit', (error) => {
-      process._rawDebug('!!! send result', error)
+    psock.on('close', () => {
+      t.assert.strictEqual(output.length > 0, true)
+      psockResolve()
     })
   })
+
+  await Promise.all([scriptPromise, psockPromise])
 })

test/utils.js

@@ -46,8 +46,19 @@ function createSecureTcpListener (msgHandler) {
   })
 }
 
+function withResolvers () {
+  let _resolve
+  let _reject
+  const promise = new Promise((resolve, reject) => {
+    _resolve = resolve
+    _reject = reject
+  })
+  return { promise, resolve: _resolve, reject: _reject }
+}
+
 module.exports = {
   createSecureTcpListener,
   createTcpListener,
-  createUdpListener
+  createUdpListener,
+  withResolvers
 }