@cloudbase/cli 2.6.7 → 2.6.9

package/bin/tcb.js

@@ -42,7 +42,6 @@ async function main() {
 
     // 定义最小版本和推荐版本
     const NODE_MIN_VERSION = 18
-    const NODE_RECOMMENDED_VERSIONS = [18]
 
     // 检查当前版本是否满足最小版本要求
     if (NODE_MIN_VERSION > currentMajorVersion) {
@@ -51,27 +50,9 @@ async function main() {
                 `当前 Node.js 版本为 v${currentMajorVersion}。请升级到至少 v${NODE_MIN_VERSION} 版本。`
             )
         )
-        console.warn(
-            chalk.bold.yellow(
-                `建议使用 ${NODE_RECOMMENDED_VERSIONS.map((item) => `v${item}`).join(
-                    ' 或 '
-                )} 版本。`
-            )
-        )
         process.exit(1)
     }
 
-    // 检查当前版本是否在推荐版本列表中
-    if (!NODE_RECOMMENDED_VERSIONS.some((version) => currentMajorVersion === version)) {
-        console.warn(
-            chalk.bold.yellow(
-                `当前 Node.js 版本为 v${currentMajorVersion}。建议使用 ${NODE_RECOMMENDED_VERSIONS.map(
-                    (item) => `v${item}`
-                ).join(' 或 ')} 版本。`
-            )
-        )
-    }
-
     // Sentry 错误上报
     Sentry.init({
         release: pkg.version,

package/lib/commands/fun/base.js

@@ -168,15 +168,7 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
             }
             else {
                 if (!(loadResult === null || loadResult === void 0 ? void 0 : loadResult.userFunction)) {
-                    if (loadResult.reason.includes('is not a loadable module')) {
-                        log.error(`${source} 不是一个有效的函数式托管代码目录，可以通过 --source <source> 指定代码目录路径`);
-                    }
-                    else if (loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason.includes('is not defined in the provided module')) {
-                        log.error(`主文件并未导出目标函数 ${target}，请导出 ${target} 目标函数`);
-                    }
-                    else {
-                        log.error(loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason);
-                    }
+                    log.error(`验证加载云函数失败: ${loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason}`);
                     return;
                 }
             }

package/lib/commands/runf/base.js

@@ -148,22 +148,14 @@ let RunfDeployCommand = class RunfDeployCommand extends common_1.Command {
             if (Array.isArray(loadResult)) {
                 for (const loadItem of loadResult) {
                     if (!(loadItem === null || loadItem === void 0 ? void 0 : loadItem.userFunction)) {
-                        log.error(`加载函数 ${loadItem === null || loadItem === void 0 ? void 0 : loadItem.name} 失败: "${loadItem === null || loadItem === void 0 ? void 0 : loadItem.reason}"`);
+                        log.error(`验证加载函数 ${loadItem === null || loadItem === void 0 ? void 0 : loadItem.name} 失败: "${loadItem === null || loadItem === void 0 ? void 0 : loadItem.reason}"`);
                         return;
                     }
                 }
             }
             else {
                 if (!(loadResult === null || loadResult === void 0 ? void 0 : loadResult.userFunction)) {
-                    if (loadResult.reason.includes('is not a loadable module')) {
-                        log.error(`${targetDir} 不是一个有效的函数式托管代码目录，可以通过 --source <source> 指定代码目录路径`);
-                    }
-                    else if (loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason.includes('is not defined in the provided module')) {
-                        log.error(`主文件并未导出目标函数 ${target}，请导出 ${target} 目标函数`);
-                    }
-                    else {
-                        log.error(loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason);
-                    }
+                    log.error(`验证加载云函数失败: ${loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason}`);
                     return;
                 }
             }
@@ -457,11 +449,19 @@ let RunfRunCommand = class RunfRunCommand extends common_1.Command {
             desc: '本地运行云函数 2.0 代码'
         };
     }
-    execute(logger) {
+    execute(logger, ctx, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const args = process.argv.slice(2);
             const watchFlag = ['--watch', '-w'];
             const defaultIgnoreFiles = ['logs/*.*'];
+            const credential = yield getCredential(ctx, options);
+            process.env.EXTENDED_CONTEXT = JSON.stringify({
+                tmpSecret: {
+                    secretId: credential.secretId,
+                    secretKey: credential.secretKey,
+                    token: credential.token
+                }
+            });
             if (watchFlag.some((flag) => args.includes(flag))) {
                 const cmd = args.filter((arg) => !watchFlag.includes(arg)).join(' ');
                 (0, nodemon_1.default)({
@@ -506,8 +506,10 @@ let RunfRunCommand = class RunfRunCommand extends common_1.Command {
 __decorate([
     (0, decorators_1.InjectParams)(),
     __param(0, (0, decorators_1.Log)()),
+    __param(1, (0, decorators_1.CmdContext)()),
+    __param(2, (0, decorators_1.ArgsOptions)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [decorators_1.Logger]),
+    __metadata("design:paramtypes", [decorators_1.Logger, Object, Object]),
     __metadata("design:returntype", Promise)
 ], RunfRunCommand.prototype, "execute", null);
 RunfRunCommand = __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.6.7",
+    "version": "2.6.9",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {

package/types/commands/runf/base.d.ts

@@ -53,5 +53,5 @@ export declare class RunfRunCommand extends Command {
         requiredEnvId: boolean;
         desc: string;
     };
-    execute(logger: Logger): Promise<void>;
+    execute(logger: Logger, ctx: any, options: any): Promise<void>;
 }