tronclass-auto 1.3.9 → 1.4.1

package/package.json

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

package/src/index.js

@@ -157,9 +157,36 @@ async function processCourse(page, courseId, stats) {
       }
       const success = await watchVideo(page, stats);
       if (success) {
-        markDone(courseId, act.id);
-        done++;
-        console.log(chalk.green('  ✓ Saved'));
+        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) {}
+            }
+          }
+          return false;
+        }, act.id);
+
+        if (serverComplete) {
+          markDone(courseId, act.id);
+          done++;
+          console.log(chalk.green('  ✓ Saved (server confirmed)'));
+        } else {
+          console.log(chalk.yellow('  Server not confirmed yet, will retry next run'));
+          fail++;
+        }
       } else {
         fail++;
       }

package/src/video.js

@@ -61,33 +61,57 @@ async function watchYouTube(page, stats) {
   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);
+
+    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);
 
-    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) {}
+    const 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) => {
+  let rate = 1;
+  try {
+            const d = typeof e.data === 'string' ? JSON.parse(e.data) : e.data;
+            if (d.event === 'infoDelivery' && d.info && d.info.playbackRate) {
+              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 +125,13 @@ async function watchYouTube(page, stats) {
     return 180;
   });
 
-  const waitTime = Math.ceil(ytDuration / 2) + 30;
-  log(chalk.blue(`  ~${formatTime(ytDuration)} video → ~${formatTime(waitTime)} (2x)`));
+  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;
+    stats.currentVideoElapsed = 0;
+  }
 
   let elapsed = 0;
   let lastPct = -1;