Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 25 additions & 3 deletions packages/dev-middleware/src/inspector-proxy/Device.js
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,9 @@ export default class Device {
this.#deviceEventReporter?.logRequest(debuggerRequest, 'debugger', {
pageId: this.#debuggerConnection?.pageId ?? null,
frontendUserAgent: metadata.userAgent,
prefersFuseboxFrontend: this.#isPageFuseboxFrontend(
this.#debuggerConnection?.pageId,
),
});
let processedReq = debuggerRequest;

Expand Down Expand Up @@ -521,6 +524,7 @@ export default class Device {
this.#deviceEventReporter?.logResponse(parsedPayload, 'device', {
pageId,
frontendUserAgent: this.#debuggerConnection?.userAgent ?? null,
prefersFuseboxFrontend: this.#isPageFuseboxFrontend(pageId),
});
}

Expand Down Expand Up @@ -601,9 +605,11 @@ export default class Device {
];

for (const message of toSend) {
const pageId = this.#debuggerConnection?.pageId ?? null;
this.#deviceEventReporter?.logRequest(message, 'proxy', {
pageId: this.#debuggerConnection?.pageId ?? null,
pageId,
frontendUserAgent: this.#debuggerConnection?.userAgent ?? null,
prefersFuseboxFrontend: this.#isPageFuseboxFrontend(pageId),
});
this.#sendMessageToDevice({
event: 'wrappedEvent',
Expand Down Expand Up @@ -713,6 +719,9 @@ export default class Device {
this.#deviceEventReporter?.logRequest(resumeMessage, 'proxy', {
pageId: this.#debuggerConnection?.pageId ?? null,
frontendUserAgent: this.#debuggerConnection?.userAgent ?? null,
prefersFuseboxFrontend: this.#isPageFuseboxFrontend(
this.#debuggerConnection?.pageId,
),
});
this.#sendMessageToDevice({
event: 'wrappedEvent',
Expand Down Expand Up @@ -796,9 +805,11 @@ export default class Device {
result,
};
socket.send(JSON.stringify(response));
const pageId = this.#debuggerConnection?.pageId ?? null;
this.#deviceEventReporter?.logResponse(response, 'proxy', {
pageId: this.#debuggerConnection?.pageId ?? null,
pageId,
frontendUserAgent: this.#debuggerConnection?.userAgent ?? null,
prefersFuseboxFrontend: this.#isPageFuseboxFrontend(pageId),
});
};
const sendErrorResponse = (error: string) => {
Expand All @@ -809,9 +820,11 @@ export default class Device {

// Send to the console as well, so the user can see it
this.#sendErrorToDebugger(error);
const pageId = this.#debuggerConnection?.pageId ?? null;
this.#deviceEventReporter?.logResponse(response, 'proxy', {
pageId: this.#debuggerConnection?.pageId ?? null,
pageId,
frontendUserAgent: this.#debuggerConnection?.userAgent ?? null,
prefersFuseboxFrontend: this.#isPageFuseboxFrontend(pageId),
});
};

Expand Down Expand Up @@ -909,4 +922,13 @@ export default class Device {
);
}
}

#isPageFuseboxFrontend(pageId: ?string): boolean | null {
const page = pageId == null ? null : this.#pages.get(pageId);
if (page == null) {
return null;
}

return this.#pageHasCapability(page, 'prefersFuseboxFrontend');
}
}
17 changes: 13 additions & 4 deletions packages/dev-middleware/src/inspector-proxy/DeviceEventReporter.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ type DeviceMetadata = $ReadOnly<{
type RequestMetadata = $ReadOnly<{
pageId: string | null,
frontendUserAgent: string | null,
prefersFuseboxFrontend: boolean | null,
}>;

type ResponseMetadata = $ReadOnly<{
pageId: string | null,
frontendUserAgent: string | null,
prefersFuseboxFrontend: boolean | null,
}>;

class DeviceEventReporter {
Expand Down Expand Up @@ -72,10 +79,7 @@ class DeviceEventReporter {
logResponse(
res: CDPResponse<>,
origin: 'device' | 'proxy',
metadata: $ReadOnly<{
pageId: string | null,
frontendUserAgent: string | null,
}>,
metadata: ResponseMetadata,
): void {
const pendingCommand = this.#pendingCommands.get(res.id);
if (!pendingCommand) {
Expand All @@ -93,6 +97,7 @@ class DeviceEventReporter {
deviceName: this.#metadata.deviceName,
pageId: metadata.pageId,
frontendUserAgent: metadata.frontendUserAgent,
prefersFuseboxFrontend: metadata.prefersFuseboxFrontend,
});
return;
}
Expand All @@ -118,6 +123,7 @@ class DeviceEventReporter {
deviceName: this.#metadata.deviceName,
pageId: pendingCommand.metadata.pageId,
frontendUserAgent: pendingCommand.metadata.frontendUserAgent,
prefersFuseboxFrontend: metadata.prefersFuseboxFrontend,
});
return;
}
Expand All @@ -134,6 +140,7 @@ class DeviceEventReporter {
deviceName: this.#metadata.deviceName,
pageId: pendingCommand.metadata.pageId,
frontendUserAgent: pendingCommand.metadata.frontendUserAgent,
prefersFuseboxFrontend: metadata.prefersFuseboxFrontend,
});
}

Expand Down Expand Up @@ -179,6 +186,7 @@ class DeviceEventReporter {
deviceName: this.#metadata.deviceName,
pageId: pendingCommand.metadata.pageId,
frontendUserAgent: pendingCommand.metadata.frontendUserAgent,
prefersFuseboxFrontend: pendingCommand.metadata.prefersFuseboxFrontend,
});
}
this.#pendingCommands.clear();
Expand Down Expand Up @@ -218,6 +226,7 @@ class DeviceEventReporter {
deviceName: this.#metadata.deviceName,
pageId: pendingCommand.metadata.pageId,
frontendUserAgent: pendingCommand.metadata.frontendUserAgent,
prefersFuseboxFrontend: pendingCommand.metadata.prefersFuseboxFrontend,
});
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/dev-middleware/src/types/EventReporter.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export type ReportableEvent =
timeSinceStart: number | null,
...DebuggerSessionIDs,
frontendUserAgent: string | null,
prefersFuseboxFrontend: boolean | null,
...
| SuccessResult<void>
| CodedErrorResult<
Expand Down