esa-cli 0.0.2-beta.12 → 0.0.2-beta.13

package/dist/i18n/locales.json

@@ -281,7 +281,7 @@
   },
   "init_input_name": {
     "en": "Enter the name of edgeRoutine:",
-    "zh_CN": "输入 edgeRoutine 的名称："
+    "zh_CN": "输入 edgeRoutine 的名称"
   },
   "init_skip_git": {
     "en": "Git installation was skipped.",
@@ -359,6 +359,18 @@
     "en": "The name of route to add",
     "zh_CN": "要添加的路由名称"
   },
+  "route_add_site_describe": {
+    "en": "The site to bind the route to. For example: example.com",
+    "zh_CN": "要绑定路由的站点"
+  },
+  "route_add_route_name_option": {
+    "en": "Route name (aliases)",
+    "zh_CN": "路由名称（别名）"
+  },
+  "route_add_route_value_option": {
+    "en": "The route value. For example: example.com/*",
+    "zh_CN": "路由值"
+  },
   "route_add_invalid": {
     "en": "The route does not correspond to the domain.",
     "zh_CN": "该路由与域名不对应。"
@@ -505,7 +517,35 @@
   },
   "init_config_file": {
     "en": "Generate a config file for your project",
-    "zh_CN": "在您的项目中生成一个esa.toml配置文件"
+    "zh_CN": "在您的项目中生成一个配置文件"
+  },
+  "init_config_format_select": {
+    "en": "Select configuration file format:",
+    "zh_CN": "选择配置文件格式："
+  },
+  "init_config_format_jsonc": {
+    "en": "JSONC (.jsonc) - JSON with comments, recommended",
+    "zh_CN": "JSONC (.jsonc) - 带注释的JSON，推荐"
+  },
+  "init_config_format_toml": {
+    "en": "TOML (.toml) - Traditional format",
+    "zh_CN": "TOML (.toml) - 传统格式"
+  },
+  "init_language_select": {
+    "en": "Select programming language:",
+    "zh_CN": "选择编程语言："
+  },
+  "init_language_typescript": {
+    "en": "TypeScript (.ts) - Type-safe JavaScript, recommended",
+    "zh_CN": "TypeScript (.ts) - 类型安全的JavaScript，推荐"
+  },
+  "init_language_javascript": {
+    "en": "JavaScript (.js) - Traditional JavaScript",
+    "zh_CN": "JavaScript (.js) - 传统JavaScript"
+  },
+  "init_language_selected": {
+    "en": "Language",
+    "zh_CN": "语言"
   },
   "init_project_name": {
     "en": "Project name",
@@ -520,12 +560,12 @@
     "zh_CN": "未找到模板 \"${templateName}\"。请检查模板名称并重试。"
   },
   "generate_config_error": {
-    "en": "esa.toml already exists",
-    "zh_CN": "esa.toml 文件已经存在"
+    "en": "${path.basename(newFilePath)} already exists",
+    "zh_CN": "配置文件已经存在"
   },
   "generate_config_success": {
-    "en": "Generated esa.toml",
-    "zh_CN": "生成esa.toml成功"
+    "en": "Generated ${path.basename(newFilePath)}",
+    "zh_CN": "配置文件生成成功"
   },
   "commit_option_minify": {
     "en": "Minify code before committing",
@@ -720,8 +760,8 @@
     "zh_CN": "无权限：Access Key 或 Secret 错误，或没有必要的权限。"
   },
   "init_skip": {
-    "en": "Skip the project git and deployment initialization",
-    "zh_CN": "初始化已被跳过。"
+    "en": "Answer \"No\" to any prompts for new projects.",
+    "zh_CN": "回答 \"否\" 到所有提示。"
   },
   "quick_deploy_success": {
     "en": "Your code has been successfully deployed",
@@ -735,6 +775,18 @@
     "en": "Quick deploy failed",
     "zh_CN": "快速部署失败。"
   },
