esa-cli 0.0.1-beta.9 → 0.0.2-beta.0

package/dist/commands/dev/{server.js → mockWorker/server.js}

@@ -8,48 +8,53 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import spawn from 'cross-spawn';
-import logger from '../../libs/logger.js';
+import logger from '../../../libs/logger.js';
 import path from 'path';
-import t from '../../i18n/index.js';
-import { getDevConf } from '../../utils/fileUtils/index.js';
-import { getRoot } from '../../utils/fileUtils/base.js';
-class WorkerServer {
+import t from '../../../i18n/index.js';
+import { getDevConf } from '../../../utils/fileUtils/index.js';
+import { getRoot } from '../../../utils/fileUtils/base.js';
+class MockWorkerServer {
     constructor(props) {
         this.instance = null;
         this.restarting = false;
         this.command = props.command || 'deno';
-        this.start();
     }
     start() {
-        var _a, _b, _c;
         if (this.instance) {
             return;
         }
-        const root = getRoot();
-        const inspectPort = getDevConf('inspectPort', 'dev', 9229);
-        // @ts-ignore
-        const id = global.id || '';
-        let inspectOption = '--inspect';
-        if (inspectPort !== 9229) {
-            inspectOption = `--inspect=127.0.0.1:${inspectPort}`;
-        }
-        this.instance = spawn(this.command, [
-            'run',
-            '--no-lock',
-            '--allow-net',
-            '--allow-read',
-            '--allow-write',
-            inspectOption,
-            path.join(root, `.dev/index-${id}.js`),
-            id
-        ], {
-            stdio: ['pipe', 'pipe', 'pipe']
+        return new Promise((resolve) => {
+            var _a, _b, _c;
+            const root = getRoot();
+            const inspectPort = getDevConf('inspectPort', 'dev', 9229);
+            // @ts-ignore
+            const id = global.id || '';
+            let inspectOption = '--inspect';
+            if (inspectPort !== 9229) {
+                inspectOption = `--inspect=127.0.0.1:${inspectPort}`;
+            }
+            this.instance = spawn(this.command, [
+                'run',
+                '--no-lock',
+                '--allow-net',
+                '--allow-read',
+                '--allow-write',
+                '--allow-env',
+                inspectOption,
+                path.join(root, `.dev/index-${id}.js`),
+                id
+            ], {
+                stdio: ['pipe', 'pipe', 'pipe']
+            });
+            (_a = this.instance.stdout) === null || _a === void 0 ? void 0 : _a.setEncoding('utf8');
+            (_b = this.instance.stdout) === null || _b === void 0 ? void 0 : _b.on('data', this.stdoutHandler.bind(this));
+            (_c = this.instance.stderr) === null || _c === void 0 ? void 0 : _c.on('data', this.stderrHandler.bind(this));
+            this.instance.on('close', this.closeHandler.bind(this));
+            this.instance.on('error', this.errorHandler.bind(this));
+            setTimeout(() => {
+                resolve(true);
+            }, 500);
         });
-        (_a = this.instance.stdout) === null || _a === void 0 ? void 0 : _a.setEncoding('utf8');
-        (_b = this.instance.stdout) === null || _b === void 0 ? void 0 : _b.on('data', this.stdoutHandler.bind(this));
-        (_c = this.instance.stderr) === null || _c === void 0 ? void 0 : _c.on('data', this.stderrHandler.bind(this));
-        this.instance.on('close', this.closeHandler.bind(this));
-        this.instance.on('error', this.errorHandler.bind(this));
     }
     stdoutHandler(chunk) {
         logger.log(chunk.toString().trim());
@@ -58,7 +63,6 @@ class WorkerServer {
         logger.subError(chunk.toString().trim());
     }
     errorHandler(err) {
-        console.log(err);
         logger.error(err.message ? err.message : err);
         this.instance && this.instance.kill();
     }
@@ -67,7 +71,8 @@ class WorkerServer {
             this.restarting = false;
             return;
         }
-        logger.info(t('dev_server_closed').d('Worker server closed'));
+        logger.log(t('dev_server_closed').d('Worker server closed'));
+        logger.info('Worker server closed');
         // @ts-ignore
         global.port = undefined;
     }
@@ -78,12 +83,12 @@ class WorkerServer {
     stop() {
         return new Promise((resolve) => {
             if (!this.instance) {
-                resolve(0);
+                resolve(false);
                 return;
             }
             const onExit = (code, signal) => {
                 this.instance = null;
-                resolve(1);
+                resolve(true);
             };
             this.instance.on('exit', onExit);
             this.instance.kill('SIGTERM');
@@ -94,8 +99,9 @@ class WorkerServer {
             this.restarting = true;
             yield this.stop();
             this.start();
-            logger.info(t('dev_server_restart').d('Worker server restarted'));
+            logger.log(t('dev_server_restart').d('Worker server restarted'));
+            logger.info('Worker server restarted');
         });
     }
 }
-export default WorkerServer;
+export default MockWorkerServer;

package/dist/commands/init/index.js

@@ -12,7 +12,7 @@ import path from 'path';
 import Template from '../../libs/templates/index.js';
 import { installGit } from '../../libs/git/index.js';
 import { descriptionInput } from '../../components/descriptionInput.js';
-import { generateConfigFile, getProjectConfig, getTemplatesConfig, templateHubPath, updateProjectConfigFile } from '../../utils/fileUtils/index.js';
+import { generateConfigFile, getCliConfig, getProjectConfig, getTemplatesConfig, templateHubPath, updateProjectConfigFile } from '../../utils/fileUtils/index.js';
 import t from '../../i18n/index.js';
 import logger from '../../libs/logger.js';
 import SelectItems from '../../components/selectInput.js';
@@ -22,6 +22,26 @@ import { ApiService } from '../../libs/apiService.js';
 import { exit } from 'process';
 import { checkRoutineExist } from '../../utils/checkIsRoutineCreated.js';
 import { execSync } from 'child_process';
+import MultiLevelSelect from '../../components/mutiLevelSelect.js';
+import { getDirName } from '../../utils/fileUtils/base.js';
+import { yesNoPromptAndExecute } from '../deploy/helper.js';
+import { checkIsLoginSuccess } from '../utils.js';
+export const getTemplateInstances = (templateHubPath) => {
+    return fs
+        .readdirSync(templateHubPath)
+        .filter((item) => {
+        const itemPath = path.join(templateHubPath, item);
+        return (fs.statSync(itemPath).isDirectory() &&
+            !['.git', 'node_modules', 'lib'].includes(item));
+    })
+        .map((item) => {
+        var _a;
+        const projectPath = path.join(templateHubPath, item);
+        const projectConfig = getProjectConfig(projectPath);
+        const templateName = (_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.name) !== null && _a !== void 0 ? _a : '';
+        return new Template(projectPath, templateName);
+    });
+};
 const secondSetOfItems = [
     { label: 'Yes', value: 'yesInstall' },
     { label: 'No', value: 'noInstall' }
@@ -41,13 +61,85 @@ const init = {
     })
 };
 export default init;
+export const preInstallDependencies = (targetPath) => __awaiter(void 0, void 0, void 0, function* () {
+    const packageJsonPath = path.join(targetPath, 'package.json');
+    if (fs.existsSync(packageJsonPath)) {
+        logger.log(t('init_install_dependence').d('⌛️ Installing dependencies...'));
+        execSync('npm install esa-template', {
+            stdio: 'inherit',
+            cwd: targetPath
+        });
+        logger.success(t('init_install_dependencies_success').d('Dependencies installed successfully.'));
+        logger.log(t('init_build_project').d('⌛️ Building project...'));
+        execSync('npm run build', { stdio: 'inherit', cwd: targetPath });
+        logger.success(t('init_build_project_success').d('Project built successfully.'));
+    }
+});
+export const transferTemplatesToSelectItem = (configs, templateInstanceList, lang) => {
+    if (!configs)
+        return [];
+    return configs.map((config) => {
+        var _a, _b;
+        const name = config.Title_EN;
+        const value = (_b = (_a = templateInstanceList.find((template) => {
+            return name === template.title;
+        })) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : '';
+        const children = transferTemplatesToSelectItem(config.children, templateInstanceList);
+        return {
+            label: lang === 'en' ? config.Title_EN : config.Title_ZH,
+            value: value,
+            key: name,
+            children
+        };
+    });
+};
+function checkAndUpdatePackage(packageName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            // 获取当前安装的版本
+            const __dirname = getDirName(import.meta.url);
+            const packageJsonPath = path.join(__dirname, '../../../');
+            const versionInfo = execSync(`npm list ${packageName}`, {
+                cwd: packageJsonPath
+            }).toString();
+            const match = versionInfo.match(new RegExp(`(${packageName})@([0-9.]+)`));
+            const currentVersion = match ? match[2] : '';
+            // 获取最新版本
+            const latestVersion = execSync(`npm view ${packageName} version`)
+                .toString()
+                .trim();
+            if (currentVersion !== latestVersion) {
+                logger.log(t('display_current_esa_template_version').d(`Current esa-template version:`) +
+                    chalk.green(currentVersion) +
+                    '    ' +
+                    t('display_latest_esa_template_version').d(`Latest esa-template version:`) +
+                    chalk.green(latestVersion));
+                yield yesNoPromptAndExecute(t('is_update_to_latest_version').d('Do you want to update templates to latest version?'), () => __awaiter(this, void 0, void 0, function* () {
+                    logger.log(t('updating_esa_template_to_latest_version', { packageName }).d(`Updating ${packageName} to the latest version...`));
+                    execSync(`rm -rf node_modules/${packageName} &&rm -rf package-lock.json &&npm install ${packageName}@latest`, {
+                        cwd: packageJsonPath
+                    });
+                    logger.log(t('updated_esa_template_to_latest_version', { packageName }).d(`${packageName} updated successfully`));
+                    return true;
+                }));
+            }
+            else {
+                logger.log(t('esa_template_is_latest_version', { packageName }).d(`${packageName} is latest.`));
+            }
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                logger.error('检测和更新包时发生错误，跳过更新模版');
+            }
+        }
+    });
+}
 export function handleInit(argv) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const { config } = argv;
-        // // 更新npm包
-        // const __dirname = getDirName(import.meta.url);
-        // const projectPath = path.join(__dirname, '../../..');
-        // execSync('npm install', { stdio: 'ignore', cwd: projectPath });
+        // 更新template npm包
+        yield checkAndUpdatePackage('esa-template');
         if (config !== undefined) {
             yield generateConfigFile(String(config));
             return;
@@ -58,43 +150,19 @@ export function handleInit(argv) {
             logger.error(t('init_name_error').d('Error: The project name must be at least 2 characters long and can only contain lowercase letters, numbers, and hyphens.'));
             return;
         }
-        const templatePaths = fs.readdirSync(templateHubPath).filter((item) => {
-            const itemPath = path.join(templateHubPath, item);
-            const stats = fs.statSync(itemPath);
-            return (stats.isDirectory() &&
-                item !== '.git' &&
-                item !== 'node_modules' &&
-                item !== 'lib');
-        });
-        const templateList = templatePaths.map((item) => {
-            var _a;
-            const projectPath = templateHubPath + '/' + item;
-            const projectConfig = getProjectConfig(projectPath);
-            const templateName = (_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.name) !== null && _a !== void 0 ? _a : '';
-            return new Template(projectPath, templateName);
-        });
+        const templateInstanceList = getTemplateInstances(templateHubPath);
         const templateConfig = getTemplatesConfig();
-        const firstSetOfItems = templateConfig
-            .map((template) => {
-            const name = template.Title_EN;
-            const templatePath = templateList.find((item) => {
-                return name === item.title;
-            });
-            return templatePath
-                ? {
-                    label: name,
-                    value: templatePath.path
-                }
-                : null;
-        })
-            .filter((item) => item !== null);
+        const cliConfig = getCliConfig();
+        const lang = (_a = cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.lang) !== null && _a !== void 0 ? _a : 'en';
+        const firstSetOfItems = transferTemplatesToSelectItem(templateConfig, templateInstanceList, lang);
         let selectTemplate;
         let targetPath;
         let projectConfig;
         const preInstallDependencies = () => __awaiter(this, void 0, void 0, function* () {
             const packageJsonPath = path.join(targetPath, 'package.json');
             if (fs.existsSync(packageJsonPath)) {
-                logger.info(t('init_install_dependence').d('⌛️ Installing dependencies...'));
+                logger.log('Install dependencies');
+                logger.log(t('init_install_dependence').d('⌛️ Installing dependencies...'));
                 execSync('npm install', { stdio: 'inherit', cwd: targetPath });
                 logger.success(t('init_install_dependencies_success').d('Dependencies installed successfully.'));
                 logger.log(t('init_build_project').d('⌛️ Building project...'));
@@ -103,13 +171,15 @@ export function handleInit(argv) {
             }
         });
         const handleFirstSelection = (item) => __awaiter(this, void 0, void 0, function* () {
+            if (item.key === 'exit') {
+                process.exit(0);
+            }
             const configPath = item.value;
             selectTemplate = new Template(configPath, name);
             projectConfig = getProjectConfig(configPath);
             if (!projectConfig)
                 return logger.notInProject();
             const newPath = process.cwd() + '/' + name;
-            console.log(newPath);
             targetPath = newPath;
             if (fs.existsSync(newPath)) {
                 logger.error(t('already_exist_file_error').d('Error: The project already exists. It looks like a folder named "<project-name>" is already present in the current directory. Please try the following options: 1. Choose a different project name. 2. Delete the existing folder if it\'s not needed: `rm -rf <project-name>` (use with caution!). 3. Move to a different directory before running the init command.'));
@@ -119,25 +189,30 @@ export function handleInit(argv) {
             projectConfig.name = name;
             updateProjectConfigFile(projectConfig, newPath);
             preInstallDependencies();
-            logger.info(t('init_git').d('Do you want to init git in your project?'));
+            logger.log(t('init_git').d('Do you want to init git in your project?'));
             SelectItems({
                 items: secondSetOfItems,
                 handleSelect: handleSecondSelection
             });
         });
-        const handleSecondSelection = (item) => {
+        const handleSecondSelection = (item) => __awaiter(this, void 0, void 0, function* () {
             if (item.value === 'yesInstall') {
                 installGit(targetPath);
             }
             else {
-                logger.info(t('init_skip_git').d('Git installation was skipped.'));
+                logger.log(t('init_skip_git').d('Git installation was skipped.'));
+            }
+            const isLoginSuccess = yield checkIsLoginSuccess();
+            if (!isLoginSuccess) {
+                logger.log(chalk.yellow(t('not_login_auto_deploy').d('You are not logged in, automatic deployment cannot be performed. Please log in later and manually deploy.')));
+                process.exit(0);
             }
-            logger.info(t('auto_deploy').d('Do you want to deploy your project?'));
+            logger.log(t('auto_deploy').d('Do you want to deploy your project?'));
             SelectItems({
                 items: secondSetOfItems,
                 handleSelect: handleThirdSelection
             });
-        };
+        });
         const handleThirdSelection = (item) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
             // 选择自动生成版本并发布
@@ -155,7 +230,7 @@ export function handleInit(argv) {
             exit(0);
         });
         try {
-            SelectItems({
+            MultiLevelSelect({
                 items: firstSetOfItems,
                 handleSelect: handleFirstSelection
             });

package/dist/commands/login/index.js

@@ -54,12 +54,12 @@ export function handleLogin() {
             }
             else {
                 logger.error(t('pre_login_failed').d('The previously entered Access Key ID (AK) and Secret Access Key (SK) are incorrect. Please enter them again.'));
-                logger.info(`${t('login_logging').d('Logging in')}...`);
+                logger.log(`${t('login_logging').d('Logging in')}...`);
                 yield getUserInputAuthInfo();
             }
         }
         else {
-            logger.info(`${t('login_logging').d('Logging in')}...`);
+            logger.log(`${t('login_logging').d('Logging in')}...`);
             yield getUserInputAuthInfo();
         }
     });

package/dist/commands/logout.js

@@ -8,7 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { getCliConfig, updateCliConfigFile } from '../utils/fileUtils/index.js';
-import { checkIsLoginSuccess } from './utils.js';
 import logger from '../libs/logger.js';
 import t from '../i18n/index.js';
 const logout = {
@@ -28,9 +27,6 @@ export function handleLogout(argv) {
         if (!cliConfig) {
             return;
         }
-        const isSuccess = yield checkIsLoginSuccess();
-        if (!isSuccess)
-            return;
         if (!cliConfig.auth) {
             cliConfig.auth = { accessKeyId: '', accessKeySecret: '' };
         }

package/dist/commands/route/list.js

@@ -52,7 +52,8 @@ export function handleListRoutes() {
 export function displayRelatedRouteList(routeList) {
     return __awaiter(this, void 0, void 0, function* () {
         const table = new Table({
-            head: ['Route', 'Site']
+            head: ['Route', 'Site'],
+            colWidths: [30, 30]
         });
         for (let i = 0; i < routeList.length; i++) {
             const route = routeList[i];

package/dist/commands/routine/list.js

@@ -25,6 +25,7 @@ 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')}`,
@@ -61,7 +62,7 @@ export function handleList(argv) {
         const res = yield server.getRoutineUserInfo();
         const routineList = res === null || res === void 0 ? void 0 : res.Routines;
         if (routineList) {
-            console.log(chalk.bold.bgGray(`📃 ${t('list_routine_name_title').d('List all of routine')}:`));
+            logger.log(chalk.bold.bgGray(`📃 ${t('list_routine_name_title').d('List all of routine')}:`));
             displayRoutineList(routineList);
         }
     });
@@ -69,15 +70,16 @@ export function handleList(argv) {
 export function displayRoutineList(versionList) {
     return __awaiter(this, void 0, void 0, function* () {
         const table = new Table({
-            head: ['Name', 'Created', 'Description']
+            head: ['Name', 'Created', 'Description'],
+            colWidths: [20, 25, 30]
         });
         versionList.forEach((version) => {
             table.push([
                 version.RoutineName,
-                new Date(version.CreateTime).toLocaleString(),
+                moment(version.CreateTime).format('YYYY/MM/DD HH:mm:ss'),
                 Base64.decode(version.Description)
             ]);
         });
-        console.log(table.toString());
+        console.table(table.toString());
     });
 }

package/dist/components/mutiLevelSelect.js

@@ -0,0 +1,69 @@
+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 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));
+            }
+            else {
+                // 顶层菜单，执行退出逻辑
+                handleExit();
+                exit();
+            }
+            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);
+            } }));
+    });
+});
+export default MultiLevelSelectComponent;