@cloudbase/manager-node 4.3.0 → 4.3.2

package/.yarn/unplugged/node-notifier-npm-5.4.5-0ff6280985/node_modules/node-notifier/vendor/snoreToast/LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

package/.yarn/unplugged/node-notifier-npm-5.4.5-0ff6280985/node_modules/node-notifier/vendor/terminal-notifier-LICENSE

@@ -0,0 +1,9 @@
+All the works are available under the MIT license. Except for ‘Terminal.icns’, which is a copy of Apple’s Terminal.app icon and as such is copyright of Apple.
+
+Copyright (C) 2012-2016 Eloy Durán eloy.de.enige@gmail.com, Julien Blanchard julien@sideburns.eu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

@@ -32,7 +32,6 @@ const crypto_1 = __importDefault(require("crypto"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
-const stream_1 = require("stream");
 const unzipper_1 = __importDefault(require("unzipper"));
 const constant_1 = require("../constant");
 const http_request_1 = require("./http-request");
@@ -84,19 +83,47 @@ async function downloadAndExtractRemoteZip(downloadUrl, targetPath) {
     if (!downloadResponse.body) {
         throw new Error('下载响应中没有数据流');
     }
-    // 将响应数据转为Buffer
-    const zipBuffer = Buffer.from(await downloadResponse.arrayBuffer());
     // 创建目标目录
     const dirPath = path_1.default.resolve(targetPath);
     await fs_extra_1.default.ensureDir(dirPath);
-    // 使用unzipper解压
+    // 使用流式解压，避免大文件内存问题
     await new Promise((resolve, reject) => {
-        const bufferStream = new stream_1.PassThrough();
-        bufferStream.end(zipBuffer);
-        bufferStream
-            .pipe(unzipper_1.default.Extract({ path: dirPath }))
-            .on('close', resolve)
-            .on('error', reject);
+        let fileCount = 0;
+        let extractedCount = 0;
+        downloadResponse
+            .body.pipe(unzipper_1.default.Parse())
+            .on('error', reject)
+            .on('entry', async (entry) => {
+            const filePath = path_1.default.join(dirPath, entry.path);
+            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', 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.0",
+    "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;
 }