Update node-fetch dependency

package.json

@@ -53,10 +53,9 @@
   },
   "dependencies": {
     "@jlguenego/asn.1": "^0.0.4",
-    "@types/node-fetch": "^2.5.7",
     "debug": "^4.3.1",
     "http-errors": "^1.8.0",
-    "node-fetch": "3.0.0-beta.9",
+    "node-fetch": "^3.2.3",
     "ntlm-parser": "^1.0.9"
   },
   "devDependencies": {

src/sso/client/AbstractHandler.ts

@@ -1,4 +1,4 @@
-import { RequestInit, Response } from 'node-fetch';
+import type { RequestInit, Response } from 'node-fetch';
 import { ClientCookie } from './ClientCookie';
 import { ClientInfo } from './ClientInfo';
 

src/sso/client/BasicHandler.ts

@@ -1,5 +1,6 @@
 import dbg from 'debug';
-import fetch, { RequestInit, Response } from 'node-fetch';
+import type { RequestInit, Response } from 'node-fetch';
+import { loadNodeFetch } from '../loadNodeFetch';
 
 import { AbstractHandler } from './AbstractHandler';
 import { ClientCookie } from './ClientCookie';
@@ -25,6 +26,7 @@ export class BasicHandler extends AbstractHandler {
     };
     clientCookie.restituteCookies(requestInit);
     debug('first requestInit.headers', requestInit.headers);
+    const { fetch } = await loadNodeFetch();
     response = await fetch(resource, requestInit);
     debug('first response.headers', response.headers);
     clientCookie.saveCookies(response);

src/sso/client/ClientCookie.ts

@@ -1,4 +1,4 @@
-import { RequestInit, Response } from 'node-fetch';
+import type { RequestInit, Response } from 'node-fetch';
 import dbg from 'debug';
 
 import { CookieList } from '../interfaces';

src/sso/client/DigestHandler.ts

@@ -1,7 +1,8 @@
 import dbg from 'debug';
-import fetch, { RequestInit, Response } from 'node-fetch';
+import type { RequestInit, Response } from 'node-fetch';
 import { URL } from 'url';
 import { Props } from '../../../lib/api';
+import { loadNodeFetch } from '../loadNodeFetch';
 
 import { AbstractHandler } from './AbstractHandler';
 import { ClientCookie } from './ClientCookie';
@@ -51,11 +52,11 @@ export class DigestHandler extends AbstractHandler {
     }
 
     debug('digestHeader: ', digestHeader);
-    const digestChallenge = (digestHeader.split(/, */).reduce((acc, prop) => {
+    const digestChallenge = digestHeader.split(/, */).reduce((acc, prop) => {
       const [key, value] = prop.split('=');
       acc[key] = value.replace(/^"?(.*?)"?$/, '$1');
       return acc;
-    }, {} as Props) as unknown) as DigestChallenge;
+    }, {} as Props) as unknown as DigestChallenge;
     debug('digestChallenge: ', digestChallenge);
 
     const requestInit: RequestInit = { ...init };
@@ -104,11 +105,12 @@ export class DigestHandler extends AbstractHandler {
       Authorization:
         'Digest ' +
         Object.keys(digestAnswer)
-          .map((k) => `${k}=${((digestAnswer as unknown) as Props)[k]}`)
+          .map((k) => `${k}=${(digestAnswer as unknown as Props)[k]}`)
           .join(', '),
     };
     clientCookie.restituteCookies(requestInit);
     debug('first requestInit.headers', requestInit.headers);
+    const { fetch } = await loadNodeFetch();
     response = await fetch(resource, requestInit);
     debug('first response.headers', response.headers);
     clientCookie.saveCookies(response);

src/sso/client/NegotiateHandler.ts

@@ -1,5 +1,5 @@
 import dbg from 'debug';
-import fetch, { RequestInit, Response } from 'node-fetch';
+import type { RequestInit, Response } from 'node-fetch';
 import { negotiateParse } from '../msgParser';
 
 import {
@@ -12,6 +12,7 @@ import { ClientCookie } from './ClientCookie';
 import { ClientInfo } from './ClientInfo';
 import { AbstractHandler } from './AbstractHandler';
 import { decode, encode, hexDump } from '../misc';
+import { loadNodeFetch } from '../loadNodeFetch';
 
 const debug = dbg('node-expose-sspi:client');
 
@@ -118,6 +119,7 @@ export class NegotiateHandler extends AbstractHandler {
       };
       clientCookie.restituteCookies(requestInit);
       debug('requestInit.headers', requestInit.headers);
+      const { fetch } = await loadNodeFetch();
       response = await fetch(resource, requestInit);
       debug('response.status', response.status);
       debug('response.headers', response.headers);

src/sso/loadNodeFetch.ts

@@ -0,0 +1,29 @@
+import type * as NodeFetchModule from 'node-fetch';
+
+type NodeFetchInternal = typeof NodeFetchModule;
+
+export interface NodeFetch extends NodeFetchInternal {
+  fetch: NodeFetchInternal['default'];
+}
+
+// Prevent transpiling `await import(...)` into a simple require call.
+// This would not work because this library compiles to commonjs but node-fetch is a esm library by now.
+// Wrapping the import expression into a string hides it from the typescript compiler, so the
+// native import expression will be used.
+//
+// Note that a future typescript module target would fix this as well ("Node12").
+//
+// See
+//  - https://github.com/microsoft/TypeScript/issues/43329#issuecomment-1008361973
+//  - https://nodejs.org/docs/latest-v12.x/api/esm.html#esm_import_expressions
+const internalLoader = new Function(
+  'return import("node-fetch")'
+) as () => Promise<NodeFetchInternal>;
+
+export async function loadNodeFetch(): Promise<NodeFetch> {
+  const module = await internalLoader();
+  return {
+    ...module,
+    fetch: module.default,
+  };
+}