esa-cli 0.0.5 → 1.0.1

package/dist/commands/route/add.js

@@ -7,19 +7,36 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import logger from '../../libs/logger.js';
-import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
-import { ApiService } from '../../libs/apiService.js';
+import inquirer from 'inquirer';
+import { routeBuilder } from '../../components/routeBuilder.js';
 import t from '../../i18n/index.js';
+import { ApiService } from '../../libs/apiService.js';
+import logger from '../../libs/logger.js';
 import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
-import inquirer from 'inquirer';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
 import { transferRouteToRuleString } from './helper.js';
 const addRoute = {
     command: 'add [route] [site]',
-    describe: `📥 ${t('route_add_describe').d('Bind a Route to a routine')}`,
+    describe: `🚄 ${t('route_add_describe').d('Bind a Route to a project')}`,
     builder: (yargs) => {
-        return yargs.fail((msg, err, yargsIns) => {
+        return yargs
+            .option('route', {
+            describe: t('route_add_route_value_option').d('The route value. For example: example.com/*'),
+            alias: 'r',
+            type: 'string'
+        })
+            .option('site', {
+            describe: t('route_add_site_describe').d('The site to bind the route to. For example: example.com'),
+            alias: 's',
+            type: 'string'
+        })
+            .option('alias', {
+            alias: 'a',
+            describe: t('route_add_route_name_option').d('Route name (aliases)'),
+            type: 'string'
+        })
+            .fail((msg, err, yargsIns) => {
             if (err)
                 throw err;
             if (msg) {
@@ -35,6 +52,7 @@ const addRoute = {
 };
 export function handlerAddRoute(argv) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (!checkDirectory()) {
             return;
         }
@@ -53,60 +71,100 @@ export function handlerAddRoute(argv) {
         };
         const server = yield ApiService.getInstance();
         const ListSitesRes = yield server.listSites(listSitesReq);
-        const siteList = ((ListSitesRes === null || ListSitesRes === void 0 ? void 0 : ListSitesRes.data.Sites) || []).map((i) => ({
+        if (!((_a = ListSitesRes === null || ListSitesRes === void 0 ? void 0 : ListSitesRes.data) === null || _a === void 0 ? void 0 : _a.Sites) || ListSitesRes.data.Sites.length === 0) {
+            logger.error(t('no_active_sites').d('No active sites found in your account'));
+            return;
+        }
+        const siteList = ListSitesRes.data.Sites.map((i) => ({
             name: i.SiteName,
             value: i.SiteId
         }));
-        const { routeName } = yield inquirer.prompt([
-            {
-                type: 'input',
-                name: 'routeName',
-                message: t('create_route_route_name').d('Enter a Route Name (Aliases):'),
-                validate: (input) => {
-                    if (!input) {
-                        return t('route_name_input_required').d('Route name is required');
+        let routeName = argv.alias;
+        if (!routeName) {
+            const response = yield inquirer.prompt([
+                {
+                    type: 'input',
+                    name: 'routeName',
+                    message: t('create_route_route_name').d('Enter a Route Name (Aliases):'),
+                    validate: (input) => {
+                        if (!input) {
+                            return t('route_name_input_required').d('Route name is required');
+                        }
+                        return true;
                     }
-                    return true;
                 }
+            ]);
+            routeName = response.routeName;
+        }
+        let siteName = argv.site;
+        let siteId;
+        if (!siteName) {
+            const response = yield inquirer.prompt([
+                {
+                    type: 'list',
+                    name: 'routeSite',
+                    message: t('create_route_site').d('Select a site that is active in your account:'),
+                    choices: siteList
+                }
+            ]);
+            siteId = response.routeSite;
+        }
+        else {
+            // Find corresponding site ID by site name
+            const matchedSite = siteList.find((site) => site.name === siteName);
+            if (matchedSite) {
+                siteId = matchedSite.value;
             }
-        ]);
-        const { routeSite } = yield inquirer.prompt([
-            {
-                type: 'list',
-                name: 'routeSite',
-                message: t('create_route_site').d('Select a site that is active in your account:'),
-                choices: siteList
+            else {
+                logger.error(t('site_not_found').d(`Site "${siteName}" not found in your account`));
+                return;
             }
-        ]);
-        const { inputRoute } = yield inquirer.prompt([
-            {
-                type: 'input',
-                name: 'inputRoute',
-                message: t('create_route_route').d('Enter a Route:'),
-                validate: (input) => {
-                    if (!input) {
-                        return t('route_input_required').d('Route is required');
-                    }
-                    return true;
-                }
+        }
+        let inputRoute = argv.route;
+        if (!inputRoute) {
+            // Get selected site name for route building
+            const selectedSite = siteList.find((site) => site.value === siteId);
+            const displaySiteName = selectedSite ? selectedSite.name : siteName;
+            // Use route builder
+            const builtRoute = yield routeBuilder(displaySiteName);
+            if (!builtRoute) {
+                logger.info(t('route_build_cancelled').d('Route building cancelled'));
+                return;
             }
-        ]);
+            inputRoute = builtRoute;
+        }
         const rule = transferRouteToRuleString(inputRoute);
+        if (!rule) {
+            logger.error(t('route_format_invalid').d('Invalid route format'));
+            return;
+        }
+        const selectedSite = siteList.find((site) => site.value === siteId);
+        const displaySiteName = selectedSite ? selectedSite.name : siteName;
         const req = {
             RoutineName: projectConfig.name,
             RouteName: routeName,
-            SiteId: routeSite,
+            SiteId: siteId,
             RouteEnable: 'on',
             Bypass: 'off',
             Rule: rule
         };
-        const res = yield server.createRoutineRoute(req);
-        const addSuccess = (res === null || res === void 0 ? void 0 : res.code) === 200;
-        if (addSuccess) {
-            logger.success(t('route_add_success').d('Add route success!'));
+        try {
+            logger.info(t('creating_route').d('Creating route...'));
+            const res = yield server.createRoutineRoute(req);
+            const addSuccess = (res === null || res === void 0 ? void 0 : res.code) === 200;
+            if (addSuccess) {
+                logger.success(t('route_add_success').d('Add route success!'));
+                logger.info(`Route "${routeName}" has been successfully added to routine "${projectConfig.name}" for site "${displaySiteName}"`);
+            }
+            else {
+                logger.error(t('route_add_fail').d('Add route fail!'));
+            }
         }
-        else {
+        catch (error) {
             logger.error(t('route_add_fail').d('Add route fail!'));
+            if (error instanceof Error) {
+                logger.error(`Error: ${error.message}`);
+            }
         }
     });
 }

package/dist/commands/route/delete.js

@@ -7,18 +7,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
-import { checkDirectory, checkIsLoginSuccess } from '../utils.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 logger from '../../libs/logger.js';
+import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
 const deleteRoute = {
-    command: 'delete <route>',
+    command: 'delete <routeName>',
     describe: `🗑  ${t('route_delete_describe').d('Delete a related route')}`,
     builder: (yargs) => {
         return yargs
-            .positional('route', {
+            .positional('routeName', {
             describe: t('route_delete_positional_describe').d('The name of the routes to delete'),
             type: 'string',
             demandOption: true

package/dist/commands/route/helper.js

@@ -72,8 +72,7 @@ export const transferRouteToRuleString = (routePath) => {
 export const transferRuleStringToRoute = (ruleStr) => {
     if (!ruleStr) {
         return '';
-    }
-    // 去掉外层括号并按 " and " 分割
+    } // Remove outer brackets and split by " and "
     const cleanedRule = ruleStr.replace(/^\(|\)$/g, '');
     const parts = cleanedRule.split(' and ');
     if (parts.length !== 2) {
@@ -81,36 +80,36 @@ export const transferRuleStringToRoute = (ruleStr) => {
     }
     let host = '';
     let uriPath = '';
-    // 处理host部分
+    // Process host part
     const hostPart = parts[0].trim();
     if (hostPart.startsWith(`${RuleMatchOperatorEndsWith}(${RuleMatchTypeHost},`)) {
-        // host匹配eq时的逻辑
+        // Logic when host matches eq
         // ends_with(http.host, "value")
         const match = hostPart.match(/ends_with\(http\.host,\s*"([^"]+)"\)/);
         if (match) {
-            host = `*${match[1]}`; // 加前缀 *
+            host = `*${match[1]}`; // Add prefix *
         }
     }
     else if (hostPart.startsWith(`${RuleMatchTypeHost} ${RuleMatchOperatorEq}`)) {
-        // host匹配eq时的逻辑
+        // Logic when host matches eq
         // http.host eq "value"
         const match = hostPart.match(/http\.host eq "([^"]+)"/);
         if (match) {
             host = match[1];
         }
     }
-    // 处理uriPath 部分
+    // Process uriPath part
     const uriPathPart = parts[1].trim();
     if (uriPathPart.startsWith(`${RuleMatchOperatorStartsWith}(${RuleMatchTypeUriPath},`)) {
-        // uriPath匹配startsWith时的逻辑
+        // Logic when uriPath matches startsWith
         // starts_with(http.request.uri.path, "value")
         const match = uriPathPart.match(/starts_with\(http\.request\.uri\.path,\s*"([^"]+)"\)/);
         if (match) {
-            uriPath = `${match[1]}*`; // 加后缀 *
+            uriPath = `${match[1]}*`; // Add suffix *
         }
     }
     else if (uriPathPart.startsWith(`${RuleMatchTypeUriPath} ${RuleMatchOperatorEq}`)) {
-        // uriPath匹配eq时的逻辑
+        // Logic when uriPath matches eq
         // http.request.uri.path eq "value"
         const match = uriPathPart.match(/http\.request\.uri\.path eq "([^"]+)"/);
         if (match) {

package/dist/commands/route/index.js

@@ -1,11 +1,11 @@
+import t from '../../i18n/index.js';
+import addRoute from './add.js';
 import deleteRoute from './delete.js';
 import listRoute from './list.js';
-import addRoute from './add.js';
-import t from '../../i18n/index.js';
 let yargsIns;
 const routeCommand = {
     command: 'route [script]',
-    describe: `🚀 ${t('route_describe').d('Manage the routes bound to your routine')}`,
+    describe: `🚄 ${t('route_describe').d('Manage the routes bound to your project')}`,
     builder: (yargs) => {
         yargsIns = yargs;
         return yargs
@@ -18,7 +18,7 @@ const routeCommand = {
             type: 'boolean',
             default: false
         })
-            .usage(`${t('common_usage').d('Usage')}: esa route <add | list | delete>`);
+            .usage(`${t('common_usage').d('Usage')}: esa-cli route <add | list | delete>`);
     },
     handler: (argv) => {
         if (yargsIns && (argv.help || argv._.length < 2)) {

package/dist/commands/route/list.js

@@ -7,13 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
 import Table from 'cli-table3';
-import { checkDirectory, checkIsLoginSuccess } from '../utils.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 logger from '../../libs/logger.js';
+import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
 import { transferRuleStringToRoute } from './helper.js';
 const listRoute = {
     command: 'list',

package/dist/commands/routine/delete.js

@@ -7,22 +7,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { checkIsLoginSuccess } from '../utils.js';
-import { ApiService } from '../../libs/apiService.js';
 import t from '../../i18n/index.js';
+import { ApiService } from '../../libs/apiService.js';
 import logger from '../../libs/logger.js';
+import { checkIsLoginSuccess } from '../utils.js';
 const deleteCommand = {
-    command: 'delete <routineName>',
-    describe: `🗑  ${t('delete_describe').d('Delete a routine')}`,
+    command: 'delete <projectName>',
+    aliases: ['delete <routineName>'],
+    describe: `🗑  ${t('delete_describe').d('Delete a project')}`,
     builder: (yargs) => {
         return yargs
-            .positional('routineName', {
-            describe: t('delete_routineName_positional_describe').d('The name of the routine to delete'),
+            .positional('projectName', {
+            describe: t('delete_routineName_positional_describe').d('The name of the project to delete'),
             type: 'string',
             array: true,
             demandOption: true
         })
-            .usage(`${t('common_usage').d('Usage')}: $0 delete <routineName>`);
+            .usage(`${t('common_usage').d('Usage')}: $0 delete <projectName>`);
     },
     handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
         handleDelete(argv);
@@ -34,7 +35,7 @@ export function handleDelete(argv) {
         const isSuccess = yield checkIsLoginSuccess();
         if (!isSuccess)
             return;
-        const routineName = argv.routineName;
+        const routineName = argv.projectName || argv.routineName;
         const req = { Name: routineName };
         return yield deleteRoutineFromUserAccount(req);
     });

package/dist/commands/routine/index.js

@@ -1,10 +1,11 @@
-import routineList from './list.js';
-import routineDelete from './delete.js';
 import t from '../../i18n/index.js';
+import routineDelete from './delete.js';
+import routineList from './list.js';
 let yargsIns;
 const routineCommand = {
-    command: 'routine [script]',
-    describe: `🚀 ${t('routine_describe').d('Manage your routine')}`,
+    command: 'project [script]',
+    aliases: ['routine'],
+    describe: `🧭 ${t('routine_describe').d('Manage your project')}`,
     builder: (yargs) => {
         yargsIns = yargs;
         return yargs
@@ -16,7 +17,7 @@ const routineCommand = {
             type: 'boolean',
             default: false
         })
-            .usage(`${t('common_usage').d('Usage')}: esa routine [list | delete]`);
+            .usage(`${t('common_usage').d('Usage')}: esa-cli project [list | delete]`);
     },
     handler: (argv) => {
         if (yargsIns && (argv.help || argv._.length < 2)) {

package/dist/commands/routine/list.js

@@ -7,62 +7,68 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
+import chalk from 'chalk';
 import Table from 'cli-table3';
+import moment from 'moment';
+import t from '../../i18n/index.js';
+import { ApiService } from '../../libs/apiService.js';
 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';
-import t from '../../i18n/index.js';
-import moment from 'moment';
 const list = {
     command: 'list',
-    describe: `📋 ${t('list_describe').d('List all your routines')}`,
+    describe: `📋 ${t('list_describe').d('List all your projects')}`,
     builder: (yargs) => {
-        return yargs.usage(`${t('common_usage').d('Usage')}: \$0 list []`);
+        return yargs
+            .option('keyword', {
+            alias: 'k',
+            describe: t('deploy_option_keyword').d('Keyword to search for projects'),
+            type: 'string'
+        })
+            .usage(`${t('common_usage').d('Usage')}: \$0 list [--keyword <keyword>]`);
     },
     handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
         handleList(argv);
     })
 };
 export default list;
-export function handleList(argv) {
+export function getAllRoutines(options) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const { site } = argv, args = __rest(argv, ["site"]);
+        const server = yield ApiService.getInstance();
+        const allRoutines = [];
+        let pageNumber = 1;
+        const pageSize = (options === null || options === void 0 ? void 0 : options.PageSize) || 50;
+        while (true) {
+            const res = yield server.listUserRoutines({
+                RegionId: options === null || options === void 0 ? void 0 : options.RegionId,
+                PageNumber: pageNumber,
+                PageSize: pageSize,
+                SearchKeyWord: options === null || options === void 0 ? void 0 : options.SearchKeyWord
+            });
+            if (!((_a = res === null || res === void 0 ? void 0 : res.body) === null || _a === void 0 ? void 0 : _a.Routines)) {
+                break;
+            }
+            allRoutines.push(...res.body.Routines);
+            const totalCount = res.body.TotalCount;
+            const currentCount = allRoutines.length;
+            if (currentCount >= totalCount) {
+                break;
+            }
+            pageNumber++;
+        }
+        return allRoutines;
+    });
+}
+export function handleList(argv) {
+    return __awaiter(this, void 0, void 0, function* () {
         const isSuccess = yield checkIsLoginSuccess();
         if (!isSuccess)
             return;
-        const server = yield ApiService.getInstance();
-        if (site) {
-            const req = {
-                SiteSearchType: 'fuzzy',
-                Status: 'active',
-                PageNumber: 1,
-                PageSize: 50
-            };
-            const res = yield server.listSites(req);
-            const siteList = (_a = res === null || res === void 0 ? void 0 : res.data.Sites) !== null && _a !== void 0 ? _a : [];
-            const siteNameList = siteList === null || siteList === void 0 ? void 0 : siteList.map((item) => item.SiteName);
-            logger.log(chalk.bold.bgGray(`📃 ${t('list_site_name_title').d('List all of site names')}:`));
-            logger.tree(siteNameList);
-            return;
-        }
-        const res = yield server.getRoutineUserInfo();
-        const routineList = res === null || res === void 0 ? void 0 : res.Routines;
+        const routineList = yield getAllRoutines({
+            SearchKeyWord: argv.keyword
+        });
         if (routineList) {
-            logger.log(chalk.bold.bgGray(`📃 ${t('list_routine_name_title').d('List all of routine')}:`));
+            logger.log(chalk.bold.bgGray(`📃 ${t('list_routine_name_title').d('List all of Functions and Pages')}:`));
             displayRoutineList(routineList);
         }
     });
@@ -77,7 +83,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

@@ -1,9 +1,9 @@
-import siteList from './list.js';
 import t from '../../i18n/index.js';
+import siteList from './list.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
@@ -14,7 +14,7 @@ const siteCommand = {
             type: 'boolean',
             default: false
         })
-            .usage(`${t('common_usage').d('Usage')}: esa site [list]`);
+            .usage(`${t('common_usage').d('Usage')}: esa-cli site [list]`);
     },
     handler: (argv) => {
         if (yargsIns && (argv.help || argv._.length < 2)) {

package/dist/commands/site/list.js

@@ -7,25 +7,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import logger from '../../libs/logger.js';
-import { checkIsLoginSuccess } from '../utils.js';
 import chalk from 'chalk';
-import { ApiService } from '../../libs/apiService.js';
 import t from '../../i18n/index.js';
+import { ApiService } from '../../libs/apiService.js';
+import logger from '../../libs/logger.js';
+import { checkIsLoginSuccess } from '../utils.js';
 const list = {
     command: 'list',
     describe: `📋 ${t('site_describe_list').d('List all your sites')}`,
     builder: (yargs) => {
         return yargs.usage(`${t('common_usage').d('Usage')}: \$0 list []`);
     },
-    handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
-        handleList(argv);
+    handler: () => __awaiter(void 0, void 0, void 0, function* () {
+        handleList();
     })
 };
 export default list;
-export function handleList(argv) {
+export function handleList() {
     return __awaiter(this, void 0, void 0, function* () {
-        //   const { site, ...args } = argv;
         var _a;
         const isSuccess = yield checkIsLoginSuccess();
         if (!isSuccess)