lunel-cli 0.1.77 → 0.1.78

package/dist/index.js

@@ -2758,8 +2758,41 @@ async function registerPersistentPairing(phoneId) {
         pairedAt: normalized.pairedAt,
         lastUsedAt: normalized.lastUsedAt,
     });
+    currentSessionPassword = normalized.secret;
     return normalized;
 }
+async function lookupPersistentPairings() {
+    const config = await getCliConfig();
+    const response = await fetch(`${MANAGER_URL}/v1/pairings/lookup`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+            pcId: config.deviceId,
+            root: ROOT_DIR,
+        }),
+    });
+    if (!response.ok) {
+        throw new Error(`Failed to look up persistent pairings (${response.status})`);
+    }
+    const payload = await response.json();
+    const pairings = Array.isArray(payload.pairings) ? payload.pairings : [];
+    return pairings
+        .filter((entry) => (entry &&
+        typeof entry.secret === "string" &&
+        typeof entry.hostname === "string" &&
+        typeof entry.root === "string" &&
+        typeof entry.phoneId === "string" &&
+        typeof entry.pairedAt === "number" &&
+        typeof entry.lastUsedAt === "number"))
+        .map((entry) => ({
+        secret: entry.secret,
+        root: normalizePairingRoot(entry.root),
+        hostname: entry.hostname,
+        phoneId: entry.phoneId,
+        pairedAt: entry.pairedAt,
+        lastUsedAt: entry.lastUsedAt,
+    }));
+}
 function displayQR(primaryGateway, backupGateway, code) {
     console.log("\n");
     qrcode.generate(code, { small: true }, (qr) => {
@@ -2876,9 +2909,13 @@ async function connectWebSocket() {
                             if (message.type === "connected")
                                 return;
                             if (message.type === "session_password" && message.password) {
+                                const nextPassword = message.password;
+                                if (currentSessionPassword && currentSessionPassword.length > nextPassword.length) {
+                                    return;
+                                }
                                 if (!currentSessionPassword)
                                     resetReplayBuffer(); // new session
-                                currentSessionPassword = message.password;
+                                currentSessionPassword = nextPassword;
                                 console.log("[session] received reconnect password");
                                 return;
                             }
@@ -3107,7 +3144,19 @@ async function main() {
             console.log(`[cloud] Connected to session ${session.code} via ${session.primary}`);
         }
         else {
-            const savedPairing = await getSavedPairingForRoot(ROOT_DIR);
+            let savedPairing = await getSavedPairingForRoot(ROOT_DIR);
+            if (!savedPairing) {
+                try {
+                    const remotePairings = await lookupPersistentPairings();
+                    for (const pairing of remotePairings) {
+                        await savePairing(pairing);
+                    }
+                    savedPairing = remotePairings.sort((a, b) => b.lastUsedAt - a.lastUsedAt)[0] || null;
+                }
+                catch {
+                    // fall back to QR
+                }
+            }
             if (savedPairing) {
                 try {
                     const resolved = await resolveSessionByResumeToken(savedPairing.secret);
@@ -3117,14 +3166,48 @@ async function main() {
                     }
                     else {
                         await removePairing(savedPairing.secret);
-                        session = await createSessionFromManager();
-                        displayQR(normalizeGatewayUrl(session.primary), session.backup ? normalizeGatewayUrl(session.backup) : null, session.code);
+                        const remotePairings = await lookupPersistentPairings().catch(() => []);
+                        const fallbackPairing = remotePairings.sort((a, b) => b.lastUsedAt - a.lastUsedAt)[0] || null;
+                        if (fallbackPairing) {
+                            await savePairing(fallbackPairing);
+                            const fallbackResolved = await resolveSessionByResumeToken(fallbackPairing.secret);
+                            if (fallbackResolved) {
+                                session = fallbackResolved;
+                                console.log(`[pairing] Waiting on saved connection for ${fallbackPairing.hostname}`);
+                            }
+                            else {
+                                await removePairing(fallbackPairing.secret);
+                                session = await createSessionFromManager();
+                                displayQR(normalizeGatewayUrl(session.primary), session.backup ? normalizeGatewayUrl(session.backup) : null, session.code);
+                            }
+                        }
+                        else {
+                            session = await createSessionFromManager();
+                            displayQR(normalizeGatewayUrl(session.primary), session.backup ? normalizeGatewayUrl(session.backup) : null, session.code);
+                        }
                     }
                 }
                 catch {
                     await removePairing(savedPairing.secret);
-                    session = await createSessionFromManager();
-                    displayQR(normalizeGatewayUrl(session.primary), session.backup ? normalizeGatewayUrl(session.backup) : null, session.code);
+                    const remotePairings = await lookupPersistentPairings().catch(() => []);
+                    const fallbackPairing = remotePairings.sort((a, b) => b.lastUsedAt - a.lastUsedAt)[0] || null;
+                    if (fallbackPairing) {
+                        await savePairing(fallbackPairing);
+                        const fallbackResolved = await resolveSessionByResumeToken(fallbackPairing.secret);
+                        if (fallbackResolved) {
+                            session = fallbackResolved;
+                            console.log(`[pairing] Waiting on saved connection for ${fallbackPairing.hostname}`);
+                        }
+                        else {
+                            await removePairing(fallbackPairing.secret);
+                            session = await createSessionFromManager();
+                            displayQR(normalizeGatewayUrl(session.primary), session.backup ? normalizeGatewayUrl(session.backup) : null, session.code);
+                        }
+                    }
+                    else {
+                        session = await createSessionFromManager();
+                        displayQR(normalizeGatewayUrl(session.primary), session.backup ? normalizeGatewayUrl(session.backup) : null, session.code);
+                    }
                 }
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunel-cli",
-  "version": "0.1.77",
+  "version": "0.1.78",
   "author": [
     {
       "name": "Soham Bharambe",