esa-cli 0.0.1-beta.9 → 0.0.2-beta.1

package/dist/utils/checkDevPort.js

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

package/dist/utils/checkOS.js

@@ -0,0 +1,32 @@
+import os from 'os';
+export var Platforms;
+(function (Platforms) {
+    Platforms["Win"] = "win";
+    Platforms["AppleArm"] = "darwin-arm64";
+    Platforms["AppleIntel"] = "darwin-x86_64";
+    Platforms["LinuxX86"] = "linux-x86_64";
+    Platforms["Linux"] = "linux";
+    Platforms["others"] = "others";
+})(Platforms || (Platforms = {}));
+export const checkOS = () => {
+    const platform = os.platform();
+    const cpus = os.cpus();
+    const cpuModel = cpus[0].model.toLowerCase();
+    const arch = os.arch();
+    if (platform === 'win32') {
+        return Platforms.Win;
+    }
+    if (platform === 'darwin') {
+        if (cpuModel.includes('apple')) {
+            return Platforms.AppleArm;
+        }
+        return Platforms.AppleIntel;
+    }
+    if (platform === 'linux') {
+        if (arch === 'x64') {
+            return Platforms.LinuxX86;
+        }
+        return Platforms.Linux;
+    }
+    return Platforms.others;
+};

package/dist/utils/fileMd5.js

@@ -0,0 +1,18 @@
+import fs from 'fs-extra';
+import crypto from 'crypto';
+export function calculateFileMD5(filePath) {
+    return new Promise((resolve, reject) => {
+        const hash = crypto.createHash('md5');
+        const fileStream = fs.createReadStream(filePath);
+        fileStream.on('data', (data) => {
+            hash.update(data);
+        });
+        fileStream.on('end', () => {
+            const md5sum = hash.digest('hex');
+            resolve(md5sum);
+        });
+        fileStream.on('error', (err) => {
+            reject(err);
+        });
+    });
+}

package/dist/utils/install/installEw2.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+set -e
+
+os_type=$(uname -s)
+
+if [ "$os_type" = "Darwin" ]; then
+  cpu_info=$(sysctl -n machdep.cpu.brand_string)
+  if echo "$cpu_info" | grep -q "Apple M"; then
+    target="darwin-arm64"
+  else
+    target="darwin-x86_64"
+  fi
+else
+  target="linux-x86_64"
+fi
+
+version="$1"
+ew2_uri="http://esa-runtime.myalicdn.com/ew2/${version}/${target}/edgeworker2"
+echo "${ew2_uri}"
+bin_dir="$HOME/.ew2"
+exe="$bin_dir/edgeworker2"
+
+if [ ! -d "$bin_dir" ]; then
+	mkdir -p "$bin_dir"
+fi
+
+curl --fail --location --progress-bar --output "$exe" "$ew2_uri"
+
+chmod +rwx "$exe"
+chmod +rw "$bin_dir"
+
+echo "Runtime was installed successfully to $exe"
+

package/dist/utils/{installRuntime.js → installDeno.js}

@@ -13,9 +13,9 @@ import { getDirName } from './fileUtils/base.js';
 import logger from '../libs/logger.js';
 import path from 'path';
 import t from '../i18n/index.js';
