Check for two error types. Make sure we do not double display an error (

#204) * Check for two error types. Make sure we do not double display an error * Import the new type checks * Change name of parameter to modal with a default of false * Update roku-deploy install
rokucommunity · Dec 11, 2024 · a114882 · a114882
1 parent cc32b3c
commit a114882
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 71 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -74,9 +74,9 @@
         "@types/request": "^2.48.8",
         "@types/semver": "^7.3.9",
         "@types/sinon": "^10.0.6",
+        "@types/yargs": "^15.0.5",
         "@typescript-eslint/eslint-plugin": "^5.27.0",
         "@typescript-eslint/parser": "^5.27.0",
-        "@types/yargs": "^15.0.5",
         "chai": "^4.3.4",
         "coveralls-next": "^4.2.0",
         "decompress": "^4.2.1",
@@ -113,7 +113,7 @@
         "postman-request": "^2.88.1-postman.40",
         "replace-in-file": "^6.3.2",
         "replace-last": "^1.2.6",
-        "roku-deploy": "^3.12.2",
+        "roku-deploy": "^3.12.3",
         "semver": "^7.5.4",
         "serialize-error": "^8.1.0",
         "smart-buffer": "^4.2.0",

diff --git a/src/debugSession/BrightScriptDebugSession.ts b/src/debugSession/BrightScriptDebugSession.ts
@@ -1,7 +1,7 @@
 import * as fsExtra from 'fs-extra';
 import { orderBy } from 'natural-orderby';
 import * as path from 'path';
-import { rokuDeploy, CompileError } from 'roku-deploy';
+import { rokuDeploy, CompileError, isUpdateCheckRequiredError, isConnectionResetError } from 'roku-deploy';
 import type { DeviceInfo, RokuDeploy, RokuDeployOptions } from 'roku-deploy';
 import {
     BreakpointEvent,
@@ -530,8 +530,7 @@ export class BrightScriptDebugSession extends BaseDebugSession {
             const statusCode = e?.results?.response?.statusCode;
             const message = e.message as string;
             if (statusCode === 401) {
-                this.showPopupMessage(message, 'error', true);
-                await this.shutdown(message);
+                await this.shutdown(message, true);
                 throw e;
             }
             this.logger.warn('Failed to delete the dev channel...probably not a big deal', e);
@@ -563,9 +562,8 @@ export class BrightScriptDebugSession extends BaseDebugSession {
         }).catch(async (e) => {
             const statusCode = e?.results?.response?.statusCode;
             const message = e.message as string;
-            if (statusCode && statusCode !== 200) {
-                this.showPopupMessage(message, 'error', true);
-                await this.shutdown(message);
+            if ((statusCode && statusCode !== 200) || isUpdateCheckRequiredError(e) || isConnectionResetError(e)) {
+                await this.shutdown(message, true);
                 throw e;
             }
             this.logger.error(e);
@@ -1277,7 +1275,7 @@ export class BrightScriptDebugSession extends BaseDebugSession {
         deferred.resolve();
     }
 
-    private async evaluateExpressionToTempVar(args: DebugProtocol.EvaluateArguments, variablePath: string[]): Promise< { evalArgs: DebugProtocol.EvaluateArguments; variablePath: string[] } > {
+    private async evaluateExpressionToTempVar(args: DebugProtocol.EvaluateArguments, variablePath: string[]): Promise<{ evalArgs: DebugProtocol.EvaluateArguments; variablePath: string[] }> {
         let returnVal = { evalArgs: args, variablePath };
         if (!variablePath && util.isAssignableExpression(args.expression)) {
             let varIndex = this.getNextVarIndex(args.frameId);
@@ -1545,7 +1543,7 @@ export class BrightScriptDebugSession extends BaseDebugSession {
      * Called when the debugger is terminated. Feel free to call this as frequently as you want; we'll only run the shutdown process the first time, and return
      * the same promise on subsequent calls
      */
-    public async shutdown(errorMessage?: string): Promise<void> {
+    public async shutdown(errorMessage?: string, modal = false): Promise<void> {
         if (this.shutdownPromise === undefined) {
             this.logger.log('[shutdown] Beginning shutdown sequence', errorMessage);
             this.shutdownPromise = this._shutdown(errorMessage);
@@ -1555,7 +1553,7 @@ export class BrightScriptDebugSession extends BaseDebugSession {
         return this.shutdownPromise;
     }
 
-    private async _shutdown(errorMessage?: string): Promise<void> {
+    private async _shutdown(errorMessage?: string, modal = false): Promise<void> {
         try {
             this.componentLibraryServer?.stop();
 
@@ -1578,7 +1576,7 @@ export class BrightScriptDebugSession extends BaseDebugSession {
             //if there was an error message, display it to the user
             if (errorMessage) {
                 this.logger.error(errorMessage);
-                this.showPopupMessage(errorMessage, 'error');
+                this.showPopupMessage(errorMessage, 'error', modal);
             }
 
             this.logger.log('Destroy rokuAdapter');