tronclass-auto 1.3.3 → 1.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tronclass-auto",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "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...]`));
 
@@ -109,14 +110,38 @@ async function processCourse(page, courseId, stats) {
     try {
       await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 15000 });
     } catch (e) {}
-    await page.waitForTimeout(5000);
+    await page.waitForTimeout(8000);
 
     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('  Page redirect, skipping'));
+      markLocked(courseId, act.id);
+      break;
+    }
+
+    const hasVideo = await page.evaluate(() => {
+      if (document.querySelector('video')) return true;
+      for (const f of document.querySelectorAll('iframe')) {
+        try { if (f.contentDocument && f.contentDocument.querySelector('video')) return true; } catch (e) {}
+      }
+      return false;
+    });
+    if (!hasVideo) {
+      console.log(chalk.yellow('  No video, waiting more...'));
+      await page.waitForTimeout(10000);
+      const hasVideoNow = await page.evaluate(() => {
+        if (document.querySelector('video')) return true;
+        for (const f of document.querySelectorAll('iframe')) {
+          try { if (f.contentDocument && f.contentDocument.querySelector('video')) return true; } catch (e) {}
+        }
+        return false;
+      });
+      if (!hasVideoNow) {
+        console.log(chalk.yellow('  Still no video, skipping (not a video activity)'));
+        markLocked(courseId, act.id);
+        break;
+      }
+    } else {
+      consecutiveLocked = 0;
     }
 
     try {