esa-cli 1.0.2-beta.0 → 1.0.3-beta.1

package/dist/commands/commit/index.js

@@ -73,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, undefined, (argv.bundle === false));
+        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

@@ -318,7 +318,7 @@ 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* () {
@@ -444,7 +444,7 @@ export function displayDeploySuccess(projectName_1) {
     });
 }
 /**
- * 解析 --versions 参数并执行按百分比分发部署；成功后打印展示和百分比分配
+ * 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* () {

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/login/index.js

@@ -10,14 +10,14 @@ 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')}`,
     builder: (yargs) => {
-        var _a, _b, _c;
+        var _a, _b;
         return yargs
             .option('access-key-id', {
             alias: 'ak',
@@ -28,11 +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('endpoint', {
-            alias: 'e',
-            describe: (_c = t('login_option_endpoint')) === null || _c === void 0 ? void 0 : _c.d('Endpoint'),
-            type: 'string'
         });
     },
     handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
@@ -43,18 +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'];
-        const endpoint = (argv === null || argv === void 0 ? void 0 : argv['endpoint']) || process.env.ESA_ENDPOINT;
         if (accessKeyId && accessKeySecret) {
-            yield handleLoginWithAKSK(accessKeyId, accessKeySecret, endpoint);
-            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, endpoint);
+            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;
@@ -62,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?'),
@@ -79,48 +89,15 @@ export function handleLogin(argv) {
                 if (isCancel(selected) || selected === 'exit') {
                     return;
                 }
-                yield getUserInputAuthInfo(endpoint);
             }
             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(endpoint);
-            }
-        }
-        else {
-            logger.log(`${t('login_logging').d('Logging in')}...`);
-            yield getUserInputAuthInfo(endpoint);
-        }
-    });
-}
-function handleLoginWithAKSK(accessKeyId, accessKeySecret, endpoint) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let apiConfig = getApiConfig();
-        apiConfig.auth = {
-            accessKeyId,
-            accessKeySecret
-        };
-        if (endpoint) {
-            apiConfig.endpoint = endpoint;
-        }
-        try {
-            yield updateCliConfigFile(Object.assign({ auth: apiConfig.auth }, (endpoint ? { endpoint } : {})));
-            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(endpoint) {
+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`))}`);
@@ -129,28 +106,16 @@ export function getUserInputAuthInfo(endpoint) {
         const accessKeySecret = (yield clackText({
             message: 'AccessKey Secret:'
         }));
-        let apiConfig = getApiConfig();
-        apiConfig.auth = {
-            accessKeyId,
-            accessKeySecret
-        };
-        if (endpoint) {
-            apiConfig.endpoint = endpoint;
-        }
-        try {
-            yield updateCliConfigFile(Object.assign({ auth: apiConfig.auth }, (endpoint ? { endpoint } : {})));
-            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

@@ -17,6 +17,7 @@ import { isInstalledGit } from '../libs/git/index.js';
 import logger from '../libs/logger.js';
 import { getRoot } from '../utils/fileUtils/base.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) => {
     const root = getRoot();
@@ -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;
     });
 }
@@ -160,7 +132,7 @@ export const getAllSites = () => __awaiter(void 0, void 0, void 0, function* ()
     return res.map((site) => {
         return {
             label: site.SiteName,
-            value: site.SiteId
+            value: site.SiteId.toString()
         };
     });
 });

package/dist/i18n/locales.json

@@ -1318,5 +1318,9 @@
   "login_option_endpoint": {
     "en": "Endpoint",
     "zh_CN": "Endpoint"
+  },
+  "login_get_credentials_from_environment_variables": {
+    "en": "Get credentials from environment variables",
+    "zh_CN": ""
   }
 }

package/dist/utils/validateCredentials.js

@@ -0,0 +1,126 @@
+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 * as $OpenApi from '@alicloud/openapi-client';
+// Domestic site endpoint
+const DOMESTIC_ENDPOINT = 'esa.cn-hangzhou.aliyuncs.com';
+// International site endpoint
+const INTERNATIONAL_ENDPOINT = 'esa.ap-southeast-1.aliyuncs.com';
+/**
+ * Validate credentials for a single endpoint
+ */
+function validateEndpoint(accessKeyId, accessKeySecret, endpoint) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const apiConfig = new $OpenApi.Config({
+                accessKeyId,
+                accessKeySecret,
+                endpoint
+            });
+            const client = new $OpenApi.default.default(apiConfig);
+            const params = {
+                action: 'GetErService',
+                version: '2024-09-10',
+                protocol: 'https',
+                method: 'GET',
+                authType: 'AK',
+                bodyType: 'json',
+                reqBodyType: 'json',
+                style: 'RPC',
+                pathname: '/',
+                toMap: function () {
+                    return this;
+                }
+            };
+            const request = new $OpenApi.OpenApiRequest({
+                query: {}
+            });
+            const runtime = {
+                toMap: function () {
+                    return this;
+                }
+            };
+            const response = yield client.callApi(params, request, runtime);
+            if (response.statusCode === 200) {
+                if (response.body.Status === 'Running') {
+                    return { valid: true };
+                }
+                else {
+                    return {
+                        valid: false,
+                        message: 'Functions and Pages is not active'
+                    };
+                }
+            }
+            else if (response.statusCode === 403) {
+                return {
+                    valid: false,
+                    message: 'Permission denied: Access key or secret is incorrect'
+                };
+            }
+            else {
+                return {
+                    valid: false,
+                    message: `Error: ${response.statusCode}`
+                };
+            }
+        }
+        catch (error) {
+            return {
+                valid: false,
+                message: error instanceof Error ? error.message : 'Unknown error'
+            };
+        }
+    });
+}
+/**
+ * Validate if AK/SK/endpoint are valid
+ *
+ * @param accessKeyId - AccessKey ID
+ * @param accessKeySecret - AccessKey Secret
+ * @returns Validation result, including whether valid, site type and endpoint
+ */
+export function validateCredentials(accessKeyId, accessKeySecret) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (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 };
+            }
+            else {
+                return { valid: false, message: result.message };
+            }
+        }
+        // First validate domestic site
+        const domesticResult = yield validateEndpoint(accessKeyId, accessKeySecret, DOMESTIC_ENDPOINT);
+        if (domesticResult.valid) {
+            return {
+                valid: true,
+                siteType: 'domestic',
+                endpoint: DOMESTIC_ENDPOINT
+            };
+        }
+        // If domestic site validation fails, validate international site
+        const internationalResult = yield validateEndpoint(accessKeyId, accessKeySecret, INTERNATIONAL_ENDPOINT);
+        if (internationalResult.valid) {
+            return {
+                valid: true,
+                siteType: 'international',
+                endpoint: INTERNATIONAL_ENDPOINT
+            };
+        }
+        // Both failed, return failure result
+        return {
+            valid: false,
+            message: domesticResult.message ||
+                internationalResult.message ||
+                'Invalid credentials'
+        };
+    });
+}

package/package.json

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