esa-cli 0.0.2-beta.2 → 0.0.2-beta.20

package/dist/commands/route/add.js

@@ -7,20 +7,36 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import chalk from 'chalk';
-import logger from '../../libs/logger.js';
-import { checkDirectory, checkIsLoginSuccess, isValidRouteForDomain } from '../utils.js';
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
-import { ApiService } from '../../libs/apiService.js';
+import inquirer from 'inquirer';
 import t from '../../i18n/index.js';
-import { descriptionInput } from '../../components/descriptionInput.js';
-import { promptFilterSelector } from '../../components/filterSelector.js';
+import { ApiService } from '../../libs/apiService.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 { routeBuilder } from '../../components/routeBuilder.js';
+import { transferRouteToRuleString } from './helper.js';
 const addRoute = {
-    command: 'add [route] [site]',
+    command: 'add',
     describe: `📥 ${t('route_add_describe').d('Bind a Route to a routine')}`,
     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) {
@@ -36,7 +52,7 @@ const addRoute = {
 };
 export function handlerAddRoute(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a;
         if (!checkDirectory()) {
             return;
         }
@@ -47,8 +63,6 @@ export function handlerAddRoute(argv) {
         if (!isSuccess)
             return;
         yield validRoutine(projectConfig.name);
-        // input route and site
-        const { route, site } = argv;
         const listSitesReq = {
             SiteSearchType: 'fuzzy',
             Status: 'active',
@@ -57,58 +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) => ({
-            label: i.SiteName,
+        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
         }));
-        if (route && site) {
-            const siteId = (_a = siteList.find((item) => item.label === site)) === null || _a === void 0 ? void 0 : _a.value;
-            const req = {
-                Name: projectConfig.name,
-                SiteId: Number(siteId),
-                SiteName: String(site),
-                Route: String(route)
-            };
-            const res = yield server.createRoutineRelatedRoute(req);
-            const addSuccess = ((_b = res === null || res === void 0 ? void 0 : res.data) === null || _b === void 0 ? void 0 : _b.Status) === 'OK';
-            if (addSuccess) {
-                logger.success(t('route_add_success').d('Add route success!'));
+        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;
+                    }
+                }
+            ]);
+            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;
             }
             else {
-                logger.error(t('route_add_fail').d('Add route fail!'));
+                logger.error(t('site_not_found').d(`Site "${siteName}" not found in your account`));
+                return;
             }
-            return;
         }
