esa-cli 1.0.1 → 1.0.2-beta.1

package/README.md

@@ -3,10 +3,10 @@
 ESA CLI is a command-line tool for building with Alibaba Cloud ESA Functions and Pages.
 
 <p>
-  <a href="https://discord.gg/xygV6MYx">
+  <a href="https://discord.gg/BxcRVEeh">
     <img alt="Discord CN" src="https://img.shields.io/badge/Discord-中文-5865F2?logo=discord&logoColor=white" />
   </a>
-  <a href="https://discord.gg/YeFg4yUA" style="margin-left:8px;">
+  <a href="https://discord.gg/SHYe5926" style="margin-left:8px;">
     <img alt="Discord EN" src="https://img.shields.io/badge/Discord-English-5865F2?logo=discord&logoColor=white" />
   </a>
  </p>

package/dist/commands/commit/index.js

@@ -39,6 +39,11 @@ const commit = {
             alias: 'n',
             describe: t('commit_option_name').d('Functions& Pages name'),
             type: 'string'
+        })
+            .option('bundle', {
+            describe: 'Bundle with esbuild (use --no-bundle to skip)',
+            type: 'boolean',
+            default: true
         });
     },
     handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
@@ -68,7 +73,7 @@ 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 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, undefined, argv.bundle === false);
         const { isSuccess } = res || {};
         if (!isSuccess) {
             logger.endSubStep('Generate version failed');

package/dist/commands/common/utils.js

@@ -120,9 +120,9 @@ export function getRoutineDetails(projectName) {
  * 支持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) {
+    return __awaiter(this, arguments, void 0, function* (projectName, description, entry, assets, minify = false, projectPath, noBundle = false) {
         var _a;
-        const { zip, sourceList, dynamicSources } = yield compress(entry, assets, minify, projectPath);
+        const { zip, sourceList, dynamicSources } = yield compress(entry, assets, minify, projectPath, noBundle);
         // Pretty print upload directory tree
         const buildTree = (paths, decorateTopLevel) => {
             const root = { children: new Map(), isFile: false };
@@ -260,7 +260,7 @@ export function deployToEnvironments(name, codeVersion, env) {
  * 结合了压缩、提交和部署的完整流程
  */
 export function commitAndDeployVersion(projectName_1, scriptEntry_1, assets_1) {
-    return __awaiter(this, arguments, void 0, function* (projectName, scriptEntry, assets, description = '', projectPath, env = 'production', minify = false, version) {
+    return __awaiter(this, arguments, void 0, function* (projectName, scriptEntry, assets, description = '', projectPath, env = 'production', minify = false, version, noBundle = false) {
         var _a, _b, _c;
         const projectInfo = yield validateAndInitializeProject(projectName, projectPath);
         if (!projectInfo) {
@@ -274,7 +274,7 @@ export function commitAndDeployVersion(projectName_1, scriptEntry_1, assets_1) {
             logger.endSubStep(deployed ? 'Deploy finished' : 'Deploy failed');
             return deployed;
         }
-        const res = yield generateCodeVersion(projectInfo.projectName, description, scriptEntry || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry), assets || ((_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory), minify || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.minify), projectPath);
+        const res = yield generateCodeVersion(projectInfo.projectName, description, scriptEntry || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry), assets || ((_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory), minify || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.minify), projectPath, noBundle);
         const isCommitSuccess = res === null || res === void 0 ? void 0 : res.isSuccess;
         if (!isCommitSuccess) {
             logger.endSubStep('Generate version failed');
@@ -317,6 +317,32 @@ export function deployCodeVersion(name, codeVersion, environment) {
         }
     });
 }
+/**
+ * Deploy specified multiple versions and their percentages
+ */
+export function deployCodeVersions(name, versions, env) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const server = yield ApiService.getInstance();
+        const doDeploy = (targetEnv) => __awaiter(this, void 0, void 0, function* () {
+            const res = yield server.createRoutineCodeDeployment({
+                Name: name,
+                CodeVersions: versions.map((v) => ({
+                    Percentage: v.percentage,
+                    CodeVersion: v.codeVersion
+                })),
+                Strategy: 'percentage',
+                Env: targetEnv
+            });
+            return !!res;
+        });
+        if (env === 'all') {
+            const s = yield doDeploy('staging');
+            const p = yield doDeploy('production');
+            return s && p;
+        }
+        return yield doDeploy(env);
+    });
+}
 /**
  * Poll routine code version status until it becomes ready
  */
@@ -417,3 +443,57 @@ export function displayDeploySuccess(projectName_1) {
         logger.block();
     });
 }
+/**
+ * Parse --versions parameter and execute distributed deployment by percentage; print display and percentage allocation after successful deployment
+ */
+export function deployWithVersionPercentages(nameArg, versionsArg, env, projectPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const raw = (versionsArg || [])
+            .flatMap((v) => String(v).split(','))
+            .map((s) => s.trim())
+            .filter(Boolean);
+        const pairs = raw.map((s) => {
+            const [codeVersion, percentStr] = s.split(':');
+            return {
+                codeVersion: codeVersion === null || codeVersion === void 0 ? void 0 : codeVersion.trim(),
+                percentage: Number((percentStr || '').trim())
+            };
+        });
+        if (pairs.length > 2) {
+            logger.error('Deploy failed: at most two versions are supported');
+            return false;
+        }
+        if (pairs.some((p) => !p.codeVersion || Number.isNaN(p.percentage) || p.percentage < 0)) {
+            logger.error('Deploy failed: invalid --versions format. Use v1:80,v2:20');
+            return false;
+        }
+        if (pairs.length === 1) {
+            if (pairs[0].percentage !== 100) {
+                logger.error('Deploy failed: single version must be 100%');
+                return false;
+            }
+        }
+        else if (pairs.length === 2) {
+            const sum = pairs[0].percentage + pairs[1].percentage;
+            if (sum !== 100) {
+                logger.error('Deploy failed: percentages must sum to 100');
+                return false;
+            }
+        }
+        const projectInfo = yield validateAndInitializeProject(nameArg, projectPath);
+        if (!projectInfo) {
+            return false;
+        }
+        const ok = yield deployCodeVersions(projectInfo.projectName, pairs, env);
+        if (!ok)
+            return false;
+        yield displayDeploySuccess(projectInfo.projectName, true, true);
+        logger.block();
+        logger.log('📦 Versions rollout:');
+        pairs.forEach((p) => {
+            logger.log(`- ${p.codeVersion}: ${p.percentage}%`);
+        });
+        logger.block();
+        return true;
+    });
+}

package/dist/commands/deploy/index.js

@@ -12,7 +12,7 @@ import { intro, outro } from '@clack/prompts';
 import t from '../../i18n/index.js';
 import { getRoot } from '../../utils/fileUtils/base.js';
 import { getProjectConfig } from '../../utils/fileUtils/index.js';
-import { commitAndDeployVersion, displayDeploySuccess } from '../common/utils.js';
+import { commitAndDeployVersion, displayDeploySuccess, deployWithVersionPercentages } from '../common/utils.js';
 const deploy = {
     command: 'deploy [entry]',
     builder: (yargs) => {
@@ -52,6 +52,15 @@ const deploy = {
             alias: 'm',
             describe: t('deploy_option_minify').d('Minify the code'),
             type: 'boolean'
+        })
+            .option('bundle', {
+            describe: 'Bundle with esbuild (use --no-bundle to skip)',
+            type: 'boolean',
+            default: true
+        })
+            .option('versions', {
+            describe: 'Deploy two versions with percentages, format: v1:80,v2:20 or repeat --versions v1:80 --versions v2:20',
+            type: 'array'
         });
     },
     describe: `🚀 ${t('deploy_describe').d('Deploy your project')}`,
@@ -65,8 +74,15 @@ export function handleDeploy(argv) {
         var _a;
         const entry = argv.entry;
         const assets = (_a = argv.assets) !== null && _a !== void 0 ? _a : undefined;
+        const versionsArg = argv.versions || [];
         intro(`Deploy an application with ESA`);
-        const success = yield commitAndDeployVersion(argv.name || undefined, entry, assets, argv.description || '', getRoot(), argv.environment || 'all', argv.minify, argv.version);
+        if (versionsArg.length > 0) {
+            const env = argv.environment || 'all';
+            const ok = yield deployWithVersionPercentages(argv.name || undefined, versionsArg, env, getRoot());
+            outro(ok ? 'Deploy finished' : 'Deploy failed');
+            exit(ok ? 0 : 1);
+        }
+        const success = yield commitAndDeployVersion(argv.name || undefined, entry, assets, argv.description || '', getRoot(), argv.environment || 'all', argv.minify, argv.version, (argv.bundle === false));
         outro(success ? 'Deploy finished' : 'Deploy failed');
         if (success) {
             const projectConfig = getProjectConfig(getRoot());

package/dist/commands/login/index.js

@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { isCancel, select as clackSelect, text as clackText } 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';
-import { getApiConfig, getCliConfig, updateCliConfigFile, generateDefaultConfig } from '../../utils/fileUtils/index.js';
+import { getCliConfig, updateCliConfigFile, generateDefaultConfig } from '../../utils/fileUtils/index.js';
+import { validateCredentials } from '../../utils/validateCredentials.js';
 const login = {
     command: 'login',
     describe: `🔑 ${t('login_describe').d('Login to the server')}`,
@@ -38,17 +38,34 @@ export default login;
 export function handleLogin(argv) {
     return __awaiter(this, void 0, void 0, function* () {
         generateDefaultConfig();
+        if (process.env.ESA_ACCESS_KEY_ID && process.env.ESA_ACCESS_KEY_SECRET) {
+            const result = yield validateCredentials(process.env.ESA_ACCESS_KEY_ID, process.env.ESA_ACCESS_KEY_SECRET);
+            if (result.valid) {
+                logger.log(t('login_get_credentials_from_environment_variables').d('Get credentials from environment variables'));
+                logger.success(t('login_success').d('Login success!'));
+            }
+            else {
+                logger.error(result.message || 'Login failed');
+            }
+            return;
+        }
         const accessKeyId = argv === null || argv === void 0 ? void 0 : argv['access-key-id'];
         const accessKeySecret = argv === null || argv === void 0 ? void 0 : argv['access-key-secret'];
         if (accessKeyId && accessKeySecret) {
-            yield handleLoginWithAKSK(accessKeyId, accessKeySecret);
-            return;
-        }
-        if (process.env.ESA_ACCESS_KEY_ID && process.env.ESA_ACCESS_KEY_SECRET) {
-            logger.log(`🔑 ${t('login_get_from_env').d(`Get AccessKey ID and AccessKey Secret from environment variables.`)}`);
-            yield handleLoginWithAKSK(process.env.ESA_ACCESS_KEY_ID, process.env.ESA_ACCESS_KEY_SECRET);
+            const result = yield validateCredentials(accessKeyId, accessKeySecret);
+            if (result.valid) {
+                logger.success(t('login_success').d('Login success!'));
+                updateCliConfigFile(Object.assign({ auth: {
+                        accessKeyId,
+                        accessKeySecret
+                    } }, (result.endpoint ? { endpoint: result.endpoint } : {})));
+            }
+            else {
+                logger.error(result.message || 'Login failed');
+            }
             return;
         }
+        // interactive login
         const cliConfig = getCliConfig();
         if (!cliConfig)
             return;
@@ -56,9 +73,8 @@ export function handleLogin(argv) {
             cliConfig.auth &&
             cliConfig.auth.accessKeyId &&
             cliConfig.auth.accessKeySecret) {
-            const service = yield ApiService.getInstance();
-            const loginStatus = yield service.checkLogin();
-            if (loginStatus.success) {
+            const loginStatus = yield validateCredentials(cliConfig.auth.accessKeyId, cliConfig.auth.accessKeySecret);
+            if (loginStatus.valid) {
                 logger.warn(t('login_already').d('You are already logged in.'));
                 const selected = (yield clackSelect({
                     message: t('login_existing_credentials_message').d('Existing credentials found. What do you want to do?'),
@@ -73,47 +89,15 @@ export function handleLogin(argv) {
                 if (isCancel(selected) || selected === 'exit') {
                     return;
                 }
-                yield getUserInputAuthInfo();
             }
             else {
                 logger.error(t('pre_login_failed').d('The previously entered Access Key ID (AK) and Secret Access Key (SK) are incorrect. Please enter them again.'));
-                logger.log(`${t('login_logging').d('Logging in')}...`);
-                yield getUserInputAuthInfo();
-            }
-        }
-        else {
-            logger.log(`${t('login_logging').d('Logging in')}...`);
-            yield getUserInputAuthInfo();
-        }
-    });
-}
-function handleLoginWithAKSK(accessKeyId, accessKeySecret) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let apiConfig = getApiConfig();
-        apiConfig.auth = {
-            accessKeyId,
-            accessKeySecret
-        };
-        try {
-            yield updateCliConfigFile({
-                auth: apiConfig.auth
-            });
-            const service = yield ApiService.getInstance();
-            service.updateConfig(apiConfig);
-            const loginStatus = yield service.checkLogin();
-            if (loginStatus.success) {
-                logger.success(t('login_success').d('Login success!'));
             }
-            else {
-                logger.error(loginStatus.message || 'Login failed');
-            }
-        }
-        catch (error) {
-            logger.error(t('login_failed').d('An error occurred while trying to log in.'));
         }
+        yield interactiveLogin();
     });
 }
-export function getUserInputAuthInfo() {
+export function interactiveLogin() {
     return __awaiter(this, void 0, void 0, function* () {
         const styledUrl = chalk.underline.blue('https://ram.console.aliyun.com/manage/ak');
         logger.log(`🔑 ${chalk.underline(t('login_get_ak_sk').d(`Please go to the following link to get your account's AccessKey ID and AccessKey Secret`))}`);
@@ -122,27 +106,16 @@ export function getUserInputAuthInfo() {
         const accessKeySecret = (yield clackText({
             message: 'AccessKey Secret:'
         }));
-        let apiConfig = getApiConfig();
-        apiConfig.auth = {
-            accessKeyId,
-            accessKeySecret
-        };
-        try {
-            yield updateCliConfigFile({
-                auth: apiConfig.auth
-            });
-            const service = yield ApiService.getInstance();
-            service.updateConfig(apiConfig);
-            const loginStatus = yield service.checkLogin();
-            if (loginStatus.success) {
-                logger.success(t('login_success').d('Login success!'));
-            }
-            else {
-                logger.error(loginStatus.message || 'Login failed');
-            }
+        const loginStatus = yield validateCredentials(accessKeyId, accessKeySecret);
+        if (loginStatus.valid) {
+            yield updateCliConfigFile(Object.assign({ auth: {
+                    accessKeyId,
+                    accessKeySecret
+                } }, (loginStatus.endpoint ? { endpoint: loginStatus.endpoint } : {})));
+            logger.success(t('login_success').d('Login success!'));
         }
-        catch (error) {
-            logger.error(t('login_failed').d('An error occurred while trying to log in.'));
+        else {
+            logger.error(loginStatus.message || 'Login failed');
         }
     });
 }

package/dist/commands/utils.js

@@ -18,6 +18,7 @@ import logger from '../libs/logger.js';
 import { getRoot } from '../utils/fileUtils/base.js';
 import { getCliConfig, projectConfigPath } from '../utils/fileUtils/index.js';
 import { getRoutineDetails } from './common/utils.js';
+import { validateCredentials } from '../utils/validateCredentials.js';
 export const checkDirectory = (isCheckGit = false) => {
     const root = getRoot();
     if (fs.existsSync(projectConfigPath)) {
@@ -78,55 +79,26 @@ export function validDomain(domain) {
 export function checkIsLoginSuccess() {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        let accessKeyId = process.env.ESA_ACCESS_KEY_ID;
-        let accessKeySecret = process.env.ESA_ACCESS_KEY_SECRET;
-        let endpoint = process.env.ESA_ENDPOINT;
         const cliConfig = getCliConfig();
-        if (!accessKeyId || !accessKeySecret) {
-            accessKeyId = (_a = cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.auth) === null || _a === void 0 ? void 0 : _a.accessKeyId;
-            accessKeySecret = (_b = cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.auth) === null || _b === void 0 ? void 0 : _b.accessKeySecret;
-        }
-        if (!endpoint) {
-            endpoint = cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.endpoint;
-        }
-        const namedCommand = chalk.green('esa-cli login');
-        if (!accessKeyId || !accessKeySecret) {
-            logger.log(`❌ ${t('utils_login_error').d('Maybe you are not logged in yet.')}`);
-            logger.log(`🔔 ${t('utils_login_error_config', { namedCommand }).d(`Please run command to login: ${namedCommand}`)}`);
-            return false;
-        }
-        return yield validateLoginCredentials(accessKeyId, accessKeySecret, endpoint, namedCommand);
-    });
-}
-/**
- * 验证登录凭据的公共函数
- * @param accessKeyId AccessKey ID
- * @param accessKeySecret AccessKey Secret
- * @param namedCommand 命令名称（用于错误提示）
- * @param showError 是否显示错误信息
- * @returns 登录是否成功
- */
-export function validateLoginCredentials(accessKeyId_1, accessKeySecret_1, endpoint_1, namedCommand_1) {
-    return __awaiter(this, arguments, void 0, function* (accessKeyId, accessKeySecret, endpoint, namedCommand, showError = true) {
-        const server = yield ApiService.getInstance();
-        server.updateConfig({
-            auth: {
-                accessKeyId,
-                accessKeySecret
-            },
-            endpoint: endpoint
-        });
-        const res = yield server.checkLogin();
-        if (res.success) {
-            return true;
-        }
-        if (showError) {
-            logger.log(res.message || '');
-            logger.log(`❌ ${t('utils_login_error').d('Maybe you are not logged in yet.')}`);
-            if (namedCommand) {
-                logger.log(`🔔 ${t('utils_login_error_config', { namedCommand }).d(`Please run command to login: ${namedCommand}`)}`);
+        let accessKeyId = process.env.ESA_ACCESS_KEY_ID || ((_a = cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.auth) === null || _a === void 0 ? void 0 : _a.accessKeyId);
+        let accessKeySecret = process.env.ESA_ACCESS_KEY_SECRET || ((_b = cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.auth) === null || _b === void 0 ? void 0 : _b.accessKeySecret);
+        if (accessKeyId && accessKeySecret) {
+            const result = yield validateCredentials(accessKeyId, accessKeySecret);
+            const server = yield ApiService.getInstance();
+            if (result.valid) {
+                server.updateConfig({
+                    auth: {
+                        accessKeyId,
+                        accessKeySecret
+                    },
+                    endpoint: result.endpoint
+                });
+                return true;
             }
         }
+        const namedCommand = chalk.green('esa-cli login');
+        logger.log(`❌ ${t('utils_login_error').d('Maybe you are not logged in yet.')}`);
+        logger.log(`🔔 ${t('utils_login_error_config', { namedCommand }).d(`Please run command to login: ${namedCommand}`)}`);
         return false;
     });
 }