use node-fetch-commonjs (#368)

Author: fjakobs

packages/databricks-sdk-js/package.json

@@ -34,7 +34,7 @@
     "dependencies": {
         "ini": "^3.0.1",
         "inversify": "^6.0.1",
-        "node-fetch": "^3.3.0",
+        "node-fetch-commonjs": "^3.2.4",
         "reflect-metadata": "^0.1.13"
     },
     "devDependencies": {

packages/databricks-sdk-js/src/api-client.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import * as https from "node:https";
 import {TextDecoder} from "node:util";
-import {fetch} from "./fetch";
+import fetch from "node-fetch-commonjs";
 import {ExposedLoggers, Utils, withLogContext} from "./logging";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import {context} from "./context";
@@ -127,20 +127,21 @@ export class ApiClient {
             }
         }
 
-        const response = await retry<
-            Awaited<Awaited<ReturnType<typeof fetch>>["response"]>
-        >({
+        const response = await retry<Awaited<ReturnType<typeof fetch>>>({
             timeout: new Time(
                 this.config.retryTimeoutSeconds || 300,
                 TimeUnits.seconds
             ),
             fn: async () => {
                 let response;
                 try {
-                    const {abort, response: responsePromise} = await fetch(
-                        url.toString(),
-                        options
-                    );
+                    const controller = new AbortController();
+                    const signal = controller.signal;
+                    const abort = controller.abort;
+                    const responsePromise = await fetch(url.toString(), {
+                        signal,
+                        ...options,
+                    });
                     if (context?.cancellationToken?.onCancellationRequested) {
                         context?.cancellationToken?.onCancellationRequested(
                             abort

packages/databricks-sdk-js/src/fetch.d.ts

@@ -283,7 +283,7 @@ __metadata:
     ini: ^3.0.1
     inversify: ^6.0.1
     mocha: ^10.2.0
-    node-fetch: ^3.3.0
+    node-fetch-commonjs: ^3.2.4
     nyc: ^15.1.0
     prettier: ^2.8.2
     reflect-metadata: ^0.1.13
@@ -3221,13 +3221,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-uri-to-buffer@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "data-uri-to-buffer@npm:4.0.0"
-  checksum: a010653869abe8bb51259432894ac62c52bf79ad761d418d94396f48c346f2ae739c46b254e8bb5987bded8a653d467db1968db3a69bab1d33aa5567baa5cfc7
-  languageName: node
-  linkType: hard
-
 "databricks-vscode@workspace:packages/databricks-vscode":
   version: 0.0.0-use.local
   resolution: "databricks-vscode@workspace:packages/databricks-vscode"
@@ -4407,7 +4400,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fetch-blob@npm:^3.1.2, fetch-blob@npm:^3.1.4":
+"fetch-blob@npm:^3.1.2":
   version: 3.2.0
   resolution: "fetch-blob@npm:3.2.0"
   dependencies:
@@ -7059,6 +7052,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-fetch-commonjs@npm:^3.2.4":
+  version: 3.2.4
+  resolution: "node-fetch-commonjs@npm:3.2.4"
+  dependencies:
+    formdata-polyfill: ^4.0.10
+    web-streams-polyfill: ^3.1.1
+  checksum: 37992d9b1b70c075431ea296bd4abfbd36da7b2fa6a4b3aa54378aebf66399d79852b768c3d0d2af7fca0b4635bfba6d0eb7ba5946f22443c927d2b8fd82a229
+  languageName: node
+  linkType: hard
+
 "node-fetch@npm:2.6.7":
   version: 2.6.7
   resolution: "node-fetch@npm:2.6.7"
@@ -7073,17 +7076,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-fetch@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "node-fetch@npm:3.3.0"
-  dependencies:
-    data-uri-to-buffer: ^4.0.0
-    fetch-blob: ^3.1.4
-    formdata-polyfill: ^4.0.10
-  checksum: e9936908d2783d3c48a038e187f8062de294d75ef43ec8ab812d7cbd682be2b67605868758d2e9cad6103706dcfe4a9d21d78f6df984e8edf10e7a5ce2e665f8
-  languageName: node
-  linkType: hard
-
 "node-gyp@npm:latest":
   version: 9.3.0
   resolution: "node-gyp@npm:9.3.0"
@@ -9864,7 +9856,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"web-streams-polyfill@npm:^3.0.3":
+"web-streams-polyfill@npm:^3.0.3, web-streams-polyfill@npm:^3.1.1":
   version: 3.2.1
   resolution: "web-streams-polyfill@npm:3.2.1"
   checksum: b119c78574b6d65935e35098c2afdcd752b84268e18746606af149e3c424e15621b6f1ff0b42b2676dc012fc4f0d313f964b41a4b5031e525faa03997457da02