tronclass-auto 1.5.0 → 1.5.1

package/package.json

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

package/src/index.js

@@ -155,34 +155,40 @@ async function processCourse(page, courseId, stats) {
       }
       const success = await watchVideo(page, stats);
       if (success) {
-        await page.waitForTimeout(10000);
-        await page.goto(`${BASE_URL}/course/${courseId}/content#/`, {
-          waitUntil: 'domcontentloaded', timeout: 15000
-        }).catch(() => {});
-        await page.waitForTimeout(5000);
-
-        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 {
-          console.log(chalk.yellow('  Server not confirmed, skipping'));
+          console.log(chalk.yellow('  Server not confirmed after retries, skipping'));
           triedIds.add(act.id);
           fail++;
         }

package/src/video.js

@@ -70,42 +70,39 @@ async function watchYouTube(page, stats) {
     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 && !resolved) {
+            if (d.event === 'infoDelivery' && d.info && d.info.playbackRate !== undefined && !resolved) {
               resolved = true;
               window.removeEventListener('message', handler);
-              resolve(d.info.playbackRate || 1);
+              resolve(d.info.playbackRate);
             }
           } catch(e) {}
         };
         window.addEventListener('message', handler);
-
-        f.contentWindow.postMessage(JSON.stringify({ event: 'command', func: 'mute', args: [] }), '*');
-        f.contentWindow.postMessage(JSON.stringify({ event: 'command', func: 'setPlaybackRate', args: [2] }), '*');
         f.contentWindow.postMessage(JSON.stringify({ event: 'command', func: 'getPlaybackRate', args: [] }), '*');
-
         setTimeout(() => { if (!resolved) { resolved = true; window.removeEventListener('message', handler); resolve(1); } }, 5000);
       });
     });
@@ -187,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;