devicely 2.2.1 → 2.2.2

package/lib/frontend/static/js/main.e6f081bf.js.LICENSE.txt

@@ -0,0 +1,48 @@
+/**
+ * @license React
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react-jsx-runtime.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.13.1
+ * react-is.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */

package/lib/server.js

@@ -104,7 +104,7 @@ function findScriptFile(filename) {
   
   for (const { path: scriptPath, encrypted } of pathsToTry) {
     if (fsSync.existsSync(scriptPath)) {
-      console.log(`✅ Found script: ${filename} at ${scriptPath}${encrypted ? ' (encrypted)' : ''}`);
+      logger.debug(`✅ Found script: ${filename} at ${scriptPath}${encrypted ? ' (encrypted)' : ''}`);
       
       // If encrypted, decrypt to temp directory and return temp path
       if (encrypted && scriptLoader) {
@@ -120,7 +120,7 @@ function findScriptFile(filename) {
           try {
             const content = scriptLoader.decryptScript(scriptPath);
             fsSync.writeFileSync(tmpScript, content, { mode: 0o755 });
-            console.log(`🔓 Decrypted ${filename} to temp directory`);
+            logger.debug(`🔓 Decrypted ${filename} to temp directory`);
           } catch (error) {
             console.error(`❌ Failed to decrypt ${filename}: ${error.message}`);
             continue;
@@ -538,10 +538,10 @@ function resolveAppPreset(command, platform) {
 // Execute command on device(s)
 function executeCommand(deviceNames, command, wsClient) {
   return new Promise(async (resolve, reject) => {
-    console.log(`\n${'#'.repeat(60)}`);
-    console.log(`Device names received: [${deviceNames.join(', ')}]`);
+    // separator removed
+    logger.debug(`Device names received: [${deviceNames.join(', ')}]`);
     console.log(`Command: "${command}"`);
-    console.log(`${'#'.repeat(60)}\n`);
+    // separator removed
     
     // Get full device objects from connectedDevices cache
     // Match by name, udid, or serial
@@ -551,7 +551,7 @@ function executeCommand(deviceNames, command, wsClient) {
       deviceNames.includes(d.serial)
     );
 
-    console.log(`Cache contents:`, connectedDevices.map(d => `${d.name}(${d.status})`).join(', '));
+    logger.debug(`Cache contents:`, connectedDevices.map(d => `${d.name}(${d.status})`).join(', '));
 
     if (devices.length === 0) {
       console.error(`❌ No devices found for: [${deviceNames.join(', ')}]`);
@@ -595,7 +595,7 @@ function executeCommand(deviceNames, command, wsClient) {
     if (iosUSBDevices.length > 0) {
       const names = iosUSBDevices.map(d => d.name);
       const iosCommand = resolveAppPreset(command, 'ios');
-      console.log(`Using iOS USB script for: ${names.join(', ')}`);
+      logger.debug(`Using iOS USB script for: ${names.join(', ')}`);
       promises.push(executeWithScript(USB_SCRIPT_PATH, names, iosCommand, wsClient));
     }
     
@@ -610,14 +610,14 @@ function executeCommand(deviceNames, command, wsClient) {
     // Execute for Android USB devices
     if (androidUSBDevices.length > 0) {
       const androidCommand = resolveAppPreset(command, 'android');
-      console.log(`Using Android control script for USB devices: ${androidUSBDevices.map(d => d.name).join(', ')}`);
+      logger.debug(`Using Android control script for USB devices: ${androidUSBDevices.map(d => d.name).join(', ')}`);
       promises.push(executeAndroidDevices(ANDROID_USB_SCRIPT_PATH, androidUSBDevices, androidCommand, wsClient));
     }
     
     // Execute for Android wireless devices
     if (androidWirelessDevices.length > 0) {
       const androidCommand = resolveAppPreset(command, 'android');
-      console.log(`Using Android control script for wireless devices: ${androidWirelessDevices.map(d => d.name).join(', ')}`);
+      logger.debug(`Using Android control script for wireless devices: ${androidWirelessDevices.map(d => d.name).join(', ')}`);
       promises.push(executeAndroidDevices(ANDROID_WIRELESS_SCRIPT_PATH, androidWirelessDevices, androidCommand, wsClient));
     }
     
@@ -631,7 +631,7 @@ function executeCommand(deviceNames, command, wsClient) {
       const successCount = results.filter(r => r.status === 'fulfilled').length;
       const failCount = results.filter(r => r.status === 'rejected').length;
       
-      console.log(`\nExecuteCommand summary: ${successCount} succeeded, ${failCount} failed`);
+      logger.debug(`ExecuteCommand summary: ${successCount} succeeded, ${failCount} failed`);
       
       resolve({ 
         success: true, 
@@ -713,9 +713,9 @@ function executeWithScript(scriptPath, deviceNames, command, wsClient) {
         const successful = results.filter(r => r.status === 'fulfilled').length;
         const failed = results.filter(r => r.status === 'rejected').length;
         
-        console.log(`\n${'='.repeat(60)}`);
+        // separator removed
 
-        console.log(`${'='.repeat(60)}\n`);
+        // separator removed
         
         resolve({ 
           success: true, 
@@ -793,12 +793,12 @@ function executeAndroidDevices(scriptPath, devices, command, wsClient) {
     
     Promise.allSettled(devicePromises)
       .then(results => {
-        console.log(`\n${'='.repeat(60)}`);
+        // separator removed
 
         const successCount = results.filter(r => r.status === 'fulfilled' && r.value.success).length;
         const failCount = results.length - successCount;
 
-        console.log(`${'='.repeat(60)}\n`);
+        // separator removed
         
         resolve({ success: true, results });
       })
@@ -836,11 +836,11 @@ async function convertNaturalLanguageToCommand(text, devices, provider = null) {
 async function executeCommandsSequentially(devices, commandsText, wsClient) {
   const lines = commandsText.split('\n').map(line => line.trim()).filter(line => line);
   
-  console.log(`\n${'~'.repeat(60)}`);
+  // separator removed
 
   console.log(`Total commands: ${lines.length}`);
   console.log(`Commands:`, lines);
-  console.log(`${'~'.repeat(60)}\n`);
+  // separator removed
   
   const results = [];
   
@@ -899,10 +899,10 @@ async function executeCommandsSequentially(devices, commandsText, wsClient) {
     }
   }
   
-  console.log(`\n${'~'.repeat(60)}`);
+  // separator removed
 
   console.log(`Total: ${results.length}, Success: ${results.filter(r => r.success).length}, Failed: ${results.filter(r => !r.success).length}`);
-  console.log(`${'~'.repeat(60)}\n`);
+  // separator removed
   
   return {
     success: true,
@@ -2063,12 +2063,12 @@ async function replayRecording(filename, targetDevices, wsClient) {
     ? recording.devices 
     : targetDevices;
   
-  console.log(`\n${'▶'.repeat(60)}`);
+  // separator removed
   console.log(`REPLAYING: ${recording.name}`);
   console.log(`Original devices: ${devices.join(', ')}`);
   console.log(`Target devices: ${targetDevices.join(', ')}`);
   console.log(`Commands to replay: ${commands.length}`);
-  console.log(`${'▶'.repeat(60)}\n`);
+  // separator removed
   
   // Reset abort flag at start
   replayAborted = false;
@@ -2149,10 +2149,10 @@ async function replayRecording(filename, targetDevices, wsClient) {
   
   isReplaying = false;
   
-  console.log(`\n${'▶'.repeat(60)}`);
+  // separator removed
   console.log(`REPLAY COMPLETE`);
   console.log(`Total: ${results.length}, Success: ${results.filter(r => r.success).length}, Failed: ${results.filter(r => !r.success).length}`);
-  console.log(`${'▶'.repeat(60)}\n`);
+  // separator removed
   
   return {
     success: true,
@@ -2555,7 +2555,7 @@ app.post('/api/locators', async (req, res) => {
       return res.status(400).json({ success: false, error: 'Device name required' });
     }
     
-    console.log(`\n🔍 API: Getting locators for device: ${deviceName}`);
+    logger.debug(`Getting locators for device: ${deviceName}`);
     
     // Find the device info
     const device = connectedDevices.find(d => d.name === deviceName);
@@ -2592,8 +2592,8 @@ app.post('/api/locators', async (req, res) => {
     // Execute getLocators command - this uses the fast shell script implementation
     const result = await executeCommand([deviceName], 'getLocators', null);
     
-    console.log(`Result success: ${result.success}`);
-    console.log(`Results array length: ${result.results?.length || 0}`);
+    logger.debug(`Result success: ${result.success}`);
+    logger.debug(`Results array length: ${result.results?.length || 0}`);
     
     if (result.success && result.results) {
       let output = '';
@@ -2604,18 +2604,18 @@ app.post('/api/locators', async (req, res) => {
       // allSettledResults contains: { status: 'fulfilled', value: { success, output, device } }
       
       for (const scriptResult of result.results) {
-        console.log(`Script result:`, scriptResult);
+        logger.debug(`Script result:`, scriptResult);
         
         // Check if scriptResult has value.results (fulfilled promise)
         if (scriptResult.status === 'fulfilled' && scriptResult.value && scriptResult.value.results) {
           // This is the result from executeAndroidDevices/executeWithScript
           for (const r of scriptResult.value.results) {
-            console.log(`Result status: ${r.status}`);
+            logger.debug(`Result status: ${r.status}`);
             if (r.status === 'fulfilled' && r.value) {
               // Check if it's a successful execution
               if (r.value.success && r.value.output) {
                 output = r.value.output;
-                console.log(`✅ Found output: ${output.length} characters`);
+                logger.debug(`Found output: ${output.length} characters`);
                 break;
               } else if (r.value.error) {
                 // Script executed but returned an error
@@ -2693,11 +2693,11 @@ app.post('/api/locators/click', async (req, res) => {
 
 // Helper function to parse locators output
 function parseLocatorsOutput(output) {
-  console.log('🔍 Parsing locators output...');
-  console.log('Output length:', output?.length || 0);
+  logger.debug('🔍 Parsing locators output...');
+  logger.debug('Output length:', output?.length || 0);
   
   if (!output) {
-    console.log('❌ No output to parse');
+    logger.error('❌ No output to parse');
     return [];
   }
   
@@ -2708,19 +2708,19 @@ function parseLocatorsOutput(output) {
     if (trimmed.startsWith('[') || trimmed.startsWith('{')) {
       try {
         const jsonData = JSON.parse(trimmed);
-        console.log('✅ Parsed as JSON, elements:', Array.isArray(jsonData) ? jsonData.length : 'not array');
+        logger.debug('✅ Parsed as JSON, elements:', Array.isArray(jsonData) ? jsonData.length : 'not array');
         return Array.isArray(jsonData) ? jsonData : [];
       } catch (err) {
-        console.log('⚠️ JSON parse failed:', err.message);
+        logger.debug('⚠️ JSON parse failed:', err.message);
       }
     }
   }
   
-  console.log('📝 Fallback to text parsing...');
+  logger.debug('📝 Fallback to text parsing...');
   
   // Fallback to old text parsing
   const locators = [];
-  console.log('Total lines:', lines.length);
+  logger.debug('Total lines:', lines.length);
   
   for (const line of lines) {
     // New format: "  1. 📍 ButtonName    │ [Button] │ Label:LabelText │ Val:ValueText │ @ (x,y) WxH │ ✓Vis ✓En"
@@ -2822,7 +2822,7 @@ function parseLocatorsOutput(output) {
         
         // Only add if we have meaningful data
         if (locator.name || locator.label || locator.text) {
-          console.log('✅ Parsed locator:', locator);
+          logger.debug('Parsed locator:', locator);
           locators.push(locator);
         }
       } catch (e) {
@@ -2848,13 +2848,13 @@ wss.on('connection', (ws) => {
         case 'execute_command':
           const { devices, command, useAI, aiProvider } = data;
           
-          console.log(`\n${'*'.repeat(60)}`);
+          // separator removed
           console.log(`WEBSOCKET: Received execute_command`);
           console.log(`Devices received: [${devices.join(', ')}]`);
           console.log(`Command: "${command}"`);
           console.log(`Use AI: ${useAI}`);
           if (aiProvider) console.log(`AI Provider: ${aiProvider}`);
-          console.log(`${'*'.repeat(60)}\n`);
+          // separator removed
           
           let finalCommand = command;
           
@@ -3469,12 +3469,12 @@ function startServer(options = {}) {
   
   return new Promise((resolve, reject) => {
     server = app.listen(port, () => {
-      console.log(`Server running on port ${port}`);
-      console.log(`WebSocket server ready`);
+      console.log(`✅ Server running on port ${port}`);
+      console.log(`✅ WebSocket server ready`);
       
       // Initial device discovery
       discoverDevices().then(devices => {
-        console.log(`Discovered ${devices.length} devices`);
+        console.log(`✅ Discovered ${devices.length} devices`);
         
         // Open browser if not disabled
         if (shouldOpenBrowser) {
@@ -3485,17 +3485,30 @@ function startServer(options = {}) {
           });
         }
         
-        resolve({ port, devices });
-      }).catch(reject);
+        resolve();
+      }).catch(err => {
+        logger.error('Device discovery failed:', err.message);
+        resolve();
+      });
     });
 
+    // Handle WebSocket upgrades
     server.on('upgrade', (request, socket, head) => {
       wss.handleUpgrade(request, socket, head, (ws) => {
         wss.emit('connection', ws, request);
       });
     });
 
-    server.on('error', reject);
+    server.on('error', (err) => {
+      if (err.code === 'EADDRINUSE') {
+        logger.error(`\n❌ Port ${port} is already in use!`);
+        logger.error(`\nTry one of these solutions:`);
+        logger.error(`  1. Kill the process using port ${port}: lsof -ti:${port} | xargs kill -9`);
+        logger.error(`  2. Use a different port: PORT=3002 devicely`);
+        logger.error(`  3. Set PORT in .env file\n`);
+      }
+      reject(err);
+    });
   });
 }
 
@@ -3518,7 +3531,16 @@ module.exports = {
 // Start server if run directly (not imported as module)
 if (require.main === module) {
   startServer().catch(err => {
-    console.error('Failed to start server:', err);
+    if (err.code === 'EADDRINUSE') {
+      logger.error(`\n❌ Port 3001 is already in use!`);
+      logger.error(`\nTry one of these solutions:`);
+      logger.error(`  1. Kill the process using port 3001: lsof -ti:3001 | xargs kill -9`);
+      logger.error(`  2. Use a different port: PORT=3002 devicely`);
+      logger.error(`     Note: Vercel frontend connects to port 3001 by default`);
+      logger.error(`  3. Use local frontend at http://localhost:3001\n`);
+    } else {
+      console.error('Failed to start server:', err.message);
+    }
     process.exit(1);
   });
 }