tronclass-auto 1.2.1 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tronclass-auto",
-  "version": "1.2.1",
+  "version": "1.2.4",
   "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,14 +93,17 @@ 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) {
         markDone(courseId, act.id);
         done++;
-        console.log(chalk.green('    [OK] Saved'));
+        console.log(chalk.green('    ✓ Saved'));
       } else {
         fail++;
       }

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`;
@@ -12,11 +15,11 @@ function formatTime(seconds) {
 async function watchVideo(page, stats) {
   const hasVideo = await page.evaluate(() => document.querySelector('video') !== null);
   if (!hasVideo) {
-    log(chalk.yellow('    [VIDEO] No video element'));
+    log(chalk.yellow('  No video element'));
     return false;
   }
 
-  log(chalk.blue('    [VIDEO] Muted + 2x speed'));
+  log(chalk.blue('  Muted + 2x'));
 
   await page.evaluate(() => {
     document.querySelectorAll('video').forEach(v => {
@@ -35,7 +38,7 @@ async function watchVideo(page, stats) {
   });
 
   if (!isPlaying) {
-    log(chalk.yellow('    [VIDEO] Clicking play...'));
+    log(chalk.yellow('  Clicking play...'));
     await page.evaluate(() => {
       document.querySelectorAll('[class*="play"], .vjs-big-play-button, button').forEach(btn => {
         if (btn.offsetParent && (btn.className.includes('play') || btn.className.includes('Play'))) {
@@ -53,14 +56,14 @@ async function watchVideo(page, stats) {
   });
 
   if (!duration || duration <= 0) {
-    log(chalk.yellow('    [VIDEO] Cannot get duration, waiting 30s...'));
+    log(chalk.yellow('  Cannot get duration, waiting 30s...'));
     await page.waitForTimeout(30000);
     if (stats) stats.videosWatched++;
     return true;
   }
 
   const waitTime = (duration / 2) + 15;
-  log(chalk.blue(`    [VIDEO] ${formatTime(duration)} video, waiting ~${formatTime(waitTime)} (2x)`));
+  log(chalk.blue(`  ${formatTime(duration)} video → ~${formatTime(waitTime)} (2x)`));
 
   if (stats) {
     stats.currentVideoDuration = duration / 2;
@@ -90,37 +93,48 @@ async function watchVideo(page, stats) {
 
     if (state.p > lastPct) {
       const pct = state.p;
+      const barWidth = 20;
+      const filled = Math.floor(barWidth * pct / 100);
+      const empty = barWidth - filled;
+      const bar = chalk.green('█'.repeat(filled)) + chalk.gray('░'.repeat(empty));
       const remaining = Math.max(0, waitTime - elapsed);
       let etaStr = '';
       if (stats && stats.remainingVideos > 0) {
         const totalRemaining = remaining + stats.estimatedTimeForRemaining;
-        etaStr = chalk.gray(` | ETA: ${formatTime(totalRemaining)}`);
+        etaStr = chalk.gray(` | ETA ${formatTime(totalRemaining)}`);
       } else {
-        etaStr = chalk.gray(` | ~${formatTime(remaining)} left`);
+        etaStr = chalk.gray(` | ${formatTime(remaining)} left`);
       }
-      log(chalk.blue(`    [VIDEO] ${pct}% (${formatTime(elapsed)})${etaStr}`));
+      log(chalk.blue(`  ${bar} ${String(pct).padStart(3)}%  (${formatTime(elapsed)})${etaStr}`));
       lastPct = pct;
     }
 
     if (state.e) {
-      log(chalk.green('    [VIDEO] 100% Finished'));
+      log(chalk.green('  Done ✓'));
       break;
     }
 
     if (state.stalled) {
       if (elapsed % 15 === 0) {
-        log(chalk.gray(`    [VIDEO] Buffering... (${formatTime(elapsed)})`));
+        log(chalk.gray(`  Buffering... (${formatTime(elapsed)})`));
       }
       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'));
+        log(chalk.red('  Too many restarts, giving up'));
         return false;
       }
-      log(chalk.yellow(`    [VIDEO] Paused, restarting (#${restartCount})...`));
+      log(chalk.yellow(`  Paused, restarting (#${restartCount})...`));
       await page.evaluate(() => document.querySelector('video').play());
       await page.waitForTimeout(1000);
     }