esa-cli 0.0.2-beta.10 → 0.0.2-beta.12

package/dist/commands/route/list.js

@@ -10,10 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { getProjectConfig } from '../../utils/fileUtils/index.js';
 import Table from 'cli-table3';
 import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
-import { ApiService } from '../../libs/apiService.js';
 import logger from '../../libs/logger.js';
 import t from '../../i18n/index.js';
 import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
+import api from '../../libs/api.js';
+import { transferRuleStringToRoute } from './helper.js';
 const listRoute = {
     command: 'list',
     describe: `🔍 ${t('route_list_describe').d('List all related routes')}`,
@@ -24,7 +25,7 @@ const listRoute = {
 export default listRoute;
 export function handleListRoutes() {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         if (!checkDirectory()) {
             return;
         }
@@ -35,29 +36,67 @@ export function handleListRoutes() {
         if (!isSuccess)
             return;
         yield validRoutine(projectConfig.name);
-        const server = yield ApiService.getInstance();
-        const req = { Name: projectConfig.name };
-        const routineDetail = yield server.getRoutine(req);
-        if (!routineDetail)
-            return;
-        const relatedRoutes = (_b = (_a = routineDetail.data) === null || _a === void 0 ? void 0 : _a.RelatedRoutes) !== null && _b !== void 0 ? _b : [];
-        if (relatedRoutes.length === 0) {
+        const req = {
+            routineName: projectConfig.name
+        };
+        const res = yield api.listRoutineRoutes(req);
+        const configs = ((_a = res.body) === null || _a === void 0 ? void 0 : _a.configs) || [];
+        if (configs.length === 0) {
             logger.warn(`🙅 ${t('route_list_empty').d('No related routes found')}`);
             return;
         }
-        logger.log(`📃 ${t('route_list_title').d('Related routes')}:`);
-        displayRelatedRouteList(relatedRoutes);
+        const simpleRoutes = configs
+            .filter((item) => item.mode !== 'custom')
+            .map((config) => {
+            var _a, _b, _c;
+            return {
+                RouteName: (_a = config.routeName) !== null && _a !== void 0 ? _a : '',
+                Route: transferRuleStringToRoute((_b = config.rule) !== null && _b !== void 0 ? _b : ''),
+                SiteName: (_c = config.siteName) !== null && _c !== void 0 ? _c : ''
+            };
+        });
+        if (simpleRoutes.length > 0) {
+            logger.log(`📃 ${t('route_list_simple_title').d('Related simple mode routes')}:`);
+            displayRelatedRouteList(simpleRoutes);
+        }
+        const customRoutes = configs
+            .filter((item) => item.mode === 'custom')
+            .map((config) => {
+            var _a, _b, _c;
+            return {
+                RouteName: (_a = config.routeName) !== null && _a !== void 0 ? _a : '',
+                Route: (_b = config.rule) !== null && _b !== void 0 ? _b : '',
+                SiteName: (_c = config.siteName) !== null && _c !== void 0 ? _c : ''
+            };
+        });
+        if (customRoutes.length > 0) {
+            logger.log(`📃 ${t('route_list_custom_title').d('Related custom mode routes')}:`);
+            displayRelatedRouteRuleList(customRoutes);
+        }
     });
 }
 export function displayRelatedRouteList(routeList) {
     return __awaiter(this, void 0, void 0, function* () {
         const table = new Table({
-            head: ['Route', 'Site'],
-            colWidths: [30, 30]
+            head: ['Route Name', 'Route', 'Site'],
+            colWidths: [20]
+        });
+        for (let i = 0; i < routeList.length; i++) {
+            const route = routeList[i];
+            table.push([route.RouteName, route.Route, route.SiteName]);
+        }
+        console.log(table.toString());
+    });
+}
+export function displayRelatedRouteRuleList(routeList) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const table = new Table({
+            head: ['Route Name', 'Rule', 'Site'],
+            colWidths: [20]
         });
         for (let i = 0; i < routeList.length; i++) {
             const route = routeList[i];
-            table.push([route.Route, route.SiteName]);
+            table.push([route.RouteName, route.Route, route.SiteName]);
         }
         console.log(table.toString());
     });

package/dist/commands/routine/index.js

