ai-yuca 1.0.8 → 1.1.1

package/.cdn.cache.json

@@ -1,5 +1,5 @@
 {
   "lastUploadVersion": "mfhlsh6u",
-  "lastDeployTime": "2025-09-13T02:50:24.958Z",
-  "lastDeployVersion": "mfho5760"
+  "lastDeployTime": "2025-09-15T06:15:45.798Z",
+  "lastDeployVersion": "mfkqd0es"
 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ai-yuca",
-    "version": "1.0.8",
+    "version": "1.1.1",
     "description": "一个实用的AI辅助工具",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",

package/dist/src/deploy.js

@@ -50,15 +50,32 @@ const uploadWithConfig_1 = require("./uploadWithConfig");
 const cache_1 = require("./cache");
 const child_process_1 = require("child_process");
 /**
- * 获取环境配置文件
+ * 从GCP存储读取环境配置文件
  */
-const getConfigFiles = (env, config) => {
+const getConfigFiles = (env, config, keyFile) => {
     return new Promise(async (resolve) => {
         try {
-            const { data: sitemap = { projects: [] } } = await axios_1.default.get(`${config.aws.HostName}/${config.aws.prefix}/static/config/${env}.config.json`);
+            // 继承原来的权限文件，创建GCP存储客户端
+            const storageClient = keyFile
+                ? (0, upload_1.createStorageClient)({ keyFilename: keyFile })
+                : (0, upload_1.createStorageClient)();
+            const bucket = storageClient.bucket(config.aws.Bucket);
+            const configPath = `${config.aws.prefix}/static/config/${env}.config.json`;
+            const file = bucket.file(configPath);
+            // 检查文件是否存在
+            const [exists] = await file.exists();
+            if (!exists) {
+                console.log(`配置文件不存在: ${configPath}`);
+                resolve({ data: { projects: [] } });
+                return;
+            }
+            // 直接读取文件内容到内存，不下载到本地
+            const [contents] = await file.download();
+            const sitemap = JSON.parse(contents.toString());
             resolve({ data: sitemap });
         }
         catch (e) {
+            console.log(`读取配置文件失败: ${e instanceof Error ? e.message : String(e)}`);
             resolve({ data: { projects: [] } });
         }
     });
@@ -176,7 +193,7 @@ async function uploadToGcp(filePath, bucketName, destination, keyFile) {
 async function updateEnvironmentConfig(env, projectName, versionInfo, config, keyFile) {
     try {
         // 获取当前环境配置
-        const { data: envConfig } = await getConfigFiles(env, config);
+        const { data: envConfig } = await getConfigFiles(env, config, keyFile);
         // 查找或创建项目配置
         let projectConfig = envConfig.projects.find((p) => p.name === projectName);
         if (!projectConfig) {
@@ -198,11 +215,14 @@ async function updateEnvironmentConfig(env, projectName, versionInfo, config, ke
         const configPath = `${config.aws.prefix}/static/config/${env}.config.json`;
         const tempFile = path.join(process.cwd(), `temp-${env}-config.json`);
         fs.writeFileSync(tempFile, JSON.stringify(envConfig, null, 2));
-        const result = await uploadToGcp(tempFile, config.bucketName, configPath, keyFile);
+        console.log("更新线上配置:", JSON.stringify(envConfig));
+        const result = await uploadToGcp(tempFile, config.aws.Bucket, configPath, keyFile);
         fs.unlinkSync(tempFile);
+        console.log('更新环境配置状态:', JSON.stringify(result.error) || result.url);
         return result.success;
     }
-    catch (_a) {
+    catch (e) {
+        console.log('更新环境配置失败:', e);
         return false;
     }
 }
@@ -218,23 +238,11 @@ async function deployFiles(options) {
         // 2. 执行upload-config阶段
         console.log('📤 执行upload-config上传配置文件...');
         try {
-            const uploadResult = await (0, uploadWithConfig_1.uploadFilesWithConfig)({
+            await (0, uploadWithConfig_1.uploadFilesWithConfig)({
                 configPath: options.config,
                 storageClientOptions: options.keyFile ? { keyFilename: options.keyFile } : {},
                 enableCache: true
             });
-            if (uploadResult.success.length > 0) {
-                console.log(chalk_1.default.green(`✅ upload-config成功: ${uploadResult.success.length}个文件`));
-                uploadResult.success.forEach(file => {
-                    console.log(chalk_1.default.green(`  ✅ ${file.file}: ${file.url}`));
-                });
-            }
-            if (uploadResult.failed.length > 0) {
-                console.log(chalk_1.default.red(`❌ upload-config失败: ${uploadResult.failed.length}个文件`));
-                uploadResult.failed.forEach(file => {
-                    console.log(chalk_1.default.red(`  ❌ ${file.file}: ${file.error}`));
-                });
-            }
         }
         catch (error) {
             console.warn(`⚠️ upload-config执行失败: ${error instanceof Error ? error.message : String(error)}`);
@@ -260,17 +268,22 @@ async function deployFiles(options) {
         // 5. 文件处理与上传阶段
         console.log('📤 上传原始HTML文件...');
         const uploadedFiles = [];
-        for (const file of files) {
+        // 使用Promise.all并行上传文件
+        const uploadPromises = files.map(file => {
             const relativePath = path.relative(sourcePath, file);
             const destination = `${prefix}/${cdnKey}/${relativePath}`;
             console.log(`  上传: ${relativePath}`);
-            const result = await (0, upload_1.uploadFile)({
+            return (0, upload_1.uploadFile)({
                 bucketName: uploadConfig.bucketName,
                 filePath: file,
                 destination,
                 storageClient: (0, upload_1.createStorageClient)(options.keyFile ? { keyFilename: options.keyFile } : {}),
                 enableCompression: true
-            });
+            }).then(result => ({ result, relativePath, destination }));
+        });
+        const uploadResults = await Promise.all(uploadPromises);
+        // 同步打印上传结果
+        for (const { result, relativePath, destination } of uploadResults) {
             if (result.success) {
                 uploadedFiles.push(relativePath);
                 console.log(chalk_1.default.green(`  ✅ ${relativePath}: ${result.url || destination}`));
@@ -346,7 +359,8 @@ async function deployFiles(options) {
         // 7. 环境配置同步阶段
         console.log('🔄 同步环境配置...');
         // 检查项目是否存在
-        const { data: envConfig } = await getConfigFiles(options.env, config);
+        const { data: envConfig } = await getConfigFiles(options.env, config, options.keyFile);
+        console.log('当前环境配置:', JSON.stringify(envConfig));
         const existingProject = envConfig.projects.find((p) => p.name === projectInfo.name);
         if (!existingProject) {
             if (options.force) {
@@ -375,7 +389,11 @@ async function deployFiles(options) {
             timestamp: Date.now(),
             files: obj.links
         };
-        await updateEnvironmentConfig(options.env, projectInfo.name, versionInfo, config, options.keyFile);
+        const projectConfigUpdate = await updateEnvironmentConfig(options.env, projectInfo.name, versionInfo, config, options.keyFile);
+        console.log('项目配置信息上传结果:', JSON.stringify(projectConfigUpdate));
+        if (!projectConfigUpdate) {
+            throw new Error('更新项目配置失败,发布失败！');
+        }
         // 8. 发布完成阶段
         console.log('💾 记录发布版本...');
         (0, cache_1.writeLastDeployVersion)(cdnKey);

package/dist/src/types/deploy.d.ts

@@ -61,7 +61,7 @@ export interface DeployResult {
     message: string;
 }
 export interface GetConfigFilesFunction {
-    (env: string, config: Record<string, any>): Promise<{
+    (env: string, config: Record<string, any>, keyFile?: string): Promise<{
         data: {
             projects: Array<any>;
         };

package/dist/src/upload.js

@@ -120,6 +120,7 @@ async function uploadFile(options) {
             }
         }
         // 上传文件
+        // @ts-ignore
         const [file] = await bucket.upload(fileToUpload, {
             destination: destPath,
             // 设置元数据
@@ -128,9 +129,6 @@ async function uploadFile(options) {
                 cacheControl: contentType === 'application/json' ? 'public, max-age=0' : 'public, max-age=31536000',
                 contentEncoding,
                 contentType
-            },
-            preconditionOpts: {
-                ifGenerationMatch: 0 // 0表示如果文件存在则覆盖
             }
         });
         // 如果上传了压缩文件，删除临时文件
@@ -150,7 +148,7 @@ async function uploadFile(options) {
         };
     }
     catch (error) {
-        console.log('上传文件时出错:', JSON.stringify(error));
+        console.log('上传文件时出错:', filePath, JSON.stringify(error));
         return {
             success: false,
             file: filePath,
@@ -176,14 +174,15 @@ async function uploadFiles(options) {
     try {
         // 如果sourcePath是数组，批量上传多个文件
         if (Array.isArray(sourcePath)) {
-            for (const filePath of sourcePath) {
-                const result = await uploadFile({
-                    bucketName,
-                    filePath,
-                    destination: destination ? `${destination}/${path.basename(filePath)}` : undefined,
-                    storageClient,
-                    enableCompression
-                });
+            const uploadPromises = sourcePath.map(filePath => uploadFile({
+                bucketName,
+                filePath,
+                destination: destination ? `${destination}/${path.basename(filePath)}` : undefined,
+                storageClient,
+                enableCompression
+            }));
+            const uploadResults = await Promise.all(uploadPromises);
+            for (const result of uploadResults) {
                 if (result.success) {
                     results.success.push(result);
                 }
@@ -214,37 +213,52 @@ async function uploadFiles(options) {
         else if (stats.isDirectory()) {
             // 上传目录中的文件
             const files = await readdir(sourcePath);
+            // 分离文件和目录
+            const filePromises = [];
+            const dirPromises = [];
             for (const file of files) {
                 const filePath = path.join(sourcePath, file);
                 const fileStats = await stat(filePath);
                 if (fileStats.isFile()) {
-                    // 上传文件
+                    // 准备文件上传Promise
                     const destPath = destination ? `${destination}/${file}` : file;
-                    const result = await uploadFile({
+                    filePromises.push(uploadFile({
                         bucketName,
                         filePath,
                         destination: destPath,
                         storageClient,
                         enableCompression
-                    });
-                    if (result.success) {
-                        results.success.push(result);
-                    }
-                    else {
-                        results.failed.push(result);
-                    }
+                    }));
                 }
                 else if (recursive && fileStats.isDirectory()) {
-                    // 递归上传子目录
+                    // 准备递归目录上传Promise
                     const subDestination = destination ? `${destination}/${file}` : file;
-                    const subResults = await uploadFiles({
+                    dirPromises.push(uploadFiles({
                         bucketName,
                         sourcePath: filePath,
                         destination: subDestination,
                         storageClient,
                         recursive,
                         enableCompression
-                    });
+                    }));
+                }
+            }
+            // 并行上传所有文件
+            if (filePromises.length > 0) {
+                const fileResults = await Promise.all(filePromises);
+                for (const result of fileResults) {
+                    if (result.success) {
+                        results.success.push(result);
+                    }
+                    else {
+                        results.failed.push(result);
+                    }
+                }
+            }
+            // 并行处理所有子目录
+            if (dirPromises.length > 0) {
+                const dirResults = await Promise.all(dirPromises);
+                for (const subResults of dirResults) {
                     results.success = results.success.concat(subResults.success);
                     results.failed = results.failed.concat(subResults.failed);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-yuca",
-  "version": "1.0.8",
+  "version": "1.1.1",
   "description": "一个实用的AI辅助工具",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

package/src/deploy.ts

@@ -16,23 +16,38 @@ import {
   DeployConfig,
   ProjectInfo,
   DeployVersionInfo,
-  EnvironmentConfig,
-  ProjectConfig,
   DeployResult,
   GetConfigFilesFunction
 } from './types/deploy';
 
 /**
- * 获取环境配置文件
+ * 从GCP存储读取环境配置文件
  */
-const getConfigFiles: GetConfigFilesFunction = (env, config) => {
+const getConfigFiles: GetConfigFilesFunction = (env, config, keyFile) => {
   return new Promise(async resolve => {
     try {
-      const { data: sitemap = { projects: [] } } = await axios.get(
-        `${config.aws.HostName}/${config.aws.prefix}/static/config/${env}.config.json`
-      );
+      // 继承原来的权限文件，创建GCP存储客户端
+      const storageClient = keyFile 
+        ? createStorageClient({ keyFilename: keyFile })
+        : createStorageClient();
+      const bucket = storageClient.bucket(config.aws.Bucket);
+      const configPath = `${config.aws.prefix}/static/config/${env}.config.json`;
+      const file = bucket.file(configPath);
+      
+      // 检查文件是否存在
+      const [exists] = await file.exists();
+      if (!exists) {
+        console.log(`配置文件不存在: ${configPath}`);
+        resolve({ data: { projects: [] } });
+        return;
+      }
+      
+      // 直接读取文件内容到内存，不下载到本地
+      const [contents] = await file.download();
+      const sitemap = JSON.parse(contents.toString());
       resolve({ data: sitemap });
     } catch (e) {
+      console.log(`读取配置文件失败: ${e instanceof Error ? e.message : String(e)}`);
       resolve({ data: { projects: [] } });
     }
   });
@@ -156,7 +171,7 @@ async function uploadToGcp(
       storageClient: client,
       enableCompression: true
     });
-    
+
     if (result.success) {
       return { success: true, url: result.url };
     } else {
@@ -183,7 +198,7 @@ async function updateEnvironmentConfig(
 ): Promise<boolean> {
   try {
     // 获取当前环境配置
-    const { data: envConfig } = await getConfigFiles(env, config);
+    const { data: envConfig } = await getConfigFiles(env, config, keyFile);
     
     // 查找或创建项目配置
     let projectConfig = envConfig.projects.find((p: any) => p.name === projectName);
@@ -208,13 +223,16 @@ async function updateEnvironmentConfig(
     const tempFile = path.join(process.cwd(), `temp-${env}-config.json`);
     
     fs.writeFileSync(tempFile, JSON.stringify(envConfig, null, 2));
+
+    console.log("更新线上配置:", JSON.stringify(envConfig));
     
-    const result = await uploadToGcp(tempFile, config.bucketName, configPath, keyFile);
+    const result = await uploadToGcp(tempFile, config.aws.Bucket, configPath, keyFile);
     
     fs.unlinkSync(tempFile);
-    
+    console.log('更新环境配置状态:', JSON.stringify(result.error) || result.url);
     return result.success;
-  } catch {
+  } catch(e) {
+    console.log('更新环境配置失败:', e);
     return false;
   }
 }
@@ -235,23 +253,11 @@ export async function deployFiles(options: DeployCommandOptions): Promise<Deploy
     // 2. 执行upload-config阶段
     console.log('📤 执行upload-config上传配置文件...');
     try {
-      const uploadResult = await uploadFilesWithConfig({
+      await uploadFilesWithConfig({
         configPath: options.config,
         storageClientOptions: options.keyFile ? { keyFilename: options.keyFile } : {},
         enableCache: true
       });
-      if (uploadResult.success.length > 0) {
-         console.log(chalk.green(`✅ upload-config成功: ${uploadResult.success.length}个文件`));
-         uploadResult.success.forEach(file => {
-           console.log(chalk.green(`  ✅ ${file.file}: ${file.url}`));
-         });
-       }
-       if (uploadResult.failed.length > 0) {
-         console.log(chalk.red(`❌ upload-config失败: ${uploadResult.failed.length}个文件`));
-         uploadResult.failed.forEach(file => {
-           console.log(chalk.red(`  ❌ ${file.file}: ${file.error}`));
-         });
-       }
     } catch (error) {
       console.warn(`⚠️ upload-config执行失败: ${error instanceof Error ? error.message : String(error)}`);
     }
@@ -284,19 +290,25 @@ export async function deployFiles(options: DeployCommandOptions): Promise<Deploy
     console.log('📤 上传原始HTML文件...');
     const uploadedFiles: string[] = [];
     
-    for (const file of files) {
+    // 使用Promise.all并行上传文件
+    const uploadPromises = files.map(file => {
       const relativePath = path.relative(sourcePath, file);
       const destination = `${prefix}/${cdnKey}/${relativePath}`;
       
       console.log(`  上传: ${relativePath}`);
-      const result = await uploadFile({
+      return uploadFile({
         bucketName: uploadConfig.bucketName,
         filePath: file,
         destination,
         storageClient: createStorageClient(options.keyFile ? { keyFilename: options.keyFile } : {}),
         enableCompression: true
-      });
-      
+      }).then(result => ({ result, relativePath, destination }));
+    });
+    
+    const uploadResults = await Promise.all(uploadPromises);
+    
+    // 同步打印上传结果
+    for (const { result, relativePath, destination } of uploadResults) {
       if (result.success) {
         uploadedFiles.push(relativePath);
         console.log(chalk.green(`  ✅ ${relativePath}: ${result.url || destination}`));
@@ -378,7 +390,10 @@ export async function deployFiles(options: DeployCommandOptions): Promise<Deploy
     console.log('🔄 同步环境配置...');
     
     // 检查项目是否存在
-    const { data: envConfig } = await getConfigFiles(options.env, config);
+    const { data: envConfig } = await getConfigFiles(options.env, config, options.keyFile);
+
+    console.log('当前环境配置:', JSON.stringify(envConfig));
+
     const existingProject = envConfig.projects.find((p: any) => p.name === projectInfo.name);
     
     if (!existingProject) {
@@ -410,8 +425,11 @@ export async function deployFiles(options: DeployCommandOptions): Promise<Deploy
       files: obj.links
     };
     
-    await updateEnvironmentConfig(options.env, projectInfo.name, versionInfo, config, options.keyFile);
-    
+    const projectConfigUpdate = await updateEnvironmentConfig(options.env, projectInfo.name, versionInfo, config, options.keyFile);
+    console.log('项目配置信息上传结果:',JSON.stringify(projectConfigUpdate));
+    if (!projectConfigUpdate) {
+      throw new Error('更新项目配置失败,发布失败！');
+    }
     // 8. 发布完成阶段
     console.log('💾 记录发布版本...');
     writeLastDeployVersion(cdnKey);

package/src/types/deploy.ts

@@ -70,5 +70,5 @@ export interface DeployResult {
 }
 
 export interface GetConfigFilesFunction {
-  (env: string, config: Record<string, any>): Promise<{ data: { projects: Array<any> } }>;
+  (env: string, config: Record<string, any>, keyFile?: string): Promise<{ data: { projects: Array<any> } }>;
 }

package/src/upload.ts

@@ -52,7 +52,7 @@ function createStorageClient(options: Partial<StorageClientOptions> = {}): Stora
  * @param options - 上传选项
  * @returns 上传结果
  */
-async function uploadFile(options: UploadFileOptions): Promise<UploadResult> {
+async function  uploadFile(options: UploadFileOptions): Promise<UploadResult> {
   const { bucketName, filePath, destination, storageClient, enableCompression = true } = options;
   
   if (!bucketName || !filePath || !storageClient) {
@@ -105,6 +105,7 @@ async function uploadFile(options: UploadFileOptions): Promise<UploadResult> {
     }
     
     // 上传文件
+    // @ts-ignore
     const [file] = await bucket.upload(fileToUpload, {
       destination: destPath,
       // 设置元数据
@@ -113,9 +114,6 @@ async function uploadFile(options: UploadFileOptions): Promise<UploadResult> {
         cacheControl: contentType === 'application/json' ? 'public, max-age=0' : 'public, max-age=31536000',
         contentEncoding,
         contentType
-      },
-      preconditionOpts: {
-         ifGenerationMatch: 0 // 0表示如果文件存在则覆盖
       }
     });
     
@@ -137,7 +135,7 @@ async function uploadFile(options: UploadFileOptions): Promise<UploadResult> {
       url: `https://storage.googleapis.com/${bucketName}/${metadata.name || path.basename(filePath)}`
     };
   } catch (error) {
-    console.log('上传文件时出错:', JSON.stringify(error));
+    console.log('上传文件时出错:', filePath, JSON.stringify(error));
     return {
       success: false,
       file: filePath,
@@ -169,15 +167,19 @@ async function uploadFiles(options: UploadFilesOptions): Promise<UploadFilesResu
   try {
     // 如果sourcePath是数组，批量上传多个文件
     if (Array.isArray(sourcePath)) {
-      for (const filePath of sourcePath) {
-        const result = await uploadFile({
+      const uploadPromises = sourcePath.map(filePath => 
+        uploadFile({
           bucketName,
           filePath,
           destination: destination ? `${destination}/${path.basename(filePath)}` : undefined,
           storageClient,
           enableCompression
-        });
-        
+        })
+      );
+      
+      const uploadResults = await Promise.all(uploadPromises);
+      
+      for (const result of uploadResults) {
         if (result.success) {
           results.success.push(result);
         } else {
@@ -209,40 +211,60 @@ async function uploadFiles(options: UploadFilesOptions): Promise<UploadFilesResu
       // 上传目录中的文件
       const files = await readdir(sourcePath);
       
+      // 分离文件和目录
+      const filePromises: Promise<any>[] = [];
+      const dirPromises: Promise<any>[] = [];
+      
       for (const file of files) {
         const filePath = path.join(sourcePath, file);
         const fileStats = await stat(filePath);
         
         if (fileStats.isFile()) {
-          // 上传文件
+          // 准备文件上传Promise
           const destPath = destination ? `${destination}/${file}` : file;
           
-          const result = await uploadFile({
-            bucketName,
-            filePath,
-            destination: destPath,
-            storageClient,
-            enableCompression
-          });
+          filePromises.push(
+            uploadFile({
+              bucketName,
+              filePath,
+              destination: destPath,
+              storageClient,
+              enableCompression
+            })
+          );
+        } else if (recursive && fileStats.isDirectory()) {
+          // 准备递归目录上传Promise
+          const subDestination = destination ? `${destination}/${file}` : file;
           
+          dirPromises.push(
+            uploadFiles({
+              bucketName,
+              sourcePath: filePath,
+              destination: subDestination,
+              storageClient,
+              recursive,
+              enableCompression
+            })
+          );
+        }
+      }
+      
+      // 并行上传所有文件
+      if (filePromises.length > 0) {
+        const fileResults = await Promise.all(filePromises);
+        for (const result of fileResults) {
           if (result.success) {
             results.success.push(result);
           } else {
             results.failed.push(result);
           }
-        } else if (recursive && fileStats.isDirectory()) {
-          // 递归上传子目录
-          const subDestination = destination ? `${destination}/${file}` : file;
-          
-          const subResults = await uploadFiles({
-            bucketName,
-            sourcePath: filePath,
-            destination: subDestination,
-            storageClient,
-            recursive,
-            enableCompression
-          });
-          
+        }
+      }
+      
+      // 并行处理所有子目录
+      if (dirPromises.length > 0) {
+        const dirResults = await Promise.all(dirPromises);
+        for (const subResults of dirResults) {
           results.success = results.success.concat(subResults.success);
           results.failed = results.failed.concat(subResults.failed);
         }