@cnbcool/cnb-api-generate 1.2.5 → 1.2.7

package/client/index.ts

@@ -498,7 +498,7 @@ async function main() {
   // 上传快捷命令：走完整上传流程（获取 URL → PUT 文件 → 返回结果）
   let data: any;
   if (shortcut?.upload) {
-    data = await handleUpload(shortcut, formattedParams.data?.file, toolFunction, pathAndQueryParams);
+    data = await handleUpload(shortcut, formattedParams.data?.file, toolFunction, pathAndQueryParams as { repo: string; number?: string });
   } else {
     if (formattedParams.data) {
       toolsParam.push(formattedParams.data);

package/client/utils/upload.ts

@@ -8,27 +8,148 @@
 
 import fs from 'fs';
 import nodePath from 'path';
-import { lookup as mimeLookup } from 'mime-types';
 import type { ResolvedShortcut } from '../shortcuts';
 
+/** 常见文件扩展名 → MIME 类型映射（仅用于上传场景，不引入外部依赖） */
+const MIME_MAP: Record<string, string> = {
+  '.txt': 'text/plain',
+  '.html': 'text/html', '.htm': 'text/html',
+  '.css': 'text/css',
+  '.csv': 'text/csv',
+  '.js': 'application/javascript', '.mjs': 'application/javascript',
+  '.json': 'application/json',
+  '.xml': 'application/xml',
+  '.pdf': 'application/pdf',
+  '.zip': 'application/zip',
+  '.gz': 'application/gzip', '.gzip': 'application/gzip',
+  '.tar': 'application/x-tar',
+  '.7z': 'application/x-7z-compressed',
+  '.rar': 'application/vnd.rar',
+  '.doc': 'application/msword',
+  '.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+  '.xls': 'application/vnd.ms-excel',
+  '.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+  '.ppt': 'application/vnd.ms-powerpoint',
+  '.pptx': 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+  '.png': 'image/png',
+  '.jpg': 'image/jpeg', '.jpeg': 'image/jpeg',
+  '.gif': 'image/gif',
+  '.svg': 'image/svg+xml',
+  '.webp': 'image/webp',
+  '.ico': 'image/x-icon',
+  '.bmp': 'image/bmp',
+  '.mp3': 'audio/mpeg',
+  '.wav': 'audio/wav',
+  '.ogg': 'audio/ogg',
+  '.mp4': 'video/mp4',
+  '.webm': 'video/webm',
+  '.avi': 'video/x-msvideo',
+  '.mov': 'video/quicktime',
+  '.woff': 'font/woff', '.woff2': 'font/woff2',
+  '.ttf': 'font/ttf',
+  '.otf': 'font/otf',
+  '.md': 'text/markdown',
+  '.yaml': 'text/yaml', '.yml': 'text/yaml',
+  '.sh': 'application/x-sh',
+  '.py': 'text/x-python',
+  '.rb': 'text/x-ruby',
+  '.go': 'text/x-go',
+  '.rs': 'text/x-rust',
+  '.ts': 'text/typescript', '.tsx': 'text/typescript',
+  '.jsx': 'text/jsx',
+  '.java': 'text/x-java-source',
+  '.c': 'text/x-c', '.h': 'text/x-c',
+  '.cpp': 'text/x-c++src', '.hpp': 'text/x-c++hdr',
+  '.log': 'text/plain',
+  '.patch': 'text/x-diff', '.diff': 'text/x-diff',
+};
+
+function mimeLookup(filePath: string): string {
+  const ext = nodePath.extname(filePath).toLowerCase();
+  return MIME_MAP[ext] || 'application/octet-stream';
+}
+
 // 上传文件大小上限：100MB
 const MAX_FILE_SIZE = 100 * 1024 * 1024;
 
+/** 上传 API 的 path 参数 */
+interface UploadPathParams {
+  repo: string;
+  number?: string;
+}
+
+/** Issue 上传请求体 */
+interface IssueUploadBody {
+  name: string;
+  size: number;
+  content_type: string;
+}
+
+/** Pull 上传请求体 */
+interface PullUploadBody {
+  name: string;
+  size: number;
+}
+
+/** 上传 API 函数签名 */
+type UploadApiFunction = (
+  params: UploadPathParams,
+  body: IssueUploadBody | PullUploadBody,
+) => Promise<UploadApiResponse>;
+
+/** 上传 API 响应 */
+interface UploadApiResponse {
+  status?: number;
+  data?: {
+    upload_url?: string;
+    asset_link?: string;
+    assets?: { name?: string; path?: string };
+    token?: string;
+  };
+}
+
+/** 上传失败时的 data */
+interface UploadErrorData {
+  error: string;
+  detail?: string;
+}
+
+/** Issue 上传成功时的 data */
+interface IssueUploadData {
+  asset_link?: string;
+  name: string;
+  size: number;
+}
+
+/** Pull 上传成功时的 data */
+interface PullUploadData {
+  name: string;
+  path?: string;
+  size: number;
+  token?: string;
+}
+
+/** handleUpload 的返回值 */
+interface UploadResult {
+  status: number;
+  data: UploadErrorData | IssueUploadData | PullUploadData;
+}
+
 /**
  * 处理完整上传流程
  * @param shortcut 解析后的快捷命令
  * @param filePath 本地文件路径
  * @param toolFunction 原始上传 API 函数（获取 upload_url）
- * @param toolsParam API 调用的 path 参数（repo 或 {repo, number}）
+ * @param pathParams API 调用的 path 参数（repo 或 {repo, number}）
  */
 export async function handleUpload(
   shortcut: ResolvedShortcut,
-  filePath: any,
-  toolFunction: (...args: any[]) => Promise<any>,
-  toolsParam: any,
-): Promise<any> {
+  filePath: string | undefined,
+  toolFunction: UploadApiFunction,
+  pathParams: UploadPathParams,
+): Promise<UploadResult> {
   // 校验 file 参数
-  if (!filePath || typeof filePath !== 'string') {
+  if (!filePath) {
     return { status: 400, data: { error: `上传命令需要指定文件路径，如: --data '{"file":"./path/to/file"}'` } };
   }
 
@@ -52,7 +173,7 @@ export async function handleUpload(
     return { status: 400, data: { error: `文件过大 (${(fileSize / 1024 / 1024).toFixed(1)}MB)，上限 ${MAX_FILE_SIZE / 1024 / 1024}MB` } };
   }
 
-  const contentType = mimeLookup(filePath) || 'application/octet-stream';
+  const contentType = mimeLookup(filePath);
 
   // 2. 调用上传 API 获取 upload_url
   const isIssueUpload = shortcut.module === 'issues';
@@ -60,14 +181,14 @@ export async function handleUpload(
     ? { name: fileName, size: fileSize, content_type: contentType }
     : { name: fileName, size: fileSize };
 
-  const uploadResponse = await toolFunction(toolsParam, requestBody);
+  const uploadResponse = await toolFunction(pathParams, requestBody);
 
-  // 提取 upload_url（兼容标准响应和裸响应）
-  const responseData = uploadResponse?.data ?? uploadResponse;
+  // 提取 upload_url
+  const responseData = uploadResponse?.data;
   const uploadUrl = responseData?.upload_url;
 
   if (!uploadUrl) {
-    return uploadResponse; // 获取 URL 失败，直接返回原始错误
+    return uploadResponse as unknown as UploadResult; // 获取 URL 失败，直接返回原始错误
   }
 
   // 3. PUT 文件内容到 upload_url（流式读取，避免大文件撑爆内存）
@@ -78,15 +199,22 @@ export async function handleUpload(
     'Content-Length': String(fileSize),
   };
 
-  const putResponse = await fetch(uploadUrl, {
-    method: 'PUT',
-    headers: putHeaders,
-    body: fileStream as any,
-    // @ts-ignore duplex required for streaming body in Node.js fetch
-    duplex: 'half',
-  });
+  let putResponse: Response;
+  try {
+    putResponse = await fetch(uploadUrl, {
+      method: 'PUT',
+      headers: putHeaders,
+      body: fileStream as any,
+      // @ts-ignore duplex required for streaming body in Node.js fetch
+      duplex: 'half',
+    });
+  } catch (e) {
+    fileStream.destroy();
+    throw e;
+  }
 
   if (!putResponse.ok) {
+    fileStream.destroy();
     const errText = await putResponse.text().catch(() => '');
     return {
       status: putResponse.status,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cnbcool/cnb-api-generate",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "main": "./built/index.js",
   "module": "./src/index.ts",
   "types": "./src/index.ts",