@jackwener/opencli 1.3.0 → 1.3.2

package/src/clis/bilibili/download.ts

@@ -8,18 +8,9 @@
  *   - yt-dlp must be installed: pip install yt-dlp
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
 import { cli, Strategy } from '../../registry.js';
-import {
-  ytdlpDownload,
-  checkYtdlp,
-  sanitizeFilename,
-  getTempDir,
-  exportCookiesToNetscape,
-  formatCookieHeader,
-} from '../../download/index.js';
-import { DownloadProgressTracker, formatBytes } from '../../download/progress.js';
+import { checkYtdlp, sanitizeFilename } from '../../download/index.js';
+import { downloadMedia } from '../../download/media-download.js';
 
 cli({
   site: 'bilibili',
@@ -63,21 +54,8 @@ cli({
 
     const title = sanitizeFilename(data?.title || 'video');
 
-    // Extract cookies for authenticated downloads
-    const cookies = await page.getCookies({ domain: 'bilibili.com' });
-    const cookieString = formatCookieHeader(cookies);
-
-    // Create output directory
-    fs.mkdirSync(output, { recursive: true });
-
-    // Export cookies to Netscape format for yt-dlp
-    let cookiesFile: string | undefined;
-    if (cookies.length > 0) {
-      const tempDir = getTempDir();
-      fs.mkdirSync(tempDir, { recursive: true });
-      cookiesFile = path.join(tempDir, `bilibili_cookies_${Date.now()}.txt`);
-      exportCookiesToNetscape(cookies, cookiesFile);
-    }
+    // Extract cookies for yt-dlp
+    const browserCookies = await page.getCookies({ domain: 'bilibili.com' });
 
     // Build yt-dlp format string based on quality
     let format = 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best';
@@ -89,62 +67,26 @@ cli({
       format = 'bestvideo[height<=480][ext=mp4]+bestaudio[ext=m4a]/best[height<=480]';
     }
 
-    const destPath = path.join(output, `${bvid}_${title}.mp4`);
-
-    const tracker = new DownloadProgressTracker(1, true);
-    const progressBar = tracker.onFileStart(`${bvid}.mp4`, 0);
-
-    try {
-      const result = await ytdlpDownload(
-        `https://www.bilibili.com/video/${bvid}`,
-        destPath,
-        {
-          cookiesFile,
-          format,
-          extraArgs: [
-            '--merge-output-format', 'mp4',
-            '--embed-thumbnail',
-          ],
-          onProgress: (percent) => {
-            if (progressBar) progressBar.update(percent, 100);
-          },
-        },
-      );
-
-      if (progressBar) {
-        progressBar.complete(result.success, result.success ? formatBytes(result.size) : undefined);
-      }
-
-      tracker.onFileComplete(result.success);
-      tracker.finish();
-
-      // Cleanup cookies file
-      if (cookiesFile && fs.existsSync(cookiesFile)) {
-        fs.unlinkSync(cookiesFile);
-      }
-
-      return [{
-        bvid,
-        title: data?.title || 'video',
-        status: result.success ? 'success' : 'failed',
-        size: result.success ? formatBytes(result.size) : (result.error || 'unknown error'),
-      }];
-    } catch (err: any) {
-      if (progressBar) progressBar.fail(err.message);
-      tracker.onFileComplete(false);
-      tracker.finish();
-
-      // Cleanup cookies file
-      if (cookiesFile && fs.existsSync(cookiesFile)) {
-        fs.unlinkSync(cookiesFile);
-      }
-
-      return [{
-        bvid,
-        title: data?.title || 'video',
-        status: 'failed',
-        size: err.message,
-      }];
-    }
+    const videoUrl = `https://www.bilibili.com/video/${bvid}`;
+    const filename = `${bvid}_${title}.mp4`;
+
+    const results = await downloadMedia(
+      [{ type: 'video-ytdlp', url: videoUrl, filename }],
+      {
+        output,
+        browserCookies,
+        filenamePrefix: bvid,
+        ytdlpExtraArgs: ['-f', format, '--merge-output-format', 'mp4', '--embed-thumbnail'],
+      },
+    );
+
+    // Map results to bilibili-specific columns
+    const r = results[0] || { status: 'failed', size: '-' };
+    return [{
+      bvid,
+      title: data?.title || 'video',
+      status: r.status,
+      size: r.size,
+    }];
   },
 });

package/src/clis/bilibili/utils.ts

@@ -3,6 +3,7 @@
  */
 
 import type { IPage } from '../../types.js';
+import { AuthRequiredError } from '../../errors.js';
 
 const MIXIN_KEY_ENC_TAB = [
   46,47,18,2,53,8,23,32,15,50,10,31,58,3,45,35,27,43,5,49,
@@ -98,7 +99,7 @@ export async function fetchJson(page: IPage, url: string): Promise<any> {
 export async function getSelfUid(page: IPage): Promise<string> {
   const nav = await getNavData(page);
   const mid = nav?.data?.mid;
-  if (!mid) throw new Error('Not logged in to Bilibili');
+  if (!mid) throw new AuthRequiredError('bilibili.com');
   return String(mid);
 }
 

package/src/clis/chaoxing/assignments.ts

@@ -1,4 +1,5 @@
 import { cli, Strategy } from '../../registry.js';
+import { AuthRequiredError } from '../../errors.js';
 import {
   getCourses, initSession, enterCourse, getTabIframeUrl,
   parseAssignmentsFromDom, sleep,
@@ -33,7 +34,7 @@ cli({
 
     // 2. Get courses
     const courses = await getCourses(page);
-    if (!courses.length) throw new Error('未获取到课程列表，请确认已登录学习通');
+    if (!courses.length) throw new AuthRequiredError('mooc2-ans.chaoxing.com', '未获取到课程列表');
 
     const filtered = courseFilter
       ? courses.filter(c => c.title.includes(courseFilter))

package/src/clis/doubao/ask.ts

@@ -0,0 +1,40 @@
+import { cli, Strategy } from '../../registry.js';
+import type { IPage } from '../../types.js';
+import { DOUBAO_DOMAIN, getDoubaoTranscriptLines, getDoubaoVisibleTurns, sendDoubaoMessage, waitForDoubaoResponse } from './common.js';
+
+export const askCommand = cli({
+  site: 'doubao',
+  name: 'ask',
+  description: 'Send a prompt and wait for the Doubao response',
+  domain: DOUBAO_DOMAIN,
+  strategy: Strategy.COOKIE,
+  browser: true,
+  navigateBefore: false,
+  timeoutSeconds: 180,
+  args: [
+    { name: 'text', required: true, positional: true, help: 'Prompt to send' },
+    { name: 'timeout', required: false, help: 'Max seconds to wait (default: 60)', default: '60' },
+  ],
+  columns: ['Role', 'Text'],
+  func: async (page: IPage, kwargs: any) => {
+    const text = kwargs.text as string;
+    const timeout = parseInt(kwargs.timeout as string, 10) || 60;
+    const beforeTurns = await getDoubaoVisibleTurns(page);
+    const beforeLines = await getDoubaoTranscriptLines(page);
+
+    await sendDoubaoMessage(page, text);
+    const response = await waitForDoubaoResponse(page, beforeLines, beforeTurns, text, timeout);
+
+    if (!response) {
+      return [
+        { Role: 'User', Text: text },
+        { Role: 'System', Text: `No response within ${timeout}s. Doubao may still be generating.` },
+      ];
+    }
+
+    return [
+      { Role: 'User', Text: text },
+      { Role: 'Assistant', Text: response },
+    ];
+  },
+});