Hello world
`); window.fetch = global.fetch; (global as any).window = window; +const HTTP_AGENT_HOST = 'http://localhost:4943'; + const DEFAULT_INGRESS_EXPIRY_DELTA_IN_MSECS = 5 * 60 * 1000; const REPLICA_PERMITTED_DRIFT_MILLISECONDS = 60 * 1000; const NANOSECONDS_PER_MILLISECONDS = 1_000_000; @@ -313,26 +315,26 @@ test('use anonymous principal if unspecified', async () => { describe('getDefaultFetch', () => { it("should use fetch from window if it's available", async () => { - const generateAgent = () => new HttpAgent({ host: 'localhost:8000' }); + const generateAgent = () => new HttpAgent({ host: HTTP_AGENT_HOST }); expect(generateAgent).not.toThrowError(); }); it('should throw an error if fetch is not available on the window object', async () => { delete (window as any).fetch; - const generateAgent = () => new HttpAgent({ host: 'localhost:8000' }); + const generateAgent = () => new HttpAgent({ host: HTTP_AGENT_HOST }); expect(generateAgent).toThrowError('Fetch implementation was not available'); }); it('should throw error for defaultFetch with no window or global fetch', () => { delete (global as any).window; delete (global as any).fetch; - const generateAgent = () => new HttpAgent({ host: 'localhost:8000' }); + const generateAgent = () => new HttpAgent({ host: HTTP_AGENT_HOST }); expect(generateAgent).toThrowError('Fetch implementation was not available'); }); it('should fall back to global.fetch if window is not available', () => { delete (global as any).window; global.fetch = originalFetch; - const generateAgent = () => new HttpAgent({ host: 'localhost:8000' }); + const generateAgent = () => new HttpAgent({ host: HTTP_AGENT_HOST }); expect(generateAgent).not.toThrowError(); }); @@ -494,7 +496,7 @@ describe('retry failures', () => { statusText: 'Internal Server Error', }), ); - const agent = new HttpAgent({ host: 'http://localhost:8000', fetch: mockFetch, retryTimes: 0 }); + const agent = new HttpAgent({ host: HTTP_AGENT_HOST, fetch: mockFetch, retryTimes: 0 }); expect( agent.call(Principal.managementCanister(), { methodName: 'test', @@ -510,7 +512,7 @@ describe('retry failures', () => { }); }); - const agent = new HttpAgent({ host: 'http://localhost:8000', fetch: mockFetch }); + const agent = new HttpAgent({ host: HTTP_AGENT_HOST, fetch: mockFetch }); try { expect( agent.call(Principal.managementCanister(), { @@ -540,7 +542,7 @@ describe('retry failures', () => { } }); - const agent = new HttpAgent({ host: 'http://localhost:8000', fetch: mockFetch }); + const agent = new HttpAgent({ host: HTTP_AGENT_HOST, fetch: mockFetch }); const result = await agent.call(Principal.managementCanister(), { methodName: 'test', arg: new Uint8Array().buffer, @@ -556,7 +558,7 @@ test('should change nothing if time is within 30 seconds of replica', async () = // jest.setSystemTime(systemTime); const mockFetch = jest.fn(); - const agent = new HttpAgent({ host: 'http://localhost:8000', fetch: mockFetch }); + const agent = new HttpAgent({ host: HTTP_AGENT_HOST, fetch: mockFetch }); await agent.syncTime(); @@ -590,7 +592,7 @@ test('should adjust the Expiry if the clock is more than 30 seconds behind', asy await import('../../canisterStatus'); const { HttpAgent } = await import('../index'); - const agent = new HttpAgent({ host: 'http://localhost:8000', fetch: mockFetch }); + const agent = new HttpAgent({ host: HTTP_AGENT_HOST, fetch: mockFetch }); await agent.syncTime(); @@ -633,7 +635,7 @@ test('should adjust the Expiry if the clock is more than 30 seconds ahead', asyn await import('../../canisterStatus'); const { HttpAgent } = await import('../index'); - const agent = new HttpAgent({ host: 'http://localhost:8000', fetch: mockFetch }); + const agent = new HttpAgent({ host: HTTP_AGENT_HOST, fetch: mockFetch }); await agent.syncTime(); @@ -657,3 +659,43 @@ test('should adjust the Expiry if the clock is more than 30 seconds ahead', asyn expect(delay).toBe(-1 * DEFAULT_INGRESS_EXPIRY_DELTA_IN_MSECS); jest.resetModules(); }); + +test('should fetch with given call options and fetch options', async () => { + const mockFetch: jest.Mock = jest.fn(() => { + const body = cbor.encode({}); + return Promise.resolve( + new Response(body, { + status: 200, + }), + ); + }); + + const canisterId: Principal = Principal.fromText('2chl6-4hpzw-vqaaa-aaaaa-c'); + const httpAgent = new HttpAgent({ + fetch: mockFetch, + host: 'http://localhost', + callOptions: { + reactNative: { textStreaming: true }, + }, + fetchOptions: { + reactNative: { + __nativeResponseType: 'base64', + }, + }, + }); + + await httpAgent.call(canisterId, { + methodName: 'greet', + arg: new Uint8Array([]), + }); + + await httpAgent.query(canisterId, { + methodName: 'greet', + arg: new Uint8Array([]), + }); + + const { calls } = mockFetch.mock; + + expect(calls[0][1].reactNative).toStrictEqual({ textStreaming: true }); + expect(calls[1][1].reactNative.__nativeResponseType).toBe('base64'); +}); diff --git a/packages/agent/src/agent/http/index.ts b/packages/agent/src/agent/http/index.ts index 4a53c6d67..e52709762 100644 --- a/packages/agent/src/agent/http/index.ts +++ b/packages/agent/src/agent/http/index.ts @@ -72,6 +72,13 @@ export interface HttpAgentOptions { // A surrogate to the global fetch function. Useful for testing. fetch?: typeof fetch; + // Additional options to pass along to fetch. Will not override fields that + // the agent already needs to set + fetchOptions?: Record