tronclass-auto 1.3.8 → 1.3.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/video.js +31 -24
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tronclass-auto",
3
- "version": "1.3.8",
3
+ "version": "1.3.9",
4
4
  "description": "自動觀看 eclass/TronClass 影片、填寫表單的 CLI 工具",
5
5
  "main": "src/index.js",
6
6
  "bin": {
package/src/video.js CHANGED
@@ -58,31 +58,39 @@ async function watchVideo(page, stats) {
58
58
  async function watchYouTube(page, stats) {
59
59
  log(chalk.blue(' YouTube embed'));
60
60
 
61
- const speedSet = await page.evaluate(() => {
62
- const f = document.querySelector('iframe[src*="youtube"], iframe[src*="youtu.be"]');
63
- if (!f) return false;
64
- const src = f.src || '';
65
- if (!src.includes('enablejsapi=1')) return false;
66
- try {
67
- f.contentWindow.postMessage(JSON.stringify({ event: 'command', func: 'mute', args: [] }), '*');
68
- f.contentWindow.postMessage(JSON.stringify({ event: 'command', func: 'setPlaybackRate', args: [2] }), '*');
69
- f.contentWindow.postMessage(JSON.stringify({ event: 'command', func: 'playVideo', args: [] }), '*');
70
- return true;
71
- } catch (e) { return false; }
72
- });
73
-
74
61
  try {
62
+ const ytFrame = page.locator('iframe[src*="youtube"], iframe[src*="youtu.be"]');
63
+ await ytFrame.click({ timeout: 5000 }).catch(() => {});
64
+ await page.waitForTimeout(2000);
65
+
75
66
  const frame = page.frameLocator('iframe[src*="youtube"], iframe[src*="youtu.be"]');
76
- const playBtn = frame.locator('.ytp-large-play-button, .ytp-play-button, button[aria-label*="Play"], button[aria-label*="play"]');
77
- await playBtn.first().click({ timeout: 5000 }).catch(() => {});
78
- } catch (e) {}
67
+ const playBtn = frame.locator('.ytp-large-play-button');
68
+ await playBtn.click({ timeout: 5000 }).catch(() => {});
69
+ await page.waitForTimeout(2000);
79
70
 
80
- try {
81
- const ytFrame = page.locator('iframe[src*="youtube"], iframe[src*="youtu.be"]');
82
- await ytFrame.click({ timeout: 3000 }).catch(() => {});
83
- } catch (e) {}
71
+ try {
72
+ await frame.locator('.ytp-settings-button').click({ timeout: 3000 });
73
+ await page.waitForTimeout(500);
74
+ await frame.locator('.ytp-menuitem:has-text("播放速度"), .ytp-menuitem:has-text("Playback speed")').click({ timeout: 3000 });
75
+ await page.waitForTimeout(500);
76
+ await frame.locator('.ytp-menuitem:has-text("2"), .ytp-menuitem:has-text("2x")').click({ timeout: 3000 });
77
+ log(chalk.blue(' Speed: 2x ✓'));
78
+ } catch (e) {
79
+ log(chalk.yellow(' Speed: 1x (settings menu unavailable)'));
80
+ }
84
81
 
85
- await page.waitForTimeout(3000);
82
+ try {
83
+ await frame.locator('.ytp-settings-button').click({ timeout: 2000 });
84
+ await page.waitForTimeout(500);
85
+ await frame.locator('.ytp-menuitem:has-text("字幕"), .ytp-menuitem:has-text("Subtitles"), .ytp-menuitem:has-text("CC")').click({ timeout: 2000 }).catch(() => {});
86
+ await frame.locator('.ytp-menuitem:has-text("關閉"), .ytp-menuitem:has-text("Off"), .ytp-menuitem:has-text("None")').click({ timeout: 2000 }).catch(() => {});
87
+ await page.keyboard.press('Escape');
88
+ } catch (e) {}
89
+ } catch (e) {
90
+ log(chalk.yellow(' YouTube setup failed, falling back'));
91
+ }
92
+
93
+ await page.waitForTimeout(2000);
86
94
 
87
95
  const ytDuration = await page.evaluate(() => {
88
96
  const actText = document.querySelector('.activity-attribute, [class*="attribute"]');
@@ -93,9 +101,8 @@ async function watchYouTube(page, stats) {
93
101
  return 180;
94
102
  });
95
103
 
96
- const speed = speedSet ? 2 : 1;
97
- const waitTime = Math.ceil(ytDuration / speed) + 30;
98
- log(chalk.blue(` ~${formatTime(ytDuration)} video → ~${formatTime(waitTime)} (${speed}x${speedSet ? '' : ', no speed control'})`));
104
+ const waitTime = Math.ceil(ytDuration / 2) + 30;
105
+ log(chalk.blue(` ~${formatTime(ytDuration)} video → ~${formatTime(waitTime)} (2x)`));
99
106
 
100
107
  let elapsed = 0;
101
108
  let lastPct = -1;