From 9efb5ec042437258ee8bad00c376f7e47e4a2514 Mon Sep 17 00:00:00 2001
From: Alberto Ricart <alberto@synadia.com>
Date: Tue, 21 Feb 2023 10:23:19 -0400
Subject: [PATCH] [FIX] changed "web-streams-polifill/ponyfill" to "stream/web"
 (built into node 16+) - this is required to support ReadableStream in
 ObjectStore and not create inconsistencies with fetch and other libraries.
 FIX #555 (#558)

---
 package-lock.json     | 20 +++-----------------
 package.json          |  7 +++----
 src/mod.ts            | 13 +++++++++++--
 src/node_transport.ts |  2 +-
 test/jetstream.js     |  4 ++--
 5 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b6a3379..63cb01f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,15 @@
 {
   "name": "nats",
-  "version": "2.11.0",
+  "version": "2.12.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "nats",
-      "version": "2.11.0",
+      "version": "2.12.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "nkeys.js": "1.0.5",
-        "web-streams-polyfill": "^3.2.1"
+        "nkeys.js": "1.0.5"
       },
       "devDependencies": {
         "@types/node": "^18.13.x",
@@ -3513,14 +3512,6 @@
         "uuid": "bin/uuid"
       }
     },
-    "node_modules/web-streams-polyfill": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
-      "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/well-known-symbols": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-2.0.0.tgz",
@@ -6171,11 +6162,6 @@
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "dev": true
     },
-    "web-streams-polyfill": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
-      "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q=="
-    },
     "well-known-symbols": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-2.0.0.tgz",
diff --git a/package.json b/package.json
index 23eab12..e909548 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nats",
-  "version": "2.12.0",
+  "version": "2.12.1",
   "description": "Node.js client for NATS, a lightweight, high-performance cloud native messaging system",
   "keywords": [
     "nats",
@@ -40,7 +40,7 @@
     "build": "tsc",
     "cjs": "deno run --allow-all bin/cjs-fix-imports.ts -o nats-base-client/ ./.deps/nats.deno/nats-base-client/",
     "clean": "shx rm -Rf ./lib/* ./nats-base-client ./.deps",
-    "clone-nbc": "shx mkdir -p ./.deps && cd ./.deps && git clone --branch v1.12.0 https://github.com/nats-io/nats.deno.git",
+    "clone-nbc": "shx mkdir -p ./.deps && cd ./.deps && git clone --branch v1.12.1 https://github.com/nats-io/nats.deno.git",
     "fmt": "deno fmt ./src/ ./examples/ ./test/",
     "prepack": "npm run clone-nbc && npm run cjs && npm run check-package && npm run build",
     "ava": "nyc ava --verbose -T 60000",
@@ -57,8 +57,7 @@
     "node": ">= 14.0.0"
   },
   "dependencies": {
-    "nkeys.js": "1.0.5",
-    "web-streams-polyfill": "^3.2.1"
+    "nkeys.js": "1.0.5"
   },
   "devDependencies": {
     "@types/node": "^18.13.x",
diff --git a/src/mod.ts b/src/mod.ts
index 1307375..d8a8bb2 100644
--- a/src/mod.ts
+++ b/src/mod.ts
@@ -20,12 +20,21 @@ if (typeof TextEncoder === "undefined") {
 
 if (typeof globalThis.crypto === "undefined") {
   const c = require("crypto");
+  // this will patch to undefined if webcrypto is not available (node 14)
+  // views will toss if crypto is not available
   global.crypto = c.webcrypto;
 }
 
 if (typeof globalThis.ReadableStream === "undefined") {
-  const streams = require("web-streams-polyfill/ponyfill");
-  global.ReadableStream = streams.ReadableStream;
+  // @ts-ignore: node global
+  const chunks = process.versions.node.split(".");
+  const v = parseInt(chunks[0]);
+  if (v >= 16) {
+    // this won't mess up fetch
+    const streams = require("stream/web");
+    // views will toss if ReadableStream is not available
+    global.ReadableStream = streams.ReadableStream;
+  }
 }
 
 export { connect } from "./connect";
diff --git a/src/node_transport.ts b/src/node_transport.ts
index f26c76a..052f98b 100644
--- a/src/node_transport.ts
+++ b/src/node_transport.ts
@@ -34,7 +34,7 @@ const { resolve } = require("path");
 const { readFile, existsSync } = require("fs");
 const dns = require("dns");
 
-const VERSION = "2.12.0";
+const VERSION = "2.12.1";
 const LANG = "nats.js";
 
 export class NodeTransport implements Transport {
diff --git a/test/jetstream.js b/test/jetstream.js
index 038d85b..3839722 100644
--- a/test/jetstream.js
+++ b/test/jetstream.js
@@ -376,9 +376,9 @@ async function fromReadableStream(
 }
 
 test("jetstream - os basics", async (t) => {
-  if (process.version.startsWith("v14.")) {
+  if (parseInt(process.versions.node.split(".")[0]) < 16) {
     t.log(
-      `node ${process.version} cannot run objectstore as webcrypto is not available`,
+      `node ${process.versions.node} cannot run objectstore as webcrypto and ReadableStream are not available`,
     );
     t.pass();
     return;