create-droid 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-droid",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "The fastest way to start an Android project. No Studio required.",
   "author": "YELrhilassi",
   "license": "MIT",

package/templates/base/scripts/adb.js

@@ -1,47 +1,223 @@
 const fs = require('fs');
 const path = require('path');
-const { spawn } = require('child_process');
+const { spawn, execSync } = require('child_process');
+const readline = require('readline');
 const os = require('os');
 
-// 1. Find SDK Location from local.properties
+// --- Configuration ---
 const projectRoot = path.resolve(__dirname, '..');
 const localPropertiesPath = path.join(projectRoot, 'local.properties');
 let sdkPath = process.env.ANDROID_HOME;
 
+// --- 1. Resolve ADB Path ---
 if (fs.existsSync(localPropertiesPath)) {
   const content = fs.readFileSync(localPropertiesPath, 'utf8');
   const match = content.match(/^sdk\.dir=(.*)$/m);
   if (match) {
-    sdkPath = match[1].trim().replace(/\\\\/g, '\\'); // Handle Windows escaping if present
+    sdkPath = match[1].trim().replace(/\\\\/g, '\\');
   }
 }
 
-if (!sdkPath) {
-  console.error('❌ Could not find SDK location. Set ANDROID_HOME or create local.properties.');
-  process.exit(1);
-}
-
-// 2. Resolve ADB binary
 const isWin = os.platform() === 'win32';
 const adbBinary = isWin ? 'adb.exe' : 'adb';
-const adbPath = path.join(sdkPath, 'platform-tools', adbBinary);
+const localAdbPath = sdkPath ? path.join(sdkPath, 'platform-tools', adbBinary) : null;
+const finalAdbPath = (localAdbPath && fs.existsSync(localAdbPath)) ? localAdbPath : 'adb';
+
+// --- 2. Helper Functions ---
+function runCommand(args, inherit = true) {
+  if (inherit) {
+    const child = spawn(finalAdbPath, args, { stdio: 'inherit' });
+    return new Promise((resolve) => {
+        child.on('close', (code) => resolve(code));
+    });
+  } else {
+    try {
+        return execSync(`"${finalAdbPath}" ${args.join(' ')}`, { encoding: 'utf8' }).trim();
+    } catch (e) {
+        return null;
+    }
+  }
+}
 
