Skip to content

feat: add isSentByFetch/fetchOpaque to urllib message #581

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

Merged
fengmk2 merged 2 commits into from
Jul 8, 2025
Merged

feat: add isSentByFetch/fetchOpaque to urllib message #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e55057
feat: add isSentByFetch/fetchOpaque to urllib message
killagu Jul 7, 2025
3c29ee7
f
killagu Jul 7, 2025
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 src/FetchOpaqueInterceptor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface FetchOpaque {
[symbols.kRequestStartTime]: number;
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
[symbols.kEnableRequestTiming]: number;
[symbols.kEnableRequestTiming]: boolean;
}

// const internalOpaque = {
Expand Down
5 changes: 5 additions & 0 deletions src/HttpClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import { parseJSON, digestAuthHeader, globalId, performanceTime, isReadable, upd
import symbols from './symbols.js';
import { initDiagnosticsChannel } from './diagnosticsChannel.js';
import { HttpClientConnectTimeoutError, HttpClientRequestTimeoutError } from './HttpClientError.js';
import { FetchOpaque } from './FetchOpaqueInterceptor.js';

type Exists<T> = T extends undefined ? never : T;
type UndiciRequestOption = Exists<Parameters<typeof undiciRequest>[1]>;
Expand Down Expand Up @@ -150,12 +151,16 @@ export const channels = {

export type RequestDiagnosticsMessage = {
request: RequestMeta;
isSentByFetch?: boolean;
fetchOpaque?: FetchOpaque;
};

export type ResponseDiagnosticsMessage = {
request: RequestMeta;
response: RawResponseWithMeta;
error?: Error;
isSentByFetch?: boolean;
fetchOpaque?: FetchOpaque;
};

export interface PoolStat {
Expand Down
11 changes: 11 additions & 0 deletions src/fetch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,12 @@ export interface UrllibRequestInit extends RequestInit {

export type FetchDiagnosticsMessage = {
fetch: FetchMeta;
fetchOpaque: FetchOpaque;
};

export type FetchResponseDiagnosticsMessage = {
fetch: FetchMeta;
fetchOpaque: FetchOpaque;
timingInfo?: UndiciTimingInfo;
response?: Response;
error?: Error;
Expand Down Expand Up @@ -202,9 +204,12 @@ export class FetchFactory {
};
channels.request.publish({
request: reqMeta,
isSentByFetch: true,
fetchOpaque: internalOpaque,
Comment thread
killagu marked this conversation as resolved.
} as RequestDiagnosticsMessage);
channels.fetchRequest.publish({
fetch: fetchMeta,
fetchOpaque: internalOpaque,
} as FetchDiagnosticsMessage);

let res: Response;
Expand Down Expand Up @@ -239,11 +244,14 @@ export class FetchFactory {
channels.fetchResponse.publish({
fetch: fetchMeta,
error: e,
fetchOpaque: internalOpaque,
} as FetchResponseDiagnosticsMessage);
channels.response.publish({
request: reqMeta,
response: urllibResponse,
error: e,
isSentByFetch: true,
fetchOpaque: internalOpaque,
} as ResponseDiagnosticsMessage);
throw e;
}
Expand All @@ -265,10 +273,13 @@ export class FetchFactory {
fetch: fetchMeta,
timingInfo: state.timingInfo,
response: res!,
fetchOpaque: internalOpaque,
} as FetchResponseDiagnosticsMessage);
channels.response.publish({
request: reqMeta,
response: urllibResponse,
isSentByFetch: true,
fetchOpaque: internalOpaque,
} as ResponseDiagnosticsMessage);
return res!;
}
Expand Down
Loading