tronclass-auto 1.5.6 → 1.7.0

package/package.json

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

package/src/index.js

@@ -28,6 +28,8 @@ async function getUncompleted(page, courseId) {
       try { completeness = scope.getActivityCompleteness(a); } catch (e) {}
       if (completeness === 'full') return;
 
+      if (a.completion_criterion_value === '' || a.completion_criterion_value === undefined || a.completion_criterion_value === null) return;
+
       let isUpcoming = false;
       let isExpired = false;
       try { isUpcoming = scope.activityUpcoming(a); } catch (e) {}
@@ -110,7 +112,7 @@ async function processCourse(page, courseId, stats) {
     try {
       await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 15000 });
     } catch (e) {}
-    await page.waitForTimeout(8000);
+    await page.waitForTimeout(15000);
 
     if (!page.url().includes('learning-activity')) {
       console.log(chalk.yellow('  Page redirect, skipping'));
@@ -155,13 +157,15 @@ async function processCourse(page, courseId, stats) {
       }
       const success = await watchVideo(page, stats);
       if (success) {
+        console.log(chalk.gray('  Waiting for platform tracking...'));
+        await page.waitForTimeout(30000);
+
         let serverComplete = false;
-        for (let attempt = 0; attempt < 5; attempt++) {
-          await page.waitForTimeout(10000);
+        try {
           await page.goto(`${BASE_URL}/course/${courseId}/content#/`, {
-            waitUntil: 'domcontentloaded', timeout: 15000
-          }).catch(() => {});
-          await page.waitForTimeout(5000);
+            waitUntil: 'domcontentloaded', timeout: 20000
+          });
+          await page.waitForTimeout(8000);
 
           serverComplete = await page.evaluate((actId) => {
             const el = document.querySelector('.learning-activities');
@@ -178,9 +182,8 @@ async function processCourse(page, courseId, stats) {
             }
             return false;
           }, act.id);
-
-          if (serverComplete) break;
-          console.log(chalk.gray(`  Checking server... (${attempt + 1}/5)`));
+        } catch (e) {
+          console.log(chalk.gray(`  Server check error: ${e.message.substring(0, 40)}`));
         }
 
         if (serverComplete) {
@@ -188,7 +191,7 @@ async function processCourse(page, courseId, stats) {
           done++;
           console.log(chalk.green('  ✓ Saved (server confirmed)'));
         } else {
-          console.log(chalk.yellow('  Server not confirmed after retries, skipping'));
+          console.log(chalk.yellow('  Server not confirmed, skipping'));
           triedIds.add(act.id);
           fail++;
         }
@@ -210,6 +213,50 @@ async function processCourse(page, courseId, stats) {
   return { done, skip, fail };
 }
 
+async function getAllVideos(page, courseId) {
+  try {
+    await page.goto(`${BASE_URL}/course/${courseId}/content#/`, {
+      waitUntil: 'domcontentloaded', timeout: 20000
+    });
+  } catch (e) {}
+  await page.waitForTimeout(8000);
+
+  return page.evaluate(() => {
+    const el = document.querySelector('.learning-activities');
+    if (!el) return [];
+    const scope = angular.element(el).scope();
+    if (!scope) return [];
+    const activities = document.querySelectorAll('.learning-activity.sortable');
+    let result = [];
+    activities.forEach((actEl) => {
+      const actScope = angular.element(actEl).scope();
+      if (!actScope || !actScope.activity) return;
+      const a = actScope.activity;
+      let completeness = '';
+      try { completeness = scope.getActivityCompleteness(a); } catch(e) {}
+      let isUpcoming = false;
+      try { isUpcoming = scope.activityUpcoming(a); } catch(e) {}
+      let startTime = '';
+      try {
+        const txt = actEl.textContent || '';
+        const tm = txt.match(/(\d{4}-\d{2}-\d{2})\s+\d{2}:\d{2}/);
+        if (tm) startTime = tm[1];
+      } catch(e) {}
+      const now = new Date();
+      const startDate = startTime ? new Date(startTime) : null;
+      const isFuture = startDate && startDate > now;
+      result.push({
+        id: a.id,
+        type: a.type || '',
+        completeness: completeness,
+        isUpcoming: isUpcoming,
+        isFuture: isFuture
+      });
+    });
+    return result;
+  });
+}
+
 async function showStatus() {
   const config = loadConfig();
   const cookies = loadCookies();
@@ -250,23 +297,27 @@ async function showStatus() {
     const match = courseUrl.match(/\/course\/(\d+)\//);
     const courseId = match ? match[1] : '?';
     try {
-      const uncompleted = await getUncompleted(page, courseId);
-      const videos = uncompleted.filter(u => u.type === 'online_video');
-      const remaining = videos.filter(v => !isDone(courseId, v.id));
-      const exams = uncompleted.filter(u => u.type === 'exam').length;
+      const allVideos = await getAllVideos(page, courseId);
+      const videos = allVideos.filter(u => u.type === 'online_video');
+      const completed = videos.filter(v => v.completeness === 'full').length;
+      const future = videos.filter(v => v.isFuture && v.completeness !== 'full').length;
+      const remaining = videos.filter(v => v.completeness !== 'full' && !v.isFuture).length;
+      const exams = allVideos.filter(u => u.type === 'exam' && u.completeness !== 'full').length;
       totalVideos += videos.length;
-      totalRemaining += remaining.length;
+      totalRemaining += remaining;
       totalExams += exams;
 
-      const pct = videos.length > 0 ? Math.floor(((videos.length - remaining.length) / videos.length) * 100) : 100;
+      const pct = videos.length > 0 ? Math.floor((completed / videos.length) * 100) : 100;
       const filled = Math.floor(50 * pct / 100);
       const empty = 50 - filled;
       const bar = pct === 100
         ? chalk.green('█'.repeat(50))
         : chalk.green('█'.repeat(filled)) + chalk.gray('░'.repeat(empty));
 
-      const doneCount = videos.length - remaining.length;
-      console.log(chalk.cyan('│') + `  [${courseId}] ${doneCount}/${videos.length} videos  ${exams} exams`.padEnd(50) + chalk.cyan('│'));
+      const doneCount = completed;
+      const pending = remaining;
+      const info = future > 0 ? ` (${future} 未開放)` : '';
+      console.log(chalk.cyan('│') + `  [${courseId}] ${doneCount}/${videos.length} videos  ${exams} exams${info}`.padEnd(50) + chalk.cyan('│'));
       console.log(chalk.cyan('│') + `    ${bar} ${pct}%`.padEnd(52) + chalk.cyan('│'));
     } catch (e) {
       console.log(chalk.cyan('│') + `  [${courseId}] ERROR`.padEnd(50) + chalk.cyan('│'));

package/src/tui.js

@@ -4,6 +4,49 @@ const { loadConfig, saveConfig, BASE_URL } = require('./config');
 const { loadCookies } = require('./auth');
 const pkg = require('../package.json');
 
+async function getCourseName(page, courseId) {
+  try {
+    await page.goto(`${BASE_URL}/course/${courseId}/content#/`, {
+      waitUntil: 'domcontentloaded',
+      timeout: 15000
+    });
+    await page.waitForTimeout(3000);
+    return await page.evaluate(() => {
+      const el = document.querySelector('.learning-activities');
+      if (!el) return null;
+      const scope = angular.element(el).scope();
+      if (!scope) return null;
+      return scope.course ? scope.course.title || scope.course.name : null;
+    });
+  } catch (e) {
+    return null;
+  }
+}
+
+async function withEsc(promptFn, onEsc) {
+  let resolved = false;
+  process.stdin.setRawMode(true);
+  process.stdin.resume();
+  const escHandler = (data) => {
+    if (data.toString() === '\u001b' && !resolved) {
+      resolved = true;
+      process.stdin.removeListener('data', escHandler);
+      process.stdin.setRawMode(false);
+      process.stdin.pause();
+      onEsc();
+    }
+  };
+  process.stdin.on('data', escHandler);
+  try {
+    await promptFn();
+  } finally {
+    if (!resolved) {
+      process.stdin.removeListener('data', escHandler);
+    }
+    resolved = true;
+  }
+}
+
 function box(lines, width = 52) {
   const top = '╔' + '═'.repeat(width - 2) + '╗';
   const bot = '╚' + '═'.repeat(width - 2) + '╝';
@@ -33,20 +76,36 @@ async function mainMenu() {
     ]);
     console.log('');
 
-    const { action } = await inquirer.prompt([{
-      type: 'list',
-      name: 'action',
-      message: '選擇操作:',
-      choices: [
-        { name: chalk.green('▶  開始自動觀看'), value: 'run' },
-        { name: chalk.cyan('📋 管理課程列表'), value: 'courses' },
-        { name: chalk.yellow('📊 查看進度統計'), value: 'status' },
-        { name: chalk.magenta('⚙  設定'), value: 'settings' },
-        new inquirer.Separator(),
-        { name: chalk.gray('🚪 離開'), value: 'exit' }
-      ],
-      pageSize: 10
-    }]);
+    const { action } = await new Promise((resolve) => {
+      process.stdin.setRawMode(true);
+      process.stdin.resume();
+      const escHandler = (data) => {
+        if (data.toString() === '\u001b') {
+          process.stdin.removeListener('data', escHandler);
+          process.stdin.setRawMode(false);
+          process.stdin.pause();
+          resolve({ action: 'exit' });
+        }
+      };
+      process.stdin.on('data', escHandler);
+      inquirer.prompt([{
+        type: 'list',
+        name: 'action',
+        message: '選擇操作:',
+        choices: [
+          { name: chalk.green('▶  開始自動觀看'), value: 'run' },
+          { name: chalk.cyan('📋 管理課程列表'), value: 'courses' },
+          { name: chalk.yellow('📊 查看進度統計'), value: 'status' },
+          { name: chalk.magenta('⚙  設定'), value: 'settings' },
+          new inquirer.Separator(),
+          { name: chalk.gray('🚪 離開'), value: 'exit' }
+        ],
+        pageSize: 10
+      }]).then(ans => {
+        process.stdin.removeListener('data', escHandler);
+        resolve(ans);
+      });
+    });
 
     switch (action) {
       case 'run': await runMenu(config); break;
@@ -71,20 +130,52 @@ async function runMenu(config) {
     return;
   }
 
-  const { confirm } = await inquirer.prompt([{
-    type: 'confirm',
-    name: 'confirm',
-    message: `開始觀看全部 ${config.courses.length} 個課程?`,
-    default: true
-  }]);
+  const { confirm } = await new Promise((resolve) => {
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    const escHandler = (data) => {
+      if (data.toString() === '\u001b') {
+        process.stdin.removeListener('data', escHandler);
+        process.stdin.setRawMode(false);
+        process.stdin.pause();
+        resolve({ confirm: false });
+      }
+    };
+    process.stdin.on('data', escHandler);
+    inquirer.prompt([{
+      type: 'confirm',
+      name: 'confirm',
+      message: `開始觀看全部 ${config.courses.length} 個課程?`,
+      default: true
+    }]).then(ans => {
+      process.stdin.removeListener('data', escHandler);
+      resolve(ans);
+    });
+  });
   if (!confirm) return;
 
-  const { headless } = await inquirer.prompt([{
-    type: 'confirm',
-    name: 'headless',
-    message: '無頭模式（背景執行）?',
-    default: false
-  }]);
+  const { headless } = await new Promise((resolve) => {
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    const escHandler = (data) => {
+      if (data.toString() === '\u001b') {
+        process.stdin.removeListener('data', escHandler);
+        process.stdin.setRawMode(false);
+        process.stdin.pause();
+        resolve({ headless: false });
+      }
+    };
+    process.stdin.on('data', escHandler);
+    inquirer.prompt([{
+      type: 'confirm',
+      name: 'headless',
+      message: '無頭模式（背景執行）?',
+      default: false
+    }]).then(ans => {
+      process.stdin.removeListener('data', escHandler);
+      resolve(ans);
+    });
+  });
 
   console.log('');
   box([
@@ -102,77 +193,181 @@ async function runMenu(config) {
 
 async function courseMenu() {
   let editing = true;
-  while (editing) {
-    const config = loadConfig();
-    const courses = config.courses || [];
+  const { chromium } = require('playwright');
+  const { ensureBrowser } = require('./browser');
+  let browser = null;
 
-    console.clear();
-    box([
-      chalk.bold.white('📋 課程列表'),
-      ...(courses.length === 0
-        ? [chalk.gray('  還沒有課程')]
-        : courses.map((url, i) => {
-            const match = url.match(/\/course\/(\d+)\//);
-            const id = match ? match[1] : '?';
-            return `  ${chalk.white(i + 1 + '.')} [${chalk.cyan(id)}] ${chalk.gray(url.substring(0, 45))}`;
-          })),
-      '',
-      chalk.gray('  新增: tronclass course --add <ID或URL>'),
-      chalk.gray('  移除: tronclass course --remove <編號>'),
-    ]);
-    console.log('');
+  async function getPage() {
+    if (!browser) {
+      const { loadCookies } = require('./auth');
+      const cookies = loadCookies();
+      const exePath = await ensureBrowser();
+      const launchOpts = { headless: true, slowMo: 50, args: ['--disable-gpu', '--disable-software-rasterizer'] };
+      if (exePath) launchOpts.executablePath = exePath;
+      browser = await chromium.launch(launchOpts);
+      const context = await browser.newContext();
+      await context.addCookies(cookies);
+      return await context.newPage();
+    }
+    return browser.newPage();
+  }
 
-    const { action } = await inquirer.prompt([{
-      type: 'list',
-      name: 'action',
-      message: `課程管理 (${courses.length} 個)`,
-      choices: [
-        { name: chalk.green('➕ 新增課程（互動式）'), value: 'add' },
-        ...(courses.length > 0 ? [
-          ...courses.map((url, i) => {
-            const match = url.match(/\/course\/(\d+)\//);
-            const id = match ? match[1] : '?';
-            return { name: `${chalk.red('✕')} [${id}] 移除`, value: `remove_${i}` };
-          }),
+  let courseNames = {};
+
+  async function loadCourseNames(courses) {
+    console.log(chalk.gray('  載入課程名稱...'));
+    const page = await getPage();
+    for (const url of courses) {
+      const match = url.match(/\/course\/(\d+)\//);
+      const id = match ? match[1] : null;
+      if (id && !courseNames[id]) {
+        const name = await getCourseName(page, id);
+        if (name) courseNames[id] = name;
+      }
+    }
+    try { await page.close(); } catch (e) {}
+  }
+
+  try {
+    while (editing) {
+      const config = loadConfig();
+      const courses = config.courses || [];
+
+      await loadCourseNames(courses);
+
+      console.clear();
+      box([
+        chalk.bold.white('📋 課程列表'),
+        ...(courses.length === 0
+          ? [chalk.gray('  還沒有課程')]
+          : courses.map((url, i) => {
+              const match = url.match(/\/course\/(\d+)\//);
+              const id = match ? match[1] : '?';
+              const name = courseNames[id] || null;
+              if (name) {
+                return `  ${chalk.white(i + 1 + '.')} ${chalk.cyan(name)} ${chalk.gray(`[${id}]`)}`;
+              }
+              return `  ${chalk.white(i + 1 + '.')} [${chalk.cyan(id)}] ${chalk.gray(url.substring(0, 45))}`;
+            })),
+        '',
+        chalk.gray('  新增: tronclass course --add <ID或URL>'),
+        chalk.gray('  移除: tronclass course --remove <編號>'),
+        chalk.gray('  ESC 返回'),
+      ]);
+      console.log('');
+
+      const { action } = await new Promise((resolve) => {
+        const listChoices = [
+          { name: chalk.green('➕ 新增課程（互動式）'), value: 'add' },
+          ...(courses.length > 0 ? [
+            ...courses.map((url, i) => {
+              const match = url.match(/\/course\/(\d+)\//);
+              const id = match ? match[1] : '?';
+              const name = courseNames[id] || null;
+              const label = name ? `${name} [${id}]` : `[${id}]`;
+              return { name: `${chalk.red('✕')} 移除 ${label}`, value: `remove_${i}` };
+            }),
+            new inquirer.Separator(),
+            { name: chalk.red('🗑  清空所有'), value: 'clear' }
+          ] : []),
           new inquirer.Separator(),
-          { name: chalk.red('🗑  清空所有'), value: 'clear' }
-        ] : []),
-        new inquirer.Separator(),
-        { name: chalk.gray('⬅ 返回'), value: 'back' }
-      ],
-      pageSize: 20
-    }]);
-
-    if (action === 'back') {
-      editing = false;
-    } else if (action === 'add') {
-      const { input } = await inquirer.prompt([{
-        type: 'input',
-        name: 'input',
-        message: '輸入課程 ID（如 127331）或完整 URL:',
-        validate: (v) => v.trim().length > 0 ? true : '不可為空'
-      }]);
-      const config2 = loadConfig();
-      config2.courses = config2.courses || [];
-      config2.courses.push(normalizeUrl(input.trim()));
-      saveConfig(config2);
-      console.log(chalk.green('  已新增！'));
-    } else if (action === 'clear') {
-      const { confirm } = await inquirer.prompt([{
-        type: 'confirm', name: 'confirm', message: '確定要清空所有課程?', default: false
-      }]);
-      if (confirm) {
+          { name: chalk.gray('⬅ 返回'), value: 'back' }
+        ];
+
+        process.stdin.setRawMode(true);
+        process.stdin.resume();
+        const escHandler = (data) => {
+          if (data.toString() === '\u001b') {
+            process.stdin.removeListener('data', escHandler);
+            process.stdin.setRawMode(false);
+            process.stdin.pause();
+            resolve({ action: 'back' });
+          }
+        };
+        process.stdin.on('data', escHandler);
+
+        inquirer.prompt([{
+          type: 'list',
+          name: 'action',
+          message: `課程管理 (${courses.length} 個)`,
+          choices: listChoices,
+          pageSize: 20
+        }]).then(ans => {
+          process.stdin.removeListener('data', escHandler);
+          resolve(ans);
+        });
+      });
+
+      if (action === 'back') {
+        editing = false;
+      } else if (action === 'add') {
+        const { input } = await new Promise((resolve) => {
+          process.stdin.setRawMode(true);
+          process.stdin.resume();
+          const escHandler = (data) => {
+            if (data.toString() === '\u001b') {
+              process.stdin.removeListener('data', escHandler);
+              process.stdin.setRawMode(false);
+              process.stdin.pause();
+              resolve({ input: '' });
+            }
+          };
+          process.stdin.on('data', escHandler);
+          inquirer.prompt([{
+            type: 'input',
+            name: 'input',
+            message: '輸入課程 ID（如 127331）或完整 URL:',
+            validate: (v) => v.trim().length > 0 ? true : '不可為空'
+          }]).then(ans => {
+            process.stdin.removeListener('data', escHandler);
+            resolve(ans);
+          });
+        });
+        if (input) {
+          const config2 = loadConfig();
+          config2.courses = config2.courses || [];
+          config2.courses.push(normalizeUrl(input.trim()));
+          saveConfig(config2);
+          console.log(chalk.green('  已新增！'));
+        }
+      } else if (action === 'clear') {
+        const { confirm } = await new Promise((resolve) => {
+          process.stdin.setRawMode(true);
+          process.stdin.resume();
+          const escHandler = (data) => {
+            if (data.toString() === '\u001b') {
+              process.stdin.removeListener('data', escHandler);
+              process.stdin.setRawMode(false);
+              process.stdin.pause();
+              resolve({ confirm: false });
+            }
+          };
+          process.stdin.on('data', escHandler);
+          inquirer.prompt([{
+            type: 'confirm', name: 'confirm', message: '確定要清空所有課程?', default: false
+          }]).then(ans => {
+            process.stdin.removeListener('data', escHandler);
+            resolve(ans);
+          });
+        });
+        if (confirm) {
+          const config2 = loadConfig();
+          config2.courses = [];
+          saveConfig(config2);
+          console.log(chalk.green('  已清空'));
+        }
+      } else if (action.startsWith('remove_')) {
+        const idx = parseInt(action.split('_')[1]);
         const config2 = loadConfig();
-        config2.courses = [];
+        const removed = config2.courses.splice(idx, 1)[0];
         saveConfig(config2);
-        console.log(chalk.green('  已清空'));
+        courseNames = {};
+        console.log(chalk.green(`  已移除: ${removed}`));
       }
-    } else if (action.startsWith('remove_')) {
-      const idx = parseInt(action.split('_')[1]);
-      const config2 = loadConfig();
-      const removed = config2.courses.splice(idx, 1)[0];
-      saveConfig(config2);
-      console.log(chalk.green(`  已移除: ${removed}`));
+    }
+  } finally {
+    if (browser) {
+      try { await browser.close(); } catch (e) {}
     }
   }
 }
@@ -180,46 +375,110 @@ async function courseMenu() {
 async function settingsMenu() {
   const config = loadConfig();
 
-  const { setting } = await inquirer.prompt([{
-    type: 'list',
-    name: 'setting',
-    message: '設定',
-    choices: [
-      { name: `倍速: ${chalk.cyan(config.playbackRate || 2)}x`, value: 'speed' },
-      { name: `無頭模式: ${chalk.cyan(config.headless ? '是' : '否')}`, value: 'headless' },
-      { name: `SlowMo: ${chalk.cyan(config.slowMo || 50)}ms`, value: 'slowmo' },
-      new inquirer.Separator(),
-      { name: chalk.gray('⬅ 返回'), value: 'back' }
-    ]
-  }]);
+  const { setting } = await new Promise((resolve) => {
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    const escHandler = (data) => {
+      if (data.toString() === '\u001b') {
+        process.stdin.removeListener('data', escHandler);
+        process.stdin.setRawMode(false);
+        process.stdin.pause();
+        resolve({ setting: 'back' });
+      }
+    };
+    process.stdin.on('data', escHandler);
+    inquirer.prompt([{
+      type: 'list',
+      name: 'setting',
+      message: '設定',
+      choices: [
+        { name: `倍速: ${chalk.cyan(config.playbackRate || 2)}x`, value: 'speed' },
+        { name: `無頭模式: ${chalk.cyan(config.headless ? '是' : '否')}`, value: 'headless' },
+        { name: `SlowMo: ${chalk.cyan(config.slowMo || 50)}ms`, value: 'slowmo' },
+        new inquirer.Separator(),
+        { name: chalk.gray('⬅ 返回'), value: 'back' }
+      ]
+    }]).then(ans => {
+      process.stdin.removeListener('data', escHandler);
+      resolve(ans);
+    });
+  });
 
   if (setting === 'back') return;
 
   if (setting === 'speed') {
-    const { speed } = await inquirer.prompt([{
-      type: 'list', name: 'speed', message: '選擇播放倍速:',
-      choices: [
-        { name: '1x（正常）', value: 1 },
-        { name: '1.5x', value: 1.5 },
-        { name: '2x（推薦）', value: 2 },
-        { name: '4x', value: 4 },
-        { name: '8x', value: 8 }
-      ],
-      default: config.playbackRate || 2
-    }]);
+    const { speed } = await new Promise((resolve) => {
+      process.stdin.setRawMode(true);
+      process.stdin.resume();
+      const escHandler = (data) => {
+        if (data.toString() === '\u001b') {
+          process.stdin.removeListener('data', escHandler);
+          process.stdin.setRawMode(false);
+          process.stdin.pause();
+          resolve({ speed: config.playbackRate || 2 });
+        }
+      };
+      process.stdin.on('data', escHandler);
+      inquirer.prompt([{
+        type: 'list', name: 'speed', message: '選擇播放倍速:',
+        choices: [
+          { name: '1x（正常）', value: 1 },
+          { name: '1.5x', value: 1.5 },
+          { name: '2x（推薦）', value: 2 },
+          { name: '4x', value: 4 },
+          { name: '8x', value: 8 }
+        ],
+        default: config.playbackRate || 2
+      }]).then(ans => {
+        process.stdin.removeListener('data', escHandler);
+        resolve(ans);
+      });
+    });
     config.playbackRate = speed;
     saveConfig(config);
     console.log(chalk.green(`  已設定為 ${speed}x`));
   } else if (setting === 'headless') {
-    const { hl } = await inquirer.prompt([{
-      type: 'confirm', name: 'hl', message: '啟用無頭模式?', default: config.headless || false
-    }]);
+    const { hl } = await new Promise((resolve) => {
+      process.stdin.setRawMode(true);
+      process.stdin.resume();
+      const escHandler = (data) => {
+        if (data.toString() === '\u001b') {
+          process.stdin.removeListener('data', escHandler);
+          process.stdin.setRawMode(false);
+          process.stdin.pause();
+          resolve({ hl: config.headless || false });
+        }
+      };
+      process.stdin.on('data', escHandler);
+      inquirer.prompt([{
+        type: 'confirm', name: 'hl', message: '啟用無頭模式?', default: config.headless || false
+      }]).then(ans => {
+        process.stdin.removeListener('data', escHandler);
+        resolve(ans);
+      });
+    });
     config.headless = hl;
     saveConfig(config);
   } else if (setting === 'slowmo') {
-    const { ms } = await inquirer.prompt([{
-      type: 'number', name: 'ms', message: 'SlowMo 毫秒數:', default: config.slowMo || 50
-    }]);
+    const { ms } = await new Promise((resolve) => {
+      process.stdin.setRawMode(true);
+      process.stdin.resume();
+      const escHandler = (data) => {
+        if (data.toString() === '\u001b') {
+          process.stdin.removeListener('data', escHandler);
+          process.stdin.setRawMode(false);
+          process.stdin.pause();
+          resolve({ ms: config.slowMo || 50 });
+        }
+      };
+      process.stdin.on('data', escHandler);
+      inquirer.prompt([{
+        type: 'number', name: 'ms', message: 'SlowMo 毫秒數:', default: config.slowMo || 50
+      }]).then(ans => {
+        process.stdin.removeListener('data', escHandler);
+        resolve(ans);
+      });
+    });
     config.slowMo = ms;
     saveConfig(config);
   }
@@ -236,7 +495,21 @@ function normalizeUrl(input) {
 }
 
 async function pressAnyKey() {
-  await inquirer.prompt([{ type: 'input', name: '_', message: chalk.gray('按 Enter 返回...') }]);
+  return new Promise((resolve) => {
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    const handler = (data) => {
+      const str = data.toString();
+      if (str === '\u001b' || str === '\r' || str === '\n') {
+        process.stdin.removeListener('data', handler);
+        process.stdin.setRawMode(false);
+        process.stdin.pause();
+        resolve();
+      }
+    };
+    process.stdin.on('data', handler);
+    process.stdout.write(chalk.gray('按 Enter 或 ESC 返回...'));
+  });
 }
 
 module.exports = { mainMenu };

package/src/video.js

@@ -119,17 +119,30 @@ async function watchYouTube(page, stats) {
 
   await page.waitForTimeout(2000);
 
-  const ytDuration = await page.evaluate(() => {
-    const actText = document.querySelector('.activity-attribute, [class*="attribute"]');
-    if (actText) {
-      const m = actText.textContent.match(/(\d{2}):(\d{2}):(\d{2})/);
-      if (m) return parseInt(m[1]) * 3600 + parseInt(m[2]) * 60 + parseInt(m[3]);
-    }
-    return 180;
-  });
+  let ytDuration = 0;
+  for (let i = 0; i < 10; i++) {
+    try {
+      const freshFrame = page.frame({ url: /youtube|youtu\.be/ });
+      if (freshFrame) {
+        ytDuration = await freshFrame.evaluate(() => document.querySelector('#movie_player').getDuration());
+        if (ytDuration > 0) break;
+      }
+    } catch (e) {}
+    await page.waitForTimeout(2000);
+  }
+  if (!ytDuration || ytDuration <= 0) {
+    ytDuration = await page.evaluate(() => {
+      const actText = document.querySelector('.activity-attribute, [class*="attribute"]');
+      if (actText) {
+        const m = actText.textContent.match(/(\d{2}):(\d{2}):(\d{2})/);
+        if (m) return parseInt(m[1]) * 3600 + parseInt(m[2]) * 60 + parseInt(m[3]);
+      }
+      return 180;
+    });
+  }
 
   const waitTime = (rate >= 2 ? Math.ceil(ytDuration / 2) : ytDuration) + 30;
-  log(chalk.blue(`  ~${formatTime(ytDuration)} video → ~${formatTime(waitTime)} (${rate}x)`));
+  log(chalk.blue(`  ${formatTime(ytDuration)} video → ~${formatTime(waitTime)} (${rate}x)`));
 
   if (stats) {
     stats.currentVideoDuration = ytDuration;