tronclass-auto 1.4.0 → 1.4.2

package/package.json

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

package/src/index.js

@@ -81,6 +81,7 @@ async function processCourse(page, courseId, stats) {
   let skip = 0;
   let fail = 0;
   let totalProcessed = 0;
+  let serverRejects = {};
   let consecutiveLocked = 0;
 
   console.log(chalk.cyan(`  [fetching course activities...]`));
@@ -184,8 +185,15 @@ async function processCourse(page, courseId, stats) {
           done++;
           console.log(chalk.green('  ✓ Saved (server confirmed)'));
         } else {
-          console.log(chalk.yellow('  Server not confirmed yet, will retry next run'));
-          fail++;
+          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++;
+          }
         }
       } else {
         fail++;

package/src/video.js

@@ -57,37 +57,62 @@ async function watchVideo(page, stats) {
 
 async function watchYouTube(page, stats) {
   log(chalk.blue('  YouTube embed'));
+  let rate = 1;
 
   try {
     const ytFrame = page.locator('iframe[src*="youtube"], iframe[src*="youtu.be"]');
     await ytFrame.click({ timeout: 5000 }).catch(() => {});
-    await page.waitForTimeout(2000);
+    await page.waitForTimeout(3000);
 
-    const frame = page.frameLocator('iframe[src*="youtube"], iframe[src*="youtu.be"]');
-    const playBtn = frame.locator('.ytp-large-play-button');
-    await playBtn.click({ timeout: 5000 }).catch(() => {});
+    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);
 
-    try {
-      await frame.locator('.ytp-settings-button').click({ timeout: 3000 });
-      await page.waitForTimeout(500);
-      await frame.locator('.ytp-menuitem:has-text("播放速度"), .ytp-menuitem:has-text("Playback speed")').click({ timeout: 3000 });
-      await page.waitForTimeout(500);
-      await frame.locator('.ytp-menuitem:has-text("2"), .ytp-menuitem:has-text("2x")').click({ timeout: 3000 });
-      log(chalk.blue('  Speed: 2x ✓'));
-    } catch (e) {
-      log(chalk.yellow('  Speed: 1x (settings menu unavailable)'));
-    }
+    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(1000);
 
-    try {
-      await frame.locator('.ytp-settings-button').click({ timeout: 2000 });
-      await page.waitForTimeout(500);
-      await frame.locator('.ytp-menuitem:has-text("字幕"), .ytp-menuitem:has-text("Subtitles"), .ytp-menuitem:has-text("CC")').click({ timeout: 2000 }).catch(() => {});
-      await frame.locator('.ytp-menuitem:has-text("關閉"), .ytp-menuitem:has-text("Off"), .ytp-menuitem:has-text("None")').click({ timeout: 2000 }).catch(() => {});
-      await page.keyboard.press('Escape');
-    } catch (e) {}
+    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);
+      });
+    });
+    log(chalk.blue(`  Speed: ${rate}x`));
   } catch (e) {
-    log(chalk.yellow('  YouTube setup failed, falling back'));
+    log(chalk.yellow(`  YouTube setup error: ${e.message}`));
   }
 
   await page.waitForTimeout(2000);
@@ -101,8 +126,8 @@ async function watchYouTube(page, stats) {
     return 180;
   });
 
-  const waitTime = ytDuration + 30;
-  log(chalk.blue(`  ~${formatTime(ytDuration)} video → ~${formatTime(waitTime)} (YouTube 1x safe)`));
+  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;