+  "quick_deploy_assets_detected": {
+    "en": "Static assets detected, deploying with assets support",
+    "zh_CN": "检测到静态资源，正在使用资源支持进行部署"
+  },
+  "quick_deploy_assets_success": {
+    "en": "A new version has been successfully generated",
+    "zh_CN": "您的代码和静态资源已成功部署"
+  },
+  "quick_deploy_assets_failed": {
+    "en": "Quick deploy with assets failed",
+    "zh_CN": "带静态资源的快速部署失败"
+  },
   "auto_deploy": {
     "en": "Do you want to deploy your project?",
     "zh_CN": "您想要部署您的项目吗？"
@@ -968,7 +1020,7 @@
     "zh_CN": "边缘函数创建失败"
   },
   "create_route_route": {
-    "en": "Enter a Route:",
+    "en": "Enter a Route (e.g., example.com/*):",
     "zh_CN": "输入路由:"
   },
   "route_name_input_required": {
@@ -1026,5 +1078,105 @@
   "login_option_skip_login": {
     "en": "Skip login",
     "zh_CN": "跳过登录"
+  },
+  "check_and_update_package_error": {
+    "en": "Error: An error occurred while checking and updating the package, skipping template update",
+    "zh_CN": "检测和更新包时发生错误，跳过更新模版"
+  },
+  "init_yes": {
+    "en": "Answer \"Yes\" to all prompts.",
+    "zh_CN": "回答 \"是\" 到所有提示。"
+  },
+  "init_no_templates": {
+    "en": "No templates available.",
+    "zh_CN": "没有可用的模版。"
+  },
+  "no_active_sites": {
+    "en": "No active sites found in your account",
+    "zh_CN": "没有找到已激活的站点"
+  },
+  "route_format_invalid": {
+    "en": "Invalid route format",
+    "zh_CN": "无效的路由格式"
+  },
+  "creating_route": {
+    "en": "Creating route...",
+    "zh_CN": "创建路由..."
+  },
+  "site_not_found": {
+    "en": "Site \"${siteName}\" not found in your account",
+    "zh_CN": "站点 \"${siteName}\" 未找到"
+  },
+  "commit_assets_exist": {
+    "en": "This is a routine with assets project",
+    "zh_CN": ""
+  },
+  "commit_routine_with_assets_success": {
+    "en": "Routine with assets code version committed successfully.",
+    "zh_CN": ""
+  },
+  "commit_routine_with_assets_fail": {
+    "en": "An error occurred while trying to commit your routine with assets.",
+    "zh_CN": ""
+  },
+  "commit_option_assets": {
+    "en": "Assets directory",
+    "zh_CN": ""
+  },
+  "commit_option_name": {
+    "en": "Edge Routine name",
+    "zh_CN": ""
+  },
+  "deploy_option_name": {
+    "en": "Name of the routine",
+    "zh_CN": ""
+  },
+  "deploy_option_assets": {
+    "en": "Deploy assets",
+    "zh_CN": ""
+  },
+  "deploy_invalid_environment": {
+    "en": "Invalid environment",
+    "zh_CN": ""
+  },
+  "deploy_success_guide_2": {
+    "en": "Run this command to add routes",
+    "zh_CN": ""
+  },
+  "login_get_from_env": {
+    "en": "Get AccessKey ID and AccessKey Secret from environment variables.",
+    "zh_CN": ""
+  },
+  "deploy_option_description": {
+    "en": "Description of the version",
+    "zh_CN": ""
+  },
+  "deploy_option_minify": {
+    "en": "Minify the code",
+    "zh_CN": ""
+  },
+  "error_reading_project_config_file": {
+    "en": "Error reading project configuration file.",
+    "zh_CN": "读取项目配置文件错误"
+  },
+  "checking_template_update": {
+    "en": "Checking esa-template updates...",
+    "zh_CN": ""
+  },
+  "template_updating": {
+    "en": "Updating templates to latest...",
+    "zh_CN": ""
+  },
+  "template_updated_to_latest": {
+    "en": "Templates updated to latest.",
+    "zh_CN": ""
+  },
+  "checking_esa_template_finished": {
+    "en": "Checking esa-template finished.",
+    "zh_CN": ""
+  },
+  "git_installed_success": {
+    "en": "Git has been installed successfully.",
+    "zh_CN": ""
   }
 }

package/dist/index.js

@@ -7,25 +7,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import chalk from 'chalk';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import chalk from 'chalk';
-import login from './commands/login/index.js';
+import commit from './commands/commit/index.js';
 import config from './commands/config.js';
-import dev from './commands/dev/index.js';
-import init from './commands/init/index.js';
-import routine from './commands/routine/index.js';
 import deploy from './commands/deploy/index.js';
-import commit from './commands/commit/index.js';
 import deployments from './commands/deployments/index.js';
+import dev from './commands/dev/index.js';
 import domainCommand from './commands/domain/index.js';
-import routeCommand from './commands/route/index.js';
-import logout from './commands/logout.js';
+import init from './commands/init/index.js';
 import lang from './commands/lang.js';
-import { getCliConfig } from './utils/fileUtils/index.js';
-import { handleCheckVersion } from './utils/checkVersion.js';
-import t from './i18n/index.js';
+import login from './commands/login/index.js';
+import logout from './commands/logout.js';
+import routeCommand from './commands/route/index.js';
+import routine from './commands/routine/index.js';
 import site from './commands/site/index.js';
