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

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

@@ -8,15 +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 t from '../../../i18n/index.js';
 import sleep from '../../../utils/sleep.js';
+import CacheService from './cacheService.js';
+import EdgeKV from './kvService.js';
 const getColorForStatusCode = (statusCode, message) => {
     if (statusCode >= 100 && statusCode < 200) {
         return chalk.blue(`${statusCode} ${message}`);
@@ -40,6 +42,8 @@ const getColorForStatusCode = (statusCode, message) => {
 class Ew2Server {
     constructor(props) {
         this.worker = null;
+        this.cache = null;
+        this.kv = null;
         this.startingWorker = false;
         this.workerStartTimeout = undefined;
         this.server = null;
@@ -57,6 +61,8 @@ class Ew2Server {
         return __awaiter(this, void 0, void 0, function* () {
             this.startingWorker = true;
             const result = yield this.openEdgeWorker();
+            this.cache = new CacheService();
+            this.kv = new EdgeKV();
             if (!result) {
                 throw new Error('Worker start failed');
             }
@@ -81,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) => {
@@ -96,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();
@@ -119,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();
             });
         });
     }
@@ -128,37 +136,60 @@ class Ew2Server {
     }
     createServer() {
         this.server = http.createServer((req, res) => __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
+            if (req.url === '/favicon.ico') {
+                res.writeHead(204, {
+                    'Content-Type': 'image/x-icon',
+                    'Content-Length': 0
+                });
+                return res.end();
+            }
+            if ((_a = req.url) === null || _a === void 0 ? void 0 : _a.includes('/mock_cache')) {
+                const cacheResult = yield this.handleCache(req);
+                return res.end(JSON.stringify(cacheResult));
+            }
+            if ((_b = req.url) === null || _b === void 0 ? void 0 : _b.includes('/mock_kv')) {
+                const kvResult = yield this.handleKV(req);
+                if ((_c = req.url) === null || _c === void 0 ? void 0 : _c.includes('/get')) {
+                    if (kvResult.success) {
+                        return res.end(kvResult.value);
+                    }
+                    else {
+                        res.setHeader('Kv-Get-Empty', 'true');
+                        return res.end();
+                    }
+                }
+                else {
+                    return res.end(JSON.stringify(kvResult));
+                }
+            }
             try {
                 const host = req.headers.host;
                 const url = req.url;
+                const method = req.method;
+                const headers = Object.entries(req.headers).reduce((acc, [key, value]) => {
+                    if (Array.isArray(value)) {
+                        acc[key] = value.join(', ');
+                    }
+                    else {
+                        acc[key] = value;
+                    }
+                    return acc;
+                }, {});
                 // @ts-ignore
                 const ew2Port = global.ew2Port;
                 // @ts-ignore
                 const localUpstream = global.localUpstream;
                 const workerRes = yield fetch(`http://${localUpstream ? localUpstream : host}${url}`, {
-                    method: 'GET',
-                    headers: {
-                        'x-er-context': 'eyJzaXRlX2lkIjogIjYyMjcxODQ0NjgwNjA4IiwgInNpdGVfbmFtZSI6ICJjb21wdXRlbHguYWxpY2RuLXRlc3QuY29tIiwgInNpdGVfcmVjb3JkIjogIm1vY2hlbi1uY2RuLmNvbXB1dGVseC5hbGljZG4tdGVzdC5jb20iLCAiYWxpdWlkIjogIjEzMjI0OTI2ODY2NjU2MDgiLCAic2NoZW1lIjoiaHR0cCIsICAiaW1hZ2VfZW5hYmxlIjogdHJ1ZX0=',
-                        'x-er-id': 'a.bA'
-                    },
+                    method,
+                    headers: Object.assign(Object.assign({}, headers), { 'x-er-context': 'eyJzaXRlX2lkIjogIjYyMjcxODQ0NjgwNjA4IiwgInNpdGVfbmFtZSI6ICJjb21wdXRlbHguYWxpY2RuLXRlc3QuY29tIiwgInNpdGVfcmVjb3JkIjogIm1vY2hlbi1uY2RuLmNvbXB1dGVseC5hbGljZG4tdGVzdC5jb20iLCAiYWxpdWlkIjogIjEzMjI0OTI2ODY2NjU2MDgiLCAic2NoZW1lIjoiaHR0cCIsICAiaW1hZ2VfZW5hYmxlIjogdHJ1ZX0=', 'x-er-id': 'a.bA' }),
+                    body: req.method === 'GET' ? undefined : req,
                     agent: new HttpProxyAgent(`http://127.0.0.1:${ew2Port}`)
                 });
                 const workerHeaders = Object.fromEntries(workerRes.headers.entries());
                 // 解决 gzip 兼容性问题，防止net::ERR_CONTENT_DECODING_FAILED
                 workerHeaders['content-encoding'] = 'identity';
                 if (workerRes.body) {
-                    // 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)}`);
@@ -176,6 +207,65 @@ class Ew2Server {
             logger.log(`listening on port ${this.port}`);
         });
     }
+    handleCache(req) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f;
+            const body = yield this.parseCacheBody(req);
+            if ((_a = req.url) === null || _a === void 0 ? void 0 : _a.includes('/put')) {
+                (_b = this.cache) === null || _b === void 0 ? void 0 : _b.put(body.key, body);
+                return { success: true };
+            }
+            if ((_c = req.url) === null || _c === void 0 ? void 0 : _c.includes('/get')) {
+                const res = (_d = this.cache) === null || _d === void 0 ? void 0 : _d.get(body.key);
+                if (!res) {
+                    return { success: false, key: body.key };
+                }
+                return { success: true, key: body.key, data: res === null || res === void 0 ? void 0 : res.serializedResponse };
+            }
+            if ((_e = req.url) === null || _e === void 0 ? void 0 : _e.includes('/delete')) {
+                const res = (_f = this.cache) === null || _f === void 0 ? void 0 : _f.delete(body.key);
+                return { success: !!res };
+            }
+            return { success: false };
+        });
+    }
+    handleKV(req) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f;
+            const url = new URL(req.url, 'http://localhost');
+            const key = url.searchParams.get('key');
+            const namespace = url.searchParams.get('namespace');
+            const body = yield this.parseKVBody(req);
+            if (!key || !namespace) {
+                return {
+                    success: false
+                };
+            }
+            if ((_a = req.url) === null || _a === void 0 ? void 0 : _a.includes('/put')) {
+                (_b = this.kv) === null || _b === void 0 ? void 0 : _b.put(key, body, namespace);
+                return {
+                    success: true
+                };
+            }
+            if ((_c = req.url) === null || _c === void 0 ? void 0 : _c.includes('/get')) {
+                const res = (_d = this.kv) === null || _d === void 0 ? void 0 : _d.get(key, namespace);
+                const params = { success: true, value: res };
+                if (!res) {
+                    params.success = false;
+                }
+                return params;
+            }
+            if ((_e = req.url) === null || _e === void 0 ? void 0 : _e.includes('/delete')) {
+                const res = (_f = this.kv) === null || _f === void 0 ? void 0 : _f.delete(key, namespace);
+                return {
+                    success: res
+                };
+            }
+            return {
+                success: false
+            };
+        });
+    }
     stdoutHandler(chunk) {
         logger.log(`${chalk.bgGreen('[Worker]')} ${chunk.toString().trim()}`);
     }
