pal-explorer-cli 0.4.12 → 0.4.14

package/lib/commands/nearby.js

@@ -1,108 +1,108 @@
-import chalk from 'chalk';
-import fs from 'fs';
-import path from 'path';
-import { Bonjour } from 'bonjour-service';
-import { getIdentity } from '../core/identity.js';
-import { getFriends, saveFriends } from '../core/users.js';
-import config from '../utils/config.js';
-
-export default function nearbyCommand(program) {
-  program
-    .command('nearby')
-    .description('discover nearby Palexplorer users on the LAN via mDNS')
-    .option('--add', 'Auto-add found peers as pals')
-    .option('--time <seconds>', 'How long to scan (default: 10)', '10')
-    .addHelpText('after', `
-Examples:
-  $ pe nearby                       Discover pals on local network
-  $ pe nearby --add                 Auto-add discovered pals
-  $ pe nearby --time 30             Scan for 30 seconds
-`)
-    .action(async (opts) => {
-      const identity = await getIdentity();
-      if (!identity) {
-        console.log(chalk.red('No identity found. Run `pe init <name>` first.'));
-        process.exitCode = 1;
-        return;
-      }
-
-      const scanTime = parseInt(opts.time, 10) || 10;
-      const bonjour = new Bonjour();
-      const found = [];
-
-      console.log(chalk.cyan(`Scanning for nearby pals (${scanTime}s)...`));
-      const pkShort = identity.publicKey.slice(0, 8) + '...';
-      const handleStr = identity.handle ? ` (@${identity.handle})` : '';
-      console.log(chalk.gray(`Advertising as: ${identity.name}${handleStr} [pk: ${pkShort}]`));
-      console.log('');
-
-      // Skip mDNS publish if daemon is already running (avoids "Service name already in use")
-      let service = null;
-      const pidPath = path.join(path.dirname(config.path), 'serve.pid');
-      const daemonRunning = fs.existsSync(pidPath);
-      if (!daemonRunning) {
-        try {
-          service = bonjour.publish({
-            name: `palexplorer-${identity.handle || identity.publicKey.slice(0, 8)}`,
-            type: 'palexplorer',
-            port: 7474,
-            txt: {
-              pk: identity.publicKey,
-              h: identity.handle || '',
-              n: identity.name || ''
-            }
-          });
-          service.on('error', () => { service = null; });
-        } catch {
-          // Publish failed — scan-only mode
-        }
-      }
-
-      const browser = bonjour.find({ type: 'palexplorer' }, (svc) => {
-        const txt = svc.txt || {};
-        const pk = txt.pk;
-        if (!pk || pk === identity.publicKey) return;
-
-        if (found.find(f => f.pk === pk)) return;
-
-        const name = txt.n || 'Unknown';
-        const handle = txt.h || null;
-        const ip = (svc.addresses && svc.addresses[0]) || svc.host || 'unknown';
-
-        found.push({ pk, name, handle, ip });
-
-        const handleDisplay = handle ? ` (@${handle})` : '';
-        console.log(chalk.green(`Found: ${name}${handleDisplay} - ${ip}`));
-
-        const invitePayload = 'pal://' + Buffer.from(JSON.stringify({ pk, h: handle || null, n: name })).toString('base64url');
-        console.log(chalk.gray(`  → pe pal add ${invitePayload}`));
-
-        if (opts.add) {
-          if (!/^[0-9a-f]{64}$/i.test(pk)) {
-            console.log(chalk.yellow(`  (skipped: invalid public key from mDNS)`));
-          } else {
-            const friends = getFriends();
-            const already = friends.find(f => f.id === pk);
-            if (already) {
-              console.log(chalk.yellow(`  (already in your pal list as '${already.name}')`));
-            } else {
-              const palName = name || handle || 'Nearby Pal';
-              friends.push({ id: pk, name: palName, handle: handle || null, addedAt: new Date().toISOString() });
-              saveFriends(friends);
-              console.log(chalk.green(`  ✔ Auto-added: ${palName}${handle ? ` (@${handle})` : ''}`));
-            }
-          }
-        }
-      });
-
-      await new Promise(resolve => setTimeout(resolve, scanTime * 1000));
-
-      browser.stop();
-      if (service) service.stop();
-      bonjour.destroy();
-
-      if (found.length === 0) {
-        console.log(chalk.gray('No nearby pals found.'));
-      }
-    });
-}
+import chalk from 'chalk';
+import fs from 'fs';
+import path from 'path';
+import { Bonjour } from 'bonjour-service';
+import { getIdentity } from '../core/identity.js';
+import { getFriends, saveFriends } from '../core/users.js';
+import config from '../utils/config.js';
+
+export default function nearbyCommand(program) {
+  program
+    .command('nearby')
+    .description('discover nearby Palexplorer users on the LAN via mDNS')
+    .option('--add', 'Auto-add found peers as pals')
+    .option('--time <seconds>', 'How long to scan (default: 10)', '10')
+    .addHelpText('after', `
+Examples:
+  $ pal nearby                       Discover pals on local network
+  $ pal nearby --add                 Auto-add discovered pals
+  $ pal nearby --time 30             Scan for 30 seconds
+`)
+    .action(async (opts) => {
+      const identity = await getIdentity();
+      if (!identity) {
+        console.log(chalk.red('No identity found. Run `pal init <name>` first.'));
+        process.exitCode = 1;
+        return;
+      }
+
+      const scanTime = parseInt(opts.time, 10) || 10;
+      const bonjour = new Bonjour();
+      const found = [];
+
+      console.log(chalk.cyan(`Scanning for nearby pals (${scanTime}s)...`));
+      const pkShort = identity.publicKey.slice(0, 8) + '...';
+      const handleStr = identity.handle ? ` (@${identity.handle})` : '';
+      console.log(chalk.gray(`Advertising as: ${identity.name}${handleStr} [pk: ${pkShort}]`));
+      console.log('');
+
+      // Skip mDNS publish if daemon is already running (avoids "Service name already in use")
+      let service = null;
+      const pidPath = path.join(path.dirname(config.path), 'serve.pid');
+      const daemonRunning = fs.existsSync(pidPath);
+      if (!daemonRunning) {
+        try {
+          service = bonjour.publish({
+            name: `palexplorer-${identity.handle || identity.publicKey.slice(0, 8)}`,
+            type: 'palexplorer',
+            port: 7474,
+            txt: {
+              pk: identity.publicKey,
+              h: identity.handle || '',
+              n: identity.name || ''
+            }
+          });
+          service.on('error', () => { service = null; });
+        } catch {
+          // Publish failed — scan-only mode
+        }
+      }
+
+      const browser = bonjour.find({ type: 'palexplorer' }, (svc) => {
+        const txt = svc.txt || {};
+        const pk = txt.pk;
+        if (!pk || pk === identity.publicKey) return;
+
+        if (found.find(f => f.pk === pk)) return;
+
+        const name = txt.n || 'Unknown';
+        const handle = txt.h || null;
+        const ip = (svc.addresses && svc.addresses[0]) || svc.host || 'unknown';
+
+        found.push({ pk, name, handle, ip });
+
+        const handleDisplay = handle ? ` (@${handle})` : '';
+        console.log(chalk.green(`Found: ${name}${handleDisplay} - ${ip}`));
+
+        const invitePayload = 'pal://' + Buffer.from(JSON.stringify({ pk, h: handle || null, n: name })).toString('base64url');
+        console.log(chalk.gray(`  → pal pal add ${invitePayload}`));
+
+        if (opts.add) {
+          if (!/^[0-9a-f]{64}$/i.test(pk)) {
+            console.log(chalk.yellow(`  (skipped: invalid public key from mDNS)`));
+          } else {
+            const friends = getFriends();
+            const already = friends.find(f => f.id === pk);
+            if (already) {
+              console.log(chalk.yellow(`  (already in your pal list as '${already.name}')`));
+            } else {
+              const palName = name || handle || 'Nearby Pal';
+              friends.push({ id: pk, name: palName, handle: handle || null, addedAt: new Date().toISOString() });
+              saveFriends(friends);
+              console.log(chalk.green(`  ✔ Auto-added: ${palName}${handle ? ` (@${handle})` : ''}`));
+            }
+          }
+        }
+      });
+
+      await new Promise(resolve => setTimeout(resolve, scanTime * 1000));
+
+      browser.stop();
+      if (service) service.stop();
+      bonjour.destroy();
+
+      if (found.length === 0) {
+        console.log(chalk.gray('No nearby pals found.'));
+      }
+    });
+}