@maiyunnet/kebab 3.2.15 → 3.2.17

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "3.2.15";
+export declare const VER = "3.2.17";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

@@ -6,7 +6,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export const VER = '3.2.15';
+export const VER = '3.2.17';
 // --- 服务端用的路径 ---
 const imu = decodeURIComponent(import.meta.url).replace('file://', '').replace(/^\/(\w:)/, '$1');
 /** --- /xxx/xxx --- */

package/lib/fs.js

@@ -6,9 +6,9 @@
 import * as fs from 'fs';
 import * as http2 from 'http2';
 import * as mime from '@litert/mime';
-import * as text from './text.js';
-import * as core from './core.js';
-import * as zlib from './zlib.js';
+import * as lText from './text.js';
+import * as lCore from './core.js';
+import * as lZlib from './zlib.js';
 /**
  * --- 读取完整文件或一段 ---
  * @param path 文件路径
@@ -124,7 +124,7 @@ export async function unlink(path) {
             return true;
         }
         catch {
-            await core.sleep(250);
+            await lCore.sleep(250);
         }
     }
     try {
@@ -326,7 +326,7 @@ export async function copyFolder(from, to, ignore = []) {
         }
         else if (item.isFile()) {
             // --- 先判断本文件是否被排除 ---
-            if (ignore.length > 0 && text.match(item.name, ignore)) {
+            if (ignore.length > 0 && lText.match(item.name, ignore)) {
                 continue;
             }
             if (!checkTo) {
@@ -424,11 +424,12 @@ export function createWriteStream(path, options) {
  * @param stat 文件的 stat（如果有）
  */
 export async function readToResponse(path, req, res, stat) {
+    res.statusCode = 200;
     stat ??= await stats(path);
     if (!stat) {
         const content = '<h1>404 Not found</h1><hr>Kebab';
+        res.statusCode = 404;
         res.setHeader('content-length', Buffer.byteLength(content));
-        res.writeHead(404);
         res.end(content);
         return;
     }
@@ -446,7 +447,7 @@ export async function readToResponse(path, req, res, stat) {
         const noneMatch = req.headers['if-none-match'];
         const modifiedSince = req.headers['if-modified-since'];
         if ((hash === noneMatch) && (lastModified === modifiedSince)) {
-            res.writeHead(304);
+            res.statusCode = 304;
             res.end();
             return;
         }
@@ -461,17 +462,15 @@ export async function readToResponse(path, req, res, stat) {
     const encoding = req.headers['accept-encoding'] ?? '';
     if (mimeData.compressible && (stat.size >= 1024)) {
         // --- 压缩 ---
-        const compress = await zlib.compress(encoding, await getContent(path));
+        const compress = await lZlib.compress(encoding, await getContent(path));
         if (compress) {
             res.setHeader('content-encoding', compress.type);
             res.setHeader('content-length', Buffer.byteLength(compress.buffer));
-            res.writeHead(200);
             res.end(compress.buffer);
             return;
         }
     }
     // --- 不压缩 ---
     res.setHeader('content-length', stat.size);
-    res.writeHead(200);
     await pipe(path, res instanceof http2.Http2ServerResponse ? (res.stream ?? res) : res);
 }

package/lib/net.js

@@ -525,7 +525,7 @@ export async function mproxy(ctr, auth, opt = {}) {
     if (rres.headers) {
         filterHeaders(rres.headers, res, opt.filter);
     }
-    res.writeHead(rres.headers?.['http-code'] ?? 200);
+    res.statusCode = rres.headers?.['http-code'] ?? 200;
     await new Promise((resolve) => {
         stream.pipe(res).on('finish', () => {
             resolve();
@@ -589,7 +589,7 @@ export async function rproxy(ctr, route, opt = {}) {
         if (rres.headers) {
             filterHeaders(rres.headers, res, opt.filter);
         }
-        res.writeHead(rres.headers?.['http-code'] ?? 200);
+        res.statusCode = rres.headers?.['http-code'] ?? 200;
         await new Promise((resolve) => {
             stream.pipe(res).on('finish', () => {
                 resolve();

package/lib/s3.d.ts

@@ -60,7 +60,7 @@ export declare class S3 {
      * @param key 对象路径
      * @param bucket bucket 名
      */
-    getObject(key: string, bucket?: string): Promise<any>;
+    getObject(key: string, bucket?: string): Promise<false | (stream.Readable & import("@smithy/types").SdkStreamMixin) | (Blob & import("@smithy/types").SdkStreamMixin) | (ReadableStream<any> & import("@smithy/types").SdkStreamMixin) | undefined>;
     /**
      * --- 删除对象 ---
      * @param key 对象路径

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.2.15",
+  "version": "3.2.17",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -24,7 +24,7 @@
     "@litert/http-client": "^1.1.2",
     "@litert/mime": "^0.1.3",
     "@litert/redis": "^3.0.5",
-    "@litert/websocket": "^0.2.6",
+    "@litert/websocket": "^0.2.7",
     "@types/ssh2": "^1.15.5",
     "ejs": "^3.1.10",
     "jszip": "^3.10.1",

package/sys/child.js

@@ -89,7 +89,8 @@ async function run() {
     }, function (req, res) {
         const host = (req.headers[':authority'] ?? req.headers['host'] ?? '');
         if (!host) {
-            req.socket.destroy();
+            res.statusCode = 403;
+            res.end();
             return;
         }
         const key = host + req.url;
@@ -115,7 +116,7 @@ async function run() {
     }).on('upgrade', function (req, socket) {
         const host = (req.headers['host'] ?? '');
         if (!host) {
-            req.socket.destroy();
+            socket.destroy();
             return;
         }
         const key = host + (req.url ?? '');
@@ -140,7 +141,8 @@ async function run() {
     httpServer = http.createServer(function (req, res) {
         const host = (req.headers['host'] ?? '');
         if (!host) {
-            req.socket.destroy();
+            res.statusCode = 403;
+            res.end();
             return;
         }
         const key = host + (req.url ?? '');
@@ -164,7 +166,7 @@ async function run() {
     }).on('upgrade', function (req, socket) {
         const host = (req.headers['host'] ?? '');
         if (!host) {
-            req.socket.destroy();
+            socket.destroy();
             return;
         }
         const key = host + (req.url ?? '');
@@ -207,8 +209,8 @@ async function requestHandler(req, res, https) {
                 return;
             }
             const content = '<h1>504 Gateway Timeout</h1><hr>Kebab';
+            res.statusCode = 504;
             res.setHeader('content-length', Buffer.byteLength(content));
-            res.writeHead(504);
             res.end(content);
         }
     };
@@ -222,7 +224,7 @@ async function requestHandler(req, res, https) {
     if (host === undefined || typeof host !== 'string') {
         host = req.headers['host'];
         if (host === undefined) {
-            req.socket.destroy();
+            res.end();
             return;
         }
     }
@@ -230,7 +232,8 @@ async function requestHandler(req, res, https) {
     /** --- 当前的 vhost 配置文件 --- */
     const vhost = await getVhostByHostname(uri.hostname ?? '');
     if (!vhost) {
-        req.socket.destroy();
+        res.statusCode = 403;
+        res.end();
         return;
         /*
         const text = '<h1>Kebab: No permissions</h1>host: ' + (req.headers[':authority'] as string | undefined ?? req.headers['host'] ?? '') + '<br>url: ' + (lText.htmlescape(req.url ?? ''));
@@ -259,9 +262,9 @@ async function requestHandler(req, res, https) {
             let stat = await lFs.stats(vhost.real + now + item);
             if (!stat) {
                 const content = '<h1>404 Not found</h1><hr>Kebab';
+                res.statusCode = 404;
                 res.setHeader('content-type', 'text/html; charset=utf-8');
                 res.setHeader('content-length', Buffer.byteLength(content));
-                res.writeHead(404);
                 res.end(content);
                 return;
             }
@@ -295,9 +298,9 @@ async function requestHandler(req, res, https) {
                             'headers': {}
                         }, '[CHILD][requestHandler][E0]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
                         const content = '<h1>500 Server Error</h1><hr>Kebab';
+                        res.statusCode = 500;
                         res.setHeader('content-type', 'text/html; charset=utf-8');
                         res.setHeader('content-length', Buffer.byteLength(content));
-                        res.writeHead(500);
                         res.end(content);
                         return;
                     }
@@ -334,9 +337,9 @@ async function requestHandler(req, res, https) {
                 catch (e) {
                     lCore.log({}, '[CHILD][requestHandler][E1]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
                     const content = '<h1>500 Server Error</h1><hr>Kebab';
+                    res.statusCode = 500;
                     res.setHeader('content-type', 'text/html; charset=utf-8');
                     res.setHeader('content-length', Buffer.byteLength(content));
-                    res.writeHead(500);
                     res.end(content);
                     return;
                 }
@@ -353,9 +356,9 @@ async function requestHandler(req, res, https) {
         }
     }
     const content = '<h1>403 Forbidden</h1><hr>Kebab';
+    res.statusCode = 403;
     res.setHeader('content-type', 'text/html; charset=utf-8');
     res.setHeader('content-length', Buffer.byteLength(content));
-    res.writeHead(403);
     res.end(content);
 }
 /**

package/sys/mod.d.ts

@@ -23,8 +23,8 @@ declare class Rows<T extends Mod> implements IRows<T> {
     toArray(): Array<Record<string, any>>;
     /** --- 根据规则筛掉项，predicate 返回 true 代表保留 --- */
     filter(predicate: (value: T, index: number) => boolean): Rows<T>;
-    /** --- 重塑对象内容 --- */
-    map<TU extends Mod>(fn: (v: T, i: number) => TU): Rows<TU>;
+    /** --- 重塑对象内容为数组 --- */
+    map<TU>(allbackfn: (value: T, index: number) => TU): TU[];
     /** --- for of --- */
     [Symbol.iterator](): IterableIterator<T>;
 }

package/sys/mod.js

@@ -29,9 +29,13 @@ class Rows {
     filter(predicate) {
         return new Rows(this._items.filter(predicate));
     }
-    /** --- 重塑对象内容 --- */
-    map(fn) {
-        return new Rows(this._items.map(fn));
+    /** --- 重塑对象内容为数组 --- */
+    map(allbackfn) {
+        const items = [];
+        for (let i = 0; i < this._items.length; ++i) {
+            items.push(allbackfn(this._items[i], i));
+        }
+        return items;
     }
     /** --- for of --- */
     [Symbol.iterator]() {

package/sys/route.js

@@ -37,9 +37,9 @@ export async function run(data) {
         if (!configContent) {
             if (data.res) {
                 const content = '<h1>500 File kebab.json can not be read</h1><hr>Kebab';
+                data.res.statusCode = 500;
                 data.res.setHeader('content-type', 'text/html; charset=utf-8');
                 data.res.setHeader('content-length', Buffer.byteLength(content));
-                data.res.writeHead(500);
                 data.res.end(content);
             }
             else {
@@ -133,13 +133,13 @@ export async function run(data) {
                 /** --- 组合要跳转的路径 --- */
                 const apath = config.const.path + (config.const.qs ? '?' + config.const.qs : '');
                 if (config.lang.list.includes(lang)) {
+                    data.res.statusCode = 302;
                     data.res.setHeader('location', config.const.urlBase + lang + '/' + apath);
-                    data.res.writeHead(302);
                     data.res.end('');
                     return true;
                 }
+                data.res.statusCode = 302;
                 data.res.setHeader('location', config.const.urlBase + config.lang.list[0] + '/' + apath);
-                data.res.writeHead(302);
                 data.res.end('');
                 return true;
             }
@@ -183,15 +183,15 @@ export async function run(data) {
     if (pathLeft.startsWith('middle')) {
         if (data.res) {
             if (config.route['#404']) {
+                data.res.statusCode = 302;
                 data.res.setHeader('location', lText.urlResolve(config.const.urlBase, config.route['#404']));
-                data.res.writeHead(302);
                 data.res.end('');
                 return true;
             }
             const content = '[Error] Controller not found, path: ' + path + '.';
+            data.res.statusCode = 404;
             data.res.setHeader('content-type', 'text/html; charset=utf-8');
             data.res.setHeader('content-length', Buffer.byteLength(content));
-            data.res.writeHead(404);
             data.res.end(content);
         }
         else {
@@ -218,7 +218,7 @@ export async function run(data) {
     headers['authorization'] ??= '';
     /** --- 开发者返回值 --- */
     let rtn;
-    if (data.socket && data.req instanceof http.IncomingMessage) {
+    if (data.socket && (data.req instanceof http.IncomingMessage)) {
         // --- socket 模式 ---
         // --- 判断真实控制器文件是否存在 ---
         let filePath = config.const.wsPath + pathLeft + '.js';
@@ -245,7 +245,7 @@ export async function run(data) {
         }
         catch (e) {
             lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
-            data.socket.destroy();
+            data.socket?.destroy();
             return true;
         }
         cctr.setPrototype('_param', param);
@@ -259,7 +259,7 @@ export async function run(data) {
         }
         catch (e) {
             lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
-            data.socket.destroy();
+            data.socket?.destroy();
             return true;
         }
         if (rtn === undefined || rtn === true) {
@@ -268,7 +268,7 @@ export async function run(data) {
             }
             catch (e) {
                 lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
-                data.socket.destroy();
+                data.socket?.destroy();
                 return true;
             }
             if (rtn === undefined || rtn === true) {
@@ -413,9 +413,9 @@ export async function run(data) {
     catch (e) {
         lCore.log(middle, '(E03)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
         const content = '<h1>500 Server Error</h1><hr>Kebab';
+        data.res.statusCode = 500;
         data.res.setHeader('content-type', 'text/html; charset=utf-8');
         data.res.setHeader('content-length', Buffer.byteLength(content));
-        data.res.writeHead(500);
         data.res.end(content);
         return true;
     }
@@ -429,9 +429,9 @@ export async function run(data) {
         catch (e) {
             lCore.log(middle, '(E05)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
             const content = '<h1>500 Server Error</h1><hr>Kebab';
+            data.res.statusCode = 500;
             data.res.setHeader('content-type', 'text/html; charset=utf-8');
             data.res.setHeader('content-length', Buffer.byteLength(content));
-            data.res.writeHead(500);
             data.res.end(content);
             return true;
         }
@@ -443,15 +443,15 @@ export async function run(data) {
             if (!await lFs.isFile(filePath)) {
                 // --- 指定的控制器不存在 ---
                 if (config.route['#404']) {
+                    data.res.statusCode = 302;
                     data.res.setHeader('location', lText.urlResolve(config.const.urlBase, config.route['#404']));
-                    data.res.writeHead(302);
                     data.res.end('');
                     return true;
                 }
                 const content = '[Error] Controller not found, path: ' + path + '.';
+                data.res.statusCode = 404;
                 data.res.setHeader('content-type', 'text/html; charset=utf-8');
                 data.res.setHeader('content-length', Buffer.byteLength(content));
-                data.res.writeHead(404);
                 data.res.end(content);
                 return true;
             }
@@ -482,23 +482,24 @@ export async function run(data) {
             lCore.log(cctr, '', '-visit');
             // --- 强制 HTTPS ---
             if (config.set.mustHttps && !config.const.https) {
+                data.res.statusCode = 302;
                 data.res.setHeader('location', data.req.url ?? '');
-                data.res.writeHead(302);
+                data.res.end('');
                 return true;
             }
             // --- 检测 action 是否存在，以及排除内部方法 ---
             if (pathRight.startsWith('_') || pathRight === 'onUpgrade' || pathRight === 'onLoad' || pathRight === 'onData' || pathRight === 'onDrain' || pathRight === 'onEnd' || pathRight === 'onClose' || pathRight === 'setPrototype' || pathRight === 'getPrototype' || pathRight === 'getAuthorization') {
                 // --- _ 开头的 action 是内部方法，不允许访问 ---
                 if (config.route['#404']) {
+                    data.res.statusCode = 302;
                     data.res.setHeader('location', lText.urlResolve(config.const.urlBase, config.route['#404']));
-                    data.res.writeHead(302);
                     data.res.end('');
                     return true;
                 }
                 const content = '[Error] Action not found, path: ' + path + '.';
+                data.res.statusCode = 404;
                 data.res.setHeader('content-type', 'text/html; charset=utf-8');
                 data.res.setHeader('content-length', Buffer.byteLength(content));
-                data.res.writeHead(404);
                 data.res.end(content);
                 return true;
             }
@@ -507,15 +508,15 @@ export async function run(data) {
             });
             if (cctr[pathRight] === undefined) {
                 if (config.route['#404']) {
+                    data.res.statusCode = 302;
                     data.res.setHeader('location', lText.urlResolve(config.const.urlBase, config.route['#404']));
-                    data.res.writeHead(302);
                     data.res.end('');
                     return true;
                 }
                 const content = '[Error] Action not found, path: ' + path + '.';
+                data.res.statusCode = 404;
                 data.res.setHeader('content-type', 'text/html; charset=utf-8');
                 data.res.setHeader('content-length', Buffer.byteLength(content));
-                data.res.writeHead(404);
                 data.res.end(content);
                 return true;
             }
@@ -540,9 +541,9 @@ export async function run(data) {
                     catch (e) {
                         lCore.log(cctr, '(E05)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
                         const content = '<h1>500 Server Error</h1><hr>Kebab';
+                        data.res.statusCode = 500;
                         data.res.setHeader('content-type', 'text/html; charset=utf-8');
                         data.res.setHeader('content-length', Buffer.byteLength(content));
-                        data.res.writeHead(500);
                         data.res.end(content);
                         await waitCtr(cctr);
                         return true;
@@ -555,9 +556,9 @@ export async function run(data) {
             catch (e) {
                 lCore.log(cctr, '(E04)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
                 const content = '<h1>500 Server Error</h1><hr>Kebab';
+                data.res.statusCode = 500;
                 data.res.setHeader('content-type', 'text/html; charset=utf-8');
                 data.res.setHeader('content-length', Buffer.byteLength(content));
-                data.res.writeHead(500);
                 data.res.end(content);
                 await waitCtr(cctr);
                 return true;
@@ -579,7 +580,7 @@ export async function run(data) {
             // --- 已经自行输出过 writeHead，可能自行处理了内容，如 pipe，则不再 writeHead ---
         }
         else {
-            data.res.writeHead(data.res.getHeader('location') ? 302 : httpCode);
+            data.res.statusCode = data.res.getHeader('location') ? 302 : httpCode;
         }
         if (!data.res.writableEnded) {
             // --- 如果当前还没结束，则强制关闭连接，一切 pipe 请自行在方法中 await，否则会被中断 ---
@@ -602,7 +603,7 @@ export async function run(data) {
                     data.res.setHeader('content-encoding', compress.type);
                 }
             }
-            data.res.writeHead(httpCode);
+            data.res.statusCode = httpCode;
         }
         if (!data.res.writableEnded) {
             if (compress) {
@@ -633,7 +634,7 @@ export async function run(data) {
             if (compress) {
                 data.res.setHeader('content-encoding', compress.type);
             }
-            data.res.writeHead(httpCode);
+            data.res.statusCode = httpCode;
         }
         if (!data.res.writableEnded) {
             if (compress) {
@@ -651,7 +652,7 @@ export async function run(data) {
             if (rtn.length === 0) {
                 // --- 异常 ---
                 if (!data.res.headersSent) {
-                    data.res.writeHead(500);
+                    data.res.statusCode = 500;
                 }
                 if (!data.res.writableEnded) {
                     data.res.end('<h1>500 Internal server error</h1><hr>Kebab');
@@ -687,7 +688,7 @@ export async function run(data) {
                                 data.res.setHeader('content-encoding', compress.type);
                             }
                         }
-                        data.res.writeHead(httpCode);
+                        data.res.statusCode = httpCode;
                     }
                     if (!data.res.writableEnded) {
                         if (compress) {
@@ -712,7 +713,7 @@ export async function run(data) {
                         if (compress) {
                             data.res.setHeader('content-encoding', compress.type);
                         }
-                        data.res.writeHead(httpCode);
+                        data.res.statusCode = httpCode;
                     }
                     if (!data.res.writableEnded) {
                         const passThrough = new stream.PassThrough();
@@ -741,7 +742,7 @@ export async function run(data) {
                         data.res.setHeader('content-encoding', compress.type);
                     }
                 }
-                data.res.writeHead(httpCode);
+                data.res.statusCode = httpCode;
             }
             if (!data.res.writableEnded) {
                 if (compress) {
@@ -758,7 +759,7 @@ export async function run(data) {
     else {
         // --- 异常 ---
         if (!data.res.headersSent) {
-            data.res.writeHead(500);
+            data.res.statusCode = 500;
         }
         if (!data.res.writableEnded) {
             data.res.end('<h1>500 Internal server error</h1><hr>Kebab');