@clawchatsai/connector 0.0.55 → 0.0.57

package/dist/index.js

@@ -785,8 +785,21 @@ async function handleSetup(token) {
                 fs.mkdirSync(dataDir, { recursive: true });
                 fs.mkdirSync(uploadsDir, { recursive: true });
                 ws.close();
+                // Ask if user wants to reuse TOTP from another gateway
+                let reuseSecret;
+                if (config.schemaVersion === 1) {
+                    const rlSetup = (await import('node:readline')).createInterface({ input: process.stdin, output: process.stdout });
+                    const askSetup = (q) => new Promise(r => rlSetup.question(q, r));
+                    console.log('');
+                    console.log('  💡 Already have ClawChats on another gateway?');
+                    console.log('     Run \`openclaw clawchats show-totp\` on that machine and paste the secret below.');
+                    const reuseAnswer = await askSetup('  Paste existing TOTP secret to reuse it (or press Enter to set up new): ');
+                    rlSetup.close();
+                    if (reuseAnswer.trim())
+                        reuseSecret = reuseAnswer.trim();
+                }
                 // Enroll TOTP (interactive — requires stdin)
-                const totpOk = await enrollTotp(config);
+                const totpOk = await enrollTotp(config, reuseSecret);
                 if (!totpOk) {
                     console.log('');
                     console.log('  ⚠️  TOTP not configured. You can set it up later with: openclaw clawchats reauth');
@@ -813,29 +826,38 @@ async function handleSetup(token) {
         });
     });
 }
-async function enrollTotp(config) {
+async function enrollTotp(config, existingSecret) {
     const readline = await import('node:readline');
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     const ask = (q) => new Promise(r => rl.question(q, r));
     try {
-        // Generate TOTP secret
-        const totpSecret = generateTotpSecret();
-        const email = config.google?.authorizedEmail || config.userId;
-        const otpauthUri = buildOtpauthUri(totpSecret, email);
-        // Format secret with spaces for readability
-        const formatted = totpSecret.match(/.{1,4}/g)?.join(' ') || totpSecret;
-        console.log('');
-        console.log('  🔐 Setting up two-factor authentication');
-        console.log('');
-        console.log('  Open this link to scan the QR code with your authenticator app:');
-        console.log(`  ${config.serverUrl.replace('wss://', 'https://').replace(/\/ws\/?$/, '')}/totp-setup#${totpSecret}`);
-        console.log('');
-        console.log(`  Or enter this code manually: ${formatted}`);
-        console.log('');
-        console.log("  Don't have an authenticator app?");
-        console.log('  Google Authenticator: https://apps.apple.com/app/google-authenticator/id388497605');
-        console.log('                        https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2');
-        console.log('');
+        let totpSecret;
+        if (existingSecret) {
+            // Reusing secret from another gateway — strip spaces, uppercase
+            totpSecret = existingSecret.replace(/\s+/g, '').toUpperCase();
+            console.log('');
+            console.log('  🔐 Verifying existing TOTP secret…');
+            console.log('');
+        }
+        else {
+            // Generate a brand new TOTP secret
+            totpSecret = generateTotpSecret();
+            const email = config.google?.authorizedEmail || config.userId;
+            void buildOtpauthUri(totpSecret, email); // keep import used
+            const formatted = totpSecret.match(/.{1,4}/g)?.join(' ') || totpSecret;
+            console.log('');
+            console.log('  🔐 Setting up two-factor authentication');
+            console.log('');
+            console.log('  Open this link to scan the QR code with your authenticator app:');
+            console.log(`  ${config.serverUrl.replace('wss://', 'https://').replace(/\/ws\/?$/, '')}/totp-setup#${totpSecret}`);
+            console.log('');
+            console.log(`  Or enter this code manually: ${formatted}`);
+            console.log('');
+            console.log("  Don't have an authenticator app?");
+            console.log('  Google Authenticator: https://apps.apple.com/app/google-authenticator/id388497605');
+            console.log('                        https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2');
+            console.log('');
+        }
         // Verification loop
         let verified = false;
         for (let attempt = 0; attempt < 5; attempt++) {
@@ -886,6 +908,27 @@ async function enrollTotp(config) {
         return false;
     }
 }
+async function handleShowTotp() {
+    const config = loadConfig();
+    if (!config) {
+        console.error('ClawChats not configured. Run: openclaw clawchats setup <token>');
+        return;
+    }
+    if (!config.totp?.secret) {
+        console.error('No TOTP secret found. Run: openclaw clawchats reauth to set one up first.');
+        return;
+    }
+    console.log('');
+    console.log('Your TOTP secret (account-level, keep this safe):');
+    console.log('');
+    console.log(`  ${config.totp.secret}`);
+    console.log('');
+    console.log('To reuse this on a new gateway:');
+    console.log('  1. Generate a setup token at login.clawchats.ai/dashboard');
+    console.log('  2. On the new machine: openclaw clawchats setup <token>');
+    console.log('  3. When prompted for a TOTP secret, paste the value above');
+    console.log('');
+}
 async function handleReauth() {
     const config = loadConfig();
     if (!config) {
@@ -896,7 +939,16 @@ async function handleReauth() {
     console.log('');
     console.log('  ⚠️  This will invalidate all existing sessions.');
     console.log('  All connected browsers will need to re-authenticate.');
-    const success = await enrollTotp(config);
+    console.log('');
+    const readline = await import('node:readline');
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const ask = (q) => new Promise(r => rl.question(q, r));
+    let existingSecret;
+    const reuseAnswer = await ask('  Reuse TOTP from another gateway? Paste secret (or press Enter to generate new): ');
+    rl.close();
+    if (reuseAnswer.trim())
+        existingSecret = reuseAnswer.trim();
+    const success = await enrollTotp(config, existingSecret);
     if (success) {
         console.log('  All previous sessions have been invalidated.');
         console.log('  Restart the gateway for changes to take effect: systemctl --user restart openclaw-gateway');
@@ -1073,6 +1125,9 @@ const plugin = {
             cmd.command('reauth')
                 .description('Reset two-factor authentication (new TOTP secret + invalidate sessions)')
                 .action(() => handleReauth());
+            cmd.command('show-totp')
+                .description('Show your TOTP secret (use when adding ClawChats to a second gateway)')
+                .action(() => handleShowTotp());
             cmd.command('reset')
                 .description('Disconnect and remove all ClawChats data')
                 .action(() => handleReset());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawchatsai/connector",
-  "version": "0.0.55",
+  "version": "0.0.57",
   "type": "module",
   "description": "ClawChats OpenClaw plugin — P2P tunnel + local API bridge",
   "main": "dist/index.js",