esa-cli 0.0.2-beta.0 → 0.0.2-beta.10

package/README.md

@@ -7,7 +7,7 @@ English | [简体中文](./zh_CN.md)
 #### Reference
 
 - [Edge Security Acceleration (ESA)](https://www.aliyun.com/product/esa)
-- [What is EdgeRoutine?](https://help.aliyun.com/document_detail/2710021.html)》
+- [What is EdgeRoutine?](https://help.aliyun.com/document_detail/2710021.html)
 
 > **Note**: **In version 0.0.2 and above, the local development mode of the ESA CLI has been replaced with the same runtime as the ESA edge functions, ensuring that its actual behavior now matches the live environment. We invite you to experience it.**
 

package/dist/commands/commit/index.js

@@ -15,7 +15,6 @@ import { ApiService } from '../../libs/apiService.js';
 import prodBuild from './prodBuild.js';
 import logger from '../../libs/logger.js';
 import t from '../../i18n/index.js';
-import { exit } from 'process';
 const commit = {
     command: 'commit [entry]',
     describe: `📥 ${t('commit_describe').d('Commit your code, save as a new version')}`,
@@ -87,7 +86,6 @@ export function handleCommit(argv) {
                     return;
                 yield releaseOfficialVersion(edgeRoutine);
             }
-            exit(0);
         }
         catch (error) {
             logger.error(`${t('common_error_occurred').d('An error occurred:')} ${error}`);
@@ -126,6 +124,7 @@ export function uploadEdgeRoutineCode(edgeRoutine) {
             return true;
         }
         catch (error) {
+            logger.error('123');
             logger.error(`${t('common_error_occurred').d('An error occurred:')} ${error}`);
             process.exit(0);
         }

package/dist/commands/common/constant.js

@@ -1,23 +1,4 @@
 import t from '../../i18n/index.js';
-export const SUMMARIES_LIST = [
-    {
-        title: t('summery_cd').d('Enter your routine project folder'),
-        command: '💡 cd [Your Routine Name]'
-    },
-    {
-        title: t('summery_dev').d('Start a local development server for your project'),
-        command: '💡 esa dev'
-    },
-    {
-        title: t('summery_commit').d('Save a new version of code'),
-        command: '💡 esa commit'
-    },
-    // Use Deploy or Release?
-    {
-        title: t('summery_deploy').d('Deploy your project to different environments'),
-        command: '💡 esa deploy'
-    }
-];
 export const getSummary = (routineName) => {
     return [
         {

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

@@ -81,7 +81,7 @@ 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}'`));
+    return fs.promises.writeFile(devEntry, devEntryTempFile.replace(/'\$userPath'/g, `'${projectEntry.replace(/\\/g, '/')}'`));
 });
 // 前期准备
 const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(void 0, void 0, void 0, function* () {
@@ -106,27 +106,13 @@ const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(
         if (currentIds[0] && /^\d+$/.test(currentIds[0])) {
             // 删除没有用到的入口
             for (let currentId of currentIds) {
-                const useful = yield checkPort(currentConfigObj[currentId].port);
-                if (useful) {
-                    const unusedEntry = path.resolve(userRoot, `.dev/index-${currentId}.js`);
-                    const unusedTemp = path.resolve(userRoot, `.dev/devEntry-${currentId}.js`);
-                    const unusedConfig = path.resolve(userRoot, `.dev/config-${currentId}.toml`);
-                    if (fs.existsSync(unusedEntry)) {
-                        fs.rmSync(unusedEntry, {
-                            force: true,
-                            recursive: true,
-                            maxRetries: 5
-                        });
-                    }
-                    if (fs.existsSync(unusedTemp)) {
-                        fs.rmSync(unusedTemp, {
-                            force: true,
-                            recursive: true,
-                            maxRetries: 5
-                        });
-                    }
-                    if (fs.existsSync(unusedConfig)) {
-                        fs.rmSync(unusedConfig, {
+                const unused = yield checkPort(currentConfigObj[currentId].port);
+                if (unused) {
+                    const devDir = path.resolve(userRoot, '.dev');
+                    const files = fs.readdirSync(devDir);
+                    const filesToDelete = files.filter((file) => file.includes(currentId));
+                    for (const file of filesToDelete) {
+                        fs.rmSync(path.resolve(devDir, file), {
                             force: true,
                             recursive: true,
                             maxRetries: 5
@@ -164,8 +150,7 @@ const devPack = (...args_1) => __awaiter(void 0, [...args_1], void 0, function*
         .then(() => {
         logger.ora.succeed(t('dev_pack_config_success').d('Config created successfully'));
         return devBuild({
-            minify,
-            isNode: true
+            minify
         });
     })
         .then(() => {

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

@@ -128,7 +128,6 @@ class Ew2Server {
     }
     createServer() {
         this.server = http.createServer((req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
             try {
                 const host = req.headers.host;
                 const url = req.url;
@@ -148,18 +147,20 @@ class Ew2Server {
                 // 解决 gzip 兼容性问题，防止net::ERR_CONTENT_DECODING_FAILED
                 workerHeaders['content-encoding'] = 'identity';
                 if (workerRes.body) {
-                    if ((_a = workerRes.headers.get('content-type')) === null || _a === void 0 ? void 0 : _a.includes('text/')) {
-                        const text = yield workerRes.text();
-                        // 出现换行符之类会导致 content-length 不一致
-                        workerHeaders['content-length'] =
-                            Buffer.byteLength(text).toString();
-                        res.writeHead(workerRes.status, workerHeaders);
-                        res.end(text);
-                    }
-                    else {
-                        res.writeHead(workerRes.status, workerHeaders);
-                        workerRes.body.pipe(res);
-                    }
+                    // if (workerRes.headers.get('content-type')?.includes('text/')) {
+                    //   const text = await workerRes.text();
+                    //   // 出现换行符之类会导致 content-length 不一致
+                    //   workerHeaders['content-length'] =
+                    //     Buffer.byteLength(text).toString();
+                    //     console.log(workerHeaders['content-length']);
+                    //   res.writeHead(workerRes.status, workerHeaders);
+                    //   res.end(text);
+                    // } else {
+                    //   res.writeHead(workerRes.status, workerHeaders);
+                    //   workerRes.body.pipe(res);
+                    // }
+                    res.writeHead(workerRes.status, workerHeaders);
+                    workerRes.body.pipe(res);
                     logger.log(`[ESA Dev] ${req.method} ${url} ${getColorForStatusCode(workerRes.status, workerRes.statusText)}`);
                 }
                 else {

package/dist/commands/dev/index.js

@@ -27,7 +27,8 @@ import checkAndInputPort from '../../utils/checkDevPort.js';
 import { checkOS, Platforms } from '../../utils/checkOS.js';
 let yargsIns;
 const OS = checkOS();
-const useEw2 = OS === Platforms.AppleArm || Platforms.AppleIntel || Platforms.LinuxX86;
+const EW2OS = [Platforms.AppleArm, Platforms.AppleIntel, Platforms.LinuxX86];
+const useEw2 = EW2OS.includes(OS);
 const dev = {
     command: 'dev [entry]',
     describe: `💻 ${t('dev_describe').d('Start a local server for developing your routine')}`,

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

@@ -35,7 +35,7 @@ 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}'`));
+    return fs.promises.writeFile(devEntry, devEntryTempFile.replace(/'\$userPath'/g, `'${projectEntry.replace(/\\/g, '/')}'`));
 });
 const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(void 0, void 0, void 0, function* () {
     const options = {};
@@ -51,22 +51,24 @@ const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(
             .readFileSync(configPath, 'utf-8')
             .replace('export default ', '');
         const currentConfigObj = JSON.parse(currentConfig);
-        const cIds = Object.keys(currentConfigObj);
-        if (cIds[0] && /^\d+$/.test(cIds[0])) {
-            for (let cid of cIds) {
-                const useful = yield checkPort(currentConfigObj[cid].port);
-                if (useful) {
-                    const unusedEntry = path.resolve(userRoot, `.dev/index-${cid}.js`);
-                    const unusedTemp = path.resolve(userRoot, `.dev/devEntry-${cid}.js`);
-                    if (fs.existsSync(unusedEntry)) {
-                        fs.rmSync(unusedEntry);
-                    }
-                    if (fs.existsSync(unusedTemp)) {
-                        fs.rmSync(unusedTemp);
+        const currentIds = Object.keys(currentConfigObj);
+        if (currentIds[0] && /^\d+$/.test(currentIds[0])) {
+            for (let currentId of currentIds) {
+                const unused = yield checkPort(currentConfigObj[currentId].port);
+                if (unused) {
+                    const devDir = path.resolve(userRoot, '.dev');
+                    const files = fs.readdirSync(devDir);
+                    const filesToDelete = files.filter((file) => file.includes(currentId));
+                    for (const file of filesToDelete) {
+                        fs.rmSync(path.resolve(devDir, file), {
+                            force: true,
+                            recursive: true,
+                            maxRetries: 5
+                        });
                     }
                 }
                 else {
-                    options[cid] = currentConfigObj[cid];
+                    options[currentId] = currentConfigObj[currentId];
                 }
             }
         }

package/dist/commands/init/helper.js

@@ -0,0 +1,113 @@
+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 fs from 'fs-extra';
+import path from 'path';
+import Template from '../../libs/templates/index.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import logger from '../../libs/logger.js';
+import { execSync } from 'child_process';
+import t from '../../i18n/index.js';
+import chalk from 'chalk';
+import { getDirName } from '../../utils/fileUtils/base.js';
+import inquirer from 'inquirer';
+export const getTemplateInstances = (templateHubPath) => {
+    return fs
+        .readdirSync(templateHubPath)
+        .filter((item) => {
+        const itemPath = path.join(templateHubPath, item);
+        return (fs.statSync(itemPath).isDirectory() &&
+            !['.git', 'node_modules', 'lib'].includes(item));
+    })
+        .map((item) => {
+        var _a;
+        const projectPath = path.join(templateHubPath, item);
+        const projectConfig = getProjectConfig(projectPath);
+        const templateName = (_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.name) !== null && _a !== void 0 ? _a : '';
+        return new Template(projectPath, templateName);
+    });
+};
+export const transferTemplatesToSelectItem = (configs, templateInstanceList, lang) => {
+    if (!configs)
+        return [];
+    return configs.map((config) => {
+        var _a, _b;
+        const title = config.Title_EN;
+        const value = (_b = (_a = templateInstanceList.find((template) => {
+            return title === template.title;
+        })) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : '';
+        const children = transferTemplatesToSelectItem(config.children, templateInstanceList, lang);
+        return {
+            label: lang === 'en' ? config.Title_EN : config.Title_ZH,
+            value: value,
+            children
+        };
+    });
+};
+export const preInstallDependencies = (targetPath) => __awaiter(void 0, void 0, void 0, function* () {
+    const packageJsonPath = path.join(targetPath, 'package.json');
+    if (fs.existsSync(packageJsonPath)) {
+        logger.log(t('init_install_dependence').d('⌛️ Installing dependencies...'));
+        execSync('npm install', { stdio: 'inherit', cwd: targetPath });
+        logger.success(t('init_install_dependencies_success').d('Dependencies installed successfully.'));
+        // Read and parse package.json to check for build script
+        const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
+        if (packageJson.scripts && packageJson.scripts.build) {
+            logger.log(t('init_build_project').d('⌛️ Building project...'));
+            execSync('npm run build', { stdio: 'inherit', cwd: targetPath });
+            logger.success(t('init_build_project_success').d('Project built successfully.'));
+        }
+        else {
+            logger.log(t('no_build_script').d('No build script found in package.json, skipping build step.'));
+        }
+    }
+});
+export function checkAndUpdatePackage(packageName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            // 获取当前安装的版本
+            const __dirname = getDirName(import.meta.url);
+            const packageJsonPath = path.join(__dirname, '../../../');
+            const versionInfo = execSync(`npm list ${packageName}`).toString();
+            const match = versionInfo.match(new RegExp(`(${packageName})@([0-9.]+)`));
+            const currentVersion = match ? match[2] : '';
+            // 获取最新版本
+            const latestVersion = execSync(`npm view ${packageName} version`)
+                .toString()
+                .trim();
+            if (currentVersion !== latestVersion) {
+                logger.log(t('display_current_esa_template_version').d(`Current esa-template version:`) +
+                    chalk.green(currentVersion) +
+                    '    ' +
+                    t('display_latest_esa_template_version').d(`Latest esa-template version:`) +
+                    chalk.green(latestVersion));
+                const { isUpdate } = yield inquirer.prompt({
+                    type: 'confirm',
+                    name: 'isUpdate',
+                    message: t('is_update_to_latest_version').d('Do you want to update templates to latest version?')
+                });
+                if (isUpdate) {
+                    execSync(`rm -rf node_modules/${packageName} &&rm -rf package-lock.json &&npm install ${packageName}@latest`, {
+                        cwd: packageJsonPath
+                    });
+                    logger.log(t('updated_esa_template_to_latest_version', { packageName }).d(`${packageName} updated successfully`));
+                }
+            }
+            else {
+                logger.log(t('esa_template_is_latest_version', { packageName }).d(`${packageName} is latest.`));
+            }
+        }
+        catch (error) {
+            console.log(error);
+            if (error instanceof Error) {
+                logger.error('检测和更新包时发生错误，跳过更新模版');
+            }
+        }
+    });
+}