esa-cli 1.0.3-beta.4 → 1.0.4-beta.0

package/dist/commands/commit/index.js

@@ -13,6 +13,7 @@ import chalk from 'chalk';
 import t from '../../i18n/index.js';
 import logger from '../../libs/logger.js';
 import promptParameter from '../../utils/prompt.js';
+import { checkAndCleanupVersions } from '../utils.js';
 import { validateAndInitializeProject, generateCodeVersion } from '../common/utils.js';
 const commit = {
     command: 'commit [entry]',
@@ -44,6 +45,10 @@ const commit = {
             describe: 'Bundle with esbuild (use --no-bundle to skip)',
             type: 'boolean',
             default: true
+        })
+            .option('version-limit', {
+            describe: t('commit_option_version_limit').d('Maximum number of versions to keep. Oldest unreleased versions will be deleted if exceeded.'),
+            type: 'number'
         });
     },
     handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
@@ -59,7 +64,12 @@ export function handleCommit(argv) {
         const projectInfo = yield validateAndInitializeProject(argv === null || argv === void 0 ? void 0 : argv.name);
         if (!projectInfo)
             return;
-        const { projectName } = projectInfo;
+        const { projectName, projectConfig } = projectInfo;
+        // Cleanup old versions if limit is specified
+        const limit = argv['version-limit'] || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.versionLimit);
+        if (limit) {
+            yield checkAndCleanupVersions(projectName, limit, true);
+        }
         let description;
         if (argv.description) {
             description = argv.description;

package/dist/commands/common/utils.js

@@ -15,7 +15,7 @@ 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';
+import { checkAndCleanupVersions, checkIsLoginSuccess } from '../utils.js';
 function normalizeNotFoundStrategy(value) {
     if (!value)
         return undefined;
@@ -260,21 +260,26 @@ 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, noBundle = false) {
+    return __awaiter(this, arguments, void 0, function* (projectName, scriptEntry, assets, description = '', projectPath, env = 'production', minify = false, version, noBundle = false, versionLimit) {
         var _a, _b, _c;
         const projectInfo = yield validateAndInitializeProject(projectName, projectPath);
         if (!projectInfo) {
             return false;
         }
-        const { projectConfig } = projectInfo;
+        const { projectConfig, projectName: resolvedProjectName } = projectInfo;
+        // Cleanup old versions if limit is specified
+        const limit = versionLimit || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.versionLimit);
+        if (limit) {
+            yield checkAndCleanupVersions(resolvedProjectName, limit, !version);
+        }
         // 2) Use existing version or generate a new one
         if (version) {
             logger.startSubStep(`Using existing version ${version}`);
-            const deployed = yield deployToEnvironments(projectInfo.projectName, version, env);
+            const deployed = yield deployToEnvironments(resolvedProjectName, version, env);
             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, noBundle);
+        const res = yield generateCodeVersion(resolvedProjectName, 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');

package/dist/commands/deploy/index.js

@@ -61,6 +61,10 @@ const deploy = {
             .option('versions', {
             describe: 'Deploy two versions with percentages, format: v1:80,v2:20 or repeat --versions v1:80 --versions v2:20',
             type: 'array'
+        })
+            .option('version-limit', {
+            describe: t('deploy_option_version_limit').d('Maximum number of versions to keep. Oldest unreleased versions will be deleted if exceeded.'),
+            type: 'number'
         });
     },
     describe: `🚀 ${t('deploy_describe').d('Deploy your project')}`,
@@ -82,7 +86,7 @@ export function handleDeploy(argv) {
             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));
+        const success = yield commitAndDeployVersion(argv.name || undefined, entry, assets, argv.description || '', getRoot(), argv.environment || 'all', argv.minify, argv.version, (argv.bundle === false), argv['version-limit']);
         outro(success ? 'Deploy finished' : 'Deploy failed');
         if (success) {
             const projectConfig = getProjectConfig(getRoot());

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

@@ -1,10 +1,8 @@
-import worker from '$userPath';
 import Cache from './mock/cache.js';
 import mockKV from './mock/kv.js';
+import worker from '$userPath';
 
-var mock_cache = new Cache($userPort);
-globalThis.mockCache = mock_cache;
+Cache.port = $userPort;
 mockKV.port = $userPort;
-globalThis.mockKV = mockKV;
 
 export default worker;

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

@@ -1,7 +1,7 @@
 class MockCache {
-  constructor(port) {
-    this.port = port;
-  }
+  static port = 0;
+
+  constructor() {}
 
   async put(reqOrUrl, response) {
     if (arguments.length < 2) {
@@ -30,7 +30,7 @@ class MockCache {
 
       const key = this.normalizeKey(reqOrUrl);
       const fetchRes = await fetch(
-        `http://localhost:${this.port}/mock_cache/put`,
+        `http://localhost:${MockCache.port}/mock_cache/put`,
         {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
@@ -58,7 +58,7 @@ class MockCache {
   async get(reqOrUrl) {
     const key = this.normalizeKey(reqOrUrl);
     const fetchRes = await fetch(
-      `http://localhost:${this.port}/mock_cache/get`,
+      `http://localhost:${MockCache.port}/mock_cache/get`,
       {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
@@ -85,7 +85,7 @@ class MockCache {
   async delete(reqOrUrl) {
     const key = this.normalizeKey(reqOrUrl);
     const fetchRes = await fetch(
-      `http://localhost:${this.port}/mock_cache/delete`,
+      `http://localhost:${MockCache.port}/mock_cache/delete`,
       {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
@@ -113,4 +113,7 @@ class MockCache {
   }
 }
 
+var mock_cache = new MockCache();
+globalThis.mockCache = mock_cache;
+
 export default MockCache;

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

@@ -163,4 +163,6 @@ class EdgeKV {
   }
 }
 
+globalThis.mockKV = EdgeKV;
+
 export default EdgeKV;

package/dist/commands/init/helper.js

@@ -17,7 +17,7 @@ import Haikunator from 'haikunator';
 import t from '../../i18n/index.js';
 import logger from '../../libs/logger.js';
 import Template from '../../libs/templates/index.js';
-import { execCommand } from '../../utils/command.js';
+import { execCommand, execWithLoginShell } from '../../utils/command.js';
 import { getDirName } from '../../utils/fileUtils/base.js';
 import { generateConfigFile, getCliConfig, getProjectConfig, getTemplatesConfig, templateHubPath, updateProjectConfigFile } from '../../utils/fileUtils/index.js';
 import promptParameter from '../../utils/prompt.js';
@@ -382,7 +382,7 @@ export const createProject = (initParams) => __awaiter(void 0, void 0, void 0, f
         const templateFlag = ((_a = frameworkConfig.language) === null || _a === void 0 ? void 0 : _a[initParams.language || 'typescript']) || '';
         const extraParams = frameworkConfig.params || '';
         const full = `${command} ${initParams.name} ${templateFlag} ${extraParams}`.trim();
-        const res = yield execCommand(['sh', '-lc', full], {
+        const res = yield execWithLoginShell(full, {
             interactive: true,
             startText: `Starting to execute framework command ${chalk.gray(full)}`,
             doneText: `Framework command executed  ${chalk.gray(full)}`

package/dist/commands/utils.js

@@ -153,3 +153,61 @@ export const getRoutineCodeVersions = (projectName) => __awaiter(void 0, void 0,
     const productionVersions = ((_m = (_l = (_k = (_j = (_h = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _h === void 0 ? void 0 : _h.Envs) === null || _j === void 0 ? void 0 : _j.find((item) => item.Env === 'production')) === null || _k === void 0 ? void 0 : _k.CodeDeploy) === null || _l === void 0 ? void 0 : _l.CodeVersions) === null || _m === void 0 ? void 0 : _m.map((item) => item.CodeVersion)) || [];
     return { allVersions, stagingVersions, productionVersions };
 });
+/**
+ * Check the total number of versions and delete the oldest unreleased ones if they exceed the limit.
+ * @param projectName Name of the project
+ * @param limit The maximum number of versions to keep
+ * @param isCreatingNewVersion Whether a new version will be created after cleanup
+ */
+export function checkAndCleanupVersions(projectName_1, limit_1) {
+    return __awaiter(this, arguments, void 0, function* (projectName, limit, isCreatingNewVersion = true) {
+        if (limit <= 0)
+            return;
+        const { allVersions, stagingVersions, productionVersions } = yield getRoutineCodeVersions(projectName);
+        const currentCount = allVersions.length;
+        const targetCount = isCreatingNewVersion ? limit - 1 : limit;
+        if (currentCount <= targetCount) {
+            return;
+        }
+        const deployedVersions = new Set([...stagingVersions, ...productionVersions]);
+        // Filter versions that are not currently deployed
+        const undeployedVersions = allVersions.filter((v) => v.codeVersion && !deployedVersions.has(v.codeVersion));
+        // Sort by createTime (oldest first)
+        undeployedVersions.sort((a, b) => {
+            const timeA = a.createTime ? new Date(a.createTime).getTime() : 0;
+            const timeB = b.createTime ? new Date(b.createTime).getTime() : 0;
+            return timeA - timeB;
+        });
+        const numToDelete = currentCount - targetCount;
+        const toDelete = undeployedVersions.slice(0, numToDelete);
+        if (toDelete.length > 0) {
+            logger.info(t('cleanup_versions_start', {
+                count: toDelete.length.toString(),
+                limit: limit.toString()
+            }).d(`Cleaning up ${toDelete.length} oldest unreleased versions (limit: ${limit})...`));
+            const server = yield ApiService.getInstance();
+            for (const version of toDelete) {
+                if (!version.codeVersion)
+                    continue;
+                try {
+                    const res = yield server.deleteRoutineCodeVersion({
+                        Name: projectName,
+                        CodeVersion: version.codeVersion
+                    });
+                    if ((res === null || res === void 0 ? void 0 : res.Status) === 'OK') {
+                        logger.success(t('deployments_delete_success').d('Delete success') +
+                            `: ${version.codeVersion}`);
+                    }
+                    else {
+                        logger.warn(t('deployments_delete_failed').d('Delete failed') +
+                            `: ${version.codeVersion}`);
+                    }
+                }
+                catch (error) {
+                    logger.warn(t('deployments_delete_failed').d('Delete failed') +
+                        `: ${version.codeVersion}`);
+                }
+            }
+        }
+    });
+}

package/dist/docs/Commands_en.md

@@ -143,6 +143,9 @@ Description for Functions & Pages/version (skip interactive input)
 **--name, -n** _optional_  
 Functions & Pages name
 
+**--version-limit** _optional_  
+Maximum number of versions to keep. Oldest unreleased versions (not in staging or production) will be deleted if exceeded.
+
 ---
 
 ## deploy
@@ -174,6 +177,9 @@ Description of the version
 **--minify, -m** _optional_  
 Whether to minify the code
 
+**--version-limit** _optional_  
+Maximum number of versions to keep. Oldest unreleased versions (not in staging or production) will be deleted if exceeded.
+
 ---
 
 ## deployments

package/dist/docs/Commands_zh_CN.md

@@ -155,6 +155,9 @@ esa-cli commit [<ENTRY>] [OPTIONS]
 **--name, -n** _可选_
 **函数和Pages名称**
 
+**--version-limit** _可选_
+**保持的最大版本数量。如果超过此限制，将删除最旧的未发布版本（不处于仿真环境或线上环境的版本）。**
+
 ---
 
 ## deploy
@@ -186,6 +189,9 @@ esa-cli deploy [<ENTRY>] [OPTIONS]
 **--minify, -m** _可选_
 **是否压缩代码**
 
+**--version-limit** _可选_
+**保持的最大版本数量。如果超过此限制，将删除最旧的未发布版本（不处于仿真环境或线上环境的版本）。**
+
 ---
 
 ## deployments

package/dist/i18n/locales.json

@@ -1322,5 +1322,17 @@
   "login_get_credentials_from_environment_variables": {
     "en": "Get credentials from environment variables",
     "zh_CN": ""
+  },
+  "commit_option_version_limit": {
+    "en": "Maximum number of versions to keep. Oldest unreleased versions will be deleted if exceeded.",
+    "zh_CN": "保留的最大版本数量。如果超过此限制，最旧的未发布版本将被删除。"
+  },
+  "deploy_option_version_limit": {
+    "en": "Maximum number of versions to keep. Oldest unreleased versions will be deleted if exceeded.",
+    "zh_CN": "保留的最大版本数量。如果超过此限制，最旧的未发布版本将被删除。"
+  },
+  "cleanup_versions_start": {
+    "en": "Cleaning up ${toDelete.length} oldest unreleased versions (limit: ${limit})...",
+    "zh_CN": "正在清理 ${count} 个最旧的未发布版本（限制数量：${limit}）..."
   }
 }

package/dist/index.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import chalk from 'chalk';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import logger from './libs/logger.js';
 import commit from './commands/commit/index.js';
 import config from './commands/config.js';
 import deploy from './commands/deploy/index.js';
@@ -25,6 +24,7 @@ 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 logger from './libs/logger.js';
 import { handleCheckVersion, checkCLIVersion } from './utils/checkVersion.js';
 import { getCliConfig } from './utils/fileUtils/index.js';
 const main = () => __awaiter(void 0, void 0, void 0, function* () {

package/dist/libs/api.js

@@ -11,6 +11,7 @@ import ESA, * as $ESA from '@alicloud/esa20240910';
 import * as $OpenApi from '@alicloud/openapi-client';
 import * as $Util from '@alicloud/tea-util';
 import { getApiConfig } from '../utils/fileUtils/index.js';
+import { CLI_USER_AGENT } from './constants.js';
 import logger from './logger.js';
 class Client {
     constructor() {
@@ -77,7 +78,8 @@ class Client {
         const apiConfig = new $OpenApi.Config({
             accessKeyId: (_a = config.auth) === null || _a === void 0 ? void 0 : _a.accessKeyId,
             accessKeySecret: (_b = config.auth) === null || _b === void 0 ? void 0 : _b.accessKeySecret,
-            endpoint: config.endpoint
+            endpoint: config.endpoint,
+            userAgent: CLI_USER_AGENT
         });
         return new ESA.default(apiConfig);
     }

package/dist/libs/apiService.js

@@ -12,6 +12,7 @@ import FormData from 'form-data';
 import fetch from 'node-fetch';
 import t from '../i18n/index.js';
 import { getApiConfig } from '../utils/fileUtils/index.js';
+import { CLI_USER_AGENT } from './constants.js';
 import { Environment } from './interface.js';
 export class ApiService {
     constructor(cliConfig) {
@@ -19,7 +20,8 @@ export class ApiService {
         let apiConfig = new $OpenApi.Config({
             accessKeyId: (_a = cliConfig.auth) === null || _a === void 0 ? void 0 : _a.accessKeyId,
             accessKeySecret: (_b = cliConfig.auth) === null || _b === void 0 ? void 0 : _b.accessKeySecret,
-            endpoint: cliConfig.endpoint
+            endpoint: cliConfig.endpoint,
+            userAgent: CLI_USER_AGENT
         });
         this.client = new $OpenApi.default.default(apiConfig);
     }
@@ -37,7 +39,8 @@ export class ApiService {
         let apiConfig = new $OpenApi.Config({
             accessKeyId: (_a = newConfig.auth) === null || _a === void 0 ? void 0 : _a.accessKeyId,
             accessKeySecret: (_b = newConfig.auth) === null || _b === void 0 ? void 0 : _b.accessKeySecret,
-            endpoint: newConfig.endpoint
+            endpoint: newConfig.endpoint,
+            userAgent: CLI_USER_AGENT
         });
         this.client = new $OpenApi.default.default(apiConfig);
     }

package/dist/libs/constants.js

@@ -0,0 +1,13 @@
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+const packageJson = require('../../package.json');
+/**
+ * CLI User-Agent string for API requests
+ * Format: esa-cli/{version}
+ * This helps identify requests originating from the CLI
+ */
+export const CLI_USER_AGENT = `esa-cli/${packageJson.version}`;
+/**
+ * CLI version from package.json
+ */
+export const CLI_VERSION = packageJson.version;

package/dist/libs/logger.js

@@ -63,9 +63,6 @@ class Logger {
     get ora() {
         return this.spinner;
     }
-    get isDebug() {
-        return this.logger.level === 'debug';
-    }
     setLogLevel(level) {
         this.logger.level = level;
     }

package/dist/utils/command.js

@@ -7,15 +7,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { spawn } from 'child_process';
+import { platform } from 'os';
 import { cancel, spinner } from '@clack/prompts';
 import chalk from 'chalk';
-import spawn from 'cross-spawn';
-import logger from '../libs/logger.js';
+export const isWindows = platform() === 'win32';
 /**
  * Execute a shell command with rich options (spinner, capture, env, cwd).
  */
 export const execCommand = (command_1, ...args_1) => __awaiter(void 0, [command_1, ...args_1], void 0, function* (command, options = {}) {
-    const { startText, doneText, silent = false, captureOutput = false, useSpinner = true, realtimeOutput = false, interactive = false, env, cwd, transformOutput, fallbackOutput, errorMessage, debug = logger.isDebug } = options;
+    const { startText, doneText, silent = false, captureOutput = false, useSpinner = true, realtimeOutput = false, interactive = false, env, cwd, transformOutput, fallbackOutput, errorMessage, shell = false } = options;
     // Determine stdio mode based on options
     // If realtimeOutput is true, we need to pipe to capture and display output in real-time
     // If spinner is used without realtimeOutput, pipe to avoid TTY contention
@@ -56,7 +57,7 @@ export const execCommand = (command_1, ...args_1) => __awaiter(void 0, [command_
                 stdio,
                 cwd,
                 env: Object.assign(Object.assign({}, process.env), env),
-                shell: false
+                shell
             });
             if (stdio === 'pipe') {
                 (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (chunk) => {
@@ -141,27 +142,27 @@ export const execCommand = (command_1, ...args_1) => __awaiter(void 0, [command_
             if (stderr)
                 process.stderr.write(stderr);
         }
-        if (debug) {
-            console.error(chalk.red('\n--- DEBUG INFO ---'));
-            console.error(chalk.red(`Command: ${command.join(' ')}`));
-            if (cwd)
-                console.error(chalk.red(`CWD: ${cwd}`));
-            if (stdout)
-                console.error(chalk.red(`Stdout:\n${stdout}`));
-            if (stderr)
-                console.error(chalk.red(`Stderr:\n${stderr}`));
-            if (e instanceof Error && e.stack) {
-                console.error(chalk.red(`Stack:\n${e.stack}`));
-            }
-            else if (e && typeof e === 'object') {
-                console.error(chalk.red(`Error Object:\n${JSON.stringify(e, null, 2)}`));
-            }
-            console.error(chalk.red('------------------\n'));
-        }
         if (errorMessage) {
             cancel(errorMessage);
         }
         return { success: false, stdout, stderr };
     }
 });
+/**
+ * Execute a command with login shell on Unix (to load ~/.profile, ~/.zshrc etc.)
+ * On Windows, directly execute the command since login shell is not typically needed.
+ *
+ * @param commandStr - The full command string to execute
+ * @param options - ExecCommandOptions
+ */
+export const execWithLoginShell = (commandStr_1, ...args_1) => __awaiter(void 0, [commandStr_1, ...args_1], void 0, function* (commandStr, options = {}) {
+    if (isWindows) {
+        // Windows: use cmd /c to execute the command
+        return execCommand(['cmd', '/c', commandStr], options);
+    }
+    else {
+        // Unix: use login shell to ensure PATH is properly set (nvm, fnm, etc.)
+        return execCommand(['sh', '-lc', commandStr], options);
+    }
+});
 export default execCommand;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "1.0.3-beta.4",
+  "version": "1.0.4-beta.0",
   "description": "A CLI for operating Alibaba Cloud ESA Functions and Pages.",
   "main": "bin/enter.cjs",
   "type": "module",