esa-cli 0.0.1-beta.8 → 0.0.2-beta.0

package/dist/index.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
+import chalk from 'chalk';
 import login from './commands/login/index.js';
 import config from './commands/config.js';
 import dev from './commands/dev/index.js';
@@ -25,6 +26,7 @@ import { getCliConfig } from './utils/fileUtils/index.js';
 import { handleCheckVersion } from './utils/checkVersion.js';
 import t from './i18n/index.js';
 import site from './commands/site/index.js';
+import { quickDeployRoutine } from './libs/service.js';
 const main = () => __awaiter(void 0, void 0, void 0, function* () {
     const argv = hideBin(process.argv);
     const cliConfig = getCliConfig();
@@ -38,9 +40,7 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
         .version(false)
         .wrap(null)
         .help(false)
-        // .epilogue(
-        //   `${t('main_epilogue').d('For more information, visit DCDN')}: ${chalk.underline.blue('https://dcdnnext.console.aliyun.com/')}`
-        // )
+        .epilogue(`${t('main_epilogue').d('For more information, visit ESA')}: ${chalk.underline.blue('https://www.aliyun.com/product/esa')}`)
         .options('version', {
         describe: t('main_version_describe').d('Show version'),
         alias: 'v'
@@ -74,6 +74,13 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
     esa.command(logout);
     esa.command(config);
     esa.command(lang);
+    esa.command('t', false, () => { }, (args) => __awaiter(void 0, void 0, void 0, function* () {
+        const res = yield quickDeployRoutine({
+            name: 'test',
+            code: 'test'
+        });
+        // console.log(res);
+    }));
     esa.group(['help', 'version'], 'Options:');
     esa.parse();
 });

package/dist/libs/api.js

@@ -0,0 +1,155 @@
+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 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 logger from './logger.js';
+class Client {
+    constructor() {
+        this.callApi = (action, request) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                logger.info(`Called api ${action.name}, Request: ${request ? JSON.stringify(request) : 'no request'}`);
+                const runtime = new $Util.RuntimeOptions({
+                    connectTimeout: 10000,
+                    readTimeout: 10000,
+                    autoretry: true,
+                    maxAttempts: 3
+                });
+                const response = request
+                    ? yield action(request, runtime)
+                    : yield action(runtime);
+                return response;
+            }
+            catch (error) {
+                const err = error;
+                logger.error(`Code: ${err.code}, Message: ${err.message}}`);
+                logger.debug(`Data: ${JSON.stringify(err.data)}`);
+                throw err;
+            }
+        });
+        this.callOpenApi = (apiName, requestParams) => __awaiter(this, void 0, void 0, function* () {
+            logger.info(`Called api ${apiName} with openApi, Request: ${requestParams ? JSON.stringify(requestParams) : 'no request'}`);
+            try {
+                let params = {
+                    action: apiName,
+                    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(requestParams);
+                const runtime = new $Util.RuntimeOptions({
+                    connectTimeout: 10000,
+                    readTimeout: 10000,
+                    autoretry: true,
+                    maxAttempts: 3
+                });
+                const response = yield this.client.callApi(params, request, runtime);
+                return response;
+            }
+            catch (error) {
+                const err = error;
+                logger.error(`Code: ${err.code}, Message: ${err.message}}`);
+                logger.debug(`Data: ${JSON.stringify(err.data)}`);
+                throw err;
+            }
+        });
+        const config = getApiConfig();
+        this.client = Client.createClient(config);
+    }
+    static createClient(config) {
+        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
+        });
+        return new ESA.default(apiConfig);
+    }
+    updateConfig(config) {
+        this.client = Client.createClient(config);
+    }
+    getErService() {
+        const request = new $ESA.GetErServiceRequest({});
+        return this.callApi(this.client.getErServiceWithOptions.bind(this.client), request);
+    }
+    getRoutineStagingCodeUploadInfo(params) {
+        const request = new $ESA.GetRoutineStagingCodeUploadInfoRequest(params);
+        return this.callApi(this.client.getRoutineStagingCodeUploadInfoWithOptions.bind(this.client), request);
+    }
+    commitRoutineStagingCode(params) {
+        const request = new $ESA.CommitRoutineStagingCodeRequest(params);
+        return this.callApi(this.client.commitRoutineStagingCodeWithOptions.bind(this.client), request);
+    }
+    publishRoutineCodeVersion(params) {
+        const request = new $ESA.PublishRoutineCodeVersionRequest(params);
+        return this.callApi(this.client.publishRoutineCodeVersionWithOptions.bind(this.client), request);
+    }
+    getMatchSite(params) {
+        return this.callOpenApi('getMatchSite', params);
+    }
+    listRoutineCanaryAreas() {
+        return this.callApi(this.client.listRoutineCanaryAreasWithOptions.bind(this.client));
+    }
+    getRoutineUserInfo() {
+        return this.callApi(this.client.getRoutineUserInfoWithOptions.bind(this.client));
+    }
+    deleteRoutine(params) {
+        const request = new $ESA.DeleteRoutineRequest(params);
+        return this.callApi(this.client.deleteRoutineWithOptions.bind(this.client), request);
+    }
+    deleteRoutineCodeVersion(params) {
+        const request = new $ESA.DeleteRoutineCodeVersionRequest(params);
+        return this.callApi(this.client.deleteRoutineCodeVersionWithOptions.bind(this.client), request);
+    }
+    createRoutineRelatedRoute(params) {
+        const request = new $ESA.CreateRoutineRelatedRouteRequest(params);
+        return this.callApi(this.client.createRoutineRelatedRouteWithOptions.bind(this.client), request);
+    }
+    deleteRoutineRelatedRoute(params) {
+        const request = new $ESA.DeleteRoutineRelatedRouteRequest(params);
+        return this.callApi(this.client.deleteRoutineRelatedRouteWithOptions.bind(this.client), request);
+    }
+    listSites(params) {
+        const request = new $ESA.ListSitesRequest(params);
+        return this.callApi(this.client.listSitesWithOptions.bind(this.client), request);
+    }
+    getRoutineStagingEnvIp() {
+        return this.callApi(this.client.getRoutineStagingEnvIpWithOptions.bind(this.client));
+    }
+    getRoutine(params) {
+        const request = new $ESA.GetRoutineRequest(params);
+        return this.callApi(this.client.getRoutineWithOptions.bind(this.client), request);
+    }
+    createRoutine(params) {
+        const request = new $ESA.CreateRoutineRequest(params);
+        return this.callApi(this.client.createRoutineWithOptions.bind(this.client), request);
+    }
+    listRoutineOptionalSpecs() {
+        return this.callApi(this.client.listRoutineOptionalSpecsWithOptions.bind(this.client));
+    }
+    createRoutineRelatedRecord(params) {
+        const request = new $ESA.CreateRoutineRelatedRecordRequest(params);
+        return this.callApi(this.client.createRoutineRelatedRecordWithOptions.bind(this.client), request);
+    }
+    deleteRoutineRelatedRecord(params) {
+        const request = new $ESA.DeleteRoutineRelatedRecordRequest(params);
+        return this.callApi(this.client.deleteRoutineRelatedRecordWithOptions.bind(this.client), request);
+    }
+}
+export default new Client();