@@ -189,17 +279,60 @@ 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) {
+        return new Promise((resolve, reject) => {
+            const chunks = [];
+            let totalLength = 0;
+            req.on('data', (chunk) => {
+                chunks.push(chunk);
+                totalLength += chunk.length;
+            });
+            req.on('end', () => {
+                try {
+                    const buffer = Buffer.concat(chunks, totalLength);
+                    const rawBody = buffer.toString('utf8');
+                    resolve(rawBody ? JSON.parse(rawBody) : {});
+                }
+                catch (err) {
+                    reject(new Error(`Invalid JSON: ${err.message}`));
+                }
+            });
+            req.on('error', reject);
+        });
+    }
+    parseKVBody(req) {
+        return new Promise((resolve, reject) => {
+            const chunks = [];
+            let totalLength = 0;
+            req.on('data', (chunk) => {
+                chunks.push(chunk);
+                totalLength += chunk.length;
+            });
+            req.on('end', () => {
+                try {
+                    const buffer = Buffer.concat(chunks, totalLength);
+                    const rawBody = buffer.toString();
+                    resolve(rawBody);
+                }
+                catch (err) {
+                    reject(new Error(`Invalid JSON: ${err.message}`));
+                }
+            });
+            req.on('error', reject);
         });
     }
     runCommand(command) {
@@ -213,7 +346,7 @@ class Ew2Server {
                 resolve(false);
                 return;
             }
-            const onExit = (code, signal) => {
+            const onExit = () => {
                 this.worker = null;
                 resolve(true);
             };
@@ -222,10 +355,12 @@ class Ew2Server {
             (_a = this.server) === null || _a === void 0 ? void 0 : _a.close();
         });
     }
