@cloudbase/cli 2.8.0 → 2.8.1-beta.1

package/lib/commands/functions/deploy.js

@@ -218,20 +218,13 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
                             codeSecret,
                             functionRootPath
                         });
-                        const code_text = '代码';
-                        yield this.waitForFunctionReady(envId, func.name, loading, code_text);
+                        yield this.waitForFunctionReady(envId, func.name, loading);
+                        loading.succeed(`[${func.name}] 云函数配置更新中...`);
                         yield (0, function_2.updateFunctionConfig)({
                             envId,
                             functionName: func.name,
                             config: func
                         });
-                        const config_text = '配置';
-                        yield this.waitForFunctionReady(envId, func.name, loading, config_text);
-                        yield (0, function_2.createFunctionTriggers)({
-                            envId,
-                            functionName: func.name,
-                            triggers
-                        });
                         loading.succeed(`[${func.name}] 云函数更新成功！`);
                         yield this.printSuccessTips(envId);
                     }
@@ -245,7 +238,7 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
             throw e;
         });
     }
-    waitForFunctionReady(envId, functionName, loading, text, timeoutMinutes = 5) {
+    waitForFunctionReady(envId, functionName, loading, timeoutMinutes = 5) {
         return __awaiter(this, void 0, void 0, function* () {
             const scfService = yield (0, function_2.getFunctionService)(envId);
             const timeoutMs = timeoutMinutes * 60 * 1000;
@@ -261,11 +254,11 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
                         if ((functionInfo === null || functionInfo === void 0 ? void 0 : functionInfo.Status) === 'Active') {
                             clearTimeout(timeoutId);
                             clearInterval(intervalId);
-                            loading.succeed(`[${functionName}] 云函数${text}已更新！`);
+                            loading.succeed(`[${functionName}] 云函数代码已更新！`);
                             resolve();
                         }
                         else {
-                            loading.text = `正在更新[${functionName}] 云函数${text}... 当前状态: ${(functionInfo === null || functionInfo === void 0 ? void 0 : functionInfo.Status) || '未知'}`;
+                            loading.text = `正在更新[${functionName}] 云函数代码... 当前状态: ${(functionInfo === null || functionInfo === void 0 ? void 0 : functionInfo.Status) || '未知'}`;
                         }
                     }
                     catch (error) {

package/lib/commands/functions/layer/bind.js

@@ -54,7 +54,7 @@ let AttachFileLayer = class AttachFileLayer extends common_1.Command {
             const fnName = params === null || params === void 0 ? void 0 : params[0];
             const loading = (0, utils_1.loadingFactory)();
             loading.start('数据加载中...');
-            const envFunctions = yield (0, function_1.listFunction)({
+            const envFunctions = yield (0, function_1.listAllFunctions)({
                 envId
             });
             const exist = envFunctions.find((fn) => fn.FunctionName === fnName);

package/lib/function/base.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.copyFunction = exports.batchInvokeFunctions = exports.invokeFunction = exports.batchUpdateFunctionConfig = exports.updateFunctionConfig = exports.getFunctionLog = exports.batchGetFunctionsDetail = exports.getFunctionDetail = exports.listFunction = exports.getFunctionService = void 0;
+exports.copyFunction = exports.batchInvokeFunctions = exports.invokeFunction = exports.batchUpdateFunctionConfig = exports.updateFunctionConfig = exports.getFunctionLog = exports.batchGetFunctionsDetail = exports.getFunctionDetail = exports.listAllFunctions = exports.listFunction = exports.getFunctionService = void 0;
 const manager_node_1 = __importDefault(require("@cloudbase/manager-node"));
 const utils_1 = require("../utils");
 const logger_1 = require("../logger");
@@ -61,6 +61,50 @@ function listFunction(options) {
     });
 }
 exports.listFunction = listFunction;
+function listAllFunctions(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const allFunctions = [];
+        let currentOffset = 0;
+        const pageSize = 20;
+        const { envId } = options;
+        console.log(`这是listAllFunctions函数，envId: ${envId}`);
+        while (true) {
+            try {
+                const res = yield scfService.request('ListFunctions', {
+                    Namespace: envId,
+                    Limit: pageSize,
+                    Offset: currentOffset
+                });
+                const { Functions = [], TotalCount } = res;
+                if (Functions.length === 0) {
+                    break;
+                }
+                allFunctions.push(...Functions);
+                if (allFunctions.length >= TotalCount || Functions.length < pageSize) {
+                    break;
+                }
+                currentOffset += pageSize;
+            }
+            catch (error) {
+                throw new error_1.CloudBaseError(`获取函数列表失败: ${error.message}`);
+            }
+        }
+        const data = [];
+        allFunctions.forEach(func => {
+            const { FunctionId, FunctionName, Runtime, AddTime, ModTime, Status } = func;
+            data.push({
+                FunctionId,
+                FunctionName,
+                Runtime,
+                AddTime,
+                ModTime,
+                Status
+            });
+        });
+        return data;
+    });
+}
+exports.listAllFunctions = listAllFunctions;
 function getFunctionDetail(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const { functionName, envId, codeSecret } = options;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.8.0",
+    "version": "2.8.1-beta.1",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -38,7 +38,7 @@
         "@cloudbase/functions-framework": "1.16.0",
         "@cloudbase/iac-core": "0.0.3-alpha.11",
         "@cloudbase/lowcode-cli": "^0.22.2",
-        "@cloudbase/manager-node": "4.3.3",
+        "@cloudbase/manager-node": "4.4.3",
         "@cloudbase/toolbox": "^0.7.7",
         "@dotenvx/dotenvx": "^1.48.3",
         "address": "^1.1.2",

package/types/commands/functions/deploy.d.ts

@@ -16,7 +16,7 @@ export declare class FunctionDeploy extends Command {
     execute(ctx: any, params: any, log: Logger): Promise<void>;
     deployAllFunction(options: any): Promise<void>;
     handleDeployFail(e: CloudBaseError, options: ICreateFunctionOptions): Promise<void>;
-    waitForFunctionReady(envId: string, functionName: string, loading: any, text: string, timeoutMinutes?: number): Promise<void>;
+    waitForFunctionReady(envId: string, functionName: string, loading: any, timeoutMinutes?: number): Promise<void>;
     printSuccessTips(envId: string, log?: Logger): Promise<void>;
     genApiGateway(envId: string, name: string): Promise<void>;
 }

package/types/function/base.d.ts

@@ -17,6 +17,7 @@ export interface IDetailOptions extends IBaseOptions {
 }
 export declare function getFunctionService(envId: string): Promise<import("@cloudbase/manager-node/types/function").FunctionService>;
 export declare function listFunction(options: IListFunctionOptions): Promise<Record<string, string>[]>;
+export declare function listAllFunctions(options: IListFunctionOptions): Promise<Record<string, string>[]>;
 export declare function getFunctionDetail(options: IDetailOptions): Promise<Record<string, any>>;
 export declare function batchGetFunctionsDetail({ names, envId, codeSecret }: {
     names: any;

package/.claude/settings.local.json

@@ -1,6 +0,0 @@
-{
-  "enabledMcpjsonServers": [
-    "cloudbase"
-  ],
-  "enableAllProjectMcpServers": true
-}