channel-worker 1.0.3 → 1.0.5

package/lib/command-poller.js

@@ -61,12 +61,11 @@ class CommandPoller {
   }
 
   async handleLaunchProfile(command) {
-    const { profile_id } = command.payload || {};
+    const { profile_id, channel_id } = command.payload || {};
     console.log(`[commands] Launching Nstbrowser profile: ${profile_id}`);
 
     try {
       if (!this.nst) {
-        // No Nstbrowser SDK — try to get API key from dashboard settings
         const apiKey = await this.api.getSetting('nst_api_key');
         if (apiKey) {
           this.nst = new NstManager(apiKey);
@@ -75,12 +74,21 @@ class CommandPoller {
         }
       }
 
-      const result = await this.nst.launchProfile(profile_id);
-      console.log(`[commands] Profile ${profile_id} launched — user can now login via RDP`);
+      // Fetch channel proxy if channel_id provided
+      let proxy = null;
+      if (channel_id) {
+        try {
+          const channel = await this.api.getChannel(channel_id);
+          proxy = channel?.proxy || null;
+        } catch { /* ignore */ }
+      }
+
+      const result = await this.nst.launchProfile(profile_id, { proxy });
+      console.log(`[commands] Profile ${profile_id} launched${proxy ? ' (proxy: ' + proxy + ')' : ''}`);
 
       await this.api.updateCommand(command._id, {
         status: 'done',
-        result: { profile_id: result.profileId, launched_at: new Date().toISOString() },
+        result: { profile_id: result.profileId, launched_at: new Date().toISOString(), proxy: proxy || null },
       });
     } catch (err) {
       console.error(`[commands] Failed to launch profile: ${err.message}`);

package/lib/nst-manager.js

@@ -2,7 +2,7 @@ let NstBrowserV2;
 try {
   NstBrowserV2 = require('nstbrowser-sdk-node').NstBrowserV2;
 } catch {
-  // SDK not installed — will fail gracefully
+  // SDK not installed
 }
 
 class NstManager {
@@ -16,17 +16,40 @@ class NstManager {
     });
   }
 
-  // Check if profile exists by name, return profileId
+  // Get all running browsers
+  async getRunningBrowsers() {
+    try {
+      const res = await this.client.browsers().getBrowsers('running');
+      return res?.data || [];
+    } catch (err) {
+      console.error(`[nst] Error getting running browsers:`, err.message);
+      return [];
+    }
+  }
+
+  // Check if profile is already running
+  async isProfileRunning(profileId) {
+    const running = await this.getRunningBrowsers();
+    return running.some(b => b.profileId === profileId);
+  }
+
+  // Find profile by name, return profileId
   async findProfile(name) {
     try {
       const res = await this.client.profiles().getProfiles({ keyword: name });
-      const profiles = res?.data?.docs || res?.data?.list || [];
-      if (!Array.isArray(profiles)) {
-        console.log(`[nst] getProfiles response:`, JSON.stringify(res?.data).slice(0, 200));
-        return null;
+      // Response: { data: { docs: [...], totalDocs, ... } }
+      let profiles = [];
+      if (res?.data?.docs && Array.isArray(res.data.docs)) {
+        profiles = res.data.docs;
+      } else if (Array.isArray(res?.data)) {
+        profiles = res.data;
       }
+
       const match = profiles.find(p => p.name === name);
-      return match?.profileId || match?._id || null;
+      if (match) {
+        return match.profileId || match._id;
+      }
+      return null;
     } catch (err) {
       console.error(`[nst] Error finding profile "${name}":`, err.message);
       return null;
@@ -35,14 +58,12 @@ class NstManager {
 
   // Create profile if not exists, return profileId
   async ensureProfile(name) {
-    // Check existing
-    let profileId = await this.findProfile(name);
-    if (profileId) {
-      console.log(`[nst] Profile "${name}" exists: ${profileId}`);
-      return profileId;
+    const existing = await this.findProfile(name);
+    if (existing) {
+      console.log(`[nst] Profile "${name}" exists: ${existing}`);
+      return existing;
     }
 
-    // Create new
     console.log(`[nst] Creating profile "${name}"...`);
     const res = await this.client.profiles().createProfile({
       name,
@@ -61,48 +82,46 @@ class NstManager {
       },
     });
 
-    profileId = res?.data?.profileId || res?.data?.id;
+    const profileId = res?.data?.profileId || res?.data?._id;
     if (!profileId) throw new Error('Failed to create profile — no ID returned');
 
     console.log(`[nst] Profile "${name}" created: ${profileId}`);
     return profileId;
   }
 
-  // Launch browser for profile (visible, not headless)
-  async launchProfile(profileIdOrName) {
-    // If it looks like a name (not UUID), find/create by name
-    let profileId = profileIdOrName;
-    if (!this.isUUID(profileIdOrName)) {
-      profileId = await this.ensureProfile(profileIdOrName);
-    }
-
-    console.log(`[nst] Starting browser for profile: ${profileId}`);
-    const res = await this.client.browsers().startBrowser(profileId);
-    console.log(`[nst] Browser started`);
-    return { profileId, response: res };
+  // Set proxy on profile
+  async setProxy(profileId, proxyUrl) {
+    if (!proxyUrl) return;
+    console.log(`[nst] Setting proxy for ${profileId}: ${proxyUrl}`);
+    await this.client.profiles().updateProfileProxy(profileId, { url: proxyUrl });
+    console.log(`[nst] Proxy set`);
   }
 
-  // Launch and get CDP WebSocket URL (for automation)
-  async connectProfile(profileIdOrName) {
+  // Launch browser — skip if already running, set proxy if provided
+  async launchProfile(profileIdOrName, options = {}) {
     let profileId = profileIdOrName;
     if (!this.isUUID(profileIdOrName)) {
       profileId = await this.ensureProfile(profileIdOrName);
     }
 
-    console.log(`[nst] Connecting to profile: ${profileId}`);
-    const res = await this.client.cdpEndpoints().connectBrowser(profileId, {
-      headless: false,
-      autoClose: false,
-    });
+    // Check if already running
+    if (await this.isProfileRunning(profileId)) {
+      console.log(`[nst] Profile ${profileId} already running — skipping`);
+      return { profileId, alreadyRunning: true };
+    }
 
-    const wsEndpoint = res?.data?.webSocketDebuggerUrl;
-    if (!wsEndpoint) throw new Error('No WebSocket endpoint returned');
+    // Set proxy before launch
+    if (options.proxy) {
+      await this.setProxy(profileId, options.proxy);
+    }
 
-    console.log(`[nst] Connected — WS: ${wsEndpoint}`);
-    return { profileId, wsEndpoint };
+    console.log(`[nst] Starting browser for profile: ${profileId}`);
+    const res = await this.client.browsers().startBrowser(profileId);
+    console.log(`[nst] Browser started`);
+    return { profileId, response: res };
   }
 
-  // Stop browser for profile
+  // Stop browser
   async stopProfile(profileIdOrName) {
     let profileId = profileIdOrName;
     if (!this.isUUID(profileIdOrName)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "channel-worker",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Channel Manager worker daemon — runs on remote machines to execute video pipeline jobs",
   "main": "lib/daemon.js",
   "bin": {