-        logger.warn(t('interactive_mode').d('Interactive mode'));
-        // not input route and site, enter interactive mode
-        logger.log(`🖊️ ${t('domain_input').d('Enter the name of domain (Support fuzzy matching on tab press):')}`);
-        const domain = yield promptFilterSelector(siteList);
-        const inputRoute = yield descriptionInput(`🖊️ ${t('route_input').d('Enter a Route:')} (${chalk.green(t('route_validate').d('You can add an asterisk (*) as the prefix or suffix to match more URLs, such as "*.example.com/*".'))})`, true);
-        const ROUTE_PATTERN = /^(?:\*\.)?([a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*\.[a-zA-Z]{2,})(\/\*|\/[^?#]*)?$/;
-        if (!ROUTE_PATTERN.test(inputRoute)) {
-            return logger.error(t('route_add_invalid_route').d('Invalid route'));
+        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;
         }
-        if (!isValidRouteForDomain(inputRoute, domain.label)) {
-            return logger.error(t('route_site_not_match').d('The route does not correspond to the domain.'));
+        const rule = transferRouteToRuleString(inputRoute);
+        if (!rule) {
+            logger.error(t('route_format_invalid').d('Invalid route format'));
+            return;
         }
-        if (domain.value !== '') {
-            const req = {
-                Name: projectConfig.name,
-                SiteId: Number(domain.value),
-                SiteName: domain.label,
-                Route: inputRoute
-            };
-            const res = yield server.createRoutineRelatedRoute(req);
-            const addSuccess = ((_c = res === null || res === void 0 ? void 0 : res.data) === null || _c === void 0 ? void 0 : _c.Status) === 'OK';
+        const selectedSite = siteList.find((site) => site.value === siteId);
+        const displaySiteName = selectedSite ? selectedSite.name : siteName;
+        const req = {
+            RoutineName: projectConfig.name,
+            RouteName: routeName,
+            SiteId: siteId,
+            RouteEnable: 'on',
+            Bypass: 'off',
+            Rule: rule
+        };
+        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 {
-            logger.error(t('invalid_domain').d('Input domain is invalid'));
+        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,20 +7,30 @@ 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 { ApiService } from '../../libs/apiService.js';
-import logger from '../../libs/logger.js';
 import t from '../../i18n/index.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', {
+        return yargs
+            .positional('routeName', {
             describe: t('route_delete_positional_describe').d('The name of the routes to delete'),
             type: 'string',
             demandOption: true
+        })
+            .fail((msg, err, yargsIns) => {
+            console.log(msg, err);
+            if (err)
+                throw err;
+            if (msg) {
+                yargsIns.showHelp('log');
+            }
+            process.exit(1);
         });
     },
     handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
@@ -30,7 +40,7 @@ const deleteRoute = {
 export default deleteRoute;
 export function handleDeleteRoute(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         if (!checkDirectory()) {
             return;
         }
@@ -41,29 +51,25 @@ export function handleDeleteRoute(argv) {
         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 : [];
-        const deleteDomain = argv.route;
-        const matchedSite = relatedRoutes.find((item) => {
-            return String(item.Route) === deleteDomain;
-        });
-        if (matchedSite === undefined) {
-            logger.error(t('route_not_exist').d('Route not exist!'));
+        const req = {
+            routineName: projectConfig.name
+        };
+        const res = yield api.listRoutineRoutes(req);
+        const configs = ((_a = res.body) === null || _a === void 0 ? void 0 : _a.configs) || [];
+        const deleteRouteName = argv.routeName;
+        const matchedRoute = configs.find((config) => config.routeName === deleteRouteName);
+        if (!matchedRoute) {
+            logger.error(t('no_route_found').d('No route found! Please check the route name.'));
             return;
         }
-        const request = {
-            Name: projectConfig.name,
-            SiteId: matchedSite.SiteId,
-            SiteName: matchedSite.SiteName,
-            Route: matchedSite.Route,
-            RouteId: matchedSite.RouteId
+        const siteId = matchedRoute === null || matchedRoute === void 0 ? void 0 : matchedRoute.siteId;
+        const configId = matchedRoute === null || matchedRoute === void 0 ? void 0 : matchedRoute.configId;
+        const deleteRouteReq = {
+            siteId: siteId,
+            configId: configId
         };
-        const res = yield server.deleteRoutineRelatedRoute(request);
-        const isDeleteSuccess = (res === null || res === void 0 ? void 0 : res.data.Status) === 'OK';
+        const deleteRouteRes = yield api.deleteRoutineRoute(deleteRouteReq);
+        const isDeleteSuccess = deleteRouteRes.statusCode === 200;
         if (isDeleteSuccess) {
             logger.success(t('route_delete_success').d('Delete route success!'));
         }

package/dist/commands/route/helper.js

@@ -0,0 +1,123 @@
+/* 操作符号枚举 */
+export var OPERATOR_ENUM;
+(function (OPERATOR_ENUM) {
+    OPERATOR_ENUM["Eq"] = "eq";
+    OPERATOR_ENUM["Ne"] = "ne";
+    OPERATOR_ENUM["Contains"] = "contains";
+    OPERATOR_ENUM["Negate_Contains"] = "negate_contains";
+    OPERATOR_ENUM["StartsWith"] = "starts_with";
+    OPERATOR_ENUM["Negate_StartsWith"] = "negate_starts_with";
+    OPERATOR_ENUM["EndsWith"] = "ends_with";
+    OPERATOR_ENUM["Negate_EndsWith"] = "negate_ends_with";
+    OPERATOR_ENUM["Matches"] = "matches";
+    OPERATOR_ENUM["Negate_Matches"] = "negate_matches";
+    OPERATOR_ENUM["In"] = "in";
+    OPERATOR_ENUM["Negate_In"] = "negate_in";
+    OPERATOR_ENUM["Gt"] = "gt";
+    OPERATOR_ENUM["Lt"] = "lt";
+    OPERATOR_ENUM["Ge"] = "ge";
+    OPERATOR_ENUM["Le"] = "le";
+    OPERATOR_ENUM["InList"] = "in_list";
+    OPERATOR_ENUM["Negate_InList"] = "negate_in_list";
+})(OPERATOR_ENUM || (OPERATOR_ENUM = {}));
+const RuleMatchTypeHost = 'http.host';
+const RuleMatchTypeUriPath = 'http.request.uri.path';
+const RuleMatchOperatorEq = OPERATOR_ENUM.Eq;
+const RuleMatchOperatorStartsWith = OPERATOR_ENUM.StartsWith;
+const RuleMatchOperatorEndsWith = OPERATOR_ENUM.EndsWith;
+export const transferRouteToRuleString = (routePath) => {
+    if (!routePath) {
+        return '';
+    }
+    const index = routePath.indexOf('/');
+    let host = '';
+    let uriPath = '';
+    if (index < 0) {
+        host = routePath;
+        uriPath = '/';
+    }
+    else {
+        host = routePath.substring(0, index);
+        uriPath = routePath.substring(index);
+    }
+    let hostOperator = RuleMatchOperatorEq;
+    if (host.startsWith('*')) {
+        hostOperator = RuleMatchOperatorEndsWith;
+        host = host.replace(/\*/g, '');
+    }
+    let uriPathOperator = RuleMatchOperatorEq;
+    if (uriPath.endsWith('*')) {
+        uriPathOperator = RuleMatchOperatorStartsWith;
+        uriPath = uriPath.replace(/\*$/, '');
+    }
+    let ruleStr = '';
+    if (hostOperator === RuleMatchOperatorEq) {
+        if (uriPathOperator === RuleMatchOperatorEq) {
+            ruleStr = `(${RuleMatchTypeHost} ${hostOperator} "${host}" and ${RuleMatchTypeUriPath} ${uriPathOperator} "${uriPath}")`;
+        }
+        else if (uriPathOperator === RuleMatchOperatorStartsWith) {
+            ruleStr = `(${RuleMatchTypeHost} ${hostOperator} "${host}" and ${RuleMatchOperatorStartsWith}(${RuleMatchTypeUriPath}, "${uriPath}"))`;
+        }
+    }
+    else if (hostOperator === RuleMatchOperatorEndsWith) {
+        if (uriPathOperator === RuleMatchOperatorEq) {
+            ruleStr = `(${RuleMatchOperatorEndsWith}(${RuleMatchTypeHost}, "${host}") and ${RuleMatchTypeUriPath} ${uriPathOperator} "${uriPath}")`;
+        }
+        else if (uriPathOperator === RuleMatchOperatorStartsWith) {
+            ruleStr = `(${RuleMatchOperatorEndsWith}(${RuleMatchTypeHost}, "${host}") and ${RuleMatchOperatorStartsWith}(${RuleMatchTypeUriPath}, "${uriPath}"))`;
+        }
+    }
+    return ruleStr;
+};
+export const transferRuleStringToRoute = (ruleStr) => {
+    if (!ruleStr) {
+        return '';
+    } // Remove outer brackets and split by " and "
+    const cleanedRule = ruleStr.replace(/^\(|\)$/g, '');
+    const parts = cleanedRule.split(' and ');
+    if (parts.length !== 2) {
+        return '';
+    }
+    let host = '';
+    let uriPath = '';
+    // Process host part
+    const hostPart = parts[0].trim();
+    if (hostPart.startsWith(`${RuleMatchOperatorEndsWith}(${RuleMatchTypeHost},`)) {
+        // Logic when host matches eq
+        // ends_with(http.host, "value")
+        const match = hostPart.match(/ends_with\(http\.host,\s*"([^"]+)"\)/);
+        if (match) {
+            host = `*${match[1]}`; // Add prefix *
+        }
+    }
+    else if (hostPart.startsWith(`${RuleMatchTypeHost} ${RuleMatchOperatorEq}`)) {
+        // Logic when host matches eq
+        // http.host eq "value"
+        const match = hostPart.match(/http\.host eq "([^"]+)"/);
+        if (match) {
+            host = match[1];
+        }
+    }
+    // Process uriPath part
+    const uriPathPart = parts[1].trim();
+    if (uriPathPart.startsWith(`${RuleMatchOperatorStartsWith}(${RuleMatchTypeUriPath},`)) {
+        // 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]}*`; // Add suffix *
+        }
+    }
+    else if (uriPathPart.startsWith(`${RuleMatchTypeUriPath} ${RuleMatchOperatorEq}`)) {
+        // Logic when uriPath matches eq
+        // http.request.uri.path eq "value"
+        const match = uriPathPart.match(/http\.request\.uri\.path eq "([^"]+)"/);
+        if (match) {
+            uriPath = match[1];
+        }
+    }
+    if (!host || !uriPath) {
+        return '';
+    }
+    return `${host}${uriPath}`;
+};

package/dist/commands/route/index.js

@@ -1,7 +1,7 @@
+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]',

package/dist/commands/route/list.js

@@ -7,13 +7,14 @@ 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 { ApiService } from '../../libs/apiService.js';
-import logger from '../../libs/logger.js';
 import t from '../../i18n/index.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',
     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/delete.js

@@ -7,10 +7,10 @@ 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')}`,

package/dist/commands/routine/index.js

@@ -1,6 +1,6 @@
-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]',