@cnbcool/cnb-api-generate 2.6.0 → 2.6.1

package/client/utils/upload.ts

@@ -72,43 +72,32 @@ function mimeLookup(filePath: string): string {
 // 上传文件大小上限：100MB
 const MAX_FILE_SIZE = 100 * 1024 * 1024;
 
-/** 上传 API 的 path 参数（issue 走 asset-group 流程时只需要 repo） */
+/** 上传 API 的 path 参数（issue 走 comment-asset-upload-url 流程需要 repo + number） */
 interface UploadPathParams {
   repo: string;
   number?: string;
 }
 
-/** Issue asset-group 单条附件的描述（请求体里的元素） */
-interface AssetItem {
+/** Issue comment-asset-upload-url 接口请求体（单文件，与 swagger PostIssueAssetUploadURLForm 对齐） */
+interface IssueAssetUploadURLBody {
   name: string;
   size: number;
   content_type: string;
 }
 
-/** Issue asset-group 创建请求体 */
-interface IssueAssetGroupBody {
-  file_assets?: AssetItem[];
-  image_assets?: AssetItem[];
-}
-
 /** Pull 上传请求体 */
 interface PullUploadBody {
   name: string;
   size: number;
 }
 
-/** Issue asset-group 接口响应（与 swagger 一致；只列出我们用到的字段） */
-interface AssetUploadEntry {
+/** Issue comment-asset-upload-url 接口响应（与 swagger api.IssueAssetUploadURL 对齐） */
+interface IssueAssetUploadURLResponseData {
   name?: string;
   path?: string;
   asset_link?: string;
   upload_url?: string;
 }
-interface IssueAssetGroupResponseData {
-  asset_group_id?: string;
-  file_upload_urls?: AssetUploadEntry[];
-  image_upload_urls?: AssetUploadEntry[];
-}
 
 /** Pull 上传 API 响应 */
 interface PullUploadResponseData {
@@ -117,11 +106,11 @@ interface PullUploadResponseData {
   token?: string;
 }
 
-/** 上传 API 函数签名（issue 与 pull 分别由对应的 swagger 函数承担，统一为 (firstArg, body)） */
+/** 上传 API 函数签名（issue 与 pull 分别由对应的 swagger 函数承担） */
 type UploadApiFunction = (
   firstArg: UploadPathParams | string,
-  body: IssueAssetGroupBody | PullUploadBody,
-) => Promise<{ status?: number; data?: IssueAssetGroupResponseData | PullUploadResponseData }>;
+  body: IssueAssetUploadURLBody | PullUploadBody,
+) => Promise<{ status?: number; data?: IssueAssetUploadURLResponseData | PullUploadResponseData }>;
 
 /** 上传失败时的 data */
 interface UploadErrorData {
@@ -132,8 +121,8 @@ interface UploadErrorData {
 /** Issue 上传成功时的 data */
 interface IssueUploadData {
   asset_link?: string;
-  asset_group_id?: string;
   name: string;
+  path?: string;
   size: number;
 }
 
@@ -154,11 +143,12 @@ interface UploadResult {
 /**
  * 处理完整上传流程
  *
- * Issue 路径（走 asset-group 一次性接口）：
- *   1. POST /{repo}/-/issues/asset-groups 携带 file_assets 或 image_assets
- *      → 服务端创建 asset_group 并返回 upload_url + asset_link
+ * Issue 路径（走 comment-asset-upload-url 接口，按 file/image 分别调用）：
+ *   1. POST /{repo}/-/issues/{number}/comment-file-asset-upload-url
+ *      或 /{repo}/-/issues/{number}/comment-image-asset-upload-url
+ *      携带 { name, size, content_type } → 服务端返回 upload_url + asset_link
  *   2. PUT 文件流到 upload_url
- *   3. 返回 asset_link 给调用方拼到评论或 issue 描述里
+ *   3. 返回 asset_link 给调用方拼到评论 body 里
  *
  * Pull 路径（保留原有的 upload-files / upload-imgs 一步上传）：
  *   1. POST /{repo}/upload-files（或 imgs） 拿 upload_url
@@ -167,7 +157,7 @@ interface UploadResult {
  * @param shortcut    解析后的快捷命令；shortcut.kind 决定 issue 上传走 file 还是 image 通道
  * @param filePath    本地文件路径
  * @param toolFunction 原始上传 API 函数
- * @param pathParams  API 调用的 path 参数（issue 只需 repo；pull 也只需 repo）
+ * @param pathParams  API 调用的 path 参数（issue 需要 repo+number；pull 只需 repo）
  */
 export async function handleUpload(
   shortcut: ResolvedShortcut,
@@ -204,30 +194,30 @@ export async function handleUpload(
 
   // 2. 调用上传 API 获取 upload_url
   const isIssueUpload = shortcut.module === 'issues';
-  const isImageKind = shortcut.kind === 'image';
 
   let uploadUrl: string | undefined;
-  let issueAssetLink: string | undefined;
-  let issueAssetGroupId: string | undefined;
+  let issueResponseData: IssueAssetUploadURLResponseData | undefined;
   let pullResponseData: PullUploadResponseData | undefined;
 
   if (isIssueUpload) {
-    // Issue: 调 post-asset-group，一次拿 asset_group_id + upload_url + asset_link
-    // 函数签名：(repo: string, { file_assets | image_assets }, ...)
-    const assetItem: AssetItem = { name: fileName, size: fileSize, content_type: contentType };
-    const requestBody: IssueAssetGroupBody = isImageKind
-      ? { image_assets: [assetItem] }
-      : { file_assets: [assetItem] };
-
-    const apiResponse = await toolFunction(pathParams.repo, requestBody);
-    const data = apiResponse?.data as IssueAssetGroupResponseData | undefined;
+    // Issue: 调 post-issue-comment-{file|image}-asset-upload-url，
+    // 由 cag.config.js 的 quickCommands 通过 kind=file/image 选择 realTool。
+    // 函数签名：({ repo, number }, { name, size, content_type })
+    if (!pathParams.number) {
+      return { status: 400, data: { error: '缺少 issue number（请确认 CNB_ISSUE_IID 是否已设置）' } };
+    }
+    const requestBody: IssueAssetUploadURLBody = {
+      name: fileName,
+      size: fileSize,
+      content_type: contentType,
+    };
 
-    // 服务端可能返回 201/200，从对应数组里取第一条 upload 描述
-    const entries = isImageKind ? data?.image_upload_urls : data?.file_upload_urls;
-    const entry = entries?.[0];
-    uploadUrl = entry?.upload_url;
-    issueAssetLink = entry?.asset_link;
-    issueAssetGroupId = data?.asset_group_id;
+    const apiResponse = await toolFunction(
+      { repo: pathParams.repo, number: pathParams.number },
+      requestBody,
+    );
+    issueResponseData = apiResponse?.data as IssueAssetUploadURLResponseData | undefined;
+    uploadUrl = issueResponseData?.upload_url;
 
     if (!uploadUrl) {
       // 拿 URL 失败：把原始响应作为错误返回，便于排查
@@ -282,9 +272,9 @@ export async function handleUpload(
     return {
       status: 200,
       data: {
-        asset_link: issueAssetLink,
-        asset_group_id: issueAssetGroupId,
-        name: fileName,
+        asset_link: issueResponseData?.asset_link,
+        name: issueResponseData?.name || fileName,
+        path: issueResponseData?.path,
         size: fileSize,
       },
     };

package/package.json

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