esa-cli 1.0.8-beta.2 → 1.0.8-beta.3

package/dist/commands/login/index.js

@@ -13,42 +13,11 @@ import t from '../../i18n/index.js';
 import logger from '../../libs/logger.js';
 import { getCliConfig, updateCliConfigFile, generateDefaultConfig } from '../../utils/fileUtils/index.js';
 import { validateCredentials } from '../../utils/validateCredentials.js';
-/** Parse STS token string: "AccessKeyId,AccessKeySecret,SecurityToken" or JSON */
-function parseStsToken(raw) {
-    var _a, _b, _c;
-    const s = raw.trim();
-    if (!s)
-        return null;
-    if (s.startsWith('{')) {
-        try {
-            const o = JSON.parse(s);
-            const accessKeyId = (_a = o.AccessKeyId) !== null && _a !== void 0 ? _a : o.accessKeyId;
-            const accessKeySecret = (_b = o.AccessKeySecret) !== null && _b !== void 0 ? _b : o.accessKeySecret;
-            const securityToken = (_c = o.SecurityToken) !== null && _c !== void 0 ? _c : o.securityToken;
-            if (accessKeyId && accessKeySecret && securityToken) {
-                return { accessKeyId, accessKeySecret, securityToken };
-            }
-        }
-        catch (_d) {
-            return null;
-        }
-        return null;
-    }
-    const parts = s.split(',').map((p) => p.trim());
-    if (parts.length >= 3) {
-        return {
-            accessKeyId: parts[0],
-            accessKeySecret: parts[1],
-            securityToken: parts.slice(2).join(',').trim()
-        };
-    }
-    return null;
-}
 const login = {
     command: 'login',
     describe: `🔑 ${t('login_describe').d('Login to the server')}`,
     builder: (yargs) => {
-        var _a, _b, _c;
+        var _a, _b;
         return yargs
             .option('access-key-id', {
             alias: 'ak',
@@ -59,10 +28,6 @@ const login = {
             alias: 'sk',
             describe: (_b = t('login_option_access_key_secret')) === null || _b === void 0 ? void 0 : _b.d('AccessKey Secret'),
             type: 'string'
-        })
-            .option('sts-token', {
-            describe: (_c = t('login_option_sts_token')) === null || _c === void 0 ? void 0 : _c.d('STS token: AccessKeyId,AccessKeySecret,SecurityToken (comma-separated, one-shot)'),
-            type: 'string'
         });
     },
     handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
@@ -73,10 +38,8 @@ export default login;
 export function handleLogin(argv) {
     return __awaiter(this, void 0, void 0, function* () {
         generateDefaultConfig();
-        const envSecurityToken = process.env.ESA_SECURITY_TOKEN;
-        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, envSecurityToken);
+        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!'));
@@ -86,27 +49,6 @@ export function handleLogin(argv) {
             }
             return;
         }
-        const stsTokenRaw = argv === null || argv === void 0 ? void 0 : argv['sts-token'];
-        if (stsTokenRaw) {
-            const parsed = parseStsToken(stsTokenRaw);
-            if (!parsed) {
-                logger.error(t('login_sts_token_format_invalid').d('Invalid STS token format. Use: AccessKeyId,AccessKeySecret,SecurityToken'));
-                return;
-            }
-            const result = yield validateCredentials(parsed.accessKeyId, parsed.accessKeySecret, parsed.securityToken);
-            if (result.valid) {
-                logger.success(t('login_success').d('Login success!'));
-                updateCliConfigFile(Object.assign({ auth: {
-                        accessKeyId: parsed.accessKeyId,
-                        accessKeySecret: parsed.accessKeySecret,
-                        securityToken: parsed.securityToken
-                    } }, (result.endpoint ? { endpoint: result.endpoint } : {})));
-            }
-            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) {
@@ -131,7 +73,7 @@ export function handleLogin(argv) {
             cliConfig.auth &&
             cliConfig.auth.accessKeyId &&
             cliConfig.auth.accessKeySecret) {
-            const loginStatus = yield validateCredentials(cliConfig.auth.accessKeyId, cliConfig.auth.accessKeySecret, cliConfig.auth.securityToken);
+            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({
@@ -157,47 +99,6 @@ export function handleLogin(argv) {
 }
 export function interactiveLogin() {
     return __awaiter(this, void 0, void 0, function* () {
-        const loginMethod = (yield clackSelect({
-            message: t('login_method_select').d('Choose login method'),
-            options: [
-                {
-                    label: t('login_method_aksk').d('AK/SK (AccessKey ID + AccessKey Secret)'),
-                    value: 'aksk'
-                },
-                {
-                    label: t('login_method_sts').d('STS Token (one-shot: AccessKeyId,AccessKeySecret,SecurityToken)'),
-                    value: 'sts'
-                }
-            ]
-        }));
-        if (isCancel(loginMethod)) {
-            return;
-        }
-        if (loginMethod === 'sts') {
-            const stsInput = (yield clackText({
-                message: t('login_sts_token_prompt').d('Enter STS token (AccessKeyId,AccessKeySecret,SecurityToken):')
-            }));
-            if (isCancel(stsInput))
-                return;
-            const parsed = parseStsToken(stsInput);
-            if (!parsed) {
-                logger.error(t('login_sts_token_format_invalid').d('Invalid STS token format. Use: AccessKeyId,AccessKeySecret,SecurityToken'));
-                return;
-            }
-            const loginStatus = yield validateCredentials(parsed.accessKeyId, parsed.accessKeySecret, parsed.securityToken);
-            if (loginStatus.valid) {
-                yield updateCliConfigFile(Object.assign({ auth: {
-                        accessKeyId: parsed.accessKeyId,
-                        accessKeySecret: parsed.accessKeySecret,
-                        securityToken: parsed.securityToken
-                    } }, (loginStatus.endpoint ? { endpoint: loginStatus.endpoint } : {})));
-                logger.success(t('login_success').d('Login success!'));
-            }
-            else {
-                logger.error(loginStatus.message || 'Login failed');
-            }
-            return;
-        }
         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`))}`);
         logger.log(`👉 ${styledUrl}`);

package/dist/commands/logout.js

@@ -28,18 +28,11 @@ export function handleLogout() {
             return;
         }
         if (!cliConfig.auth) {
-            cliConfig.auth = {
-                accessKeyId: '',
-                accessKeySecret: '',
-                securityToken: ''
-            };
+            cliConfig.auth = { accessKeyId: '', accessKeySecret: '' };
         }
         else {
             cliConfig.auth.accessKeyId = '';
             cliConfig.auth.accessKeySecret = '';
-            if ('securityToken' in cliConfig.auth) {
-                cliConfig.auth.securityToken = '';
-            }
         }
         yield updateCliConfigFile(cliConfig);
         logger.success(t('logout_success').d('Logout successfully'));

package/dist/commands/utils.js

@@ -16,7 +16,7 @@ import { ApiService } from '../libs/apiService.js';
 import { isInstalledGit } from '../libs/git/index.js';
 import logger from '../libs/logger.js';
 import { getRoot } from '../utils/fileUtils/base.js';
-import { getApiConfig, getCliConfig, projectConfigPath } from '../utils/fileUtils/index.js';
+import { getCliConfig, projectConfigPath } from '../utils/fileUtils/index.js';
 import { validateCredentials } from '../utils/validateCredentials.js';
 import { getRoutineDetails } from './common/utils.js';
 export const checkDirectory = (isCheckGit = false) => {
@@ -78,26 +78,28 @@ export function validDomain(domain) {
 }
 export function checkIsLoginSuccess() {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b;
         const cliConfig = getCliConfig();
         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);
-        const securityToken = process.env.ESA_SECURITY_TOKEN || ((_c = cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.auth) === null || _c === void 0 ? void 0 : _c.securityToken);
         if (accessKeyId && accessKeySecret) {
-            const result = yield validateCredentials(accessKeyId, accessKeySecret, securityToken);
+            const result = yield validateCredentials(accessKeyId, accessKeySecret);
             const server = yield ApiService.getInstance();
             if (result.valid) {
-                const auth = {
-                    accessKeyId,
-                    accessKeySecret
-                };
-                if (securityToken)
-                    auth.securityToken = securityToken;
-                // 使用配置文件/项目里的 endpoint，避免 validateCredentials 探测到的公网域名
-                //（如 esa.cn-hangzhou）覆盖用户显式配置的预发等地址
-                const fileConfig = getApiConfig();
-                server.updateConfig(Object.assign(Object.assign({}, fileConfig), { auth }));
-                api.updateConfig(Object.assign(Object.assign({}, fileConfig), { auth }));
+                server.updateConfig({
+                    auth: {
+                        accessKeyId,
+                        accessKeySecret
+                    },
+                    endpoint: result.endpoint
+                });
+                api.updateConfig({
+                    auth: {
+                        accessKeyId,
+                        accessKeySecret
+                    },
+                    endpoint: result.endpoint
+                });
                 return true;
             }
         }

package/dist/i18n/locales.json

@@ -1075,30 +1075,6 @@
     "en": "AccessKey Secret (SK)",
     "zh_CN": "AccessKey Secret (SK)"
   },
-  "login_option_sts_token": {
-    "en": "STS token: AccessKeyId,AccessKeySecret,SecurityToken (comma-separated, one-shot)",
-    "zh_CN": "STS 临时凭证：AccessKeyId,AccessKeySecret,SecurityToken（逗号分隔，一次性输入）"
-  },
-  "login_sts_token_prompt": {
-    "en": "Enter STS token (AccessKeyId,AccessKeySecret,SecurityToken):",
-    "zh_CN": "请输入 STS 凭证（AccessKeyId,AccessKeySecret,SecurityToken）："
-  },
-  "login_sts_token_format_invalid": {
-    "en": "Invalid STS token format. Use: AccessKeyId,AccessKeySecret,SecurityToken",
-    "zh_CN": "STS 凭证格式错误，请使用：AccessKeyId,AccessKeySecret,SecurityToken"
-  },
-  "login_method_select": {
-    "en": "Choose login method",
-    "zh_CN": "选择登录方式"
-  },
-  "login_method_aksk": {
-    "en": "AK/SK (AccessKey ID + AccessKey Secret)",
-    "zh_CN": "AK/SK（AccessKey ID + AccessKey Secret）"
-  },
-  "login_method_sts": {
-    "en": "STS Token (one-shot: AccessKeyId,AccessKeySecret,SecurityToken)",
-    "zh_CN": "STS 临时凭证（一次性输入：AccessKeyId,AccessKeySecret,SecurityToken）"
-  },
   "login_option_skip_login": {
     "en": "Skip login",
     "zh_CN": "跳过登录"

package/dist/libs/api.js

@@ -74,10 +74,13 @@ class Client {
         this.client = Client.createClient(config);
     }
     static createClient(config) {
-        var _a, _b, _c;
-        const apiConfig = new $OpenApi.Config(Object.assign({ 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, userAgent: CLI_USER_AGENT }, (((_c = config.auth) === null || _c === void 0 ? void 0 : _c.securityToken)
-            ? { securityToken: config.auth.securityToken }
-            : {})));
+        var _a, _b;
+        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,
+            userAgent: CLI_USER_AGENT
+        });
         return new ESA.default(apiConfig);
     }
     updateConfig(config) {

package/dist/libs/apiService.js

@@ -16,10 +16,13 @@ import { CLI_USER_AGENT } from './constants.js';
 import { Environment } from './interface.js';
 export class ApiService {
     constructor(cliConfig) {
-        var _a, _b, _c;
-        let apiConfig = new $OpenApi.Config(Object.assign({ 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, userAgent: CLI_USER_AGENT }, (((_c = cliConfig.auth) === null || _c === void 0 ? void 0 : _c.securityToken)
-            ? { securityToken: cliConfig.auth.securityToken }
-            : {})));
+        var _a, _b;
+        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,
+            userAgent: CLI_USER_AGENT
+        });
         this.client = new $OpenApi.default.default(apiConfig);
     }
     static getInstance() {
@@ -32,10 +35,13 @@ export class ApiService {
         });
     }
     updateConfig(newConfig) {
-        var _a, _b, _c;
-        let apiConfig = new $OpenApi.Config(Object.assign({ 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, userAgent: CLI_USER_AGENT }, (((_c = newConfig.auth) === null || _c === void 0 ? void 0 : _c.securityToken)
-            ? { securityToken: newConfig.auth.securityToken }
-            : {})));
+        var _a, _b;
+        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,
+            userAgent: CLI_USER_AGENT
+        });
         this.client = new $OpenApi.default.default(apiConfig);
     }
     /**

package/dist/utils/checkVersion.js

@@ -36,13 +36,26 @@ export function handleCheckVersion() {
  */
 export function checkCLIVersion(currentCommand) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (process.env.ESA_NO_UPDATE_CHECK) {
+            return true;
+        }
         try {
             const __dirname = getDirName(import.meta.url);
             const packageJsonPath = path.join(__dirname, '..', '..', 'package.json');
             const jsonString = yield fs.readFile(packageJsonPath, 'utf-8');
             const packageJson = JSON.parse(jsonString);
             const currentVersion = packageJson.version;
-            const response = yield fetch('https://registry.npmjs.org/esa-cli/latest');
+            const controller = new AbortController();
+            const fetchTimeout = setTimeout(() => controller.abort(), 5000);
+            let response;
+            try {
+                response = yield fetch('https://registry.npmjs.org/esa-cli/latest', {
+                    signal: controller.signal
+                });
+            }
+            finally {
+                clearTimeout(fetchTimeout);
+            }
             if (!response.ok) {
                 return true;
             }

package/dist/utils/fileUtils/index.js

@@ -260,13 +260,12 @@ export function getDevOpenBrowserUrl() {
     return `http://localhost:${port}`;
 }
 export const getApiConfig = () => {
-    var _a, _b, _c;
+    var _a, _b;
     const [cliConfig, projectConfig] = getConfigurations();
     let defaultConfig = {
         auth: {
             accessKeyId: '',
-            accessKeySecret: '',
-            securityToken: undefined
+            accessKeySecret: ''
         },
         endpoint: `esa.cn-hangzhou.aliyuncs.com`
     };
@@ -274,8 +273,7 @@ export const getApiConfig = () => {
     const config = {
         auth: {
             accessKeyId: (_a = combinedConfig.auth) === null || _a === void 0 ? void 0 : _a.accessKeyId,
-            accessKeySecret: (_b = combinedConfig.auth) === null || _b === void 0 ? void 0 : _b.accessKeySecret,
-            securityToken: (_c = combinedConfig.auth) === null || _c === void 0 ? void 0 : _c.securityToken
+            accessKeySecret: (_b = combinedConfig.auth) === null || _b === void 0 ? void 0 : _b.accessKeySecret
         },
         endpoint: combinedConfig.endpoint
     };

package/dist/utils/validateCredentials.js

@@ -14,14 +14,15 @@ const DOMESTIC_ENDPOINT = 'esa.cn-hangzhou.aliyuncs.com';
 const INTERNATIONAL_ENDPOINT = 'esa.ap-southeast-1.aliyuncs.com';
 /**
  * Validate credentials for a single endpoint
- * @param securityToken - Optional STS SecurityToken; when provided, uses STS auth
  */
-function validateEndpoint(accessKeyId, accessKeySecret, endpoint, securityToken) {
+function validateEndpoint(accessKeyId, accessKeySecret, endpoint) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const apiConfig = new $OpenApi.Config(Object.assign({ accessKeyId,
+            const apiConfig = new $OpenApi.Config({
+                accessKeyId,
                 accessKeySecret,
-                endpoint }, (securityToken ? { securityToken } : {})));
+                endpoint
+            });
             const client = new $OpenApi.default.default(apiConfig);
             const params = {
                 action: 'GetErService',
@@ -79,24 +80,25 @@ function validateEndpoint(accessKeyId, accessKeySecret, endpoint, securityToken)
     });
 }
 /**
- * Validate if AK/SK/endpoint are valid (supports STS when securityToken is provided)
+ * Validate if AK/SK/endpoint are valid
  *
  * @param accessKeyId - AccessKey ID
  * @param accessKeySecret - AccessKey Secret
- * @param securityToken - Optional STS SecurityToken for temporary credentials
  * @returns Validation result, including whether valid, site type and endpoint
  */
-export function validateCredentials(accessKeyId, accessKeySecret, securityToken) {
+export function validateCredentials(accessKeyId, accessKeySecret) {
     return __awaiter(this, void 0, void 0, function* () {
-        const withToken = (ep) => validateEndpoint(accessKeyId, accessKeySecret, ep, securityToken);
         if (process.env.CUSTOM_ENDPOINT) {
-            const result = yield withToken(process.env.CUSTOM_ENDPOINT);
+            const result = yield validateEndpoint(accessKeyId, accessKeySecret, process.env.CUSTOM_ENDPOINT);
             if (result.valid) {
                 return { valid: true, endpoint: process.env.CUSTOM_ENDPOINT };
             }
-            return { valid: false, message: result.message };
+            else {
+                return { valid: false, message: result.message };
+            }
         }
-        const domesticResult = yield withToken(DOMESTIC_ENDPOINT);
+        // First validate domestic site
+        const domesticResult = yield validateEndpoint(accessKeyId, accessKeySecret, DOMESTIC_ENDPOINT);
         if (domesticResult.valid) {
             return {
                 valid: true,
@@ -104,7 +106,8 @@ export function validateCredentials(accessKeyId, accessKeySecret, securityToken)
                 endpoint: DOMESTIC_ENDPOINT
             };
         }
-        const internationalResult = yield withToken(INTERNATIONAL_ENDPOINT);
+        // If domestic site validation fails, validate international site
+        const internationalResult = yield validateEndpoint(accessKeyId, accessKeySecret, INTERNATIONAL_ENDPOINT);
         if (internationalResult.valid) {
             return {
                 valid: true,
@@ -112,6 +115,7 @@ export function validateCredentials(accessKeyId, accessKeySecret, securityToken)
                 endpoint: INTERNATIONAL_ENDPOINT
             };
         }
+        // Both failed, return failure result
         return {
             valid: false,
             message: domesticResult.message ||

package/package.json

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