esa-cli 0.0.2-beta.12 → 0.0.2-beta.13

package/dist/commands/deploy/index.js

@@ -7,19 +7,9 @@ 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 { 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 t from '../../i18n/index.js';
+import { validateAndInitializeProject, commitAndDeployVersion, displayDeploySuccess } from '../common/routineUtils.js';
 const deploy = {
     command: 'deploy [entry]',
     builder: (yargs) => {
@@ -28,11 +18,6 @@ const deploy = {
             describe: t('dev_entry_describe').d('Entry file of the Routine'),
             type: 'string',
             demandOption: false
-        })
-            .option('quick', {
-            alias: 'q',
-            describe: t('deploy_quick_describe').d('Quick deploy the routine to production environment'),
-            type: 'boolean'
         })
             .option('version', {
             alias: 'v',
@@ -44,6 +29,31 @@ const deploy = {
             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 the routine'),
+            type: 'string'
+        })
+            .option('assets', {
+            alias: 'a',
+            describe: t('deploy_option_assets').d('Deploy assets'),
+            type: 'boolean'
+        })
+            .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'
+        })
+            .option('minify', {
+            alias: 'm',
+            describe: t('deploy_option_minify').d('Minify the code'),
+            type: 'boolean'
         });
     },
     describe: `🚀 ${t('deploy_describe').d('Deploy your project')}`,
@@ -52,157 +62,60 @@ const deploy = {
         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);
-            let selectedVersion;
-            let selectedType;
-            // Check if version and environment are provided via command line arguments
-            if (argv.version && argv.environment) {
-                // Validate version exists
-                const versionExists = versionList.some((v) => v.codeVersion === argv.version);
-                if (!versionExists) {
-                    logger.error(t('deploy_version_not_found').d(`Version '${argv.version}' not found`));
-                    return;
-                }
-                selectedVersion = argv.version;
-                selectedType =
-                    argv.environment === 'staging'
-                        ? PublishType.Staging
-                        : PublishType.Production;
-                logger.log(chalk.bold(`${t('deploy_using_version').d('Using version')}: ${selectedVersion}`));
-                logger.log(chalk.bold(`${t('deploy_using_environment').d('Using environment')}: ${argv.environment}`));
-            }
-            else {
-                logger.log(chalk.bold(`${t('deploy_version_select').d('Select the version you want to publish')}:`));
-                selectedVersion = yield promptSelectVersion(versionList);
-                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);
-    });
-}
-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* () {
-        const server = yield ApiService.getInstance();
-        const param = {
-            Name: name,
-            Env: selectedType === PublishType.Staging
-                ? Environment.Staging
-                : Environment.Production
-        };
-        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 : ''
-            ]);
+        const projectInfo = yield validateAndInitializeProject(argv === null || argv === void 0 ? void 0 : argv.name);
+        if (!projectInfo)
+            return;
+        const { projectConfig, projectName } = projectInfo;
+        const entry = argv.entry || projectConfig.entry;
+        const assets = argv.assets || ((_a = projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory);
+        const success = yield commitAndDeployVersion(projectConfig, entry, assets, argv.description || '', undefined, argv.environment, argv.minify, argv.version);
+        if (success) {
+            yield displayDeploySuccess(projectName, true, false);
         }
-        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]);
+        // if (allVersions.length === 0) {
+        //   logger.log(
+        //     t('no_formal_version_found').d(
+        //       'No formal version found, you need to create a version first.'
+        //     )
+        //   );
+        //   const commitRes = await generateCodeVersion(projectName, '', entry, assets);
+        //   if (!commitRes?.isSuccess) {
+        //     exit(0);
+        //   }
+        // }
+        // const {
+        //   allVersions: committedVersionList,
+        //   stagingVersions,
+        //   productionVersions
+        // } = await getRoutineCodeVersions(projectName);
+        // await displayVersionList(
+        //   committedVersionList,
+        //   stagingVersions,
+        //   productionVersions
+        // );
+        // const selectedVersion =
+        //   (argv.version as string) ||
+        //   (await promptSelectVersion(committedVersionList));
+        // const selectedEnvironment =
+        //   (argv.environment as string) || (await displaySelectDeployEnv());
+        // if (
+        //   selectedEnvironment !== PublishType.Staging &&
+        //   selectedEnvironment !== PublishType.Production
+        // ) {
+        //   logger.error(t('deploy_invalid_environment').d('Invalid environment'));
+        //   exit(0);
+        // }
+        // const success = await deployCodeVersion(
+        //   projectName,
+        //   selectedVersion,
+        //   selectedEnvironment as PublishType
+        // );
+        // if (success) {
+        //   await displayDeploySuccess(projectName, true, true);
+        // }
     });
 }
+export default deploy;

package/dist/commands/deployments/delete.js

