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

package/README.md

@@ -7,11 +7,11 @@ 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**: ESA CLI is in public beta. If you encounter any issues or have any suggestions while using it, please feel free to submit an issue or a pull request.
->
-> We are actively working to improve this tool and welcome any feedback. Thank you for your understanding and support!
+> **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.**
+
+ESA CLI is in public beta. If you encounter any issues or have any suggestions while using it, please feel free to submit an issue or a pull request.We are actively working to improve this tool and welcome any feedback. Thank you for your understanding and support!
 
 ## Installation
 
@@ -75,8 +75,6 @@ After executing `esa dev`, the entry file will be automatically packaged and a l
 ![dev png](https://github.com/aliyun/alibabacloud-esa-cli/blob/master/docs/dev.png)
 
 - Press `b` to open the debugging page in the browser.
-- Press `d` to view debugging instructions. **Chrome does not allow the command line to open the debugging page**.
-- Open `chrome://inspect#devices` in the Chrome browser to see a running Remote Target. Click inspect below it to view console information. **Note that the EdgeRoutine code is server-side, so the console on the preview page will not output console in the entry file. Use inspect for debugging.**
 - Press `c` to clear the panel.
 - Press `x` to exit debugging.
 - You can use `esa dev --port <port>` to temporarily specify the port or use `esa config -l` to set the port by project configuration.

package/bin/enter.cjs

@@ -35,7 +35,6 @@ const main = () => {
       process.disconnect && process.disconnect();
     })
     .on('exit', (code) => {
-      // console.log('Get exit', code);
       process.exit && process.exit(code);
     });
 };

package/dist/README.md

@@ -7,11 +7,11 @@ 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**: ESA CLI is in public beta. If you encounter any issues or have any suggestions while using it, please feel free to submit an issue or a pull request.
->
-> We are actively working to improve this tool and welcome any feedback. Thank you for your understanding and support!
+> **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.**
+
+ESA CLI is in public beta. If you encounter any issues or have any suggestions while using it, please feel free to submit an issue or a pull request.We are actively working to improve this tool and welcome any feedback. Thank you for your understanding and support!
 
 ## Installation
 
@@ -75,8 +75,6 @@ After executing `esa dev`, the entry file will be automatically packaged and a l
 ![dev png](https://github.com/aliyun/alibabacloud-esa-cli/blob/master/docs/dev.png)
 
 - Press `b` to open the debugging page in the browser.
-- Press `d` to view debugging instructions. **Chrome does not allow the command line to open the debugging page**.
-- Open `chrome://inspect#devices` in the Chrome browser to see a running Remote Target. Click inspect below it to view console information. **Note that the EdgeRoutine code is server-side, so the console on the preview page will not output console in the entry file. Use inspect for debugging.**
 - Press `c` to clear the panel.
 - Press `x` to exit debugging.
 - You can use `esa dev --port <port>` to temporarily specify the port or use `esa config -l` to set the port by project configuration.

package/dist/bin/enter.cjs

@@ -35,7 +35,6 @@ const main = () => {
       process.disconnect && process.disconnect();
     })
     .on('exit', (code) => {
-      // console.log('Get exit', code);
       process.exit && process.exit(code);
     });
 };

package/dist/commands/commit/index.js

@@ -120,14 +120,14 @@ export function uploadEdgeRoutineCode(edgeRoutine) {
             const uploadResult = yield server.getRoutineStagingCodeUploadInfo(edgeRoutine);
             if (!uploadResult) {
                 logger.error(t('commit_upload_fail').d('An error occurred while trying to upload your code'));
-                return false;
+                process.exit(0);
             }
             logger.success(t('commit_upload_success').d('Code uploaded successfully.'));
             return true;
         }
         catch (error) {
             logger.error(`${t('common_error_occurred').d('An error occurred:')} ${error}`);
-            return false;
+            process.exit(0);
         }
     });
 }

package/dist/commands/commit/prodBuild.js

@@ -11,7 +11,7 @@ import esbuild from 'esbuild';
 import { lessLoader } from 'esbuild-plugin-less';
 import path from 'path';
 import fs from 'fs';
-import { getRoot } from '../../utils/fileUtils/index.js';
+import { getRoot } from '../../utils/fileUtils/base.js';
 import { NODE_EXTERNALS } from '../common/constant.js';
 const userRoot = getRoot();
 const entry = path.resolve(userRoot, 'src/index.js');

package/dist/commands/deploy/index.js

