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

package/dist/commands/commit/index.js

@@ -7,17 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { getProjectConfig, readEdgeRoutineFile } from '../../utils/fileUtils/index.js';
-import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
+import { exit } from 'process';
 import { descriptionInput } from '../../components/descriptionInput.js';
-import { ApiService } from '../../libs/apiService.js';
-import prodBuild from './prodBuild.js';
-import logger from '../../libs/logger.js';
 import t from '../../i18n/index.js';
-import { exit } from 'process';
+import { validateAndInitializeProject, generateCodeVersion } from '../common/routineUtils.js';
 const commit = {
     command: 'commit [entry]',
-    describe: `📦 ${t('commit_describe').d('Commit your code, save as a new version')}`,
+    describe: `📥 ${t('commit_describe').d('Commit your code, save as a new version')}`,
     builder: (yargs) => {
         return yargs
             .option('minify', {
@@ -25,16 +21,21 @@ const commit = {
             describe: t('commit_option_minify').d('Minify code before committing'),
             type: 'boolean',
             default: false
+        })
+            .option('assets', {
+            alias: 'a',
+            describe: t('commit_option_assets').d('Assets directory'),
+            type: 'string'
         })
             .option('description', {
             alias: 'd',
             describe: t('commit_option_description').d('Description for the routine/version (skip interactive input)'),
             type: 'string'
         })
-            .positional('entry', {
-            describe: t('dev_entry_describe').d('Entry file of the Routine'),
-            type: 'string',
-            demandOption: false
+            .option('name', {
+            alias: 'n',
+            describe: t('commit_option_name').d('Edge Routine name'),
+            type: 'string'
         });
     },
     handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
@@ -45,117 +46,17 @@ const commit = {
 export default commit;
 export function handleCommit(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (!checkDirectory())
-            return;
-        const projectConfig = getProjectConfig();
-        if (!projectConfig)
-            return logger.notInProject();
-        if (!(yield checkIsLoginSuccess()))
+        const projectInfo = yield validateAndInitializeProject(argv === null || argv === void 0 ? void 0 : argv.name);
+        if (!projectInfo)
             return;
-        yield prodBuild(!!argv.minify, argv === null || argv === void 0 ? void 0 : argv.entry);
-        try {
-            const server = yield ApiService.getInstance();
-            const req = { Name: projectConfig.name };
-            const response = yield server.getRoutine(req, false);
-            let action = 'Creating';
-            let description;
-            if (!response) {
-                logger.log(`🙅 ${t('commit_er_not_exist').d('No routine found, creating a new one')}`);
-                if (argv.description) {
-                    description = argv.description;
-                }
-                else {
-                    description = yield descriptionInput(`🖊️ ${t('commit_er_description').d('Enter a description for the routine')}:`, false);
-                }
-            }
-            else {
-                logger.log(`🔄 ${t('commit_er_exist').d('Routine exists, updating the code')}`);
-                if (argv.description) {
-                    description = argv.description;
-                }
-                else {
-                    description = yield descriptionInput(`🖊️ ${t('commit_version_description').d('Enter a description for the version')}:`, false);
-                }
-                action = 'Updating';
-            }
-            const code = readEdgeRoutineFile() || '';
-            if (action === 'Creating') {
-                const edgeRoutineProps = {
-                    name: projectConfig.name,
-                    code,
-                    description: ''
-                };
-                yield createEdgeRoutine(edgeRoutineProps);
-            }
-            const versionProps = {
-                name: projectConfig.name,
-                code,
-                description: description
-            };
-            const uploadResult = yield uploadEdgeRoutineCode(versionProps);
-            if (uploadResult) {
-                yield releaseOfficialVersion(versionProps);
-            }
-        }
-        catch (error) {
-            logger.error(`${t('common_error_occurred').d('An error occurred:')} ${error}`);
-        }
-    });
-}
-export function createEdgeRoutine(edgeRoutine) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const server = yield ApiService.getInstance();
-            const res = yield server.createRoutine(edgeRoutine);
-            const createResult = (res === null || res === void 0 ? void 0 : res.data.Status) === 'OK';
-            if (!createResult) {
-                logger.error(t('commit_create_er_fail').d('An error occurred while trying to create a routine'));
-                return false;
-            }
-            logger.success(t('commit_create_er_success').d('Routine created successfully.'));
-            return yield uploadEdgeRoutineCode(edgeRoutine);
-        }
-        catch (error) {
-            logger.error(`${t('common_error_occurred').d('An error occurred:')} ${error}`);
-            return false;
-        }
-    });
-}
-export function uploadEdgeRoutineCode(edgeRoutine) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const server = yield ApiService.getInstance();
-            const uploadResult = yield server.getRoutineStagingCodeUploadInfo(edgeRoutine);
-            if (!uploadResult) {
-                logger.error(t('commit_upload_fail').d('An error occurred while trying to upload your code'));
-                process.exit(0);
-            }
-            logger.success(t('commit_upload_success').d('Code uploaded successfully.'));
-            return true;
-        }
-        catch (error) {
-            logger.error('123');
-            logger.error(`${t('common_error_occurred').d('An error occurred:')} ${error}`);
-            process.exit(0);
-        }
-    });
-}
-export function releaseOfficialVersion(edgeRoutine) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const param = {
-            Name: edgeRoutine.name,
-            CodeDescription: (_a = edgeRoutine.description) !== null && _a !== void 0 ? _a : ''
-        };
-        const server = yield ApiService.getInstance();
-        const commitResult = yield server.commitRoutineStagingCode(param);
-        if (commitResult) {
-            logger.success(t('commit_success').d('Code version committed successfully.'));
-            return true;
+        const { projectName } = projectInfo;
+        let description;
+        if (argv.description) {
+            description = argv.description;
         }
         else {
-            logger.error(t('commit_fail').d('An error occurred while trying to commit your code.'));
-            return false;
+            description = yield descriptionInput(`🖊️ ${t('commit_version_description').d('Enter a description for the version')}:`, false);
         }
+        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);
     });
 }

