Merge pull request #268 from Open-STEM/FranksDev

STOP button and Google login robustness

Author: fgrossman

src/connections/connection.ts

@@ -648,6 +648,7 @@ abstract class Connection {
         this.startReaduntil("KeyboardInterrupt:");
         await this.writeToDevice("\r" + this.CTRL_CMD_KINTERRUPT);  // ctrl-C to interrupt any running program
         let result = await this.haltUntilRead(1, 20);
+    
         if (result == undefined) {
             this.startReaduntil(">>>");
             await this.writeToDevice("\r" + this.CTRL_CMD_NORMALMODE);  // ctrl-C to interrupt any running program
@@ -656,17 +657,22 @@ abstract class Connection {
                 return true;
             }
         }
+    
         //try multiple times to get to the prompt
         let gotToPrompt = false;
         for (let i = 0; i < 20; i++) {
             this.startReaduntil(">>>");
-            await this.writeToDevice("\r" + this.CTRL_CMD_KINTERRUPT);
-            result = await this.haltUntilRead(2, 5); //this should be fast
+            await this.writeToDevice("\r" + this.CTRL_CMD_KINTERRUPT + this.CTRL_CMD_KINTERRUPT);
+            result = await this.haltUntilRead(0, 5); //this should be fast
             if (result != undefined && result.length > 0) {
                 gotToPrompt = true;
                 break;
             }
         }
+
+        this.startReaduntil(">>>");
+        await this.writeToDevice("\r" + this.CTRL_CMD_NORMALMODE);  // ctrl-C to interrupt any running program
+        result = await this.haltUntilRead(1, 20);
         return gotToPrompt;
     }
     async prepareForStop() {

src/services/google-auth.ts

@@ -126,6 +126,25 @@ class GoogleAuthService {
         }
     }
 
+    /**
+     * Wait until the backend handshake token is available before exchanging OAuth codes.
+     */
+    async ensureHandshakeReady(): Promise<void> {
+        if (this._handshakeToken) {
+            return;
+        }
+        const maxAttempts = 15;
+        const delayMs = 200;
+        for (let attempt = 0; attempt < maxAttempts; attempt++) {
+            await this.initHandshake();
+            if (this._handshakeToken) {
+                return;
+            }
+            await new Promise((resolve) => setTimeout(resolve, delayMs));
+        }
+        throw new Error('Google Auth handshake not ready');
+    }
+
     /**
      * Refreshes the access token using the stored refresh token.
      * @returns A Promise that resolves to the new access token.
@@ -226,8 +245,12 @@ class GoogleAuthService {
      * @returns A Promise that resolves to an object containing access_token, refresh_token, and expires_in.
      */
     async getRefreshToken() {
-        if (!this._handshakeToken || !this._code) {
-            throw new Error('Handshake token or authorization code not available.');
+        if (!this._code) {
+            throw new Error('Authorization code not available.');
+        }
+        await this.ensureHandshakeReady();
+        if (!this._handshakeToken) {
+            throw new Error('Handshake token not available.');
         }
 
         try {

src/utils/i18n/locales/en/en.json

@@ -107,6 +107,7 @@
     "user-folder": "User Folder Name",
     "google-drive-folder": "Google Drive Folder Name",
     "googleLoginTooltip": "Sign in with your Google account to access files stored in Google Drive.",
+    "googleSigningIn": "Signing in...",
     "googlogoutTooltip": "Sign out of your Google account.",
     "not-google-drive-file": "This file can not be saved to Google Drive because it was not associated with Google Drive! Please try saving it to XRP!",
     "editGoogleLoginRequired": "This file is stored in Google Drive. Please sign back in to Google Drive to edit and save it.",

src/utils/i18n/locales/es/es.json

@@ -191,6 +191,7 @@
     "username": "Nombre de Usuario",
     "googlesignin": "Iniciar sesión con Google",
     "googleLoginTooltip": "Inicie sesión con su cuenta de Google para acceder a los archivos almacenados en Google Drive.",
+    "googleSigningIn": "Iniciando sesión...",
     "googlogoutTooltip": "Cerrar sesión de su cuenta de Google.",
     "login": "Inicio de Sesión de Google",
     "login-desc": "El modo de usuario está configurado actualmente en Usuario de Google. Por favor inicie sesión en su cuenta de Google para editar sus archivos. Haga clic en el botón Iniciar Sesión en Google a continuación.",