resume screenshot capture after onDidTerminateDebugSession

rokucommunity · Mar 1, 2024 · 0692b1b · 0692b1b
1 parent ac68702
commit 0692b1b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -190,6 +190,7 @@ export class Extension {
                 if (config.remoteControlMode?.deactivateOnSessionEnd) {
                     void this.remoteControlManager.setRemoteControlMode(false, 'launch');
                 }
+                this.webviewViewProviderManager.onDidTerminateDebugSession(e);
             }
             this.diagnosticManager.clear();
         });

diff --git a/src/managers/WebviewViewProviderManager.ts b/src/managers/WebviewViewProviderManager.ts
@@ -67,6 +67,12 @@ export class WebviewViewProviderManager {
         }
     }
 
+    public onDidTerminateDebugSession(e: vscode.DebugSession) {
+        for (const webview of this.webviewViews) {
+            webview.provider.onDidTerminateDebugSession(e);
+        }
+    }
+
     // Notification from extension
     public onChannelPublishedEvent(e: ChannelPublishedEvent) {
         const config = e.body.launchConfiguration as BrightScriptLaunchConfiguration;

diff --git a/src/viewProviders/BaseWebviewViewProvider.ts b/src/viewProviders/BaseWebviewViewProvider.ts
@@ -48,7 +48,11 @@ export abstract class BaseWebviewViewProvider implements vscode.WebviewViewProvi
     }
 
     public onDidStartDebugSession(e: vscode.DebugSession) {
-        // Can be overwritten in a child to notify on channel publish
+        // Can be overwritten in a child to notify on debug session start
+    }
+
+    public onDidTerminateDebugSession(e: vscode.DebugSession) {
+        // Can be overwritten in a child to notify on debug session end
     }
 
     public onChannelPublishedEvent(e: ChannelPublishedEvent) {

diff --git a/src/viewProviders/RokuDeviceViewViewProvider.ts b/src/viewProviders/RokuDeviceViewViewProvider.ts
@@ -9,6 +9,7 @@ export class RokuDeviceViewViewProvider extends BaseRdbViewProvider {
     public readonly id = ViewProviderId.rokuDeviceView;
 
     private temporarilyDisableScreenshotCapture = false;
+    private resumeScreenshotCapture: () => void | undefined;
 
     constructor(context: vscode.ExtensionContext, dependencies) {
         super(context, dependencies);
@@ -28,7 +29,10 @@ export class RokuDeviceViewViewProvider extends BaseRdbViewProvider {
             try {
                 if (this.temporarilyDisableScreenshotCapture) {
                     // Sometimes we need to temporarily stop screenshot capture as it can prevent successful package deployment to the device
-                    return;
+                    // Originally was just returning true here but now we just pause until we resume capturing
+                    await new Promise<void>((resolve) => {
+                        this.resumeScreenshotCapture = resolve;
+                    });
                 }
                 const result = await this.dependencies.rtaManager.device.getScreenshot();
                 this.postOrQueueMessage({
@@ -54,7 +58,14 @@ export class RokuDeviceViewViewProvider extends BaseRdbViewProvider {
         this.temporarilyDisableScreenshotCapture = true;
     }
 
+    public onDidTerminateDebugSession(e: vscode.DebugSession) {
+        // In case we failed to start debugging we want to allow screenshots again
+        this.temporarilyDisableScreenshotCapture = false;
+        this.resumeScreenshotCapture?.();
+    }
+
     public onChannelPublishedEvent(e: ChannelPublishedEvent) {
         this.temporarilyDisableScreenshotCapture = false;
+        this.resumeScreenshotCapture?.();
     }
 }