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

package/dist/commands/routine/list.js

@@ -7,60 +7,66 @@ 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')}`,
     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 routines'),
+            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')}:`));
             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,5 +1,5 @@
-import siteList from './list.js';
 import t from '../../i18n/index.js';
+import siteList from './list.js';
 let yargsIns;
 const siteCommand = {
     command: 'site [script]',

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)

package/dist/commands/utils.js

@@ -7,15 +7,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import fs from 'fs';
 import { execSync } from 'child_process';
-import { isInstalledGit } from '../libs/git/index.js';
-import { getCliConfig, projectConfigPath } from '../utils/fileUtils/index.js';
-import { getRoot } from '../utils/fileUtils/base.js';
+import fs from 'fs';
 import chalk from 'chalk';
 import t from '../i18n/index.js';
+import api from '../libs/api.js';
 import { ApiService } from '../libs/apiService.js';
+import { isInstalledGit } from '../libs/git/index.js';
 import logger from '../libs/logger.js';
+import { getRoot } from '../utils/fileUtils/base.js';
+import { getCliConfig, projectConfigPath } from '../utils/fileUtils/index.js';
+import { getRoutineDetails } from './common/utils.js';
 export const checkDirectory = (isCheckGit = false) => {
     const root = getRoot();
     if (fs.existsSync(projectConfigPath)) {
@@ -66,51 +68,75 @@ export const bindRoutineWithDomain = (name, domain) => __awaiter(void 0, void 0,
         logger.error(t('utils_domain_error').d('Domain is not active'));
     }
 });
-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) || [];
-});
 export function validName(name) {
     return /^[a-zA-Z0-9-_]+$/.test(name);
 }
-// 校验域名是否有效
+// Validate if domain is valid
 export function validDomain(domain) {
     return /^(?:[a-z0-9-](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/.test(domain);
 }
 export function checkIsLoginSuccess() {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        let accessKeyId = process.env.ESA_ACCESS_KEY_ID;
+        let accessKeySecret = process.env.ESA_ACCESS_KEY_SECRET;
+        let endpoint = process.env.ESA_ENDPOINT;
         const cliConfig = getCliConfig();
-        const namedCommand = chalk.green('esa login');
-        if (!cliConfig || !cliConfig.auth) {
-            return false;
+        if (!accessKeyId || !accessKeySecret) {
+            accessKeyId = (_a = cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.auth) === null || _a === void 0 ? void 0 : _a.accessKeyId;
+            accessKeySecret = (_b = cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.auth) === null || _b === void 0 ? void 0 : _b.accessKeySecret;
+        }
+        if (!endpoint) {
+            endpoint = cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.endpoint;
         }
-        if (!cliConfig.auth.accessKeyId || !cliConfig.auth.accessKeySecret) {
+        const namedCommand = chalk.green('esa login');
+        if (!accessKeyId || !accessKeySecret) {
             logger.log(`❌ ${t('utils_login_error').d('Maybe you are not logged in yet.')}`);
             logger.log(`🔔 ${t('utils_login_error_config', { namedCommand }).d(`Please run command to login: ${namedCommand}`)}`);
             return false;
         }
+        return yield validateLoginCredentials(accessKeyId, accessKeySecret, endpoint, namedCommand);
+    });
+}
+/**
+ * 验证登录凭据的公共函数
+ * @param accessKeyId AccessKey ID
+ * @param accessKeySecret AccessKey Secret
+ * @param namedCommand 命令名称（用于错误提示）
+ * @param showError 是否显示错误信息
+ * @returns 登录是否成功
+ */
+export function validateLoginCredentials(accessKeyId_1, accessKeySecret_1, endpoint_1, namedCommand_1) {
+    return __awaiter(this, arguments, void 0, function* (accessKeyId, accessKeySecret, endpoint, namedCommand, showError = true) {
         const server = yield ApiService.getInstance();
-        server.updateConfig(cliConfig);
+        server.updateConfig({
+            auth: {
+                accessKeyId,
+                accessKeySecret
+            },
+            endpoint: endpoint
+        });
         const res = yield server.checkLogin();
         if (res.success) {
             return true;
         }
-        logger.log(res.message || '');
-        logger.log(`❌ ${t('utils_login_error').d('Maybe you are not logged in yet.')}`);
-        logger.log(`🔔 ${t('utils_login_error_config', { namedCommand }).d(`Please run command to login: ${namedCommand}`)}`);
+        if (showError) {
+            logger.log(res.message || '');
+            logger.log(`❌ ${t('utils_login_error').d('Maybe you are not logged in yet.')}`);
+            if (namedCommand) {
+                logger.log(`🔔 ${t('utils_login_error_config', { namedCommand }).d(`Please run command to login: ${namedCommand}`)}`);
+            }
+        }
         return false;
     });
 }
 export function isValidRouteForDomain(route, domain) {
-    // 构建一个允许子域和任意路径的正则表达式
-    // 例如，匹配形式如 *.example.com/* 的URL
+    // Build a regex that allows subdomains and arbitrary paths
+    // For example, match URLs like *.example.com/*
     return route.includes(domain);
 }
 export function escapeRegExp(string) {
-    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& 表示整个被匹配的字符串
+    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& represents the entire matched string
 }
 export const getAllSites = () => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
@@ -138,3 +164,13 @@ export const getAllSites = () => __awaiter(void 0, void 0, void 0, function* ()
         };
     });
 });
