ai-yuca 1.0.6 → 1.0.7

package/.cdn.cache.json

@@ -1,5 +1,5 @@
 {
   "lastUploadVersion": "mfhlsh6u",
-  "lastDeployTime": "2025-09-13T01:59:08.130Z",
-  "lastDeployVersion": "mfhmaoje"
+  "lastDeployTime": "2025-09-13T02:39:31.383Z",
+  "lastDeployVersion": "mfhnr62y"
 }

package/bin/cli.ts

@@ -42,6 +42,7 @@ program
   .option('--no-cache', '禁用文件缓存功能')
   .option('--cache-file <path>', '指定缓存文件路径（默认为.cdn.cache.json）')
   .option('--show-config', '仅显示配置信息，不执行部署')
+  .option('-f, --force', '强制执行，跳过交互式确认')
   .action(async (options: DeployCommandOptions) => {
     try {
       const result = await deployFiles(options);

package/dist/bin/cli.js

@@ -71,6 +71,7 @@ program
     .option('--no-cache', '禁用文件缓存功能')
     .option('--cache-file <path>', '指定缓存文件路径（默认为.cdn.cache.json）')
     .option('--show-config', '仅显示配置信息，不执行部署')
+    .option('-f, --force', '强制执行，跳过交互式确认')
     .action(async (options) => {
     try {
         const result = await (0, deploy_1.deployFiles)(options);

package/dist/package.json

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

package/dist/src/deploy.js

@@ -119,22 +119,6 @@ function getBranchName() {
         return 'main';
     }
 }
-/**
- * 读取缓存文件中的版本号
- */
-function getCachedVersion(cacheFile) {
-    const cacheFilePath = cacheFile || path.join(process.cwd(), '.cdn.cache.json');
-    if (!fs.existsSync(cacheFilePath)) {
-        return null;
-    }
-    try {
-        const cache = JSON.parse(fs.readFileSync(cacheFilePath, 'utf8'));
-        return cache.lastUploadVersion || null;
-    }
-    catch (_a) {
-        return null;
-    }
-}
 /**
  * 筛选HTML文件
  */
@@ -185,46 +169,6 @@ async function uploadToGcp(filePath, bucketName, destination, keyFile) {
         return { success: false, error: error instanceof Error ? error.message : String(error) };
     }
 }
-/**
- * 上传版本配置文件
- */
-async function uploadVersionConfig(versionInfo, bucketName, prefix, env, projectName, keyFile) {
-    try {
-        const configPath = `${prefix}/static/config/${env}/${projectName}/${versionInfo.cdnKey}.json`;
-        const tempFile = path.join(process.cwd(), `temp-${versionInfo.cdnKey}.json`);
-        // 写入临时文件
-        fs.writeFileSync(tempFile, JSON.stringify(versionInfo, null, 2));
-        // 上传到GCP
-        const result = await uploadToGcp(tempFile, bucketName, configPath, keyFile);
-        // 删除临时文件
-        fs.unlinkSync(tempFile);
-        return result.success;
-    }
-    catch (_a) {
-        return false;
-    }
-}
-/**
- * 维护版本列表
- */
-async function maintainVersionList(versions, bucketName, prefix, env, projectName, keyFile) {
-    try {
-        // 保留最近50个版本
-        const keepVersions = versions.slice(-50);
-        const versionKeepPath = `${prefix}/static/config/${env}/${projectName}/version.keep.json`;
-        const tempFile = path.join(process.cwd(), 'temp-version-keep.json');
-        // 写入临时文件
-        fs.writeFileSync(tempFile, JSON.stringify({ versions: keepVersions }, null, 2));
-        // 上传到GCP
-        const result = await uploadToGcp(tempFile, bucketName, versionKeepPath, keyFile);
-        // 删除临时文件
-        fs.unlinkSync(tempFile);
-        return result.success;
-    }
-    catch (_a) {
-        return false;
-    }
-}
 /**
  * 更新环境配置
  */
@@ -261,24 +205,6 @@ async function updateEnvironmentConfig(env, projectName, versionInfo, config, ke
         return false;
     }
 }
-/**
- * 写入缓存文件
- */
-function writeCacheFile(cdnKey, cacheFile) {
-    const cacheFilePath = cacheFile || path.join(process.cwd(), '.cdn.cache.json');
-    let cache = {};
-    if (fs.existsSync(cacheFilePath)) {
-        try {
-            cache = JSON.parse(fs.readFileSync(cacheFilePath, 'utf8'));
-        }
-        catch (_a) {
-            cache = {};
-        }
-    }
-    cache.lastUploadVersion = cdnKey;
-    cache.lastDeployTime = new Date().toISOString();
-    fs.writeFileSync(cacheFilePath, JSON.stringify(cache, null, 2));
-}
 /**
  * 执行deploy命令
  */
@@ -288,10 +214,23 @@ async function deployFiles(options) {
         // 1. 配置校验阶段
         console.log('📋 验证配置文件...');
         const config = validateConfig(options.config);
-        // 2. 密钥与客户端初始化阶段
+        // 2. 执行upload-config阶段
+        console.log('📤 执行upload-config上传配置文件...');
+        try {
+            const uploadResult = await (0, uploadWithConfig_1.uploadFilesWithConfig)({
+                configPath: options.config,
+                storageClientOptions: options.keyFile ? { keyFilename: options.keyFile } : {},
+                enableCache: true
+            });
+            console.log(`✅ upload-config完成: 成功${uploadResult.success.length}个，失败${uploadResult.failed.length}个`);
+        }
+        catch (error) {
+            console.warn(`⚠️ upload-config执行失败: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        // 3. 密钥与客户端初始化阶段
         console.log('⚙️ 继承当前项目中GCP上传的配置...');
         const uploadConfig = (0, uploadWithConfig_1.getConfigSummary)(options.config);
-        // 3. 版本与文件准备阶段
+        // 4. 版本与文件准备阶段
         console.log('📦 确定发布版本号...');
         const version = generateVersion();
         const cdnKey = options.cdn ? ((0, cache_1.readLastUploadCacheFile)(options.cacheFile) || version) : version;
@@ -306,7 +245,7 @@ async function deployFiles(options) {
         if (files.length === 0) {
             throw new Error('未找到需要上传的HTML文件');
         }
-        // 4. 文件处理与上传阶段
+        // 5. 文件处理与上传阶段
         console.log('📤 上传原始HTML文件...');
         const uploadedFiles = [];
         for (const file of files) {
@@ -327,7 +266,7 @@ async function deployFiles(options) {
                 console.warn(`  警告: ${relativePath} 上传失败: ${result.error}`);
             }
         }
-        // 5. 发布配置文件上传阶段
+        // 6. 发布配置文件上传阶段
         console.log('📝 生成发布信息对象...');
         const langCdnHtml = []; // 多语言HTML文件，暂时为空
         const obj = {
@@ -391,22 +330,27 @@ async function deployFiles(options) {
                 fs.unlinkSync(tempVersionListFile);
             }
         }
-        // 5. 环境配置同步阶段
+        // 7. 环境配置同步阶段
         console.log('🔄 同步环境配置...');
         // 检查项目是否存在
         const { data: envConfig } = await getConfigFiles(options.env, config);
         const existingProject = envConfig.projects.find((p) => p.name === projectInfo.name);
         if (!existingProject) {
-            const { createProject } = await inquirer_1.default.prompt([
-                {
-                    type: 'confirm',
-                    name: 'createProject',
-                    message: `项目 "${projectInfo.name}" 在环境 "${options.env}" 中不存在，是否创建新项目？`,
-                    default: true
+            if (options.force) {
+                console.log(`🆕 自动创建项目 "${projectInfo.name}" 在环境 "${options.env}" 中...`);
+            }
+            else {
+                const { createProject } = await inquirer_1.default.prompt([
+                    {
+                        type: 'confirm',
+                        name: 'createProject',
+                        message: `项目 "${projectInfo.name}" 在环境 "${options.env}" 中不存在，是否创建新项目？`,
+                        default: true
+                    }
+                ]);
+                if (!createProject) {
+                    throw new Error('用户取消创建新项目，部署终止');
                 }
-            ]);
-            if (!createProject) {
-                throw new Error('用户取消创建新项目，部署终止');
             }
         }
         // 创建版本信息对象
@@ -419,7 +363,7 @@ async function deployFiles(options) {
             files: obj.links
         };
         await updateEnvironmentConfig(options.env, projectInfo.name, versionInfo, config, options.keyFile);
-        // 6. 发布完成阶段
+        // 8. 发布完成阶段
         console.log('💾 记录发布版本...');
         (0, cache_1.writeLastDeployVersion)(cdnKey);
         console.log('📊 输出发布信息...');
@@ -428,11 +372,11 @@ async function deployFiles(options) {
         console.log(`版本号：【${cdnKey}】`);
         // 测试环境验证（非生产环境）
         if (options.env !== 'production') {
-            const testHost = config.deploy.testHost || 'https://test.valleysound.xyz/';
+            const testHost = config.deploy.testHost || 'https://test.valleysound.xyz';
             const baseUrls = Array.isArray(config.deploy.baseUrl) ? config.deploy.baseUrl : [config.deploy.baseUrl];
             console.log('🔍 测试环境验证路径:');
             baseUrls.forEach(baseUrl => {
-                const verificationUrl = `${testHost}${baseUrl}?deployCheck=${cdnKey}`;
+                const verificationUrl = `${testHost}/${baseUrl}?deployCheck=${cdnKey}`;
                 console.log(`  ${verificationUrl}`);
             });
             // 触发配置更新

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

@@ -13,6 +13,7 @@ export interface DeployCommandOptions {
     cacheFile?: string;
     showConfig?: boolean;
     cdn?: boolean;
+    force?: boolean;
 }
 export interface DeployConfig {
     deploy: {

package/dist/src/upload.js

@@ -164,7 +164,7 @@ async function uploadFile(options) {
  * @returns 上传结果
  */
 async function uploadFiles(options) {
-    console.log(options);
+    // console.log(options);
     const { bucketName, sourcePath, destination, storageClient, recursive = false, enableCompression = true } = options;
     if (!bucketName || !sourcePath || !storageClient) {
         throw new Error('缺少必要的上传参数');

package/package.json

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

package/src/deploy.ts

@@ -7,7 +7,7 @@ import * as path from 'path';
 import axios from 'axios';
 import inquirer from 'inquirer';
 import { createStorageClient, uploadFile } from './upload';
-import { getConfigSummary } from './uploadWithConfig';
+import { getConfigSummary, uploadFilesWithConfig } from './uploadWithConfig';
 import { readLastUploadCacheFile, writeLastDeployVersion } from './cache';
 import { execSync } from 'child_process';
 import {
@@ -105,23 +105,7 @@ function getBranchName(): string {
   }
 }
 
-/**
- * 读取缓存文件中的版本号
- */
-function getCachedVersion(cacheFile?: string): string | null {
-  const cacheFilePath = cacheFile || path.join(process.cwd(), '.cdn.cache.json');
-  
-  if (!fs.existsSync(cacheFilePath)) {
-    return null;
-  }
-  
-  try {
-    const cache = JSON.parse(fs.readFileSync(cacheFilePath, 'utf8'));
-    return cache.lastUploadVersion || null;
-  } catch {
-    return null;
-  }
-}
+
 
 /**
  * 筛选HTML文件
@@ -182,67 +166,9 @@ async function uploadToGcp(
   }
 }
 
-/**
- * 上传版本配置文件
- */
-async function uploadVersionConfig(
-  versionInfo: DeployVersionInfo,
-  bucketName: string,
-  prefix: string,
-  env: string,
-  projectName: string,
-  keyFile?: string
-): Promise<boolean> {
-  try {
-    const configPath = `${prefix}/static/config/${env}/${projectName}/${versionInfo.cdnKey}.json`;
-    const tempFile = path.join(process.cwd(), `temp-${versionInfo.cdnKey}.json`);
-    
-    // 写入临时文件
-    fs.writeFileSync(tempFile, JSON.stringify(versionInfo, null, 2));
-    
-    // 上传到GCP
-    const result = await uploadToGcp(tempFile, bucketName, configPath, keyFile);
-    
-    // 删除临时文件
-    fs.unlinkSync(tempFile);
-    
-    return result.success;
-  } catch {
-    return false;
-  }
-}
 
-/**
- * 维护版本列表
- */
-async function maintainVersionList(
-  versions: DeployVersionInfo[],
-  bucketName: string,
-  prefix: string,
-  env: string,
-  projectName: string,
-  keyFile?: string
-): Promise<boolean> {
-  try {
-    // 保留最近50个版本
-    const keepVersions = versions.slice(-50);
-    const versionKeepPath = `${prefix}/static/config/${env}/${projectName}/version.keep.json`;
-    const tempFile = path.join(process.cwd(), 'temp-version-keep.json');
-    
-    // 写入临时文件
-    fs.writeFileSync(tempFile, JSON.stringify({ versions: keepVersions }, null, 2));
-    
-    // 上传到GCP
-    const result = await uploadToGcp(tempFile, bucketName, versionKeepPath, keyFile);
-    
-    // 删除临时文件
-    fs.unlinkSync(tempFile);
-    
-    return result.success;
-  } catch {
-    return false;
-  }
-}
+
+
 
 /**
  * 更新环境配置
@@ -292,26 +218,7 @@ async function updateEnvironmentConfig(
   }
 }
 
-/**
- * 写入缓存文件
- */
-function writeCacheFile(cdnKey: string, cacheFile?: string): void {
-  const cacheFilePath = cacheFile || path.join(process.cwd(), '.cdn.cache.json');
-  
-  let cache: any = {};
-  if (fs.existsSync(cacheFilePath)) {
-    try {
-      cache = JSON.parse(fs.readFileSync(cacheFilePath, 'utf8'));
-    } catch {
-      cache = {};
-    }
-  }
-  
-  cache.lastUploadVersion = cdnKey;
-  cache.lastDeployTime = new Date().toISOString();
-  
-  fs.writeFileSync(cacheFilePath, JSON.stringify(cache, null, 2));
-}
+
 
 /**
  * 执行deploy命令
@@ -324,11 +231,24 @@ export async function deployFiles(options: DeployCommandOptions): Promise<Deploy
     console.log('📋 验证配置文件...');
     const config = validateConfig(options.config);
     
-    // 2. 密钥与客户端初始化阶段
+    // 2. 执行upload-config阶段
+    console.log('📤 执行upload-config上传配置文件...');
+    try {
+      const uploadResult = await uploadFilesWithConfig({
+        configPath: options.config,
+        storageClientOptions: options.keyFile ? { keyFilename: options.keyFile } : {},
+        enableCache: true
+      });
+      console.log(`✅ upload-config完成: 成功${uploadResult.success.length}个，失败${uploadResult.failed.length}个`);
+    } catch (error) {
+      console.warn(`⚠️ upload-config执行失败: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    
+    // 3. 密钥与客户端初始化阶段
     console.log('⚙️ 继承当前项目中GCP上传的配置...');
     const uploadConfig = getConfigSummary(options.config);
     
-    // 3. 版本与文件准备阶段
+    // 4. 版本与文件准备阶段
     console.log('📦 确定发布版本号...');
     const version = generateVersion();
     const cdnKey = options.cdn ? (readLastUploadCacheFile(options.cacheFile) || version) : version;
@@ -348,7 +268,7 @@ export async function deployFiles(options: DeployCommandOptions): Promise<Deploy
       throw new Error('未找到需要上传的HTML文件');
     }
     
-    // 4. 文件处理与上传阶段
+    // 5. 文件处理与上传阶段
     console.log('📤 上传原始HTML文件...');
     const uploadedFiles: string[] = [];
     
@@ -372,7 +292,7 @@ export async function deployFiles(options: DeployCommandOptions): Promise<Deploy
       }
     }
     
-    // 5. 发布配置文件上传阶段
+    // 6. 发布配置文件上传阶段
     console.log('📝 生成发布信息对象...');
     const langCdnHtml: string[] = []; // 多语言HTML文件，暂时为空
     const obj = {
@@ -441,7 +361,7 @@ export async function deployFiles(options: DeployCommandOptions): Promise<Deploy
       }
     }
     
-    // 5. 环境配置同步阶段
+    // 7. 环境配置同步阶段
     console.log('🔄 同步环境配置...');
     
     // 检查项目是否存在
@@ -449,17 +369,21 @@ export async function deployFiles(options: DeployCommandOptions): Promise<Deploy
     const existingProject = envConfig.projects.find((p: any) => p.name === projectInfo.name);
     
     if (!existingProject) {
-      const { createProject } = await inquirer.prompt([
-        {
-          type: 'confirm',
-          name: 'createProject',
-          message: `项目 "${projectInfo.name}" 在环境 "${options.env}" 中不存在，是否创建新项目？`,
-          default: true
+      if (options.force) {
+        console.log(`🆕 自动创建项目 "${projectInfo.name}" 在环境 "${options.env}" 中...`);
+      } else {
+        const { createProject } = await inquirer.prompt([
+          {
+            type: 'confirm',
+            name: 'createProject',
+            message: `项目 "${projectInfo.name}" 在环境 "${options.env}" 中不存在，是否创建新项目？`,
+            default: true
+          }
+        ]);
+        
+        if (!createProject) {
+          throw new Error('用户取消创建新项目，部署终止');
         }
-      ]);
-      
-      if (!createProject) {
-        throw new Error('用户取消创建新项目，部署终止');
       }
     }
     
@@ -475,7 +399,7 @@ export async function deployFiles(options: DeployCommandOptions): Promise<Deploy
     
     await updateEnvironmentConfig(options.env, projectInfo.name, versionInfo, config, options.keyFile);
     
-    // 6. 发布完成阶段
+    // 8. 发布完成阶段
     console.log('💾 记录发布版本...');
     writeLastDeployVersion(cdnKey);
     
@@ -486,12 +410,12 @@ export async function deployFiles(options: DeployCommandOptions): Promise<Deploy
     
     // 测试环境验证（非生产环境）
     if (options.env !== 'production') {
-      const testHost = config.deploy.testHost || 'https://test.valleysound.xyz/';
+      const testHost = config.deploy.testHost || 'https://test.valleysound.xyz';
       const baseUrls = Array.isArray(config.deploy.baseUrl) ? config.deploy.baseUrl : [config.deploy.baseUrl];
       
       console.log('🔍 测试环境验证路径:');
       baseUrls.forEach(baseUrl => {
-        const verificationUrl = `${testHost}${baseUrl}?deployCheck=${cdnKey}`;
+        const verificationUrl = `${testHost}/${baseUrl}?deployCheck=${cdnKey}`;
         console.log(`  ${verificationUrl}`);
       });
       

package/src/types/deploy.ts

@@ -15,6 +15,7 @@ export interface DeployCommandOptions {
   cacheFile?: string; // 缓存文件路径
   showConfig?: boolean; // 仅显示配置信息
   cdn?: boolean; // 使用CDN缓存版本
+  force?: boolean; // 强制执行，跳过交互式确认
 }
 
 export interface DeployConfig {

package/src/upload.ts

@@ -153,7 +153,7 @@ async function uploadFile(options: UploadFileOptions): Promise<UploadResult> {
  */
 async function uploadFiles(options: UploadFilesOptions): Promise<UploadFilesResult> {
 
-  console.log(options);
+  // console.log(options);
 
   const { bucketName, sourcePath, destination, storageClient, recursive = false, enableCompression = true } = options;