@maiyunnet/kebab 9.1.4 → 9.2.0

package/lib/net.js

@@ -11,8 +11,8 @@ import * as hc from '@litert/http-client';
 import * as kebab from '#kebab/index.js';
 import * as lFs from '#kebab/lib/fs.js';
 import * as lText from '#kebab/lib/text.js';
-import * as lTime from '#kebab/lib/time.js';
-import * as lCore from './core.js';
+import * as lCore from '#kebab/lib/core.js';
+import * as lCookie from '#kebab/lib/cookie.js';
 // --- 自己 ---
 import * as lFd from './net/formdata.js';
 import * as lRequest from './net/request.js';
@@ -309,7 +309,7 @@ export async function request(u, data, opt = {}) {
     }
     // --- cookie 托管 ---
     if (opt.cookie) {
-        headers['cookie'] = buildCookieQuery(opt.cookie, uri);
+        headers['cookie'] = lCookie.buildCookieQuery(opt.cookie, uri);
     }
     // --- 发起请求 ---
     let req;
@@ -346,7 +346,7 @@ export async function request(u, data, opt = {}) {
             'method': method,
             'data': data,
             'headers': headers,
-            'timeout': timeout * 1000,
+            'timeout': timeout * 1_000,
             'localAddress': local,
             'ca': ca,
             'connectionOptions': {
@@ -367,7 +367,7 @@ export async function request(u, data, opt = {}) {
     // --- 是否追踪 cookie ---
     if (opt.cookie) {
         // --- 提取 cookie ---
-        await buildCookieObject(opt.cookie, (req.headers['set-cookie'] ?? []), uri);
+        await lCookie.buildCookieObject(opt.cookie, (req.headers['set-cookie'] ?? []), uri);
     }
     // --- 直接下载到文件 ---
     /** --- 已下载文件的 size --- */
@@ -437,220 +437,6 @@ export async function request(u, data, opt = {}) {
         'reuse': reuse
     });
 }
-/**
- * --- 对 cookie 对象进行操作 ---
- * @param cookie 要操作的对象
- * @param name 名
- * @param value 值
- * @param domain 应用网址，如 .xxx.com
- * @param opt 选项 ttl, path, ssl, httponly
- */
-export function setCookie(cookie, name, value, domain, opt = {}) {
-    const tim = lTime.stamp();
-    const ttl = opt.ttl ?? 0;
-    domain = lText.parseHost(domain).hostname;
-    const domainN = domain.startsWith('.') ? domain.slice(1) : domain;
-    let exp = -1992199400;
-    if (ttl) {
-        exp = tim + ttl;
-    }
-    cookie[name + '-' + domainN] = {
-        'name': name,
-        'value': value,
-        'exp': exp,
-        'path': opt['path'] ?? '/',
-        'domain': domainN,
-        'secure': opt['ssl'] ? true : false,
-        'httponly': opt['httponly'] ? true : false
-    };
-}
-/**
- * --- 根据 Set-Cookie 头部转换到 cookie 对象 ---
- * @param cookie cookie 对象
- * @param setCookies 头部的 set-cookie 数组
- * @param uri 请求的 URI 对象
- */
-async function buildCookieObject(cookie, setCookies, uri) {
-    const tim = lTime.stamp();
-    uri.path ??= '/';
-    for (const setCookie of setCookies) {
-        const cookieTmp = {};
-        const list = setCookie.split(';');
-        // --- 提取 set-cookie 中的定义信息 ---
-        for (let index = 0; index < list.length; ++index) {
-            const item = list[index];
-            const arr = item.split('=');
-            /** --- 提取 key 并修整 --- */
-            const key = arr[0].trim();
-            if (key === '') {
-                continue;
-            }
-            /** --- 提取 value --- */
-            let val = '';
-            if (arr.length > 1) {
-                val = item.slice(item.indexOf('=') + 1).trim();
-            }
-            if (index === 0) {
-                // --- 用户定义的信息 ---
-                cookieTmp['name'] = key;
-                try {
-                    cookieTmp['value'] = decodeURIComponent(val);
-                }
-                catch {
-                    cookieTmp['value'] = val;
-                }
-            }
-            else {
-                // --- cookie 配置信息，可转小写方便读取 ---
-                cookieTmp[key.toLowerCase()] = val;
-            }
-        }
-        // --- 获取定义的 domain ---
-        let domain = '', domainN = '';
-        if (cookieTmp['domain']) {
-            cookieTmp['domain'] = lText.parseHost(cookieTmp['domain']).hostname;
-            if (!(cookieTmp['domain'].startsWith('.'))) {
-                domain = '.' + cookieTmp['domain'];
-                domainN = cookieTmp['domain'];
-            }
-            else {
-                domain = cookieTmp['domain'];
-                domainN = cookieTmp['domain'].slice(1);
-            }
-        }
-        else {
-            domain = '.' + (uri.hostname ?? '');
-            domainN = uri.hostname ?? '';
-        }
-        // --- 判断有没有设置 domain 的权限 ---
-        // --- uri.hostname vs  domain(domainN) ---
-        // --- ok.xxx.com   vs  .ok.xxx.com: true ---
-        // --- ok.xxx.com   vs  .xxx.com: true ---
-        // --- z.ok.xxx.com vs  .xxx.com: true ---
-        // --- ok.xxx.com   vs  .zz.ok.xxx.com: false ---
-        if (uri.hostname !== domainN) {
-            // --- 设置的域名和当前 host 不相等，如果是 IP、无 . 域名，则直接失败 ---
-            if (!lText.isDomain(uri.hostname ?? '')) {
-                continue;
-            }
-            const parseDomain = await lText.parseDomain(domainN);
-            if (parseDomain.tld === domainN.toLowerCase()) {
-                // --- 不能给 tld 设置 cookie ---
-                continue;
-            }
-            // --- 判断访问路径 (uri['host']) 是不是设置域名 (domain) 的孩子，domain 必须是 uriHost 的同级或者父辈 ---
-            if (!((uri.hostname ?? '').endsWith(domain))) {
-                // --- false 代表进入了，代表失败 ---
-                // --- ok.xxx.com, .xxx.com: true ---
-                // --- ok.xxx.com, .ppp.com: false ---
-                // --- ok.xxx.com, .p.ok.xxx.com: false ---
-                continue;
-            }
-        }
-        const cookieKey = cookieTmp['name'] + '-' + domainN;
-        let exp = -1992199400;
-        if (cookieTmp['max-age'] !== undefined) {
-            const maxAge = Number(cookieTmp['max-age']);
-            if (!(isNaN(maxAge))) {
-                if (maxAge <= 0) {
-                    delete cookie[cookieKey];
-                    continue;
-                }
-                exp = tim + maxAge;
-            }
-        }
-        if ((exp === -1992199400) && cookieTmp['expires']) {
-            const expires = lTime.stamp(cookieTmp['expires']);
-            if (!(isNaN(expires))) {
-                if (expires <= tim) {
-                    delete cookie[cookieKey];
-                    continue;
-                }
-                exp = expires;
-            }
-        }
-        // --- path ---
-        let path = cookieTmp['path'] ?? '';
-        if (path === '') {
-            const srp = (uri.pathname ?? '').lastIndexOf('/');
-            path = (uri.pathname ?? '').slice(0, srp + 1);
-        }
-        else if (!path.startsWith('/')) {
-            path = '/' + path;
-        }
-        cookie[cookieKey] = {
-            'name': cookieTmp['name'],
-            'value': cookieTmp['value'],
-            'exp': exp,
-            'path': path,
-            'domain': domainN,
-            'secure': cookieTmp['secure'] !== undefined,
-            'httponly': cookieTmp['httponly'] !== undefined
-        };
-    }
-}
-/**
- * --- 对象转换为 Cookie 拼接字符串（会自动筛掉不能发送的 cookie） ---
- * @param cookie cookie 对象
- * @param uri 请求的 URI 对象
- */
-export function buildCookieQuery(cookie, uri) {
-    const tim = lTime.stamp();
-    let cookieStr = '';
-    for (const key in cookie) {
-        const item = cookie[key];
-        if ((item.exp < tim) && (item.exp !== -1992199400)) {
-            delete cookie[key];
-            continue;
-        }
-        uri.path ??= '/';
-        if (item.secure && (uri.protocol !== 'https:')) {
-            continue;
-        }
-        // --- 判断 path 是否匹配 ---
-        if (!uri.path.startsWith(item.path)) {
-            continue;
-        }
-        const domain = '.' + item.domain;
-        // --- 判断 $uri['host'] 必须是 $domain 的同级或子级 ---
-        // --- $uri['host']     vs      $domain ---
-        // --- ok.xxx.com       vs      .ok.xxx.com: true ---
-        // --- ok.xxx.com       vs      .xxx.com: true ---
-        // --- z.ok.xxx.com     vs      .xxx.com: true ---
-        // --- ok.xxx.com       vs      .zz.ok.xxx.com: false ---
-        if ('.' + (uri.hostname ?? '') !== domain) {
-            // --- 域名不相等，那么判断当前域名 host 是不是 domain 的孩子 ---
-            if (!(uri.hostname.endsWith(domain))) {
-                // --- false 代表进入，被排除了，因为 cookie 的 domain 和当前 host 后半部分，代表不是 domain 的孩子 ---
-                // --- ok.xxx.com, .zz.ok.xxx.com: false ---
-                // --- pp.ok.xxx.com, .zz.ok.xxx.com: false ---
-                // --- q.b.ok.xx.com, .zz.ok.xxx.com: false ---
-                // --- z.ok.xxx.com, .xxx.com: true ---
-                // --- xx.xxx.com, .ok.xxx.com: false ---
-                continue;
-            }
-        }
-        cookieStr += item.name + '=' + encodeURIComponent(item.value) + '; ';
-    }
-    if (cookieStr !== '') {
-        return cookieStr.slice(0, -2);
-    }
-    else {
-        return '';
-    }
-}
-/**
- * --- 模拟重启浏览器后的状态 ---
- * @param cookie cookie 对象
- */
-export function resetCookieSession(cookie) {
-    for (const key in cookie) {
-        const item = cookie[key];
-        if (item.exp === -1992199400000) {
-            delete cookie[key];
-        }
-    }
-}
 /**
  * --- 创建 FormData 对象 ---
  */
@@ -808,3 +594,4 @@ export async function rproxy(ctr, route, opt = {}) {
     }
     return false;
 }