+export const getRoutineCodeVersions = (projectName) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    const routineDetail = yield getRoutineDetails(projectName);
+    const req = { name: projectName };
+    const res = yield api.listRoutineCodeVersions(req);
+    const allVersions = (_b = (_a = res.body) === null || _a === void 0 ? void 0 : _a.codeVersions) !== null && _b !== void 0 ? _b : [];
+    const stagingVersions = ((_g = (_f = (_e = (_d = (_c = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _c === void 0 ? void 0 : _c.Envs) === null || _d === void 0 ? void 0 : _d.find((item) => item.Env === 'staging')) === null || _e === void 0 ? void 0 : _e.CodeDeploy) === null || _f === void 0 ? void 0 : _f.CodeVersions) === null || _g === void 0 ? void 0 : _g.map((item) => item.CodeVersion)) || [];
+    const productionVersions = ((_m = (_l = (_k = (_j = (_h = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _h === void 0 ? void 0 : _h.Envs) === null || _j === void 0 ? void 0 : _j.find((item) => item.Env === 'production')) === null || _k === void 0 ? void 0 : _k.CodeDeploy) === null || _l === void 0 ? void 0 : _l.CodeVersions) === null || _m === void 0 ? void 0 : _m.map((item) => item.CodeVersion)) || [];
+    return { allVersions, stagingVersions, productionVersions };
+});

package/dist/components/descriptionInput.js

@@ -7,9 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import React, { useState } from 'react';
 import { Box, render, Text } from 'ink';
 import TextInput from 'ink-text-input';
