Avoid importing Node's stream lib just to inform that Node native str…

…eams are no longer support A more generic check suffices, and requires no special handling in browsers. Also, TS will warn on unexpected input type.
openpgpjs · Jan 19, 2024 · e05b87f · e05b87f
1 parent 060c88f
commit e05b87f
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 15 deletions.
diff --git a/lib/node-utils/browser-fallback.js b/lib/node-utils/browser-fallback.js
diff --git a/lib/node-utils/index.js b/lib/node-utils/index.js
diff --git a/lib/node-utils/node.js b/lib/node-utils/node.js
diff --git a/lib/node-utils/package.json b/lib/node-utils/package.json
diff --git a/lib/util.js b/lib/util.js
@@ -1,6 +1,5 @@
 /* eslint-disable no-prototype-builtins */
 import { isArrayStream } from './writer.js';
-import { NodeReadableStream as NodeNativeReadableStream } from './node-utils/index.js';
 const isNode = typeof globalThis.process === 'object' &&
   typeof globalThis.process.versions === 'object';
 
@@ -16,7 +15,8 @@ function isStream(input) {
   if (globalThis.ReadableStream && globalThis.ReadableStream.prototype.isPrototypeOf(input)) {
     return 'web';
   }
-  if (NodeNativeReadableStream && NodeNativeReadableStream.prototype.isPrototypeOf(input)) {
+  // 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') {
     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) {