channel-worker 1.6.0 → 1.6.2

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

@@ -1,8 +1,8 @@
 const WebSocket = require('ws');
 
 /**
- * Sync YouTube Studio stats via Nstbrowser CDP.
- * Flow: Launch profile → connect CDP → navigate to Studio → scrape stats → close
+ * Sync YouTube stats via Nstbrowser CDP.
+ * Flow: Launch profile → navigate to youtube.com/@handle/about → read stats table
  */
 class StatsSyncer {
   constructor(nstManager, apiClient) {
@@ -22,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', {
@@ -45,7 +47,7 @@ class StatsSyncer {
     }
   }
 
-  scrapeViaCDP(wsEndpoint) {
+  scrapeViaCDP(wsEndpoint, youtubeHandle) {
     return new Promise((resolve, reject) => {
       const ws = new WebSocket(wsEndpoint);
       let msgId = 1;
@@ -92,221 +94,105 @@ class StatsSyncer {
           await s('Page.enable');
           await s('Runtime.enable');
 
-          let stats = { subscribers: 0, total_views: 0, video_count: 0 };
-
-          // Step 1: Go to YouTube Studio → auto-redirects to correct channel
-          console.log('[stats] Navigating to YouTube Studio...');
-          await s('Page.navigate', { url: 'https://studio.youtube.com' });
-          await this.waitForLoad(s);
-          await this.sleep(5000);
-
-          // Get channel ID from URL
-          const urlResult = await s('Runtime.evaluate', { expression: 'window.location.href', returnByValue: true });
-          const studioUrl = urlResult?.result?.value || '';
-          console.log(`[stats] Studio URL: ${studioUrl}`);
-
-          const channelIdMatch = studioUrl.match(/channel\/(UC[\w-]+)/);
-          const channelId = channelIdMatch ? channelIdMatch[1] : null;
-
-          if (!channelId) {
-            // Try ytcfg
-            const cfgResult = await s('Runtime.evaluate', {
-              expression: '(window.ytcfg && window.ytcfg.get) ? window.ytcfg.get("CHANNEL_ID") : ""',
-              returnByValue: true,
-            });
-            console.log(`[stats] ytcfg CHANNEL_ID: ${cfgResult?.result?.value}`);
-          }
-
-          const cid = channelId || (await s('Runtime.evaluate', {
-            expression: '(window.ytcfg && window.ytcfg.get) ? window.ytcfg.get("CHANNEL_ID") : ""',
-            returnByValue: true,
-          }))?.result?.value;
-
-          // Step 2: Navigate to Studio Analytics page (English URL works regardless of UI language)
-          if (cid) {
-            const analyticsUrl = `https://studio.youtube.com/channel/${cid}/analytics/tab-overview/period-default`;
-            console.log(`[stats] Navigating to analytics: ${analyticsUrl}`);
-            await s('Page.navigate', { url: analyticsUrl });
+          // 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 {
+            // 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(6000);
-
-            // Scrape analytics page — look for numbers regardless of language
-            const analyticsResult = await s('Runtime.evaluate', {
-              expression: `
-                (function() {
-                  var result = { subscribers: 0, total_views: 0, video_count: 0, debug_text: '' };
-                  var text = document.body ? document.body.innerText : '';
-                  result.debug_text = text.substring(0, 800);
-
-                  // YouTube Studio Analytics shows metric cards with labels and numbers
-                  // The layout is: Label (in any language) followed by a number
-                  // We look for large numbers near subscriber/view keywords in ANY language
-
-                  // Strategy: find all metric-like elements by looking for number patterns
-                  // Studio analytics typically shows: Views, Watch time, Subscribers
-                  // in cards with the number prominently displayed
-
-                  // Try to find subscriber-related numbers
-                  // Multi-language patterns: subscribers, người đăng ký, abonnés, Abonnenten, etc.
-                  var subKeywords = /subscri|đăng ký|abonn|подписч|구독/i;
-                  var viewKeywords = /views?|lượt xem|vues?|aufrufe|просмотр|조회/i;
-
-                  var lines = text.split('\\n').map(function(l) { return l.trim(); }).filter(function(l) { return l.length > 0; });
-
-                  for (var i = 0; i < lines.length; i++) {
-                    var line = lines[i];
-                    var nextLine = lines[i + 1] || '';
-                    var prevLine = lines[i - 1] || '';
-
-                    // Check if this line or adjacent lines contain keywords
-                    if (subKeywords.test(line) || subKeywords.test(prevLine)) {
-                      // Look for a number in this line or nearby
-                      var numInLine = extractNumber(line);
-                      var numInNext = extractNumber(nextLine);
-                      if (numInLine > 0 && result.subscribers === 0) result.subscribers = numInLine;
-                      else if (numInNext > 0 && result.subscribers === 0) result.subscribers = numInNext;
-                    }
-
-                    if (viewKeywords.test(line) || viewKeywords.test(prevLine)) {
-                      var numInLine2 = extractNumber(line);
-                      var numInNext2 = extractNumber(nextLine);
-                      if (numInLine2 > 0 && result.total_views === 0) result.total_views = numInLine2;
-                      else if (numInNext2 > 0 && result.total_views === 0) result.total_views = numInNext2;
-                    }
-                  }
-
-                  // Also try: Current subscribers count shown in Studio sidebar
-                  // Pattern: "Current subscribers\\n123" or "Người đăng ký hiện tại\\n123"
-                  var currentSubMatch = text.match(/(?:current subscribers|người đăng ký hiện tại|subscriber|đăng ký)[\\s\\n]*([\\d,\\.]+[KMB]?)/i);
-                  if (currentSubMatch && result.subscribers === 0) {
-                    result.subscribers = parseHumanNum(currentSubMatch[1]);
-                  }
-
-                  function extractNumber(str) {
-                    if (!str) return 0;
-                    // Match standalone numbers like "1,234" or "5.2K" or "123"
-                    var m = str.match(/^([\\d,\\.]+[KMB]?)$/i) || str.match(/\\b([\\d,\\.]+[KMB]?)\\b/);
-                    if (m) return parseHumanNum(m[1]);
-                    return 0;
-                  }
-
-                  function parseHumanNum(str) {
-                    if (!str) return 0;
-                    str = str.replace(/,/g, '').trim();
-                    var m = str.match(/([\\d\\.]+)\\s*([KMB])/i);
-                    if (m) {
-                      var n = parseFloat(m[1]);
-                      var s = m[2].toUpperCase();
-                      if (s === 'K') return Math.round(n * 1000);
-                      if (s === 'M') return Math.round(n * 1000000);
-                      if (s === 'B') return Math.round(n * 1000000000);
-                    }
-                    return parseInt(str, 10) || 0;
-                  }
-
-                  return JSON.stringify(result);
-                })()
-              `,
-              returnByValue: true,
-            });
-
-            try {
-              var parsed = JSON.parse(analyticsResult?.result?.value || '{}');
-              console.log('[stats] Analytics debug text (first 300):', (parsed.debug_text || '').substring(0, 300));
-              if (parsed.subscribers > 0) stats.subscribers = parsed.subscribers;
-              if (parsed.total_views > 0) stats.total_views = parsed.total_views;
-            } catch {}
+            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`;
           }
 
-          // Step 3: Get video count + subscriber from channel page via ytInitialData
-          var channelPageUrl = cid
-            ? 'https://www.youtube.com/channel/' + cid
-            : 'https://www.youtube.com/@me';
-
-          console.log('[stats] Navigating to channel page:', channelPageUrl);
-          await s('Page.navigate', { url: channelPageUrl });
+          // 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);
 
-          var ytResult = await s('Runtime.evaluate', {
+          // Read #additional-info-container table
+          const result = await s('Runtime.evaluate', {
             expression: `
               (function() {
-                var result = { subscribers: 0, total_views: 0, video_count: 0 };
-                try {
-                  var data = window.ytInitialData;
-                  if (!data) return JSON.stringify({ error: 'no ytInitialData' });
-
-                  // Try pageHeaderRenderer (new layout)
-                  var pageHeader = data.header && data.header.pageHeaderRenderer;
-                  if (pageHeader) {
-                    var content = pageHeader.content && pageHeader.content.pageHeaderViewModel;
-                    if (content && content.metadata && content.metadata.contentMetadataViewModel) {
-                      var rows = content.metadata.contentMetadataViewModel.metadataRows || [];
-                      for (var r = 0; r < rows.length; r++) {
-                        var parts = rows[r].metadataParts || [];
-                        for (var p = 0; p < parts.length; p++) {
-                          var t = (parts[p].text && parts[p].text.content) || '';
-                          // subscriber text like "123 subscribers" or "0 người đăng ký"
-                          if (/subscri|đăng ký/i.test(t)) {
-                            var m = t.match(/([\\d,\\.]+[KMB]?)/);
-                            if (m) result.subscribers = parseN(m[1]);
-                          }
-                          // video count like "1 video" or "15 video"
-                          if (/video/i.test(t)) {
-                            var m2 = t.match(/([\\d,]+)/);
-                            if (m2) result.video_count = parseInt(m2[1].replace(/,/g, ''), 10);
-                          }
-                        }
-                      }
-                    }
-                  }
+                var stats = { subscribers: -1, total_views: -1, video_count: -1, debug: '' };
 
-                  // Try c4TabbedHeaderRenderer (old layout)
-                  var c4Header = data.header && data.header.c4TabbedHeaderRenderer;
-                  if (c4Header) {
-                    var subText = c4Header.subscriberCountText && c4Header.subscriberCountText.simpleText || '';
-                    if (subText) {
-                      var m3 = subText.match(/([\\d,\\.]+[KMB]?)/);
-                      if (m3 && result.subscribers === 0) result.subscribers = parseN(m3[1]);
-                    }
-                    if (c4Header.videosCountText) {
-                      var vText = c4Header.videosCountText.runs ? c4Header.videosCountText.runs.map(function(r){return r.text}).join('') : (c4Header.videosCountText.simpleText || '');
-                      var m4 = vText.match(/([\\d,]+)/);
-                      if (m4) result.video_count = parseInt(m4[1].replace(/,/g, ''), 10);
-                    }
-                  }
+                var container = document.querySelector('#additional-info-container');
+                if (!container) {
+                  stats.debug = 'no #additional-info-container';
+                  return JSON.stringify(stats);
+                }
 
-                } catch (e) {
-                  return JSON.stringify({ error: e.message });
+                var table = container.querySelector('table');
+                if (!table) {
+                  stats.debug = 'no table, text: ' + container.innerText.substring(0, 300);
+                  return JSON.stringify(stats);
                 }
 
-                function parseN(str) {
-                  if (!str) return 0;
-                  str = str.replace(/,/g, '').trim();
-                  var m = str.match(/([\\d\\.]+)\\s*([KMB])/i);
-                  if (m) {
-                    var n = parseFloat(m[1]);
-                    var s = m[2].toUpperCase();
-                    if (s === 'K') return Math.round(n * 1000);
-                    if (s === 'M') return Math.round(n * 1000000);
-                    if (s === 'B') return Math.round(n * 1000000000);
+                var rows = table.querySelectorAll('tr');
+                var texts = [];
+                rows.forEach(function(row) {
+                  var text = row.innerText.trim();
+                  texts.push(text);
+
+                  var num = 0;
+                  var suffixMatch = text.match(/([\\d,\\.]+)\\s*([KMB])/i);
+                  if (suffixMatch) {
+                    var n = parseFloat(suffixMatch[1].replace(/,/g, ''));
+                    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);
                   }
-                  return parseInt(str, 10) || 0;
-                }
 
-                return JSON.stringify(result);
+                  if (/subscriber|đăng ký/i.test(text)) {
+                    stats.subscribers = num;
+                  } else if (/\\bvideos?\\b/i.test(text)) {
+                    stats.video_count = num;
+                  } else if (/\\bviews?\\b|lượt xem/i.test(text)) {
+                    stats.total_views = num;
+                  }
+                });
+
+                stats.debug = texts.join(' | ');
+                return JSON.stringify(stats);
               })()
             `,
             returnByValue: true,
           });
 
+          var stats = { subscribers: 0, total_views: 0, video_count: 0 };
           try {
-            var ytData = JSON.parse(ytResult?.result?.value || '{}');
-            console.log('[stats] ytInitialData result:', JSON.stringify(ytData));
-            if (ytData.subscribers > 0 && stats.subscribers === 0) stats.subscribers = ytData.subscribers;
-            if (ytData.video_count > 0) stats.video_count = ytData.video_count;
-            if (ytData.total_views > 0 && stats.total_views === 0) stats.total_views = ytData.total_views;
-          } catch {}
+            var parsed = JSON.parse(result?.result?.value || '{}');
+            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;
+          } catch (e) {
+            console.error('[stats] Parse error:', e.message);
+          }
 
           clearTimeout(timeout);
           ws.close();

package/package.json

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