esa-cli 1.0.8-beta.3 → 1.0.8

package/dist/commands/common/utils.js

@@ -389,57 +389,46 @@ export function waitForCodeVersionReady(name_1, codeVersion_1, env_1) {
  */
 export function displayDeploySuccess(projectName_1) {
     return __awaiter(this, arguments, void 0, function* (projectName, showDomainGuide = true, showRouteGuide = true) {
-        var _a;
+        var _a, _b;
         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 ? 'https://' + defaultUrl : '';
-        const accent = chalk.hex('#7C3AED');
+        let visitUrl = defaultUrl ? 'https://' + defaultUrl : '';
+        // Get access token for the visit URL
+        let hasToken = false;
+        if (visitUrl) {
+            const tokenRes = yield service.getRoutineAccessToken({
+                Name: projectName
+            });
+            const token = (_b = tokenRes === null || tokenRes === void 0 ? void 0 : tokenRes.data) === null || _b === void 0 ? void 0 : _b.Token;
+            if (token) {
+                visitUrl += `?esa_er_token=${token}`;
+                hasToken = true;
+            }
+        }
         const label = chalk.hex('#22c55e');
         const subtle = chalk.gray;
-        const title = `${chalk.bold('🚀 ')}${chalk.bold(t('init_deploy_success').d('Deploy Success'))}`;
-        const lineUrl = `${label('URL')}  ${visitUrl ? chalk.yellowBright(visitUrl) : subtle('-')}`;
-        const lineProject = `${label('APP')}  ${chalk.cyan(projectName || '-')}`;
-        const lineCd = projectName
-            ? `${label('TIP')}  ${t('deploy_success_cd').d('Enter project directory')}: ${chalk.green(`cd ${projectName}`)}`
-            : '';
-        const guides = [];
+        const orange = chalk.hex('#FFA500');
+        logger.block();
+        logger.log(`${chalk.bold('🚀')} ${chalk.hex('#7C3AED').bold(t('init_deploy_success').d('Deploy Success'))}`);
+        logger.block();
+        logger.log(`${label('APP')}  ${chalk.cyan(projectName || '-')}`);
+        if (hasToken) {
+            logger.log(orange(`⏰  ${t('token_validity_tip').d('Token is valid for 1 hour')}`));
+        }
+        logger.log(`${label('URL')}  ${visitUrl ? chalk.yellowBright(visitUrl) : subtle('-')}`);
+        if (projectName) {
+            logger.block();
+            logger.log(`${label('TIP')}  ${t('deploy_success_cd').d('Enter project directory')}: ${chalk.green(`cd ${projectName}`)}`);
+        }
         if (showDomainGuide) {
-            guides.push(`${label('TIP')}  ${t('deploy_success_guide').d('Add a custom domain')}: ${chalk.green('esa-cli domain add <DOMAIN>')}`);
+            logger.log(`${label('TIP')}  ${t('deploy_success_guide').d('Add a custom domain')}: ${chalk.green('esa-cli domain add <DOMAIN>')}`);
         }
         if (showRouteGuide) {
-            guides.push(`${label('TIP')}  ${t('deploy_success_guide_2').d('Add routes for a site')}: ${chalk.green('esa-cli route add -r <ROUTE> -s <SITE>')}`);
+            logger.log(`${label('TIP')}  ${t('deploy_success_guide_2').d('Add routes for a site')}: ${chalk.green('esa-cli route add -r <ROUTE> -s <SITE>')}`);
         }
-        const tip = `${subtle(t('deploy_url_warn').d('The domain may take some time to take effect, please try again later.'))}`;
-        const lines = [
-            accent(title),
-            '',
-            lineProject,
-            lineUrl,
-            lineCd ? '' : '',
-            lineCd || '',
-            guides.length ? '' : '',
-            ...guides,
-            guides.length ? '' : '',
-            tip
-        ];
-        const stripAnsi = (s) => s.replace(/\x1B\[[0-?]*[ -\/]*[@-~]/g, '');
-        const contentWidth = Math.max(...lines.map((l) => stripAnsi(l).length));
-        const borderColor = chalk.hex('#00D4FF').bold;
-        const top = `${borderColor('╔')}${borderColor('═'.repeat(contentWidth + 2))}${borderColor('╗')}`;
-        const bottom = `${borderColor('╚')}${borderColor('═'.repeat(contentWidth + 2))}${borderColor('╝')}`;
-        const boxLines = [
-            top,
-            ...lines.map((l) => {
-                const pad = ' '.repeat(contentWidth - stripAnsi(l).length);
-                const left = borderColor('║');
-                const right = borderColor('║');
-                return `${left} ${l}${pad} ${right}`;
-            }),
-            bottom
-        ];
         logger.block();
-        boxLines.forEach((l) => logger.log(l));
+        logger.log(subtle(t('deploy_url_warn').d('The domain may take some time to take effect, please try again later.')));
         logger.block();
     });
 }

package/dist/i18n/locales.json

@@ -1322,5 +1322,17 @@
   "login_get_credentials_from_environment_variables": {
     "en": "Get credentials from environment variables",
     "zh_CN": ""
+  },
+  "main_skip_update_check": {
+    "en": "Skip CLI version update check",
+    "zh_CN": ""
+  },
+  "deploy_visit_url": {
+    "en": "Visit URL (with token)",
+    "zh_CN": ""
+  },
+  "token_validity_tip": {
+    "en": "Token is valid for 1 hour",
+    "zh_CN": "该 URL 有效期为 1 小时"
   }
 }

package/dist/index.js

@@ -44,6 +44,9 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
         if (argv.debug) {
             logger.setLogLevel('debug');
         }
+        if (argv.skipUpdateCheck) {
+            return;
+        }
         try {
             // Pass current command (first positional) so version check can decide prompting behavior
             yield checkCLIVersion((argv._ && argv._[0] ? String(argv._[0]) : ''));
@@ -66,6 +69,11 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
         describe: t('dev_option_debugger').d('Output debug logs'),
         type: 'boolean',
         default: false
+    })
+        .options('skip-update-check', {
+        describe: t('main_skip_update_check').d('Skip CLI version update check'),
+        type: 'boolean',
+        default: false
     });
     esa.command('*', false, () => { }, (args) => {
         if (args._.length > 0) {

package/dist/libs/apiService.js

@@ -1100,5 +1100,51 @@ export class ApiService {
             return null;
         });
     }
+    getRoutineAccessToken(requestParams) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let params = {
+                    action: 'GetRoutineAccessToken',
+                    version: '2024-09-10',
+                    protocol: 'https',
+                    method: 'GET',
+                    authType: 'AK',
+                    bodyType: 'json',
+                    reqBodyType: 'json',
+                    style: 'RPC',
+                    pathname: '/',
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                let request = new $OpenApi.OpenApiRequest({
+                    query: {
+                        Name: requestParams.Name
+                    }
+                });
+                let runtime = {
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                const res = yield this.client.callApi(params, request, runtime);
+                if (res.statusCode === 200 && res.body) {
+                    const ret = {
+                        code: res.statusCode.toString(),
+                        data: {
+                            RequestId: res.body.RequestId,
+                            Token: res.body.Token,
+                            DefaultRelatedRecord: res.body.DefaultRelatedRecord
+                        }
+                    };
+                    return ret;
+                }
+            }
+            catch (error) {
+                // Token retrieval failure is non-critical, silently return null
+            }
+            return null;
+        });
+    }
 }
 ApiService.instance = null;

