esa-cli 0.0.2-beta.9 → 0.0.5

package/dist/commands/deploy/helper.js

@@ -32,11 +32,14 @@ export function yesNoPromptAndExecute(message, execute) {
 }
 export function promptSelectVersion(versionList) {
     const items = versionList
-        .filter((version) => version.CodeVersion !== 'unstable')
-        .map((version, index) => ({
-        label: version.CodeVersion,
-        value: String(index)
-    }));
+        .filter((version) => version.codeVersion !== 'unstable')
+        .map((version, index) => {
+        var _a;
+        return ({
+            label: (_a = version.codeVersion) !== null && _a !== void 0 ? _a : '',
+            value: String(index)
+        });
+    });
     return new Promise((resolve) => {
         const handleSelection = (item) => __awaiter(this, void 0, void 0, function* () {
             resolve(item.label);

package/dist/commands/deploy/index.js

@@ -13,7 +13,6 @@ import { Environment, PublishType } from '../../libs/interface.js';
 import logger from '../../libs/logger.js';
 import { checkDirectory, checkIsLoginSuccess, getRoutineVersionList } from '../utils.js';
 import { displayMultiSelectTable } from '../../components/mutiSelectTable.js';
-import { Base64 } from 'js-base64';
 import { ApiService } from '../../libs/apiService.js';
 import { createAndDeployVersion, displaySelectDeployType, promptSelectVersion, yesNoPromptAndExecute } from './helper.js';
 import t from '../../i18n/index.js';
@@ -64,7 +63,7 @@ export function quickDeploy(entry, projectConfig) {
 }
 export function handleDeploy(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         if (!checkDirectory()) {
             return;
         }
@@ -79,10 +78,10 @@ export function handleDeploy(argv) {
         yield checkRoutineExist(projectConfig.name, entry);
         const req = { Name: projectConfig.name };
         const routineDetail = yield server.getRoutine(req, false);
-        const versionList = ((_a = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _a === void 0 ? void 0 : _a.CodeVersions) || [];
+        const versionList = yield getRoutineVersionList(projectConfig.name);
         const customEntry = argv.entry;
-        const stagingVersion = (_c = (_b = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _b === void 0 ? void 0 : _b.Envs[1]) === null || _c === void 0 ? void 0 : _c.CodeVersion;
-        const productionVersion = (_e = (_d = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _d === void 0 ? void 0 : _d.Envs[0]) === null || _e === void 0 ? void 0 : _e.CodeVersion;
+        const stagingVersion = (_b = (_a = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _a === void 0 ? void 0 : _a.Envs[1]) === null || _b === void 0 ? void 0 : _b.CodeVersion;
+        const productionVersion = (_d = (_c = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _c === void 0 ? void 0 : _c.Envs[0]) === null || _d === void 0 ? void 0 : _d.CodeVersion;
         if (argv.quick) {
             yield quickDeploy(customEntry, projectConfig);
             exit(0);
@@ -179,6 +178,7 @@ export function deploySelectedCodeVersion(name, selectedType, version) {
 }
 export function displayVersionList(versionList_1) {
     return __awaiter(this, arguments, void 0, function* (versionList, stagingVersion = 'unstable', productionVersion = 'unstable') {
+        var _a;
         logger.log(`${chalk.bgYellow('Active')} ${t('deploy_env_staging').d('Staging')}`);
         logger.log(`${chalk.bgGreen('Active')} ${t('deploy_env_production').d('Production')}`);
         const data = [];
@@ -186,13 +186,13 @@ export function displayVersionList(versionList_1) {
             const version = versionList[i];
             const createTime = moment(version.CreateTime).format('YYYY/MM/DD HH:mm:ss');
             const tags = [
-                version.CodeVersion === stagingVersion ? chalk.bgYellow('Active') : '',
-                version.CodeVersion === productionVersion ? chalk.bgGreen('Active') : ''
+                version.codeVersion === stagingVersion ? chalk.bgYellow('Active') : '',
+                version.codeVersion === productionVersion ? chalk.bgGreen('Active') : ''
             ];
             data.push([
-                `${version.CodeVersion} ${tags.join(' ')}`,
+                `${version.codeVersion} ${tags.join(' ')}`,
                 createTime,
-                Base64.decode(version.CodeDescription)
+                (_a = version.codeDescription) !== null && _a !== void 0 ? _a : ''
             ]);
         }
         logger.table([

package/dist/commands/dev/ew2/server.js

@@ -128,7 +128,6 @@ class Ew2Server {
     }
     createServer() {
         this.server = http.createServer((req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
             try {
                 const host = req.headers.host;
                 const url = req.url;
@@ -148,18 +147,20 @@ class Ew2Server {
                 // 解决 gzip 兼容性问题，防止net::ERR_CONTENT_DECODING_FAILED
                 workerHeaders['content-encoding'] = 'identity';
                 if (workerRes.body) {
-                    if ((_a = workerRes.headers.get('content-type')) === null || _a === void 0 ? void 0 : _a.includes('text/')) {
-                        const text = yield workerRes.text();
-                        // 出现换行符之类会导致 content-length 不一致
-                        workerHeaders['content-length'] =
-                            Buffer.byteLength(text).toString();
-                        res.writeHead(workerRes.status, workerHeaders);
-                        res.end(text);
-                    }
-                    else {
-                        res.writeHead(workerRes.status, workerHeaders);
-                        workerRes.body.pipe(res);
-                    }
+                    // if (workerRes.headers.get('content-type')?.includes('text/')) {
+                    //   const text = await workerRes.text();
+                    //   // 出现换行符之类会导致 content-length 不一致
+                    //   workerHeaders['content-length'] =
+                    //     Buffer.byteLength(text).toString();
+                    //     console.log(workerHeaders['content-length']);
+                    //   res.writeHead(workerRes.status, workerHeaders);
+                    //   res.end(text);
+                    // } else {
+                    //   res.writeHead(workerRes.status, workerHeaders);
+                    //   workerRes.body.pipe(res);
+                    // }
+                    res.writeHead(workerRes.status, workerHeaders);
+                    workerRes.body.pipe(res);
                     logger.log(`[ESA Dev] ${req.method} ${url} ${getColorForStatusCode(workerRes.status, workerRes.statusText)}`);
                 }
                 else {

package/dist/commands/domain/delete.js

@@ -31,7 +31,7 @@ const deleteDomain = {
 export default deleteDomain;
 export function handleDeleteDomain(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         if (!checkDirectory()) {
             return;
         }
@@ -44,10 +44,10 @@ export function handleDeleteDomain(argv) {
         yield validRoutine(projectConfig.name);
         const server = yield ApiService.getInstance();
         const req = { Name: projectConfig.name || '' };
-        const routineDetail = yield server.getRoutine(req);
-        if (!routineDetail)
+        const listRoutineRelatedRecordRes = yield server.listRoutineRelatedRecords(req);
+        if (!listRoutineRelatedRecordRes)
             return;
-        const relatedRecords = (_b = (_a = routineDetail.data) === null || _a === void 0 ? void 0 : _a.RelatedRecords) !== null && _b !== void 0 ? _b : [];
+        const relatedRecords = ((_a = listRoutineRelatedRecordRes.data) === null || _a === void 0 ? void 0 : _a.RelatedRecords) || [];
         const relatedDomain = argv.domain;
         const matchedSite = relatedRecords.find((item) => {
             return String(item.RecordName) === relatedDomain;

package/dist/commands/domain/list.js

@@ -36,10 +36,10 @@ export function handleListDomains(argv) {
         yield validRoutine(projectConfig.name);
         const server = yield ApiService.getInstance();
         const req = { Name: projectConfig.name };
-        const routineDetail = yield server.getRoutine(req);
-        if (!routineDetail)
+        const res = yield server.listRoutineRelatedRecords(req);
+        if (!res)
             return;
-        const relatedRecords = (_b = (_a = routineDetail.data) === null || _a === void 0 ? void 0 : _a.RelatedRecords) !== null && _b !== void 0 ? _b : [];
+        const relatedRecords = (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.RelatedRecords) !== null && _b !== void 0 ? _b : [];
         if (relatedRecords.length === 0) {
             logger.log(`🙅 ${t('domain_list_empty').d('No related domains found')}`);
             return;

package/dist/commands/init/helper.js

@@ -15,8 +15,8 @@ import logger from '../../libs/logger.js';
 import { execSync } from 'child_process';
 import t from '../../i18n/index.js';
 import chalk from 'chalk';
-import { getDirName } from '../../utils/fileUtils/base.js';
 import inquirer from 'inquirer';
+import { getDirName } from '../../utils/fileUtils/base.js';
 export const getTemplateInstances = (templateHubPath) => {
     return fs
         .readdirSync(templateHubPath)
@@ -73,6 +73,7 @@ export function checkAndUpdatePackage(packageName) {
         try {
             // 获取当前安装的版本
             const __dirname = getDirName(import.meta.url);
+            console.log(__dirname);
             const packageJsonPath = path.join(__dirname, '../../../');
             const versionInfo = execSync(`npm list ${packageName}`, {
                 cwd: packageJsonPath

package/dist/commands/route/add.js

@@ -7,15 +7,14 @@ 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 { checkDirectory, checkIsLoginSuccess } from '../utils.js';
 import { getProjectConfig } from '../../utils/fileUtils/index.js';
 import { ApiService } from '../../libs/apiService.js';
 import t from '../../i18n/index.js';
-import { descriptionInput } from '../../components/descriptionInput.js';
-import { promptFilterSelector } from '../../components/filterSelector.js';
 import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
+import inquirer from 'inquirer';
+import { transferRouteToRuleString } from './helper.js';
 const addRoute = {
     command: 'add [route] [site]',
     describe: `📥 ${t('route_add_describe').d('Bind a Route to a routine')}`,
@@ -36,7 +35,6 @@ const addRoute = {
 };
 export function handlerAddRoute(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
         if (!checkDirectory()) {
             return;
         }
@@ -47,8 +45,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',
@@ -58,57 +54,59 @@ 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,
+            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!'));
+        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');
+                    }
+                    return true;
+                }
             }
-            else {
-                logger.error(t('route_add_fail').d('Add route fail!'));
+        ]);
+        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
             }
-            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'));
-        }
-        if (!isValidRouteForDomain(inputRoute, domain.label)) {
-            return logger.error(t('route_site_not_match').d('The route does not correspond to the domain.'));
-        }
-        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';
-            if (addSuccess) {
-                logger.success(t('route_add_success').d('Add route success!'));
-            }
-            else {
-                logger.error(t('route_add_fail').d('Add route fail!'));
+        ]);
+        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;
+                }
             }
+        ]);
+        const rule = transferRouteToRuleString(inputRoute);
+        const req = {
+            RoutineName: projectConfig.name,
+            RouteName: routeName,
+            SiteId: routeSite,
+            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!'));
         }
         else {
-            logger.error(t('invalid_domain').d('Input domain is invalid'));
+            logger.error(t('route_add_fail').d('Add route fail!'));
         }
     });
 }

package/dist/commands/route/delete.js

@@ -9,18 +9,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 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 { validRoutine } from '../../utils/checkIsRoutineCreated.js';
+import api from '../../libs/api.js';
 const deleteRoute = {
     command: 'delete <route>',
     describe: `🗑  ${t('route_delete_describe').d('Delete a related route')}`,
     builder: (yargs) => {
-        return yargs.positional('route', {
+        return yargs
+            .positional('route', {
             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,124 @@
+/* 操作符号枚举 */
+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 '';
+    }
+    // 去掉外层括号并按 " and " 分割
+    const cleanedRule = ruleStr.replace(/^\(|\)$/g, '');
+    const parts = cleanedRule.split(' and ');
+    if (parts.length !== 2) {
+        return '';
+    }
+    let host = '';
+    let uriPath = '';
+    // 处理host部分
+    const hostPart = parts[0].trim();
+    if (hostPart.startsWith(`${RuleMatchOperatorEndsWith}(${RuleMatchTypeHost},`)) {
+        // host匹配eq时的逻辑
+        // ends_with(http.host, "value")
+        const match = hostPart.match(/ends_with\(http\.host,\s*"([^"]+)"\)/);
+        if (match) {
+            host = `*${match[1]}`; // 加前缀 *
+        }
+    }
+    else if (hostPart.startsWith(`${RuleMatchTypeHost} ${RuleMatchOperatorEq}`)) {
+        // host匹配eq时的逻辑
+        // http.host eq "value"
+        const match = hostPart.match(/http\.host eq "([^"]+)"/);
+        if (match) {
+            host = match[1];
+        }
+    }
+    // 处理uriPath 部分
+    const uriPathPart = parts[1].trim();
+    if (uriPathPart.startsWith(`${RuleMatchOperatorStartsWith}(${RuleMatchTypeUriPath},`)) {
+        // uriPath匹配startsWith时的逻辑
+        // starts_with(http.request.uri.path, "value")
+        const match = uriPathPart.match(/starts_with\(http\.request\.uri\.path,\s*"([^"]+)"\)/);
+        if (match) {
+            uriPath = `${match[1]}*`; // 加后缀 *
+        }
+    }
+    else if (uriPathPart.startsWith(`${RuleMatchTypeUriPath} ${RuleMatchOperatorEq}`)) {
+        // uriPath匹配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/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/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/i18n/locales.json

@@ -934,5 +934,49 @@
   "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": ""
   }
 }

package/dist/libs/api.js

@@ -140,9 +140,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 +148,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();

package/dist/libs/apiService.js

@@ -12,7 +12,6 @@ import FormData from 'form-data';
 import fetch from 'node-fetch';
 import { Environment } from './interface.js';
 import { getApiConfig } from '../utils/fileUtils/index.js';
-import chain from 'lodash';
 import t from '../i18n/index.js';
 export class ApiService {
     constructor(cliConfig) {
@@ -569,7 +568,7 @@ export class ApiService {
     }
     getRoutine(requestParams_1) {
         return __awaiter(this, arguments, void 0, function* (requestParams, isShowError = true) {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f;
             try {
                 let params = {
                     action: 'GetRoutine',
@@ -602,12 +601,10 @@ export class ApiService {
                         data: {
                             RequestId: (_a = res.body) === null || _a === void 0 ? void 0 : _a.RequestId,
                             CodeVersions: ((_b = res.body) === null || _b === void 0 ? void 0 : _b.CodeVersions) || [],
-                            RelatedRecords: ((_c = res.body) === null || _c === void 0 ? void 0 : _c.RelatedRecords) || [],
-                            Envs: ((_d = res.body) === null || _d === void 0 ? void 0 : _d.Envs) || [],
-                            CreateTime: (_e = res.body) === null || _e === void 0 ? void 0 : _e.CreateTime,
-                            Description: (_f = res.body) === null || _f === void 0 ? void 0 : _f.Description,
-                            RelatedRoutes: ((_g = res.body) === null || _g === void 0 ? void 0 : _g.RelatedRoutes) || [],
-                            DefaultRelatedRecord: (_h = res.body) === null || _h === void 0 ? void 0 : _h.DefaultRelatedRecord
+                            Envs: ((_c = res.body) === null || _c === void 0 ? void 0 : _c.Envs) || [],
+                            CreateTime: (_d = res.body) === null || _d === void 0 ? void 0 : _d.CreateTime,
+                            Description: (_e = res.body) === null || _e === void 0 ? void 0 : _e.Description,
+                            DefaultRelatedRecord: (_f = res.body) === null || _f === void 0 ? void 0 : _f.DefaultRelatedRecord
                         }
                     };
                     return routineResponse;
@@ -695,7 +692,7 @@ export class ApiService {
                     }
                 };
                 const uploadResult = yield this.client.callApi(params, request, runtime);
-                const ossConfig = chain(uploadResult).get('body.OssPostConfig');
+                const ossConfig = uploadResult.body.OssPostConfig;
                 if (uploadResult.statusCode !== 200 || !ossConfig) {
                     return false;
                 }
@@ -708,12 +705,12 @@ export class ApiService {
                 formData.append('policy', policy);
                 formData.append('key', key);
                 formData.append('file', edgeRoutine.code);
-                // TODO: 检查oss结果;
                 const ossRes = yield fetch(Url, {
                     method: 'POST',
                     body: formData,
                     headers: formData.getHeaders()
                 });
+                // console.log('oss result', oss);
                 if (ossRes && ossRes.status === 200) {
                     return true;
                 }
@@ -868,5 +865,106 @@ export class ApiService {
             return null;
         });
     }
+    listRoutineRelatedRecords(requestParams) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let params = {
+                    action: 'ListRoutineRelatedRecords',
+                    version: '2024-09-10',
+                    protocol: 'https',
+                    method: 'GET',
+                    authType: 'AK',
+                    bodyType: 'json',
+                    reqBodyType: 'json',
+                    style: 'RPC',
+                    pathname: '/',
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                let request = new $OpenApi.OpenApiRequest({
+                    query: {
+                        Name: requestParams.Name,
+                        PageNumber: requestParams.PageNumber,
+                        PageSize: requestParams.PageSize,
+                        SearchKeyWord: requestParams.SearchKeyWord
+                    }
+                });
+                let runtime = {
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                const res = yield this.client.callApi(params, request, runtime);
+                if (res.statusCode === 200 && res.body) {
+                    const ret = {
+                        code: res.statusCode,
+                        data: {
+                            PageNumber: res.body.PageNumber,
+                            PageSize: res.body.PageSize,
+                            TotalCount: res.body.TotalCount,
+                            RelatedRecords: res.body.RelatedRecords
+                        }
+                    };
+                    return ret;
+                }
+            }
+            catch (error) {
+                console.log(error);
+            }
+            return null;
+        });
+    }
+    createRoutineRoute(requestParams) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let params = {
+                    action: 'CreateRoutineRoute',
+                    version: '2024-09-10',
+                    protocol: 'https',
+                    method: 'POST',
+                    authType: 'AK',
+                    bodyType: 'json',
+                    reqBodyType: 'json',
+                    style: 'RPC',
+                    pathname: '/',
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                let request = new $OpenApi.OpenApiRequest({
+                    query: {
+                        SiteId: requestParams.SiteId,
+                        RoutineName: requestParams.RoutineName,
+                        RouteName: requestParams.RouteName,
+                        RouteEnable: 'on',
+                        Rule: requestParams.Rule,
+                        Bypass: requestParams.Bypass,
+                        Mode: 'simple'
+                    }
+                });
+                let runtime = {
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                const res = yield this.client.callApi(params, request, runtime);
+                if (res.statusCode === 200 && res.body) {
+                    const ret = {
+                        code: res.statusCode,
+                        data: {
+                            RequestId: res.body.RequestId,
+                            ConfigId: res.body.ConfigId
+                        }
+                    };
+                    return ret;
+                }
+            }
+            catch (error) {
+                console.log(error);
+            }
+            return null;
+        });
+    }
 }
 ApiService.instance = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "0.0.2-beta.9",
+  "version": "0.0.5",
   "description": "A CLI for operating Alibaba Cloud ESA EdgeRoutine (Edge Functions).",
   "main": "bin/enter.cjs",
   "type": "module",
@@ -67,7 +67,7 @@
     "vitest": "^2.0.4"
   },
   "dependencies": {
-    "@alicloud/esa20240910": "2.8.1",
+    "@alicloud/esa20240910": "2.25.0",
     "@alicloud/openapi-client": "^0.4.7",
     "@babel/generator": "^7.26.3",
     "@babel/parser": "^7.24.4",
@@ -80,7 +80,7 @@
     "chokidar": "^3.5.3",
     "cli-table3": "^0.6.5",
     "cross-spawn": "^7.0.3",
-    "esa-template": "0.0.4-beta.1",
+    "esa-template": "^0.0.3",
     "esbuild": "^0.21.1",
     "esbuild-plugin-less": "^1.3.8",
     "form-data": "^4.0.0",