esa-cli 0.0.2-beta.4 → 0.0.2-beta.6

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* () {

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 = {};

package/dist/i18n/locales.json

@@ -894,5 +894,29 @@
   "dev_url_invalid": {
     "en": "Invalid URL: ${url}. Please enter a valid URL.",
     "zh_CN": "不是正确的URL: ${url}. 请输入正确的URL."
+  },
+  "deno_download_failed": {
+    "en": "Download failed",
+    "zh_CN": "下载失败"
+  },
+  "deno_unzip_failed": {
+    "en": "Unzip failed",
+    "zh_CN": "解压失败"
+  },
+  "deno_add_path_failed": {
+    "en": "Add BinDir to Path failed",
+    "zh_CN": "添加环境变量失败"
+  },
+  "deno_install_success": {
+    "en": "Runtime install success!",
+    "zh_CN": "Runtime 安装成功！"
+  },
+  "deno_download_success": {
+    "en": "Download success",
+    "zh_CN": "下载成功"
+  },
+  "deno_install_success_tips": {
+    "en": "Please run ${dev} again",
+    "zh_CN": ""
   }
 }

package/dist/index.js

@@ -26,7 +26,6 @@ import { getCliConfig } from './utils/fileUtils/index.js';
 import { handleCheckVersion } from './utils/checkVersion.js';
 import t from './i18n/index.js';
 import site from './commands/site/index.js';
-import { quickDeployRoutine } from './libs/service.js';
 const main = () => __awaiter(void 0, void 0, void 0, function* () {
     const argv = hideBin(process.argv);
     const cliConfig = getCliConfig();
@@ -74,13 +73,6 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
     esa.command(logout);
     esa.command(config);
     esa.command(lang);
-    esa.command('t', false, () => { }, (args) => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield quickDeployRoutine({
-            name: 'test',
-            code: 'test'
-        });
-        // console.log(res);
-    }));
     esa.group(['help', 'version'], 'Options:');
     esa.parse();
 });

package/dist/utils/download.js

