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

package/dist/commands/commit/index.js

@@ -69,6 +69,11 @@ export function handleCommit(argv) {
         }
         logger.startSubStep('Generating code version');
         const res = yield generateCodeVersion(projectName, description, argv === null || argv === void 0 ? void 0 : argv.entry, argv === null || argv === void 0 ? void 0 : argv.assets, argv === null || argv === void 0 ? void 0 : argv.minify);
+        const { isSuccess } = res || {};
+        if (!isSuccess) {
+            logger.endSubStep('Generate version failed');
+            exit(1);
+        }
         const codeVersion = (_b = (_a = res === null || res === void 0 ? void 0 : res.res) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.CodeVersion;
         if (!codeVersion) {
             logger.endSubStep('Missing CodeVersion in response');

package/dist/commands/common/utils.js

@@ -120,100 +120,97 @@ export function generateCodeVersion(projectName_1, description_1, entry_1, asset
     return __awaiter(this, arguments, void 0, function* (projectName, description, entry, assets, minify = false, projectPath) {
         var _a;
         const { zip, sourceList, dynamicSources } = yield compress(entry, assets, minify, projectPath);
-        try {
-            // Pretty print upload directory tree
-            const buildTree = (paths, decorateTopLevel) => {
-                const root = { children: new Map(), isFile: false };
-                const sorted = [...paths].sort((a, b) => a.localeCompare(b));
-                for (const p of sorted) {
-                    const parts = p.split('/').filter(Boolean);
-                    let node = root;
-                    for (let i = 0; i < parts.length; i++) {
-                        const part = parts[i];
-                        if (!node.children.has(part)) {
-                            node.children.set(part, { children: new Map(), isFile: false });
-                        }
-                        const child = node.children.get(part);
-                        if (i === parts.length - 1)
-                            child.isFile = true;
-                        node = child;
+        // Pretty print upload directory tree
+        const buildTree = (paths, decorateTopLevel) => {
+            const root = { children: new Map(), isFile: false };
+            const sorted = [...paths].sort((a, b) => a.localeCompare(b));
+            for (const p of sorted) {
+                const parts = p.split('/').filter(Boolean);
+                let node = root;
+                for (let i = 0; i < parts.length; i++) {
+                    const part = parts[i];
+                    if (!node.children.has(part)) {
+                        node.children.set(part, { children: new Map(), isFile: false });
                     }
+                    const child = node.children.get(part);
+                    if (i === parts.length - 1)
+                        child.isFile = true;
+                    node = child;
                 }
-                const lines = [];
-                const render = (node, prefix, depth) => {
-                    const entries = [...node.children.entries()];
-                    entries.forEach(([_name, _child], idx) => {
-                        const isLast = idx === entries.length - 1;
-                        const connector = isLast ? '└ ' : '├ ';
-                        const nextPrefix = prefix + (isLast ? '   ' : '│  ');
-                        const displayName = depth === 0 ? decorateTopLevel(_name) : _name;
-                        lines.push(prefix + connector + displayName);
-                        render(_child, nextPrefix, depth + 1);
-                    });
-                };
-                render(root, '', 0);
-                return lines.length ? lines : ['-'];
-            };
-            const header = chalk.hex('#22c55e')('UPLOAD') + ' Files to be uploaded (source paths)';
-            logger.block();
-            logger.log(header);
-            const dynamicSet = new Set(dynamicSources);
-            const LIMIT = 300;
-            const staticPaths = sourceList
-                .filter((p) => !dynamicSet.has(p))
-                .sort((a, b) => a.localeCompare(b));
-            const dynamicPaths = sourceList
-                .filter((p) => dynamicSet.has(p))
-                .sort((a, b) => a.localeCompare(b));
-            let omitted = 0;
-            let shownStatic = staticPaths;
-            if (staticPaths.length > LIMIT) {
-                shownStatic = staticPaths.slice(0, LIMIT);
-                omitted = staticPaths.length - LIMIT;
             }
-            // Compute top-level markers based on whether a top-level bucket contains dynamic/static files
-            const topLevelStats = new Map();
-            const addStat = (p, isDynamic) => {
-                const top = p.split('/')[0] || p;
-                const stat = topLevelStats.get(top) || {
-                    hasDynamic: false,
-                    hasStatic: false
-                };
-                if (isDynamic)
-                    stat.hasDynamic = true;
-                else
-                    stat.hasStatic = true;
-                topLevelStats.set(top, stat);
+            const lines = [];
+            const render = (node, prefix, depth) => {
+                const entries = [...node.children.entries()];
+                entries.forEach(([_name, _child], idx) => {
+                    const isLast = idx === entries.length - 1;
+                    const connector = isLast ? '└ ' : '├ ';
+                    const nextPrefix = prefix + (isLast ? '   ' : '│  ');
+                    const displayName = depth === 0 ? decorateTopLevel(_name) : _name;
+                    lines.push(prefix + connector + displayName);
+                    render(_child, nextPrefix, depth + 1);
+                });
             };
-            dynamicPaths.forEach((p) => addStat(p, true));
-            shownStatic.forEach((p) => addStat(p, false));
-            const dynamicMarker = chalk.bold.yellowBright(' (dynamic)');
-            const staticMarker = chalk.bold.greenBright(' (static)');
-            const decorateTopLevel = (name) => {
-                const stat = topLevelStats.get(name);
-                if (!stat)
-                    return name;
-                if (stat.hasDynamic && stat.hasStatic) {
-                    return `${name}${dynamicMarker}${staticMarker}`;
-                }
-                if (stat.hasDynamic)
-                    return `${name}${dynamicMarker}`;
-                if (stat.hasStatic)
-                    return `${name}${staticMarker}`;
-                return name;
+            render(root, '', 0);
+            return lines.length ? lines : ['-'];
+        };
+        const header = chalk.hex('#22c55e')('UPLOAD') + ' Files to be uploaded (source paths)';
+        logger.block();
+        logger.log(header);
+        const dynamicSet = new Set(dynamicSources);
+        const LIMIT = 300;
+        const staticPaths = sourceList
+            .filter((p) => !dynamicSet.has(p))
+            .sort((a, b) => a.localeCompare(b));
+        const dynamicPaths = sourceList
+            .filter((p) => dynamicSet.has(p))
+            .sort((a, b) => a.localeCompare(b));
+        let omitted = 0;
+        let shownStatic = staticPaths;
+        if (staticPaths.length > LIMIT) {
+            shownStatic = staticPaths.slice(0, LIMIT);
+            omitted = staticPaths.length - LIMIT;
+        }
+        // Compute top-level markers based on whether a top-level bucket contains dynamic/static files
+        const topLevelStats = new Map();
+        const addStat = (p, isDynamic) => {
+            const top = p.split('/')[0] || p;
+            const stat = topLevelStats.get(top) || {
+                hasDynamic: false,
+                hasStatic: false
             };
-            const combined = [...dynamicPaths, ...shownStatic];
-            const treeLines = buildTree(combined, decorateTopLevel);
-            for (const line of treeLines) {
-                logger.log(line);
-            }
-            if (omitted > 0) {
-                const note = chalk.gray(`仅展示前 ${LIMIT} 个静态文件，已省略 ${omitted} 个`);
-                logger.log(note);
+            if (isDynamic)
+                stat.hasDynamic = true;
+            else
+                stat.hasStatic = true;
+            topLevelStats.set(top, stat);
+        };
+        dynamicPaths.forEach((p) => addStat(p, true));
+        shownStatic.forEach((p) => addStat(p, false));
+        const dynamicMarker = chalk.bold.yellowBright(' (dynamic)');
+        const staticMarker = chalk.bold.greenBright(' (static)');
+        const decorateTopLevel = (name) => {
+            const stat = topLevelStats.get(name);
+            if (!stat)
+                return name;
+            if (stat.hasDynamic && stat.hasStatic) {
+                return `${name}${dynamicMarker}${staticMarker}`;
             }
-            logger.block();
+            if (stat.hasDynamic)
+                return `${name}${dynamicMarker}`;
+            if (stat.hasStatic)
+                return `${name}${staticMarker}`;
+            return name;
+        };
+        const combined = [...dynamicPaths, ...shownStatic];
+        const treeLines = buildTree(combined, decorateTopLevel);
+        for (const line of treeLines) {
+            logger.log(line);
         }
-        catch (_b) { }
+        if (omitted > 0) {
+            const note = chalk.gray(`Only show the first ${LIMIT} static files, omitted ${omitted} files`);
+            logger.log(note);
+        }
+        logger.block();
         const projectConfig = getProjectConfig(projectPath);
         const notFoundStrategy = normalizeNotFoundStrategy((_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.assets) === null || _a === void 0 ? void 0 : _a.notFoundStrategy);
         logger.startSubStep('Generating code version');

package/dist/commands/deploy/index.js

@@ -75,6 +75,7 @@ export function handleDeploy(argv) {
                 getRoot().split(/[\\/]/).pop() ||
                 '', true, true);
         }
+        exit(success ? 0 : 1);
     });
 }
 export default deploy;

package/dist/commands/deployments/delete.js

@@ -52,7 +52,7 @@ export function handleDeleteDeployments(argv) {
         const isInteractive = argv.i;
         if (isInteractive) {
             const { allVersions, stagingVersions, productionVersions } = yield getRoutineCodeVersions(projectConfig.name);
-            // 显示正在部署的版本信息
+            // Show information about versions being deployed
             if (stagingVersions.length > 0 || productionVersions.length > 0) {
                 logger.log(chalk.yellow('⚠️  Currently deploying versions:'));
                 if (stagingVersions.length > 0) {
@@ -64,7 +64,7 @@ export function handleDeleteDeployments(argv) {
                 logger.log('');
             }
             logger.log(t('delete_deployments_table_title').d('  Version ID            Description'));
-            // 过滤掉正在部署的版本
+            // Filter out versions being deployed
             const selectList = allVersions
                 .filter((item) => {
                 var _a, _b;

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

@@ -16,7 +16,7 @@ import { getRoot, getDirName } from '../../../utils/fileUtils/base.js';
 import { getDevConf } from '../../../utils/fileUtils/index.js';
 import { EW2Path } from '../../../utils/installEw2.js';
 import devBuild from '../build.js';
-// 生成可用的Ew2端口
+// Generate available Ew2 port
 const generateEw2Port = () => __awaiter(void 0, void 0, void 0, function* () {
     let ew2port = 3322;
     let portAvailable = yield checkPort(ew2port);
@@ -60,7 +60,7 @@ conf_path = "${erConfPath}"
         fs.promises.writeFile(erConfPath, erConf)
     ]);
 };
-// 生成入口文件
+// Generate entry file
 const generateEntry = (id, projectEntry, userRoot, port) => __awaiter(void 0, void 0, void 0, function* () {
     const __dirname = getDirName(import.meta.url);
     const devDir = path.resolve(userRoot, '.dev');
@@ -85,20 +85,20 @@ const generateEntry = (id, projectEntry, userRoot, port) => __awaiter(void 0, vo
         .replace(/'\$userPath'/g, `'${projectEntry.replace(/\\/g, '/')}'`)
         .replace(/\$userPort/g, `${port}`));
 });
-// 前期准备
+// Preliminary preparation
 const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(void 0, void 0, void 0, function* () {
     const options = {};
     const currentOptions = { entry, port, localUpstream };
-    // 支持同时跑多个 worker
+    // Support running multiple workers simultaneously
     const id = new Date().getTime().toString();
     // @ts-ignore
     global.id = id;
-    // 生成入口文件
+    // Generate entry file
     yield generateEntry(id, entry, userRoot, port);
-    // 生成 Ew2 配置
+    // Generate Ew2 configuration
     const ew2port = yield generateEw2Port();
     yield writeEw2config(id, ew2port, userRoot);
-    // 给每一次 dev 的配置项，在一个文件中通过 id 区分
+    // Configuration items for each dev session, distinguished by id in one file
     if (fs.existsSync(configPath)) {
         const currentConfig = fs
             .readFileSync(configPath, 'utf-8')
@@ -106,7 +106,7 @@ const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(
         const currentConfigObj = JSON.parse(currentConfig);
         const currentIds = Object.keys(currentConfigObj);
         if (currentIds[0] && /^\d+$/.test(currentIds[0])) {
-            // 删除没有用到的入口
+            // Remove unused entries
             for (let currentId of currentIds) {
                 const unused = yield checkPort(currentConfigObj[currentId].port);
                 if (unused) {
@@ -155,7 +155,7 @@ const devPack = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     else {
         logger.notInProject();
-        process.exit(0);
+        process.exit(1);
     }
     return prepare(path.resolve(userRoot, '.dev/devConfig.js'), projectEntry, port, localUpstream, userRoot)
         .then(() => {

package/dist/commands/dev/ew2/mock/kv.js

@@ -103,7 +103,7 @@ class EdgeKV {
         headers: { 'Content-Type': 'application/json' }
       }
     );
-    // 判断是否存在key
+    // Check if key exists
     let isGetFailed = false;
     fetchRes.headers.forEach((v, k) => {
       if (k === 'kv-get-empty') {

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

@@ -187,7 +187,7 @@ class Ew2Server {
                     agent: new HttpProxyAgent(`http://127.0.0.1:${ew2Port}`)
                 });
                 const workerHeaders = Object.fromEntries(workerRes.headers.entries());
-                // 解决 gzip 兼容性问题，防止net::ERR_CONTENT_DECODING_FAILED
+                // Solve gzip compatibility issue, prevent net::ERR_CONTENT_DECODING_FAILED
                 workerHeaders['content-encoding'] = 'identity';
                 if (workerRes.body) {
                     res.writeHead(workerRes.status, workerHeaders);

package/dist/commands/dev/index.js

@@ -187,7 +187,7 @@ const dev = {
             yield worker.start();
         }
         catch (err) {
-            console.log('Track err', err);
+            logger.error(`Worker start failed: ${err}`);
             process.exit(1);
         }
         const ignored = (path) => {

package/dist/commands/dev/mockWorker/devPack.js

@@ -40,12 +40,12 @@ const generateEntry = (id, projectEntry, userRoot) => __awaiter(void 0, void 0,
 const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(void 0, void 0, void 0, function* () {
     const options = {};
     const currentOptions = { entry, port, localUpstream };
-    // 支持同时跑多个 deno
+    // Support running multiple deno instances simultaneously
     const id = new Date().getTime().toString();
     // @ts-ignore
     global.id = id;
     yield generateEntry(id, entry, userRoot);
-    // 给每一次 dev 的配置项，在一个文件中通过 id 区分
+    // Configuration items for each dev session, distinguished by id in one file
     if (fs.existsSync(configPath)) {
         const currentConfig = fs
             .readFileSync(configPath, 'utf-8')
@@ -101,7 +101,7 @@ const devPack = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     else {
         logger.notInProject();
-        process.exit(0);
+        process.exit(1);
     }
     return prepare(path.resolve(userRoot, '.dev/devConfig.js'), projectEntry, port, localUpstream, userRoot)
         .then(() => {

package/dist/commands/init/helper.js

@@ -100,7 +100,7 @@ export function checkAndUpdatePackage(packageName) {
             const spinner = logger.ora;
             spinner.text = t('checking_template_update').d('Checking esa-template updates...');
             spinner.start();
-            // 获取当前安装的版本
+            // Get currently installed version
             const __dirname = getDirName(import.meta.url);
             const packageJsonPath = path.join(__dirname, '../../../');
             let versionInfo;
@@ -124,7 +124,7 @@ export function checkAndUpdatePackage(packageName) {
             }
             const match = versionInfo.match(new RegExp(`(${packageName})@([0-9.]+)`));
             const currentVersion = match ? match[2] : '';
-            // 获取最新版本
+            // Get latest version
             const latestVersion = execSync(`npm view ${packageName} version`, {
                 cwd: packageJsonPath
             })
@@ -173,7 +173,7 @@ export function checkAndUpdatePackage(packageName) {
     });
 }
 export const getFrameworkConfig = (framework) => {
-    // 从init目录读取template.jsonc
+    // Read template.jsonc from init directory
     const templatePath = path.join(getDirName(import.meta.url), 'template.jsonc');
     const jsonc = fs.readFileSync(templatePath, 'utf-8');
     const json = JSON.parse(jsonc);
@@ -184,7 +184,7 @@ export const getFrameworkConfig = (framework) => {
  * @returns 框架全部配置
  */
 export const getAllFrameworkConfig = () => {
-    // 从init目录读取template.jsonc
+    // Read template.jsonc from init directory
     const templatePath = path.join(getDirName(import.meta.url), 'template.jsonc');
     const jsonc = fs.readFileSync(templatePath, 'utf-8');
     const json = JSON.parse(jsonc);
@@ -231,7 +231,7 @@ export function getInitParamsFromArgv(argv) {
         params.deploy = Boolean(a.deploy);
     return params;
 }
-// 配置项目名称
+// Configure project name
 export const configProjectName = (initParams) => __awaiter(void 0, void 0, void 0, function* () {
     if (initParams.name) {
         log.step(`Project name configured ${initParams.name}`);
@@ -608,7 +608,7 @@ export function getGitVersion() {
 }
 export function isGitInstalled() {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield getGitVersion()) !== '';
+        return (yield getGitVersion()) !== '' && (yield getGitVersion()) !== null;
     });
 }
 /**
@@ -684,7 +684,6 @@ function ensureGitignore(projectRoot, assetsDirectory) {
                 ? `${existingContent.replace(/\n$/, '')}\n${toAppend.join('\n')}\n`
                 : `${toAppend.join('\n')}\n`;
             fs.writeFileSync(gitignorePath, newContent, 'utf-8');
-            logger.log('Updated .gitignore');
         }
         catch (_a) {
             // Do not fail init due to .gitignore issues

package/dist/commands/route/add.js

@@ -79,7 +79,6 @@ export function handlerAddRoute(argv) {
             name: i.SiteName,
             value: i.SiteId
         }));
-        // 获取路由名称，支持直接通过参数传入
         let routeName = argv.alias;
         if (!routeName) {
             const response = yield inquirer.prompt([

package/dist/commands/route/helper.js

@@ -72,8 +72,7 @@ export const transferRouteToRuleString = (routePath) => {
 export const transferRuleStringToRoute = (ruleStr) => {
     if (!ruleStr) {
         return '';
-    }
-    // 去掉外层括号并按 " and " 分割
+    } // Remove outer brackets and split by " and "
     const cleanedRule = ruleStr.replace(/^\(|\)$/g, '');
     const parts = cleanedRule.split(' and ');
     if (parts.length !== 2) {
@@ -81,36 +80,36 @@ export const transferRuleStringToRoute = (ruleStr) => {
     }
     let host = '';
     let uriPath = '';
-    // 处理host部分
+    // Process host part
     const hostPart = parts[0].trim();
     if (hostPart.startsWith(`${RuleMatchOperatorEndsWith}(${RuleMatchTypeHost},`)) {
-        // host匹配eq时的逻辑
+        // Logic when host matches eq
         // ends_with(http.host, "value")
         const match = hostPart.match(/ends_with\(http\.host,\s*"([^"]+)"\)/);
         if (match) {
-            host = `*${match[1]}`; // 加前缀 *
+            host = `*${match[1]}`; // Add prefix *
         }
     }
     else if (hostPart.startsWith(`${RuleMatchTypeHost} ${RuleMatchOperatorEq}`)) {
-        // host匹配eq时的逻辑
+        // Logic when host matches eq
         // http.host eq "value"
         const match = hostPart.match(/http\.host eq "([^"]+)"/);
         if (match) {
             host = match[1];
         }
     }
-    // 处理uriPath 部分
+    // Process uriPath part
     const uriPathPart = parts[1].trim();
     if (uriPathPart.startsWith(`${RuleMatchOperatorStartsWith}(${RuleMatchTypeUriPath},`)) {
-        // uriPath匹配startsWith时的逻辑
+        // Logic when uriPath matches startsWith
         // starts_with(http.request.uri.path, "value")
         const match = uriPathPart.match(/starts_with\(http\.request\.uri\.path,\s*"([^"]+)"\)/);
         if (match) {
-            uriPath = `${match[1]}*`; // 加后缀 *
+            uriPath = `${match[1]}*`; // Add suffix *
         }
     }
     else if (uriPathPart.startsWith(`${RuleMatchTypeUriPath} ${RuleMatchOperatorEq}`)) {
-        // uriPath匹配eq时的逻辑
+        // Logic when uriPath matches eq
         // http.request.uri.path eq "value"
         const match = uriPathPart.match(/http\.request\.uri\.path eq "([^"]+)"/);
         if (match) {

package/dist/commands/utils.js

@@ -71,7 +71,7 @@ export const bindRoutineWithDomain = (name, domain) => __awaiter(void 0, void 0,
 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);
 }
@@ -131,12 +131,12 @@ export function validateLoginCredentials(accessKeyId_1, accessKeySecret_1, endpo
     });
 }
 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;

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/i18n/locales.json

@@ -204,8 +204,8 @@
     "zh_CN": "读取 CLI 配置错误"
   },
   "dev_error_no_project_config": {
-    "en": "Error reading project configuration esa.toml file.",
-    "zh_CN": "读取项目配置 esa.toml 文件错误"
+    "en": "Error reading project configuration esa.jsonc (recommended) or esa.toml file.",
+    "zh_CN": "读取项目配置 esa.jsonc (推荐) 或 esa.toml 文件错误"
   },
   "dev_build_start": {
     "en": "Starting build process",

package/dist/libs/apiService.js

@@ -90,7 +90,6 @@ export class ApiService {
                 }
             }
             catch (error) {
-                console.log('error', error);
                 return {
                     success: false,
                     message: t('login_failed').d('An error occurred while trying to log in.')
@@ -101,15 +100,15 @@ export class ApiService {
     quickDeployRoutine(edgeRoutine) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                // 上传代码到unstable版本
+                // Upload code to unstable version
                 const stagingRes = yield this.getRoutineStagingCodeUploadInfo(edgeRoutine);
                 if (stagingRes) {
-                    // 生产版本
+                    // Production version
                     const commitRes = yield this.commitRoutineStagingCode({
                         Name: edgeRoutine.name,
                         CodeDescription: edgeRoutine.description
                     });
-                    // 发布到生产环境
+                    // Deploy to production environment
                     if (commitRes) {
                         const deployRes = yield this.publishRoutineCodeVersion({
                             Name: edgeRoutine.name,

package/dist/libs/logger.js

@@ -180,7 +180,7 @@ class Logger {
         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:');
+        this.subLog('- Or create an "esa.jsonc" file (recommended):');
         console.log('```jsonc\n' +
             '{\n' +
             '  "name": "my-routine",\n' +
@@ -188,7 +188,7 @@ class Logger {
             '  "dev": { "port": 18080 }\n' +
             '}\n' +
             '```');
-        this.subLog('- Or, if you prefer TOML, add to your "esa.toml":');
+        this.subLog('- Or, if you prefer TOML, create an "esa.toml" file:');
         console.log('```toml\n' +
             'name = "my-routine"\n' +
             'entry = "src/index.ts"\n' +
@@ -197,7 +197,7 @@ class Logger {
             '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')}`);
+        this.subLog(`- Create an "esa.jsonc" file (recommended) and run ${chalk.green('esa deploy -a ./dist')}`);
         console.log('```jsonc\n' +
             '{\n' +
             '  "name": "my-routine",\n' +
@@ -206,7 +206,7 @@ class Logger {
             '  }\n' +
             '}\n' +
             '```');
-        this.subLog(`- Or add to your "esa.toml" and run ${chalk.green('esa deploy -a ./dist')}`);
+        this.subLog(`- Or create an "esa.toml" file and run ${chalk.green('esa deploy -a ./dist')}`);
         console.log('```toml\n' +
             'name = "my-routine"\n' +
             '\n' +

package/dist/utils/checkIsRoutineCreated.js

@@ -26,7 +26,7 @@ export function validRoutine(name) {
         const isCreatedRoutine = yield isRoutineExist(name);
         if (!isCreatedRoutine) {
             logger.warn(`${t('routine_not_exist').d('Routine does not exist, please create a new one. Run command:')} ${chalk.greenBright('esa deploy')}`);
-            exit(0);
+            exit(1);
         }
     });
 }

package/dist/utils/compress.js

@@ -43,10 +43,10 @@ const compress = (scriptEntry_1, assetsDir_1, ...args_1) => __awaiter(void 0, [s
     let assetsDirectory = assetsDir || ((_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory);
     const routineType = checkEdgeRoutineType(scriptEntry, assetsDir, projectPath);
     if (!projectConfig && !scriptEntry && !assetsDir) {
-        logger.error('esa.jsonc or esa.toml is not found and script entry or assets directory is not provided by command line');
-        exit(0);
+        logger.error('esa.jsonc (recommended) or esa.toml is not found and script entry or assets directory is not provided by command line');
+        exit(1);
     }
-    // 参数优先：如果有参数则使用参数，否则使用配置文件中的值
+    // Parameter priority: use parameters if available, otherwise use values from config file
     const entry = scriptEntry || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry);
     if (routineType === EDGE_ROUTINE_TYPE.NOT_EXIST) {
         const errorMessage = [
@@ -61,7 +61,7 @@ const compress = (scriptEntry_1, assetsDir_1, ...args_1) => __awaiter(void 0, [s
             chalk.cyan('🔍 Possible issue causes:'),
             chalk.white('  1. Entry file path is incorrect or file does not exist'),
             chalk.white('  2. Assets directory path is incorrect or directory does not exist'),
-            chalk.white(`  3. Project configuration file ${chalk.yellow('esa.jsonc')} or ${chalk.yellow('esa.toml')} format error`),
+            chalk.white(`  3. Project configuration file ${chalk.yellow('esa.jsonc')} (recommended) or ${chalk.yellow('esa.toml')} format error`),
             chalk.white(`  4. Relative path format error, please use ${chalk.yellow('./xxx')} format`),
             '',
             chalk.yellow.bold(`📍 Please check if the following ${chalk.red('absolute paths')} are correct:`),
@@ -83,7 +83,7 @@ const compress = (scriptEntry_1, assetsDir_1, ...args_1) => __awaiter(void 0, [s
             ''
         ].join('\n');
         logger.error(errorMessage);
-        exit(0);
+        exit(1);
     }
     if (routineType === EDGE_ROUTINE_TYPE.JS_ONLY ||
         routineType === EDGE_ROUTINE_TYPE.JS_AND_ASSETS) {

package/dist/utils/download.js

@@ -92,8 +92,8 @@ function isBinDirInPath(binDir) {
  */
 function addBinDirToPath(binDir) {
     return __awaiter(this, void 0, void 0, function* () {
-        // 使用 setx 添加到 PATH
-        // setx 对 PATH 的长度有2047字符的限制
+        // Use setx to add to PATH
+        // setx has a 2047 character limit for PATH
         const command = `setx Path "%Path%;${binDir}"`;
         try {
             yield execAsync(command);

package/dist/utils/fileUtils/index.js

@@ -17,7 +17,19 @@ import { getDirName, getRoot } from './base.js';
 const projectConfigFile = 'esa.toml';
 const __dirname = getDirName(import.meta.url);
 const root = getRoot();
-export const projectConfigPath = path.join(root, projectConfigFile);
+// Function to get the actual project config file path (supports both .jsonc and .toml)
+export const getProjectConfigPath = (filePath = root) => {
+    const configFormats = ['esa.jsonc', 'esa.toml'];
+    for (const format of configFormats) {
+        const configPath = path.join(filePath, format);
+        if (fs.existsSync(configPath)) {
+            return configPath;
+        }
+    }
+    // Default to .jsonc if no config file exists
+    return path.join(filePath, 'esa.jsonc');
+};
+export const projectConfigPath = getProjectConfigPath();
 export const cliConfigPath = path.join(os.homedir(), '.esa/config/default.toml');
 // Function to get the actual config file path (supports both .toml and .jsonc)
 export const getCliConfigPath = () => {
@@ -39,7 +51,7 @@ export const generateHiddenConfigDir = () => {
 export const generateToml = (path) => {
     if (!fs.existsSync(path)) {
         fs.writeFileSync(path, '', 'utf-8');
-        // 添加默认的endpoint
+        // Add default endpoint
         const defaultConfig = {
             endpoint: 'esa.cn-hangzhou.aliyuncs.com'
         };
@@ -53,16 +65,29 @@ export const generateDefaultConfig = () => {
 };
 export function updateProjectConfigFile(configUpdate_1) {
     return __awaiter(this, arguments, void 0, function* (configUpdate, filePath = root) {
-        const configPath = path.join(filePath, projectConfigFile);
+        const configPath = getProjectConfigPath(filePath);
         try {
             let configFileContent = yield fsPromises.readFile(configPath, 'utf8');
-            let config = toml.parse(configFileContent);
-            config = Object.assign(Object.assign({}, config), configUpdate);
-            const updatedConfigString = toml.stringify(config);
+            let config;
+            let updatedConfigString;
+            // Detect file format based on file extension
+            if (configPath.endsWith('.jsonc') || configPath.endsWith('.json')) {
+                // Handle JSONC format
+                const jsonContent = configFileContent.replace(/\/\*[\s\S]*?\*\/|\/\/.*$/gm, '');
+                config = JSON.parse(jsonContent);
+                config = Object.assign(Object.assign({}, config), configUpdate);
+                updatedConfigString = JSON.stringify(config, null, 2) + '\n';
+            }
+            else {
+                // Handle TOML format (default)
+                config = toml.parse(configFileContent);
+                config = Object.assign(Object.assign({}, config), configUpdate);
+                updatedConfigString = toml.stringify(config);
+            }
             yield fsPromises.writeFile(configPath, updatedConfigString);
         }
         catch (error) {
-            logger.error(`Error updating TOML file: ${error}`);
+            logger.error(`Error updating config file: ${error}`);
             logger.pathEacces(__dirname);
         }
     });
@@ -114,7 +139,6 @@ export function readConfigFile(configPath) {
             }
         }
         catch (error) {
-            console.log(error);
             logger.error(`Error parsing config file: ${error}`);
             return null;
         }
@@ -160,7 +184,7 @@ export function getConfigurations() {
     }
 }
 export function generateConfigFile(projectName_1, initConfigs_1, targetDir_1) {
-    return __awaiter(this, arguments, void 0, function* (projectName, initConfigs, targetDir, configFormat = 'toml', notFoundStrategy) {
+    return __awaiter(this, arguments, void 0, function* (projectName, initConfigs, targetDir, configFormat = 'jsonc', notFoundStrategy) {
         var _a, _b;
         const outputDir = targetDir !== null && targetDir !== void 0 ? targetDir : process.cwd();
         const currentDirName = path.basename(outputDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "0.0.2-beta.19",
+  "version": "0.0.2-beta.20",
   "description": "A CLI for operating Alibaba Cloud ESA EdgeRoutine (Edge Functions).",
   "main": "bin/enter.cjs",
   "type": "module",