Merge pull request #1378 from microsoft/fix/wd-request-loop

fix: request loop on certain kinds of Node.js attach failures

Author: connor4312

CHANGELOG.md

@@ -4,7 +4,7 @@ This changelog records changes to stable releases since 1.50.2. "TBA" changes he
 
 ## Nightly (only)
 
-Nothing yet...
+- fix: request loop on certain kinds of Node.js attach failures ([vscode#156810](https://github.com/microsoft/vscode/issues/156810))
 
 ## v1.71 (August 2022)
 

src/cdp/webSocketTransport.ts

@@ -7,9 +7,12 @@ import WebSocket from 'ws';
 import { CancellationTokenSource, timeoutPromise } from '../common/cancellation';
 import { EventEmitter } from '../common/events';
 import { HrTime } from '../common/hrnow';
+import { delay } from '../common/promiseUtil';
 import { isLoopback } from '../common/urlUtils';
 import { ITransport } from './transport';
 
+const maxRetryInterval = 50;
+
 export class WebSocketTransport implements ITransport {
   private _ws: WebSocket | undefined;
   private readonly messageEmitter = new EventEmitter<[string, HrTime]>();
@@ -29,6 +32,7 @@ export class WebSocketTransport implements ITransport {
     const targetAddressIsLoopback = await isLoopback(url);
 
     while (true) {
+      const dontRetryBefore = Date.now() + maxRetryInterval;
       try {
         const options = {
           headers: { host: 'localhost' },
@@ -64,6 +68,11 @@ export class WebSocketTransport implements ITransport {
         if (cancellationToken.isCancellationRequested) {
           throw err;
         }
+
+        const retryIn = dontRetryBefore - Date.now();
+        if (retryIn > 0) {
+          await delay(retryIn);
+        }
       }
     }
   }

src/targets/node/autoAttachLauncher.ts

@@ -220,7 +220,10 @@ export class AutoAttachLauncher
       ...data,
       ipcAddress: this.run.serverAddress, // may be outdated from a previous set of vars
     });
-    wd.onEnd(() => this.telemetryItems.delete(pid));
+    wd.onEnd(() => {
+      this.telemetryItems.delete(pid);
+      wd.dispose();
+    });
   }
 
   public static clearVariables(context: vscode.ExtensionContext) {

src/targets/node/program.ts

@@ -106,7 +106,10 @@ export class StubProgram implements IProgram {
 export class WatchDogProgram extends StubProgram {
   constructor(private readonly wd: WatchDog) {
     super();
-    wd.onEnd(this.stopDefer);
+    wd.onEnd(data => {
+      this.stopDefer(data);
+      this.wd.dispose();
+    });
   }
 
   public stop() {

src/targets/node/watchdogSpawn.ts

@@ -7,7 +7,7 @@ import Cdp from '../../cdp/api';
 import { RawPipeTransport } from '../../cdp/rawPipeTransport';
 import { ITransport } from '../../cdp/transport';
 import { WebSocketTransport } from '../../cdp/webSocketTransport';
-import { NeverCancelled } from '../../common/cancellation';
+import { CancellationTokenSource } from '../../common/cancellation';
 import { IDisposable } from '../../common/disposable';
 import { EventEmitter } from '../../common/events';
 import { Logger } from '../../common/logging/logger';
@@ -70,6 +70,7 @@ const enum Method {
 
 export class WatchDog implements IDisposable {
   private readonly onEndEmitter = new EventEmitter<IStopMetadata>();
+  private readonly cts = new CancellationTokenSource();
   private target?: WebSocketTransport;
   private gracefulExit = false;
   private targetAlive = false;
@@ -150,6 +151,7 @@ export class WatchDog implements IDisposable {
    */
   public dispose() {
     this.gracefulExit = true;
+    this.cts.dispose(true);
     this.disposeTarget();
     this.server.dispose(); // will cause the end emitter to fire after teardown finishes
   }
@@ -188,7 +190,7 @@ export class WatchDog implements IDisposable {
 
   private async createTarget() {
     this.gracefulExit = false; // reset
-    const target = await WebSocketTransport.create(this.info.inspectorURL, NeverCancelled);
+    const target = await WebSocketTransport.create(this.info.inspectorURL, this.cts.token);
     target.onMessage(([data]) => this.server.send(data));
     target.onEnd(() => {
       if (target) {

src/test/infra/infra-initialize.txt

@@ -33,6 +33,7 @@
     supportsCompletionsRequest : true
     supportsConditionalBreakpoints : true
     supportsConfigurationDoneRequest : true
+    supportsDebuggerProperties : true
     supportsDelayedStackTraceLoading : true
     supportsEvaluateForHovers : true
     supportsExceptionFilterOptions : true