tronclass-auto 1.3.3 → 1.3.4

package/package.json

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

package/src/config.js

@@ -54,7 +54,13 @@ function saveProgress(data) {
 
 function markDone(courseId, activityId) {
   const p = loadProgress();
-  p[`${courseId}_${activityId}`] = true;
+  p[`${courseId}_${activityId}`] = 'done';
+  saveProgress(p);
+}
+
+function markLocked(courseId, activityId) {
+  const p = loadProgress();
+  p[`${courseId}_${activityId}`] = 'locked';
   saveProgress(p);
 }
 
@@ -154,5 +160,5 @@ module.exports = {
   CONFIG_DIR, CONFIG_FILE, PROGRESS_FILE, COOKIE_FILE, SALT_FILE,
   BASE_URL, DEFAULT_CONFIG,
   ensureDir, loadConfig, saveConfig,
-  loadProgress, saveProgress, markDone, isDone, showConfig, manageCourses
+  loadProgress, saveProgress, markDone, markLocked, isDone, showConfig, manageCourses
 };

package/src/index.js

@@ -81,6 +81,7 @@ async function processCourse(page, courseId, stats) {
   let skip = 0;
   let fail = 0;
   let totalProcessed = 0;
+  let consecutiveLocked = 0;
 
   console.log(chalk.cyan(`  [fetching course activities...]`));
 
@@ -112,11 +113,29 @@ async function processCourse(page, courseId, stats) {
     await page.waitForTimeout(5000);
 
     if (!page.url().includes('learning-activity')) {
-      console.log(chalk.yellow('  [WARN] Failed to load, locked or skipped'));
-      skip++;
-      markDone(courseId, act.id);
-      totalProcessed++;
-      continue;
+      console.log(chalk.yellow('  Locked (page redirect), skipping rest'));
+      markLocked(courseId, act.id);
+      break;
+    }
+
+    const hasVideo = await page.evaluate(() => document.querySelector('video') !== null);
+    if (!hasVideo) {
+      consecutiveLocked++;
+      if (consecutiveLocked >= 2) {
+        console.log(chalk.yellow('  Locked (no video), stopping this course'));
+        markLocked(courseId, act.id);
+        break;
+      }
+      console.log(chalk.yellow('  No video, might be loading... waiting'));
+      await page.waitForTimeout(5000);
+      const hasVideoNow = await page.evaluate(() => document.querySelector('video') !== null);
+      if (!hasVideoNow) {
+        console.log(chalk.yellow('  Still no video, locked'));
+        markLocked(courseId, act.id);
+        break;
+      }
+    } else {
+      consecutiveLocked = 0;
     }
 
     try {