Fix isStream in Node v16 and 17, update test to detect issue

The issue was missed as the ReadableStream were polyfilled (unnecessarily).
openpgpjs · Jan 25, 2024 · 2ce22fe · 2ce22fe
1 parent 6285bd0
commit 2ce22fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/util.js b/lib/util.js
@@ -16,7 +16,9 @@ function isStream(input) {
     return 'web';
   }
   // try and detect a node native stream without having to import its class
-  if (input && !(input instanceof globalThis.ReadableStream) && typeof input._read === 'function' && typeof input._readableState === 'object') {
+  if (input &&
+    !(globalThis.ReadableStream && input instanceof globalThis.ReadableStream) &&
+    typeof input._read === 'function' && typeof input._readableState === 'object') {
     throw new Error('Native Node streams are no longer supported: please manually convert the stream to a WebStream, using e.g. `stream.Readable.toWeb`');
   }
   if (input && input.getReader) {

diff --git a/test/node.test.ts b/test/node.test.ts
@@ -2,7 +2,6 @@ import { expect } from 'chai';
 import { Readable as NodeNativeReadableStream } from 'node:stream';
 import { ReadableStream as NodeWebReadableStream } from 'node:stream/web';
 import { toStream, readToEnd } from '@openpgp/web-stream-tools';
-import { ReadableStream as PolyfilledReadableStream } from 'web-streams-polyfill';
 
 describe('Node integration tests', () => {
   it('throws on node native stream', async () => {
@@ -36,6 +35,8 @@ describe('Node integration tests', () => {
   });
 
   it('polyfilled web stream cannot be converted into node native stream', async () => {
+    const { ReadableStream: PolyfilledReadableStream } = await import ('web-streams-polyfill');
+
     // this test is just to keep track that this behaviour is expected
     const input = 'chunk';
     const stream = new PolyfilledReadableStream({