+/* eslint-enable */

package/lib/socket.d.ts

@@ -4,16 +4,17 @@
  * Last: 2025-9-25 16:49:48
  */
 import net from 'net';
-import * as lNet from '#kebab/lib/net.js';
+import * as lUndici from '#kebab/lib/undici.js';
 import * as lWs from '#kebab/lib/ws.js';
+import * as lCokie from '#kebab/lib/cookie.js';
 export interface IRwebsocketOptions {
     /** --- 秒数 --- */
     'timeout'?: number;
     'hosts'?: Record<string, string>;
     'local'?: string;
-    'headers'?: lNet.THttpHeaders;
+    'headers'?: lUndici.THttpHeaders;
     /** --- cookie 托管对象 --- */
-    'cookie'?: Record<string, lNet.ICookie>;
+    'cookie'?: Record<string, lCokie.ICookie>;
     /** --- 小帧模式，默认 false --- */
     'mode'?: lWs.EFrameReceiveMode;
     /** --- 加密模式，默认 true --- */

package/lib/turnstile.js

@@ -5,7 +5,7 @@
  */
 import * as tc from 'tencentcloud-sdk-nodejs';
 // --- 库和定义 ---
-import * as lNet from '#kebab/lib/net.js';
+import * as lUndici from '#kebab/lib/undici.js';
 import * as lText from '#kebab/lib/text.js';
 /**
  * 0. CloudFlare：https://developers.cloudflare.com/turnstile/get-started/server-side-validation/
@@ -22,7 +22,7 @@ export async function verify(ctr, opt) {
     switch (opt.factory) {
         case EFACTORY.CLOUDFLARE: {
             // --- CloudFlare 验证 ---
-            const res = await lNet.postJson('https://challenges.cloudflare.com/turnstile/v0/siteverify', {
+            const res = await lUndici.postJson('https://challenges.cloudflare.com/turnstile/v0/siteverify', {
                 'secret': config.turnstile['CF'].skey,
                 'response': opt.token,
                 'remoteip': opt.ip,

package/lib/undici/formdata.d.ts

@@ -0,0 +1,83 @@
+/**
+ * Project: Kebab, User: JianSuoQiYue
+ * Date: 2020-04-07 23:45:03
+ * Last: 2020-04-07 23:45:07, 2022-09-10 01:35:25
+ */
+import * as stream from 'stream';
+/** --- Item 对象 --- */
+export type IItem = {
+    /** --- key 键 --- */
+    'key': string;
+    'type': 'string';
+    /** --- 字符串值 --- */
+    'value': string;
+    'path': '';
+} | {
+    /** --- key 键 --- */
+    'key': string;
+    'type': 'file';
+    /** --- 文件名 --- */
+    'value': string;
+    /** --- 文件路径 --- */
+    'path': string;
+} | {
+    /** --- key 键 --- */
+    'key': string;
+    'type': 'buffer';
+    /** --- 文件名 --- */
+    'value': string;
+    /** --- Buffer 数据 --- */
+    'path': Buffer;
+};
+export declare class FormData extends stream.Readable {
+    /** --- read 调用次数 --- */
+    private _num;
+    /** --- 要编译的数据 --- */
+    private readonly _data;
+    /** --- 分隔符 --- */
+    private readonly _boundary;
+    /** --- 正在读取文件吗 --- */
+    private _fileReading;
+    /** --- 是否已经结束 --- */
+    private _close;
+    /** --- 总字节长度 --- */
+    private _length;
+    /** --- 已发送字节长度 --- */
+    private _sent;
+    /**
+     * --- 添加字符串 ---
+     * @param key 键
+     * @param val 值
+     */
+    putString(key: string, val: string): void;
+    /**
+     * --- 添加文件 ---
+     * @param key 键
+     * @param path 路径
+     * @param fname 可选，文件名
+     */
+    putFile(key: string, path: string, fname?: string): Promise<boolean>;
+    /**
+     * --- 添加 Buffer 数据 ---
+     * @param key 键
+     * @param buffer Buffer 数据
+     * @param fname 文件名
+     */
+    putBuffer(key: string, buffer: Buffer, fname: string): void;
+    /**
+     * --- 获取 boundary ---
+     */
+    getBoundary(): string;
+    /**
+     * --- 获取总字节长度 ---
+     */
+    getLength(): number;
+    /**
+     * --- 获取已发送的字节长度 ---
+     */
+    getSent(): number;
+    /**
+     * --- 间隔读取（on data 或 pipe 触发）---
+     */
+    _read(): void;
+}

package/lib/undici/formdata.js

@@ -0,0 +1,166 @@
+/**
+ * Project: Kebab, User: JianSuoQiYue
+ * Date: 2020-04-07 23:45:03
+ * Last: 2020-04-07 23:45:07, 2022-09-10 01:35:25
+ */
+import * as stream from 'stream';
+import * as mime from '@litert/mime';
+import * as core from '#kebab/lib/core.js';
+import * as fs from '#kebab/lib/fs.js';
+export class FormData extends stream.Readable {
+    /** --- read 调用次数 --- */
+    _num = 0;
+    /** --- 要编译的数据 --- */
+    _data = [];
+    /** --- 分隔符 --- */
+    _boundary = '----Kebab' + core.random(29, core.RANDOM_LUN);
+    /** --- 正在读取文件吗 --- */
+    _fileReading = false;
+    /** --- 是否已经结束 --- */
+    _close = false;
+    /** --- 总字节长度 --- */
+    _length = 4 + this._boundary.length;
+    /** --- 已发送字节长度 --- */
+    _sent = 0;
+    /**
+     * --- 添加字符串 ---
+     * @param key 键
+     * @param val 值
+     */
+    putString(key, val) {
+        this._data.push({
+            'key': key,
+            'type': 'string',
+            'value': val,
+            'path': ''
+        });
+        this._length += this._boundary.length + 49 + Buffer.byteLength(key) + Buffer.byteLength(val);
+    }
+    /**
+     * --- 添加文件 ---
+     * @param key 键
+     * @param path 路径
+     * @param fname 可选，文件名
+     */
+    async putFile(key, path, fname) {
+        path = path.replace(/\\/g, '/');
+        const stat = await fs.stats(path);
+        if (!stat) {
+            return false;
+        }
+        if (!fname) {
+            const lio = path.lastIndexOf('/');
+            fname = lio === -1 ? path : path.slice(lio + 1);
+        }
+        this._data.push({
+            'key': key,
+            'type': 'file',
+            'value': fname,
+            'path': path
+        });
+        this._length += this._boundary.length +
+            76 + Buffer.byteLength(key) + Buffer.byteLength(fname) +
+            mime.getMime(fname).length + stat.size + 2;
+        return true;
+    }
+    /**
+     * --- 添加 Buffer 数据 ---
+     * @param key 键
+     * @param buffer Buffer 数据
+     * @param fname 文件名
+     */
+    putBuffer(key, buffer, fname) {
+        this._data.push({
+            'key': key,
+            'type': 'buffer',
+            'value': fname,
+            'path': buffer
+        });
+        this._length += this._boundary.length +
+            76 + Buffer.byteLength(key) + Buffer.byteLength(fname) +
+            mime.getMime(fname).length + buffer.byteLength + 2;
+    }
+    /**
+     * --- 获取 boundary ---
+     */
+    getBoundary() {
+        return this._boundary;
+    }
+    /**
+     * --- 获取总字节长度 ---
+     */
+    getLength() {
+        return this._length;
+    }
+    /**
+     * --- 获取已发送的字节长度 ---
+     */
+    getSent() {
+        return this._sent;
+    }
+    /**
+     * --- 间隔读取（on data 或 pipe 触发）---
+     */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    _read() {
+        if (this._close) {
+            // --- 结束了 ---
+            this.push(null);
+            return;
+        }
+        // --- 文件读取中 ---
+        if (this._fileReading) {
+            // --- 等待下面 fileReadable 的 on data 或 end 事件 ---
+            return;
+        }
+        // --- 获取当前 item ---
+        const item = this._data[this._num];
+        if (!item) {
+            this._close = true;
+            const push = `--${this._boundary}--`;
+            this._sent += Buffer.byteLength(push);
+            this.push(push);
+            return;
+        }
+        if (item.type === 'buffer') {
+            // --- Buffer 数据 ---
+            const push = `--${this._boundary}\r\nContent-Disposition: form-data; name="${item.key}"; filename="${item.value}"\r\nContent-Type: ${mime.getMime(item.value)}\r\n\r\n`;
+            this._sent += Buffer.byteLength(push);
+            this.push(push);
+            this._sent += item.path.byteLength;
+            this.push(item.path);
+            const pushEnd = '\r\n';
+            this._sent += Buffer.byteLength(pushEnd);
+            this.push(pushEnd);
+        }
+        else if (item.type === 'string') {
+            // --- 字段 ---
+            const push = `--${this._boundary}\r\nContent-Disposition: form-data; name="${item.key}"\r\n\r\n${item.value}\r\n`;
+            this._sent += Buffer.byteLength(push);
+            this.push(push);
+        }
+        else {
+            // --- 文件 ---
+            const push = `--${this._boundary}\r\nContent-Disposition: form-data; name="${item.key}"; filename="${item.value}"\r\nContent-Type: ${mime.getMime(item.value)}\r\n\r\n`;
+            this._sent += Buffer.byteLength(push);
+            this.push(push);
+            // --- 创建流 ---
+            this._fileReading = true;
+            const fileReadable = fs.createReadStream(item.path);
+            fileReadable.on('data', (chunk) => {
+                if (!(chunk instanceof Buffer)) {
+                    return;
+                }
+                this._sent += chunk.byteLength;
+                this.push(chunk);
+            });
+            fileReadable.on('end', () => {
+                this._fileReading = false;
+                const push = '\r\n';
+                this._sent += Buffer.byteLength(push);
+                this.push(push);
+            });
+        }
+        ++this._num;
+    }
+}

package/lib/undici/request.d.ts

@@ -0,0 +1,86 @@
+/**
+ * Project: Kebab, User: JianSuoQiYue
+ * Date: 2020-4-9 20:02:39
+ * Last: 2020-4-9 20:47:58, 2022-09-10 01:35:34, 2025-9-23 12:41:58
+ */
+import * as stream from 'stream';
+import * as lCookie from '#kebab/lib/cookie.js';
+import * as lUndici from '#kebab/lib/undici.js';
+import * as lResponse from './response.js';
+export declare class Request {
+    /** --- get 或 post 的数据 --- */
+    private _data;
+    /** --- 访问的 URL --- */
+    private readonly _url;
+    /** --- 要传递的参数 --- */
+    private _opt;
+    constructor(url: string);
+    /**
+     * --- 设置 get 或 post 的数据 ---
+     * @param data 数据
+     */
+    data(data: Record<string, any> | Buffer | string | stream.Readable): this;
+    /**
+     * --- 设置 get 或 post 请求 ---
+     * @param method
+     */
+    method(method: 'GET' | 'POST'): this;
+    /**
+     * --- method get 方法别名 ---
+     */
+    get(): this;
+    /**
+     * --- method post 方法别名 ---
+     */
+    post(): this;
+    /**
+     * --- 设置提交模式，json 还是普通 form ---
+     * @param type
+     */
+    type(type: 'form' | 'json'): this;
+    /**
+     * --- type json 方法别名 ---
+     */
+    json(): this;
+    /**
+     * --- 设置请求有效期 ---
+     * @param timeout 秒
+     */
+    timeout(timeout: number): this;
+    /**
+     * --- 设置是否跟随请求方的 location，留空为跟随，不设置为不跟随 ---
+     * @param follow
+     */
+    follow(follow?: number): this;
+    /**
+     * --- 设置域名 -> ip的对应键值，就像电脑里的 hosts 一样 ---
+     * @param hosts
+     */
+    hosts(hosts: Record<string, string> | string): this;
+    /**
+     * --- 设置后将直接保存到本地文件，不会返回，save 为本地实体路径 ---
+     * @param save
+     */
+    save(save: string): this;
+    /**
+     * --- 设置使用的本地网卡 IP ---
+     * @param addr
+     */
+    local(addr: string): this;
+    /**
+     * --- 批量设置提交的 headers ---
+     * @param headers
+     */
+    headers(headers: lUndici.THttpHeaders): this;
+    /**
+     * --- 设置单条 header ---
+     * @param name
+     * @param val
+     */
+    setHeader(name: string, val: string): this;
+    /**
+     * --- 发起请求 ---
+     * @param cookie
+     */
+    request(cookie?: Record<string, lCookie.ICookie>): Promise<lResponse.Response>;
+}