pal-explorer-cli 0.4.12 → 0.4.13

package/lib/commands/download.js

@@ -1,226 +1,240 @@
-import WebTorrent from 'webtorrent';
-import chalk from 'chalk';
-import ora from 'ora';
-import path from 'path';
-import { trackTransfer, getTransfers, completeTransfer } from '../core/transfers.js';
-import { getIdentity } from '../core/identity.js';
-import { decryptFromDownload, getDecryptedDownloadDir } from '../crypto/streamEncryption.js';
-import logger from '../utils/logger.js';
-import { getNearbyPeers, startMdns, isRunning as isMdnsRunning } from '../core/mdnsService.js';
-import { injectLanPeers, tryLanHttpDownload } from '../utils/torrent.js';
-import config from '../utils/config.js';
-import { getDownloadDir } from '../utils/downloadDir.js';
-import fs from 'fs';
-
-function startMdnsIfNeeded() {
-  if (isMdnsRunning()) return;
-  const identity = config.get('identity');
-  if (identity?.publicKey) {
-    const pidPath = path.join(path.dirname(config.path), 'serve.pid');
-    const daemonRunning = fs.existsSync(pidPath);
-    startMdns(identity, { advertise: !daemonRunning });
-  }
-}
-
-export default function downloadCommand(program) {
-  program
-    .command('download <magnet> [moreMagnets...]')
-    .description('download file(s) from Magnet Link(s)')
-    .option('--key <encryptedShareKey>', 'Encrypted share key for decryption (for private shares)')
-    .option('--lan-only', 'Only download from LAN peers (skip public trackers)')
-    .option('--share-name <name>', 'Share name for LAN HTTP download')
-    .addHelpText('after', `
-Examples:
-  $ pe download "magnet:?xt=urn:btih:..."                     Download a public share
-  $ pe download "magnet:?xt=..." --key abc123                  Download encrypted share
-  $ pe download "magnet:?xt=..." "magnet:?xt=..."              Batch download multiple
-  $ pe download "magnet:?xt=..." --lan-only                    LAN peers only
-  $ pe download "magnet:?xt=..." --share-name Photos           Try direct HTTP from LAN first
-`)
-    .action(async (magnet, moreMagnets, opts) => {
-      // Start mDNS to discover LAN peers
-      startMdnsIfNeeded();
-      const lanPeers = getNearbyPeers();
-      if (lanPeers.length > 0) {
-        logger.info(`Found ${lanPeers.length} LAN peer(s) via mDNS`);
-      }
-
-      const allMagnets = [magnet, ...(moreMagnets || [])];
-
-      if (allMagnets.length > 1) {
-        console.log(chalk.blue(`Batch downloading ${allMagnets.length} items...`));
-        const client = new WebTorrent();
-        let completed = 0;
-        let failed = 0;
-
-        for (const m of allMagnets) {
-          if (!m.startsWith('magnet:?') && !/^[0-9a-fA-F]{40}$/.test(m)) {
-            console.error(chalk.red(`Skipping invalid magnet: ${m.slice(0, 50)}...`));
-            failed++;
-            continue;
-          }
-
-          try {
-            const dlDir = getDownloadDir();
-            if (!fs.existsSync(dlDir)) fs.mkdirSync(dlDir, { recursive: true });
-            await new Promise((resolve, reject) => {
-              const timeout = setTimeout(() => reject(new Error('Peer timeout (60s)')), 60000);
-              const addOpts = { path: dlDir };
-              const t = client.add(opts.lanOnly ? m : m, addOpts, (torrent) => {
-                clearTimeout(timeout);
-                console.log(chalk.cyan(`  Downloading: ${torrent.name}`));
-                trackTransfer(m, torrent.name, dlDir, null);
-                torrent.on('done', () => {
-                  console.log(chalk.green(`  ✔ ${torrent.name}`));
-                  completeTransfer(m);
-                  completed++;
-                  resolve();
-                });
-              });
-
-              // Inject LAN peers into each torrent
-              if (lanPeers.length > 0) {
-                injectLanPeers(t, lanPeers);
-              }
-
-              client.on('error', (err) => { clearTimeout(timeout); reject(err); });
-            });
-          } catch (err) {
-            console.error(chalk.red(`  ✖ Failed: ${err.message}`));
-            failed++;
-          }
-        }
-
-        console.log('');
-        console.log(chalk.green(`Completed: ${completed}`) + (failed > 0 ? chalk.red(` Failed: ${failed}`) : ''));
-        client.destroy();
-        process.exit(failed > 0 ? 1 : 0);
-        return;
-      }
-
-      // Single download
-      if (!magnet.startsWith('magnet:?') && !/^[0-9a-fA-F]{40}$/.test(magnet)) {
-        console.error(chalk.red('Invalid magnet URI. Must start with "magnet:?" or be a 40-character hex infohash.'));
-        process.exitCode = 1;
-        return;
-      }
-
-      const dlDir = getDownloadDir();
-      if (!fs.existsSync(dlDir)) fs.mkdirSync(dlDir, { recursive: true });
-
-      // Strategy 1: Try direct HTTP download from LAN peer (fastest)
-      if (opts.shareName && lanPeers.length > 0) {
-        console.log(chalk.blue(`Trying direct LAN download from ${lanPeers.length} nearby peer(s)...`));
-        const spinner = ora('Downloading via LAN HTTP...').start();
-        try {
-          const result = await tryLanHttpDownload(lanPeers, opts.shareName, dlDir, {
-            onProgress: (pct, fileName) => {
-              spinner.text = `LAN download... ${(pct * 100).toFixed(1)}% (${fileName})`;
-            },
-          });
-          if (result) {
-            spinner.succeed(chalk.green(`LAN download complete from ${result.peerIp} (${result.files.length} files, ${(result.totalBytes / 1024 / 1024).toFixed(2)} MB)`));
-            trackTransfer(magnet, opts.shareName, dlDir, opts.key || null);
-            completeTransfer(magnet);
-            process.exit(0);
-            return;
-          }
-          spinner.info(chalk.dim('No LAN peer serving this share. Falling back to BitTorrent...'));
-        } catch (err) {
-          spinner.info(chalk.dim(`LAN download failed: ${err.message}. Falling back to BitTorrent...`));
-        }
-      }
-
-      if (opts.lanOnly && lanPeers.length === 0) {
-        console.error(chalk.red('No LAN peers found. Remove --lan-only to use public trackers.'));
-        process.exitCode = 1;
-        return;
-      }
-
-      // Strategy 2: WebTorrent with LAN peer injection
-      logger.info('Starting download', { magnet: magnet.slice(0, 40) });
-      console.log(chalk.blue('Connecting to peers...'));
-      if (lanPeers.length > 0) {
-        console.log(chalk.cyan(`  ${lanPeers.length} LAN peer(s) will be injected for faster discovery`));
-      }
-      const spinner = ora('Finding peers...').start();
-
-      const client = new WebTorrent();
-
-      const peerTimeout = setTimeout(() => {
-        const torrents = client.torrents;
-        if (torrents.length > 0 && torrents[0].numPeers === 0) {
-          spinner.warn(chalk.yellow('⚠ No peers found after 120 seconds. Check that the share is being seeded.'));
-          client.destroy();
-          process.exitCode = 1;
-        }
-      }, 120000);
-
-      const addOpts = { path: dlDir };
-      const torrentSrc = opts.lanOnly ? magnet : magnet;
-
-      client.add(torrentSrc, addOpts, (torrent) => {
-        clearTimeout(peerTimeout);
-        spinner.succeed(chalk.green(`Connected! Downloading: ${torrent.name}`));
-
-        // Track transfer, storing the encrypted key if provided
-        trackTransfer(magnet, torrent.name, dlDir, opts.key || null);
-
-        const progressSpinner = ora('Downloading... 0%').start();
-
-        torrent.on('download', (bytes) => {
-          const progress = (torrent.progress * 100).toFixed(1);
-          progressSpinner.text = `Downloading... ${progress}% (${(torrent.downloaded / 1024 / 1024).toFixed(2)} MB / ${(torrent.length / 1024 / 1024).toFixed(2)} MB)`;
-        });
-
-        torrent.on('done', async () => {
-          logger.info(`Download complete: ${torrent.name}`, { size: torrent.length });
-          progressSpinner.succeed(chalk.green('Download Complete!'));
-          const downloadedDir = path.join(dlDir, torrent.name);
-          console.log(chalk.cyan(`File saved to: ${downloadedDir}`));
-
-          // Attempt decryption if an encrypted share key was provided
-          const transfers = getTransfers();
-          const thisTransfer = transfers.find(t => t.magnet === magnet);
-          if (thisTransfer?.encryptedShareKey) {
-            const identity = await getIdentity();
-            if (identity?.publicKey && identity?.privateKey) {
-              try {
-                const { decryptShareKey } = await import('../crypto/shareEncryption.js');
-                const shareKey = decryptShareKey(thisTransfer.encryptedShareKey, identity.publicKey, identity.privateKey);
-                const shareName = thisTransfer.name || 'download';
-                const outDir = getDecryptedDownloadDir(shareName);
-                console.log(chalk.blue('Decrypting E2EE files...'));
-                decryptFromDownload(downloadedDir, outDir, shareKey);
-                console.log(chalk.green(`Decrypted files saved to: ${outDir}`));
-              } catch (e) {
-                console.log(chalk.yellow(`Warning: Could not decrypt files — ${e.message}`));
-              }
-            } else {
-              console.log(chalk.yellow('Warning: No identity found — skipping decryption. Run `pe identity` to set up.'));
-            }
-          }
-
-          completeTransfer(magnet);
-          client.destroy();
-          process.exit(0);
-        });
-      });
-
-      // Inject LAN peers into the torrent right after adding
-      const currentTorrent = client.torrents[client.torrents.length - 1];
-      if (currentTorrent && lanPeers.length > 0) {
-        const injected = injectLanPeers(currentTorrent, lanPeers);
-        if (injected > 0) {
-          logger.info(`Injected ${injected} LAN peer(s) into torrent`);
-        }
-      }
-
-      client.on('error', (err) => {
-        logger.error(`Download failed: ${err.message}`, { magnet: magnet.slice(0, 40) });
-        spinner.fail(chalk.red('Download Failed'));
-        console.error(chalk.red(`Error: ${err.message}`));
-        process.exit(1);
-      });
-    });
-}
+import WebTorrent from 'webtorrent';
+import chalk from 'chalk';
+import ora from 'ora';
+import path from 'path';
+import { trackTransfer, getTransfers, completeTransfer } from '../core/transfers.js';
+import { getIdentity } from '../core/identity.js';
+import { decryptFromDownload, getDecryptedDownloadDir } from '../crypto/streamEncryption.js';
+import logger from '../utils/logger.js';
+import { getNearbyPeers, startMdns, isRunning as isMdnsRunning } from '../core/mdnsService.js';
+import { injectLanPeers, tryLanHttpDownload } from '../utils/torrent.js';
+import config from '../utils/config.js';
+import { getDownloadDir } from '../utils/downloadDir.js';
+import fs from 'fs';
+
+function startMdnsIfNeeded() {
+  if (isMdnsRunning()) return;
+  const identity = config.get('identity');
+  if (identity?.publicKey) {
+    const pidPath = path.join(path.dirname(config.path), 'serve.pid');
+    const daemonRunning = fs.existsSync(pidPath);
+    startMdns(identity, { advertise: !daemonRunning });
+  }
+}
+
+export default function downloadCommand(program) {
+  program
+    .command('download <magnet> [moreMagnets...]')
+    .description('download file(s) from Magnet Link(s)')
+    .option('--key <encryptedShareKey>', 'Encrypted share key for decryption (for private shares)')
+    .option('--lan-only', 'Only download from LAN peers (skip public trackers)')
+    .option('--share-name <name>', 'Share name for LAN HTTP download')
+    .option('-o, --output <dir>', 'Output directory (overrides default)')
+    .option('-p, --peer <addr>', 'Direct peer address (ip:port) to add')
+    .addHelpText('after', `
+Examples:
+  $ pal download "magnet:?xt=urn:btih:..."                     Download a public share
+  $ pal download "magnet:?xt=..." --key abc123                  Download encrypted share
+  $ pal download "magnet:?xt=..." -p 1.2.3.4:6881               Direct connection to peer
+  $ pal download "magnet:?xt=..." --lan-only                    LAN peers only
+  $ pal download "magnet:?xt=..." --share-name Photos           Try direct HTTP from LAN first
+`)
+    .action(async (magnet, moreMagnets, opts) => {
+      // Start mDNS to discover LAN peers
+      startMdnsIfNeeded();
+      const lanPeers = getNearbyPeers();
+      if (lanPeers.length > 0) {
+        logger.info(`Found ${lanPeers.length} LAN peer(s) via mDNS`);
+      }
+
+      const allMagnets = [magnet, ...(moreMagnets || [])];
+
+      if (allMagnets.length > 1) {
+        console.log(chalk.blue(`Batch downloading ${allMagnets.length} items...`));
+        const client = new WebTorrent();
+        let completed = 0;
+        let failed = 0;
+
+        for (const m of allMagnets) {
+          if (!m.startsWith('magnet:?') && !/^[0-9a-fA-F]{40}$/.test(m)) {
+            console.error(chalk.red(`Skipping invalid magnet: ${m.slice(0, 50)}...`));
+            failed++;
+            continue;
+          }
+
+          try {
+            const dlDir = opts.output || getDownloadDir();
+            if (!fs.existsSync(dlDir)) fs.mkdirSync(dlDir, { recursive: true });
+            await new Promise((resolve, reject) => {
+              const timeout = setTimeout(() => reject(new Error('Peer timeout (60s)')), 60000);
+              const addOpts = { path: dlDir };
+              const t = client.add(opts.lanOnly ? m : m, addOpts, (torrent) => {
+                clearTimeout(timeout);
+                console.log(chalk.cyan(`  Downloading: ${torrent.name}`));
+                trackTransfer(m, torrent.name, dlDir, null);
+                torrent.on('done', () => {
+                  console.log(chalk.green(`  ✔ ${torrent.name}`));
+                  completeTransfer(m);
+                  completed++;
+                  resolve();
+                });
+              });
+
+              // Inject LAN peers and manual peer
+              if (lanPeers.length > 0) injectLanPeers(t, lanPeers);
+              if (opts.peer) {
+                try { t.addPeer(opts.peer); } catch (e) { console.error(chalk.yellow(`  Warning: Could not add peer ${opts.peer}: ${e.message}`)); }
+              }
+
+              client.on('error', (err) => { clearTimeout(timeout); reject(err); });
+            });
+          } catch (err) {
+            console.error(chalk.red(`  ✖ Failed: ${err.message}`));
+            failed++;
+          }
+        }
+
+        console.log('');
+        console.log(chalk.green(`Completed: ${completed}`) + (failed > 0 ? chalk.red(` Failed: ${failed}`) : ''));
+        client.destroy();
+        process.exit(failed > 0 ? 1 : 0);
+        return;
+      }
+
+      // Single download
+      if (!magnet.startsWith('magnet:?') && !/^[0-9a-fA-F]{40}$/.test(magnet)) {
+        console.error(chalk.red('Invalid magnet URI. Must start with "magnet:?" or be a 40-character hex infohash.'));
+        process.exitCode = 1;
+        return;
+      }
+
+      const dlDir = opts.output || getDownloadDir();
+      if (!fs.existsSync(dlDir)) fs.mkdirSync(dlDir, { recursive: true });
+
+      // Strategy 1: Try direct HTTP download from LAN peer (fastest)
+      if (opts.shareName && lanPeers.length > 0) {
+        console.log(chalk.blue(`Trying direct LAN download from ${lanPeers.length} nearby peer(s)...`));
+        const spinner = ora('Downloading via LAN HTTP...').start();
+        try {
+          const result = await tryLanHttpDownload(lanPeers, opts.shareName, dlDir, {
+            onProgress: (pct, fileName) => {
+              spinner.text = `LAN download... ${(pct * 100).toFixed(1)}% (${fileName})`;
+            },
+          });
+          if (result) {
+            spinner.succeed(chalk.green(`LAN download complete from ${result.peerIp} (${result.files.length} files, ${(result.totalBytes / 1024 / 1024).toFixed(2)} MB)`));
+            trackTransfer(magnet, opts.shareName, dlDir, opts.key || null);
+            completeTransfer(magnet);
+            process.exit(0);
+            return;
+          }
+          spinner.info(chalk.dim('No LAN peer serving this share. Falling back to BitTorrent...'));
+        } catch (err) {
+          spinner.info(chalk.dim(`LAN download failed: ${err.message}. Falling back to BitTorrent...`));
+        }
+      }
+
+      if (opts.lanOnly && lanPeers.length === 0) {
+        console.error(chalk.red('No LAN peers found. Remove --lan-only to use public trackers.'));
+        process.exitCode = 1;
+        return;
+      }
+
+      // Strategy 2: WebTorrent with LAN peer injection
+      logger.info('Starting download', { magnet: magnet.slice(0, 40) });
+      console.log(chalk.blue('Connecting to peers...'));
+      if (lanPeers.length > 0) {
+        console.log(chalk.cyan(`  ${lanPeers.length} LAN peer(s) will be injected for faster discovery`));
+      }
+      if (opts.peer) {
+        console.log(chalk.cyan(`  Manual peer ${opts.peer} will be injected`));
+      }
+      const spinner = ora('Finding peers...').start();
+
+      const client = new WebTorrent();
+
+      const peerTimeout = setTimeout(() => {
+        const torrents = client.torrents;
+        if (torrents.length > 0 && torrents[0].numPeers === 0) {
+          spinner.warn(chalk.yellow('⚠ No peers found after 120 seconds. Check that the share is being seeded.'));
+          client.destroy();
+          process.exitCode = 1;
+        }
+      }, 120000);
+
+      const addOpts = { path: dlDir };
+      const torrentSrc = opts.lanOnly ? magnet : magnet;
+
+      client.add(torrentSrc, addOpts, (torrent) => {
+        clearTimeout(peerTimeout);
+        spinner.succeed(chalk.green(`Connected! Downloading: ${torrent.name}`));
+
+        // Track transfer, storing the encrypted key if provided
+        trackTransfer(magnet, torrent.name, dlDir, opts.key || null);
+
+        const progressSpinner = ora('Downloading... 0%').start();
+
+        torrent.on('download', (bytes) => {
+          const progress = (torrent.progress * 100).toFixed(1);
+          progressSpinner.text = `Downloading... ${progress}% (${(torrent.downloaded / 1024 / 1024).toFixed(2)} MB / ${(torrent.length / 1024 / 1024).toFixed(2)} MB)`;
+        });
+
+        torrent.on('done', async () => {
+          logger.info(`Download complete: ${torrent.name}`, { size: torrent.length });
+          progressSpinner.succeed(chalk.green('Download Complete!'));
+          const downloadedDir = path.join(dlDir, torrent.name);
+          console.log(chalk.cyan(`File saved to: ${downloadedDir}`));
+
+          // Attempt decryption if an encrypted share key was provided
+          const transfers = getTransfers();
+          const thisTransfer = transfers.find(t => t.magnet === magnet);
+          if (thisTransfer?.encryptedShareKey) {
+            const identity = await getIdentity();
+            if (identity?.publicKey && identity?.privateKey) {
+              try {
+                const { decryptShareKey } = await import('../crypto/shareEncryption.js');
+                const shareKey = decryptShareKey(thisTransfer.encryptedShareKey, identity.publicKey, identity.privateKey);
+                const shareName = thisTransfer.name || 'download';
+                const outDir = getDecryptedDownloadDir(shareName);
+                console.log(chalk.blue('Decrypting E2EE files...'));
+                decryptFromDownload(downloadedDir, outDir, shareKey);
+                console.log(chalk.green(`Decrypted files saved to: ${outDir}`));
+              } catch (e) {
+                console.log(chalk.yellow(`Warning: Could not decrypt files — ${e.message}`));
+              }
+            } else {
+              console.log(chalk.yellow('Warning: No identity found — skipping decryption. Run `pal identity` to set up.'));
+            }
+          }
+
+          completeTransfer(magnet);
+          client.destroy();
+          process.exit(0);
+        });
+      });
+
+      // Inject LAN peers into the torrent right after adding
+      const currentTorrent = client.torrents[client.torrents.length - 1];
+      if (currentTorrent) {
+        if (lanPeers.length > 0) {
+          const injected = injectLanPeers(currentTorrent, lanPeers);
+          if (injected > 0) logger.info(`Injected ${injected} LAN peer(s) into torrent`);
+        }
+        if (opts.peer) {
+          try {
+            currentTorrent.addPeer(opts.peer);
+            logger.info(`Injected manual peer ${opts.peer} into torrent`);
+          } catch (e) {
+            console.error(chalk.yellow(`Warning: Could not add peer ${opts.peer}: ${e.message}`));
+          }
+        }
+      }
+
+      client.on('error', (err) => {
+        logger.error(`Download failed: ${err.message}`, { magnet: magnet.slice(0, 40) });
+        spinner.fail(chalk.red('Download Failed'));
+        console.error(chalk.red(`Error: ${err.message}`));
+        process.exit(1);
+      });
+    });
+}