Drop cross-fetch

Author: pimterry

karma.conf.js

@@ -31,7 +31,8 @@ module.exports = function(config) {
                     "portfinder": require.resolve('./test/empty-stub.js'),
                     "dns2": require.resolve('./test/empty-stub.js'),
                     "ws": require.resolve('./test/empty-stub.js'),
-                    "tmp-promise": require.resolve('./test/empty-stub.js')
+                    "tmp-promise": require.resolve('./test/empty-stub.js'),
+                    "undici": require.resolve('./test/empty-stub.js')
                 },
                 fallback: {
                     // With Webpack 5, we need explicit mocks for all node modules. Because the

package.json

@@ -45,7 +45,6 @@
     "https": false,
     "http2": false,
     "http2-wrapper": false,
-    "cross-fetch": false,
     "cacheable-lookup": false,
     "@httptoolkit/proxy-agent": false,
     "http-encoding": false
@@ -148,6 +147,7 @@
     "ts-node": "^10.9.2",
     "typedoc": "^0.26.7",
     "typescript": "5.6.2",
+    "undici": "^7.22.0",
     "url": "^0.11.0",
     "util": "^0.12.4",
     "webpack": "^5.72.0",
@@ -177,7 +177,6 @@
     "connect": "^3.7.0",
     "cors": "^2.8.4",
     "cors-gate": "^1.1.3",
-    "cross-fetch": "^3.1.5",
     "destroyable-server": "^1.1.1",
     "express": "^4.14.0",
     "fast-json-patch": "^3.1.1",

src/client/admin-client.ts

@@ -3,17 +3,15 @@ import { EventEmitter } from 'events';
 import { Duplex } from 'stream';
 import DuplexPair = require('native-duplexpair');
 import { TypedError } from 'typed-error';
-import * as CrossFetch from 'cross-fetch';
 import * as WebSocket from 'isomorphic-ws';
 import connectWebSocketStream = require('@httptoolkit/websocket-stream');
 import { SubscriptionClient } from '@httptoolkit/subscriptions-transport-ws';
-import { MaybePromise, getDeferred } from '@httptoolkit/util';
+import { ErrorLike, MaybePromise, getDeferred } from '@httptoolkit/util';
 import { print } from 'graphql';
 
 import { DEFAULT_ADMIN_SERVER_PORT } from "../types";
 
 import { RequireProps } from '../util/type-utils';
-import { isNode } from '../util/util';
 import { delay, isErrorLike } from '@httptoolkit/util';
 
 import { introspectionQuery } from './schema-introspection';
@@ -22,10 +20,6 @@ import { AdminPlugin, PluginClientResponsesMap, PluginStartParamsMap } from '../
 import { SchemaIntrospector } from './schema-introspection';
 import { AdminQuery, getSingleSelectedFieldName } from './admin-query';
 
-const { fetch, Headers } = isNode || typeof globalThis.fetch === 'undefined'
-    ? CrossFetch
-    : globalThis;
-
 export class ConnectionError extends TypedError { }
 
 // The Response type requires lib.dom. We include an empty placeholder here to
@@ -135,9 +129,14 @@ async function requestFromAdminServer<T>(serverUrl: string, path: string, option
     try {
         response = await fetch(url, options);
     } catch (e) {
-        if (isErrorLike(e) && e.code === 'ECONNREFUSED') {
+        if (isErrorLike(e) && (
+            e.code === 'ECONNREFUSED' ||
+            (e.cause as ErrorLike)?.code === 'ECONNREFUSED')
+        ) {
             throw new ConnectionError(`Failed to connect to admin server at ${serverUrl}`);
-        } else throw e;
+        } else {
+            throw e;
+        }
     }
 
     if (response.status >= 400) {
@@ -160,7 +159,7 @@ async function requestFromAdminServer<T>(serverUrl: string, path: string, option
             );
         }
     } else {
-        return response.json();
+        return response.json() as Promise<T>;
     }
 }
 
@@ -397,7 +396,7 @@ export class AdminClient<Plugins extends { [key: string]: AdminPlugin<any, any>
                 body: JSON.stringify({ query, variables })
             }));
 
