@maiyunnet/kebab 2.0.13 → 2.0.15

package/sys/ctr.d.ts

@@ -34,9 +34,9 @@ export declare class Ctr {
     /** --- Cookie 数组 --- */
     protected _cookie: Record<string, string>;
     /** --- Jwt 数组 --- */
-    protected _jwt: Record<string, types.Json>;
+    protected _jwt: Record<string, any>;
     /** --- Session 数组 --- */
-    protected _session: Record<string, types.Json>;
+    protected _session: Record<string, any>;
     /** --- Session --- 对象 */
     protected _sess: session.Session | null;
     /** --- 页面浏览器客户端缓存 --- */

package/sys/master.js

@@ -130,7 +130,7 @@ function createRpcListener() {
                 return;
             }
             if (lCore.globalConfig.rpcSecret === 'MUSTCHANGE') {
-                res.end('rpcSecret need be "' + lCore.random(32, lCore.RANDOM_LUN) + '"');
+                res.end(`The rpcSecret is not set. It's recommended to set it to: ${lCore.random(32, lCore.RANDOM_LUN)}`);
                 return;
             }
             switch (msg.action) {
@@ -235,9 +235,19 @@ function createRpcListener() {
                         }
                         // --- 看文件夹是否存在 ---
                         if (pat && !await lFs.isDir(to + pat)) {
+                            if (rtn.post['strict'] === '1') {
+                                res.end('Path not found: ' + to + pat);
+                                await sRoute.unlinkUploadFiles(rtn.files);
+                                return;
+                            }
                             await lFs.mkdir(to + pat);
                         }
                         // --- 覆盖或创建文件 ---
+                        if ((rtn.post['strict'] === '1') && !await lFs.isFile(to + pat + fname)) {
+                            res.end('Path not found: ' + to + pat + fname);
+                            await sRoute.unlinkUploadFiles(rtn.files);
+                            return;
+                        }
                         await lFs.putContent(to + pat + fname, ls[path]);
                     }
                     await sRoute.unlinkUploadFiles(rtn.files);
@@ -252,6 +262,118 @@ function createRpcListener() {
                     }
                     break;
                 }
+                case 'log': {
+                    // --- 获取日志信息 ---
+                    const path = kebab.LOG_CWD + msg.hostname + (msg.fend ?? '') + '/' + msg.path + '.csv';
+                    if (!await lFs.isFile(path)) {
+                        res.end(lText.stringifyJson({
+                            'result': 1,
+                            'data': false,
+                        }));
+                        return;
+                    }
+                    /** --- 剩余 limit --- */
+                    let limit = msg.limit ?? 100;
+                    /** --- 剩余 offset --- */
+                    let offset = msg.offset ?? 0;
+                    const rtn = await new Promise((resolve) => {
+                        const list = [];
+                        /** --- 当前行号 --- */
+                        let line = 0;
+                        /** --- 当前行数据 --- */
+                        let packet = '';
+                        lFs.createReadStream(path, {
+                            'encoding': 'utf8',
+                            'start': msg.start,
+                        }).on('data', (buf) => {
+                            if (typeof buf !== 'string') {
+                                return;
+                            }
+                            while (true) {
+                                // --- 分包 ---
+                                const index = buf.indexOf('\n');
+                                if (index === -1) {
+                                    // --- 本次包还没有结束 ---
+                                    packet += buf;
+                                    break;
+                                }
+                                // --- 本次行结束了 ---
+                                if (limit === 0) {
+                                    break;
+                                }
+                                packet += buf.slice(0, index);
+                                buf = buf.slice(index + 1);
+                                ++line;
+                                // --- 先执行下本次完成的 ---
+                                if (line > 1) {
+                                    if (offset === 0) {
+                                        if (!msg.search || packet.includes(msg.search)) {
+                                            const result = [];
+                                            let currentField = '';
+                                            let inQuotes = false;
+                                            for (let i = 0; i < packet.length; ++i) {
+                                                const char = packet[i];
+                                                if (char === '"') {
+                                                    if (inQuotes && packet[i + 1] === '"') {
+                                                        currentField += '"';
+                                                        ++i;
+                                                    }
+                                                    else {
+                                                        inQuotes = !inQuotes;
+                                                    }
+                                                }
+                                                else if (char === ',' && !inQuotes) {
+                                                    result.push(currentField);
+                                                    currentField = '';
+                                                }
+                                                else {
+                                                    currentField += char;
+                                                }
+                                            }
+                                            result.push(currentField);
+                                            list.push(result);
+                                            --limit;
+                                        }
+                                    }
+                                    else {
+                                        --offset;
+                                    }
+                                }
+                                // --- 处理结束 ---
+                                packet = '';
+                                // --- 看看还有没有后面的粘连包 ---
+                                if (!buf.length) {
+                                    // --- 没粘连包 ---
+                                    break;
+                                }
+                                // --- 有粘连包 ---
+                            }
+                        }).on('end', () => {
+                            resolve(list);
+                        }).on('error', () => {
+                            resolve(false);
+                        });
+                    });
+                    res.end(lText.stringifyJson({
+                        'result': 1,
+                        'data': rtn,
+                    }));
+                    return;
+                }
+                case 'ls': {
+                    // --- 获取目录内文件/文件夹列表 ---
+                    const path = lText.urlResolve(kebab.ROOT_CWD, msg.path);
+                    res.end(lText.stringifyJson({
+                        'result': 1,
+                        'data': (await lFs.readDir(path, msg.encoding)).map(item => ({
+                            'isFile': item.isFile(),
+                            'isDirectory': item.isDirectory(),
+                            'isSymbolicLink': item.isSymbolicLink(),
+                            'name': item.name,
+                        })),
+                    }));
+                    return;
+                }
                 default: {
                     res.end('Not command: ' + msg.action);
                     return;

package/sys/route.js

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

@@ -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

@@ -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/ws/test.js

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