chore: update app container tokens to 0.2.0 (#2194)

* chore: experimental networking by default on recent Node versions

It's now good enough to be reasonably useful in Node.js, so turn it on by default. Still have a setting to turn it off.

* chore: update app container tokens to 0.2.0

Closes microsoft/vscode#244139

* rm outdated test

Author: connor4312

CHANGELOG.md

@@ -7,6 +7,8 @@ This changelog records changes to stable releases since 1.50.2. "TBA" changes he
 - fix: explicitly specify completion ranges ([[vscode#243409](https://github.com/microsoft/vscode/issues/243409)])
 - fix: memory leak between debug sessions ([#2173](https://github.com/microsoft/vscode-js-debug/issues/2173))
 - fix: support `npm.scriptRunner: node`
+- fix: support "attach to node process" without wmic.exe and on arm64 ([vscode#244139](https://github.com/microsoft/vscode/issues/244139))
+- fix: support webview2 debugging on arm64
 - chore: enable experimental networking by default on recent Node versions
 
 ## 1.97 (January 2025)

package-lock.json

@@ -55,7 +55,7 @@
     "@jridgewell/trace-mapping": "^0.3.22",
     "@vscode/js-debug-browsers": "^1.1.2",
     "@vscode/l10n": "^0.0.18",
-    "@vscode/win32-app-container-tokens": "^0.1.0",
+    "@vscode/win32-app-container-tokens": "^0.2.0",
     "acorn": "^8.11.3",
     "acorn-loose": "^8.4.0",
     "astring": "^1.8.6",

package.json

@@ -39,17 +39,18 @@ exports.nativeNodeModulesPlugin = () => ({
   setup(build) {
     // If a ".node" file is imported within a module in the "file" namespace, resolve
     // it to an absolute path and put it into the "node-file" virtual namespace.
-    build.onResolve({ filter: /\.node$/, namespace: 'file' }, args => ({
-      path: require.resolve(args.path, { paths: [args.resolveDir] }),
-      namespace: 'node-file',
-    }));
+    build.onResolve({ filter: /\.node$/, namespace: 'file' }, args => {
+      return ({
+        path: require.resolve(args.path, { paths: [args.resolveDir] }),
+        namespace: 'node-file',
+      });
+    });
 
     // Files in the "node-file" virtual namespace call "require()" on the
     // path from esbuild of the ".node" file in the output directory.
     build.onLoad({ filter: /.*/, namespace: 'node-file' }, args => ({
       contents: `
-        import path from ${JSON.stringify(args.path)}
-        try { module.exports = require(path) }
+        try { module.exports = require(${JSON.stringify(args.path)}) }
         catch {}
       `,
     }));
@@ -66,7 +67,7 @@ exports.nativeNodeModulesPlugin = () => ({
     // these ".node" files.
     let opts = build.initialOptions;
     opts.loader = opts.loader || {};
-    opts.loader['.node'] = 'file';
+    opts.loader['.node'] = 'copy';
   },
 });
 

src/build/esbuildPlugins.js

@@ -0,0 +1,30 @@
+/*---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------*/
+
+import type * as Win32AppContainerTokens from '@vscode/win32-app-container-tokens';
+import { once } from './objUtils';
+
+const load = once((): Promise<typeof Win32AppContainerTokens> => {
+  if (process.arch === 'arm64') {
+    return import(
+      // @ts-expect-error no types here
+      '@vscode/win32-app-container-tokens/win32-app-container-tokens.win32-arm64-msvc.node'
+    );
+  } else if (process.arch === 'x64') {
+    return import(
+      // @ts-expect-error no types here
+      '@vscode/win32-app-container-tokens/win32-app-container-tokens.win32-x64-msvc.node'
+    );
+  } else {
+    throw new Error(`Unsupported architecture ${process.arch}`);
+  }
+});
+
+export function getWinUtils() {
+  if (process.platform !== 'win32') {
+    throw new Error('Not running on Windows');
+  }
+
+  return load();
+}

src/common/win32Utils.ts

@@ -4,6 +4,7 @@
 
 import { inject, injectable, optional } from 'inversify';
 import { connect, Socket } from 'net';
+import { join } from 'path';
 import type * as vscodeType from 'vscode';
 import Connection from '../../cdp/connection';
 import { RawPipeTransport } from '../../cdp/rawPipeTransport';
@@ -12,6 +13,7 @@ import { DebugType } from '../../common/contributionUtils';
 import { ILogger } from '../../common/logging';
 import { some } from '../../common/promiseUtil';
 import { ISourcePathResolver } from '../../common/sourcePathResolver';
+import { getWinUtils } from '../../common/win32Utils';
 import { AnyLaunchConfiguration, IEdgeAttachConfiguration } from '../../configuration';
 import { noUwpPipeFound, uwpPipeNotAvailable } from '../../dap/errors';
 import { ProtocolError } from '../../dap/protocolError';
@@ -51,8 +53,8 @@ export class UWPWebviewBrowserAttacher extends BrowserAttacher<IEdgeParamsWithWe
     context: ILaunchContext,
     params: IEdgeParamsWithWebviewPipe,
   ): Promise<Connection> {
-    const { getAppContainerProcessTokens } = await import('@vscode/win32-app-container-tokens');
-    const pipeNames = getAppContainerProcessTokens(params.useWebView.pipeName);
+    const { getAppContainerProcessTokens } = await getWinUtils();
+    const pipeNames = getAppContainerProcessTokens().map(n => join(n, params.useWebView.pipeName));
     if (!pipeNames) {
       throw new ProtocolError(uwpPipeNotAvailable());
     }