-            const { data, errors }: { data?: T, errors?: Error[] } = await response.json();
+            const { data, errors } = await response.json() as { data?: T, errors?: Error[] };
 
             if (errors && errors.length) {
                 throw new GraphQLError(response, errors);
@@ -411,7 +410,7 @@ export class AdminClient<Plugins extends { [key: string]: AdminPlugin<any, any>
 
             let graphQLErrors: Error[] | undefined = undefined;
             try {
-                graphQLErrors = (await e.response.json()).errors;
+                graphQLErrors = (await e.response.json() as { errors?: Error[] }).errors;
             } catch (e2) {}
 
             if (graphQLErrors) {

test/certificates.spec.ts

@@ -7,7 +7,6 @@ import {
     DestroyableServer,
     makeDestroyable,
     expect,
-    fetch,
     ignoreNetworkError,
     nodeOnly
 } from "./test-utils";

test/integration/completion.spec.ts

@@ -1,5 +1,5 @@
 import { getLocal } from "../..";
-import { expect, fetch } from "../test-utils";
+import { expect } from "../test-utils";
 import * as _ from "lodash";
 
 describe("HTTP mock rule completion", function () {

test/integration/explanations.spec.ts

@@ -1,5 +1,5 @@
 import { getLocal } from "../..";
-import { expect, fetch, URLSearchParams, Headers, isNode } from "../test-utils";
+import { expect, URLSearchParams, isNode } from "../test-utils";
 import * as _ from "lodash";
 import { Readable } from 'stream';
 

test/integration/form-data.spec.ts

@@ -3,12 +3,9 @@ import { Buffer } from 'buffer';
 import { getLocal } from "../..";
 import {
     expect,
-    File,
-    fetch as fetchPolyfill
+    File
 } from "../test-utils";
 
-const fetch = globalThis.fetch ?? fetchPolyfill;
-
 describe("Body getXFormData methods", () => {
     let server = getLocal();
 

test/integration/handlers/broken-response.spec.ts

@@ -3,7 +3,6 @@ import * as http from 'http';
 import { getLocal } from "../../..";
 import {
     expect,
-    fetch,
     isNode,
     nodeOnly,
     delay,
@@ -28,7 +27,7 @@ describe("Broken response handlers", function () {
             let result = await fetch(server.urlFor('/mocked-endpoint')).catch(e => e);
 
             expect(result).to.be.instanceof(Error);
-            expect(result.message).to.contain(isNode ? 'socket hang up' : 'Failed to fetch');
+            expect(result.message).to.contain(isNode ? 'fetch failed' : 'Failed to fetch');
         });
 
         it("should allow forcibly resetting the connection", async function () {
@@ -37,7 +36,7 @@ describe("Broken response handlers", function () {
             let result = await fetch(server.urlFor('/mocked-endpoint')).catch(e => e);
 
             expect(result).to.be.instanceof(Error);
-            expect(result.message).to.contain(isNode ? 'read ECONNRESET' : 'Failed to fetch');
+            expect(result.message).to.contain(isNode ? 'fetch failed' : 'Failed to fetch');
         });
 
 

test/integration/handlers/callback-response.spec.ts

@@ -4,7 +4,6 @@ import * as http from 'http';
 import { getLocal } from "../../..";
 import {
     expect,
-    fetch,
     isNode,
     isWeb,
     headersToObject,
@@ -167,7 +166,7 @@ describe("Callback response handlers", function () {
 
         expect(response).to.be.instanceOf(Error);
         if (isNode) {
-            expect((response as any).code).to.equal('ECONNRESET');
+            expect((response as any).cause?.code).to.equal('UND_ERR_SOCKET');
         } else {
             expect((response as Error).message).to.include('Failed to fetch');
         }

test/integration/handlers/delay.spec.ts

@@ -3,7 +3,6 @@ import * as WebSocket from 'ws';
 import { getLocal } from "../../..";
 import {
     expect,
-    fetch,
     nodeOnly
 } from "../../test-utils";