@@ -22,6 +22,7 @@ import prodBuild from '../commit/prodBuild.js';
 import { exit } from 'process';
 import path from 'path';
 import { checkRoutineExist } from '../../utils/checkIsRoutineCreated.js';
+import moment from 'moment';
 const deploy = {
     command: 'deploy [entry]',
     builder: (yargs) => {
@@ -58,6 +59,7 @@ export function quickDeploy(entry, projectConfig) {
         }
         else {
             logger.error(t('quick_deploy_failed').d('Quick deploy failed'));
+            process.exit(0);
         }
     });
 }
@@ -197,7 +199,7 @@ export function displayVersionList(versionList_1) {
         const data = [];
         for (let i = 0; i < versionList.length; i++) {
             const version = versionList[i];
-            const createTime = new Date(version.CreateTime).toLocaleString();
+            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') : ''
@@ -212,6 +214,6 @@ export function displayVersionList(versionList_1) {
             t('deploy_table_header_version').d('Version'),
             t('deploy_table_header_created').d('Created'),
             t('deploy_table_header_description').d('Description')
-        ], data);
+        ], data, [30, 25, 15]);
     });
 }

package/dist/commands/deployments/list.js

@@ -83,7 +83,8 @@ function displayListPrompt(routineDetail) {
         logger.block();
         logger.log(`${chalk.bold(`${t('deploy_env_canary').d('Canary')} ${isCanary ? chalk.green('●') : ''}`)}`);
         showEnvTable((_d = canaryEnv.CanaryCodeVersion) !== null && _d !== void 0 ? _d : '', canaryEnv.SpecName, (_e = canaryEnv.CanaryAreaList) === null || _e === void 0 ? void 0 : _e.join(', '));
-        logger.info(`${t('show_default_url').d(`You can visit:`)} ${chalk.yellowBright(routineDetail.data.DefaultRelatedRecord)}`);
+        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

@@ -0,0 +1,57 @@
+import fs from 'fs';
+import path from 'path';
+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;
+const renameMock = {
+    name: 'rename-mock',
+    setup(build) {
+        build.onEnd(() => {
+            if (build.initialOptions.outfile) {
+                const outFile = fs.readFileSync(build.initialOptions.outfile, 'utf-8');
+                const ast = parser.parse(outFile, {
+                    sourceType: 'module'
+                });
+                traverse(ast, {
+                    Identifier(path) {
+                        const name = path.node.name;
+                        if (replacements.hasOwnProperty(name)) {
+                            path.node.name = replacements[name];
+                        }
+                    }
+                });
+                const { code } = generator(ast);
+                fs.writeFileSync(build.initialOptions.outfile, code);
+            }
+        });
+    }
+};
+export default function (options) {
+    const userRoot = getRoot();
+    // @ts-ignore
+    const id = global.id;
+    const devEntry = path.resolve(userRoot, `.dev/devEntry-${id}.js`);
+    return esbuild.build({
+        entryPoints: [devEntry],
+        outfile: path.resolve(userRoot, `.dev/index-${id}.js`),
+        bundle: true,
+        minify: !!options.minify,
+        splitting: false,
+        format: 'esm',
+        platform: options.isNode ? 'node' : 'browser',
+        // EW2 support node externals
+        external: NODE_EXTERNALS,
+        // @ts-ignore
+        plugins: [lessLoader(), renameMock],
+        loader: {
+            '.client.js': 'text'
+        }
+    });
+}

package/dist/commands/dev/doProcess.js

@@ -13,12 +13,15 @@ import chalk from 'chalk';
 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';
 const InteractionBox = ({ worker }) => {
     const { exit } = useApp();
     const inspectLink = chalk.underline.blue('chrome://inspect/#devices');
     const remoteTarget = chalk.blue('Remote Target');
     const inspect = chalk.blue('inspect');
+    const OS = checkOS();
+    const useEw2 = OS === Platforms.AppleArm || Platforms.AppleIntel || Platforms.LinuxX86;
     /* eslint-disable no-unused-vars */
     useInput((input) => __awaiter(void 0, void 0, void 0, function* () {
         switch (input.toLowerCase()) {
@@ -31,6 +34,8 @@ const InteractionBox = ({ worker }) => {
                 break;
             }
             case 'd': {
+                if (useEw2)
+                    return;
                 logger.log(t('dev_input_inspect_tip1', { inspectLink }).d(`👉 Please visit ${inspectLink} in the Chrome browser`));
                 logger.log(t('dev_input_inspect_tip2', { inspect, remoteTarget }).d(`👉 See your debugger under ${remoteTarget} and click the ${inspect} button`));
                 break;
@@ -53,9 +58,9 @@ const InteractionBox = ({ worker }) => {
         React.createElement(Box, { borderStyle: "classic", paddingLeft: 1, paddingRight: 1 },
             React.createElement(Text, { bold: true }, "[b]"),
             React.createElement(Text, null, " open a browser, "),
-            React.createElement(React.Fragment, null,
+            !useEw2 ? (React.createElement(React.Fragment, null,
                 React.createElement(Text, { bold: true }, "[d]"),
-                React.createElement(Text, null, " open Devtools, ")),
+                React.createElement(Text, null, " open Devtools, "))) : null,
             React.createElement(Text, { bold: true }, "[c]"),
             React.createElement(Text, null, " clear console, "),
             React.createElement(Text, { bold: true }, "[x]"),
@@ -67,6 +72,9 @@ const doProcess = (worker) => {
         devElement,
         exit: () => {
             devElement.unmount();
+            setTimeout(() => {
+                process.exit(0);
+            }, 500);
         }
     };
 };

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

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

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

@@ -0,0 +1,185 @@
+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 path from 'path';
+import fs from 'fs';
+import logger from '../../../libs/logger.js';
+import devBuild from '../build.js';
+import t from '../../../i18n/index.js';
+import { getDevConf } from '../../../utils/fileUtils/index.js';
+import { getRoot, getDirName } from '../../../utils/fileUtils/base.js';
+import { checkPort } from '../../../utils/checkDevPort.js';
+import { EW2Path } from '../../../utils/installEw2.js';
+// 生成可用的Ew2端口
+const generateEw2Port = () => __awaiter(void 0, void 0, void 0, function* () {
+    let ew2port = 3322;
+    let portAvailable = yield checkPort(ew2port);
+    while (!portAvailable) {
+        ew2port += 1;
+        portAvailable = yield checkPort(ew2port);
+    }
+    // @ts-ignore
+    global.ew2Port = ew2port;
+    return ew2port;
+});
+const writeEw2config = (id, port, userRoot) => {
+    const devDir = path.resolve(userRoot, '.dev');
+    const devIndex = path.resolve(devDir, `index-${id}.js`);
+    const devConfPath = path.resolve(devDir, `config-${id}.toml`);
+    const erConfPath = path.resolve(EW2Path, `er.conf`);
+    const config = `
+port = ${port}
+[debugger_cli_options]
+enable = true
+code_path = "${devIndex}"
+conf_path = "${erConfPath}"
+`;
+    const erConf = JSON.stringify({
+        Ttl: 301,
+        ServiceOptions: {
+            service_status: 'active'
+        },
+        InstanceOptions: {
+            allow_node_module: true
+        },
+        ContextOptions: {
+            vm_max_cpu_time: 100
+        },
+        ServiceOptionsMd5: '1',
+        InstanceOptionsMd5: '2',
+        ContextOptionsMd5: '3'
+    });
+    return Promise.all([
+        fs.promises.writeFile(devConfPath, config),
+        fs.promises.writeFile(erConfPath, erConf)
+    ]);
+};
+// 生成入口文件
+const generateEntry = (id, projectEntry, userRoot) => __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`);
+    const devEntryTemp = path.resolve(__dirname, './devEntry.js');
+    const devEntryTempFile = fs.readFileSync(devEntryTemp, 'utf-8');
+    const mockDevDir = path.resolve(userRoot, '.dev/mock');
+    const mockDir = path.resolve(__dirname, './mock');
+    if (!fs.existsSync(devDir)) {
+        yield fs.promises.mkdir(devDir);
+    }
+    if (!fs.existsSync(mockDevDir)) {
+        yield fs.promises.mkdir(mockDevDir);
+    }
+    const entries = yield fs.promises.readdir(mockDir);
+    for (const file of entries) {
+        const srcPath = path.resolve(mockDir, file);
+        const destPath = path.resolve(mockDevDir, file);
+        yield fs.promises.copyFile(srcPath, destPath);
+    }
+    return fs.promises.writeFile(devEntry, devEntryTempFile.replace(/'\$userPath'/g, `'${projectEntry}'`));
+});
+// 前期准备
+const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(void 0, void 0, void 0, function* () {
+    const options = {};
+    const currentOptions = { entry, port, localUpstream };
+    // 支持同时跑多个 worker
+    const id = new Date().getTime().toString();
+    // @ts-ignore
+    global.id = id;
+    // 生成入口文件
+    yield generateEntry(id, entry, userRoot);
+    // 生成 Ew2 配置
+    const ew2port = yield generateEw2Port();
+    yield writeEw2config(id, ew2port, userRoot);
+    // 给每一次 dev 的配置项，在一个文件中通过 id 区分
+    if (fs.existsSync(configPath)) {
+        const currentConfig = fs
+            .readFileSync(configPath, 'utf-8')
+            .replace('export default ', '');
+        const currentConfigObj = JSON.parse(currentConfig);
+        const currentIds = Object.keys(currentConfigObj);
+        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, {
+                            force: true,
+                            recursive: true,
+                            maxRetries: 5
+                        });
+                    }
+                }
+                else {
+                    options[currentId] = currentConfigObj[currentId];
+                }
+            }
+        }
+    }
+    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) {
+    logger.ora.start('Processing...\n');
+    const userRoot = getRoot();
+    const configPath = path.resolve(userRoot, 'esa.toml');
+    let port, minify, localUpstream, entry;
+    let projectEntry = path.resolve(userRoot, 'src/index.js');
+    if (fs.existsSync(configPath)) {
+        port = getDevConf('port', 'dev', 18080);
+        minify = getDevConf('minify', 'dev', false);
+        localUpstream = getDevConf('localUpstream', 'dev', '');
+        entry = getDevConf('entry', '', '');
+        if (entry) {
+            projectEntry = path.resolve(userRoot, entry);
+        }
+    }
+    else {
+        logger.notInProject();
+        process.exit(0);
+    }
+    return prepare(path.resolve(userRoot, '.dev/devConfig.js'), projectEntry, port, localUpstream, userRoot)
+        .then(() => {
+        logger.ora.succeed(t('dev_pack_config_success').d('Config created successfully'));
+        return devBuild({
+            minify,
+            isNode: true
+        });
+    })
+        .then(() => {
+        logger.ora.succeed(t('dev_pack_success').d('Build finished successfully'));
+        logger.ora.stop();
+        logger.block();
+    })
+        .catch((err) => {
+        logger.ora.fail('Build Failed');
+        logger.error(`${t('common_error_occurred').d('An error occurred')}: ${err}`);
+        if (err.toString().includes('EACCES')) {
+            logger.pathEacces(getDirName(import.meta.url));
+        }
+        process.exit(1);
+    });
+});
+export default devPack;

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

@@ -0,0 +1,32 @@
+class MockCache {
+  constructor() {
+    this.cache = new Map();
+  }
+
+  static async init(cacheName) {
+    const instance = await MockCache.open(cacheName);
+    return new MockCache(instance);
+  }
+
+  static async open(cacheName) {
+    return new Map();
+  }
+
+  async match(reqOrUrl) {
+    return this.cache.get(reqOrUrl) || null;
+  }
+
+  async delete(reqOrUrl) {
+    return this.cache.delete(reqOrUrl);
+  }
+
+  async put(reqOrUrl, response) {
+    this.cache.set(reqOrUrl, response);
+  }
+
+  async get(reqOrUrl) {
+    return this.match(reqOrUrl);
+  }
+}
+
+export default MockCache;

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

@@ -0,0 +1,45 @@
+class EdgeKV {
+  constructor(options) {
+    this.namespace = options.namespace;
+    this.allData = {};
+  }
+
+  async get(key, options) {
+    const namespaceData = this.allData[this.namespace] || {};
+    if (!(key in namespaceData)) {
+      return undefined;
+    }
+    const value = namespaceData[key];
+    const type = options?.type || 'text';
+    switch (type) {
+      case 'text':
+        return value;
+      case 'json':
+        try {
+          return JSON.parse(value);
+        } catch (error) {
+          throw new Error('Failed to parse JSON');
+        }
+      case 'arrayBuffer':
+        const encoder = new TextEncoder();
+        const uint8Array = encoder.encode(value);
+        return uint8Array.buffer;
+      default:
+        throw new Error('Invalid type option');
+    }
+  }
+
+  async put(key, value) {
+    const namespaceData = this.allData[this.namespace] || {};
+    namespaceData[key] = value;
+    this.allData[this.namespace] = namespaceData;
+  }
+
+  async delete(key) {
+    const namespaceData = this.allData[this.namespace] || {};
+    delete namespaceData[key];
+    this.allData[this.namespace] = namespaceData;
+  }
+}
+
+export default EdgeKV;