esa-cli 0.0.5 → 1.0.0

package/dist/commands/deploy/index.js

@@ -7,198 +7,75 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import chalk from 'chalk';
-import { getProjectConfig, readEdgeRoutineFile } from '../../utils/fileUtils/index.js';
-import { Environment, PublishType } from '../../libs/interface.js';
-import logger from '../../libs/logger.js';
-import { checkDirectory, checkIsLoginSuccess, getRoutineVersionList } from '../utils.js';
-import { displayMultiSelectTable } from '../../components/mutiSelectTable.js';
-import { ApiService } from '../../libs/apiService.js';
-import { createAndDeployVersion, displaySelectDeployType, promptSelectVersion, yesNoPromptAndExecute } from './helper.js';
-import t from '../../i18n/index.js';
-import prodBuild from '../commit/prodBuild.js';
 import { exit } from 'process';
-import path from 'path';
-import { checkRoutineExist } from '../../utils/checkIsRoutineCreated.js';
-import moment from 'moment';
+import { intro, outro } from '@clack/prompts';
+import t from '../../i18n/index.js';
+import { getRoot } from '../../utils/fileUtils/base.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import { commitAndDeployVersion, displayDeploySuccess } from '../common/utils.js';
 const deploy = {
     command: 'deploy [entry]',
     builder: (yargs) => {
         return yargs
             .positional('entry', {
-            describe: t('dev_entry_describe').d('Entry file of the Routine'),
+            describe: t('dev_entry_describe').d('Entry file of Functions& Pages'),
             type: 'string',
             demandOption: false
         })
-            .option('quick', {
-            alias: 'q',
+            .option('version', {
+            alias: 'v',
+            describe: t('deploy_option_version').d('Version to deploy (skip interactive selection)'),
+            type: 'string'
+        })
+            .option('environment', {
+            alias: 'e',
+            describe: t('deploy_option_environment').d('Environment to deploy to: staging or production (skip interactive selection)'),
+            type: 'string',
+            choices: ['staging', 'production']
+        })
+            .option('name', {
+            alias: 'n',
+            describe: t('deploy_option_name').d('Name of Functions& Pages'),
+            type: 'string'
+        })
+            .option('assets', {
+            alias: 'a',
+            describe: t('deploy_option_assets').d('Deploy assets'),
+            type: 'string'
+        })
+            .option('description', {
+            alias: 'd',
+            describe: t('deploy_option_description').d('Description of the version'),
+            type: 'string'
+        })
+            .option('minify', {
+            alias: 'm',
+            describe: t('deploy_option_minify').d('Minify the code'),
             type: 'boolean'
         });
     },
     describe: `🚀 ${t('deploy_describe').d('Deploy your project')}`,
     handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
-        handleDeploy(argv);
+        yield handleDeploy(argv);
+        exit();
     })
 };
