tronclass-auto 1.2.1 → 1.2.3

package/package.json

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

package/src/index.js

@@ -27,10 +27,28 @@ async function getUncompleted(page, courseId) {
       let completeness = '';
       try { completeness = scope.getActivityCompleteness(a); } catch (e) {}
       if (completeness !== 'full') {
+        let durationSec = 0;
+        try {
+          const durText = actEl.querySelector('.activity-attribute');
+          if (durText) {
+            const m = durText.textContent.match(/(\d{2}):(\d{2}):(\d{2})/);
+            if (m) durationSec = parseInt(m[1]) * 3600 + parseInt(m[2]) * 60 + parseInt(m[3]);
+          }
+        } catch (e) {}
+        if (durationSec === 0) {
+          try {
+            const durScope = angular.element(actEl).scope();
+            if (durScope && durScope.activity) {
+              const d = durScope.activity.data;
+              if (d && d.duration) durationSec = d.duration;
+            }
+          } catch (e) {}
+        }
         result.push({
           id: a.id,
           title: (a.title || '').substring(0, 60),
-          type: a.type || ''
+          type: a.type || '',
+          durationSec
         });
       }
     });
@@ -49,9 +67,13 @@ async function processCourse(page, courseId, stats) {
 
   console.log(chalk.cyan(`  Uncompleted: ${videos.length} videos, remaining: ${remaining.length}`));
 
+  const totalDuration = remaining.reduce((sum, v) => sum + (v.durationSec || 120), 0);
+  const estWatchTime = Math.ceil(totalDuration / 2) + remaining.length * 15;
+  console.log(chalk.cyan(`  預估時間: ${formatTime(estWatchTime)}`));
+
   if (stats) {
     stats.remainingVideos = remaining.length;
-    stats.estimatedTimeForRemaining = remaining.reduce((sum, v) => sum + 120, 0);
+    stats.estimatedTimeForRemaining = estWatchTime;
   }
 
   for (let i = 0; i < remaining.length; i++) {
@@ -71,8 +93,11 @@ async function processCourse(page, courseId, stats) {
     }
 
     try {
+      const thisDuration = Math.ceil((act.durationSec || 120) / 2) + 15;
       if (stats) {
         stats.remainingVideos = remaining.length - i - 1;
+        stats.estimatedTimeForRemaining -= thisDuration;
+        if (stats.estimatedTimeForRemaining < 0) stats.estimatedTimeForRemaining = 0;
       }
       const success = await watchVideo(page, stats);
       if (success) {

package/src/video.js

@@ -1,9 +1,12 @@
 const chalk = require('chalk');
 
 function formatTime(seconds) {
-  const h = Math.floor(seconds / 3600);
+  seconds = Math.max(0, Math.floor(seconds));
+  const d = Math.floor(seconds / 86400);
+  const h = Math.floor((seconds % 86400) / 3600);
   const m = Math.floor((seconds % 3600) / 60);
-  const s = Math.floor(seconds % 60);
+  const s = seconds % 60;
+  if (d > 0) return `${d}d ${h}h ${m}m`;
   if (h > 0) return `${h}h ${m}m ${s}s`;
   if (m > 0) return `${m}m ${s}s`;
   return `${s}s`;
@@ -114,7 +117,14 @@ async function watchVideo(page, stats) {
       continue;
     }
 
-    if (state.paused && elapsed > 5) {
+    if (state.paused && !state.stalled && elapsed > 10) {
+      await page.waitForTimeout(3000);
+      const stillPaused = await page.evaluate(() => {
+        const v = document.querySelector('video');
+        return v ? v.paused : false;
+      });
+      if (!stillPaused) continue;
+
       restartCount++;
       if (restartCount > 10) {
         log(chalk.red('    [VIDEO] Too many restarts, giving up'));