worker: allow BroadcastChannel in receiveMessageOnPort

nodejs · Feb 27, 2021 · f902b97 · f902b97
1 parent 5968c54
commit f902b97
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/doc/api/worker_threads.md b/doc/api/worker_threads.md
@@ -179,9 +179,13 @@ if (isMainThread) {
 ## `worker.receiveMessageOnPort(port)`
 <!-- YAML
 added: v12.3.0
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/0000
+    description: The port argument can also refer to a `BroadcastChannel` now.
 -->
 
-* `port` {MessagePort}
+* `port` {MessagePort|BroadcastChannel}
 
 * Returns: {Object|undefined}
 

diff --git a/lib/internal/worker/io.js b/lib/internal/worker/io.js
@@ -333,7 +333,7 @@ function createWorkerStdio() {
 }
 
 function receiveMessageOnPort(port) {
-  const message = receiveMessageOnPort_(port);
+  const message = receiveMessageOnPort_(port[kHandle] ?? port);
   if (message === noMessageSymbol) return undefined;
   return { message };
 }

diff --git a/test/parallel/test-worker-broadcastchannel.js b/test/parallel/test-worker-broadcastchannel.js
@@ -4,6 +4,7 @@ const common = require('../common');
 const {
   BroadcastChannel,
   Worker,
+  receiveMessageOnPort
 } = require('worker_threads');
 const assert = require('assert');
 
@@ -140,3 +141,13 @@ assert.throws(() => new BroadcastChannel(), {
     message: /BroadcastChannel is closed/
   });
 }
+
+{
+  const bc1 = new BroadcastChannel('channel4');
+  const bc2 = new BroadcastChannel('channel4');
+  bc1.postMessage('some data');
+  assert.strictEqual(receiveMessageOnPort(bc2).message, 'some data');
+  assert.strictEqual(receiveMessageOnPort(bc2), undefined);
+  bc1.close();
+  bc2.close();
+}