From bc2111c7e62710810805e0211e0411f9d1884fa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Jos=C3=A9=20Arboleda?= <soyjuanarbol@gmail.com>
Date: Sun, 2 May 2021 22:43:08 -0500
Subject: [PATCH] src: make workers messaging more resilient

PR-URL: https://github.com/nodejs/node/pull/38510
Fixes: https://github.com/nodejs/node/issues/38499
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/errors.md                             | 22 +++++++++----------
 .../test-worker-message-port-close.js         | 12 +++++++++-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/doc/api/errors.md b/doc/api/errors.md
index e2e169eefb5d3d..6be1cc47c25ac4 100644
--- a/doc/api/errors.md
+++ b/doc/api/errors.md
@@ -715,7 +715,17 @@ Used when the main process is trying to read data from the child process's
 STDERR/STDOUT, and the data's length is longer than the `maxBuffer` option.
 
 <a id="ERR_CLOSED_MESSAGE_PORT"></a>
-### ERR_CLOSED_MESSAGE_PORT
+### `ERR_CLOSED_MESSAGE_PORT`
+<!--
+added: REPLACEME
+changes:
+  - version: 11.12.0
+    pr-url: https://github.com/nodejs/node/pull/26487
+    description: The error message was removed.
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/38510
+    description: The error message was reintroduced.
+-->
 
 There was an attempt to use a `MessagePort` instance in a closed
 state, usually after `.close()` has been called.
@@ -2284,16 +2294,6 @@ removed: v12.5.0
 The value passed to `postMessage()` contained an object that is not supported
 for transferring.
 
-<a id="ERR_CLOSED_MESSAGE_PORT"></a>
-### `ERR_CLOSED_MESSAGE_PORT`
-<!-- YAML
-added: v10.5.0
-removed: v11.12.0
--->
-
-There was an attempt to use a `MessagePort` instance in a closed
-state, usually after `.close()` has been called.
-
 <a id="ERR_CRYPTO_HASH_DIGEST_NO_UTF16"></a>
 ### `ERR_CRYPTO_HASH_DIGEST_NO_UTF16`
 <!-- YAML
diff --git a/test/parallel/test-worker-message-port-close.js b/test/parallel/test-worker-message-port-close.js
index 17a10559e4e61d..6abc01d1b7b568 100644
--- a/test/parallel/test-worker-message-port-close.js
+++ b/test/parallel/test-worker-message-port-close.js
@@ -1,6 +1,7 @@
 'use strict';
 const common = require('../common');
-const { MessageChannel } = require('worker_threads');
+const assert = require('assert');
+const { MessageChannel, moveMessagePortToContext } = require('worker_threads');
 
 // Make sure that .start() and .stop() do not throw on closing/closed
 // MessagePorts.
@@ -29,3 +30,12 @@ function dummy() {}
     port1.off('message', dummy);
   }));
 }
+
+{
+  const { port2 } = new MessageChannel();
+  port2.close();
+  assert.throws(() => moveMessagePortToContext(port2, {}), {
+    code: 'ERR_CLOSED_MESSAGE_PORT',
+    message: 'Cannot send data on closed MessagePort'
+  });
+}