-if (!fs.existsSync(adbPath)) {
-    // Fallback to global adb if local not found
-    console.warn(`⚠️  Local ADB not found at ${adbPath}. Trying global 'adb'...`);
+async function getMdnsServices() {
+    const output = runCommand(['mdns', 'services'], false);
+    if (!output) return [];
+    
+    // Output format usually:
+    // List of discovered mdns services
+    // <name> <type> <ip>:<port>
+    // myphone _adb-tls-connect._tcp. 192.168.1.5:38291
+    
+    const lines = output.split('\n');
+    const services = [];
+    
+    for (const line of lines) {
+        if (!line.includes('_adb-tls-connect') && !line.includes('_adb._tcp')) continue;
+        
+        const parts = line.trim().split(/\s+/);
+        if (parts.length >= 3) {
+             const ipPort = parts[parts.length - 1]; // last part is ip:port
+             const name = parts[0];
+             services.push({ name, ipPort });
+        }
+    }
+    return services;
 }
 
-// 3. Run ADB with arguments
-const args = process.argv.slice(2);
-const finalAdbPath = fs.existsSync(adbPath) ? adbPath : 'adb';
+function clearScreen() {
+    process.stdout.write('\x1Bc');
+}
+
+// --- 3. Interactive Menu ---
+async function showMenu() {
+    clearScreen();
+    console.log('\x1b[36m%s\x1b[0m', '🤖 Android Debug Bridge (ADB) Manager');
+    console.log('-----------------------------------');
+    console.log('1. 📱 List Connected Devices');
+    console.log('2. 📡 Connect to Device (Wi-Fi)');
+    console.log('3. 🔗 Pair Device (Android 11+)');
+    console.log('4. 🔄 Reverse Port 8081 (React Native/Metro)');
+    console.log('5. 📜 Stream Logcat');
+    console.log('6. 💀 Kill ADB Server');
+    console.log('0. 🚪 Exit');
+    console.log('-----------------------------------');
+
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+
+    rl.question('Select option: ', async (answer) => {
+        rl.close();
+        switch (answer.trim()) {
+            case '1':
+                await runCommand(['devices', '-l']);
+                await pause();
+                showMenu();
+                break;
+            case '2':
+                await handleConnect();
+                break;
+            case '3':
+                await handlePair();
+                break;
+            case '4':
+                console.log('Reversing tcp:8081...');
+                await runCommand(['reverse', 'tcp:8081', 'tcp:8081']);
+                await pause();
+                showMenu();
+                break;
+            case '5':
+                console.log('Starting Logcat (Ctrl+C to stop)...');
+                await runCommand(['logcat']);
+                break;
+            case '6':
+                await runCommand(['kill-server']);
+                console.log('Server killed.');
+                await pause();
+                showMenu();
+                break;
+            case '0':
+                process.exit(0);
+                break;
+            default:
+                showMenu();
+        }
+    });
+}
 
-const child = spawn(finalAdbPath, args, { stdio: 'inherit' });
+async function handleConnect() {
+    console.log('\nScanning for devices via mDNS...');
+    const services = await getMdnsServices();
+    
+    if (services.length > 0) {
+        console.log('\nDiscovered Devices:');
+        services.forEach((s, i) => console.log(`${i + 1}. ${s.name} (${s.ipPort})`));
+        console.log(`${services.length + 1}. Enter manually`);
+    } else {
+        console.log('No mDNS devices found.');
+    }
 
-child.on('error', (err) => {
-  console.error(`❌ Failed to start ADB: ${err.message}`);
-  process.exit(1);
-});
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.question('\nSelect device number or enter IP:Port: ', async (answer) => {
+        rl.close();
+        
+        let target = answer.trim();
+        const idx = parseInt(target) - 1;
+        
+        if (!isNaN(idx) && idx >= 0 && idx < services.length) {
+            target = services[idx].ipPort;
+        }
+        
+        if (target) {
+            console.log(`Connecting to ${target}...`);
+            await runCommand(['connect', target]);
+        }
+        await pause();
+        showMenu();
+    });
+}
+
+async function handlePair() {
+    console.log('\nScanning for devices via mDNS...');
+    const services = await getMdnsServices();
+    
+    if (services.length > 0) {
+        console.log('\nDiscovered Devices:');
+        services.forEach((s, i) => console.log(`${i + 1}. ${s.name} (${s.ipPort})`));
+        console.log(`${services.length + 1}. Enter manually`);
+    } else {
+        console.log('No mDNS devices found.');
+    }
+
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.question('\nSelect device number or enter IP:Port: ', (answer) => {
+        let target = answer.trim();
+        const idx = parseInt(target) - 1;
+        
+        if (!isNaN(idx) && idx >= 0 && idx < services.length) {
+            target = services[idx].ipPort;
+        }
+
+        if (!target) {
+            rl.close();
+            showMenu();
+            return;
+        }
+
+        rl.question(`Enter Pairing Code for ${target}: `, async (code) => {
+            rl.close();
+            if (code) {
+                console.log(`Pairing with ${target}...`);
+                await runCommand(['pair', target, code]);
+            }
+            await pause();
+            showMenu();
+        });
+    });
+}
 
-child.on('close', (code) => {
-  process.exit(code);
-});
+function pause() {
+    return new Promise((resolve) => {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        rl.question('\nPress Enter to continue...', () => {
+            rl.close();
+            resolve();
+        });
+    });
+}
+
+// --- 4. Main Execution ---
+const args = process.argv.slice(2);
+
+if (args.length > 0) {
+    // Pass-through mode (e.g., npm run adb connect ...)
+    const child = spawn(finalAdbPath, args, { stdio: 'inherit' });
+    child.on('close', (code) => process.exit(code));
+} else {
+    // Interactive mode
+    if (!sdkPath && !process.env.ANDROID_HOME) {
+        console.warn('⚠️  ANDROID_HOME not set. Trying global ADB...');
+    }
+    showMenu();
+}