fix: Rework how fetch and AC are accessed from global

packages/client/src/getFetch.ts

@@ -1,19 +1,21 @@
-import { getWindow } from './internals/fetchHelpers';
 import { FetchEsque, NativeFetchEsque } from './internals/types';
 
-export function getFetch(f?: FetchEsque | NativeFetchEsque): FetchEsque {
-  if (f) {
-    return f as FetchEsque;
+export function getFetch(
+  customFetchImpl?: FetchEsque | NativeFetchEsque,
+): FetchEsque {
+  if (customFetchImpl) {
+    return customFetchImpl as FetchEsque;
   }
 
-  const win = getWindow();
-  const globalFetch = win.fetch;
-  if (globalFetch) {
-    return (
-      typeof globalFetch.bind === 'function'
-        ? globalFetch.bind(win)
-        : globalFetch
-    ) as FetchEsque;
+  if (typeof window !== 'undefined' && typeof window.fetch === 'function') {
+    return window.fetch.bind(window) as FetchEsque;
+  }
+
+  if (
+    typeof globalThis !== 'undefined' &&
+    typeof globalThis.fetch === 'function'
+  ) {
+    return globalThis.fetch.bind(globalThis) as FetchEsque;
   }
 
   throw new Error('No fetch implementation found');

packages/client/src/internals/getAbortController.ts

@@ -0,0 +1,20 @@
+import { Maybe } from '@trpc/server';
+import { AbortControllerEsque } from './types';
+
+export function getAbortController(
+  customAbortControllerImpl: Maybe<AbortControllerEsque>,
+): AbortControllerEsque | null {
+  if (customAbortControllerImpl) {
+    return customAbortControllerImpl;
+  }
+
+  if (typeof window !== 'undefined' && window.AbortController) {
+    return window.AbortController;
+  }
+
+  if (typeof globalThis !== 'undefined' && globalThis.AbortController) {
+    return globalThis.AbortController;
+  }
+
+  return null;
+}

packages/client/src/internals/types.test.ts

@@ -5,7 +5,7 @@ import type { fetch as undiciFetch } from 'undici';
 import { createTRPCProxyClient } from '../createTRPCClientProxy';
 import { getFetch } from '../getFetch';
 import { httpBatchLink } from '../links/httpBatchLink';
-import { getAbortController } from './fetchHelpers';
+import { getAbortController } from './getAbortController';
 import {
   AbortControllerEsque,
   AbortControllerInstanceEsque,

packages/client/src/links/internals/httpUtils.ts

@@ -1,7 +1,7 @@
 import { ProcedureType } from '@trpc/server';
 import { TRPCResponse } from '@trpc/server/rpc';
 import { getFetch } from '../../getFetch';
-import { getAbortController } from '../../internals/fetchHelpers';
+import { getAbortController } from '../../internals/getAbortController';
 import {
   AbortControllerEsque,
   FetchEsque,

packages/tests/server/clientInternals.test.ts

@@ -1,5 +1,5 @@
 import { getFetch } from '@trpc/client/src';
-import { getAbortController } from '@trpc/client/src/internals/fetchHelpers';
+import { getAbortController } from '@trpc/client/src/internals/getAbortController';
 
 describe('getAbortController() from..', () => {
   test('passed', () => {
@@ -8,17 +8,22 @@ describe('getAbortController() from..', () => {
   });
   test('window', () => {
     const sym: any = Symbol('test');
-
     (global as any).AbortController = undefined;
-    (global as any).window = {};
-    (global as any).window.AbortController = sym;
+    (global as any).window = {
+      AbortController: sym,
+    };
     expect(getAbortController(null)).toBe(sym);
   });
   test('global', () => {
     const sym: any = Symbol('test');
-
     (global as any).AbortController = sym;
-    delete (global as any).window;
+    (global as any).window = undefined;
+    expect(getAbortController(null)).toBe(sym);
+  });
+  test('window w. undefined AbortController -> global', () => {
+    const sym: any = Symbol('test');
+    (global as any).AbortController = sym;
+    (global as any).window = {};
     expect(getAbortController(null)).toBe(sym);
   });
   test('neither', () => {
@@ -30,23 +35,26 @@ describe('getAbortController() from..', () => {
 
 describe('getFetch() from...', () => {
   test('passed', () => {
-    const sym: any = Symbol('test');
-    expect(getFetch(sym)).toBe(sym);
+    const customImpl: any = () => true;
+    expect(getFetch(customImpl)).toBe(customImpl);
   });
   test('window', () => {
-    const sym: any = Symbol('test');
-
     (global as any).fetch = undefined;
-    (global as any).window = {};
-    (global as any).window.fetch = sym;
-    expect(getFetch()).toBe(sym);
+    (global as any).window = {
+      fetch: () => 42,
+    };
+    expect(getFetch()('')).toBe(42);
   });
   test('global', () => {
-    const sym: any = Symbol('test');
-
-    (global as any).fetch = sym;
+    (global as any).fetch = () => 1337;
+    (global as any).window = undefined;
     delete (global as any).window;
-    expect(getFetch()).toBe(sym);
+    expect(getFetch()('')).toBe(1337);
+  });
+  test('window w. undefined fetch -> global', () => {
+    (global as any).fetch = () => 808;
+    (global as any).window = {};
+    expect(getFetch()('')).toBe(808);
   });
   test('neither -> throws', () => {
     (global as any).fetch = undefined;

packages/tests/server/interop/clientInternals.test.ts

@@ -1,5 +1,5 @@
 import { getFetch } from '@trpc/client/src';
-import { getAbortController } from '@trpc/client/src/internals/fetchHelpers';
+import { getAbortController } from '@trpc/client/src/internals/getAbortController';
 
 describe('getAbortController() from..', () => {
   test('passed', () => {
@@ -8,17 +8,22 @@ describe('getAbortController() from..', () => {
   });
   test('window', () => {
     const sym: any = Symbol('test');
-
     (global as any).AbortController = undefined;
-    (global as any).window = {};
-    (global as any).window = AbortController = sym;
-    expect(getAbortController(null)).toBe(null);
+    (global as any).window = {
+      AbortController: sym,
+    };
+    expect(getAbortController(null)).toBe(sym);
   });
   test('global', () => {
     const sym: any = Symbol('test');
-
     (global as any).AbortController = sym;
-    delete (global as any).window;
+    (global as any).window = undefined;
+    expect(getAbortController(null)).toBe(sym);
+  });
+  test('window w. undefined AbortController -> global', () => {
+    const sym: any = Symbol('test');
+    (global as any).AbortController = sym;
+    (global as any).window = {};
     expect(getAbortController(null)).toBe(sym);
   });
   test('neither', () => {
@@ -30,23 +35,26 @@ describe('getAbortController() from..', () => {
 
 describe('getFetch() from...', () => {
   test('passed', () => {
-    const sym: any = Symbol('test');
-    expect(getFetch(sym)).toBe(sym);
+    const customImpl: any = () => true;
+    expect(getFetch(customImpl)).toBe(customImpl);
   });
   test('window', () => {
-    const sym: any = Symbol('test');
-
     (global as any).fetch = undefined;
-    (global as any).window = {};
-    (global as any).window.fetch = sym;
-    expect(getFetch()).toBe(sym);
+    (global as any).window = {
+      fetch: () => 42,
+    };
+    expect(getFetch()('')).toBe(42);
   });
   test('global', () => {
-    const sym: any = Symbol('test');
-
-    (global as any).fetch = sym;
+    (global as any).fetch = () => 1337;
+    (global as any).window = undefined;
     delete (global as any).window;
-    expect(getFetch()).toBe(sym);
+    expect(getFetch()('')).toBe(1337);
+  });
+  test('window w. undefined fetch -> global', () => {
+    (global as any).fetch = () => 808;
+    (global as any).window = {};
+    expect(getFetch()('')).toBe(808);
   });
   test('neither -> throws', () => {
     (global as any).fetch = undefined;