@cloudbase/manager-node 4.3.1 → 4.3.2

package/lib/cloudrun/index.js

@@ -10,6 +10,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudRunService = void 0;
+const archiver_1 = __importDefault(require("archiver"));
+const fs_extra_1 = require("fs-extra");
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("../utils");
 /**
@@ -63,10 +65,7 @@ class CloudRunService {
         /**
          * 获取最新版本
          */
-        const cloudRunServerDetailRes = await this.tcbrService.request('DescribeCloudRunServerDetail', {
-            EnvId: envConfig.EnvId,
-            ServerName: serverName
-        });
+        const cloudRunServerDetailRes = await this.detail({ serverName });
         const version = (_b = (_a = cloudRunServerDetailRes.OnlineVersionInfos) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.VersionName;
         if (!version) {
             throw new Error('未找到云托管服务版本');
@@ -131,6 +130,109 @@ class CloudRunService {
             ServerName: params.serverName // 要删除的服务名称
         });
     }
+    /**
+     * 本地代码部署云托管服务
+     * @param {Object} params 部署参数
+     * @param {string} params.serverName 要部署的服务名称
+     * @param {string} params.targetPath 本地代码路径
+     * @param {Object} [params.serverConfig] 服务配置项(可选)
+     * @param {string[]} [params.serverConfig.OpenAccessTypes] 开放访问类型
+     * @param {number} [params.serverConfig.Cpu] CPU规格
+     * @param {number} [params.serverConfig.Mem] 内存规格
+     * @param {number} [params.serverConfig.MinNum] 最小实例数
+     * @param {number} [params.serverConfig.MaxNum] 最大实例数
+     * @param {Object} [params.serverConfig.PolicyDetails] 策略详情
+     * @param {Object} [params.serverConfig.CustomLogs] 自定义日志配置
+     * @param {Object} [params.serverConfig.EnvParams] 环境变量参数
+     * @param {number} [params.serverConfig.Port] 端口(函数型服务不允许设置)
+     * @param {string} [params.serverConfig.Dockerfile] Dockerfile路径
+     * @param {string} [params.serverConfig.BuildDir] 构建目录
+     * @param {boolean} [params.serverConfig.InternalAccess] 是否开启内网访问
+     * @param {string} [params.serverConfig.InternalDomain] 内网域名
+     * @param {string} [params.serverConfig.EntryPoint] 入口文件
+     * @param {string} [params.serverConfig.Cmd] 启动命令
+     * @returns {Promise<IResponseInfo>} 返回部署操作的响应信息
+     */
+    async deploy(params) {
+        const { serverName, targetPath = process.cwd(), serverConfig } = params;
+        /**
+         * 参数校验和默认值设置
+         */
+        if (!serverName) {
+            throw new Error('Missing required parameters: serviceName');
+        }
+        // 获取当前环境配置(包含EnvId)
+        const envConfig = this.environment.lazyEnvironmentConfig;
+        /**
+         * 获取部署包上传信息
+         */
+        const { UploadUrl: uploadUrl, UploadHeaders: uploadHeaders, PackageName: packageName, PackageVersion: packageVersion } = await this.tcbService.request('DescribeCloudBaseBuildService', {
+            EnvId: envConfig.EnvId,
+            ServiceName: serverName
+        });
+        const deployInfo = {
+            DeployType: 'package',
+            PackageName: packageName,
+            PackageVersion: packageVersion
+        };
+        /**
+         * 上传部署包
+         */
+        const zipFile = await codeToZip(targetPath, { installDependency: true });
+        await upload({
+            action: uploadUrl,
+            file: zipFile,
+            filename: 'file',
+            headers: (uploadHeaders || []).reduce((map, item) => {
+                map[item.Key] = item.Value;
+                return map;
+            }, {}) || {},
+            method: 'PUT',
+            send: (file) => file
+        });
+        /**
+         * 执行部署
+         */
+        if (await this._checkFunctionExist(serverName)) {
+            // 更新
+            const serverDetail = await this.detail({ serverName });
+            const _serverConfig = Object.assign(Object.assign(Object.assign({}, ((serverDetail === null || serverDetail === void 0 ? void 0 : serverDetail.ServerConfig) || {})), serverConfig), ((serverDetail === null || serverDetail === void 0 ? void 0 : serverDetail.ServerConfig.Tag) === 'function:' ? { Port: 3000 } : {}) // 函数型不能指定端口，需要固定为3000
+            );
+            deployInfo.ReleaseType = 'FULL';
+            return this._upsertFunction(false, {
+                name: serverName,
+                deployInfo,
+                serverConfig: _serverConfig
+            });
+        }
+        else {
+            // 创建
+            /**
+             * 判断是容器器还是函数型
+             */
+            let type = 'function';
+            if (serverConfig === null || serverConfig === void 0 ? void 0 : serverConfig.Dockerfile) {
+                type = 'container';
+            }
+            else {
+                if (await (0, fs_extra_1.pathExists)(path_1.default.join(targetPath, 'Dockerfile'))) {
+                    type = 'container';
+                }
+            }
+            if (type === 'function') {
+                deployInfo.BuildPacks = {
+                    LanguageVersion: '20.18',
+                    RepoLanguage: 'Node.js'
+                };
+            }
+            const _serverConfig = Object.assign(Object.assign(Object.assign({ OpenAccessTypes: ['OA', 'PUBLIC'], Cpu: 0, Mem: 0, MinNum: 0, MaxNum: 0, PolicyDetails: [], EnvParams: JSON.stringify({}), InitialDelaySeconds: 0, CustomLogs: '', HasDockerfile: true, CreateTime: '', EnvId: envConfig.EnvId, ServerName: serverName, Port: type === 'container' ? 80 : 3000, Dockerfile: 'Dockerfile', BuildDir: '' }, serverConfig), (type === 'function' ? { Port: 3000 } : {})), { Tag: type === 'container' ? '' : 'function:' });
+            return this._upsertFunction(true, {
+                name: serverName,
+                deployInfo,
+                serverConfig: _serverConfig
+            });
+        }
+    }
     /**
      * 获取云托管服务模板列表
      * @returns {Promise<ITemplate[]>} 返回模板数组
@@ -138,6 +240,32 @@ class CloudRunService {
     async getTemplates() {
         return (0, utils_1.fetchTemplates)(['tcbrFunc', 'tcbrContainer']);
     }
+    async _checkFunctionExist(name) {
+        try {
+            await this.detail({
+                serverName: name
+            });
+            return true;
+        }
+        catch (e) {
+            if (e.code === 'ResourceNotFound' ||
+                // 备注：以下条件当 NotFound 处理（已与 fisheryan 确认过）
+                (e.code === 'InvalidParameter' && e.original.Message === 'service data illegal')) {
+                return false;
+            }
+            throw e;
+        }
+    }
+    _upsertFunction(isNew, data) {
+        const { name, deployInfo, serverConfig } = data;
+        const envConfig = this.environment.lazyEnvironmentConfig;
+        return this.tcbrService.request(isNew ? 'CreateCloudRunServer' : 'UpdateCloudRunServer', {
+            EnvId: envConfig.EnvId,
+            ServerName: name,
+            DeployInfo: deployInfo,
+            ServerConfig: serverConfig
+        });
+    }
 }
 exports.CloudRunService = CloudRunService;
 __decorate([
@@ -155,3 +283,87 @@ __decorate([
 __decorate([
     (0, utils_1.preLazy)()
 ], CloudRunService.prototype, "delete", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], CloudRunService.prototype, "deploy", null);
+async function codeToZip(cwd, options) {
+    const archive = (0, archiver_1.default)('zip', {
+        zlib: { level: 1 } // 保持与之前相同的压缩级别
+    });
+    const chunks = [];
+    const bufferPromise = new Promise((resolve, reject) => {
+        archive.on('data', (chunk) => {
+            chunks.push(chunk);
+        });
+        archive.on('end', () => {
+            resolve(Buffer.concat(chunks));
+        });
+        archive.on('error', err => {
+            reject(err);
+        });
+    });
+    async function addFilesToArchive(dir, root = false, relativePath = '') {
+        const entries = await (0, fs_extra_1.readdir)(dir, { withFileTypes: true });
+        for (let entry of entries) {
+            const fullPath = path_1.default.join(dir, entry.name);
+            const entryRelativePath = path_1.default.join(relativePath, entry.name);
+            if (entry.isDirectory()) {
+                if (['logs', '.git'].includes(entry.name)) {
+                    // 忽略 logs 等目录
+                    continue;
+                }
+                if (options === null || options === void 0 ? void 0 : options.installDependency) {
+                    // 忽略 node_modules 等目录
+                    if (['node_modules'].includes(entry.name)) {
+                        continue;
+                    }
+                }
+                await addFilesToArchive(fullPath, false, entryRelativePath);
+            }
+            else {
+                if (root) {
+                    // 可以配置忽略指定文件名的文件
+                    if ([''].includes(entry.name)) {
+                        continue;
+                    }
+                }
+                // 保持与之前相同的文件添加方式，包括相对路径处理
+                archive.file(fullPath, { name: entryRelativePath });
+            }
+        }
+    }
+    await addFilesToArchive(path_1.default.resolve(cwd), true);
+    await archive.finalize();
+    return bufferPromise;
+}
+function upload({ action, file, method = 'POST', headers = {}, withCredentials = false }) {
+    return (0, utils_1.fetchStream)(action, {
+        method,
+        headers,
+        body: file,
+        credentials: withCredentials ? 'include' : 'same-origin'
+    })
+        .then(async (response) => {
+        const text = await response.text();
+        const dataMeta = {
+            data: null,
+            context: {
+                response,
+                file
+            }
+        };
+        try {
+            dataMeta.data = JSON.parse(text);
+        }
+        catch (e) {
+            // If parsing fails, keep data as null
+        }
+        if (!response.ok) {
+            throw new Error(`${response.status} ${response.statusText} HTTP ERROR`);
+        }
+        return dataMeta;
+    })
+        .catch(error => {
+        throw error; // 或者可以在这里进行错误转换
+    });
+}

package/lib/utils/index.js

@@ -91,29 +91,39 @@ async function downloadAndExtractRemoteZip(downloadUrl, targetPath) {
         let fileCount = 0;
         let extractedCount = 0;
         downloadResponse
-            .body.pipe(unzipper_1.default.Parse()) // 使用 unzipper.Parse() 逐一处理是为了避免解压时丢失文件
+            .body.pipe(unzipper_1.default.Parse())
             .on('error', reject)
-            .on('entry', entry => {
-            fileCount++;
+            .on('entry', async (entry) => {
             const filePath = path_1.default.join(dirPath, entry.path);
-            // 确保目录存在
-            fs_extra_1.default.ensureDirSync(path_1.default.dirname(filePath));
-            entry
-                .pipe(fs_extra_1.default.createWriteStream(filePath))
-                .on('error', reject)
-                .on('finish', () => {
-                extractedCount++;
-                if (extractedCount === fileCount) {
-                    resolve('');
+            try {
+                // 确保父目录存在（处理嵌套目录情况）
+                await fs_extra_1.default.ensureDir(path_1.default.dirname(filePath));
+                // 如果是目录则创建，否则写入文件
+                if (entry.type === 'Directory') {
+                    await fs_extra_1.default.ensureDir(filePath);
+                    extractedCount++;
                 }
-            });
+                else {
+                    fileCount++;
+                    entry
+                        .pipe(fs_extra_1.default.createWriteStream(filePath))
+                        .on('error', reject)
+                        .on('finish', () => {
+                        extractedCount++;
+                        checkCompletion();
+                    });
+                }
+            }
+            catch (err) {
+                reject(err);
+            }
         })
-            .on('close', () => {
-            // 确保所有文件都已处理
-            if (fileCount === extractedCount) {
+            .on('close', checkCompletion);
+        function checkCompletion() {
+            if (fileCount > 0 && fileCount === extractedCount) {
                 resolve('');
             }
-        });
+        }
     });
 }
 function getRuntime() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "4.3.1",
+    "version": "4.3.2",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {

package/types/cloudrun/index.d.ts

@@ -1,6 +1,6 @@
 import { Environment } from '../environment';
 import { IResponseInfo } from '../interfaces';
-import { CloudrunServerType, ICloudrunDetailResponse, ICloudrunListResponse, ITemplate } from './type';
+import { CloudrunServerType, ICloudrunDetailResponse, ICloudrunListResponse, ICloudrunServerBaseConfig, ITemplate } from './type';
 /**
  * 云托管服务管理类
  * 提供云托管服务的初始化、下载、列表查询和删除等功能
@@ -73,9 +73,39 @@ export declare class CloudRunService {
     delete(params: {
         serverName: string;
     }): Promise<IResponseInfo>;
+    /**
+     * 本地代码部署云托管服务
+     * @param {Object} params 部署参数
+     * @param {string} params.serverName 要部署的服务名称
+     * @param {string} params.targetPath 本地代码路径
+     * @param {Object} [params.serverConfig] 服务配置项(可选)
+     * @param {string[]} [params.serverConfig.OpenAccessTypes] 开放访问类型
+     * @param {number} [params.serverConfig.Cpu] CPU规格
+     * @param {number} [params.serverConfig.Mem] 内存规格
+     * @param {number} [params.serverConfig.MinNum] 最小实例数
+     * @param {number} [params.serverConfig.MaxNum] 最大实例数
+     * @param {Object} [params.serverConfig.PolicyDetails] 策略详情
+     * @param {Object} [params.serverConfig.CustomLogs] 自定义日志配置
+     * @param {Object} [params.serverConfig.EnvParams] 环境变量参数
+     * @param {number} [params.serverConfig.Port] 端口(函数型服务不允许设置)
+     * @param {string} [params.serverConfig.Dockerfile] Dockerfile路径
+     * @param {string} [params.serverConfig.BuildDir] 构建目录
+     * @param {boolean} [params.serverConfig.InternalAccess] 是否开启内网访问
+     * @param {string} [params.serverConfig.InternalDomain] 内网域名
+     * @param {string} [params.serverConfig.EntryPoint] 入口文件
+     * @param {string} [params.serverConfig.Cmd] 启动命令
+     * @returns {Promise<IResponseInfo>} 返回部署操作的响应信息
+     */
+    deploy(params: {
+        serverName: string;
+        targetPath: string;
+        serverConfig?: Partial<Pick<ICloudrunServerBaseConfig, 'OpenAccessTypes' | 'Cpu' | 'Mem' | 'MinNum' | 'MaxNum' | 'PolicyDetails' | 'CustomLogs' | 'EnvParams' | 'Port' | 'Dockerfile' | 'BuildDir' | 'InternalAccess' | 'InternalDomain' | 'EntryPoint' | 'Cmd'>>;
+    }): Promise<IResponseInfo>;
     /**
      * 获取云托管服务模板列表
      * @returns {Promise<ITemplate[]>} 返回模板数组
      */
     getTemplates(): Promise<ITemplate[]>;
+    private _checkFunctionExist;
+    private _upsertFunction;
 }