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

package/dist/libs/logger.js

@@ -1,22 +1,23 @@
+import os from 'os';
+import path from 'path';
 import chalk from 'chalk';
-import { format, createLogger } from 'winston';
-import DailyRotateFile from 'winston-daily-rotate-file';
 import Table from 'cli-table3';
-import path from 'path';
-import os from 'os';
 import ora from 'ora';
+import { format, createLogger } from 'winston';
+import DailyRotateFile from 'winston-daily-rotate-file';
 import t from '../i18n/index.js';
 import { getProjectConfig } from '../utils/fileUtils/index.js';
 const transport = new DailyRotateFile({
     filename: path.join(os.homedir(), '.esa-logs/esa-debug-%DATE%.log'),
     level: 'info',
-    datePattern: 'YYYY-MM-DD-HH:mm:ss',
+    datePattern: 'YYYY-MM-DD-HH',
     zippedArchive: true,
     maxSize: '10m',
     maxFiles: '7d'
 });
 class Logger {
     constructor() {
+        this.spinnerText = '';
         const { combine, timestamp, label, printf } = format;
         const customFormat = printf(({ level, message, label: printLabel, timestamp: printTimestamp }) => {
             var _a;
@@ -65,6 +66,60 @@ class Logger {
     setLogLevel(level) {
         this.logger.level = level;
     }
+    /**
+     * Start a sub-step: show a spinner with the provided message.
+     * If a spinner is already running, just update its text.
+     */
+    startSubStep(message) {
+        this.spinnerText = message;
+        this.spinner.text = message;
+        if (!this.spinner.isSpinning) {
+            this.spinner.start();
+        }
+    }
+    /**
+     * End a sub-step: stop loading and replace spinner with `├` and final message.
+     * This overwrites the previous spinner line with the provided message.
+     */
+    endSubStep(message) {
+        // console.log(chalk.gray('├') + ' ' + this.spinnerText);
+        try {
+            if (this.spinner && this.spinner.isSpinning) {
+                this.spinner.stop();
+            }
+        }
+        catch (_a) { }
+        console.log(chalk.gray(`│ `));
+        console.log(chalk.gray('├  ') + this.spinnerText);
+        console.log(chalk.gray(`│  ${message}`));
+    }
+    stopSpinner() {
+        try {
+            if (this.spinner && this.spinner.isSpinning) {
+                this.spinner.stop();
+            }
+        }
+        catch (_a) { }
+    }
+    /**
+     * Prepare terminal output just before showing an interactive prompt.
+     * - Stops any active spinner
+     * - Replaces the previous line with a clean `╰ <text>` indicator
+     */
+    prepareForPrompt(text) {
+        this.stopSpinner();
+        const content = `╰ ${text || ''}`;
+        this.replacePrevLine(content);
+    }
+    /**
+     * Consolidate interactive prompt output after completion by replacing
+     * the previous N lines with a concise summary line.
+     * Defaults to 2 lines (prompt + answer line in most cases).
+     */
+    consolidateAfterPrompt(summary, linesToReplace = 2) {
+        const content = `├ ${summary}`;
+        this.replacePrevLines(linesToReplace, content);
+    }
     log(message) {
         console.log(message);
     }
@@ -72,7 +127,7 @@ class Logger {
         console.log(`\t${message}`);
     }
     success(message) {
-        console.log(`\n🎉 ${chalk.bgGreen(' SUCCESS ')} ${chalk.green(message)}`);
+        console.log(`🎉 ${chalk.bgGreen(' SUCCESS ')} ${chalk.green(message)}`);
     }
     debug(message) {
         this.logger.debug(message);
@@ -120,8 +175,47 @@ class Logger {
         console.log(message);
     }
     notInProject() {
-        const initCommand = chalk.green('esa init');
-        this.error(t('common_not_edge_project', { initCommand }).d(`You are not in an esa project, Please run ${initCommand} to initialize a project, or enter an esa project.`));
+        this.block();
+        this.error('Missing ESA project configuration (esa.jsonc or esa.toml)');
+        this.block();
+        this.log('If there is code to deploy, you can either:');
+        this.subLog(`- Specify an entry-point to your Routine via the command line (ex: ${chalk.green('esa deploy src/index.ts')})`);
+        this.subLog('- Or add the following to your "esa.jsonc" file:');
+        console.log('```jsonc\n' +
+            '{\n' +
+            '  "name": "my-routine",\n' +
+            '  "entry": "src/index.ts",\n' +
+            '  "dev": { "port": 18080 }\n' +
+            '}\n' +
+            '```');
+        this.subLog('- Or, if you prefer TOML, add to your "esa.toml":');
+        console.log('```toml\n' +
+            'name = "my-routine"\n' +
+            'entry = "src/index.ts"\n' +
+            '\n' +
+            '[dev]\n' +
+            'port = 18080\n' +
+            '```\n');
+        this.log('If you are deploying a directory of static assets, you can either:');
+        this.subLog(`- Add the assets directory to your "esa.jsonc" and run ${chalk.green('esa deploy -a ./dist')}`);
+        console.log('```jsonc\n' +
+            '{\n' +
+            '  "name": "my-routine",\n' +
+            '  "assets": {\n' +
+            '    "directory": "./dist"\n' +
+            '  }\n' +
+            '}\n' +
+            '```');
+        this.subLog(`- Or add to your "esa.toml" and run ${chalk.green('esa deploy -a ./dist')}`);
+        console.log('```toml\n' +
+            'name = "my-routine"\n' +
+            '\n' +
+            '[assets]\n' +
+            'directory = "./dist"\n' +
+            '```\n');
+        this.log('Alternatively, initialize a new ESA project:');
+        this.log(chalk.green('$ esa init my-routine'));
+        this.block();
     }
     pathEacces(localPath) {
         this.block();
@@ -146,15 +240,73 @@ class Logger {
         if (messages.length === 0)
             return;
         const lines = [];
-        lines.push(`╭─ ${messages[0]}`);
+        lines.push(`╭ ${messages[0]}`);
         for (let i = 1; i < messages.length - 1; i++) {
             lines.push(`│ ${messages[i]}`);
         }
         if (messages.length > 1) {
-            lines.push(`╰─ ${messages[messages.length - 1]}`);
+            lines.push(`╰ ${messages[messages.length - 1]}`);
         }
         console.log(lines.join('\n'));
     }
+    StepHeader(title, step, total) {
+        console.log(`\n╭ ${title} ${chalk.green(`Step ${step} of ${total}`)}`);
+        console.log('│');
+    }
+    StepItem(prompt) {
+        console.log(`├ ${prompt}`);
+    }
+    StepStart(prompt) {
+        console.log(`╭ ${prompt}`);
+    }
+    StepKV(key, value) {
+        const orange = chalk.hex('#FFA500');
+        console.log(`│ ${orange(key)} ${value}`);
+    }
+    StepSpacer() {
+        console.log('│');
+    }
+    StepEnd(str) {
+        console.log(`╰ ${str || ''}`);
+    }
+    StepEndInline() {
+        try {
+            process.stdout.write('╰ ');
+        }
+        catch (_a) {
+            console.log('╰');
+        }
+    }
+    divider() {
+        console.log(chalk.yellow('--------------------------------------------------------'));
+    }
+    // Replace the previous single terminal line with new content
+    replacePrevLine(content) {
+        try {
+            // Move cursor up 1 line, clear it, carriage return, print new content
+            process.stdout.write('\x1b[1A');
+            process.stdout.write('\x1b[2K');
+            process.stdout.write('\r');
+            console.log(content);
+        }
+        catch (_a) {
+            console.log(content);
+        }
+    }
+    // Replace multiple previous lines with one consolidated line
+    replacePrevLines(linesToReplace, content) {
+        try {
+            for (let i = 0; i < linesToReplace; i++) {
+                process.stdout.write('\x1b[1A'); // move up
+                process.stdout.write('\x1b[2K'); // clear line
+            }
+            process.stdout.write('\r');
+            console.log(content);
+        }
+        catch (_a) {
+            console.log(content);
+        }
+    }
 }
 const logger = Logger.getInstance();
 export default logger;

package/dist/libs/service.js

@@ -7,10 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import ora from 'ora';
-import chain from 'lodash';
 import FormData from 'form-data';
+import chain from 'lodash';
 import fetch from 'node-fetch';
+import ora from 'ora';
 import t from '../i18n/index.js';
 import api from './api.js';
 import { Environment } from './interface.js';

package/dist/libs/templates/index.js

@@ -1,5 +1,6 @@
-import { getSummary } from '../../commands/common/constant.js';
 import chalk from 'chalk';
+import { getSummary } from '../../commands/common/constant.js';
+import logger from '../logger.js';
 export default class Template {
     constructor(path, title) {
         this.path = path;
@@ -10,7 +11,7 @@ export default class Template {
         list.forEach((summary) => {
             const title = chalk.bold(summary.title);
             const command = chalk.green(summary.command);
-            console.log(`${title}: ${command}`);
+            logger.log(`${title}: ${command}`);
         });
     }
 }

package/dist/utils/checkAssetsExist.js

@@ -0,0 +1,80 @@
+import fs from 'fs';
+import path from 'path';
+import { getProjectConfig } from './fileUtils/index.js';
+/**
+ * Check if the assets directory exists in the project config
+ * @returns {boolean} true if the assets directory exists, false otherwise
+ */
+const checkConfigAssetsExist = () => {
+    var _a;
+    const projectConfig = getProjectConfig();
+    if (!projectConfig) {
+        return false;
+    }
+    const directory = (_a = projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory;
+    if (!directory) {
+        return false;
+    }
+    return true;
+};
+export var EDGE_ROUTINE_TYPE;
+(function (EDGE_ROUTINE_TYPE) {
+    EDGE_ROUTINE_TYPE["ASSETS_ONLY"] = "assets_only";
+    EDGE_ROUTINE_TYPE["JS_ONLY"] = "js_only";
+    EDGE_ROUTINE_TYPE["JS_AND_ASSETS"] = "js_and_assets";
+    EDGE_ROUTINE_TYPE["NOT_EXIST"] = "not_exist";
+})(EDGE_ROUTINE_TYPE || (EDGE_ROUTINE_TYPE = {}));
+/**
+ * Check if a path exists and is valid
+ * @param filePath - The path to check
+ * @param isDirectory - Whether the path should be a directory
+ * @returns boolean
+ */
+const isValidPath = (filePath, isDirectory = false) => {
+    if (!filePath || typeof filePath !== 'string' || filePath.trim() === '') {
+        return false;
+    }
+    try {
+        const resolvedPath = path.isAbsolute(filePath)
+            ? filePath
+            : path.resolve(filePath);
+        const exists = fs.existsSync(resolvedPath);
+        if (!exists) {
+            return false;
+        }
+        if (isDirectory) {
+            return fs.statSync(resolvedPath).isDirectory();
+        }
+        else {
+            return fs.statSync(resolvedPath).isFile();
+        }
+    }
+    catch (error) {
+        return false;
+    }
+};
+export const checkEdgeRoutineType = (scriptEntry, assetsDirectory, projectPath) => {
+    var _a;
+    const projectConfig = getProjectConfig(projectPath);
+    const entry = scriptEntry || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry);
+    const assets = assetsDirectory || ((_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory);
+    const entryPath = path.resolve(projectPath !== null && projectPath !== void 0 ? projectPath : '', entry !== null && entry !== void 0 ? entry : '');
+    const assetsPath = path.resolve(projectPath !== null && projectPath !== void 0 ? projectPath : '', assets !== null && assets !== void 0 ? assets : '');
+    const hasAssets = isValidPath(assetsPath, true) && assets;
+    const hasEntry = isValidPath(entryPath, false) && entry;
+    // Both assets and entry exist
+    if (hasAssets && hasEntry) {
+        return EDGE_ROUTINE_TYPE.JS_AND_ASSETS;
+    }
+    // Only assets exist
+    if (hasAssets && !hasEntry) {
+        return EDGE_ROUTINE_TYPE.ASSETS_ONLY;
+    }
+    // Only entry exists
+    if (!hasAssets && hasEntry) {
+        return EDGE_ROUTINE_TYPE.JS_ONLY;
+    }
+    // Neither exists
+    return EDGE_ROUTINE_TYPE.NOT_EXIST;
+};
+export default checkConfigAssetsExist;

package/dist/utils/checkDevPort.js

@@ -7,12 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import portscanner from 'portscanner';
-import SelectItems from '../components/selectInput.js';
+import chalk from 'chalk';
 import inquirer from 'inquirer';
-import logger from '../libs/logger.js';
+import portscanner from 'portscanner';
 import t from '../i18n/index.js';
-import chalk from 'chalk';
+import logger from '../libs/logger.js';
 export const checkPort = (port) => {
     return new Promise((resolve) => {
         portscanner.checkPortStatus(port, '127.0.0.1', (error, status) => {
@@ -28,19 +27,6 @@ export const checkPort = (port) => {
         });
     });
 };
-const ask = () => {
-    return new Promise((resolve) => {
-        SelectItems({
-            items: [
-                { label: 'Yes', value: 'yes' },
-                { label: 'No', value: 'no' }
-            ],
-            handleSelect: (item) => __awaiter(void 0, void 0, void 0, function* () {
-                resolve(item.value === 'yes');
-            })
-        });
-    });
-};
 const findAvailablePort = (startPort) => __awaiter(void 0, void 0, void 0, function* () {
     return yield portscanner.findAPortNotInUse(startPort, 65535);
 });

package/dist/utils/checkEntryFileExist.js

@@ -0,0 +1,10 @@
+import fs from 'fs';
+import { getProjectConfig } from './fileUtils/index.js';
+export const checkEntryFileExist = () => {
+    const projectConfig = getProjectConfig();
+    const entry = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry;
+    if (!entry) {
+        return true;
+    }
+    return fs.existsSync(entry);
+};

package/dist/utils/checkIsRoutineCreated.js

@@ -7,16 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import path from 'path';
-import { createEdgeRoutine } from '../commands/commit/index.js';
-import { displaySelectSpec } from '../commands/deploy/index.js';
-import { ApiService } from '../libs/apiService.js';
-import { readEdgeRoutineFile } from './fileUtils/index.js';
-import logger from '../libs/logger.js';
-import t from '../i18n/index.js';
-import prodBuild from '../commands/commit/prodBuild.js';
 import { exit } from 'process';
+import { log } from '@clack/prompts';
 import chalk from 'chalk';
+import t from '../i18n/index.js';
+import { ApiService } from '../libs/apiService.js';
+import logger from '../libs/logger.js';
 export function isRoutineExist(name) {
     return __awaiter(this, void 0, void 0, function* () {
         const server = yield ApiService.getInstance();
@@ -34,28 +30,33 @@ export function validRoutine(name) {
         }
     });
 }
-export function checkRoutineExist(name, entry) {
+/**
+ * Ensure routine exists, if not, create a new routine
+ * @param name - Routine name
+ */
+export function ensureRoutineExists(name) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const isCreatedRoutine = yield isRoutineExist(name);
-        if (!isCreatedRoutine) {
-            logger.log(t('first_deploy').d('This is the first time to deploy, we will create a new routine for you.'));
-            const entryFile = path.resolve(entry !== null && entry !== void 0 ? entry : '', 'src/index.js');
-            yield prodBuild(false, entryFile, entry);
-            const code = readEdgeRoutineFile(entry) || '';
+        const isExist = yield isRoutineExist(name);
+        // If routine does not exist, create a new routine
+        if (!isExist) {
+            logger.startSubStep(`Creating routine ${chalk.gray(name)}`);
             const server = yield ApiService.getInstance();
-            const specList = ((_b = (_a = (yield server.ListRoutineOptionalSpecs())) === null || _a === void 0 ? void 0 : _a.data.Specs) !== null && _b !== void 0 ? _b : []).reduce((acc, item) => {
-                if (item.IsAvailable) {
-                    acc.push(item.SpecName);
-                }
-                return acc;
-            }, []);
-            const spec = yield displaySelectSpec(specList);
-            yield createEdgeRoutine({
+            const createRes = yield server.createRoutine({
                 name: name,
-                specName: spec,
-                code: code
+                description: '',
+                hasAssets: true
             });
+            const isSuccess = (createRes === null || createRes === void 0 ? void 0 : createRes.data.Status) === 'OK';
+            if (isSuccess) {
+                logger.endSubStep('Routine created successfully');
+            }
+            else {
+                logger.endSubStep('Routine created failed');
+                exit();
+            }
+        }
+        else {
+            log.step('Routine has already exists');
         }
     });
 }

package/dist/utils/checkVersion.js

@@ -8,8 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { promises as fs } from 'fs';
-import { getDirName } from '../utils/fileUtils/base.js';
 import path from 'path';
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import fetch from 'node-fetch';
+import t from '../i18n/index.js';
+import logger from '../libs/logger.js';
+import execCommand from '../utils/command.js';
+import { getDirName } from '../utils/fileUtils/base.js';
 export function handleCheckVersion() {
     return __awaiter(this, void 0, void 0, function* () {
         const __dirname = getDirName(import.meta.url);
@@ -24,3 +30,115 @@ export function handleCheckVersion() {
         }
     });
 }
+/**
+ * 检查CLI是否为最新版本，如果不是则提示用户更新
+ * @returns 是否为最新版本
+ */
+export function checkCLIVersion(currentCommand) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const __dirname = getDirName(import.meta.url);
+            const packageJsonPath = path.join(__dirname, '..', '..', 'package.json');
+            const jsonString = yield fs.readFile(packageJsonPath, 'utf-8');
+            const packageJson = JSON.parse(jsonString);
+            const currentVersion = packageJson.version;
+            const response = yield fetch('https://registry.npmjs.org/esa-cli/latest');
+            if (!response.ok) {
+                return true;
+            }
+            const data = (yield response.json());
+            const latestVersion = data.version;
+            if (currentVersion !== latestVersion) {
+                const accent = chalk.hex('#7C3AED').bold;
+                const labelColor = chalk.hex('#22c55e');
+                const currentLabelRaw = t('version_current').d('Current');
+                const latestLabelRaw = t('version_latest').d('Latest');
+                const noteLabelRaw = t('version_note').d('Note');
+                const updateLabelRaw = t('version_update').d('Update');
+                const labelsRaw = [
+                    currentLabelRaw,
+                    latestLabelRaw,
+                    noteLabelRaw,
+                    updateLabelRaw
+                ];
+                const labelWidth = Math.max(...labelsRaw.map((l) => l.length));
+                const gap = '  ';
+                const padLabel = (raw, colored) => `${colored}${' '.repeat(labelWidth - raw.length)}`;
+                const lines = [
+                    `${accent('🚀  ' + t('version_title_update_available').d('ESA CLI Update Available'))}`,
+                    '',
+                    `${padLabel(currentLabelRaw, labelColor(currentLabelRaw))}${gap}${chalk.yellowBright('v' + currentVersion)}`,
+                    `${padLabel(latestLabelRaw, labelColor(latestLabelRaw))}${gap}${chalk.greenBright('v' + latestVersion)}`,
+                    '',
+                    `${padLabel(noteLabelRaw, chalk.yellowBright.bold(noteLabelRaw))}${gap}${chalk.yellowBright(t('version_note_incompatible').d('This version may have incompatibilities, please upgrade soon.'))}`,
+                    '',
+                    `${padLabel(updateLabelRaw, labelColor(updateLabelRaw))}${gap}${chalk.cyanBright('npm i -g esa-cli@latest')}`,
+                    `${' '.repeat(labelWidth)}${gap}${chalk.cyanBright('yarn global add esa-cli@latest')}`,
+                    `${' '.repeat(labelWidth)}${gap}${chalk.cyanBright('pnpm add -g esa-cli@latest')}`,
+                    '',
+                    `${chalk.gray(t('version_continue').d('You can continue using the current version; commands will proceed.'))}`
+                ];
+                // Render with deploy-success-style box (cyan double border)
+                const stripAnsi = (s) => s.replace(/\x1B\[[0-?]*[ -\/]*[@-~]/g, '');
+                const contentWidth = Math.max(...lines.map((l) => stripAnsi(l).length));
+                const borderColor = chalk.hex('#00D4FF').bold;
+                const top = `${borderColor('╔')}${borderColor('═'.repeat(contentWidth + 2))}${borderColor('╗')}`;
+                const bottom = `${borderColor('╚')}${borderColor('═'.repeat(contentWidth + 2))}${borderColor('╝')}`;
+                const box = [
+                    top,
+                    ...lines.map((l) => {
+                        const pad = ' '.repeat(contentWidth - stripAnsi(l).length);
+                        const left = borderColor('║');
+                        const right = borderColor('║');
+                        return `${left} ${l}${pad} ${right}`;
+                    }),
+                    bottom
+                ];
+                logger.block();
+                box.forEach((l) => logger.log(l));
+                logger.block();
+                // Only prompt interactively on init command; others just display notice
+                if (currentCommand === 'init') {
+                    const { updateNow } = yield inquirer.prompt([
+                        {
+                            type: 'confirm',
+                            name: 'updateNow',
+                            message: chalk.bold(t('version_prompt_update_now').d('Update now to the latest version?')),
+                            default: true
+                        }
+                    ]);
+                    if (updateNow) {
+                        const startText = 'Updating ESA CLI to latest (npm i -g esa-cli@latest)';
+                        const doneText = 'ESA CLI update finished';
+                        try {
+                            const res = yield execCommand(['npm', 'i', '-g', 'esa-cli@latest'], {
+                                startText,
+                                doneText,
+                                useSpinner: true,
+                                interactive: false
+                            });
+                            if (!res.success) {
+                                logger.warn(t('version_update_failed').d('Global update failed. You may need elevated permissions (sudo) or use yarn/pnpm:'));
+                                logger.subLog('sudo npm i -g esa-cli@latest');
+                                logger.subLog('yarn global add esa-cli@latest');
+                                logger.subLog('pnpm add -g esa-cli@latest');
+                            }
+                        }
+                        catch (e) {
+                            logger.warn(t('version_update_failed').d('Global update failed. You may need elevated permissions (sudo) or use yarn/pnpm:'));
+                            logger.subLog('sudo npm i -g esa-cli@latest');
+                            logger.subLog('yarn global add esa-cli@latest');
+                            logger.subLog('pnpm add -g esa-cli@latest');
+                        }
+                        logger.divider();
+                    }
+                }
+                return false;
+            }
+            return true;
+        }
+        catch (error) {
+            return true;
+        }
+    });
+}