esa-cli 0.0.2-beta.8 → 0.0.5

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/components/mutiLevelSelect.js

@@ -7,63 +7,52 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import React, { useState } from 'react';
-import { render, Text, useApp } from 'ink';
-import SelectInput from 'ink-select-input';
-import Item from './selectItem.js';
-import t from '../i18n/index.js';
-const Indicator = ({ isSelected }) => {
-    return React.createElement(Text, null, isSelected ? '👉 ' : '  ');
-};
-const EXIT_ITEM = {
-    label: t('exit_select_init_template').d('Exit'),
-    key: 'exit',
-    value: '__exit__'
-};
-const RETURN_ITEM = {
-    label: t('return_select_init_template').d('Return'),
-    key: 'return',
-    value: '__return__'
-};
-const MultiLevelSelect = ({ items, handleSelect, handleExit }) => {
-    const { exit } = useApp();
-    const [stack, setStack] = useState([[...items, EXIT_ITEM]]);
-    const currentItems = stack[stack.length - 1];
-    const onSelect = (item) => {
-        if (item.value === '__return__') {
-            if (stack.length > 1) {
-                // 返回上一级菜单
-                setStack(stack.slice(0, -1));
+import inquirer from 'inquirer';
+import logger from '../libs/logger.js';
+/**
+ * Perform multi-level selection and return the final selected template path
+ * @param items Array of selection items (including categories and sub-templates)
+ * @param message Initial prompt message
+ * @returns Selected template path, or null if the user exits
+ */
+export default function multiLevelSelect(items_1) {
+    return __awaiter(this, arguments, void 0, function* (items, message = 'Select a template:') {
+        let currentItems = items; // Current level options
+        const stack = []; // Stack to store previous level options for back navigation
+        let selectedPath = null;
+        while (selectedPath === null) {
+            const { choice } = yield inquirer.prompt([
+                {
+                    type: 'list',
+                    name: 'choice',
+                    message,
+                    pageSize: 10,
+                    choices: [
+                        ...currentItems.map((item) => ({ name: item.label, value: item })),
+                        ...(stack.length > 0 ? [{ name: 'Back', value: 'back' }] : []), // Show "Back" if there’s a previous level
+                        { name: 'Exit', value: 'exit' }
+                    ]
+                }
+            ]);
+            if (choice === 'exit') {
+                logger.log('User canceled the operation.');
+                return null;
+            }
+            if (choice === 'back') {
+                currentItems = stack.pop(); // Return to the previous level
+                continue;
+            }
+            // If a category with children is selected
+            if (choice.children && choice.children.length > 0) {
+                stack.push(currentItems); // Save the current level
+                currentItems = choice.children; // Move to the next level
+                message = `Select a template under ${choice.label}:`;
             }
             else {
-                // 顶层菜单，执行退出逻辑
-                handleExit();
-                exit();
+                // A leaf node (no children) is selected, end the selection
+                selectedPath = choice.value;
             }
-            return;
-        }
-        if (item.children && item.children.length > 0) {
-            setStack([...stack, [...item.children, RETURN_ITEM]]); // 在子层级中添加“退出”选项
         }
-        else {
-            handleSelect(item);
-            exit();
-        }
-    };
-    return (React.createElement(SelectInput, { items: currentItems, onSelect: onSelect, itemComponent: Item, indicatorComponent: Indicator, limit: 10 }));
-};
-export const MultiLevelSelectComponent = (props) => __awaiter(void 0, void 0, void 0, function* () {
-    const { items, handleSelect, handleExit } = props;
-    return new Promise((resolve) => {
-        const { unmount } = render(React.createElement(MultiLevelSelect, { items: items, handleSelect: (item) => {
-                unmount();
-                handleSelect && handleSelect(item);
-                resolve(item);
-            }, handleExit: () => {
-                unmount();
-                handleExit && handleExit();
-                resolve(null);
-            } }));
+        return selectedPath;
     });
-});
-export default MultiLevelSelectComponent;
+}

package/dist/i18n/locales.json

@@ -918,5 +918,65 @@
   "deno_install_success_tips": {
     "en": "Please run ${dev} again",
     "zh_CN": "请重新运行 ${dev}"
+  },
+  "no_build_script": {
+    "en": "No build script found in package.json, skipping build step.",
+    "zh_CN": "在 package.json 中未找到构建脚本，跳过构建步骤。"
+  },
+  "init_cancel": {
+    "en": "User canceled the operation.",
+    "zh_CN": "用户取消了操作。"
+  },
+  "routine_create_success": {
+    "en": "Routine created successfully.",
+    "zh_CN": "边缘函数创建成功"
+  },
+  "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();