@maiyunnet/kebab 2.0.14 → 2.0.16

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/rsocket.d.ts

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

package/www/example/ws/rsocket.js

@@ -0,0 +1,47 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+const sCtr = __importStar(require("~/sys/ctr"));
+const lWs = __importStar(require("~/lib/ws"));
+class default_1 extends sCtr.Ctr {
+    async onLoad() {
+        console.log('WebSocket rsocket test onLoad.');
+        if (await lWs.rsocket(this, '192.168.31.99', 5900)) {
+            return false;
+        }
+        return true;
+    }
+}
+exports.default = default_1;

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

@@ -1,6 +1,11 @@
-import * as sCtr from '../../../sys/ctr';
+import * as sCtr from '~/sys/ctr';
+import * as http from 'http';
 export default class extends sCtr.Ctr {
     private _nick;
+    onUpgrade(): {
+        'headers'?: http.OutgoingHttpHeaders;
+        'timeout'?: number;
+    };
     onLoad(): boolean;
     onData(data: Buffer | string): string;
     onClose(): void;

package/www/example/ws/test.js

@@ -33,13 +33,18 @@ 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);
         this._nick = '';
     }
+    onUpgrade() {
+        return {
+            'timeout': 60_000 * 2,
+        };
+    }
     onLoad() {
         console.log('WebSocket test onLoad.');
         setTimeout(() => {
@@ -47,7 +52,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 +64,8 @@ class default_1 extends sCtr.Ctr {
             return 'Base64: ' + lCrypto.base64Encode(data);
         }
         // --- 用户消息 ---
+        const date = new Date();
+        console.log('[' + date.getHours().toString().padStart(2, '0') + ':' + date.getMinutes().toString().padStart(2, '0') + ':' + date.getSeconds().toString().padStart(2, '0') + '] WebSocket test onData, data: ' + data);
         return '<b>' + this._nick + ':</b> ' + data;
     }
     onClose() {