-    restart() {
+    restart(devPack) {
         return __awaiter(this, void 0, void 0, function* () {
             this.restarting = true;
+            console.clear();
             yield this.stop();
+            yield devPack();
             this.start();
             logger.log(t('dev_server_restart').d('Worker server restarted'));
             logger.info('Worker server restarted');

package/dist/commands/dev/index.js

@@ -10,21 +10,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { exec } from 'child_process';
 import { isIP } from 'net';
 import chokidar from 'chokidar';
-import doProcess from './doProcess.js';
-import { getProjectConfig, generateConfigFile, getDevConf } from '../../utils/fileUtils/index.js';
-import { getRoot } from '../../utils/fileUtils/base.js';
 import SelectItems from '../../components/selectInput.js';
-import logger from '../../libs/logger.js';
-import MockServer from './mockWorker/server.js';
-import mockPack from './mockWorker/devPack.js';
-import Ew2Server from './ew2/server.js';
-import ew2Pack from './ew2/devPack.js';
-import { preCheckDeno } from '../../utils/installDeno.js';
-import { preCheckEw2 } from '../../utils/installEw2.js';
-import debounce from '../../utils/debounce.js';
 import t from '../../i18n/index.js';
+import logger from '../../libs/logger.js';
 import checkAndInputPort from '../../utils/checkDevPort.js';
 import { checkOS, Platforms } from '../../utils/checkOS.js';
+import debounce from '../../utils/debounce.js';
+import { getRoot } from '../../utils/fileUtils/base.js';
+import { getProjectConfig, generateConfigFile, getDevConf } from '../../utils/fileUtils/index.js';
+import { preCheckDeno } from '../../utils/installDeno.js';
+import { preCheckEw2 } from '../../utils/installEw2.js';
+import doProcess from './doProcess.js';
+import ew2Pack from './ew2/devPack.js';
+import Ew2Server from './ew2/server.js';
+import mockPack from './mockWorker/devPack.js';
+import MockServer from './mockWorker/server.js';
 let yargsIns;
 const OS = checkOS();
 const EW2OS = [Platforms.AppleArm, Platforms.AppleIntel, Platforms.LinuxX86];
@@ -203,7 +203,7 @@ const dev = {
                     userFileRepacking = false;
                     return;
                 }
-                worker.restart();
+                worker.restart(devPack);
                 return;
             }
             logger.info('Dev repack');
@@ -215,14 +215,13 @@ const dev = {
                 catch (err) { }
             }
             userFileRepacking = true;
-            yield devPack();
-            yield worker.restart();
+            yield worker.restart(devPack);
         }), 500));
         var { devElement, exit } = doProcess(worker);
         const { waitUntilExit } = devElement;
         yield waitUntilExit();
         function onWorkerClosed() {
-            exit && exit();
+            exit === null || exit === void 0 ? void 0 : exit();
         }
         watcher.close();
     })

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

@@ -7,14 +7,14 @@ 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 devBuild from '../build.js';
 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');
