tronclass-auto 1.4.6 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tronclass-auto",
-  "version": "1.4.6",
+  "version": "1.5.1",
   "description": "自動觀看 eclass/TronClass 影片、填寫表單的 CLI 工具",
   "main": "src/index.js",
   "bin": {

package/src/index.js

@@ -81,15 +81,14 @@ async function processCourse(page, courseId, stats) {
   let skip = 0;
   let fail = 0;
   let totalProcessed = 0;
-  let serverRejects = {};
-  let consecutiveLocked = 0;
+  let triedIds = new Set();
 
   console.log(chalk.cyan(`  [fetching course activities...]`));
 
   while (true) {
     const uncompleted = await getUncompleted(page, courseId);
     const videos = uncompleted.filter(u => u.type === 'online_video');
-    const remaining = videos.filter(v => !isDone(courseId, v.id));
+    const remaining = videos.filter(v => !isDone(courseId, v.id) && !triedIds.has(v.id));
 
     if (remaining.length === 0) break;
 
@@ -115,8 +114,9 @@ async function processCourse(page, courseId, stats) {
 
     if (!page.url().includes('learning-activity')) {
       console.log(chalk.yellow('  Page redirect, skipping'));
-      markLocked(courseId, act.id);
-      break;
+      triedIds.add(act.id);
+      totalProcessed++;
+      continue;
     }
 
     const playerType = await page.evaluate(() => {
@@ -128,25 +128,22 @@ async function processCourse(page, courseId, stats) {
       }
       return 'none';
     });
+
     if (playerType === 'none') {
-      console.log(chalk.yellow('  No video, waiting more...'));
+      console.log(chalk.yellow('  No player, waiting more...'));
       await page.waitForTimeout(10000);
       const hasVideoNow = await page.evaluate(() => {
-        if (document.querySelector('video')) return true;
+        if (document.querySelector('video')) return 'html5';
         const yt = document.querySelector('iframe[src*="youtube"], iframe[src*="youtu.be"], iframe[src*="vimeo"]');
-        if (yt) return true;
-        for (const f of document.querySelectorAll('iframe')) {
-          try { if (f.contentDocument && f.contentDocument.querySelector('video')) return true; } catch (e) {}
-        }
-        return false;
+        if (yt) return 'iframe';
+        return 'none';
       });
-      if (!hasVideoNow) {
-        console.log(chalk.yellow('  Still no video, skipping (not a video activity)'));
-        markLocked(courseId, act.id);
-        break;
+      if (hasVideoNow === 'none') {
+        console.log(chalk.yellow('  No player found, skipping'));
+        triedIds.add(act.id);
+        totalProcessed++;
+        continue;
       }
-    } else {
-      consecutiveLocked = 0;
     }
 
     try {
@@ -158,48 +155,50 @@ async function processCourse(page, courseId, stats) {
       }
       const success = await watchVideo(page, stats);
       if (success) {
-        await page.waitForTimeout(5000);
-        await page.goto(`${BASE_URL}/course/${courseId}/content#/`, {
-          waitUntil: 'domcontentloaded', timeout: 15000
-        }).catch(() => {});
-        await page.waitForTimeout(3000);
-
-        const serverComplete = await page.evaluate((actId) => {
-          const el = document.querySelector('.learning-activities');
-          if (!el) return false;
-          const scope = angular.element(el).scope();
-          if (!scope) return false;
-          const activities = document.querySelectorAll('.learning-activity.sortable');
-          for (const actEl of activities) {
-            const actScope = angular.element(actEl).scope();
-            if (!actScope || !actScope.activity) continue;
-            if (actScope.activity.id == actId) {
-              try { return scope.getActivityCompleteness(actScope.activity) === 'full'; } catch (e) {}
+        let serverComplete = false;
+        for (let attempt = 0; attempt < 5; attempt++) {
+          await page.waitForTimeout(10000);
+          await page.goto(`${BASE_URL}/course/${courseId}/content#/`, {
+            waitUntil: 'domcontentloaded', timeout: 15000
+          }).catch(() => {});
+          await page.waitForTimeout(5000);
+
+          serverComplete = await page.evaluate((actId) => {
+            const el = document.querySelector('.learning-activities');
+            if (!el) return false;
+            const scope = angular.element(el).scope();
+            if (!scope) return false;
+            const activities = document.querySelectorAll('.learning-activity.sortable');
+            for (const actEl of activities) {
+              const actScope = angular.element(actEl).scope();
+              if (!actScope || !actScope.activity) continue;
+              if (actScope.activity.id == actId) {
+                try { return scope.getActivityCompleteness(actScope.activity) === 'full'; } catch (e) {}
+              }
             }
-          }
-          return false;
-        }, act.id);
+            return false;
+          }, act.id);
+
+          if (serverComplete) break;
+          console.log(chalk.gray(`  Checking server... (${attempt + 1}/5)`));
+        }
 
         if (serverComplete) {
           markDone(courseId, act.id);
           done++;
           console.log(chalk.green('  ✓ Saved (server confirmed)'));
         } else {
-          serverRejects[act.id] = (serverRejects[act.id] || 0) + 1;
-          if (serverRejects[act.id] >= 2) {
-            console.log(chalk.yellow('  Server rejected twice, marking done locally'));
-            markDone(courseId, act.id);
-            done++;
-          } else {
-            console.log(chalk.yellow('  Server not confirmed, will retry...'));
-            fail++;
-          }
+          console.log(chalk.yellow('  Server not confirmed after retries, skipping'));
+          triedIds.add(act.id);
+          fail++;
         }
       } else {
+        triedIds.add(act.id);
         fail++;
       }
     } catch (e) {
       console.log(chalk.red(`  [ERROR] ${e.message}`));
+      triedIds.add(act.id);
       fail++;
     }
 

package/src/video.js

@@ -60,32 +60,64 @@ async function watchYouTube(page, stats) {
   let rate = 1;
 
   try {
+    await page.evaluate(() => {
+      const f = document.querySelector('iframe[src*="youtube"], iframe[src*="youtu.be"]');
+      if (f) f.scrollIntoView({ block: 'center' });
+    });
+    await page.waitForTimeout(2000);
+
     const ytFrame = page.locator('iframe[src*="youtube"], iframe[src*="youtu.be"]');
     await ytFrame.click({ timeout: 5000 }).catch(() => {});
     await page.waitForTimeout(5000);
 
-    await page.evaluate(() => {
-      const f = document.querySelector('iframe[src*="youtube"], iframe[src*="youtu.be"]');
-      if (!f) return;
-      f.contentWindow.postMessage('{"event":"listening"}', '*');
-    });
-    await page.waitForTimeout(3000);
+    const postMsg = async (msg) => {
+      await page.evaluate((m) => {
+        const f = document.querySelector('iframe[src*="youtube"], iframe[src*="youtu.be"]');
+        if (f) f.contentWindow.postMessage(m, '*');
+      }, typeof msg === 'string' ? msg : JSON.stringify(msg));
+    };
 
-    await page.evaluate(() => {
-      const f = document.querySelector('iframe[src*="youtube"], iframe[src*="youtu.be"]');
-      if (!f) return;
-      f.contentWindow.postMessage(JSON.stringify({ event: 'command', func: 'playVideo', args: [] }), '*');
+    await postMsg('{"event":"listening"}');
+    await page.waitForTimeout(2000);
+    await postMsg({ event: 'command', func: 'mute', args: [] });
+    await page.waitForTimeout(1000);
+    await postMsg({ event: 'command', func: 'setPlaybackRate', args: [2] });
+    await page.waitForTimeout(2000);
+    await postMsg({ event: 'command', func: 'playVideo', args: [] });
+    await page.waitForTimeout(5000);
+
+    rate = await page.evaluate(() => {
+      return new Promise((resolve) => {
+        const f = document.querySelector('iframe[src*="youtube"], iframe[src*="youtu.be"]');
+        if (!f) { resolve(1); return; }
+        let resolved = false;
+        const handler = (e) => {
+          try {
+            const d = typeof e.data === 'string' ? JSON.parse(e.data) : e.data;
+            if (d.event === 'infoDelivery' && d.info && d.info.playbackRate !== undefined && !resolved) {
+              resolved = true;
+              window.removeEventListener('message', handler);
+              resolve(d.info.playbackRate);
+            }
+          } catch(e) {}
+        };
+        window.addEventListener('message', handler);
+        f.contentWindow.postMessage(JSON.stringify({ event: 'command', func: 'getPlaybackRate', args: [] }), '*');
+        setTimeout(() => { if (!resolved) { resolved = true; window.removeEventListener('message', handler); resolve(1); } }, 5000);
+      });
     });
-    await page.waitForTimeout(3000);
+    log(chalk.blue(`  Speed: ${rate}x`));
 
     const isPlaying = await page.evaluate(() => {
       return new Promise((resolve) => {
         const f = document.querySelector('iframe[src*="youtube"], iframe[src*="youtu.be"]');
         if (!f) { resolve(false); return; }
+        let resolved = false;
         const handler = (e) => {
           try {
             const d = typeof e.data === 'string' ? JSON.parse(e.data) : e.data;
-            if (d.event === 'infoDelivery' && d.info) {
+            if (d.event === 'infoDelivery' && d.info && !resolved) {
+              resolved = true;
               window.removeEventListener('message', handler);
               resolve(d.info.currentTime > 0);
             }
@@ -93,67 +125,52 @@ async function watchYouTube(page, stats) {
         };
         window.addEventListener('message', handler);
         f.contentWindow.postMessage(JSON.stringify({ event: 'command', func: 'getCurrentTime', args: [] }), '*');
-        setTimeout(() => { window.removeEventListener('message', handler); resolve(false); }, 5000);
+        setTimeout(() => { if (!resolved) { resolved = true; window.removeEventListener('message', handler); resolve(false); } }, 5000);
       });
     });
 
-    if (!isPlaying) {
-      log(chalk.yellow('  Player not responding, retrying click...'));
-      try {
-        const frame = page.frameLocator('iframe[src*="youtube"], iframe[src*="youtu.be"]');
-        await frame.locator('.ytp-large-play-button, .ytp-play-button').first().click({ timeout: 5000 }).catch(() => {});
-      } catch(e) {}
-      await page.waitForTimeout(3000);
-
+    if (isPlaying) {
+      log(chalk.green('  Playing ✓'));
+    } else {
+      log(chalk.yellow('  Not playing, retrying...'));
       await page.evaluate(() => {
         const f = document.querySelector('iframe[src*="youtube"], iframe[src*="youtu.be"]');
         if (!f) return;
         f.contentWindow.postMessage('{"event":"listening"}', '*');
       });
-      await page.waitForTimeout(2000);
+      await page.waitForTimeout(3000);
       await page.evaluate(() => {
         const f = document.querySelector('iframe[src*="youtube"], iframe[src*="youtu.be"]');
         if (!f) return;
         f.contentWindow.postMessage(JSON.stringify({ event: 'command', func: 'playVideo', args: [] }), '*');
       });
-      await page.waitForTimeout(3000);
-    }
-
-    await page.evaluate(() => {
-      const f = document.querySelector('iframe[src*="youtube"], iframe[src*="youtu.be"]');
-      if (!f) return;
-      f.contentWindow.postMessage(JSON.stringify({ event: 'command', func: 'mute', args: [] }), '*');
-    });
-    await page.waitForTimeout(1000);
-
-    await page.evaluate(() => {
-      const f = document.querySelector('iframe[src*="youtube"], iframe[src*="youtu.be"]');
-      if (!f) return;
-      f.contentWindow.postMessage(JSON.stringify({ event: 'command', func: 'setPlaybackRate', args: [2] }), '*');
-    });
-    await page.waitForTimeout(2000);
-
-    rate = await page.evaluate(() => {
-      return new Promise((resolve) => {
-        const f = document.querySelector('iframe[src*="youtube"], iframe[src*="youtu.be"]');
-        if (!f) { resolve(1); return; }
-        const handler = (e) => {
-          try {
-            const d = typeof e.data === 'string' ? JSON.parse(e.data) : e.data;
-            if (d.event === 'infoDelivery' && d.info && d.info.playbackRate) {
-              window.removeEventListener('message', handler);
-              resolve(d.info.playbackRate);
-            }
-          } catch(e) {}
-        };
-        window.addEventListener('message', handler);
-        f.contentWindow.postMessage(JSON.stringify({ event: 'command', func: 'getPlaybackRate', args: [] }), '*');
-        setTimeout(() => { window.removeEventListener('message', handler); resolve(1); }, 3000);
+      await page.waitForTimeout(5000);
+
+      const retry = await page.evaluate(() => {
+        return new Promise((resolve) => {
+          const f = document.querySelector('iframe[src*="youtube"], iframe[src*="youtu.be"]');
+          if (!f) { resolve(false); return; }
+          let resolved = false;
+          const handler = (e) => {
+            try {
+              const d = typeof e.data === 'string' ? JSON.parse(e.data) : e.data;
+              if (d.event === 'infoDelivery' && d.info && !resolved) {
+                resolved = true;
+                window.removeEventListener('message', handler);
+                resolve(d.info.currentTime > 0);
+              }
+            } catch(e) {}
+          };
+          window.addEventListener('message', handler);
+          f.contentWindow.postMessage(JSON.stringify({ event: 'command', func: 'getCurrentTime', args: [] }), '*');
+          setTimeout(() => { if (!resolved) { resolved = true; window.removeEventListener('message', handler); resolve(false); } }, 5000);
+        });
       });
-    });
-    log(chalk.blue(`  Speed: ${rate}x`));
+      if (retry) log(chalk.green('  Playing ✓'));
+      else log(chalk.yellow('  Could not verify playback'));
+    }
   } catch (e) {
-    log(chalk.yellow(`  YouTube setup error: ${e.message}`));
+    log(chalk.yellow(`  YouTube error: ${e.message}`));
   }
 
   await page.waitForTimeout(2000);
@@ -167,8 +184,8 @@ async function watchYouTube(page, stats) {
     return 180;
   });
 
-  const waitTime = ytDuration + 30;
-  log(chalk.blue(`  ~${formatTime(ytDuration)} video → ~${formatTime(waitTime)} (2x playback, full wait)`));
+  const waitTime = (rate >= 2 ? Math.ceil(ytDuration / 2) : ytDuration) + 30;
+  log(chalk.blue(`  ~${formatTime(ytDuration)} video → ~${formatTime(waitTime)} (${rate}x)`));
 
   if (stats) {
     stats.currentVideoDuration = ytDuration;