channel-worker 1.6.1 → 1.6.3

package/lib/command-poller.js

@@ -899,8 +899,8 @@ class CommandPoller {
   }
 
   async handleSyncYoutubeStats(command) {
-    const { channel_id } = command.payload || {};
-    console.log(`[commands] Syncing YouTube stats for channel: ${channel_id}`);
+    const { channel_id, youtube_handle } = command.payload || {};
+    console.log(`[commands] Syncing YouTube stats for channel: ${channel_id} (handle: ${youtube_handle || 'none'})`);
 
     try {
       if (!this.nst) {
@@ -917,6 +917,9 @@ class CommandPoller {
       if (!channel) throw new Error(`Channel ${channel_id} not found`);
       if (!channel.nst_profile_id) throw new Error(`Channel "${channel.name}" has no Nstbrowser profile`);
 
+      // Pass youtube_handle from command payload
+      channel.youtube_handle = youtube_handle || null;
+
       const syncer = new StatsSyncer(this.nst, this.api);
       const stats = await syncer.syncYouTubeStats(channel);
 

package/lib/stats-syncer.js

@@ -2,8 +2,7 @@ const WebSocket = require('ws');
 
 /**
  * Sync YouTube stats via Nstbrowser CDP.
- * Flow: Launch profile → connect CDP → get channel ID from Studio →
- *       navigate to channel About page → read #additional-info-container table
+ * Flow: Launch profile → navigate to youtube.com/@handle/about → read stats table
  */
 class StatsSyncer {
   constructor(nstManager, apiClient) {
@@ -23,8 +22,10 @@ class StatsSyncer {
 
     if (!wsEndpoint) throw new Error('No wsEndpoint returned from Nstbrowser');
 
+    const youtubeHandle = channel.youtube_handle;
+
     try {
-      const stats = await this.scrapeViaCDP(wsEndpoint);
+      const stats = await this.scrapeViaCDP(wsEndpoint, youtubeHandle);
       console.log(`[stats] "${channel.name}" → subs: ${stats.subscribers}, views: ${stats.total_views}, videos: ${stats.video_count}`);
 
       await this.api.request('POST', '/analytics/sync', {
@@ -33,6 +34,7 @@ class StatsSyncer {
         subscribers: stats.subscribers,
         total_views: stats.total_views,
         video_count: stats.video_count,
+        avatar_url: stats.avatar_url,
       });
 
       console.log(`[stats] "${channel.name}" stats saved to API`);
@@ -46,7 +48,7 @@ class StatsSyncer {
     }
   }
 
-  scrapeViaCDP(wsEndpoint) {
+  scrapeViaCDP(wsEndpoint, youtubeHandle) {
     return new Promise((resolve, reject) => {
       const ws = new WebSocket(wsEndpoint);
       let msgId = 1;
@@ -93,86 +95,77 @@ class StatsSyncer {
           await s('Page.enable');
           await s('Runtime.enable');
 
-          // Step 1: Go to YouTube Studio to get channel ID
-          console.log('[stats] Navigating to YouTube Studio...');
-          await s('Page.navigate', { url: 'https://studio.youtube.com' });
-          await this.waitForLoad(s);
-          await this.sleep(4000);
-
-          const urlResult = await s('Runtime.evaluate', { expression: 'window.location.href', returnByValue: true });
-          const studioUrl = urlResult?.result?.value || '';
-          console.log(`[stats] Studio URL: ${studioUrl}`);
-
-          // Extract channel ID
-          let cid = null;
-          const cidMatch = studioUrl.match(/channel\/(UC[\w-]+)/);
-          if (cidMatch) {
-            cid = cidMatch[1];
+          // Determine the about URL
+          let aboutUrl;
+          if (youtubeHandle) {
+            // Direct: youtube.com/@handle/about
+            const handle = youtubeHandle.startsWith('@') ? youtubeHandle : '@' + youtubeHandle;
+            aboutUrl = `https://www.youtube.com/${handle}/about`;
           } else {
-            const cfgResult = await s('Runtime.evaluate', {
-              expression: '(window.ytcfg && window.ytcfg.get) ? window.ytcfg.get("CHANNEL_ID") : ""',
-              returnByValue: true,
-            });
-            cid = cfgResult?.result?.value || null;
+            // Fallback: go to Studio first to get channel ID
+            console.log('[stats] No youtube_handle, falling back to Studio...');
+            await s('Page.navigate', { url: 'https://studio.youtube.com' });
+            await this.waitForLoad(s);
+            await this.sleep(4000);
+
+            const urlResult = await s('Runtime.evaluate', { expression: 'window.location.href', returnByValue: true });
+            const studioUrl = urlResult?.result?.value || '';
+            const cidMatch = studioUrl.match(/channel\/(UC[\w-]+)/);
+            let cid = cidMatch ? cidMatch[1] : null;
+
+            if (!cid) {
+              const cfgResult = await s('Runtime.evaluate', {
+                expression: '(window.ytcfg && window.ytcfg.get) ? window.ytcfg.get("CHANNEL_ID") : ""',
+                returnByValue: true,
+              });
+              cid = cfgResult?.result?.value || null;
+            }
+
+            if (!cid) throw new Error('Could not find channel ID from YouTube Studio');
+            aboutUrl = `https://www.youtube.com/channel/${cid}/about`;
           }
 
-          if (!cid) {
-            throw new Error('Could not find channel ID from YouTube Studio');
-          }
-          console.log(`[stats] Channel ID: ${cid}`);
-
-          // Step 2: Navigate to channel About page
-          const aboutUrl = `https://www.youtube.com/channel/${cid}/about`;
+          // Navigate directly to about page
           console.log(`[stats] Navigating to: ${aboutUrl}`);
           await s('Page.navigate', { url: aboutUrl });
           await this.waitForLoad(s);
           await this.sleep(4000);
 
-          // Step 3: Read #additional-info-container table
+          // Read #additional-info-container table
           const result = await s('Runtime.evaluate', {
             expression: `
               (function() {
                 var stats = { subscribers: -1, total_views: -1, video_count: -1, debug: '' };
 
-                // Find the table inside #additional-info-container
                 var container = document.querySelector('#additional-info-container');
                 if (!container) {
-                  stats.debug = 'no #additional-info-container found';
-                  // Fallback: try to find stats from page text
-                  var text = document.body ? document.body.innerText : '';
-                  stats.debug = text.substring(0, 500);
+                  stats.debug = 'no #additional-info-container';
                   return JSON.stringify(stats);
                 }
 
                 var table = container.querySelector('table');
                 if (!table) {
-                  stats.debug = 'no table in container, text: ' + container.innerText.substring(0, 300);
+                  stats.debug = 'no table, text: ' + container.innerText.substring(0, 300);
                   return JSON.stringify(stats);
                 }
 
-                // Each row has: icon cell + text cell (e.g. "1 subscriber", "3 videos", "743 views")
                 var rows = table.querySelectorAll('tr');
                 var texts = [];
                 rows.forEach(function(row) {
                   var text = row.innerText.trim();
                   texts.push(text);
 
-                  // Match patterns: "X subscriber(s)", "X video(s)", "X view(s)"
-                  // Also Vietnamese: "X người đăng ký", "X video", "X lượt xem"
                   var num = 0;
-                  var numMatch = text.match(/([\\d,\\.]+)/);
-                  if (numMatch) {
-                    num = parseInt(numMatch[1].replace(/,/g, ''), 10);
-                  }
-
-                  // Check for K/M/B suffix
                   var suffixMatch = text.match(/([\\d,\\.]+)\\s*([KMB])/i);
                   if (suffixMatch) {
                     var n = parseFloat(suffixMatch[1].replace(/,/g, ''));
-                    var suffix = suffixMatch[2].toUpperCase();
-                    if (suffix === 'K') num = Math.round(n * 1000);
-                    else if (suffix === 'M') num = Math.round(n * 1000000);
-                    else if (suffix === 'B') num = Math.round(n * 1000000000);
+                    var sx = suffixMatch[2].toUpperCase();
+                    if (sx === 'K') num = Math.round(n * 1000);
+                    else if (sx === 'M') num = Math.round(n * 1000000);
+                    else if (sx === 'B') num = Math.round(n * 1000000000);
+                  } else {
+                    var numMatch = text.match(/([\\d,]+)/);
+                    if (numMatch) num = parseInt(numMatch[1].replace(/,/g, ''), 10);
                   }
 
                   if (/subscriber|đăng ký/i.test(text)) {
@@ -184,6 +177,12 @@ class StatsSyncer {
                   }
                 });
 
+                // Get channel avatar
+                var avatarEl = document.querySelector('#channel-header-container img, yt-decorated-avatar img, yt-avatar-shape img');
+                if (avatarEl && avatarEl.src) {
+                  stats.avatar_url = avatarEl.src;
+                }
+
                 stats.debug = texts.join(' | ');
                 return JSON.stringify(stats);
               })()
@@ -191,15 +190,16 @@ class StatsSyncer {
             returnByValue: true,
           });
 
-          var stats = { subscribers: 0, total_views: 0, video_count: 0 };
+          var stats = { subscribers: 0, total_views: 0, video_count: 0, avatar_url: null };
           try {
             var parsed = JSON.parse(result?.result?.value || '{}');
-            console.log(`[stats] About page data: ${parsed.debug}`);
+            console.log('[stats] About page data:', parsed.debug);
             if (parsed.subscribers >= 0) stats.subscribers = parsed.subscribers;
             if (parsed.total_views >= 0) stats.total_views = parsed.total_views;
             if (parsed.video_count >= 0) stats.video_count = parsed.video_count;
+            if (parsed.avatar_url) stats.avatar_url = parsed.avatar_url;
           } catch (e) {
-            console.error(`[stats] Parse error: ${e.message}`);
+            console.error('[stats] Parse error:', e.message);
           }
 
           clearTimeout(timeout);

package/package.json

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