From 3f0101c94df31687d169392d7afc2082b64d1acc Mon Sep 17 00:00:00 2001 From: Cedric van Putten Date: Sat, 2 Dec 2023 14:02:22 +0100 Subject: [PATCH 1/2] fix: add `userAgent` query parameter in debugger --- src/expoDebuggers.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/expoDebuggers.ts b/src/expoDebuggers.ts index 855cd13..cd2321e 100644 --- a/src/expoDebuggers.ts +++ b/src/expoDebuggers.ts @@ -10,11 +10,13 @@ import { import { ExpoProjectCache, ExpoProject, findProjectFromWorkspaces } from './expo/project'; import { debug } from './utils/debug'; import { featureTelemetry } from './utils/telemetry'; +import { version as extensionVersion } from '../package.json'; const log = debug.extend('expo-debuggers'); const DEBUG_TYPE = 'expo'; const DEBUG_COMMAND = 'expo.debug.start'; +const DEBUG_USER_AGENT = `vscode/${vscode.version} vscode-expo-tools/${extensionVersion}`; interface ExpoDebugConfig extends vscode.DebugConfiguration { projectRoot: string; @@ -198,7 +200,10 @@ async function resolveDeviceConfig(config: ExpoDebugConfig, project: ExpoProject workflow: device._workflow, // The address of the device to connect to - websocketAddress: `${device.webSocketDebuggerUrl}&type=vscode`, + websocketAddress: + device.webSocketDebuggerUrl + + '&type=vscode' + // Adding the "classic" `type=vscode` query parameter (SDK <=49) + `&userAgent=${encodeURIComponent(DEBUG_USER_AGENT)}`, // Adding the modern "userAgent" query parameter (SDK >=50)s // Define the required root paths to resolve source maps localRoot: project.root, From 1512045cc1be86b988ac18a6e8c7af57d0e15678 Mon Sep 17 00:00:00 2001 From: Cedric van Putten Date: Sat, 2 Dec 2023 14:18:23 +0100 Subject: [PATCH 2/2] docs: fix typo in comment --- src/expoDebuggers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/expoDebuggers.ts b/src/expoDebuggers.ts index cd2321e..cc811cf 100644 --- a/src/expoDebuggers.ts +++ b/src/expoDebuggers.ts @@ -203,7 +203,7 @@ async function resolveDeviceConfig(config: ExpoDebugConfig, project: ExpoProject websocketAddress: device.webSocketDebuggerUrl + '&type=vscode' + // Adding the "classic" `type=vscode` query parameter (SDK <=49) - `&userAgent=${encodeURIComponent(DEBUG_USER_AGENT)}`, // Adding the modern "userAgent" query parameter (SDK >=50)s + `&userAgent=${encodeURIComponent(DEBUG_USER_AGENT)}`, // Adding the modern "userAgent" query parameter (SDK >=50) // Define the required root paths to resolve source maps localRoot: project.root,