Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Defer resolving globalThis.fetch until calling endpoint #692

Merged
merged 5 commits into from
Jun 27, 2023
Merged

Defer resolving globalThis.fetch until calling endpoint #692

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8b22eb
Make sure patched fetch is used
paul-sachs Jun 26, 2023
952ee81
Undo patch after fetch
paul-sachs Jun 26, 2023
72368cd
Update bench and add grpc-web test
paul-sachs Jun 26, 2023
655354b
Remove gRPC test
paul-sachs Jun 26, 2023
bd90236
Moved fetch polyfill to beforeEach/afterEach
paul-sachs Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/connect-web-bench/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ it like a web server would usually do.

| code generator | bundle size | minified | compressed |
|----------------|-------------------:|-----------------------:|---------------------:|
| connect | 112,976 b | 49,590 b | 13,282 b |
| connect | 113,120 b | 49,644 b | 13,266 b |
| grpc-web | 414,906 b | 301,127 b | 53,279 b |
29 changes: 29 additions & 0 deletions packages/connect-web-test/src/fetch.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,34 @@ describe("custom fetch", function () {
expect(response.json).toHaveBeenCalledTimes(1); // eslint-disable-line @typescript-eslint/unbound-method
expect(response.arrayBuffer).toHaveBeenCalledTimes(0); // eslint-disable-line @typescript-eslint/unbound-method
});
it("should should defer resolving fetch until calling endpoint", async function () {
const response = new Response(
new SimpleResponse({ username: "donald" }).toJsonString(),
{
headers: {
"Content-Type": "application/json",
},
}
);
spyOn(response, "arrayBuffer").and.callThrough();
spyOn(response, "json").and.callThrough();
const transport = createConnectTransport({
baseUrl: "https://example.com",
});
const originFetch = globalThis.fetch;
// Patch globalThis.fetch to mimic a polyfill or patch
globalThis.fetch = () => Promise.resolve(response);
await transport.unary(
TestService,
TestService.methods.unaryCall,
undefined,
undefined,
undefined,
new SimpleRequest()
);
globalThis.fetch = originFetch;
expect(response.json).toHaveBeenCalledTimes(1); // eslint-disable-line @typescript-eslint/unbound-method
expect(response.arrayBuffer).toHaveBeenCalledTimes(0); // eslint-disable-line @typescript-eslint/unbound-method
});
});
});
3 changes: 2 additions & 1 deletion packages/connect-web/src/connect-transport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ export function createConnectTransport(
): Transport {
assertFetchApi();
const useBinaryFormat = options.useBinaryFormat ?? false;
const fetch = options.fetch ?? globalThis.fetch;
return {
async unary<
I extends Message<I> = AnyMessage,
Expand Down Expand Up @@ -180,6 +179,7 @@ export function createConnectTransport(
} else {
body = serialize(req.message);
}
const fetch = options.fetch ?? globalThis.fetch;
const response = await fetch(req.url, {
...req.init,
headers: req.header,
Expand Down Expand Up @@ -303,6 +303,7 @@ export function createConnectTransport(
message: input,
},
next: async (req) => {
const fetch = options.fetch ?? globalThis.fetch;
const fRes = await fetch(req.url, {
...req.init,
headers: req.header,
Expand Down
3 changes: 2 additions & 1 deletion packages/connect-web/src/grpc-web-transport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ export function createGrpcWebTransport(
): Transport {
assertFetchApi();
const useBinaryFormat = options.useBinaryFormat ?? true;
const fetch = options.fetch ?? globalThis.fetch;
return {
async unary<
I extends Message<I> = AnyMessage,
Expand Down Expand Up @@ -157,6 +156,7 @@ export function createGrpcWebTransport(
message: normalize(message),
},
next: async (req: UnaryRequest<I, O>): Promise<UnaryResponse<I, O>> => {
const fetch = options.fetch ?? globalThis.fetch;
const response = await fetch(req.url, {
...req.init,
headers: req.header,
Expand Down Expand Up @@ -308,6 +308,7 @@ export function createGrpcWebTransport(
message: input,
},
next: async (req) => {
const fetch = options.fetch ?? globalThis.fetch;
const fRes = await fetch(req.url, {
...req.init,
headers: req.header,
Expand Down