fix: rejectAuthorize broken in VSCode ECL Extension (#4512)

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>

Author: GordonSmith

packages/comms/src/connection.ts

@@ -1,4 +1,4 @@
-import { join, promiseTimeout, scopedLogger, utf8ToBase64 } from "@hpcc-js/util";
+import { join, promiseTimeout, root, scopedLogger, utf8ToBase64 } from "@hpcc-js/util";
 
 const logger = scopedLogger("comms/connection.ts");
 
@@ -154,20 +154,12 @@ function doFetch(opts: IOptions, action: string, requestInit: RequestInit, heade
         headers: headersInit
     };
 
-    if (fetch["__setGlobalDispatcher"]) {
-        fetch["__setGlobalDispatcher"](fetch["__defaultAgent"]);
-    }
-
     if (opts.baseUrl.indexOf("https:") === 0) {
         //  NodeJS / node-fetch only  ---
-        if (opts.rejectUnauthorized === false && fetch["__rejectUnauthorizedAgent"]) {
-            if (fetch["__setGlobalDispatcher"]) {
-                fetch["__setGlobalDispatcher"](fetch["__rejectUnauthorizedAgent"]);
-            } else {
-                requestInit["agent"] = fetch["__rejectUnauthorizedAgent"];
-            }
-        } else if (fetch["__trustwaveAgent"]) {
-            requestInit["agent"] = fetch["__trustwaveAgent"];
+        if (opts.rejectUnauthorized === false && root.__hpcc_rejectUnauthorizedAgent) {
+            requestInit["dispatcher"] = root.__hpcc_rejectUnauthorizedAgent;
+        } else if (root.__hpcc_trustwaveAgent) {
+            requestInit["agent"] = root.__hpcc_trustwaveAgent;
         }
     }
 
@@ -178,12 +170,13 @@ function doFetch(opts: IOptions, action: string, requestInit: RequestInit, heade
         throw new Error(response.statusText);
     }
 
-    return promiseTimeout(opts.timeoutSecs! * 1000, fetch(join(opts.baseUrl, action), requestInit)
+    const fetchOverride = root.__hpcc_undiciFetch ?? fetch;
+    return promiseTimeout(opts.timeoutSecs! * 1000, fetchOverride(join(opts.baseUrl, action), requestInit)
         .then(handleResponse)
         .catch(e => {
             //  Try again with the opposite credentials mode  ---
             requestInit.credentials = !_omitMap[opts.baseUrl] ? "omit" : "include";
-            return fetch(join(opts.baseUrl, action), requestInit)
+            return fetchOverride(join(opts.baseUrl, action), requestInit)
                 .then(handleResponse)
                 .then(responseBody => {
                     _omitMap[opts.baseUrl] = !_omitMap[opts.baseUrl];  // The "opposite" credentials mode is known to work  ---

packages/comms/src/index.node.ts

@@ -6,19 +6,18 @@ root.DOMParser = DOMParser;
 //  fetch setup for Node.js ---
 import * as https from "node:https";
 import { Buffer } from "node:buffer";
-import { Agent, setGlobalDispatcher } from "undici";
+import { fetch, Agent } from "undici";
 
 //  NodeJS >= v18 has native fetch  ---
 if (root.fetch === undefined) {
     throw new Error("@hpcc-js/comms requires Node.js >= 18.0.0 for native fetch support");
 }
-root.fetch.__defaultAgent = new Agent();
-root.fetch.__rejectUnauthorizedAgent = new Agent({
+root.__hpcc_undiciFetch = fetch;
+root.__hpcc_rejectUnauthorizedAgent = new Agent({
     connect: {
         rejectUnauthorized: false
     }
 });
-root.fetch.__setGlobalDispatcher = setGlobalDispatcher;
 
 import { trustwave } from "./pem/trustwave.ts";
 
@@ -38,7 +37,7 @@ if (https.globalAgent.options.ca !== undefined) {
     globalCA += "\n";
 }
 
-root.fetch.__trustwaveAgent = new https.Agent({
+root.__hpcc_trustwaveAgent = new https.Agent({
     ca: globalCA + trustwave
 });
 

packages/comms/tests/testLib.ts

@@ -1,6 +1,7 @@
 import { isBrowser, isCI as utilIsTravis } from "@hpcc-js/util";
 
 export const isCI = utilIsTravis;
+// export const ESP_URL = isCI ? "https://play.hpccsystems.com:18010/" : "https://play.hpccsystems.com:18010/";
 export const ESP_URL = isCI ? "http://127.0.0.1:8010/" : "http://127.0.0.1:8010/";
 export const QUERY_URL = isCI ? "http://127.0.0.1:8002/" : "http://127.0.0.1:8002/";