-export function preCheckRuntime() {
+export function preCheckDeno() {
     return __awaiter(this, void 0, void 0, function* () {
-        const command = yield checkRuntimeInstalled();
+        const command = yield checkDenoInstalled();
         if (!command) {
             logger.error(t('install_runtime_explain').d('Under the beta phase, we are temporarily using Deno as the local development runtime. It needs to be installed first.'));
             installDeno();
@@ -24,20 +24,20 @@ export function preCheckRuntime() {
         return command;
     });
 }
-function checkDeno(command) {
-    return new Promise((resolve, reject) => {
-        exec(`${command} --version`, (err) => {
-            if (err) {
-                reject();
-            }
-            else {
-                resolve(command);
-            }
-        });
-    });
-}
-export function checkRuntimeInstalled() {
+export function checkDenoInstalled() {
     const homeDeno = path.resolve(os.homedir(), '.deno/bin/deno');
+    function checkDeno(command) {
+        return new Promise((resolve, reject) => {
+            exec(`${command} --version`, (err) => {
+                if (err) {
+                    reject();
+                }
+                else {
+                    resolve(command);
+                }
+            });
+        });
+    }
     return new Promise((resolve) => {
         // @ts-ignore
         Promise.any([checkDeno('deno'), checkDeno(homeDeno)])

package/dist/utils/installEw2.js

@@ -0,0 +1,127 @@
+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 os from 'os';
+import fs from 'fs-extra';
+import path from 'path';
+import util from 'util';
+import https from 'https';
+import { execSync } from 'child_process';
+import logger from '../libs/logger.js';
+import { getDirName } from './fileUtils/base.js';
+import t from '../i18n/index.js';
+import { calculateFileMD5 } from './fileMd5.js';
+import { checkOS } from './checkOS.js';
+export const EW2DirName = '.ew2';
+export const EW2BinName = 'edgeworker2';
+export const EW2Path = path.join(os.homedir(), EW2DirName);
+export const EW2BinPath = path.join(EW2Path, EW2BinName);
+export const EW2ManifestPath = path.join(EW2Path, 'manifest.json');
+export function preCheckEw2() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const fsAccess = util.promisify(fs.access);
+        const manifestRes = yield checkManifest();
+        function installVersion(manifest) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield installEw2(manifest);
+                    return true;
+                }
+                catch (error) {
+                    const err = error;
+                    logger.error(err.message);
+                    return false;
+                }
+            });
+        }
+        try {
+            yield fsAccess(EW2BinPath, fs.constants.X_OK);
+            if (!manifestRes.isLatest) {
+                logger.warn(t('install_runtime_update_tip').d(`🔔 Runtime must be update to use esa dev. Installing...`));
+                return yield installVersion(manifestRes.remoteManifest);
+            }
+            return true;
+        }
+        catch (error) {
+            const err = error;
+            if (err.code === 'EACCES') {
+                logger.pathEacces(EW2BinPath);
+                return false;
+            }
+            if (err.code === 'ENOENT' || err.code === 'EPERM') {
+                logger.warn(t('install_runtime_tip').d(`🔔 Runtime must be installed to use esa dev. Installing...`));
+                return yield installVersion(manifestRes.remoteManifest);
+            }
+            logger.error(err.message);
+            return false;
+        }
+    });
+}
+export function fetchRemoteManifest() {
+    return new Promise((resolve, reject) => {
+        https
+            .get('https://edgestar-cn.oss-cn-beijing.aliyuncs.com/ew2/manifest.json', (res) => {
+            let data = '';
+            res.on('data', (chunk) => (data += chunk));
+            res.on('end', () => {
+                try {
+                    const json = JSON.parse(data);
+                    resolve(json);
+                }
+                catch (err) {
+                    reject(null);
+                }
+            });
+        })
+            .on('error', (err) => reject);
+    });
+}
+export function checkManifest() {
+    return __awaiter(this, void 0, void 0, function* () {
+        let isLatest = false;
+        const remoteManifest = yield fetchRemoteManifest();
+        const localManifestExists = yield fs.pathExists(EW2ManifestPath);
+        logger.info(`Remote version: ${remoteManifest.version}`);
+        if (localManifestExists) {
+            const localManifest = yield fs.readJSON(EW2ManifestPath);
+            isLatest = localManifest.version === remoteManifest.version;
+            logger.info(`Local version: ${localManifest.version}`);
+            if (!isLatest) {
+                logger.log(`Runtime Latest version: ${remoteManifest.version}, Current version: ${localManifest.version}`);
+            }
+        }
+        return {
+            remoteManifest,
+            isLatest
+        };
+    });
+}
+export function installEw2(manifest) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const __dirname = getDirName(import.meta.url);
+        const p = path.join(__dirname, './install');
+        const installCommand = `sh ${p}/installEw2.sh ${manifest.version}`;
+        try {
+            execSync(installCommand, { stdio: 'inherit', env: Object.assign({}, process.env) });
+            const md5 = yield calculateFileMD5(EW2BinPath);
+            const os = checkOS();
+            // @ts-ignore;
+            if (md5 === manifest[`${os}_checksum`]) {
+                logger.success('Runtime checksum success.');
+            }
+            yield fs.writeJSON(EW2ManifestPath, manifest);
+            logger.success(t('install_runtime_success').d(`Runtime installed.`));
+            return true;
+        }
+        catch (error) {
+            logger.error(`Failed to install: ${error.message}`);
+            return false;
+        }
+    });
+}