+import React, { useState } from 'react';
 export const DescriptionInput = ({ prompt, onSubmit, required }) => {
     const [input, setInput] = useState('');
     const [error, setError] = useState('');

package/dist/components/filterSelector.js

@@ -51,7 +51,7 @@ export const FilterSelector = ({ data, onSubmit, hideCount = 20 }) => {
             else if (tabPressCount === 1) {
                 const filteredDataInner = data.filter((site) => site.label.includes(inputValue));
                 setFilteredData(filteredDataInner);
-                // 匹配结果大于等于1个时，进入选择模式
+                // Enter selection mode when match results >= 1
                 if ((filteredDataInner.length >= 1 &&
                     showAll &&
                     filteredDataInner.length > hideCount) ||

package/dist/components/mutiLevelSelect.js

@@ -7,63 +7,51 @@ 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 { isCancel, select as clackSelect } from '@clack/prompts';
+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 clackSelect({
+                message,
+                options: [
+                    ...currentItems.map((item) => ({
+                        label: item.label,
+                        value: item.value,
+                        hint: item.hint
+                    })),
+                    ...(stack.length > 0 ? [{ label: 'Back', value: '__back__' }] : [])
+                ]
+            }));
+            if (isCancel(choice)) {
+                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
+            const selected = currentItems.find((i) => i.value === choice);
+            if (selected && selected.children && selected.children.length > 0) {
+                stack.push(currentItems); // Save the current level
+                currentItems = selected.children; // Move to the next level
+                message = `Select a template under ${selected.label}:`;
             }
             else {
-                // 顶层菜单，执行退出逻辑
-                handleExit();
-                exit();
+                // A leaf node (no children) is selected, end the selection
+                selectedPath = choice;
             }
-            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/components/mutiSelectTable.js

@@ -7,8 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import React, { useState } from 'react';
 import { Box, render, Text, useInput } from 'ink';
+import React, { useState } from 'react';
 import t from '../i18n/index.js';
 export const MultiSelectTable = ({ items, itemsPerRow, onSubmit, boxWidth = 25 }) => {
     const [selectedIndexes, setSelectedIndexes] = useState(new Set());

package/dist/components/routeBuilder.js

@@ -0,0 +1,68 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { Box, render, Text } from 'ink';
+import TextInput from 'ink-text-input';
+import React, { useState } from 'react';
+import t from '../i18n/index.js';
+export const RouteBuilder = ({ siteName, onSubmit, onCancel }) => {
+    const [prefix, setPrefix] = useState('');
+    const [suffix, setSuffix] = useState('');
+    const [currentInput, setCurrentInput] = useState('prefix');
+    const [error, setError] = useState('');
+    const handleSubmit = () => {
+        if (currentInput === 'prefix') {
+            setCurrentInput('suffix');
+            return;
+        }
+        // Build complete route, add dot before prefix and slash before suffix if not empty
+        const prefixWithDot = prefix ? `${prefix}.` : '';
+        const suffixWithDot = suffix ? `/${suffix}` : '';
+        const route = `${prefixWithDot}${siteName}${suffixWithDot}`;
+        onSubmit(route);
+    };
+    const handleCancel = () => {
+        onCancel();
+    };
+    const currentPrompt = currentInput === 'prefix'
+        ? t('route_builder_prefix_prompt')
+            .d(`Enter route prefix for ${siteName} (e.g., abc, def):`)
+            .replace('${siteName}', siteName)
+        : t('route_builder_suffix_prompt')
+            .d(`Enter route suffix for ${siteName} (e.g., *, users/*):`)
+            .replace('${siteName}', siteName);
+    const prefixWithDot = prefix ? `${prefix}.` : '';
+    const suffixWithDot = suffix ? `/${suffix}` : '';
+    const preview = `Preview: ${prefixWithDot}${siteName}${suffixWithDot}`;
+    return (React.createElement(Box, { flexDirection: "column" },
+        React.createElement(Box, null,
+            React.createElement(Text, null, "Building route for site: "),
+            React.createElement(Text, { color: "cyan" }, siteName)),
+        React.createElement(Box, { marginTop: 1 },
+            React.createElement(Text, null, currentPrompt)),
+        React.createElement(Box, { marginTop: 1 },
+            React.createElement(TextInput, { value: currentInput === 'prefix' ? prefix : suffix, onChange: currentInput === 'prefix' ? setPrefix : setSuffix, onSubmit: handleSubmit })),
+        preview && (React.createElement(Box, { marginTop: 1 },
+            React.createElement(Text, { color: "green" }, preview))),
+        React.createElement(Box, { marginTop: 1 },
+            React.createElement(Text, { color: "gray" }, t('route_builder_instructions').d('Press Enter to continue, Ctrl+C to cancel'))),
+        error && (React.createElement(Box, { marginTop: 1 },
+            React.createElement(Text, { color: "red" }, error)))));
+};
+export const routeBuilder = (siteName) => __awaiter(void 0, void 0, void 0, function* () {
+    return new Promise((resolve) => {
+        const { unmount } = render(React.createElement(RouteBuilder, { siteName: siteName, onSubmit: (route) => {
+                unmount();
+                resolve(route);
+            }, onCancel: () => {
+                unmount();
+                resolve(null);
+            } }));
+    });
+});

package/dist/components/selectInput.js

@@ -1,7 +1,6 @@
-import React from 'react';
-import { render } from 'ink';
+import { render, Text } from 'ink';
 import SelectInput from 'ink-select-input';
-import { Text } from 'ink';
+import React from 'react';
 import Item from './selectItem.js';
 const Indicator = ({ isSelected }) => {
     return React.createElement(Text, null, isSelected ? '👉 ' : ' ');

package/dist/components/selectItem.js

@@ -1,5 +1,5 @@
-import * as React from 'react';
 import { Text } from 'ink';
+import * as React from 'react';
 function Item({ isSelected = false, label }) {
     return React.createElement(Text, { color: isSelected ? 'green' : undefined }, label);
 }