@cloudbase/cli 2.8.27-beta.0 → 2.8.27-beta.1

package/lib/commands/functions/code-download.js

@@ -66,12 +66,9 @@ let CodeDownload = class CodeDownload extends common_1.Command {
             if (!name) {
                 throw new error_1.CloudBaseError('请指定云函数名称！');
             }
+            const functionService = yield (0, function_1.getFunctionService)(envId);
             try {
-                yield (0, function_1.getFunctionDetail)({
-                    envId,
-                    codeSecret,
-                    functionName: name
-                });
+                yield functionService.getFunctionDetail(name, codeSecret);
             }
             catch (e) {
                 if (e.code === 'ResourceNotFound.FunctionName') {
@@ -98,7 +95,7 @@ let CodeDownload = class CodeDownload extends common_1.Command {
             }
             const loading = (0, utils_1.loadingFactory)();
             loading.start('文件下载中...');
-            yield (0, function_1.downloadFunctionCode)({
+            yield functionService.downloadFunctionCode({
                 envId,
                 functionName: name,
                 destPath: destPath,

package/lib/commands/functions/copy.js

@@ -52,19 +52,15 @@ let FunctionCopy = class FunctionCopy extends common_1.Command {
     execute(envId, options, params, log) {
         return __awaiter(this, void 0, void 0, function* () {
             const name = params === null || params === void 0 ? void 0 : params[0];
-            const newFunctionName = params === null || params === void 0 ? void 0 : params[1];
-            const { force, codeSecret, targetEnvId } = options;
+            let newFunctionName = params === null || params === void 0 ? void 0 : params[1];
+            let { force, codeSecret, targetEnvId } = options;
             if (!name) {
                 throw new error_1.CloudBaseError('请指定函数名称！');
             }
-            yield (0, function_1.copyFunction)({
-                force,
-                envId,
-                codeSecret,
-                functionName: name,
-                newFunctionName: newFunctionName || name,
-                targetEnvId: targetEnvId || envId
-            });
+            const functionService = yield (0, function_1.getFunctionService)(envId);
+            newFunctionName = newFunctionName || name;
+            targetEnvId = targetEnvId || envId;
+            yield functionService.copyFunction(name, newFunctionName, targetEnvId, force);
             log.success('拷贝函数成功');
         });
     }

package/lib/commands/functions/delete.js

@@ -50,6 +50,7 @@ let DeleteFunction = class DeleteFunction extends common_1.Command {
         return __awaiter(this, void 0, void 0, function* () {
             const name = params === null || params === void 0 ? void 0 : params[0];
             const { envId, config: { functions } } = ctx;
+            const functionService = yield (0, function_1.getFunctionService)(envId);
             let isBatchDelete = false;
             if (!name) {
                 const answer = yield inquirer_1.default.prompt({
@@ -73,16 +74,14 @@ let DeleteFunction = class DeleteFunction extends common_1.Command {
             }
             if (isBatchDelete) {
                 const names = functions.map((item) => item.name);
-                return (0, function_1.batchDeleteFunctions)({
-                    names,
-                    envId
+                return functionService.batchDeleteFunctions({
+                    names
                 });
             }
             const loading = (0, utils_1.loadingFactory)();
             loading.start(`删除函数 [${name}] 中...`);
-            yield (0, function_1.deleteFunction)({
-                envId,
-                functionName: name
+            yield functionService.deleteFunction({
+                name
             });
             loading.succeed(`删除函数 [${name}] 成功！`);
         });

package/lib/commands/functions/detail.js

@@ -67,12 +67,9 @@ let FunctionDetail = class FunctionDetail extends common_1.Command {
             }
             const loading = (0, utils_1.loadingFactory)();
             loading.start('获取函数信息中...');
+            const functionService = yield (0, function_1.getFunctionService)(envId);
             try {
-                const data = yield (0, function_1.getFunctionDetail)({
-                    envId,
-                    functionName: name,
-                    codeSecret
-                });
+                const data = yield functionService.getFunctionDetail(name, codeSecret);
                 loading.stop();
                 this.logDetail(data, name);
             }

package/lib/commands/functions/invoke.js

@@ -55,6 +55,7 @@ let InvokeFunction = class InvokeFunction extends common_1.Command {
             const { envId, config: { functions }, options } = ctx;
             const name = argsParams === null || argsParams === void 0 ? void 0 : argsParams[0];
             let isBatchInvoke = false;
+            const functionService = yield (0, function_1.getFunctionService)(envId);
             if (!name) {
                 const { isBatch } = yield inquirer_1.default.prompt({
                     type: 'confirm',
@@ -79,7 +80,7 @@ let InvokeFunction = class InvokeFunction extends common_1.Command {
                 }
             }
             if (isBatchInvoke) {
-                return (0, function_1.batchInvokeFunctions)({
+                return functionService.batchInvokeFunctions({
                     envId,
                     functions,
                     log: true
@@ -87,11 +88,8 @@ let InvokeFunction = class InvokeFunction extends common_1.Command {
             }
             const func = functions.find((item) => item.name === name);
             const configParams = (func === null || func === void 0 ? void 0 : func.params) ? func.params : undefined;
-            const result = yield (0, function_1.invokeFunction)({
-                envId,
-                functionName: name,
-                params: params || configParams
-            });
+            params = params || configParams;
+            const result = yield functionService.invokeFunction(name, params);
             if (result.InvokeResult === 0) {
                 log.success(`[${name}] 调用成功\n`);
             }

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

@@ -54,7 +54,8 @@ 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.listAllFunctions)({
+            const functionService = yield (0, function_1.getFunctionService)(envId);
+            const envFunctions = yield functionService.listAllFunctions({
                 envId
             });
             const exist = envFunctions.find((fn) => fn.FunctionName === fnName);
@@ -142,11 +143,8 @@ let UnAttachFileLayer = class UnAttachFileLayer extends common_1.Command {
             const fnName = params === null || params === void 0 ? void 0 : params[0];
             const loading = (0, utils_1.loadingFactory)();
             loading.start('数据加载中...');
-            const detail = yield (0, function_1.getFunctionDetail)({
-                envId,
-                codeSecret,
-                functionName: fnName
-            });
+            const functionService = yield (0, function_1.getFunctionService)(envId);
+            const detail = yield functionService.getFunctionDetail(fnName, codeSecret);
             if (!((_a = detail === null || detail === void 0 ? void 0 : detail.Layers) === null || _a === void 0 ? void 0 : _a.length)) {
                 throw new error_1.CloudBaseError('该云函数未绑定文件层！');
             }

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

@@ -47,6 +47,7 @@ let CreateFileLayer = class CreateFileLayer extends common_1.Command {
     }
     execute(envId, options, params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const functionsService = yield (0, function_1.getFunctionService)(envId);
             const alias = params === null || params === void 0 ? void 0 : params[0];
             const { file } = options;
             const layerName = `${alias}_${envId}`;

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

@@ -54,6 +54,7 @@ let ListFileLayer = class ListFileLayer extends common_1.Command {
             const loading = (0, utils_1.loadingFactory)();
             loading.start('数据加载中...');
             let data;
+            const functionService = yield (0, function_1.getFunctionService)(envId);
             if (layer && typeof layer === 'string') {
                 const layerName = `${layer}_${envId}`;
                 data = yield (0, function_1.listLayerVersions)({
@@ -61,11 +62,7 @@ let ListFileLayer = class ListFileLayer extends common_1.Command {
                 });
             }
             else if (name && typeof name === 'string') {
-                const res = yield (0, function_1.getFunctionDetail)({
-                    envId,
-                    functionName: name,
-                    codeSecret
-                });
+                const res = yield functionService.getFunctionDetail(name, codeSecret);
                 data = (res === null || res === void 0 ? void 0 : res.Layers) || [];
             }
             else if (envId) {

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

@@ -53,11 +53,8 @@ let SortFileLayer = class SortFileLayer extends common_1.Command {
             const fnName = params === null || params === void 0 ? void 0 : params[0];
             const loading = (0, utils_1.loadingFactory)();
             loading.start('数据加载中...');
-            const detail = yield (0, function_1.getFunctionDetail)({
-                envId,
-                codeSecret,
-                functionName: fnName
-            });
+            const functionService = yield (0, function_1.getFunctionService)(envId);
+            const detail = yield functionService.getFunctionDetail(fnName, codeSecret);
             loading.stop();
             const layers = detail.Layers.map((item) => ({
                 name: `${item.LayerName} - ${item.LayerVersion}`,

package/lib/commands/functions/list.js

@@ -50,6 +50,7 @@ let ListFunction = class ListFunction extends common_1.Command {
     }
     execute(envId, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const functionsService = yield (0, function_1.getFunctionService)(envId);
             let { limit = 20, offset = 0 } = options;
             limit = Number(limit);
             offset = Number(offset);
@@ -61,11 +62,7 @@ let ListFunction = class ListFunction extends common_1.Command {
             }
             const loading = (0, utils_1.loadingFactory)();
             loading.start('数据加载中...');
-            const data = yield (0, function_1.listFunction)({
-                envId,
-                limit: Number(limit),
-                offset: Number(offset)
-            });
+            const data = yield functionsService.listFunctions(Number(limit), Number(offset));
             loading.stop();
             const head = ['函数 Id', '函数名称', '运行时', '创建时间', '修改时间', '状态'];
             const tableData = data.map((item) => [

package/lib/commands/functions/log.js

@@ -67,7 +67,8 @@ let FunctionLog = class FunctionLog extends common_1.Command {
                     desc: '查询的具体日期，例如：2019-05-16 20:59:59，只能与 startTime 相差一天之内'
                 },
                 { flags: '-e, --error', desc: '只返回错误类型的日志' },
-                { flags: '-s, --success', desc: '只返回正确类型的日志' }
+                { flags: '-s, --success', desc: '只返回正确类型的日志' },
+                { flags: '-q, --qualifier <qualifier>', desc: '函数版本，，默认为 $LATEST' }
             ],
             desc: '打印云函数日志'
         };
@@ -76,7 +77,7 @@ let FunctionLog = class FunctionLog extends common_1.Command {
         return __awaiter(this, void 0, void 0, function* () {
             const { envId, options } = ctx;
             const name = argsParams === null || argsParams === void 0 ? void 0 : argsParams[0];
-            let { offset, limit, order, orderBy, error, success, startTime, endTime, reqId: functionRequestId } = options;
+            let { offset = 0, limit = 10, order, orderBy, error, success, startTime, endTime, reqId: requestId, qualifier } = options;
             if (!name) {
                 throw new error_1.CloudBaseError('云函数名称不能为空');
             }
@@ -98,20 +99,20 @@ let FunctionLog = class FunctionLog extends common_1.Command {
                 orderBy,
                 startTime,
                 endTime,
-                functionRequestId,
+                requestId,
                 offset: Number(offset),
-                limit: Number(limit)
+                limit: Number(limit),
+                qualifier
             };
             error && (params.filter = { RetCode: 'not0' });
             success && (params.filter = { RetCode: 'is0' });
             params = JSON.parse(JSON.stringify(params));
-            const logs = yield (0, function_1.getFunctionLog)(Object.assign({ envId, functionName: name }, params));
+            const functionService = yield (0, function_1.getFunctionService)(envId);
+            const logs = yield functionService.getCompleteFunctionLogs(Object.assign({ name }, params));
             const ResMap = {
                 StartTime: '请求时间',
                 FunctionName: '函数名称',
-                BillDuration: '计费时间(ms)',
                 Duration: '运行时间(ms)',
-                InvokeFinished: '调用次数',
                 MemUsage: '占用内存',
                 RequestId: '请求 Id',
                 RetCode: '调用状态',
@@ -134,7 +135,7 @@ let FunctionLog = class FunctionLog extends common_1.Command {
                     return `${ResMap[key]}：${log[key]} \n`;
                 })
                     .reduce((prev, next) => prev + next);
-                console.log(info + `日志：\n ${log.Log} \n`);
+                console.log(info + `日志：\n ${log.LogJson} \n`);
             });
         });
     }

package/lib/commands/functions/run.js

@@ -164,11 +164,9 @@ function debugByConfig(ctx, name) {
         }
         try {
             const finalPath = path_1.default.join(debugDirname, indexFile);
-            console.log("finalPath", finalPath);
             const requirePath = process.platform === 'win32'
                 ? finalPath.replace(/\\/g, '\\\\')
                 : finalPath;
-            console.log("requirePath", requirePath);
             const fileExports = require(requirePath);
             if (!fileExports[mainFunction]) {
                 errorLog(`handler 中的 ${mainFunction} 方法不存在，请检查你的配置！`, debug);

package/lib/commands/gateway/create.js

@@ -55,15 +55,12 @@ let CreateService = class CreateService extends common_1.Command {
     }
     execute(envId, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const functionsService = yield (0, function_1.getFunctionService)(envId);
             let { function: functionName, servicePath } = options;
             const loading = (0, utils_1.loadingFactory)();
             if (!servicePath || !functionName) {
                 loading.start('数据加载中...');
-                const functions = yield (0, function_1.listFunction)({
-                    envId,
-                    limit: 100,
-                    offset: 0
-                });
+                const functions = yield functionsService.listFunctions(100, 0);
                 loading.stop();
                 if (!functions.length) {
                     throw new error_1.CloudBaseError('当前环境下不存在可用的云函数，请先创建云函数！');

package/lib/function/layer/attach.js

@@ -14,18 +14,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unAttachLayer = exports.attachLayer = void 0;
 const lodash_1 = __importDefault(require("lodash"));
-const base_1 = require("../base");
 const utils_1 = require("../../utils");
 const error_1 = require("../../error");
+const __1 = require("../");
 const scfService = new utils_1.CloudApiService('scf');
 function attachLayer(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const { envId, functionName, layerName, layerVersion, codeSecret } = options;
-        let { Layers } = yield (0, base_1.getFunctionDetail)({
-            envId,
-            codeSecret,
-            functionName
-        });
+        const functionService = yield (0, __1.getFunctionService)(envId);
+        let { Layers } = yield functionService.getFunctionDetail(functionName, codeSecret);
         Layers = Layers.map(item => lodash_1.default.pick(item, ['LayerName', 'LayerVersion']));
         Layers.push({
             LayerName: layerName,
@@ -43,11 +40,8 @@ exports.attachLayer = attachLayer;
 function unAttachLayer(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const { envId, functionName, layerName, layerVersion, codeSecret } = options;
-        let { Layers } = yield (0, base_1.getFunctionDetail)({
-            envId,
-            codeSecret,
-            functionName
-        });
+        const functionService = yield (0, __1.getFunctionService)(envId);
+        let { Layers } = yield functionService.getFunctionDetail(functionName, codeSecret);
         Layers = Layers.map(item => lodash_1.default.pick(item, ['LayerName', 'LayerVersion']));
         const index = Layers.findIndex(item => item.LayerName === layerName && item.LayerVersion === layerVersion);
         if (index === -1) {

package/lib/utils/fs/index.js

@@ -24,18 +24,24 @@ __exportStar(require("./del"), exports);
 function checkFullAccess(dest, throwError = false) {
     try {
         fs_1.default.accessSync(dest, fs_1.default.constants.F_OK);
+    }
+    catch (e) {
+        if (throwError) {
+            throw new error_1.CloudBaseError(`路径不存在：${dest}`);
+        }
+        return false;
+    }
+    try {
         fs_1.default.accessSync(dest, fs_1.default.constants.W_OK);
         fs_1.default.accessSync(dest, fs_1.default.constants.R_OK);
-        return true;
     }
     catch (e) {
         if (throwError) {
-            throw new error_1.CloudBaseError(`路径不存在或没有权限访问：${dest}`);
-        }
-        else {
-            return false;
+            throw new error_1.CloudBaseError(`路径无读写权限：${dest}`);
         }
+        return false;
     }
+    return true;
 }
 exports.checkFullAccess = checkFullAccess;
 function checkWritable(dest, throwError = false) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.8.27-beta.0",
+    "version": "2.8.27-beta.1",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -53,7 +53,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.4.4",
+        "@cloudbase/manager-node": "^4.4.9-beta.0",
         "@cloudbase/toolbox": "^0.7.9",
         "@dotenvx/dotenvx": "^1.48.3",
         "@musistudio/claude-code-router": "1.0.36",

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

@@ -11,5 +11,5 @@ export declare class InvokeFunction extends Command {
         }[];
         desc: string;
     };
-    execute(ctx: any, argsParams: any, log: Logger): Promise<any[]>;
+    execute(ctx: any, argsParams: any, log: Logger): Promise<import("@cloudbase/manager-node/types/interfaces").IFunctionInvokeRes[]>;
 }