package/dist/utils/checkVersion.js

@@ -49,7 +49,7 @@ export function checkCLIVersion(currentCommand) {
             const fetchTimeout = setTimeout(() => controller.abort(), 5000);
             let response;
             try {
-                response = yield fetch('https://registry.npmjs.org/esa-cli/latest', {
+                response = yield fetch('https://registry.npmmirror.com/esa-cli/latest', {
                     signal: controller.signal
                 });
             }

package/dist/utils/fileUtils/index.js

@@ -16,6 +16,14 @@ import logger from '../../libs/logger.js';
 import { getDirName, getRoot } from './base.js';
 const __dirname = getDirName(import.meta.url);
 const root = getRoot();
+/**
+ * Strip JSONC content (comments + trailing commas) to make it valid JSON
+ */
+function stripJsonc(content) {
+    return content
+        .replace(/\/\*[\s\S]*?\*\/|\/\/.*$/gm, '')
+        .replace(/,\s*([}\]])/g, '$1');
+}
 // Function to get the actual project config file path (supports both .jsonc and .toml)
 export const getProjectConfigPath = (filePath = root) => {
     const configFormats = ['esa.jsonc', 'esa.toml'];
@@ -72,7 +80,7 @@ export function updateProjectConfigFile(configUpdate_1) {
             // Detect file format based on file extension
             if (configPath.endsWith('.jsonc') || configPath.endsWith('.json')) {
                 // Handle JSONC format
-                const jsonContent = configFileContent.replace(/\/\*[\s\S]*?\*\/|\/\/.*$/gm, '');
+                const jsonContent = stripJsonc(configFileContent);
                 config = JSON.parse(jsonContent);
                 config = Object.assign(Object.assign({}, config), configUpdate);
                 updatedConfigString = JSON.stringify(config, null, 2) + '\n';
@@ -101,7 +109,7 @@ export function updateCliConfigFile(configUpdate) {
             // Detect file format based on file extension
             if (configPath.endsWith('.jsonc') || configPath.endsWith('.json')) {
                 // Handle JSONC format
-                const jsonContent = configFileContent.replace(/\/\*[\s\S]*?\*\/|\/\/.*$/gm, '');
+                const jsonContent = stripJsonc(configFileContent);
                 config = JSON.parse(jsonContent);
                 config = Object.assign(Object.assign({}, config), configUpdate);
                 updatedConfigString = JSON.stringify(config, null, 2) + '\n';
@@ -126,8 +134,8 @@ export function readConfigFile(configPath) {
         const configFileContent = fs.readFileSync(configPath, 'utf-8');
         try {
             if (configPath.endsWith('.jsonc') || configPath.endsWith('.json')) {
-                // Remove comments for JSON parsing
-                const jsonContent = configFileContent.replace(/\/\*[\s\S]*?\*\/|\/\/.*$/gm, '');
+                // Remove comments and trailing commas for JSON parsing
+                const jsonContent = stripJsonc(configFileContent);
                 const config = JSON.parse(jsonContent);
                 return config;
             }

package/package.json

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