@@ -4,7 +4,7 @@ import t from '../../i18n/index.js';
 let yargsIns;
 const routineCommand = {
     command: 'routine [script]',
-    describe: `🚀 ${t('routine_describe').d('Manage your routine')}`,
+    describe: `🧭 ${t('routine_describe').d('Manage your routine')}`,
     builder: (yargs) => {
         yargsIns = yargs;
         return yargs

package/dist/commands/routine/list.js

@@ -20,7 +20,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import Table from 'cli-table3';
 import logger from '../../libs/logger.js';
-import { Base64 } from 'js-base64';
 import { checkIsLoginSuccess } from '../utils.js';
 import chalk from 'chalk';
 import { ApiService } from '../../libs/apiService.js';
@@ -39,7 +38,7 @@ const list = {
 export default list;
 export function handleList(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const { site } = argv, args = __rest(argv, ["site"]);
         const isSuccess = yield checkIsLoginSuccess();
         if (!isSuccess)
@@ -59,8 +58,8 @@ export function handleList(argv) {
             logger.tree(siteNameList);
             return;
         }
-        const res = yield server.getRoutineUserInfo();
-        const routineList = res === null || res === void 0 ? void 0 : res.Routines;
+        const res = yield server.listUserRoutines();
+        const routineList = (_b = res === null || res === void 0 ? void 0 : res.body) === null || _b === void 0 ? void 0 : _b.Routines;
         if (routineList) {
             logger.log(chalk.bold.bgGray(`📃 ${t('list_routine_name_title').d('List all of routine')}:`));
             displayRoutineList(routineList);
@@ -77,7 +76,7 @@ export function displayRoutineList(versionList) {
             table.push([
                 version.RoutineName,
                 moment(version.CreateTime).format('YYYY/MM/DD HH:mm:ss'),
-                Base64.decode(version.Description)
+                version.Description
             ]);
         });
         console.table(table.toString());

package/dist/commands/site/index.js

@@ -3,7 +3,7 @@ import t from '../../i18n/index.js';
 let yargsIns;
 const siteCommand = {
     command: 'site [script]',
-    describe: `🚀 ${t('site_describe').d('Manage your sites')}`,
+    describe: `📈 ${t('site_describe').d('Manage your sites')}`,
     builder: (yargs) => {
         yargsIns = yargs;
         return yargs

package/dist/commands/utils.js

@@ -16,6 +16,7 @@ import chalk from 'chalk';
 import t from '../i18n/index.js';
 import { ApiService } from '../libs/apiService.js';
 import logger from '../libs/logger.js';
+import api from '../libs/api.js';
 export const checkDirectory = (isCheckGit = false) => {
     const root = getRoot();
     if (fs.existsSync(projectConfigPath)) {
@@ -67,11 +68,10 @@ export const bindRoutineWithDomain = (name, domain) => __awaiter(void 0, void 0,
     }
 });
 export const getRoutineVersionList = (name) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    const server = yield ApiService.getInstance();
-    const req = { Name: name };
-    const res = yield server.getRoutine(req);
-    return ((_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.CodeVersions) || [];
+    var _a, _b;
+    const req = { name };
+    const res = yield api.listRoutineCodeVersions(req);
+    return (_b = (_a = res.body) === null || _a === void 0 ? void 0 : _a.codeVersions) !== null && _b !== void 0 ? _b : [];
 });
 export function validName(name) {
     return /^[a-zA-Z0-9-_]+$/.test(name);

package/dist/docs/Commands_en.md

@@ -1,9 +1,23 @@
 # Commands
 
+- init - Initialize a new project from a template
+- dev - Start a local development server for testing
+- commit - Commit code and create a version
+- deploy - Build and deploy project to the edge routine
+- deployments - Manage deployments
+- routine - Manage edge routine functions
+- site - Manage site settings
+- domain - Configure edge function trigger domain
+- route - Configure edge function trigger routes
+- login - Authenticate via AK/SK to your account
+- logout - Log out current user
+- config - Modify local/global settings
+- lang - Switch CLI interface language
+
 ### init
 
 Initialize a routine with a template.
-    
+
 ```bash
 $ esa init [OPTIONS]
 ```
@@ -14,7 +28,7 @@ $ esa init [OPTIONS]
 ### routine [script]
 
 Manage your routine.
-    
+
 #### delete <routineName>
 
 Delete a routine.
@@ -37,7 +51,7 @@ $ esa routine list
 ### route [script]
 
 Manage the routes bound to your routine.
-    
+
 #### add [route] [site]
 
 Bind a Route to a routine.
@@ -68,7 +82,7 @@ $ esa route list
 ### login
 
 Login to the server.
-    
+
 ```bash
 $ esa login
 ```
@@ -76,7 +90,7 @@ $ esa login
 ### dev [entry]
 
 Start a local server for developing your routine.
-    
+
 ```bash
 $ esa dev [entry] [OPTIONS]
 ```
@@ -102,7 +116,7 @@ $ esa dev [entry] [OPTIONS]
 ### deployments [script]
 
 Manage your deployments.
-    
+
 #### delete <deploymentId>
 
 Delete one or more deployment versions.
@@ -125,7 +139,7 @@ $ esa deployments list
 ### deploy [entry]
 
 Deploy your project.
-    
+
 ```bash
 $ esa deploy [entry]
 ```
@@ -136,7 +150,7 @@ $ esa deploy [entry]
 ### domain [script]
 
 Manage the domain names bound to your routine.
-    
+
 #### add <domain>
 
 Bind a domain to a routine.
@@ -170,7 +184,7 @@ $ esa domain list
 ### commit [entry]
 
 Commit your code, save as a new version.
-    
+
 ```bash
 $ esa commit [entry] [OPTIONS]
 ```
@@ -184,7 +198,7 @@ $ esa commit [entry] [OPTIONS]
 ### logout
 
 Logout.
-    
+
 ```bash
 $ esa logout
 ```
@@ -192,7 +206,7 @@ $ esa logout
 ### config
 
 Modify your local or global configuration using -l, -g.
-    
+
 ```bash
 $ esa config [OPTIONS]
 ```
@@ -206,7 +220,7 @@ $ esa config [OPTIONS]
 ### lang
 
 Set the language of the CLI.
-    
+
 ```bash
 $ esa lang
 ```
@@ -214,7 +228,7 @@ $ esa lang
 ### site [script]
 
 Manage your sites.
-    
+
 #### list
 
 List all your sites.

package/dist/docs/Commands_zh_CN.md

@@ -1,5 +1,19 @@
 # Commands
 
+- init - 使用模板初始化新项目
+- dev - 启动本地开发服务器进行调试
+- commit - 提交代码并创建一个新版本
+- deploy - 部署项目到边缘网络
+- deployments - 管理历史部署版本
+- routine - 管理边缘函数
+- site - 管理站点
+- domain - 管理绑定到边缘函数的域名
+- route - 管理绑定到边缘函数的路由
+- login - 通过AK/SK登录到您的账户
+- logout - 注销当前用户
+- config - 修改本地/全局配置
+- lang - 切换CLI界面语言
+
 ### init
 
 选择模版初始化项目。

package/dist/i18n/locales.json

@@ -75,10 +75,6 @@
     "en": "Production",
     "zh_CN": "生产环境"
   },
-  "deploy_env_canary": {
-    "en": "Canary",
-    "zh_CN": "灰度环境"
-  },
   "deploy_description_routine": {
     "en": "Enter the description of the routine",
     "zh_CN": "请输入边缘函数的描述"
@@ -103,10 +99,6 @@
     "en": "Do you want to create a formal version to deploy on production environment?",
     "zh_CN": "是否创建正式版本以部署到生产环境？"
   },
-  "deploy_select_canary": {
-    "en": "Please select the canary area(s) you want to deploy to",
-    "zh_CN": "请选择您要部署的灰度区域"
-  },
   "deploy_success": {
     "en": "Your code has been successfully deployed",
     "zh_CN": "您的代码已成功部署"
@@ -489,7 +481,7 @@
   },
   "route_validate": {
     "en": "You can add an asterisk (*) as the prefix or suffix to match more URLs, such as \"*.example.com/*\".",
-    "zh_CN": "您可以通过添加前缀或后缀通配符（*）来匹配更多的URL，例如: “*.example.com/*”。"
+    "zh_CN": "您可以通过添加前缀或后缀通配符（*）来匹配更多的URL，例如: \"*.example.com/*\"."
   },
   "domain_input": {
     "en": "Enter the name of domain (Support fuzzy matching on tab press):",
@@ -515,6 +507,18 @@
     "en": "Generate a config file for your project",
     "zh_CN": "在您的项目中生成一个esa.toml配置文件"
   },
+  "init_project_name": {
+    "en": "Project name",
+    "zh_CN": "项目名称"
+  },
+  "init_template_name": {
+    "en": "Template name to use",
+    "zh_CN": "要使用的模板名称"
+  },
+  "init_template_not_found": {
+    "en": "Template \"${templateName}\" not found. Please check the template name and try again.",
+    "zh_CN": "未找到模板 \"${templateName}\"。请检查模板名称并重试。"
+  },
   "generate_config_error": {
     "en": "esa.toml already exists",
     "zh_CN": "esa.toml 文件已经存在"
@@ -527,6 +531,10 @@
     "en": "Minify code before committing",
     "zh_CN": "上传前压缩代码"
   },
+  "commit_option_description": {
+    "en": "Description for the routine/version (skip interactive input)",
+    "zh_CN": "函数/版本的描述（跳过交互式输入）"
+  },
   "dev_entry_describe": {
     "en": "Entry file of the Routine",
     "zh_CN": "入口文件路径"
@@ -712,7 +720,7 @@
     "zh_CN": "无权限：Access Key 或 Secret 错误，或没有必要的权限。"
   },
   "init_skip": {
-    "en": "Initialization was skipped.",
+    "en": "Skip the project git and deployment initialization",
     "zh_CN": "初始化已被跳过。"
   },
   "quick_deploy_success": {
@@ -763,6 +771,30 @@
     "en": "The domain may take some time to take effect, please try again later.",
     "zh_CN": "域名生效可能需要一段时间，请稍后再试。"
   },
+  "deploy_quick_describe": {
+    "en": "Quick deploy the routine to production environment",
+    "zh_CN": "快速部署到生产环境"
+  },
+  "deploy_option_version": {
+    "en": "Version to deploy (skip interactive selection)",
+    "zh_CN": "要部署的版本（跳过交互式选择）"
+  },
+  "deploy_option_environment": {
+    "en": "Environment to deploy to: staging or production (skip interactive selection)",
+    "zh_CN": "部署环境：staging 或 production（跳过交互式选择）"
+  },
+  "deploy_version_not_found": {
+    "en": "Version '${argv.version}' not found",
+    "zh_CN": "版本 '${version}' 未找到"
+  },
+  "deploy_using_version": {
+    "en": "Using version",
+    "zh_CN": "使用版本"
+  },
+  "deploy_using_environment": {
+    "en": "Using environment",
+    "zh_CN": "使用环境"
+  },
   "init_install_dependence": {
     "en": "⌛️ Installing dependencies...",
     "zh_CN": "⌛️ 正在安装依赖..."
@@ -934,5 +966,65 @@
   "routine_create_fail": {
     "en": "Routine created failed.",
     "zh_CN": "边缘函数创建失败"
+  },
+  "create_route_route": {
+    "en": "Enter a Route:",
+    "zh_CN": "输入路由:"
+  },
+  "route_name_input_required": {
+    "en": "Route name is required",
+    "zh_CN": "路由名称是必需的"
+  },
+  "create_route_mode": {
+    "en": "Which mode of route do you want to use?",
+    "zh_CN": "您想要使用哪种路由模式？"
+  },
+  "create_route_site": {
+    "en": "Select a site that is active in your account:",
+    "zh_CN": "选择您账户中已激活的站点:"
+  },
+  "route_input_required": {
+    "en": "Route is required",
+    "zh_CN": "路由是必需的"
+  },
+  "create_route_rule": {
+    "en": "Enter a Rule Expression:",
+    "zh_CN": "输入规则表达式:"
+  },
+  "rule_input_required": {
+    "en": "Rule is required",
+    "zh_CN": "规则是必需的"
+  },
+  "route_list_simple_title": {
+    "en": "Related simple mode routes",
+    "zh_CN": "相关简单模式路由"
+  },
+  "route_list_custom_title": {
+    "en": "Related custom mode routes",
+    "zh_CN": "相关自定义模式路由"
+  },
+  "create_route_route_name": {
+    "en": "Enter a Route Name (Aliases):",
+    "zh_CN": "输入路由名称（别名）:"
+  },
+  "no_route_found": {
+    "en": "No route found! Please check the route name.",
+    "zh_CN": "未找到路由！请检查路由名称。"
+  },
+  "init_template_not_ready": {
+    "en": "Template is not ready. We will install it for you now.",
+    "zh_CN": "模版未准备好，我们为您安装模版。"
+  },
+  "login_option_access_key_id": {
+    "en": "AccessKey ID (AK)",
+    "zh_CN": "AccessKey ID (AK)"
+  },
+  "login_option_access_key_secret": {
+    "en": "AccessKey Secret (SK)",
+    "zh_CN": "AccessKey Secret (SK)"
+  },
+  "login_option_skip_login": {
+    "en": "Skip login",
+    "zh_CN": "跳过登录"
   }
 }

package/dist/index.js

@@ -38,7 +38,7 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
         .locale((cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.lang) || 'en')
         .version(false)
         .wrap(null)
-        .help(false)
+        .help()
         .epilogue(`${t('main_epilogue').d('For more information, visit ESA')}: ${chalk.underline.blue('https://www.aliyun.com/product/esa')}`)
         .options('version', {
         describe: t('main_version_describe').d('Show version'),
@@ -50,11 +50,16 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
     });
     esa.command('*', false, () => { }, (args) => {
         if (args._.length > 0) {
+            // Unknown command
+            console.error(t('common_sub_command_fail').d('Use esa <command> -h to see help'));
         }
         else {
             if (args.v) {
                 handleCheckVersion();
             }
+            else if (args.h || args.help) {
+                esa.showHelp('log');
+            }
             else {
                 esa.showHelp('log');
             }

package/dist/libs/api.js

@@ -103,16 +103,13 @@ class Client {
     getMatchSite(params) {
         return this.callOpenApi('getMatchSite', params);
     }
-    listRoutineCanaryAreas() {
-        return this.callApi(this.client.listRoutineCanaryAreasWithOptions.bind(this.client));
-    }
-    getRoutineUserInfo() {
-        return this.callApi(this.client.getRoutineUserInfoWithOptions.bind(this.client));
-    }
     deleteRoutine(params) {
         const request = new $ESA.DeleteRoutineRequest(params);
         return this.callApi(this.client.deleteRoutineWithOptions.bind(this.client), request);
     }
+    listUserRoutines(params) {
+        return this.callApi(this.client.listUserRoutinesWithOptions.bind(this.client), new $ESA.ListUserRoutinesRequest(params));
+    }
     deleteRoutineCodeVersion(params) {
         const request = new $ESA.DeleteRoutineCodeVersionRequest(params);
         return this.callApi(this.client.deleteRoutineCodeVersionWithOptions.bind(this.client), request);
@@ -140,9 +137,6 @@ class Client {
         const request = new $ESA.CreateRoutineRequest(params);
         return this.callApi(this.client.createRoutineWithOptions.bind(this.client), request);
     }
-    listRoutineOptionalSpecs() {
-        return this.callApi(this.client.listRoutineOptionalSpecsWithOptions.bind(this.client));
-    }
     createRoutineRelatedRecord(params) {
         const request = new $ESA.CreateRoutineRelatedRecordRequest(params);
         return this.callApi(this.client.createRoutineRelatedRecordWithOptions.bind(this.client), request);
@@ -151,5 +145,34 @@ class Client {
         const request = new $ESA.DeleteRoutineRelatedRecordRequest(params);
         return this.callApi(this.client.deleteRoutineRelatedRecordWithOptions.bind(this.client), request);
     }
+    createRoutineRoute(params) {
+        const request = new $ESA.CreateRoutineRouteRequest(params);
+        const newRequest = Object.assign(request, { mode: 'simple' });
+        return this.callApi(this.client.createRoutineRouteWithOptions.bind(this.client), newRequest);
+    }
+    deleteRoutineRoute(params) {
+        const request = new $ESA.DeleteRoutineRouteRequest(params);
+        return this.callApi(this.client.deleteRoutineRouteWithOptions.bind(this.client), request);
+    }
+    getRoutineRoute(params) {
+        const request = new $ESA.GetRoutineRouteRequest(params);
+        return this.callApi(this.client.getRoutineRouteWithOptions.bind(this.client), request);
+    }
+    listSiteRoutes(params) {
+        const request = new $ESA.ListSiteRoutesRequest(params);
+        return this.callApi(this.client.listSiteRoutes.bind(this.client), request);
+    }
+    listRoutineRoutes(params) {
+        const request = new $ESA.ListRoutineRoutesRequest(params);
+        return this.callApi(this.client.listRoutineRoutes.bind(this.client), request);
+    }
+    updateRoutineRoute(params) {
+        const request = new $ESA.UpdateRoutineRouteRequest(params);
+        return this.callApi(this.client.updateRoutineRoute.bind(this.client), request);
+    }
+    listRoutineCodeVersions(params) {
+        const request = new $ESA.ListRoutineCodeVersionsRequest(params);
+        return this.callApi(this.client.listRoutineCodeVersions.bind(this.client), request);
+    }
 }
 export default new Client();