@@ -7,13 +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 { 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')}`,
@@ -50,13 +51,37 @@ export function handleDeleteDeployments(argv) {
         let versions = argv.deploymentId;
         const isInteractive = argv.i;
         if (isInteractive) {
-            const versionList = yield getRoutineVersionList(projectConfig.name);
+            const { allVersions, stagingVersions, productionVersions } = yield getRoutineCodeVersions(projectConfig.name);
+            // 显示正在部署的版本信息
+            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) => {
+            // 过滤掉正在部署的版本
+            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 + '   ' + 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

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,45 +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;
-        const stagingEnv = routineDetail.data.Envs[1];
-        const prodEnv = routineDetail.data.Envs[0];
         const server = yield ApiService.getInstance();
         const res = yield server.getRoutineStagingEnvIp();
         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);
+        if (stagingVersions.length > 0) {
+            showEnvTable(stagingVersions.join(','));
+        }
         logger.block();
         logger.log(`${chalk.bold(`${t('deploy_env_production').d('Production')} ${chalk.green('●')}`)}`);
-        showEnvTable(prodEnv.CodeVersion);
+        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/devPack.js

@@ -7,15 +7,15 @@ 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';
+import devBuild from '../build.js';
 // 生成可用的Ew2端口
 const generateEw2Port = () => __awaiter(void 0, void 0, void 0, function* () {
     let ew2port = 3322;
@@ -129,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', '');

package/dist/commands/dev/ew2/mock/kv.js

@@ -134,10 +134,10 @@ class EdgeKV {
           );
         }
       case 'stream':
-        const value = await fetchRes.text();
+        const stream = fetchRes.body;
         return new ReadableStream({
           start(controller) {
-            controller.enqueue(new TextEncoder().encode(value));
+            controller.enqueue(new TextEncoder().encode('hello world'));
             controller.close();
           }
         });

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

@@ -8,17 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import * as http from 'http';
+import chalk from 'chalk';
 import spawn from 'cross-spawn';
+import { HttpProxyAgent } from 'http-proxy-agent';
 import fetch from 'node-fetch';
+import t from '../../../i18n/index.js';
 import logger from '../../../libs/logger.js';
 import { getRoot } from '../../../utils/fileUtils/base.js';
 import { EW2BinPath } from '../../../utils/installEw2.js';
-import { HttpProxyAgent } from 'http-proxy-agent';
-import chalk from 'chalk';
+import sleep from '../../../utils/sleep.js';
 import CacheService from './cacheService.js';
 import EdgeKV from './kvService.js';
-import t from '../../../i18n/index.js';
-import sleep from '../../../utils/sleep.js';
 const getColorForStatusCode = (statusCode, message) => {
     if (statusCode >= 100 && statusCode < 200) {
         return chalk.blue(`${statusCode} ${message}`);
@@ -87,8 +87,9 @@ class Ew2Server {
                 stdio: ['pipe', 'pipe', 'pipe']
             });
             this.workerStartTimeout = setTimeout(() => {
+                var _a;
                 reject(new Error(t('dev_worker_timeout').d('Worker start timeout')));
-                this.worker && this.worker.kill();
+                (_a = this.worker) === null || _a === void 0 ? void 0 : _a.kill();
             }, 60000);
             const sendToRuntime = () => {
                 return new Promise((resolveStart) => {
@@ -102,7 +103,7 @@ class Ew2Server {
                     const req = http.get(options, (res) => {
                         resolveStart(res.statusCode);
                     });
-                    req.on('error', (err) => {
+                    req.on('error', () => {
                         resolveStart(null);
                     });
                     req.end();
@@ -125,7 +126,8 @@ class Ew2Server {
             this.worker.on('close', this.closeHandler.bind(this));
             this.worker.on('error', this.errorHandler.bind(this));
             process.on('SIGTERM', () => {
-                this.worker && this.worker.kill();
+                var _a;
+                (_a = this.worker) === null || _a === void 0 ? void 0 : _a.kill();
             });
         });
     }
@@ -277,17 +279,18 @@ class Ew2Server {
         }
         this.stop();
     }
-    closeHandler(code, signal) {
+    closeHandler() {
         if (this.restarting) {
             this.restarting = false;
             return;
         }
         this.stop().then(() => {
+            var _a;
             logger.log(t('dev_server_closed').d('Worker server closed'));
             logger.info('Worker server closed');
             // @ts-ignore
             global.port = undefined;
-            this.onClose && this.onClose();
+            (_a = this.onClose) === null || _a === void 0 ? void 0 : _a.call(this);
         });
     }
     parseCacheBody(req) {
@@ -343,7 +346,7 @@ class Ew2Server {
                 resolve(false);
                 return;
             }
-            const onExit = (code, signal) => {
+            const onExit = () => {
                 this.worker = null;
                 resolve(true);
             };