@maiyunnet/kebab 2.0.14 → 2.0.15

package/sys/mod.js

@@ -38,11 +38,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Date: 2019-6-4 21:35
  * Last: 2020-4-14 13:33:51, 2022-07-23 16:01:34, 2022-09-06 22:59:26, 2023-5-24 19:11:37, 2023-6-13 21:47:58, 2023-7-10 18:54:03, 2023-8-23 17:03:16, 2023-12-11 15:21:22, 2023-12-20 23:12:03, 2024-3-8 16:05:29, 2024-3-20 19:58:15, 2024-8-11 21:14:54, 2024-10-5 14:00:22, 2024-12-14 19:58:34
  */
-const lSql = __importStar(require("../lib/sql"));
-const lTime = __importStar(require("../lib/time"));
-const lCore = __importStar(require("../lib/core"));
-const lText = __importStar(require("../lib/text"));
-const sCtr = __importStar(require("../sys/ctr"));
+const lSql = __importStar(require("~/lib/sql"));
+const lTime = __importStar(require("~/lib/time"));
+const lCore = __importStar(require("~/lib/core"));
+const lText = __importStar(require("~/lib/text"));
+const sCtr = __importStar(require("~/sys/ctr"));
 /** --- 条数列表 --- */
 class Rows {
     constructor(initialItems = []) {

package/sys/route.d.ts

@@ -7,7 +7,7 @@ import * as http from 'http';
 import * as http2 from 'http2';
 import * as net from 'net';
 import * as sCtr from './ctr';
-import * as types from '../types';
+import * as types from '~/types';
 /**
  * --- 清除已经加载的虚拟主机配置文件 ---
  */

package/sys/route.js

@@ -49,15 +49,15 @@ const stream = __importStar(require("stream"));
 // --- 第三方 ---
 const ws = __importStar(require("@litert/websocket"));
 // --- 库和定义 ---
-const lFs = __importStar(require("../lib/fs"));
-const lZlib = __importStar(require("../lib/zlib"));
-const lCore = __importStar(require("../lib/core"));
-const lText = __importStar(require("../lib/text"));
-const lTime = __importStar(require("../lib/time"));
-const lResponse = __importStar(require("../lib/net/response"));
-const lWs = __importStar(require("../lib/ws"));
+const lFs = __importStar(require("~/lib/fs"));
+const lZlib = __importStar(require("~/lib/zlib"));
+const lCore = __importStar(require("~/lib/core"));
+const lText = __importStar(require("~/lib/text"));
+const lTime = __importStar(require("~/lib/time"));
+const lResponse = __importStar(require("~/lib/net/response"));
+const lWs = __importStar(require("~/lib/ws"));
 const sCtr = __importStar(require("./ctr"));
-const kebab = __importStar(require("../index"));
+const kebab = __importStar(require("~/index"));
 /** --- 动态层 kebab.json 缓存（文件路径: 最终合并值） --- */
 let kebabConfigs = {};
 /**
@@ -303,7 +303,7 @@ async function run(data) {
             cctr.setPrototype('_socket', wsSocket);
         }
         catch (e) {
-            await lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+            lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
             data.socket.destroy();
             return true;
         }
@@ -312,12 +312,12 @@ async function run(data) {
         cctr.setPrototype('_headers', headers);
         cctr.setPrototype('_get', get);
         cctr.setPrototype('_cookie', cookies);
-        await lCore.log(cctr, '', '-visit');
+        lCore.log(cctr, '', '-visit');
         try {
             rtn = await cctr.onLoad();
         }
         catch (e) {
-            await lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+            lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
             data.socket.destroy();
             return true;
         }
@@ -374,7 +374,7 @@ async function run(data) {
                                 }
                             }
                             catch (e) {
-                                await lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                                lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
                             }
                             break;
                         }
@@ -387,16 +387,16 @@ async function run(data) {
                         await cctr['onDrain']();
                     }
                     catch (e) {
-                        await lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                        lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
                     }
-                }).on('error', async (e) => {
-                    await lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                }).on('error', (e) => {
+                    lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
                 }).on('close', async () => {
                     try {
                         await cctr['onClose']();
                     }
                     catch (e) {
-                        await lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                        lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
                     }
                     resolve();
                 });
@@ -443,7 +443,7 @@ async function run(data) {
         rtn = await middle.onLoad();
     }
     catch (e) {
-        await lCore.log(middle, '(E03)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+        lCore.log(middle, '(E03)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
         data.res.setHeader('content-type', 'text/html; charset=utf-8');
         data.res.setHeader('content-length', 25);
         data.res.writeHead(500);
@@ -495,7 +495,7 @@ async function run(data) {
         cctr.setPrototype('_cacheTTL', middle.getPrototype('_cacheTTL'));
         cctr.setPrototype('_xsrf', middle.getPrototype('_xsrf'));
         cctr.setPrototype('_httpCode', middle.getPrototype('_httpCode'));
-        await lCore.log(cctr, '', '-visit');
+        lCore.log(cctr, '', '-visit');
         // --- 强制 HTTPS ---
         if (config.set.mustHttps && !config.const.https) {
             data.res.setHeader('location', data.req.url ?? '');
@@ -553,7 +553,7 @@ async function run(data) {
             httpCode = cctr.getPrototype('_httpCode');
         }
         catch (e) {
-            await lCore.log(cctr, '(E04)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+            lCore.log(cctr, '(E04)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
             data.res.setHeader('content-type', 'text/html; charset=utf-8');
             data.res.setHeader('content-length', 25);
             data.res.writeHead(500);
@@ -820,7 +820,7 @@ async function waitCtr(cctr) {
         // --- 有事务未关闭 ---
         const msg = 'transaction(' + waitInfo.transaction + ') not be closed';
         lCore.display('[ERROR][ROUTE][WAITCTR] ' + msg + ': ', cctr.getPrototype('_config').const.path);
-        await lCore.log(cctr, msg, '-error');
+        lCore.log(cctr, msg, '-error');
     }
     // --- 彻底结束，删除文件 ---
     await unlinkUploadFiles(cctr);

package/www/example/ctr/main.d.ts

@@ -1,4 +1,4 @@
-import * as ctr from '../../../sys/ctr';
+import * as ctr from '~/sys/ctr';
 export default class extends ctr.Ctr {
     index(): string;
 }

package/www/example/ctr/main.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-const ctr = __importStar(require("../../../sys/ctr"));
+const ctr = __importStar(require("~/sys/ctr"));
 class default_1 extends ctr.Ctr {
     index() {
         return `<a href="${this._config.const.urlBase}test">Hello world! Click here to visit demo.</a>`;

package/www/example/ctr/middle.d.ts

@@ -1,5 +1,5 @@
-import * as ctr from '../../../sys/ctr';
-import * as types from '../../../types';
+import * as ctr from '~/sys/ctr';
+import * as types from '~/types';
 export default class extends ctr.Ctr {
     onLoad(): string | boolean;
     onUnload(rtn: string | boolean | types.DbValue[]): string | boolean | types.DbValue[];

package/www/example/ctr/middle.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-const ctr = __importStar(require("../../../sys/ctr"));
+const ctr = __importStar(require("~/sys/ctr"));
 class default_1 extends ctr.Ctr {
     onLoad() {
         if (this._config.const.path !== 'test/middle') {

package/www/example/ctr/test.d.ts

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
-import * as sCtr from '../../../sys/ctr';
-import * as types from '../../../types';
+import * as sCtr from '~/sys/ctr';
+import * as types from '~/types';
 export default class extends sCtr.Ctr {
     private _internalUrl;
     onLoad(): Array<string | number> | boolean;
@@ -37,6 +37,7 @@ export default class extends sCtr.Ctr {
     coreChecktype(): string;
     coreMuid(): string;
     coreGetlog(): Promise<string>;
+    coreLs(): Promise<string>;
     coreUpdatecode(): Promise<string>;
     coreReload(): Promise<string>;
     coreRestart(): Promise<string>;

package/www/example/ctr/test.js

@@ -37,27 +37,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 // --- 库和定义 ---
-const lCore = __importStar(require("../../../lib/core"));
-const lNet = __importStar(require("../../../lib/net"));
-const lDb = __importStar(require("../../../lib/db"));
-const lFs = __importStar(require("../../../lib/fs"));
-const lText = __importStar(require("../../../lib/text"));
-const lCrypto = __importStar(require("../../../lib/crypto"));
-const lKv = __importStar(require("../../../lib/kv"));
-const lCaptcha = __importStar(require("../../../lib/captcha"));
-const lTime = __importStar(require("../../../lib/time"));
-const lScan = __importStar(require("../../../lib/scan"));
-const lSql = __importStar(require("../../../lib/sql"));
-const lConsistent = __importStar(require("../../../lib/consistent"));
-const lSsh = __importStar(require("../../../lib/ssh"));
-const lJwt = __importStar(require("../../../lib/jwt"));
-const lWs = __importStar(require("../../../lib/ws"));
-const lS3 = __importStar(require("../../../lib/s3"));
-const lZip = __importStar(require("../../../lib/zip"));
-const lBuffer = __importStar(require("../../../lib/buffer"));
-const lLan = __importStar(require("../../../lib/lan"));
-const sCtr = __importStar(require("../../../sys/ctr"));
-const kebab = __importStar(require("../../../index"));
+const lCore = __importStar(require("~/lib/core"));
+const lNet = __importStar(require("~/lib/net"));
+const lDb = __importStar(require("~/lib/db"));
+const lFs = __importStar(require("~/lib/fs"));
+const lText = __importStar(require("~/lib/text"));
+const lCrypto = __importStar(require("~/lib/crypto"));
+const lKv = __importStar(require("~/lib/kv"));
+const lCaptcha = __importStar(require("~/lib/captcha"));
+const lTime = __importStar(require("~/lib/time"));
+const lScan = __importStar(require("~/lib/scan"));
+const lSql = __importStar(require("~/lib/sql"));
+const lConsistent = __importStar(require("~/lib/consistent"));
+const lSsh = __importStar(require("~/lib/ssh"));
+const lJwt = __importStar(require("~/lib/jwt"));
+const lWs = __importStar(require("~/lib/ws"));
+const lS3 = __importStar(require("~/lib/s3"));
+const lZip = __importStar(require("~/lib/zip"));
+const lBuffer = __importStar(require("~/lib/buffer"));
+const lLan = __importStar(require("~/lib/lan"));
+const sCtr = __importStar(require("~/sys/ctr"));
+const kebab = __importStar(require("~/index"));
 // --- mod ---
 const test_1 = __importDefault(require("../mod/test"));
 const testdata_1 = __importDefault(require("../mod/testdata"));
@@ -165,6 +165,7 @@ class default_1 extends sCtr.Ctr {
             `<br><a href="${this._config.const.urlBase}test/core-checktype">View "test/core-checktype"</a>`,
             `<br><a href="${this._config.const.urlBase}test/core-muid">View "test/core-muid"</a>`,
             `<br><a href="${this._config.const.urlBase}test/core-getlog">View "test/core-getlog"</a>`,
+            `<br><a href="${this._config.const.urlBase}test/core-ls">View "test/core-ls"</a>`,
             `<br><a href="${this._config.const.urlBase}test/core-reload">View "test/core-reload"</a>`,
             `<br><a href="${this._config.const.urlBase}test/core-restart">View "test/core-restart"</a>`,
             `<br><a href="${this._config.const.urlBase}test/core-global">View "test/core-global"</a>`,
@@ -1030,13 +1031,14 @@ for (let i = 0; i < 30000; ++i) {
     async coreGetlog() {
         const path = lTime.format(null, 'Y/m/d/H');
         const list = await lCore.getLog({
-            'host': this._config.const.hostname,
+            'hostname': this._config.const.hostname,
             'path': path,
             'fend': '-visit',
         });
         const echo = [];
-        echo.push('<table style="width: 100%;"><tr>');
+        echo.push('<table style="width: 100%;">');
         if (list) {
+            echo.push('<tr><th>TIME</th><th>UNIX</th><th>URL</th><th>COOKIE</th><th>SESSION</th><th>JWT</th><th>USER_AGENT</th><th>REALIP</th><th>CLIENTIP</th><th>MESSAGE</th></tr>');
             for (const row of list) {
                 echo.push('<tr>');
                 for (const item of row) {
@@ -1046,7 +1048,41 @@ for (let i = 0; i < 30000; ++i) {
             }
         }
         else {
-            echo.push('<th>' + JSON.stringify(list) + '</th></tr>');
+            echo.push('<tr><th>' + JSON.stringify(list) + '</th></tr>');
+        }
+        echo.push('</table>');
+        return echo.join('') + '<br>' + this._getEnd();
+    }
+    async coreLs() {
+        const echo = [
+            './'
+        ];
+        const list = await lCore.ls({
+            'path': './',
+        });
+        echo.push('<table style="width: 100%;">');
+        for (const item of list) {
+            echo.push('<tr>');
+            echo.push('<td>' + lText.htmlescape(item.name) + '</td>');
+            echo.push('<td>isDirectory:' + (item.isDirectory ? 'true' : 'false') + '</td>');
+            echo.push('<td>isFile:' + (item.isFile ? 'true' : 'false') + '</td>');
+            echo.push('<td>isSymbolicLink:' + (item.isSymbolicLink ? 'true' : 'false') + '</td>');
+            echo.push('</tr>');
+        }
+        echo.push('</table>');
+        // --- source/ ---
+        echo.push('source/');
+        const list2 = await lCore.ls({
+            'path': 'source/',
+        });
+        echo.push('<table style="width: 100%;">');
+        for (const item of list2) {
+            echo.push('<tr>');
+            echo.push('<td>' + lText.htmlescape(item.name) + '</td>');
+            echo.push('<td>isDirectory:' + (item.isDirectory ? 'true' : 'false') + '</td>');
+            echo.push('<td>isFile:' + (item.isFile ? 'true' : 'false') + '</td>');
+            echo.push('<td>isSymbolicLink:' + (item.isSymbolicLink ? 'true' : 'false') + '</td>');
+            echo.push('</tr>');
         }
         echo.push('</table>');
         return echo.join('') + '<br>' + this._getEnd();
@@ -2620,6 +2656,7 @@ ${lTime.format(null, 'd|D|j|l|N|w|Y|y|F|M|m|H|h|i|s|T')}`;
 <div style="margin-top: 10px; display: flex;">
     <input id="text" style="flex: 1;">
     <input id="send" type="button" value="Send" onclick="send()" disabled style="margin-left: 10px;">
+    <input type="button" value="!Ping" onclick="pinging = !pinging; this.value = pinging ? 'Ping' : '!Ping';" style="margin-left: 10px;">
 </div>
 <script>
 var ws = null;
@@ -2630,6 +2667,12 @@ var stopEl = document.getElementById('stop');
 
 var textEl = document.getElementById('text');
 var sendEl = document.getElementById('send');
+
+function dateStr() {
+    const date = new Date();
+    return date.getHours().toString().padStart(2, '0') + ':' + date.getMinutes().toString().padStart(2, '0') + ':' + date.getSeconds().toString().padStart(2, '0');
+}
+
 function enter() {
     var nick = nickEl.value.trim();
     if (nick === '') {
@@ -2638,27 +2681,27 @@ function enter() {
     }
     nickEl.disabled = true;
     btnEl.disabled = true;
-    listEl.insertAdjacentHTML('afterbegin', '<div>Connecting...</div>');
+    listEl.insertAdjacentHTML('afterbegin', '<div>[' + dateStr() + '] Connecting...</div>');
     ws = new WebSocket('ws${this._config.const.https ? 's' : ''}://${this._config.const.host}/${this._get['ac'] === 'rproxy' ? 'rproxy' : 'test'}');
     ws.onopen = function() {
-        listEl.insertAdjacentHTML('afterbegin', '<div>Event: onOpen.</div>');
+        listEl.insertAdjacentHTML('afterbegin', '<div>[' + dateStr() + '] Event: onOpen.</div>');
         ws.send('Hello: ' + nick);
-        listEl.insertAdjacentHTML('afterbegin', '<div>Client: send "Hello: ' + nick + '".</div>');
+        listEl.insertAdjacentHTML('afterbegin', '<div>[' + dateStr() + '] Client: send "Hello: ' + nick + '".</div>');
         stopEl.disabled = false;
         sendEl.disabled = false;
     };
     ws.onmessage = function(ev) {
-        listEl.insertAdjacentHTML('afterbegin', '<div>Server: ' + ev.data + '.</div>');
+        listEl.insertAdjacentHTML('afterbegin', '<div>[' + dateStr() + '] Server: ' + ev.data + '.</div>');
     };
     ws.onclose = function() {
-        listEl.insertAdjacentHTML('afterbegin', '<div>Event: onClose.</div>');
+        listEl.insertAdjacentHTML('afterbegin', '<div>[' + dateStr() + '] Event: onClose.</div>');
         nickEl.disabled = false;
         btnEl.disabled = false;
         stopEl.disabled = true;
         sendEl.disabled = true;
     };
     ws.onerror = function(ev) {
-        listEl.insertAdjacentHTML('afterbegin', '<div>Event: onError.</div>');
+        listEl.insertAdjacentHTML('afterbegin', '<div>[' + dateStr() + '] Event: onError.</div>');
         nickEl.disabled = false;
         btnEl.disabled = false;
         stopEl.disabled = true;
@@ -2673,6 +2716,16 @@ function send() {
     ws.send(textEl.value);
     textEl.value = '';
 }
+var pinging = false;
+setInterval(() => {
+    if (!ws) {
+        return;
+    }
+    if (!pinging) {
+        return;
+    }
+    ws.send('ping');
+}, 5_000);
 </script>`;
         return echo + '<br>' + this._getEnd();
     }

package/www/example/mod/test.d.ts

@@ -1,5 +1,5 @@
-import sMod from '../../../sys/mod';
-import types from '../../../types';
+import sMod from '~/sys/mod';
+import types from '~/types';
 export default class extends sMod {
     protected static _$table: string;
     protected static _$primary: string;

package/www/example/mod/test.js

@@ -36,8 +36,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const lCore = __importStar(require("../../../lib/core"));
-const mod_1 = __importDefault(require("../../../sys/mod"));
+const lCore = __importStar(require("~/lib/core"));
+const mod_1 = __importDefault(require("~/sys/mod"));
 /*
 CREATE TABLE `m_test`  (
   `id` int NOT NULL AUTO_INCREMENT,

package/www/example/mod/testdata.d.ts

@@ -1,4 +1,4 @@
-import sMod from '../../../sys/mod';
+import sMod from '~/sys/mod';
 export default class extends sMod {
     protected static _$table: string;
     protected static _$primary: string;

package/www/example/mod/testdata.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const mod_1 = __importDefault(require("../../../sys/mod"));
+const mod_1 = __importDefault(require("~/sys/mod"));
 /*
 CREATE TABLE `m_test_data_0` (
     `id` bigint NOT NULL AUTO_INCREMENT,

package/www/example/ws/mproxy.d.ts

@@ -1,4 +1,4 @@
-import * as sCtr from '../../../sys/ctr';
+import * as sCtr from '~/sys/ctr';
 export default class extends sCtr.Ctr {
     onLoad(): Promise<boolean>;
 }

package/www/example/ws/mproxy.js

@@ -33,8 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-const sCtr = __importStar(require("../../../sys/ctr"));
-const lWs = __importStar(require("../../../lib/ws"));
+const sCtr = __importStar(require("~/sys/ctr"));
+const lWs = __importStar(require("~/lib/ws"));
 class default_1 extends sCtr.Ctr {
     async onLoad() {
         console.log('WebSocket mproxy test onLoad.');

package/www/example/ws/rproxy.d.ts

@@ -1,4 +1,4 @@
-import * as sCtr from '../../../sys/ctr';
+import * as sCtr from '~/sys/ctr';
 export default class extends sCtr.Ctr {
     onLoad(): Promise<boolean>;
 }

package/www/example/ws/rproxy.js

@@ -33,8 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-const sCtr = __importStar(require("../../../sys/ctr"));
-const lWs = __importStar(require("../../../lib/ws"));
+const sCtr = __importStar(require("~/sys/ctr"));
+const lWs = __importStar(require("~/lib/ws"));
 class default_1 extends sCtr.Ctr {
     async onLoad() {
         console.log('WebSocket rproxy test onLoad.');

package/www/example/ws/test.d.ts

@@ -1,4 +1,4 @@
-import * as sCtr from '../../../sys/ctr';
+import * as sCtr from '~/sys/ctr';
 export default class extends sCtr.Ctr {
     private _nick;
     onLoad(): boolean;

package/www/example/ws/test.js

@@ -33,8 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-const sCtr = __importStar(require("../../../sys/ctr"));
-const lCrypto = __importStar(require("../../../lib/crypto"));
+const sCtr = __importStar(require("~/sys/ctr"));
+const lCrypto = __importStar(require("~/lib/crypto"));
 class default_1 extends sCtr.Ctr {
     constructor() {
         super(...arguments);
@@ -47,7 +47,7 @@ class default_1 extends sCtr.Ctr {
                 return;
             }
             this._writeText('Other message, host: ' + this._config.const.host);
-        }, 2000);
+        }, 2_000);
         return true;
     }
     onData(data) {
@@ -59,6 +59,7 @@ class default_1 extends sCtr.Ctr {
             return 'Base64: ' + lCrypto.base64Encode(data);
         }
         // --- 用户消息 ---
+        console.log('[' + Date.now() + '] WebSocket test onData, data: ' + data);
         return '<b>' + this._nick + ':</b> ' + data;
     }
     onClose() {