Revert advanced IPC

* Revert "Don't use global setImmediate" This reverts commit ea66e64. * Revert "Use advanced serialization (when available) for worker communication" This reverts commit 0f879f4.
avajs · Aug 24, 2020 · f499cbf · f499cbf
1 parent 7694171
commit f499cbf
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 91 deletions.
diff --git a/lib/cli.js b/lib/cli.js
@@ -430,7 +430,7 @@ exports.run = async () => { // eslint-disable-line complexity
 		reporter.startRun(plan);
 
 		if (process.env.AVA_EMIT_RUN_STATUS_OVER_IPC === 'I\'ll find a payphone baby / Take some time to talk to you') {
-			if (process.versions.node >= '12.17.0') {
+			if (process.versions.node >= '12.16.0') {
 				plan.status.on('stateChange', evt => {
 					process.send(evt);
 				});

diff --git a/lib/fork.js b/lib/fork.js
@@ -3,7 +3,6 @@ const childProcess = require('child_process');
 const path = require('path');
 const fs = require('fs');
 const Emittery = require('emittery');
-const {controlFlow} = require('./ipc-flow-control');
 
 if (fs.realpathSync(__filename) !== __filename) {
 	console.warn('WARNING: `npm link ava` and the `--preserve-symlink` flag are incompatible. We have detected that AVA is linked via `npm link`, and that you are using either an early version of Node 6, or the `--preserve-symlink` flag. This breaks AVA. You should upgrade to Node 6.2.0+, avoid the `--preserve-symlink` flag, or avoid using `npm link ava`.');
@@ -15,12 +14,6 @@ const AVA_PATH = path.resolve(__dirname, '..');
 
 const workerPath = require.resolve('./worker/subprocess');
 
-const useAdvanced = process.versions.node >= '12.17.0';
-// FIXME: Fix this in api.js or cli.js.
-const serializeOptions = useAdvanced ?
-	options => JSON.parse(JSON.stringify(options)) : // Use JSON serialization to remove non-clonable values.
-	options => options;
-
 module.exports = (file, options, execArgv = process.execArgv) => {
 	let finished = false;
 
@@ -41,8 +34,7 @@ module.exports = (file, options, execArgv = process.execArgv) => {
 		cwd: options.projectDir,
 		silent: true,
 		env: {NODE_ENV: 'test', ...process.env, ...options.environmentVariables, AVA_PATH},
-		execArgv,
-		serialization: useAdvanced ? 'advanced' : 'json'
+		execArgv
 	});
 
 	subprocess.stdout.on('data', chunk => {
@@ -53,12 +45,12 @@ module.exports = (file, options, execArgv = process.execArgv) => {
 		emitStateChange({type: 'worker-stderr', chunk});
 	});
 
-	const bufferedSend = controlFlow(subprocess);
-
 	let forcedExit = false;
 	const send = evt => {
-		if (!finished && !forcedExit) {
-			bufferedSend({ava: evt});
+		if (subprocess.connected && !finished && !forcedExit) {
+			subprocess.send({ava: evt}, () => {
+				// Disregard errors.
+			});
 		}
 	};
 
@@ -74,7 +66,7 @@ module.exports = (file, options, execArgv = process.execArgv) => {
 			}
 
 			if (message.ava.type === 'ready-for-options') {
-				send({type: 'options', options: serializeOptions(options)});
+				send({type: 'options', options});
 				return;
 			}
 

diff --git a/lib/ipc-flow-control.js b/lib/ipc-flow-control.js
diff --git a/lib/worker/ipc.js b/lib/worker/ipc.js
@@ -1,6 +1,5 @@
 'use strict';
 const Emittery = require('emittery');
-const {controlFlow} = require('../ipc-flow-control');
 
 const emitter = new Emittery();
 process.on('message', message => {
@@ -26,9 +25,10 @@ process.on('message', message => {
 exports.options = emitter.once('options');
 exports.peerFailed = emitter.once('peerFailed');
 
-const bufferedSend = controlFlow(process);
 function send(evt) {
-	bufferedSend({ava: evt});
+	if (process.connected) {
+		process.send({ava: evt});
+	}
 }
 
 exports.send = send;

diff --git a/test-tap/fixture/report/regular/uncaught-exception.js b/test-tap/fixture/report/regular/uncaught-exception.js
@@ -1,7 +1,7 @@
 const test = require('../../../..');
 
 test('passes', t => {
-	setImmediate(() => {
+	setTimeout(() => {
 		throw new Error('Can’t catch me');
 	});
 	t.pass();

diff --git a/test-tap/reporters/mini.regular.v10.log b/test-tap/reporters/mini.regular.v10.log
@@ -515,13 +515,13 @@
 
   [90muncaught-exception.js:5[39m
 
-   [90m4:[39m   setImmediate(() => {                
+   [90m4:[39m   setTimeout(() => {                  
   [41m 5:     throw new Error('Can’t catch me');[49m
    [90m6:[39m   });                                 
 
   Error: Can’t catch me
 
-  [90m› Immediate.setImmediate (test-tap/fixture/report/regular/uncaught-exception.js:5:9)[39m
+  [90m› Timeout.setTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)[39m
 
 
 

diff --git a/test-tap/reporters/mini.regular.v12.log b/test-tap/reporters/mini.regular.v12.log
@@ -497,14 +497,15 @@
 
   [90muncaught-exception.js:5[39m
 
-   [90m4:[39m   setImmediate(() => {                
+   [90m4:[39m   setTimeout(() => {                  
   [41m 5:     throw new Error('Can’t catch me');[49m
    [90m6:[39m   });                                 
 
   Error: Can’t catch me
 
-  [90m› Immediate.<anonymous> (test-tap/fixture/report/regular/uncaught-exception.js:5:9)[39m
-  [90m[2m› processImmediate (internal/timers.js:456:21)[22m[39m
+  [90m› Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)[39m
+  [90m[2m› listOnTimeout (internal/timers.js:549:17)[22m[39m
+  [90m[2m› processTimers (internal/timers.js:492:7)[22m[39m
 
 
 

diff --git a/test-tap/reporters/mini.regular.v14.log b/test-tap/reporters/mini.regular.v14.log
@@ -497,14 +497,15 @@
 
   [90muncaught-exception.js:5[39m
 
-   [90m4:[39m   setImmediate(() => {                
+   [90m4:[39m   setTimeout(() => {                  
   [41m 5:     throw new Error('Can’t catch me');[49m
    [90m6:[39m   });                                 
 
   Error: Can’t catch me
 
-  [90m› Immediate.<anonymous> (test-tap/fixture/report/regular/uncaught-exception.js:5:9)[39m
-  [90m[2m› processImmediate (internal/timers.js:458:21)[22m[39m
+  [90m› Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)[39m
+  [90m[2m› listOnTimeout (internal/timers.js:551:17)[22m[39m
+  [90m[2m› processTimers (internal/timers.js:494:7)[22m[39m
 
 
 

diff --git a/test-tap/reporters/tap.regular.v10.log b/test-tap/reporters/tap.regular.v10.log
@@ -323,9 +323,7 @@ not ok 25 - Error: Can’t catch me
   ---
     name: Error
     message: Can’t catch me
-    at: >-
-      Immediate.setImmediate
-      (test-tap/fixture/report/regular/uncaught-exception.js:5:9)
+    at: 'Timeout.setTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)'
   ...
 ---tty-stream-chunk-separator
 # uncaught-exception.js exited with a non-zero exit code: 1

diff --git a/test-tap/reporters/tap.regular.v12.log b/test-tap/reporters/tap.regular.v12.log
@@ -296,11 +296,10 @@ not ok 25 - Error: Can’t catch me
   ---
     name: Error
     message: Can’t catch me
-    at: >-
-      Immediate.<anonymous>
-      (test-tap/fixture/report/regular/uncaught-exception.js:5:9)
-
-      processImmediate (internal/timers.js:456:21)
+    at: |-
+      Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)
+      listOnTimeout (internal/timers.js:549:17)
+      processTimers (internal/timers.js:492:7)
   ...
 ---tty-stream-chunk-separator
 # uncaught-exception.js exited with a non-zero exit code: 1

diff --git a/test-tap/reporters/tap.regular.v14.log b/test-tap/reporters/tap.regular.v14.log
@@ -296,11 +296,10 @@ not ok 25 - Error: Can’t catch me
   ---
     name: Error
     message: Can’t catch me
-    at: >-
-      Immediate.<anonymous>
-      (test-tap/fixture/report/regular/uncaught-exception.js:5:9)
-
-      processImmediate (internal/timers.js:458:21)
+    at: |-
+      Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)
+      listOnTimeout (internal/timers.js:551:17)
+      processTimers (internal/timers.js:494:7)
   ...
 ---tty-stream-chunk-separator
 # uncaught-exception.js exited with a non-zero exit code: 1

diff --git a/test-tap/reporters/verbose.regular.v10.log b/test-tap/reporters/verbose.regular.v10.log
@@ -87,13 +87,13 @@
 
   [90muncaught-exception.js:5[39m
 
-   [90m4:[39m   setImmediate(() => {                
+   [90m4:[39m   setTimeout(() => {                  
   [41m 5:     throw new Error('Can’t catch me');[49m
    [90m6:[39m   });                                 
 
   Error: Can’t catch me
 
-  [90m› Immediate.setImmediate (test-tap/fixture/report/regular/uncaught-exception.js:5:9)[39m
+  [90m› Timeout.setTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)[39m
 
 ---tty-stream-chunk-separator
   [31m✖ uncaught-exception.js exited with a non-zero exit code: 1[39m

diff --git a/test-tap/reporters/verbose.regular.v12.log b/test-tap/reporters/verbose.regular.v12.log
@@ -87,14 +87,15 @@
 
   [90muncaught-exception.js:5[39m
 
-   [90m4:[39m   setImmediate(() => {                
+   [90m4:[39m   setTimeout(() => {                  
   [41m 5:     throw new Error('Can’t catch me');[49m
    [90m6:[39m   });                                 
 
   Error: Can’t catch me
 
-  [90m› Immediate.<anonymous> (test-tap/fixture/report/regular/uncaught-exception.js:5:9)[39m
-  [90m[2m› processImmediate (internal/timers.js:456:21)[22m[39m
+  [90m› Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)[39m
+  [90m[2m› listOnTimeout (internal/timers.js:549:17)[22m[39m
+  [90m[2m› processTimers (internal/timers.js:492:7)[22m[39m
 
 ---tty-stream-chunk-separator
   [31m✖ uncaught-exception.js exited with a non-zero exit code: 1[39m

diff --git a/test-tap/reporters/verbose.regular.v14.log b/test-tap/reporters/verbose.regular.v14.log
@@ -87,14 +87,15 @@
 
   [90muncaught-exception.js:5[39m
 
-   [90m4:[39m   setImmediate(() => {                
+   [90m4:[39m   setTimeout(() => {                  
   [41m 5:     throw new Error('Can’t catch me');[49m
    [90m6:[39m   });                                 
 
   Error: Can’t catch me
 
-  [90m› Immediate.<anonymous> (test-tap/fixture/report/regular/uncaught-exception.js:5:9)[39m
-  [90m[2m› processImmediate (internal/timers.js:458:21)[22m[39m
+  [90m› Timeout._onTimeout (test-tap/fixture/report/regular/uncaught-exception.js:5:9)[39m
+  [90m[2m› listOnTimeout (internal/timers.js:551:17)[22m[39m
+  [90m[2m› processTimers (internal/timers.js:494:7)[22m[39m
 
 ---tty-stream-chunk-separator
   [31m✖ uncaught-exception.js exited with a non-zero exit code: 1[39m

diff --git a/test/helpers/exec.js b/test/helpers/exec.js
@@ -8,7 +8,7 @@ const defaultsDeep = require('lodash/defaultsDeep');
 const cliPath = path.resolve(__dirname, '../../cli.js');
 const ttySimulator = path.join(__dirname, './simulate-tty.js');
 
-const serialization = process.versions.node >= '12.17.0' ? 'advanced' : 'json';
+const serialization = process.versions.node >= '12.16.0' ? 'advanced' : 'json';
 
 const normalizePath = (root, file) => path.posix.normalize(path.relative(root, file));