package/dist/utils/stepsRunner.js

@@ -0,0 +1,33 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import ora from 'ora';
+function stepsRunner(promises) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const results = [];
+        for (const promise of promises) {
+            const spinner = ora('Loading...').start();
+            try {
+                const result = yield promise();
+                spinner.succeed('Success!');
+                results.push({ status: 'success', message: result });
+            }
+            catch (error) {
+                spinner.fail('Error: ' + (error instanceof Error ? error.message : 'Unknown Error'));
+                results.push({
+                    status: 'error',
+                    message: error instanceof Error ? error.message : 'Unknown Error'
+                });
+                break;
+            }
+        }
+        return results;
+    });
+}
+export default stepsRunner;

package/package.json

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

package/{dist/zh_CN.md → zh_CN.md}

@@ -9,9 +9,10 @@
 - [边缘安全加速(ESA)](https://www.aliyun.com/product/esa)
 - [边缘函数概述](https://help.aliyun.com/document_detail/2710021.html)
 
-> **注意**: ESA CLI 处于公测阶段，如果您在使用中遇到任何问题，或者有任何建议，请随时提交 issue 或 pull request。
->
-> 我们正在积极改进，并欢迎任何反馈。感谢您的理解与支持！
+> **注意**: **ESA CLI 在0.0.2以上版本的本地开发模式替换成了ESA边缘函数相同的Runtime，目前实际表现与线上相同，欢迎体验！**
+
+ESA CLI 处于公测阶段，如果您在使用中遇到任何问题，或者有任何建议，请随时提交 issue 或 pull request。
+我们正在积极改进，并欢迎任何反馈。感谢您的理解与支持！
 
 ## 安装
 
@@ -75,8 +76,6 @@ export default {
 ![调试界面](https://github.com/aliyun/alibabacloud-esa-cli/blob/master/docs/dev.png)
 
 - 在界面上按 `b` 即可在浏览器中打开调试页面。
-- 在界面上按 `d` 可以查看调试引导。**Chrome 不允许命令行打开调试页面。**
-- 在 Chrome 浏览器中打开 `Chrome://inspect#devices` 页面，可以看到一个运行的`Remote Target`，点击下面的`inspect`即可查看 console 信息。**注意，EdgeRoutine 的代码为服务端代码，所以预览页面的控制台并不会输出入口文件中的 `console`，只能通过`inspect`调试。**
 - 在界面上按 `c` 可以清空面板。
 - 在界面上按 `x` 可以退出调试。
 - 可以用 `esa dev --port <port>` 临时指定端口，也可以使用 `esa config -l` 按照项目配置端口。

package/dist/README.md

@@ -1,175 +0,0 @@
-# ESA CLI
-
-A CLI for operating Alibaba Cloud ESA EdgeRoutine (Edge Functions). It supports quick creation of edge functions, local debugging, version publishing and deployment, and trigger management.
-
-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)
-
-> **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!
-
-## Installation
-
-Install and run the CLI using npm:
-
-```bash
-$ npm install esa-cli -g    # Install globally
-$ esa -v                    # Check the version
-```
-
-## Usage
-
-### 1. Initialize Routine Project
-
-```bash
-& esa init
-```
-
-The initialization command has a complete process guide. Follow the prompts to enter the project name and choose a template.
-
-### 2. Start a local server for developing your routine
-
-Local dev is the core feature of the CLI, offering a more convenient debugging experience compared to the Alibaba Cloud ESA console.
-
-```bash
-& cd <Project Name>
-& esa dev [options]
-```
-
-#### Write Code
-
-In an EdgeRoutine project, the entry file is `src/index.js`, and the basic structure is as follows:
-
-```javascript
-const html = `<!DOCTYPE html>
-<body>
-  <h1>Hello World!</h1>
-</body>`;
-
-async function handleRequest(request) {
-  return new Response(html, {
-    headers: {
-      'content-type': 'text/html;charset=UTF-8'
-    }
-  });
-}
-
-export default {
-  async fetch(event) {
-    return event.respondWith(handleRequest(event));
-  }
-};
-```
-
-For more EdgeRoutine APIs and syntax, please refer to the [API Reference](https://help.aliyun.com/document_detail/2710024.html)
-
-#### Local Debugging
-
-After executing `esa dev`, the entry file will be automatically packaged and a local debugging service will be started. The interface looks like this:
-
-![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.
-
-### 3. Log in to Alibaba Cloud Account
-
-You need to log in to your Alibaba Cloud account to perform remote management operations.
-
-First, visit the [Alibaba Cloud RAM Console](https://ram.console.aliyun.com/manage/ak) to get your AccessKey ID and AccessKey Secret, then execute `esa login` and follow the prompts to enter them.
-
-```bash
-& esa login
-& esa logout
-```
-
-### 4. Create a Version
-
-After local debugging is complete, you need to create a code version for deployment.
-
-```bash
-& esa commit      # Create a Version
-```
-
-### 5. Deploy to Environment & Manage Versions and Deployments
-
-After the code version is created, it needs to be deployed to edge nodes.
-
-Use the `esa deployments [script]` command to manage versions and deployments.
-
-```bash
-& esa deploy              # Deploy versions to the target environment
-& esa deployments list    # View deployments
-& esa deployments delete <versionId>  # Delete a version
-```
-
-_Note: Deployed versions cannot be deleted._
-
-### 6. Manage Triggers
-
-Once deployed to the nodes, you can configure triggers to access your edge functions. There are two types of triggers:
-
-- Domain: After you associate the routine with a domain name, you can use the domain name to access the routine.
-- Route: After you add a route for requested URLs, the routine is called from the edge to respond to the request.
-
-```bash
-& esa domain list
-& esa domain add <domainName>
-& esa domain delete <domainName>
-
-& esa route list
-& esa route add [route] [site]
-& esa route delete <route>
-```
-
-### 7. Manage Functions
-
-You can view and delete Routine functions through the CLI.
-
-```bash
-& esa routine list
-& esa routine delete <routineName>
-```
-
-## Commands
-
-see [Commands](./docs/Commands_en.md)
-
-## Config files
-
-### Global config file
-
-```toml
-endpoint = "" # ESA API Endpoint
-lang = "zh_CN" # language
-
-[auth]
-accessKeyId = "" # AccessKey ID
-accessKeySecret = "" # AccessKey Secret
-```
-
-### Project config file
-
-```toml
-name = "Hello World" # Project name
-description = "Hello World" # Project description
-entry = "src/index.js" # Entry file
-codeVersions = [ ] # Code version
-
-[dev]
-port = 18080 # Debug port
-localUpstream = '' # When debugging locally, the upstream source site will replace the current origin when returning to the source
-```
-
-## LICENSE
-
-[The MIT License](./LICENSE)