Fixing first install

tuzig · Aug 22, 2024 · 9717846 · 9717846
1 parent 4dd25b3
commit 9717846
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/aatp/common/utils.ts b/aatp/common/utils.ts
@@ -36,10 +36,9 @@ export async function getTWRBuffer(page) {
         }
         return ret.trimEnd()
     })
-    console.log("--> b4 trimming:", ret)
     ret = ret.substring(checkedC)
+    console.log("TWR: ", ret)
     checkedC = ret.length
-    console.log("TWR", ret)
     return ret
 }
 export function webexecReset(uid: string) {

diff --git a/aatp/ui/ui.spec.ts b/aatp/ui/ui.spec.ts
@@ -151,7 +151,7 @@ insecure=true`)
         await page.keyboard.type("hide")
         await page.keyboard.press("Enter")
     })
-    test('connect to gate with no webexec', async () => {
+    test('connect to gate with no webexec, get install command', async () => {
         await runSSHCommand(webexecSSHConfig, "webexec stop")
         await connectFirstGate(page)
         await sleep(1000)

diff --git a/src/commands.ts b/src/commands.ts
@@ -786,17 +786,7 @@ export async function installCMD(shell: Shell, args: string[]) {
         return
     }
 
-    let uid = ""
-    try {
-        uid  = await terminal7.pb.getUID()
-    } catch(e) {
-        terminal7.log("getUID returned an error", e)
-    }
-    if (!uid && native) {
-        shell.t.writeln("Error connecting to PeerBook")
-        shell.t.writeln("Please try again or `support`")
-        return
-    }
+    const uid = terminal7.pb.uid
     let gate: Gate
 
     if (args[0]) {

diff --git a/src/shell.ts b/src/shell.ts
@@ -512,14 +512,18 @@ export class Shell {
         if (failure == Failure.TimedOut)
             // hourglass emojy: 🍒
             gate.notify("🍒 Connection timed out")
-        else
+        else if (failure == Failure.NotSupported) {
+            gate.notify("WebRTC agent unreachable")
+        } else
             gate.notify(`Connect failed: ${failure || "Lost Connection"}`)
+
+        this.stopWatchdog()
+        console.log("onDisconnect", gate.firstConnection)
         if (gate.firstConnection) {
             this.onFirstConnectionDisconnect(gate)
             return
         }
 
-        this.stopWatchdog()
         let res: string
         try {
             res = await this.runForm(this.reconnectForm, "menu")