package/dist/libs/logger.js

@@ -1,21 +1,36 @@
 import chalk from 'chalk';
-import { format, createLogger, transports } from 'winston';
+import { format, createLogger } from 'winston';
+import DailyRotateFile from 'winston-daily-rotate-file';
 import Table from 'cli-table3';
 import path from 'path';
 import os from 'os';
 import ora from 'ora';
-import { fileURLToPath } from 'url';
 import t from '../i18n/index.js';
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
+import { getProjectConfig } from '../utils/fileUtils/index.js';
+const transport = new DailyRotateFile({
+    filename: path.join(os.homedir(), '.esa-logs/esa-debug-%DATE%.log'),
+    level: 'info',
+    datePattern: 'YYYY-MM-DD-HH:mm:ss',
+    zippedArchive: true,
+    maxSize: '10m',
+    maxFiles: '7d'
+});
 class Logger {
     constructor() {
         const { combine, timestamp, label, printf } = format;
         const customFormat = printf(({ level, message, label: printLabel, timestamp: printTimestamp }) => {
+            var _a;
             let colorizedLevel;
+            const projName = ((_a = getProjectConfig()) === null || _a === void 0 ? void 0 : _a.name) || 'Outside';
             switch (level) {
+                case 'warn':
+                    colorizedLevel = chalk.yellow(level);
+                    break;
+                case 'info':
+                    colorizedLevel = chalk.green(level);
+                    break;
                 case 'error':
-                    colorizedLevel = chalk.bgRed(' ERROR ');
-                    return `❌ ${colorizedLevel} ${chalk.red(message)}`;
+                    colorizedLevel = chalk.red(level);
                 case 'verbose':
                     colorizedLevel = chalk.magenta(level);
                     break;
@@ -28,18 +43,12 @@ class Logger {
                 default:
                     colorizedLevel = level;
             }
-            return `${printTimestamp} [${chalk.green(printLabel)}] ${colorizedLevel}: ${message}`;
+            return `${printTimestamp} [${chalk.green(printLabel)}] ${colorizedLevel} in ${chalk.italic(projName)}: ${message}`;
         });
         this.logger = createLogger({
             level: 'info',
-            format: combine(label({ label: 'Esa' }), timestamp(), customFormat),
-            transports: [
-                new transports.Console(),
-                new transports.File({
-                    filename: path.join(os.homedir(), '.asea-logs/esa-debug.log'),
-                    level: 'error'
-                })
-            ]
+            format: combine(label({ label: 'ESA' }), timestamp(), customFormat),
+            transports: [transport]
         });
         this.spinner = ora('Loading...');
     }
@@ -63,13 +72,16 @@ class Logger {
         console.log(`\t${message}`);
     }
     success(message) {
-        console.log(`🎉 ${chalk.bgGreen(' SUCCESS ')} ${chalk.green(message)}`);
+        console.log(`\n🎉 ${chalk.bgGreen(' SUCCESS ')} ${chalk.green(message)}`);
     }
     debug(message) {
         this.logger.debug(message);
+        if (this.logger.level === 'debug') {
+            console.log(`${chalk.grey('[DEBUG]')} ${message}`);
+        }
     }
     info(message) {
-        console.log(`💬 ${message}`);
+        this.logger.info(message);
     }
     ask(message) {
         console.log(`❓ ${message}`);
@@ -78,16 +90,18 @@ class Logger {
         console.log(`👉🏻 ${chalk.green(message)}`);
     }
     block() {
-        console.log(' ');
+        console.log('\n');
     }
     warn(message) {
-        console.log(`${chalk.bgYellow(' WARNING ')} ${chalk.yellow(message)}`);
+        this.logger.warn(message);
+        console.log(`\n${chalk.bgYellow(' WARNING ')} ${chalk.yellow(message)}`);
     }
     error(message) {
         this.logger.error(message);
+        console.log(`\n❌ ${chalk.bgRed(' ERROR ')} ${chalk.red(message)}`);
     }
     subError(message) {
-        console.log(` ${chalk.red(message)}`);
+        console.log(`\n${chalk.red(message)}`);
     }
     http(message) {
         this.logger.http(message);
@@ -107,7 +121,7 @@ class Logger {
     }
     notInProject() {
         const initCommand = chalk.green('esa init');
-        this.logger.error(t('common_not_edge_project', { initCommand }).d(`You are not in an esa project, Please run ${initCommand} to initialize a project, or enter an esa project.`));
+        this.error(t('common_not_edge_project', { initCommand }).d(`You are not in an esa project, Please run ${initCommand} to initialize a project, or enter an esa project.`));
     }
     pathEacces(localPath) {
         this.block();
@@ -119,9 +133,10 @@ class Logger {
         this.block();
         this.log(chalk.green(`$ sudo chmod -R 777 ${localPath}`));
     }
-    table(head, data) {
+    table(head, data, width = []) {
         const table = new Table({
-            head
+            head,
+            colWidths: width
         });
         table.push(...data);
         this.log(table.toString());
@@ -130,19 +145,15 @@ class Logger {
     tree(messages) {
         if (messages.length === 0)
             return;
-        if (messages.length === 1) {
-            console.log(`─ ${messages[0]}`);
-            return;
-        }
-        console.log(`╭─ ${messages[0]}`);
+        const lines = [];
+        lines.push(`╭─ ${messages[0]}`);
         for (let i = 1; i < messages.length - 1; i++) {
-            console.log(`│`);
-            console.log(`├─ ${messages[i]}`);
+            lines.push(`│ ${messages[i]}`);
         }
         if (messages.length > 1) {
-            console.log(`│`);
-            console.log(`╰─ ${messages[messages.length - 1]}`);
+            lines.push(`╰─ ${messages[messages.length - 1]}`);
         }
+        console.log(lines.join('\n'));
     }
 }
 const logger = Logger.getInstance();

package/dist/libs/service.js

@@ -0,0 +1,178 @@
+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 ora from 'ora';
+import chain from 'lodash';
+import FormData from 'form-data';
+import fetch from 'node-fetch';
+import t from '../i18n/index.js';
+import api from './api.js';
+import { Environment } from './interface.js';
+import logger from './logger.js';
+export const checkLogin = () => __awaiter(void 0, void 0, void 0, function* () {
+    const result = new ServiceOutput();
+    try {
+        const response = yield api.getErService();
+        if (response.statusCode === 200) {
+            result.success = true;
+            result.message = t('login_success').d('Login success!');
+        }
+        else if (response.statusCode === 403) {
+            result.message = t('login_permission_denied').d('Permission denied: Access key or secret is incorrect, or does not have the necessary permissions.');
+        }
+        else {
+            result.message = `${t('common_error_occurred').d('An error occurred')}: ${response.statusCode}`;
+        }
+    }
+    catch (error) {
+        result.message = t('login_failed').d('An error occurred while trying to log in.');
+    }
+    return result;
+});
+const commonUploadCodeError = t('upload_code_failed').d('An error occurred while trying to upload the code.');
+export const getRoutineStagingCodeUploadInfo = (edgeRoutine) => __awaiter(void 0, void 0, void 0, function* () {
+    const result = new ServiceOutput();
+    let ossConfig;
+    try {
+        const uploadResult = yield api.getRoutineStagingCodeUploadInfo({
+            name: edgeRoutine.name
+        });
+        ossConfig = chain(uploadResult).get('body.OssPostConfig');
+        if (!ossConfig) {
+            result.message = t('oss_config_not_found').d('Failed to retrieve OSS configuration information.');
+            return result;
+        }
+    }
+    catch (error) {
+        result.message = commonUploadCodeError;
+        return result;
+    }
+    try {
+        const { OSSAccessKeyId, Signature, callback, Url, key, policy } = ossConfig;
+        const formData = new FormData();
+        formData.append('OSSAccessKeyId', OSSAccessKeyId);
+        formData.append('Signature', Signature);
+        formData.append('callback', callback);
+        formData.append('x:codeDescription', ossConfig['x:codeDescription']);
+        formData.append('policy', policy);
+        formData.append('key', key);
+        formData.append('file', edgeRoutine.code);
+        const ossRes = yield fetch(Url, {
+            method: 'POST',
+            body: formData,
+            headers: formData.getHeaders()
+        });
+        if (ossRes && ossRes.status === 200) {
+            result.success = true;
+            result.message = t('upload_oss_success').d('Upload code success!');
+        }
+        else {
+            logger.error(`${t('oss_upload_failed').d('Failed to upload to OSS')}: ${ossRes.status}, ${ossRes.statusText}}`);
+            result.message = commonUploadCodeError;
+        }
+        return result;
+    }
+    catch (error) {
+        const err = error;
+        logger.error(err.message);
+        result.message = commonUploadCodeError;
+        return result;
+    }
+});
+export const commitRoutineStagingCode = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const result = new ServiceOutput();
+    try {
+        const res = yield api.commitRoutineStagingCode(params);
+        if (res.statusCode === 200 && res.body) {
+            result.success = true;
+            result.message = t('commit_success').d('Generate code version success!');
+            result.data = {
+                code: res.statusCode,
+                data: {
+                    RequestId: res.body.RequestId,
+                    CodeVersion: res.body.CodeVersion
+                }
+            };
+        }
+        return result;
+    }
+    catch (error) {
+        result.message = commonUploadCodeError;
+        return result;
+    }
+});
+const publishRoutineCodeVersion = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const result = new ServiceOutput();
+    try {
+        const res = yield api.publishRoutineCodeVersion(params);
+        if (res.statusCode === 200 && res.body) {
+            result.success = true;
+            result.message = t('publish_success').d('Publish success!');
+            result.data = {
+                code: res.statusCode,
+                data: {
+                    CodeVersion: res.body.CodeVersion,
+                    RequestId: res.body.RequestId
+                }
+            };
+        }
+        return result;
+    }
+    catch (error) {
+        result.message = commonUploadCodeError;
+        return result;
+    }
+});
+export const quickDeployRoutine = (edgeRoutineProps) => __awaiter(void 0, void 0, void 0, function* () {
+    const result = new ServiceOutput();
+    result.success = true;
+    const steps = [
+        {
+            action: () => getRoutineStagingCodeUploadInfo(edgeRoutineProps),
+            message: t('upload_code').d('Uploading code...')
+        },
+        {
+            action: () => commitRoutineStagingCode({
+                name: edgeRoutineProps.name,
+                codeDescription: edgeRoutineProps.description
+            }),
+            message: t('commit_code').d('Generating code version...')
+        },
+        {
+            action: () => publishRoutineCodeVersion({
+                Name: edgeRoutineProps.name,
+                CodeVersion: '',
+                Env: Environment.Staging
+            }),
+            message: t('publish_code').d('Publishing code to production environment...')
+        }
+    ];
+    const spinner = ora(t('start_quick_deploy').d('Starting quick deploy...')).start();
+    for (const step of steps) {
+        spinner.text = step.message;
+        const stepRes = yield step.action();
+        if (stepRes.success) {
+            spinner.succeed(stepRes.message);
+        }
+        else {
+            result.success = false;
+            spinner.fail('Error: ' + stepRes.message);
+            result.message = stepRes.message;
+            break;
+        }
+    }
+    return result;
+});
+export class ServiceOutput {
+    constructor() {
+        this.success = false;
+        this.message = '';
+        this.data = {};
+    }
+}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "0.0.1-beta.8",
+  "version": "0.0.2-beta.0",
   "description": "A CLI for operating Alibaba Cloud ESA EdgeRoutine (Edge Functions).",
   "main": "bin/enter.cjs",
   "type": "module",
@@ -16,14 +16,14 @@
     "eslint": "eslint src/ --ext .js,.jsx,.ts,.tsx",
     "lint-staged": "lint-staged",
     "prepare": "npm run build",
-    "test": "vitest",
-    "coverage": "vitest --coverage",
-    "preuninstall": "rm -rf ~/.esa/config"
+    "test": "FORCE_COLOR=0 npx vitest ",
+    "coverage": "vitest --coverage"
   },
   "keywords": [
     "cli",
     "edge",
     "esa",
+    "edgeRoutine",
     "alibaba",
     "ali"
   ],
@@ -31,8 +31,11 @@
   "license": "MIT",
   "devDependencies": {
     "@babel/plugin-syntax-import-attributes": "^7.24.7",
+    "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react": "^16.0.1",
+    "@types/babel__generator": "^7.6.8",
+    "@types/babel__traverse": "^7.20.6",
     "@types/cli-table": "^0.3.4",
     "@types/cross-spawn": "^6.0.6",
     "@types/fs-extra": "^11.0.4",
@@ -50,7 +53,6 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.3",
     "jsdom": "^25.0.1",
-    "@testing-library/dom": "^10.4.0",
     "lint-staged": "^15.0.2",
     "prettier": "^3.0.3",
     "react": "^18.2.0",
@@ -61,33 +63,38 @@
     "vitest": "^2.0.4"
   },
   "dependencies": {
+    "@alicloud/esa20240910": "2.8.1",
     "@alicloud/openapi-client": "^0.4.7",
+    "@babel/generator": "^7.26.3",
     "@babel/parser": "^7.24.4",
     "@babel/traverse": "^7.24.1",
     "@iarna/toml": "^2.2.5",
-    "@tqman/ink-table": "^0.0.0-development",
     "@types/inquirer": "^9.0.7",
     "@vitest/coverage-istanbul": "^2.0.4",
+    "axios": "^1.7.7",
     "chalk": "^5.3.0",
     "chokidar": "^3.5.3",
     "cli-table3": "^0.6.5",
     "cross-spawn": "^7.0.3",
-    "esa-template": "^0.0.1-beta.2",
+    "esa-template": "^0.0.3",
     "esbuild": "^0.21.1",
     "esbuild-plugin-less": "^1.3.8",
     "form-data": "^4.0.0",
     "fs-extra": "^11.2.0",
+    "http-proxy-agent": "^7.0.2",
     "ink": "^5.0.1",
     "ink-select-input": "^6.0.0",
     "ink-text-input": "^6.0.0",
     "inquirer": "^9.2.15",
     "js-base64": "^3.7.7",
+    "moment": "^2.30.1",
     "node-fetch": "^3.3.2",
     "open": "^9.1.0",
     "ora": "^7.0.1",
     "os-locale": "^6.0.2",
     "portscanner": "^2.2.0",
     "winston": "^3.11.0",
+    "winston-daily-rotate-file": "^5.0.0",
     "yargs": "^17.7.2"
   },
   "repository": {

package/dist/utils/checkDevPort.js

@@ -52,17 +52,16 @@ const echoNewInspectTip = () => {
     logger.point(t('dev_inspect_tip5').d('Now you can use Chrome inspect with new port 😉'));
     logger.block();
 };
-const checkAndInputPort = (denoPort, inspectPort) => __awaiter(void 0, void 0, void 0, function* () {
-    let finalDenoPort = denoPort;
+const checkAndInputPort = (port, inspectPort) => __awaiter(void 0, void 0, void 0, function* () {
+    let finalPort = port;
     let finalInspectPort = inspectPort;
-    const isDenoPortAvailable = yield checkPort(denoPort);
-    const stringDenoPort = denoPort.toString();
-    const stringInspectPort = inspectPort.toString();
-    if (!isDenoPortAvailable) {
-        logger.error(t('dev_port_used', { stringDenoPort }).d(`Port ${stringDenoPort} already in use.`));
+    const isPortAvailable = yield checkPort(port);
+    const stringPort = port.toString();
+    if (!isPortAvailable) {
+        logger.error(t('dev_port_used', { stringPort }).d(`Port ${stringPort} already in use.`));
         try {
-            const availablePort = yield findAvailablePort(denoPort);
-            finalDenoPort = (yield inquirer.prompt([
+            const availablePort = yield findAvailablePort(port);
+            finalPort = (yield inquirer.prompt([
                 {
                     type: 'number',
                     name: 'port',
@@ -70,18 +69,24 @@ const checkAndInputPort = (denoPort, inspectPort) => __awaiter(void 0, void 0, v
                     default: availablePort
                 }
             ])).port;
-            const isNewDenoPortAvailable = yield checkPort(finalDenoPort);
-            if (!isNewDenoPortAvailable) {
+            const isNewPortAvailable = yield checkPort(finalPort);
+            if (!isNewPortAvailable) {
                 logger.error(t('dev_port_invalid').d('This port is invalid.'));
                 throw new Error('Specified port already in use.');
             }
         }
         catch (_) {
             const option = chalk.green('esa dev --port <port>');
-            logger.info(t('dev_port_used_advice', { option }).d(`You can use ${option} to specify another port.`));
+            logger.log(t('dev_port_used_advice', { option }).d(`You can use ${option} to specify another port.`));
             throw new Error('Specified port already in use.');
         }
     }
+    if (!inspectPort) {
+        return {
+            port: finalPort
+        };
+    }
+    const stringInspectPort = inspectPort.toString();
     const isInspectPortAvailable = yield checkPort(inspectPort);
     if (!isInspectPortAvailable) {
         logger.error(t('dev_inspect_port_used', { stringInspectPort }).d(`Inspect port ${stringInspectPort} already in use.`));
@@ -98,7 +103,7 @@ const checkAndInputPort = (denoPort, inspectPort) => __awaiter(void 0, void 0, v
         }
         catch (_) {
             const option = chalk.green('esa dev --inspect-port <port>');
-            logger.info(t('dev_port_used_advice', { option }).d(`You can use ${option} to specify another port.`));
+            logger.log(t('dev_port_used_advice', { option }).d(`You can use ${option} to specify another port.`));
             throw new Error('Inspect port already in use.');
         }
     }
@@ -106,7 +111,7 @@ const checkAndInputPort = (denoPort, inspectPort) => __awaiter(void 0, void 0, v
         echoNewInspectTip();
     }
     return {
-        denoPort: finalDenoPort,
+        port: finalPort,
         inspectPort: finalInspectPort
     };
 });