@@ -78,10 +78,19 @@ const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(
 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/mockWorker/server.js

@@ -7,12 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import spawn from 'cross-spawn';
-import logger from '../../../libs/logger.js';
 import path from 'path';
+import spawn from 'cross-spawn';
 import t from '../../../i18n/index.js';
-import { getDevConf } from '../../../utils/fileUtils/index.js';
+import logger from '../../../libs/logger.js';
 import { getRoot } from '../../../utils/fileUtils/base.js';
+import { getDevConf } from '../../../utils/fileUtils/index.js';
 class MockWorkerServer {
     constructor(props) {
         this.instance = null;
@@ -63,10 +63,11 @@ class MockWorkerServer {
         logger.subError(chunk.toString().trim());
     }
     errorHandler(err) {
+        var _a;
         logger.error(err.message ? err.message : err);
-        this.instance && this.instance.kill();
+        (_a = this.instance) === null || _a === void 0 ? void 0 : _a.kill();
     }
-    closeHandler(code, signal) {
+    closeHandler() {
         if (this.restarting) {
             this.restarting = false;
             return;
@@ -86,7 +87,7 @@ class MockWorkerServer {
                 resolve(false);
                 return;
             }
-            const onExit = (code, signal) => {
+            const onExit = () => {
                 this.instance = null;
                 resolve(true);
             };

package/dist/commands/domain/add.js

@@ -7,11 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { bindRoutineWithDomain, checkDirectory, checkIsLoginSuccess, validDomain, validName } from '../utils.js';
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
 import t from '../../i18n/index.js';
 import logger from '../../libs/logger.js';
 import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import { bindRoutineWithDomain, checkDirectory, checkIsLoginSuccess, validDomain, validName } from '../utils.js';
 const addDomain = {
     command: 'add <domain>',
     describe: `📥 ${t('domain_add_describe').d('Bind a domain to a routine')}`,

package/dist/commands/domain/delete.js

@@ -7,12 +7,12 @@ 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 } from '../utils.js';
-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 { checkDirectory, checkIsLoginSuccess } from '../utils.js';
 const deleteDomain = {
     command: 'delete <domain>',
     describe: `🗑  ${t('domain_delete_describe').d('Delete a related domain')}`,
@@ -31,7 +31,7 @@ const deleteDomain = {
 export default deleteDomain;
 export function handleDeleteDomain(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         if (!checkDirectory()) {
             return;
         }
@@ -44,10 +44,10 @@ export function handleDeleteDomain(argv) {
         yield validRoutine(projectConfig.name);
         const server = yield ApiService.getInstance();
         const req = { Name: projectConfig.name || '' };
-        const routineDetail = yield server.getRoutine(req);
-        if (!routineDetail)
+        const listRoutineRelatedRecordRes = yield server.listRoutineRelatedRecords(req);
+        if (!listRoutineRelatedRecordRes)
             return;
-        const relatedRecords = (_b = (_a = routineDetail.data) === null || _a === void 0 ? void 0 : _a.RelatedRecords) !== null && _b !== void 0 ? _b : [];
+        const relatedRecords = ((_a = listRoutineRelatedRecordRes.data) === null || _a === void 0 ? void 0 : _a.RelatedRecords) || [];
         const relatedDomain = argv.domain;
         const matchedSite = relatedRecords.find((item) => {
             return String(item.RecordName) === relatedDomain;

package/dist/commands/domain/index.js

@@ -1,7 +1,7 @@
+import t from '../../i18n/index.js';
 import addDomain from './add.js';
-import listDomain from './list.js';
 import deleteDomain from './delete.js';
-import t from '../../i18n/index.js';
+import listDomain from './list.js';
 let yargsIns;
 const domainCommand = {
     command: 'domain [script]',

package/dist/commands/domain/list.js

@@ -7,21 +7,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
-import logger from '../../libs/logger.js';
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
-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 { checkDirectory, checkIsLoginSuccess } from '../utils.js';
 const listDomain = {
     command: 'list',
     describe: `🔍 ${t('domain_list_describe').d('List all related domains')}`,
-    handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
-        handleListDomains(argv);
+    handler: () => __awaiter(void 0, void 0, void 0, function* () {
+        handleListDomains();
     })
 };
 export default listDomain;
-export function handleListDomains(argv) {
+export function handleListDomains() {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         if (!checkDirectory()) {
@@ -36,10 +36,10 @@ export function handleListDomains(argv) {
         yield validRoutine(projectConfig.name);
         const server = yield ApiService.getInstance();
         const req = { Name: projectConfig.name };
-        const routineDetail = yield server.getRoutine(req);
-        if (!routineDetail)
+        const res = yield server.listRoutineRelatedRecords(req);
+        if (!res)
             return;
-        const relatedRecords = (_b = (_a = routineDetail.data) === null || _a === void 0 ? void 0 : _a.RelatedRecords) !== null && _b !== void 0 ? _b : [];
+        const relatedRecords = (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.RelatedRecords) !== null && _b !== void 0 ? _b : [];
         if (relatedRecords.length === 0) {
             logger.log(`🙅 ${t('domain_list_empty').d('No related domains found')}`);
             return;