package/dist/commands/commit/prodBuild.js

@@ -7,15 +7,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import fs from 'fs';
+import path from 'path';
 import esbuild from 'esbuild';
 import { lessLoader } from 'esbuild-plugin-less';
-import path from 'path';
-import fs from 'fs';
 import { getRoot } from '../../utils/fileUtils/base.js';
 import { NODE_EXTERNALS } from '../common/constant.js';
 const userRoot = getRoot();
 const entry = path.resolve(userRoot, 'src/index.js');
-const outfile = path.resolve(userRoot, '.dev/pub.js');
 export default function () {
     return __awaiter(this, arguments, void 0, function* (minify = false, customEntry, outputPath) {
         const entryPoint = customEntry

package/dist/commands/common/routineUtils.js

@@ -0,0 +1,276 @@
+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 chalk from 'chalk';
+import t from '../../i18n/index.js';
+import { ApiService } from '../../libs/apiService.js';
+import logger from '../../libs/logger.js';
+import { ensureRoutineExists } from '../../utils/checkIsRoutineCreated.js';
+import compress from '../../utils/compress.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import sleep from '../../utils/sleep.js';
+import { checkIsLoginSuccess } from '../utils.js';
+export function commitRoutineWithAssets(requestParams, zipBuffer) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const server = yield ApiService.getInstance();
+            const apiResult = yield server.CreateRoutineWithAssetsCodeVersion(requestParams);
+            if (!apiResult || !apiResult.data.OssPostConfig) {
+                return {
+                    isSuccess: false,
+                    res: null
+                };
+            }
+            const ossConfig = apiResult.data.OssPostConfig;
+            if (!ossConfig.OSSAccessKeyId ||
+                !ossConfig.Signature ||
+                !ossConfig.Url ||
+                !ossConfig.Key ||
+                !ossConfig.Policy) {
+                console.error('Missing required OSS configuration fields');
+                return {
+                    isSuccess: false,
+                    res: null
+                };
+            }
+            let uploadSuccess = false;
+            for (let i = 0; i < 3; i++) {
+                uploadSuccess = yield server.uploadToOss({
+                    OSSAccessKeyId: ossConfig.OSSAccessKeyId,
+                    Signature: ossConfig.Signature,
+                    Url: ossConfig.Url,
+                    Key: ossConfig.Key,
+                    Policy: ossConfig.Policy,
+                    XOssSecurityToken: ossConfig.XOssSecurityToken || ''
+                }, zipBuffer);
+                if (uploadSuccess) {
+                    break;
+                }
+            }
+            return {
+                isSuccess: uploadSuccess,
+                res: apiResult
+            };
+        }
+        catch (error) {
+            console.error('Error in createRoutineWithAssetsCodeVersion:', error);
+            return {
+                isSuccess: false,
+                res: null
+            };
+        }
+    });
+}
+/**
+ * 通用的项目验证和初始化函数
+ * 包含目录检查、项目配置获取、登录检查、routine存在性检查
+ */
+export function validateAndInitializeProject(name) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const projectConfig = getProjectConfig();
+        if (!projectConfig) {
+            logger.notInProject();
+            return null;
+        }
+        const projectName = name || projectConfig.name;
+        const isSuccess = yield checkIsLoginSuccess();
+        if (!isSuccess) {
+            return null;
+        }
+        yield ensureRoutineExists(projectName);
+        return { projectConfig, projectName };
+    });
+}
+/**
+ * 通用的routine详情获取函数
+ */
+export function getRoutineDetails(projectName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const server = yield ApiService.getInstance();
+        const req = { Name: projectName };
+        return yield server.getRoutine(req, false);
+    });
+}
+/**
+ * 通用的代码压缩和提交函数
+ * 支持assets和普通代码两种模式
+ */
+export function generateCodeVersion(projectName_1, description_1, entry_1, assets_1) {
+    return __awaiter(this, arguments, void 0, function* (projectName, description, entry, assets, minify = false, projectPath) {
+        const zip = yield compress(entry, assets, minify, projectPath);
+        const res = yield commitRoutineWithAssets({
+            Name: projectName,
+            CodeDescription: description
+        }, zip === null || zip === void 0 ? void 0 : zip.toBuffer());
+        if (res === null || res === void 0 ? void 0 : res.isSuccess) {
+            logger.success('Your code has been successfully committed');
+            return {
+                isSuccess: true,
+                res: res === null || res === void 0 ? void 0 : res.res
+            };
+        }
+        else {
+            logger.error('Generate code version failed');
+            return {
+                isSuccess: false,
+                res: null
+            };
+        }
+    });
+}
+/**
+ * 根据 env 在一个或多个环境部署
+ */
+export function deployToEnvironments(name, codeVersion, env) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (env === 'all') {
+            const isStagingSuccess = yield deployCodeVersion(name, codeVersion, 'staging');
+            const isProdSuccess = yield deployCodeVersion(name, codeVersion, 'production');
+            return isStagingSuccess && isProdSuccess;
+        }
+        return yield deployCodeVersion(name, codeVersion, env);
+    });
+}
+/**
+ * 通用的快速部署函数
+ * 结合了压缩、提交和部署的完整流程
+ */
+export function commitAndDeployVersion(projectConfig_1, scriptEntry_1, assets_1) {
+    return __awaiter(this, arguments, void 0, function* (projectConfig, scriptEntry, assets, description = '', projectPath, env = 'production', minify = false, version) {
+        var _a, _b, _c;
+        if (version) {
+            return yield deployToEnvironments(projectConfig.name, version, env);
+        }
+        else {
+            const res = yield generateCodeVersion(projectConfig.name, description, scriptEntry || projectConfig.entry, assets || ((_a = projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory), minify || projectConfig.minify, projectPath);
+            const isCommitSuccess = res === null || res === void 0 ? void 0 : res.isSuccess;
+            if (isCommitSuccess) {
+                const codeVersion = (_c = (_b = res === null || res === void 0 ? void 0 : res.res) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.CodeVersion;
+                if (!codeVersion) {
+                    logger.error('Failed to read CodeVersion from response.');
+                    return false;
+                }
+                return yield deployToEnvironments(projectConfig.name, codeVersion, env);
+            }
+            else {
+                return false;
+            }
+        }
+    });
+}
+/**
+ * 通用的版本部署函数
+ */
+export function deployCodeVersion(name, codeVersion, environment) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const server = yield ApiService.getInstance();
+        // Ensure the committed code version is ready before deploying
+        const isReady = yield waitForCodeVersionReady(name, codeVersion);
+        if (!isReady) {
+            logger.error('The code version is not ready for deployment.');
+            return false;
+        }
+        const res = yield server.createRoutineCodeDeployment({
+            Name: name,
+            CodeVersions: [{ Percentage: 100, CodeVersion: codeVersion }],
+            Strategy: 'percentage',
+            Env: environment
+        });
+        if (res) {
+            logger.success(`Your code has been successfully deployed to ${chalk.cyan(environment)}`);
+            return true;
+        }
+        else {
+            logger.error('Your code has not been deployed');
+            return false;
+        }
+    });
+}
+/**
+ * Poll routine code version status until it becomes ready
+ */
+export function waitForCodeVersionReady(name_1, codeVersion_1) {
+    return __awaiter(this, arguments, void 0, function* (name, codeVersion, timeoutMs = 5 * 60 * 1000, intervalMs = 1000) {
+        var _a, _b;
+        if (!name || !codeVersion) {
+            return false;
+        }
+        const server = yield ApiService.getInstance();
+        const start = Date.now();
+        logger.log(`⏳ Waiting for code version ${chalk.cyan(codeVersion)} to be ready...`);
+        while (Date.now() - start < timeoutMs) {
+            try {
+                const info = yield server.getRoutineCodeVersionInfo({
+                    Name: name,
+                    CodeVersion: codeVersion
+                });
+                const status = (_b = (_a = info === null || info === void 0 ? void 0 : info.data) === null || _a === void 0 ? void 0 : _a.Status) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+                if (status === 'init') {
+                    yield sleep(intervalMs);
+                    continue;
+                }
+                else if (status === 'available') {
+                    logger.log(`✅ Code version ${chalk.cyan(codeVersion)} is ready.`);
+                    return true;
+                }
+                else {
+                    logger.error(`Code version ${chalk.cyan(codeVersion)} build ${status}.`);
+                    return false;
+                }
+            }
+            catch (e) {
+                // swallow and retry until timeout
+                console.log(e);
+            }
+        }
+        logger.error(`⏰ Waiting for code version ${chalk.cyan(codeVersion)} timed out.`);
+        return false;
+    });
+}
+/**
+ * 通用的部署成功显示函数
+ * 显示部署成功信息、访问链接和后续操作指南
+ */
+export function displayDeploySuccess(projectName_1) {
+    return __awaiter(this, arguments, void 0, function* (projectName, showDomainGuide = true, showRouteGuide = true) {
+        var _a;
+        const service = yield ApiService.getInstance();
+        const res = yield service.getRoutine({ Name: projectName });
+        const defaultUrl = (_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.DefaultRelatedRecord;
+        const visitUrl = defaultUrl ? 'http://' + defaultUrl : '';
+        if (showDomainGuide) {
+            logger.log(`👉 ${t('deploy_success_guide').d('Run this command to add domains')}: ${chalk.green('esa domain add <DOMAIN>')}`);
+        }
+        if (showRouteGuide) {
+            logger.log(`👉 ${t('deploy_success_guide_2').d('Run this command to add routes')}: ${chalk.green('esa route add -r <ROUTE> -s <SITE>')}`);
+        }
+        logger.success(`${t('init_deploy_success').d('Project deployment completed. Visit: ')}${chalk.yellowBright(visitUrl)}`);
+        logger.warn(t('deploy_url_warn').d('The domain may take some time to take effect, please try again later.'));
+    });
+}
+/**
+ * 通用的快速部署函数（用于init命令）
+ * 结合了登录检查、routine创建、代码提交和部署的完整流程
+ */
+export function quickDeployForInit(targetPath_1, projectConfig_1) {
+    return __awaiter(this, arguments, void 0, function* (targetPath, projectConfig, description = 'Quick deploy from init') {
+        var _a, _b;
+        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.')));
+            return false;
+        }
+        yield ensureRoutineExists(projectConfig.name);
+        const isProdSuccess = yield commitAndDeployVersion(projectConfig, projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry, (_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory, description, targetPath, 'all');
+        if (isProdSuccess) {
+            yield displayDeploySuccess((_b = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.name) !== null && _b !== void 0 ? _b : '');
+        }
+        return isProdSuccess;
+    });
+}

package/dist/commands/config.js

@@ -1,8 +1,8 @@
 import fs from 'fs';
 import spawn from 'cross-spawn';
-import { projectConfigPath, cliConfigPath } from '../utils/fileUtils/index.js';
 import t from '../i18n/index.js';
 import logger from '../libs/logger.js';
+import { projectConfigPath, cliConfigPath } from '../utils/fileUtils/index.js';
 const editConfigFile = (configPath) => {
     const editor = process.env.EDITOR || 'vi';
     spawn(editor, [configPath], {

package/dist/commands/deploy/helper.js

@@ -7,16 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import chalk from 'chalk';
+import moment from 'moment';
 import SelectItems from '../../components/selectInput.js';
 import { yesNoPrompt } from '../../components/yesNoPrompt.js';
+import t from '../../i18n/index.js';
 import { PublishType } from '../../libs/interface.js';
-import { ApiService } from '../../libs/apiService.js';
-import { descriptionInput } from '../../components/descriptionInput.js';
-import { readEdgeRoutineFile } from '../../utils/fileUtils/index.js';
-import { createEdgeRoutine, releaseOfficialVersion, uploadEdgeRoutineCode } from '../commit/index.js';
 import logger from '../../libs/logger.js';
-import t from '../../i18n/index.js';
-import prodBuild from '../commit/prodBuild.js';
 export function yesNoPromptAndExecute(message, execute) {
     return new Promise((resolve) => {
         yesNoPrompt((item) => __awaiter(this, void 0, void 0, function* () {
@@ -47,7 +44,7 @@ export function promptSelectVersion(versionList) {
         SelectItems({ items, handleSelect: handleSelection });
     });
 }
-export function displaySelectDeployType() {
+export function displaySelectDeployEnv() {
     logger.log(`📃 ${t('deploy_env_select_description').d('Please select which environment you want to deploy')}`);
     const selectItems = [
         { label: t('deploy_env_staging').d('Staging'), value: PublishType.Staging },
@@ -63,35 +60,33 @@ export function displaySelectDeployType() {
         SelectItems({ items: selectItems, handleSelect: handleSelection });
     });
 }
-export function createAndDeployVersion(projectConfig_1) {
-    return __awaiter(this, arguments, void 0, function* (projectConfig, createUnstable = false, customEntry) {
-        try {
-            const server = yield ApiService.getInstance();
-            const description = yield descriptionInput(createUnstable
-                ? `🖊️ ${t('deploy_description_routine').d('Enter the description of the routine')}:`
-                : `🖊️ ${t('deploy_description_version').d('Enter the description of the code version')}:`, false);
-            yield prodBuild(false, customEntry);
-            const code = readEdgeRoutineFile();
-            const edgeRoutine = {
-                name: projectConfig.name,
-                code: code || '',
-                description: description
-            };
-            if (createUnstable) {
-                return yield createEdgeRoutine(edgeRoutine);
-            }
-            else {
-                const uploadResult = yield uploadEdgeRoutineCode(edgeRoutine);
-                if (!uploadResult) {
-                    return false;
-                }
-                return yield releaseOfficialVersion(edgeRoutine);
-            }
-        }
-        catch (error) {
-            logger.error(`
-      ${t('deploy_error').d('An error occurred during the creation or publishing process')}: ${error}`);
-            return false;
+export function displayVersionList(allVersions, stagingVersions, productionVersions) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        logger.log(`${chalk.bgYellow('Active')} ${t('deploy_env_staging').d('Staging')}`);
+        logger.log(`${chalk.bgGreen('Active')} ${t('deploy_env_production').d('Production')}`);
+        const data = [];
+        for (let i = 0; i < allVersions.length; i++) {
+            const version = allVersions[i];
+            const createTime = moment(version.createTime).format('YYYY/MM/DD HH:mm:ss');
+            const tags = [
+                stagingVersions.includes((_a = version.codeVersion) !== null && _a !== void 0 ? _a : '')
+                    ? chalk.bgYellow('Active')
+                    : '',
+                productionVersions.includes((_b = version.codeVersion) !== null && _b !== void 0 ? _b : '')
+                    ? chalk.bgGreen('Active')
+                    : ''
+            ];
+            data.push([
+                `${version.codeVersion} ${tags.join(' ')}`,
+                createTime,
+                (_c = version.codeDescription) !== null && _c !== void 0 ? _c : ''
+            ]);
         }
+        logger.table([
+            t('deploy_table_header_version').d('Version'),
+            t('deploy_table_header_created').d('Created'),
+            t('deploy_table_header_description').d('Description')
+        ], data);
     });
 }