-export default deploy;
-export function quickDeploy(entry, projectConfig) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const server = yield ApiService.getInstance();
-        const entryFile = path.resolve(entry !== null && entry !== void 0 ? entry : '', 'src/index.js');
-        yield prodBuild(false, entryFile, entry);
-        const code = readEdgeRoutineFile(entry) || '';
-        const res = yield server.quickDeployRoutine({
-            name: projectConfig.name,
-            code: code
-        });
-        if (res) {
-            logger.success(t('quick_deploy_success').d('Your code has been successfully deployed'));
-            logger.log(`👉 ${t('quick_deploy_success_guide').d('Run this command to add domains')}: ${chalk.green('esa domain add <DOMAIN>')}`);
-        }
-        else {
-            logger.error(t('quick_deploy_failed').d('Quick deploy failed'));
-            throw Error(t('quick_deploy_failed').d('Quick deploy failed'));
-        }
-    });
-}
 export function handleDeploy(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        if (!checkDirectory()) {
-            return;
-        }
-        const projectConfig = getProjectConfig();
-        if (!projectConfig)
-            return logger.notInProject();
-        const isSuccess = yield checkIsLoginSuccess();
-        if (!isSuccess)
-            return;
-        const server = yield ApiService.getInstance();
-        const entry = argv.entry;
-        yield checkRoutineExist(projectConfig.name, entry);
-        const req = { Name: projectConfig.name };
-        const routineDetail = yield server.getRoutine(req, false);
-        const versionList = yield getRoutineVersionList(projectConfig.name);
-        const customEntry = argv.entry;
-        const stagingVersion = (_b = (_a = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _a === void 0 ? void 0 : _a.Envs[1]) === null || _b === void 0 ? void 0 : _b.CodeVersion;
-        const productionVersion = (_d = (_c = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _c === void 0 ? void 0 : _c.Envs[0]) === null || _d === void 0 ? void 0 : _d.CodeVersion;
-        if (argv.quick) {
-            yield quickDeploy(customEntry, projectConfig);
-            exit(0);
-        }
-        if (versionList.length === 0) {
-            logger.log(t('no_formal_version_found').d('No formal version found, you need to create a version first.'));
-            yield handleOnlyUnstableVersionFound(projectConfig, customEntry);
-        }
-        else {
-            yield displayVersionList(versionList, stagingVersion, productionVersion);
-            logger.log(chalk.bold(`${t('deploy_version_select').d('Select the version you want to publish')}:`));
-            const selectedVersion = yield promptSelectVersion(versionList);
-            const selectedType = yield displaySelectDeployType();
-            yield deploySelectedCodeVersion(projectConfig.name, selectedType, selectedVersion);
-        }
-    });
-}
-function handleNoVersionsFound(projectConfig, customEntry) {
-    return __awaiter(this, void 0, void 0, function* () {
-        logger.log(`😄 ${t('deploy_first_time').d("This is first time to deploy. Let's create a version first!")}`);
-        const created = yield yesNoPromptAndExecute(`📃 ${t('deploy_create_formal_version_ques').d('Do you want to create an unstable version now?')}`, () => createAndDeployVersion(projectConfig, true));
-        if (created) {
-            yield handleOnlyUnstableVersionFound(projectConfig);
-        }
-    });
-}
-function promptAndDeployVersion(projectConfig) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const versionList = yield getRoutineVersionList(projectConfig.name);
-        yield displayVersionList(versionList);
-        logger.log(`📃 ${t('deploy_select_version').d("Select which version you'd like to deploy")}`);
-        const selectedVersion = yield promptSelectVersion(versionList);
-        const selectedType = yield displaySelectDeployType();
-        yield deploySelectedCodeVersion(projectConfig.name, selectedType, selectedVersion);
-    });
-}
-const specialAreaTransfer = (canaryAreaSelectList) => {
-    return canaryAreaSelectList.map((item) => {
-        if (item.label === 'HongKong') {
-            return { label: 'HongKong(China)' };
-        }
-        if (item.label === 'Macau') {
-            return { label: 'Macau(China)' };
-        }
-        if (item.label === 'Taiwan') {
-            return { label: 'Taiwan(China)' };
-        }
-        return { label: item.label };
-    });
-};
-export function handleOnlyUnstableVersionFound(projectConfig, customEntry) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const created = yield yesNoPromptAndExecute(`📃 ${t('deploy_create_formal_version_ques').d('Do you want to create a formal version to deploy on production environment?')}`, () => createAndDeployVersion(projectConfig));
-        if (created) {
-            yield promptAndDeployVersion(projectConfig);
-        }
-    });
-}
-export function deploySelectedCodeVersion(name, selectedType, version) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const server = yield ApiService.getInstance();
-        const param = {
-            Name: name,
-            Env: selectedType === PublishType.Staging
-                ? Environment.Staging
-                : Environment.Production
-        };
-        if (selectedType === PublishType.Canary) {
-            const res = yield server.listRoutineCanaryAreas();
-            const canaryList = (_a = res === null || res === void 0 ? void 0 : res.CanaryAreas) !== null && _a !== void 0 ? _a : [];
-            logger.log(`📃 ${t('deploy_select_canary').d('Please select the canary area(s) you want to deploy to')}`);
-            const canaryAreaSelectList = canaryList.map((area) => {
-                return { label: area };
-            });
-            const selectedCanaryList = yield displayMultiSelectTable(specialAreaTransfer(canaryAreaSelectList));
-            param.CanaryAreaList = selectedCanaryList;
-            param.CanaryCodeVersion = version;
-        }
-        else {
-            param.CodeVersion = version;
-        }
-        try {
-            const res = yield server.publishRoutineCodeVersion(param);
-            if (res) {
-                logger.success(t('deploy_success').d('Your code has been successfully deployed'));
-                logger.log(`👉 ${t('deploy_success_guide').d('Run this command to add domains')}: ${chalk.green('esa domain add <DOMAIN>')}`);
-            }
-        }
-        catch (e) {
-            console.error(e);
-        }
-    });
-}
-export function displayVersionList(versionList_1) {
-    return __awaiter(this, arguments, void 0, function* (versionList, stagingVersion = 'unstable', productionVersion = 'unstable') {
         var _a;
-        logger.log(`${chalk.bgYellow('Active')} ${t('deploy_env_staging').d('Staging')}`);
-        logger.log(`${chalk.bgGreen('Active')} ${t('deploy_env_production').d('Production')}`);
-        const data = [];
-        for (let i = 0; i < versionList.length; i++) {
-            const version = versionList[i];
-            const createTime = moment(version.CreateTime).format('YYYY/MM/DD HH:mm:ss');
-            const tags = [
-                version.codeVersion === stagingVersion ? chalk.bgYellow('Active') : '',
-                version.codeVersion === productionVersion ? chalk.bgGreen('Active') : ''
-            ];
-            data.push([
-                `${version.codeVersion} ${tags.join(' ')}`,
-                createTime,
-                (_a = version.codeDescription) !== null && _a !== void 0 ? _a : ''
-            ]);
-        }
-        logger.table([
-            t('deploy_table_header_version').d('Version'),
-            t('deploy_table_header_created').d('Created'),
-            t('deploy_table_header_description').d('Description')
-        ], data, [30, 25, 15]);
+        const entry = argv.entry;
+        const assets = (_a = argv.assets) !== null && _a !== void 0 ? _a : undefined;
+        intro(`Deploy an application with ESA`);
+        const success = yield commitAndDeployVersion(argv.name || undefined, entry, assets, argv.description || '', getRoot(), argv.environment || 'all', argv.minify, argv.version);
+        outro(success ? 'Deploy finished' : 'Deploy failed');
+        if (success) {
+            const projectConfig = getProjectConfig(getRoot());
+            yield displayDeploySuccess(argv.name ||
+                (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.name) ||
+                getRoot().split(/[\\/]/).pop() ||
+                '', true, true);
+        }
+        exit(success ? 0 : 1);
     });
 }
