channel-worker 1.3.3 → 1.3.5

package/lib/nst-manager.js

@@ -1,29 +1,36 @@
-let NstBrowserV2;
-try {
-  NstBrowserV2 = require('nstbrowser-sdk-node').NstBrowserV2;
-} catch {
-  // SDK not installed
-}
-
 class NstManager {
   constructor(apiKey, options = {}) {
-    if (!NstBrowserV2) {
-      throw new Error('nstbrowser-sdk-node not installed. Run: npm install -g nstbrowser-sdk-node');
-    }
     this.apiKey = apiKey;
-    this.client = new NstBrowserV2(apiKey, {
-      timeout: options.timeout || 60000,
-      apiAddress: options.apiAddress || 'http://localhost:8848/api/v2',
+    this.baseUrl = options.apiAddress || 'http://localhost:8848/api/v2';
+  }
+
+  async api(path, options = {}) {
+    const url = path.startsWith('http') ? path : `${this.baseUrl}${path}`;
+    const res = await fetch(url, {
+      ...options,
+      headers: {
+        'x-api-key': this.apiKey,
+        'Content-Type': 'application/json',
+        ...options.headers,
+      },
     });
+    return res.json();
   }
 
   // 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);
+      const rawRes = await fetch(`${this.baseUrl}/browsers/running`, {
+        headers: { 'x-api-key': this.apiKey },
+      });
+      const text = await rawRes.text();
+      try {
+        const data = JSON.parse(text);
+        return data?.data || [];
+      } catch {
+        return [];
+      }
+    } catch {
       return [];
     }
   }
@@ -37,36 +44,19 @@ class NstManager {
   // Find profile by name, return profileId
   async findProfile(name) {
     try {
-      // Try SDK first
-      const res = await this.client.profiles().getProfiles({ keyword: name });
-      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?.toLowerCase() === name.toLowerCase());
-      if (match) return match.profileId || match._id;
-
-      // Fallback: fetch ALL profiles via local API (paginate if needed)
       let allProfiles = [];
       let page = 1;
       while (true) {
-        const rawRes = await fetch(`http://localhost:8848/api/v2/profiles/?keyword=${encodeURIComponent(name)}&page=${page}&limit=100`, {
-          headers: { 'x-api-key': this.apiKey },
-        });
-        const rawData = await rawRes.json();
-        const docs = rawData?.data?.docs || rawData?.data || [];
+        const res = await this.api(`/profiles/?keyword=${encodeURIComponent(name)}&page=${page}&limit=100`);
+        const docs = res?.data?.docs || res?.data || [];
         allProfiles = allProfiles.concat(docs);
-        const totalPages = rawData?.data?.totalPage || rawData?.data?.totalPages || 1;
+        const totalPages = res?.data?.totalPage || res?.data?.totalPages || 1;
         if (page >= totalPages || docs.length === 0) break;
         page++;
       }
-      console.log(`[nst] Fallback search for "${name}": found ${allProfiles.length} profiles, names: [${allProfiles.map(p => p.name).join(', ')}]`);
-      const fallback = allProfiles.find(p => p.name?.toLowerCase() === name.toLowerCase());
-      if (fallback) return fallback.profileId || fallback._id;
-
+      console.log(`[nst] Search for "${name}": found ${allProfiles.length} profiles [${allProfiles.map(p => p.name).join(', ')}]`);
+      const match = allProfiles.find(p => p.name?.toLowerCase() === name.toLowerCase());
+      if (match) return match.profileId || match._id;
       return null;
     } catch (err) {
       console.error(`[nst] Error finding profile "${name}":`, err.message);
@@ -83,22 +73,19 @@ class NstManager {
     }
 
     console.log(`[nst] WARNING: Profile "${name}" NOT FOUND — creating new profile...`);
-    const res = await this.client.profiles().createProfile({
-      name,
-      platform: 'Windows',
-      kernelMilestone: '132',
-      fingerprint: {
-        flags: {
-          audio: 'Noise',
-          canvas: 'Noise',
-          fonts: 'Masked',
-          gpu: 'Allow',
-          webgl: 'Noise',
+    const res = await this.api('/profiles', {
+      method: 'POST',
+      body: JSON.stringify({
+        name,
+        platform: 'Windows',
+        kernelMilestone: '132',
+        fingerprint: {
+          flags: { audio: 'Noise', canvas: 'Noise', fonts: 'Masked', gpu: 'Allow', webgl: 'Noise' },
+          hardwareConcurrency: 8,
+          deviceMemory: 8,
+          language: 'en-US',
         },
-        hardwareConcurrency: 8,
-        deviceMemory: 8,
-        language: 'en-US',
-      },
+      }),
     });
 
     const profileId = res?.data?.profileId || res?.data?._id;
@@ -112,7 +99,10 @@ class NstManager {
   async setProxy(profileId, proxyUrl) {
     if (!proxyUrl) return;
     console.log(`[nst] Setting proxy for ${profileId}: ${proxyUrl}`);
-    await this.client.profiles().updateProfileProxy(profileId, { url: proxyUrl });
+    await this.api(`/profiles/${profileId}/proxy`, {
+      method: 'PATCH',
+      body: JSON.stringify({ url: proxyUrl }),
+    });
     console.log(`[nst] Proxy set`);
   }
 
@@ -123,23 +113,13 @@ class NstManager {
       profileId = await this.ensureProfile(profileIdOrName);
     }
 
-    // If already running, skip — don't restart
+    // If already running, skip
     if (await this.isProfileRunning(profileId)) {
       console.log(`[nst] Profile ${profileId} already running — skipping`);
       return { profileId, alreadyRunning: true };
     }
 
-    // Ensure profile language is en-US to prevent auto-translate
-    try {
-      const res = await fetch(`http://localhost:8848/api/v2/profiles/${profileId}`, {
-        method: 'PATCH',
-        headers: { 'Content-Type': 'application/json', 'x-api-key': this.apiKey },
-        body: JSON.stringify({ fingerprint: { language: 'en-US' } }),
-      });
-      if (!res.ok) console.warn(`[nst] Could not update profile language: ${res.status}`);
-    } catch (err) {
-      console.warn(`[nst] Could not update profile language:`, err.message);
-    }
+    // Language set via --lang arg in connectConfig, no need to update profile
 
     // Set proxy before launch
     if (options.proxy) {
@@ -149,12 +129,10 @@ class NstManager {
     const connectConfig = {
       headless: false,
       autoClose: false,
-    };
-
-    // Disable Chrome auto-translate
-    connectConfig.args = {
-      '--lang': 'en-US',
-      '--disable-features': 'Translate',
+      args: {
+        '--lang': 'en-US',
+        '--disable-features': 'Translate',
+      },
     };
 
     if (options.extensionPath) {
@@ -164,11 +142,7 @@ class NstManager {
     }
 
     console.log(`[nst] Connecting browser for profile: ${profileId}`);
-
-    // SDK uses axios which serializes nested objects as config[key]=value
-    // But Nstbrowser API expects ?config=<JSON-string>
-    // Workaround: call the API directly with fetch instead of SDK
-    const apiUrl = `http://localhost:8848/api/v2/connect/${profileId}?config=${encodeURIComponent(JSON.stringify(connectConfig))}`;
+    const apiUrl = `${this.baseUrl}/connect/${profileId}?config=${encodeURIComponent(JSON.stringify(connectConfig))}`;
     const rawRes = await fetch(apiUrl, { headers: { 'x-api-key': this.apiKey } });
     const res = await rawRes.json();
     if (res.err) throw new Error(res.msg || 'Failed to connect browser');
@@ -186,7 +160,7 @@ class NstManager {
     }
 
     console.log(`[nst] Stopping browser for profile: ${profileId}`);
-    await this.client.browsers().stopBrowser(profileId);
+    await this.api(`/browsers/${profileId}/stop`, { method: 'PUT' });
     console.log(`[nst] Browser stopped`);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "channel-worker",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "Channel Manager worker daemon — runs on remote machines to execute video pipeline jobs",
   "main": "lib/daemon.js",
   "bin": {
@@ -16,7 +16,6 @@
   },
   "dependencies": {
     "node-fetch": "^3.3.2",
-    "nstbrowser-sdk-node": "^0.1.1",
     "ws": "^8.18.0"
   },
   "engines": {