@@ -0,0 +1,173 @@
+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 fetch from 'node-fetch';
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import os from 'os';
+import AdmZip from 'adm-zip';
+import { exec } from 'child_process';
+import { promisify } from 'util';
+import t from '../i18n/index.js';
+import logger from '../libs/logger.js';
+import chalk from 'chalk';
+const execAsync = promisify(exec);
+function getBinDir() {
+    const home = os.homedir();
+    return path.join(home || '', '.deno', 'bin');
+}
+/**
+ * 下载文件
+ * @param url 远程文件URL
+ * @param dest 本地保存路径
+ */
+export function downloadFile(url, dest) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const response = yield fetch(url);
+        if (!response.ok) {
+            throw new Error(`Error downloading file: ${response.status} ${response.statusText}`);
+        }
+        const fileStream = yield fs.open(dest, 'w');
+        return new Promise((resolve, reject) => {
+            var _a, _b;
+            (_a = response.body) === null || _a === void 0 ? void 0 : _a.pipe(fileStream.createWriteStream());
+            (_b = response.body) === null || _b === void 0 ? void 0 : _b.on('error', (err) => {
+                fileStream.close();
+                reject(err);
+            });
+            fileStream.createWriteStream().on('finish', () => {
+                fileStream.close();
+                resolve();
+            });
+        });
+    });
+}
+/**
+ * 解压Zip文件 adm 是同步的
+ * @param zipPath Zip文件路径
+ * @param extractPath 解压目标目录
+ */
+export function unzipFile(zipPath, extractPath) {
+    const zip = new AdmZip(zipPath);
+    zip.extractAllTo(extractPath, true);
+    logger.info(`UnzipFile success: from ${zipPath} to ${extractPath}`);
+}
+/**
+ * 获取用户的 PATH 环境变量（win下专用）
+ * @returns 用户 PATH
+ */
+function getUserPath() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { stdout } = yield execAsync('reg query "HKCU\\Environment" /v Path');
+        const match = stdout.match(/Path\s+REG_EXPAND_SZ\s+(.*)/i);
+        if (match && match[1]) {
+            return match[1].trim();
+        }
+        return '';
+    });
+}
+/**
+ * 检查 BinDir 是否在用户的 PATH 中（win下专用）
+ * @param binDir BinDir 路径
+ * @returns 是否包含
+ */
+function isBinDirInPath(binDir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const userPath = yield getUserPath();
+        return userPath
+            .split(';')
+            .map((p) => p.toLowerCase())
+            .includes(binDir.toLowerCase());
+    });
+}
+/**
+ * 将 BinDir 添加到用户的 PATH 环境变量（win下专用）
+ * @param binDir BinDir 路径
+ */
+function addBinDirToPath(binDir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // 使用 setx 添加到 PATH
+        // setx 对 PATH 的长度有2047字符的限制
+        const command = `setx Path "%Path%;${binDir}"`;
+        try {
+            yield execAsync(command);
+            logger.info(`Path add success: ${binDir}`);
+        }
+        catch (error) {
+            throw new Error(`Add BinDir to Path failed: ${error}`);
+        }
+    });
+}
+export function downloadRuntimeAndUnzipForWindows() {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const BinDir = getBinDir();
+            const DenoZip = path.join(BinDir, 'deno.zip');
+            const Target = 'x86_64-pc-windows-msvc';
+            const DownloadUrl = `http://esa-runtime.myalicdn.com/runtime/deno-${Target}.zip`;
+            try {
+                yield fs.mkdir(BinDir, { recursive: true });
+            }
+            catch (error) {
+                const err = error;
+                logger.error(`mkdir error ${BinDir}: ${err.message}`);
+                process.exit(1);
+            }
+            try {
+                yield downloadFile(DownloadUrl, DenoZip);
+                logger.success(`${t('deno_download_success').d('Download success')}: ${DenoZip}`);
+            }
+            catch (error) {
+                const err = error;
+                logger.error(`${t('deno_download_failed').d('Download failed')}: ${err.message}`);
+                process.exit(1);
+            }
+            logger.info(`Unzip file to: ${BinDir}`);
+            try {
+                unzipFile(DenoZip, BinDir);
+            }
+            catch (error) {
+                const err = error;
+                logger.error(`${t('deno_unzip_failed').d('Unzip failed')}: ${err.message}`);
+                process.exit(1);
+            }
+            try {
+                yield fs.unlink(DenoZip);
+                logger.info(`Delete temp file: ${DenoZip}`);
+            }
+            catch (error) {
+                logger.warn(`Delete temp file ${DenoZip} failed: ${error}`);
+            }
+            try {
+                const inPath = yield isBinDirInPath(BinDir);
+                if (!inPath) {
+                    logger.info(`${BinDir} not in PATH, adding...`);
+                    yield addBinDirToPath(BinDir);
+                }
+                else {
+                    logger.info(`${BinDir} in PATH already`);
+                }
+            }
+            catch (error) {
+                const err = error;
+                logger.error(`${t('deno_add_path_failed').d('Add BinDir to Path failed')}: ${err.message}`);
+                process.exit(1);
+            }
+            logger.success(t('deno_install_success').d('Runtime install success!'));
+            logger.block();
+            const dev = chalk.green('esa dev');
+            logger.log(t('deno_install_success_tips', { dev }).d(`Please run ${dev} again`));
+        }
+        catch (error) {
+            const err = error;
+            logger.error(`Download Error: ${err.message}`);
+            process.exit(1);
+        }
+    });
+}

package/dist/utils/installDeno.js

@@ -9,16 +9,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { exec, execSync } from 'child_process';
 import os from 'os';
-import { getDirName } from './fileUtils/base.js';
-import logger from '../libs/logger.js';
 import path from 'path';
+import logger from '../libs/logger.js';
+import { getDirName } from './fileUtils/base.js';
+import { downloadRuntimeAndUnzipForWindows } from './download.js';
 import t from '../i18n/index.js';
 export function preCheckDeno() {
     return __awaiter(this, void 0, void 0, function* () {
         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();
+            yield installDeno();
             return false;
         }
         return command;
@@ -57,8 +58,8 @@ export function installDeno() {
         const p = path.join(__dirname, './install');
         switch (os.platform()) {
             case 'win32':
-                installCommand = `powershell.exe -Command "Get-Content '${p}/install.ps1' | iex"`;
-                break;
+                yield downloadRuntimeAndUnzipForWindows();
+                return true;
             case 'darwin':
             case 'linux':
                 installCommand = `sh ${p}/install.sh`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "0.0.2-beta.4",
+  "version": "0.0.2-beta.6",
   "description": "A CLI for operating Alibaba Cloud ESA EdgeRoutine (Edge Functions).",
   "main": "bin/enter.cjs",
   "type": "module",
@@ -37,6 +37,7 @@
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react": "^16.0.1",
+    "@types/adm-zip": "^0.5.7",
     "@types/babel__generator": "^7.6.8",
     "@types/babel__traverse": "^7.20.6",
     "@types/cli-table": "^0.3.4",
@@ -74,7 +75,7 @@
     "@iarna/toml": "^2.2.5",
     "@types/inquirer": "^9.0.7",
     "@vitest/coverage-istanbul": "^2.0.4",
-    "axios": "^1.7.7",
+    "adm-zip": "^0.5.16",
     "chalk": "^5.3.0",
     "chokidar": "^3.5.3",
     "cli-table3": "^0.6.5",