A local-first personal finance app
[AI] Standardize server fetch on Undici (#9351)
Julian Dominguez-Schatzdff6b4b21bed
diff --git a/packages/sync-server/package.json b/packages/sync-server/package.jsonindex c1c5afe193..bf35bb1bdb 100644--- a/packages/sync-server/package.json+++ b/packages/sync-server/package.json@@ -129,6 +129,6 @@"vitest": "^5.0.4"},"engines": {- "node": ">=22"+ "node": ">=22.19.0"}}diff --git a/packages/sync-server/src/app-cors-proxy.js b/packages/sync-server/src/app-cors-proxy.jsindex fdcab8a70d..2610a59f83 100644--- a/packages/sync-server/src/app-cors-proxy.js+++ b/packages/sync-server/src/app-cors-proxy.js@@ -1,6 +1,7 @@import createDebug from 'debug';import express from 'express';import rateLimit from 'express-rate-limit';+import { fetch } from 'undici';import { config } from './load-config';import { requestLoggerMiddleware } from './util/middlewares';diff --git a/packages/sync-server/src/app-cors-proxy.test.js b/packages/sync-server/src/app-cors-proxy.test.jsindex 462c38e9f2..bf1c496d39 100644--- a/packages/sync-server/src/app-cors-proxy.test.js+++ b/packages/sync-server/src/app-cors-proxy.test.js@@ -2,12 +2,18 @@ import { format } from 'node:util';import createDebug from 'debug';import request from 'supertest';+import * as undici from 'undici';import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';import { handlers as app, clearAllowlistCache } from './app-cors-proxy';import { config } from './load-config';import { validateSession } from './util/validate-user';+vi.mock('undici', async importOriginal => ({+ ...(await importOriginal()),+ fetch: vi.fn(),+}));+vi.mock('./load-config', () => ({config: {get: vi.fn(),@@ -26,8 +32,6 @@ vi.mock('express-rate-limit', () => ({default: vi.fn(() => (req, res, next) => next()),}));-global.fetch = vi.fn();-describe('app-cors-proxy', () => {const defaultAllowlistedRepos = ['https://github.com/user/repo1',@@ -154,9 +158,11 @@ describe('app-cors-proxy', () => {};beforeAll(() => {- global.fetch = createFetchMock({- proxyResponses: comprehensiveProxyResponses,- });+ vi.mocked(undici.fetch).mockImplementation(+ createFetchMock({+ proxyResponses: comprehensiveProxyResponses,+ }),+ );});beforeEach(() => {@@ -346,16 +352,18 @@ describe('app-cors-proxy', () => {.get('/').query({ url: 'https://github.com/user/repo1' });- expect(global.fetch).toHaveBeenCalledWith(+ expect(undici.fetch).toHaveBeenCalledWith('https://raw.githubusercontent.com/actualbudget/plugin-store/refs/heads/main/plugins.json',);});it('should handle allowlist fetch failure gracefully', async () => {- global.fetch = createFetchMock({- allowlistFetchFails: true,- proxyResponses: comprehensiveProxyResponses,- });+ vi.mocked(undici.fetch).mockImplementation(+ createFetchMock({+ allowlistFetchFails: true,+ proxyResponses: comprehensiveProxyResponses,+ }),+ );const res = await request(app).get('/')@@ -367,16 +375,20 @@ describe('app-cors-proxy', () => {expect.any(Error),);- global.fetch = createFetchMock({- proxyResponses: comprehensiveProxyResponses,- });+ vi.mocked(undici.fetch).mockImplementation(+ createFetchMock({+ proxyResponses: comprehensiveProxyResponses,+ }),+ );});it('should handle allowlist fetch HTTP error', async () => {- global.fetch = createFetchMock({- allowlistHttpError: true,- proxyResponses: comprehensiveProxyResponses,- });+ vi.mocked(undici.fetch).mockImplementation(+ createFetchMock({+ allowlistHttpError: true,+ proxyResponses: comprehensiveProxyResponses,+ }),+ );const res = await request(app).get('/')@@ -388,9 +400,11 @@ describe('app-cors-proxy', () => {expect.any(Error),);- global.fetch = createFetchMock({- proxyResponses: comprehensiveProxyResponses,- });+ vi.mocked(undici.fetch).mockImplementation(+ createFetchMock({+ proxyResponses: comprehensiveProxyResponses,+ }),+ );});});@@ -438,7 +452,7 @@ describe('app-cors-proxy', () => {});it('should reject non-string method (array bypass)', async () => {- global.fetch.mockClear();+ undici.fetch.mockClear();const res = await request(app).get('/')@@ -448,14 +462,14 @@ describe('app-cors-proxy', () => {expect(res.statusCode).toBe(400);expect(res.body.error).toBe('Invalid method parameter');- const proxyCalls = global.fetch.mock.calls.filter(+ const proxyCalls = undici.fetch.mock.calls.filter(([url]) => url === 'https://api.github.com/repos/user/repo1',);expect(proxyCalls).toHaveLength(0);});it('should reject non-string method (object bypass)', async () => {- global.fetch.mockClear();+ undici.fetch.mockClear();const res = await request(app).get('/')@@ -465,21 +479,21 @@ describe('app-cors-proxy', () => {expect(res.statusCode).toBe(400);expect(res.body.error).toBe('Invalid method parameter');- const proxyCalls = global.fetch.mock.calls.filter(+ const proxyCalls = undici.fetch.mock.calls.filter(([url]) => url === 'https://github.com/user/repo1',);expect(proxyCalls).toHaveLength(0);});it('should forward the validated method to fetch, not the raw input', async () => {- global.fetch.mockClear();+ undici.fetch.mockClear();await request(app).get('/').send({ method: 'get' }).query({ url: 'https://github.com/user/repo1' });- const proxyCall = global.fetch.mock.calls.find(+ const proxyCall = undici.fetch.mock.calls.find(([url]) => url === 'https://github.com/user/repo1',);expect(proxyCall).toBeDefined();@@ -499,7 +513,7 @@ describe('app-cors-proxy', () => {.get('/').query({ url: 'https://api.github.com/repos/user/repo1' });- expect(global.fetch).toHaveBeenCalledWith(+ expect(undici.fetch).toHaveBeenCalledWith('https://api.github.com/repos/user/repo1',expect.objectContaining({headers: expect.objectContaining({@@ -517,7 +531,7 @@ describe('app-cors-proxy', () => {url: 'https://raw.githubusercontent.com/user/repo1/main/file.txt',});- expect(global.fetch).toHaveBeenCalledWith(+ expect(undici.fetch).toHaveBeenCalledWith('https://raw.githubusercontent.com/user/repo1/main/file.txt',expect.objectContaining({headers: expect.objectContaining({@@ -535,7 +549,7 @@ describe('app-cors-proxy', () => {.get('/').query({ url: 'https://api.github.com/repos/user/repo1' });- expect(global.fetch).toHaveBeenCalledWith(+ expect(undici.fetch).toHaveBeenCalledWith('https://api.github.com/repos/user/repo1',expect.objectContaining({headers: expect.not.objectContaining({@@ -627,7 +641,7 @@ describe('app-cors-proxy', () => {});it('should handle invalid repository URLs in allowlist', async () => {- global.fetch.mockResolvedValueOnce({+ undici.fetch.mockResolvedValueOnce({ok: true,json: () => Promise.resolve([{ url: 'invalid-url' }]),});diff --git a/packages/sync-server/src/app-enablebanking/services/enablebanking-service.ts b/packages/sync-server/src/app-enablebanking/services/enablebanking-service.tsindex 46bac59594..cf88528bd9 100644--- a/packages/sync-server/src/app-enablebanking/services/enablebanking-service.ts+++ b/packages/sync-server/src/app-enablebanking/services/enablebanking-service.ts@@ -1,4 +1,6 @@import createDebug from 'debug';+import { fetch } from 'undici';+import type { RequestInit, Response } from 'undici';import {EnableBankingError,diff --git a/packages/sync-server/src/app-enablebanking/services/tests/enablebanking-service.spec.ts b/packages/sync-server/src/app-enablebanking/services/tests/enablebanking-service.spec.tsindex f6265a758b..4e2b115b65 100644--- a/packages/sync-server/src/app-enablebanking/services/tests/enablebanking-service.spec.ts+++ b/packages/sync-server/src/app-enablebanking/services/tests/enablebanking-service.spec.ts@@ -38,9 +38,9 @@ vi.mock('../../utils/jwt', () => ({getJWT: vi.fn(() => 'mock-jwt-token'),}));-// Mock global fetch-const mockFetch = vi.fn();-vi.stubGlobal('fetch', mockFetch);+// Mock provider requests+const mockFetch = vi.hoisted(() => vi.fn());+vi.mock('undici', () => ({ fetch: mockFetch }));function mockFetchResponse(data: unknown, ok = true, status = 200) {mockFetch.mockResolvedValueOnce({diff --git a/packages/sync-server/src/app-enablebanking/tests/poll-auth.spec.ts b/packages/sync-server/src/app-enablebanking/tests/poll-auth.spec.tsindex 1958a39d10..9ab863e8f8 100644--- a/packages/sync-server/src/app-enablebanking/tests/poll-auth.spec.ts+++ b/packages/sync-server/src/app-enablebanking/tests/poll-auth.spec.ts@@ -47,9 +47,9 @@ vi.mock('../../app-gocardless/util/handle-error', () => ({},}));-// Mock fetch globally-const mockFetch = vi.fn();-vi.stubGlobal('fetch', mockFetch);+// Mock provider requests+const mockFetch = vi.hoisted(() => vi.fn());+vi.mock('undici', () => ({ fetch: mockFetch }));// We need to dynamically import the handlers after mocks are set upconst { handlers } = await import('../app-enablebanking');diff --git a/packages/sync-server/src/app-enablebanking/tests/transactions.spec.ts b/packages/sync-server/src/app-enablebanking/tests/transactions.spec.tsindex 96048ae01e..8105c467d2 100644--- a/packages/sync-server/src/app-enablebanking/tests/transactions.spec.ts+++ b/packages/sync-server/src/app-enablebanking/tests/transactions.spec.ts@@ -48,8 +48,8 @@ vi.mock('../../app-gocardless/util/handle-error', () => ({},}));-// Mock fetch globally (the service is stubbed below, this just guards stray calls)-vi.stubGlobal('fetch', vi.fn());+// Mock provider requests (the service is stubbed below, this just guards stray calls)+vi.mock('undici', () => ({ fetch: vi.fn() }));const { handlers } = await import('../app-enablebanking');const { enableBankingService } =diff --git a/packages/sync-server/src/app-gocardless/services/gocardless-api.ts b/packages/sync-server/src/app-gocardless/services/gocardless-api.tsindex 5cd02473fc..40ddbe1055 100644--- a/packages/sync-server/src/app-gocardless/services/gocardless-api.ts+++ b/packages/sync-server/src/app-gocardless/services/gocardless-api.ts@@ -1,4 +1,5 @@import createDebug from 'debug';+import { fetch } from 'undici';import type {GoCardlessAccountDetails,diff --git a/packages/sync-server/src/app-simplefin/app-simplefin.js b/packages/sync-server/src/app-simplefin/app-simplefin.jsindex 40f6959016..2787859d15 100644--- a/packages/sync-server/src/app-simplefin/app-simplefin.js+++ b/packages/sync-server/src/app-simplefin/app-simplefin.js@@ -1,5 +1,6 @@import createDebug from 'debug';import express from 'express';+import { fetch } from 'undici';import { handleError } from '#app-gocardless/util/handle-error';import { config } from '#load-config';diff --git a/packages/sync-server/src/app-simplefin/app-simplefin.test.js b/packages/sync-server/src/app-simplefin/app-simplefin.test.jsindex 43235c5c75..376a3663f4 100644--- a/packages/sync-server/src/app-simplefin/app-simplefin.test.js+++ b/packages/sync-server/src/app-simplefin/app-simplefin.test.js@@ -2,6 +2,7 @@ import { format } from 'node:util';import createDebug from 'debug';import request from 'supertest';+import * as undici from 'undici';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import { getAccountDb } from '#account-db';@@ -10,6 +11,11 @@ import { assertUrlAllowed } from '#util/ssrf';import { handlers as app } from './app-simplefin';+vi.mock('undici', async importOriginal => ({+ ...(await importOriginal()),+ fetch: vi.fn(),+}));+vi.mock('#util/ssrf', async importOriginal => ({...(await importOriginal()),assertUrlAllowed: vi.fn().mockResolvedValue(undefined),@@ -33,11 +39,9 @@ const okResponse = body => statusResponse(200, body);// The claim is a POST to the bridge; listing accounts is a GET. Route the mock// by method so a test can stub one or both.function mockFetch({ claim, accounts }) {- global.fetch = vi- .fn()- .mockImplementation((url, options) =>- Promise.resolve(options?.method === 'POST' ? claim : accounts),- );+ vi.mocked(undici.fetch).mockImplementation((url, options) =>+ Promise.resolve(options?.method === 'POST' ? claim : accounts),+ );}const post = path =>@@ -210,12 +214,12 @@ describe('app-simplefin', () => {SecretName.simplefin_token,Buffer.from('not a claim url').toString('base64'),);- global.fetch = vi.fn();+ vi.mocked(undici.fetch).mockReset();const res = await post('/accounts');expect(res.body.data.error_code).toBe('INVALID_ACCESS_TOKEN');- expect(global.fetch).not.toHaveBeenCalled();+ expect(undici.fetch).not.toHaveBeenCalled();});it('treats a 403 Forbidden claim as an invalid token and does not persist it', async () => {@@ -254,7 +258,7 @@ describe('app-simplefin', () => {it('reports SERVER_DOWN when the claim request fails at the network level', async () => {secretsService.set(SecretName.simplefin_token, SETUP_TOKEN);- global.fetch = vi.fn().mockRejectedValue(new TypeError('fetch failed'));+ vi.mocked(undici.fetch).mockRejectedValue(new TypeError('fetch failed'));const res = await post('/accounts');@@ -267,12 +271,12 @@ describe('app-simplefin', () => {assertUrlAllowed.mockRejectedValueOnce(new Error('Unable to resolve host: bridge.example.com'),);- global.fetch = vi.fn();+ vi.mocked(undici.fetch).mockReset();const res = await post('/accounts');expect(res.body.data.error_code).toBe('SERVER_DOWN');- expect(global.fetch).not.toHaveBeenCalled();+ expect(undici.fetch).not.toHaveBeenCalled();expect(secretsService.get(SecretName.simplefin_accessKey)).toBeNull();});});@@ -283,7 +287,7 @@ describe('app-simplefin', () => {SecretName.simplefin_accessKey,'<html>Bad Gateway</html>',);- global.fetch = vi.fn();+ vi.mocked(undici.fetch).mockReset();const res = await post('/transactions').send({accountId: 'account-1',@@ -291,7 +295,7 @@ describe('app-simplefin', () => {});expect(res.body.data.error_code).toBe('INVALID_ACCESS_TOKEN');- expect(global.fetch).not.toHaveBeenCalled();+ expect(undici.fetch).not.toHaveBeenCalled();});});});@@ -338,11 +342,11 @@ describe('per-budget credentials', () => {await post('/accounts').set('X-Actual-File-Id', fileA).expect(200);- expect(global.fetch).toHaveBeenCalledWith(+ expect(undici.fetch).toHaveBeenCalledWith('https://bridge.example.com/claim/abc',expect.objectContaining({ method: 'POST' }),);- expect(global.fetch).toHaveBeenLastCalledWith(+ expect(undici.fetch).toHaveBeenLastCalledWith(expect.any(String),expect.objectContaining({headers: {@@ -393,7 +397,7 @@ describe('per-budget credentials', () => {startDate: batch ? ['2024-01-01'] : '2024-01-01',});expect(res.body.data).not.toHaveProperty('error_code');- expect(global.fetch).toHaveBeenLastCalledWith(+ expect(undici.fetch).toHaveBeenLastCalledWith(expect.any(String),expect.objectContaining({headers: {@@ -407,7 +411,7 @@ describe('per-budget credentials', () => {it('does not fall back to global credentials when a budget token is invalid', async () => {secretsService.set(SecretName.simplefin_token, 'Forbidden', fileA);- const fetch = vi.spyOn(global, 'fetch');+ const fetch = vi.spyOn(undici, 'fetch');const status = await post('/status').set('X-Actual-File-Id', fileA);expect(status.body.data).toEqual({configured: false,@@ -443,7 +447,7 @@ describe('per-budget credentials', () => {getAccountDb().mutate('UPDATE files SET deleted = 1 WHERE id = ?', [fileA,]);- const fetch = vi.spyOn(global, 'fetch');+ const fetch = vi.spyOn(undici, 'fetch');for (const token of ['valid-token', 'valid-token-user']) {for (const fileId of [fileA, 'missing-budget']) {await request(app)@@ -460,7 +464,7 @@ describe('per-budget credentials', () => {it.each(['/status', '/accounts', '/transactions'])('checks budget access before %s',async path => {- const fetch = vi.spyOn(global, 'fetch');+ const fetch = vi.spyOn(undici, 'fetch');await post(path).set('X-Actual-File-Id', '../invalid').expect(400);await request(app).post(path)diff --git a/packages/sync-server/src/app-simplefin/fetch.integration.test.ts b/packages/sync-server/src/app-simplefin/fetch.integration.test.tsnew file mode 100644index 0000000000..163a4cf413--- /dev/null+++ b/packages/sync-server/src/app-simplefin/fetch.integration.test.ts@@ -0,0 +1,66 @@+import { once } from 'node:events';+import { createServer } from 'node:http';++import request from 'supertest';++import type * as LoadConfig from '#load-config';+import { SecretName, secretsService } from '#services/secrets-service';++import { handlers } from './app-simplefin';++vi.mock('#load-config', async importOriginal => {+ const original = await importOriginal<typeof LoadConfig>();+ const get = original.config.get.bind(original.config);+ vi.spyOn(original.config, 'get').mockImplementation(name =>+ name === 'simplefinAllowedNetworks' ? ['127.0.0.1'] : get(name),+ );+ return original;+});++it('claims a token and lists accounts through the real SSRF dispatcher', async () => {+ const calls: { method?: string; url?: string; authorization?: string }[] = [];+ const server = createServer((req, res) => {+ calls.push({+ method: req.method,+ url: req.url,+ authorization: req.headers.authorization,+ });+ if (req.url === '/claim') {+ res.end(`http://user:password@${req.headers.host}`);+ } else {+ res.setHeader('Content-Type', 'application/json');+ res.end(JSON.stringify({ accounts: [{ id: 'demo-account' }] }));+ }+ });+ server.listen(0, '127.0.0.1');+ await once(server, 'listening');+ const address = server.address();+ if (!address || typeof address === 'string') throw new Error('Missing port');++ secretsService.reset(SecretName.simplefin_accessKey);+ secretsService.set(+ SecretName.simplefin_token,+ Buffer.from(`http://127.0.0.1:${address.port}/claim`).toString('base64'),+ );+ try {+ const response = await request(handlers)+ .post('/accounts')+ .set('x-actual-token', 'valid-token');+ expect(response.body.data.accounts).toEqual([{ id: 'demo-account' }]);+ expect(calls).toEqual([+ { method: 'POST', url: '/claim', authorization: undefined },+ {+ method: 'GET',+ url: '/accounts?balances-only=1',+ authorization: `Basic ${Buffer.from('user:password').toString('base64')}`,+ },+ ]);+ } finally {+ secretsService.reset(SecretName.simplefin_token);+ secretsService.reset(SecretName.simplefin_accessKey);+ server.closeAllConnections();+ await new Promise<void>((resolve, reject) =>+ server.close(error => (error ? reject(error) : resolve())),+ );+ }+});diff --git a/packages/sync-server/src/app-simplefin/ssrf.test.ts b/packages/sync-server/src/app-simplefin/ssrf.test.tsindex 3d213519d5..c2c7991d99 100644--- a/packages/sync-server/src/app-simplefin/ssrf.test.ts+++ b/packages/sync-server/src/app-simplefin/ssrf.test.ts@@ -1,6 +1,8 @@import dns from 'dns';import request from 'supertest';+import { fetch, Response } from 'undici';+import type * as Undici from 'undici';import type * as LoadConfig from '#load-config';import { SecretName, secretsService } from '#services/secrets-service';@@ -8,6 +10,11 @@ import { SecretName, secretsService } from '#services/secrets-service';import { handlers } from './app-simplefin';const allowedNetworks = vi.hoisted(() => [] as string[]);+vi.mock('undici', async importOriginal => ({+ ...(await importOriginal<typeof Undici>()),+ fetch: vi.fn(),+}));+vi.mock('#load-config', async importOriginal => {const original = await importOriginal<typeof LoadConfig>();const get = original.config.get.bind(original.config);@@ -22,14 +29,14 @@ vi.mock('dns', () => ({ default: { lookup: vi.fn() } }));beforeEach(() => {secretsService.reset(SecretName.simplefin_token);secretsService.reset(SecretName.simplefin_accessKey);- vi.stubGlobal('fetch', vi.fn());+ vi.mocked(fetch).mockReset();});afterEach(() => {secretsService.reset(SecretName.simplefin_token);secretsService.reset(SecretName.simplefin_accessKey);allowedNetworks.length = 0;- vi.unstubAllGlobals();+ vi.mocked(fetch).mockReset();vi.resetAllMocks();});diff --git a/packages/sync-server/src/scripts/health-check.ts b/packages/sync-server/src/scripts/health-check.tsindex 1c208d5522..413ede5d8a 100644--- a/packages/sync-server/src/scripts/health-check.ts+++ b/packages/sync-server/src/scripts/health-check.ts@@ -1,3 +1,5 @@+import { fetch } from 'undici';+import { config } from '#load-config';const protocol =diff --git a/packages/sync-server/src/util/sensitive-logging.test.ts b/packages/sync-server/src/util/sensitive-logging.test.tsindex 0178d70f6d..b32c56c4e9 100644--- a/packages/sync-server/src/util/sensitive-logging.test.ts+++ b/packages/sync-server/src/util/sensitive-logging.test.ts@@ -3,12 +3,19 @@ import { format } from 'node:util';import createDebug from 'debug';import express from 'express';import request from 'supertest';+import { fetch, Response } from 'undici';+import type * as Undici from 'undici';import { enableBankingService } from '#app-enablebanking/services/enablebanking-service';import { handleEnableBankingError } from '#app-enablebanking/utils/errors';import { handleError } from '#app-gocardless/util/handle-error';import { SecretName, secretsService } from '#services/secrets-service';+vi.mock('undici', async importOriginal => ({+ ...(await importOriginal<typeof Undici>()),+ fetch: vi.fn(),+}));+vi.mock('#app-enablebanking/utils/jwt', () => ({getJWT: () => 'provider-jwt',}));@@ -27,7 +34,7 @@ it.each(['', 'actual:*', 'actual-sensitive:enable-banking'])('test-application',);secretsService.set(SecretName.enablebanking_secretKey, 'test-key');- vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response('{}')));+ vi.mocked(fetch).mockResolvedValue(new Response('{}'));try {const error = handleEnableBankingError(400, {message: `Invalid redirect for ${secret}`,@@ -45,7 +52,7 @@ it.each(['', 'actual:*', 'actual-sensitive:enable-banking'])(} finally {secretsService.reset(SecretName.enablebanking_applicationId);secretsService.reset(SecretName.enablebanking_secretKey);- vi.unstubAllGlobals();+ vi.mocked(fetch).mockReset();log.mockRestore();createDebug.enable(previous);}diff --git a/upcoming-release-notes/fix-simplefin-server-fetch.md b/upcoming-release-notes/fix-simplefin-server-fetch.mdnew file mode 100644index 0000000000..fec30bfd5e--- /dev/null+++ b/upcoming-release-notes/fix-simplefin-server-fetch.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [jfdoming]+---++Fix SimpleFIN connection failures on recent nightly builds