+export default deploy;

package/dist/commands/deployments/delete.js

@@ -7,14 +7,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
-import { checkDirectory, checkIsLoginSuccess, getRoutineVersionList } from '../utils.js';
-import { ApiService } from '../../libs/apiService.js';
+import chalk from 'chalk';
+import { displayMultiSelectTable } from '../../components/mutiSelectTable.js';
 import t from '../../i18n/index.js';
+import { ApiService } from '../../libs/apiService.js';
 import logger from '../../libs/logger.js';
-import { displayMultiSelectTable } from '../../components/mutiSelectTable.js';
-import { Base64 } from 'js-base64';
 import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import { checkDirectory, checkIsLoginSuccess, getRoutineCodeVersions } from '../utils.js';
 const deploymentsDelete = {
     command: 'delete [deploymentId..]',
     describe: `🗑  ${t('deployments_delete_describe').d('Delete one or more deployment versions')}`,
@@ -49,29 +49,39 @@ export function handleDeleteDeployments(argv) {
         yield validRoutine(projectConfig.name);
         const server = yield ApiService.getInstance();
         let versions = argv.deploymentId;
-        // const req: DeleteRoutineCodeVersionReq = {
-        //   Name: projectConfig.name,
-        //   CodeVersion: version
-        // };
-        // const res = await server.deleteRoutineCodeVersion(req);
-        // if (res?.Status === 'OK') {
-        //   logger.success(
-        //     `${t('deployments_delete_success').d('Delete success')}: ${version}`
-        //   );
-        // } else {
-        //   logger.error(
-        //     `🙅 ${t('deployments_delete_failed').d('Delete failed')}: ${version}`
-        //   );
-        // }
         const isInteractive = argv.i;
         if (isInteractive) {
-            const versionList = yield getRoutineVersionList(projectConfig.name);
+            const { allVersions, stagingVersions, productionVersions } = yield getRoutineCodeVersions(projectConfig.name);
+            // Show information about versions being deployed
+            if (stagingVersions.length > 0 || productionVersions.length > 0) {
+                logger.log(chalk.yellow('⚠️  Currently deploying versions:'));
+                if (stagingVersions.length > 0) {
+                    logger.log(chalk.yellow(`   Staging: ${stagingVersions.join(',')}`));
+                }
+                if (productionVersions.length > 0) {
+                    logger.log(chalk.yellow(`   Production: ${productionVersions.join(',')}`));
+                }
+                logger.log('');
+            }
             logger.log(t('delete_deployments_table_title').d('  Version ID            Description'));
-            const selectList = versionList.map((item) => {
+            // Filter out versions being deployed
+            const selectList = allVersions
+                .filter((item) => {
+                var _a, _b;
+                if (stagingVersions.length === 0 && productionVersions.length === 0)
+                    return true;
+                return (!stagingVersions.includes((_a = item.codeVersion) !== null && _a !== void 0 ? _a : '') &&
+                    !productionVersions.includes((_b = item.codeVersion) !== null && _b !== void 0 ? _b : ''));
+            })
+                .map((item) => {
                 return {
-                    label: item.CodeVersion + '   ' + Base64.decode(item.CodeDescription)
+                    label: item.codeVersion + '   ' + item.codeDescription
                 };
             });
+            if (selectList.length === 0) {
+                logger.error('No deletable versions found. All versions are currently deployed.');
+                return;
+            }
             versions = (yield displayMultiSelectTable(selectList, 1, 100)).map((item) => item.slice(0, item.indexOf(' ')));
         }
         for (let i = 0; i < versions.length; i++) {

package/dist/commands/deployments/index.js

@@ -1,10 +1,10 @@
-import deploymentsList from './list.js';
-import deploymentsDelete from './delete.js';
 import t from '../../i18n/index.js';
+import deploymentsDelete from './delete.js';
+import deploymentsList from './list.js';
 let yargsIns;
 const deploymentsCommand = {
     command: 'deployments [script]',
-    describe: `🚀 ${t('deployments_describe').d('Manage your deployments')}`,
+    describe: `📜 ${t('deployments_describe').d('Manage your deployments')}`,
     builder: (yargs) => {
         yargsIns = yargs;
         return yargs
@@ -16,7 +16,7 @@ const deploymentsCommand = {
             type: 'boolean',
             default: false
         })
-            .usage(`${t('common_usage').d('Usage')}: esa deployments [list | delete]`);
+            .usage(`${t('common_usage').d('Usage')}: esa-cli deployments [list | delete]`);
     },
     handler: (argv) => {
         if (yargsIns && (argv.help || argv._.length < 2)) {

package/dist/commands/deployments/list.js

@@ -7,28 +7,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { displayVersionList } from '../deploy/index.js';
-import { checkDirectory, checkIsLoginSuccess, getRoutineVersionList } from '../utils.js';
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
 import chalk from 'chalk';
-import { ApiService } from '../../libs/apiService.js';
 import t from '../../i18n/index.js';
+import { ApiService } from '../../libs/apiService.js';
 import logger from '../../libs/logger.js';
 import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import { displayVersionList } from '../deploy/helper.js';
+import { checkIsLoginSuccess, getRoutineCodeVersions } from '../utils.js';
 const deploymentsList = {
     command: 'list',
     describe: `🔍 ${t('deployments_list_describe').d('List all deployments')}`,
-    handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
-        handleListDeployments(argv);
+    handler: () => __awaiter(void 0, void 0, void 0, function* () {
+        handleListDeployments();
     })
 };
 export default deploymentsList;
-export function handleListDeployments(argv) {
+export function handleListDeployments() {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        if (!checkDirectory()) {
-            return;
-        }
         const projectConfig = getProjectConfig();
         if (!projectConfig)
             return logger.notInProject();
@@ -37,49 +33,40 @@ export function handleListDeployments(argv) {
             return;
         yield validRoutine(projectConfig.name);
         const server = yield ApiService.getInstance();
-        const versionList = yield getRoutineVersionList(projectConfig.name);
         const req = { Name: projectConfig.name };
         const routineDetail = yield server.getRoutine(req);
         if (!routineDetail)
             return;
-        //测试环境版本
-        const stagingVersion = (_b = (_a = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _a === void 0 ? void 0 : _a.Envs[1]) === null || _b === void 0 ? void 0 : _b.CodeVersion;
-        //生产环境版本
-        const productionVersion = (_d = (_c = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _c === void 0 ? void 0 : _c.Envs[0]) === null || _d === void 0 ? void 0 : _d.CodeVersion;
-        yield displayListPrompt(routineDetail);
-        yield displayVersionList(versionList, stagingVersion, productionVersion);
+        const { allVersions, stagingVersions, productionVersions } = yield getRoutineCodeVersions(projectConfig.name);
+        yield displayDeployingVersions(routineDetail, stagingVersions, productionVersions);
+        yield displayVersionList(allVersions, stagingVersions, productionVersions);
     });
 }
-function displayListPrompt(routineDetail) {
+function displayDeployingVersions(routineDetail, stagingVersions, productionVersions) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
-        const isCanary = ((_a = routineDetail.data.Envs[0].CanaryAreaList) !== null && _a !== void 0 ? _a : []).length !== 0;
-        const canaryEnv = routineDetail.data.Envs[0];
-        const stagingEnv = routineDetail.data.Envs[1];
+        var _a, _b;
         const server = yield ApiService.getInstance();
         const res = yield server.getRoutineStagingEnvIp();
-        const stagingIpList = (_c = (_b = res === null || res === void 0 ? void 0 : res.data) === null || _b === void 0 ? void 0 : _b.IPV4) !== null && _c !== void 0 ? _c : [];
+        const stagingIpList = (_b = (_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.IPV4) !== null && _b !== void 0 ? _b : [];
         const coloredStagingIpList = stagingIpList.map((ip) => {
             return chalk.green(ip);
         });
-        const showEnvTable = (version, region) => {
+        const showEnvTable = (version) => {
             const data = [{ Version: version }];
-            if (region) {
-                data.push({ Region: region });
-            }
             logger.table([], data);
         };
         logger.log(chalk.bold(t('deploy_env_staging').d('Staging')));
         if (stagingIpList.length > 0) {
             logger.log(`Staging IP: ${coloredStagingIpList.join(', ')}`);
         }
-        showEnvTable(stagingEnv.CodeVersion);
-        logger.block();
-        logger.log(`${chalk.bold(`${t('deploy_env_production').d('Production')} ${!isCanary ? chalk.green('●') : ''}`)}`);
-        showEnvTable(canaryEnv.CodeVersion);
+        if (stagingVersions.length > 0) {
+            showEnvTable(stagingVersions.join(','));
+        }
         logger.block();
-        logger.log(`${chalk.bold(`${t('deploy_env_canary').d('Canary')} ${isCanary ? chalk.green('●') : ''}`)}`);
-        showEnvTable((_d = canaryEnv.CanaryCodeVersion) !== null && _d !== void 0 ? _d : '', (_e = canaryEnv.CanaryAreaList) === null || _e === void 0 ? void 0 : _e.join(', '));
+        logger.log(`${chalk.bold(`${t('deploy_env_production').d('Production')} ${chalk.green('●')}`)}`);
+        if (productionVersions.length > 0) {
+            showEnvTable(productionVersions.join(','));
+        }
         logger.log(`${t('show_default_url').d(`You can visit:`)} ${chalk.yellowBright(routineDetail.data.DefaultRelatedRecord)}`);
         logger.info(routineDetail.data.DefaultRelatedRecord);
         logger.block();

package/dist/commands/dev/build.js

@@ -1,12 +1,12 @@
 import fs from 'fs';
 import path from 'path';
+import _generator from '@babel/generator';
+import parser from '@babel/parser';
+import _traverse from '@babel/traverse';
 import esbuild from 'esbuild';
 import { lessLoader } from 'esbuild-plugin-less';
 import { getRoot } from '../../utils/fileUtils/base.js';
 import { NODE_EXTERNALS } from '../common/constant.js';
-import parser from '@babel/parser';
-import _traverse from '@babel/traverse';
-import _generator from '@babel/generator';
 const replacements = { cache: 'mockCache', EdgeKV: 'mockKV' };
 const traverse = _traverse.default;
 const generator = _generator.default;

package/dist/commands/dev/doProcess.js

@@ -7,14 +7,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import React, { useEffect } from 'react';
-import { Box, Text, useApp, useInput, render } from 'ink';
 import chalk from 'chalk';
+import { Box, Text, useApp, useInput, render } from 'ink';
+import React, { useEffect } from 'react';
+import t from '../../i18n/index.js';
 import logger from '../../libs/logger.js';
-import openInBrowser from '../../utils/openInBrowser.js';
-import { getDevOpenBrowserUrl } from '../../utils/fileUtils/index.js';
 import { checkOS, Platforms } from '../../utils/checkOS.js';
-import t from '../../i18n/index.js';
+import { getDevOpenBrowserUrl } from '../../utils/fileUtils/index.js';
+import openInBrowser from '../../utils/openInBrowser.js';
 const InteractionBox = ({ worker }) => {
     const { exit } = useApp();
     const inspectLink = chalk.underline.blue('chrome://inspect/#devices');

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

@@ -0,0 +1,33 @@
+class CacheService {
+    constructor() {
+        this.store = new Map();
+        this.maxQuota = 100 * 1024 * 1024;
+    }
+    put(key, serializedResponse) {
+        const expires = serializedResponse.ttl === 0
+            ? Infinity
+            : Date.now() + serializedResponse.ttl * 1000;
+        this.store.set(key, {
+            serializedResponse,
+            expires: expires,
+            lastUsed: Date.now()
+        });
+    }
+    get(key) {
+        const entry = this.store.get(key);
+        if (!entry || Date.now() > entry.expires) {
+            return null;
+        }
+        entry.lastUsed = Date.now();
+        return entry;
+    }
+    delete(key) {
+        return this.deleteEntry(key);
+    }
+    deleteEntry(key) {
+        if (!this.store.has(key))
+            return false;
+        return this.store.delete(key);
+    }
+}
+export default CacheService;

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

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

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

@@ -7,16 +7,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import path from 'path';
 import fs from 'fs';
-import logger from '../../../libs/logger.js';
-import devBuild from '../build.js';
+import path from 'path';
 import t from '../../../i18n/index.js';
-import { getDevConf } from '../../../utils/fileUtils/index.js';
-import { getRoot, getDirName } from '../../../utils/fileUtils/base.js';
+import logger from '../../../libs/logger.js';
 import { checkPort } from '../../../utils/checkDevPort.js';
+import { getRoot, getDirName } from '../../../utils/fileUtils/base.js';
+import { getDevConf } from '../../../utils/fileUtils/index.js';
 import { EW2Path } from '../../../utils/installEw2.js';
-// 生成可用的Ew2端口
+import devBuild from '../build.js';
+// Generate available Ew2 port
 const generateEw2Port = () => __awaiter(void 0, void 0, void 0, function* () {
     let ew2port = 3322;
     let portAvailable = yield checkPort(ew2port);
@@ -60,8 +60,8 @@ conf_path = "${erConfPath}"
         fs.promises.writeFile(erConfPath, erConf)
     ]);
 };
-// 生成入口文件
-const generateEntry = (id, projectEntry, userRoot) => __awaiter(void 0, void 0, void 0, function* () {
+// Generate entry file
+const generateEntry = (id, projectEntry, userRoot, port) => __awaiter(void 0, void 0, void 0, function* () {
     const __dirname = getDirName(import.meta.url);
     const devDir = path.resolve(userRoot, '.dev');
     const devEntry = path.resolve(devDir, `devEntry-${id}.js`);
@@ -81,22 +81,24 @@ const generateEntry = (id, projectEntry, userRoot) => __awaiter(void 0, void 0,
         const destPath = path.resolve(mockDevDir, file);
         yield fs.promises.copyFile(srcPath, destPath);
     }
-    return fs.promises.writeFile(devEntry, devEntryTempFile.replace(/'\$userPath'/g, `'${projectEntry.replace(/\\/g, '/')}'`));
+    return fs.promises.writeFile(devEntry, devEntryTempFile
+        .replace(/'\$userPath'/g, `'${projectEntry.replace(/\\/g, '/')}'`)
+        .replace(/\$userPort/g, `${port}`));
 });
-// 前期准备
+// Preliminary preparation
 const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(void 0, void 0, void 0, function* () {
     const options = {};
     const currentOptions = { entry, port, localUpstream };
-    // 支持同时跑多个 worker
+    // Support running multiple workers simultaneously
     const id = new Date().getTime().toString();
     // @ts-ignore
     global.id = id;
-    // 生成入口文件
-    yield generateEntry(id, entry, userRoot);
-    // 生成 Ew2 配置
+    // Generate entry file
+    yield generateEntry(id, entry, userRoot, port);
+    // Generate Ew2 configuration
     const ew2port = yield generateEw2Port();
     yield writeEw2config(id, ew2port, userRoot);
-    // 给每一次 dev 的配置项，在一个文件中通过 id 区分
+    // Configuration items for each dev session, distinguished by id in one file
     if (fs.existsSync(configPath)) {
         const currentConfig = fs
             .readFileSync(configPath, 'utf-8')
@@ -104,7 +106,7 @@ const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(
         const currentConfigObj = JSON.parse(currentConfig);
         const currentIds = Object.keys(currentConfigObj);
         if (currentIds[0] && /^\d+$/.test(currentIds[0])) {
-            // 删除没有用到的入口
+            // Remove unused entries
             for (let currentId of currentIds) {
                 const unused = yield checkPort(currentConfigObj[currentId].port);
                 if (unused) {
@@ -127,13 +129,22 @@ const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(
     }
     return fs.promises.writeFile(configPath, `export default ${JSON.stringify(Object.assign(options, { [id]: currentOptions }))}`);
 });
-const devPack = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (restarting = false) {
+const devPack = () => __awaiter(void 0, void 0, void 0, function* () {
     logger.ora.start('Processing...\n');
     const userRoot = getRoot();
-    const configPath = path.resolve(userRoot, 'esa.toml');
+    // Try to find config file in order of preference: .jsonc, .toml
+    const configFormats = ['esa.jsonc', 'esa.toml'];
+    let configPath = null;
+    for (const format of configFormats) {
+        const testPath = path.resolve(userRoot, format);
+        if (fs.existsSync(testPath)) {
+            configPath = testPath;
+            break;
+        }
+    }
     let port, minify, localUpstream, entry;
     let projectEntry = path.resolve(userRoot, 'src/index.js');
-    if (fs.existsSync(configPath)) {
+    if (configPath) {
         port = getDevConf('port', 'dev', 18080);
         minify = getDevConf('minify', 'dev', false);
         localUpstream = getDevConf('localUpstream', 'dev', '');
@@ -144,7 +155,7 @@ const devPack = (...args_1) => __awaiter(void 0, [...args_1], void 0, function*
     }
     else {
         logger.notInProject();
-        process.exit(0);
+        process.exit(1);
     }
     return prepare(path.resolve(userRoot, '.dev/devConfig.js'), projectEntry, port, localUpstream, userRoot)
         .then(() => {