+import t from './i18n/index.js';
+import { handleCheckVersion } from './utils/checkVersion.js';
+import { getCliConfig } from './utils/fileUtils/index.js';
 const main = () => __awaiter(void 0, void 0, void 0, function* () {
     const argv = hideBin(process.argv);
     const cliConfig = getCliConfig();

package/dist/libs/apiService.js

@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import * as $OpenApi from '@alicloud/openapi-client';
 import FormData from 'form-data';
 import fetch from 'node-fetch';
-import { Environment } from './interface.js';
-import { getApiConfig } from '../utils/fileUtils/index.js';
 import t from '../i18n/index.js';
+import { getApiConfig } from '../utils/fileUtils/index.js';
+import { Environment } from './interface.js';
 export class ApiService {
     constructor(cliConfig) {
         var _a, _b;
@@ -48,7 +48,7 @@ export class ApiService {
      *   - message: (Optional) A string providing additional information in case of failure.
      */
     checkLogin() {
-        return __awaiter(this, arguments, void 0, function* (isShowError = true) {
+        return __awaiter(this, void 0, void 0, function* () {
             try {
                 let params = {
                     action: 'GetErService',
@@ -90,7 +90,7 @@ export class ApiService {
                 }
             }
             catch (error) {
-                isShowError && console.log(error);
+                console.log('error', error);
                 return {
                     success: false,
                     message: t('login_failed').d('An error occurred while trying to log in.')
@@ -522,7 +522,6 @@ export class ApiService {
     }
     getRoutine(requestParams_1) {
         return __awaiter(this, arguments, void 0, function* (requestParams, isShowError = true) {
-            var _a, _b, _c, _d, _e, _f;
             try {
                 let params = {
                     action: 'GetRoutine',
@@ -552,14 +551,7 @@ export class ApiService {
                 if (res.statusCode === 200 && res.body) {
                     const routineResponse = {
                         code: res.statusCode,
-                        data: {
-                            RequestId: (_a = res.body) === null || _a === void 0 ? void 0 : _a.RequestId,
-                            CodeVersions: ((_b = res.body) === null || _b === void 0 ? void 0 : _b.CodeVersions) || [],
-                            Envs: ((_c = res.body) === null || _c === void 0 ? void 0 : _c.Envs) || [],
-                            CreateTime: (_d = res.body) === null || _d === void 0 ? void 0 : _d.CreateTime,
-                            Description: (_e = res.body) === null || _e === void 0 ? void 0 : _e.Description,
-                            DefaultRelatedRecord: (_f = res.body) === null || _f === void 0 ? void 0 : _f.DefaultRelatedRecord
-                        }
+                        data: res.body
                     };
                     return routineResponse;
                 }
@@ -664,7 +656,6 @@ export class ApiService {
                     body: formData,
                     headers: formData.getHeaders()
                 });
-                // console.log('oss result', oss);
                 if (ossRes && ossRes.status === 200) {
                     return true;
                 }
@@ -920,5 +911,177 @@ export class ApiService {
             return null;
         });
     }
+    /**
+     * 调用 CreateRoutineWithAssetsCodeVersion API 获取 OSS 上传配置
+     */
+    CreateRoutineWithAssetsCodeVersion(requestParams) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let params = {
+                    action: 'CreateRoutineWithAssetsCodeVersion',
+                    version: '2024-09-10',
+                    protocol: 'https',
+                    method: 'POST',
+                    authType: 'AK',
+                    bodyType: 'json',
+                    reqBodyType: 'json',
+                    style: 'RPC',
+                    pathname: '/',
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                let request = new $OpenApi.OpenApiRequest({
+                    query: {
+                        Name: requestParams.Name,
+                        CodeDescription: requestParams.CodeDescription,
+                        BuildId: requestParams.BuildId
+                    }
+                });
+                let runtime = {
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                const result = yield this.client.callApi(params, request, runtime);
+                if (result.statusCode === 200 && result.body) {
+                    return {
+                        code: result.statusCode.toString(),
+                        data: {
+                            RequestId: result.body.RequestId,
+                            CodeVersion: result.body.CodeVersion,
+                            Status: result.body.Status,
+                            OssPostConfig: result.body.OssPostConfig
+                        }
+                    };
+                }
+                return null;
+            }
+            catch (error) {
+                console.error('Error calling CreateRoutineWithAssetsCodeVersion:', error);
+                return null;
+            }
+        });
+    }
+    /**
+     * 上传文件到 OSS
+     */
+    uploadToOss(ossConfig, zipBuffer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const { OSSAccessKeyId, Signature, Url, Key, Policy, XOssSecurityToken } = ossConfig;
+                const formData = new FormData();
+                formData.append('OSSAccessKeyId', OSSAccessKeyId);
+                formData.append('Signature', Signature);
+                formData.append('x-oss-security-token', XOssSecurityToken);
+                formData.append('policy', Policy);
+                formData.append('key', Key);
+                formData.append('file', zipBuffer);
+                const ossRes = yield fetch(Url, {
+                    method: 'POST',
+                    body: formData,
+                    headers: formData.getHeaders()
+                });
+                return ossRes && (ossRes.status === 200 || ossRes.status === 204);
+            }
+            catch (error) {
+                console.error('Error uploading to OSS:', error);
+                return false;
+            }
+        });
+    }
+    createRoutineCodeDeployment(requestParams) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let params = {
+                    action: 'CreateRoutineCodeDeployment',
+                    version: '2024-09-10',
+                    protocol: 'https',
+                    method: 'POST',
+                    authType: 'AK',
+                    bodyType: 'json',
+                    reqBodyType: 'json',
+                    style: 'RPC',
+                    pathname: '/',
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                let request = new $OpenApi.OpenApiRequest({
+                    query: {
+                        Name: requestParams.Name,
+                        Env: requestParams.Env,
+                        Strategy: requestParams.Strategy,
+                        CodeVersions: JSON.stringify(requestParams.CodeVersions)
+                    }
+                });
+                let runtime = {
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                const res = yield this.client.callApi(params, request, runtime);
+                if (res.statusCode === 200 && res.body) {
+                    const ret = {
+                        code: res.statusCode,
+                        data: {
+                            RequestId: res.body.RequestId,
+                            Strategy: res.body.Strategy,
+                            DeploymentId: res.body.DeploymentId,
+                            CodeVersions: res.body.CodeVersions
+                        }
+                    };
+                    return ret;
+                }
+            }
+            catch (error) {
+                console.log(error);
+            }
+            return null;
+        });
+    }
+    getRoutineCodeVersionInfo(requestParams) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let params = {
+                    action: 'GetRoutineCodeVersionInfo',
+                    version: '2024-09-10',
+                    protocol: 'https',
+                    method: 'GET',
+                    authType: 'AK',
+                    bodyType: 'json',
+                    reqBodyType: 'json',
+                    style: 'RPC',
+                    pathname: '/',
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                let request = new $OpenApi.OpenApiRequest({
+                    query: {
+                        Name: requestParams.Name,
+                        CodeVersion: requestParams.CodeVersion
+                    }
+                });
+                let runtime = {
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                const res = yield this.client.callApi(params, request, runtime);
+                if (res.statusCode === 200 && res.body) {
+                    const ret = {
+                        code: res.statusCode,
+                        data: res.body
+                    };
+                    return ret;
+                }
+            }
+            catch (error) {
+                console.log(error);
+            }
+            return null;
+        });
+    }
 }
 ApiService.instance = null;

package/dist/libs/git/index.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { execSync } from 'child_process';
 import { exit } from 'process';
+import logger from '../../libs/logger.js';
 export function isInstalledGit() {
     try {
         execSync('git --version');
@@ -32,7 +33,7 @@ export function cloneRepository(url, path) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             execSync(`git clone ${url} ${path}`, { stdio: 'inherit' });
-            console.log('Repository cloned successfully.');
+            logger.log('Repository cloned successfully.');
         }
         catch (error) {
             console.error('Error occurred while cloning the repository:', error);
@@ -40,10 +41,13 @@ export function cloneRepository(url, path) {
         }
     });
 }
-export function installGit(path) {
+export function installGit(path, debug = false) {
     try {
-        execSync('git init', { stdio: 'inherit', cwd: path });
-        console.log('Git has been installed successfully.');
+        execSync('git init', { stdio: 'ignore', cwd: path });
+        if (debug) {
+            logger.log('Git has been installed successfully.');
+        }
+        return true;
     }
     catch (error) {
         console.error('Error occurred during Git installation:', error);

package/dist/libs/logger.js

@@ -1,10 +1,10 @@
+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({
@@ -72,7 +72,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);
@@ -146,15 +146,71 @@ 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'));
     }
+    // Cloudflare-like step rendering helpers
+    cfStepHeader(title, step, total) {
+        console.log(`\n╭ ${title} ${chalk.green(`Step ${step} of ${total}`)}`);
+        console.log('│');
+    }
+    cfStepItem(prompt) {
+        console.log(`├ ${prompt}`);
+    }
+    cfStepKV(key, value) {
+        const orange = chalk.hex('#FFA500');
+        console.log(`│ ${orange(key)} ${value}`);
+    }
+    cfStepSpacer() {
+        console.log('│');
+    }
+    cfStepEnd(str) {
+        console.log(`╰ ${str || ''}`);
+    }
+    cfStepEndInline() {
+        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,5 @@
-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) {