Send proper unverified exception breakpoints when not supported on th…

…e device
rokucommunity · Nov 25, 2024 · 6ad38aa · 6ad38aa
1 parent 5e8f77f
commit 6ad38aa
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/src/adapters/DebugProtocolAdapter.ts b/src/adapters/DebugProtocolAdapter.ts
@@ -142,6 +142,13 @@ export class DebugProtocolAdapter {
         }, 0);
     }
 
+    /**
+     * Does the current client support exception breakpoints? This value will be undefined if the client has not yet connected
+     */
+    public get supportsExceptionBreakpoints(): boolean | undefined {
+        return this.client?.supportsExceptionBreakpoints;
+    }
+
     /**
      * The debugger needs to tell us when to be active (i.e. when the package was deployed)
      */

diff --git a/src/adapters/TelnetAdapter.ts b/src/adapters/TelnetAdapter.ts
@@ -71,6 +71,8 @@ export class TelnetAdapter {
      */
     public supportsExecute = true;
 
+    public supportsExceptionBreakpoints = false;
+
     public once(eventName: 'app-ready'): Promise<void>;
     public once(eventName: 'connected'): Promise<boolean>;
     public once(eventName: string) {

diff --git a/src/debugProtocol/client/DebugProtocolClient.ts b/src/debugProtocol/client/DebugProtocolClient.ts
@@ -260,7 +260,7 @@ export class DebugProtocolClient {
             this.emit('data', data);
             //queue up processing the new data, chunk by chunk
             void this.bufferQueue.run(async () => {
-                this.buffer = Buffer.concat([this.buffer, data]);
+                this.buffer = Buffer.concat([this.buffer, data] as any[]);
                 while (this.buffer.length > 0 && await this.process()) {
                     //the loop condition is the actual work
                 }
@@ -995,9 +995,8 @@ export class DebugProtocolClient {
                 return response;
             case UpdateType.ExceptionBreakpointError:
                 //we do nothing with exception breakpoint errors at this time.
-                const update = ExceptionBreakpointErrorUpdate.fromBuffer(buffer);
-                this.logger.error('Exception breakpoint error occurred', update);
-                return update;
+                const exceptionBreakpointErrorUpdate = ExceptionBreakpointErrorUpdate.fromBuffer(buffer);
+                return exceptionBreakpointErrorUpdate;
             default:
                 return undefined;
         }

diff --git a/src/debugSession/BrightScriptDebugSession.ts b/src/debugSession/BrightScriptDebugSession.ts
@@ -258,19 +258,26 @@ export class BrightScriptDebugSession extends BaseDebugSession {
             //ensure the rokuAdapter is loaded
             await this.getRokuAdapter();
 
-            await this.rokuAdapter.setExceptionBreakpoints(filterOptions);
-            //if success
-            response.body.breakpoints = [
-                { verified: true },
-                { verified: true }
-            ];
+            if (this.rokuAdapter.supportsExceptionBreakpoints) {
+                await this.rokuAdapter.setExceptionBreakpoints(filterOptions);
+                //if success
+                response.body.breakpoints = [
+                    { verified: true },
+                    { verified: true }
+                ];
+            } else {
+                response.body.breakpoints = [
+                    { verified: false },
+                    { verified: false }
+                ];
+            }
         } catch (e) {
             //if error (or not supported)
             response.body.breakpoints = [
                 { verified: false },
                 { verified: false }
             ];
-            console.error(e);
+            this.logger.error('Failed to set exception breakpoints', e);
         } finally {
             this.sendResponse(response);
         }