xshell 1.0.78 → 1.0.80

package/Terminal.js

@@ -4,6 +4,9 @@ import { useEffect, useRef } from 'react';
 import { Terminal as XTermTerminal } from 'xterm';
 import { FitAddon } from 'xterm-addon-fit';
 import { WebglAddon } from 'xterm-addon-webgl';
+import { WebLinksAddon } from 'xterm-addon-web-links';
+// 没有 ui
+// import { SearchAddon } from 'xterm-addon-search'
 import { Model } from 'react-object-model';
 import { assert, genid } from './utils.browser.js';
 export function Terminal({ font }) {
@@ -25,7 +28,11 @@ export function Terminal({ font }) {
                 }
             });
             const fit_addon = new FitAddon();
+            const link_addon = new WebLinksAddon();
+            // const search_addon = new SearchAddon()
             term.loadAddon(fit_addon);
+            term.loadAddon(link_addon);
+            // term.loadAddon(search_addon)
             term.open(rterminal.current);
             term.loadAddon(new WebglAddon());
             fit_addon.fit();

package/file.d.ts

@@ -105,7 +105,7 @@ export declare function ffstat(handle: fsp.FileHandle): Promise<fs.BigIntStats>;
     
     返回是否实际进行了删除操作
     Returns whether the delete operation actually took place */
-export declare function fdelete(fp: string, { print, red }?: {
+export declare function fdelete(fp: string, { print }?: {
     print?: boolean;
     red?: boolean;
 }): Promise<boolean>;
@@ -179,23 +179,26 @@ export interface ZipOptions {
         files: boolean;
     };
 }
-/** 将文件夹压缩为 zip
-    返回 fp_zip 或压缩包数据
+/** 将文件夹或文件列表压缩为 zip，返回生成的压缩包路径 (fp_zip)
     - data:
-        - 被压缩文件夹路径 (fpd_src: string) 或
-        - 文件索引对象 (entries: Record<压缩后相对路径, 原文件绝对路径 (string) | 数据 (Uint8Array)>)
-    - fp_zip?:
-        - 传压缩包完整路径时压缩到文件, 函数返回值为 Promise<zip 路径>
-        - 传 undefined 时压缩到内存, 函数返回值为 Promise<zip Uint8Array>
+        - fpd_src: 被压缩文件夹路径 (string) 或
+        - entries: 文件列表 (Record<压缩后相对路径, 原文件绝对路径 (string) | 数据 (Uint8Array)>)
+    - fp_zip: 生成的压缩包路径 (string)
     - options?:
         - dirname?: `fpd_src.fname` 传入 fpd_src 才生效，修改 zip 中顶层的文件夹的名字（需要以 / 结尾），如 'web/', 为空字符串时去掉顶层文件夹，不要多一个文件夹层级 (flat)
         - print?:
             - info?: `true` 开始压缩、压缩完成
             - files?: `true` 打印压缩文件列表 */
-export declare function fzip(entries: Record<string, string | Uint8Array>, fp_zip?: undefined, options?: ZipOptions): Promise<Uint8Array>;
-export declare function fzip(entries: Record<string, string | Uint8Array>, fp_zip: string, options?: ZipOptions): Promise<string>;
-export declare function fzip(fpd_src: string, fp_zip?: undefined, options?: ZipOptions): Promise<Uint8Array>;
-export declare function fzip(fpd_src: string, fp_zip: string, options?: ZipOptions): Promise<string>;
+export declare function fzip(data: string | Record<string, string | Uint8Array>, fp_zip: string, options?: ZipOptions): Promise<string>;
+/** 将文件夹或文件列表压缩为 zip，返回压缩包数据 (Uint8Array)
+    - data:
+        - fpd_src: 被压缩文件夹路径 (string) 或
+        - entries: 文件列表 (Record<压缩后相对路径, 原文件绝对路径 (string) | 数据 (Uint8Array)>)
+    - options?:
+        - print?:
+            - info?: `true` 开始压缩、压缩完成
+            - files?: `true` 打印压缩文件列表 */
+export declare function zip(data: string | Record<string, string | Uint8Array>, options?: ZipOptions): Promise<Buffer>;
 export declare let fwatchers: Record<string, fs.FSWatcher>;
 /** 跟踪文本文件追加的内容，类似 tail -f */
 export declare function ftail(fp: string, handler: (lines: string[]) => void | Promise<void>, { print }?: {

package/file.js

@@ -194,16 +194,14 @@ export async function ffstat(handle) {
     
     返回是否实际进行了删除操作
     Returns whether the delete operation actually took place */
-export async function fdelete(fp, { print = true, red = true } = {}) {
+export async function fdelete(fp, { print = true } = {}) {
     assert(fp.length >= 6, `fp: ${fp} ${t('不能太短，防止误删文件')}`);
     assert(path.isAbsolute(fp), t('fp 必须是绝对路径'));
     const { isdir } = fp;
     try {
         await fsp.rm(fp, { recursive: true });
-        if (print) {
-            const message = `${isdir ? t('删除了文件夹') : t('删除了文件')} ${fp}`;
-            console.log(red ? message.red : message);
-        }
+        if (print)
+            console.log(`${isdir ? t('删除了文件夹') : t('删除了文件')} ${fp}`);
         return true;
     }
     catch (error) {
@@ -364,7 +362,31 @@ export async function flink(fp_real, fp_link, { junction = false, print = true }
     else
         fsp.symlink(fp_real, fp_link, is_fpd_real ? 'dir' : 'file');
 }
-export async function fzip(data, fp_zip, { dirname, print = { files: true, info: true } } = {}) {
+/** 将文件夹或文件列表压缩为 zip，返回生成的压缩包路径 (fp_zip)
+    - data:
+        - fpd_src: 被压缩文件夹路径 (string) 或
+        - entries: 文件列表 (Record<压缩后相对路径, 原文件绝对路径 (string) | 数据 (Uint8Array)>)
+    - fp_zip: 生成的压缩包路径 (string)
+    - options?:
+        - dirname?: `fpd_src.fname` 传入 fpd_src 才生效，修改 zip 中顶层的文件夹的名字（需要以 / 结尾），如 'web/', 为空字符串时去掉顶层文件夹，不要多一个文件夹层级 (flat)
+        - print?:
+            - info?: `true` 开始压缩、压缩完成
+            - files?: `true` 打印压缩文件列表 */
+export async function fzip(data, fp_zip, options) {
+    return _zip(data, fp_zip, options);
+}
+/** 将文件夹或文件列表压缩为 zip，返回压缩包数据 (Uint8Array)
+    - data:
+        - fpd_src: 被压缩文件夹路径 (string) 或
+        - entries: 文件列表 (Record<压缩后相对路径, 原文件绝对路径 (string) | 数据 (Uint8Array)>)
+    - options?:
+        - print?:
+            - info?: `true` 开始压缩、压缩完成
+            - files?: `true` 打印压缩文件列表 */
+export async function zip(data, options) {
+    return _zip(data, undefined, options);
+}
+async function _zip(data, fp_zip, { dirname, print = { files: true, info: true } } = {}) {
     let entries;
     let fpd_src;
     if (typeof data === 'string') {
@@ -378,12 +400,14 @@ export async function fzip(data, fp_zip, { dirname, print = { files: true, info:
         entries = Object.fromEntries((await flist(fpd_src, { print: false }))
             .map(fp => ([dirname + fp, fpd_src + fp])));
     }
-    else
+    else {
+        assert(!dirname, 'dirname 在传入 fpd_src 时才生效');
         entries = data;
+    }
     if (print.info)
-        console.log(`开始压缩${fpd_src ? ` ${fpd_src}` : '文件索引'} -> ${fp_zip ? `${fp_zip}/${dirname}` : '内存'}`);
+        console.log(`开始压缩${fpd_src ? ` ${fpd_src}` : '文件索引'} -> ${fp_zip ? `${fp_zip}/${dirname || '{entries}'}` : '内存'}`);
     const { default: archiver } = await import('archiver');
-    let archive = archiver('zip', { zlib: { chunkSize: 16 * 2 ** 20 /* 16 MB */ } });
+    let archive = archiver('zip');
     let ostream = fp_zip ?
         fs.createWriteStream(fp_zip, { highWaterMark: 16 * 2 ** 20 /* 16 MB */ })
         :

package/git.d.ts

@@ -33,7 +33,8 @@ export declare class Git {
     checkout(branch?: 'main'): Promise<void>;
     checkout(branch?: string): Promise<void>;
     _checkout(branch?: string): Promise<void>;
-    merge(branch: string, fast_forward?: boolean): Promise<void>;
+    /** 返回是否进行了修改 */
+    merge(branch: string, fast_forward?: boolean): Promise<boolean>;
     /** 记住当前分支名
         checkout 到 <目标分支>
         merge 当前分支 */

package/git.js

@@ -121,6 +121,7 @@ export class Git {
             throw error;
         }
     }
+    /** 返回是否进行了修改 */
     async merge(branch, fast_forward = true) {
         console.log(`合并 ${branch} 分支`);
         try {
@@ -129,12 +130,14 @@ export class Git {
                 branch,
                 ...fast_forward ? [] : ['--no-ff']
             ], { print: false });
-            if (stdout === 'Already up to date.\n')
+            const unchanged = stdout === 'Already up to date.\n';
+            if (unchanged)
                 console.log('当前分支无需更新');
             else
                 console.log(stdout.trimEnd());
             if (stderr)
                 console.log(stderr);
+            return !unchanged;
         }
         catch (error) {
             if (error.result) {

package/i18n/dict.json

@@ -373,5 +373,8 @@
     },
     "已不存在文件夹": {
         "en": "folder no longer exists:"
+    },
+    "不支持 content-encoding: {{encoding}} 的 http 请求": {
+        "en": "http requests with content-encoding: {{encoding}} are not supported"
     }
 }

package/net.browser.d.ts

@@ -1,5 +1,10 @@
 import './prototype.browser.js';
 import { Lock } from './utils.browser.js';
+export interface FullResponse<TBody extends ArrayBuffer | string> {
+    status: number;
+    headers: Headers;
+    body: TBody;
+}
 export interface BasicAuth {
     type: 'basic';
     username: string;
@@ -25,19 +30,13 @@ export interface RequestOptions {
 export interface RequestRawOptions extends RequestOptions {
     raw: true;
 }
+export interface RequestFullOptions extends RequestOptions {
+    full: true;
+}
 export interface RequestError extends Error {
     url: URL;
-    options: RequestInit;
-    response?: {
-        /** 状态码 */
-        status: number;
-        url: string;
-        headers: Headers;
-        ok: boolean;
-        type: ResponseType;
-        text: string;
-        redirected: boolean;
-    };
+    options: RequestOptions | RequestFullOptions | RequestRawOptions;
+    response?: FullResponse<string>;
 }
 /**
     - url: 可以只有 pathname 部分
@@ -55,6 +54,10 @@ export interface RequestError extends Error {
         - raw?: `false` 传入后返回整个 response  */
 export declare function request(url: string | URL): Promise<string>;
 export declare function request(url: string | URL, options: RequestRawOptions): Promise<Response>;
+export declare function request(url: string | URL, options: RequestFullOptions & {
+    encoding: 'binary';
+}): Promise<FullResponse<ArrayBuffer>>;
+export declare function request(url: string | URL, options: RequestFullOptions): Promise<FullResponse<string>>;
 export declare function request(url: string | URL, options: RequestOptions & {
     encoding: 'binary';
 }): Promise<ArrayBuffer>;

package/net.browser.js

@@ -1,7 +1,6 @@
 import { t } from './i18n/instance.js';
 import './prototype.browser.js'; // to_time_str()
 import { assert, concat, genid, delay, Lock, encode, decode } from './utils.browser.js';
-// ------------------------------------ fetch, request
 const drop_request_headers = new Set([
     // : 开头的 key
     // sec-*
@@ -32,7 +31,9 @@ async function fetch_retry(url, options, timeout, retries = 0, count = 0) {
         }
     }
 }
-export async function request(url, { method, queries, headers: _headers, body, type = 'application/json', encoding, retries, timeout = 5 * 1000, auth, raw = false, cors, } = {}) {
+export async function request(url, options = {}) {
+    const { queries, headers: _headers, body, type = 'application/json', encoding, timeout = 5 * 1000, auth, cors, raw = false, full = false, } = options;
+    let { method, retries, } = options;
     url = new URL(url, location.href);
     if (queries)
         for (const key in queries) {
@@ -61,10 +62,10 @@ export async function request(url, { method, queries, headers: _headers, body, t
         else
             for (const key in _headers)
                 if (!key.startsWith(':') && !key.startsWith('sec-') && !drop_request_headers.has(key)) { // 可能在 http/2 的 response 中会有这样开头的保留 headers, 在透传时忽略比较好
-                    assert(key === key.toLowerCase(), t('传入 request 的 headers 参数中 key 应该都是小写的，实际为 {{key}}', { key }));
+                    assert(key === key.toLowerCase(), `传入 request 的 headers 参数中 key 应该都是小写的，实际为 ${key}`);
                     headers.set(key, _headers[key]);
                 }
-    let options = {
+    let fetch_options = {
         ...method ? { method } : {},
         keepalive: true,
         redirect: 'follow',
@@ -102,33 +103,39 @@ export async function request(url, { method, queries, headers: _headers, body, t
     };
     let response;
     try {
-        response = await fetch_retry(url, options, timeout, retries);
+        response = await fetch_retry(url, fetch_options, timeout, retries);
         if (!response.ok)
             throw Object.assign(new Error(t('状态码 {{status}}, 非 2xx', { status: response.status })), { name: 'StatusCodeError' });
     }
     catch (error) {
+        ;
         error.url = url;
         error.options = options;
         if (response)
             error.response = {
                 status: response.status,
-                url: response.url,
                 headers: response.headers,
-                ok: response.ok,
-                type: response.type,
-                text: await response.text(),
-                redirected: response.redirected
+                body: await response.text(),
             };
         throw error;
     }
     if (raw)
         return response;
-    if (!response.body)
-        return response.body;
-    if (encoding === 'binary')
-        return response.arrayBuffer();
-    else
-        return response.text();
+    const body_ = await (async () => {
+        if (!response.body)
+            return encoding === 'binary' ? new ArrayBuffer(0) : '';
+        if (encoding === 'binary')
+            return response.arrayBuffer();
+        else
+            return response.text();
+    })();
+    return full ? {
+        status: response.status,
+        headers: response.headers,
+        body: body_
+    }
+        :
+            body_;
 }
 /** 发起 http 请求并将响应体作为 json 解析 */
 export async function request_json(url, options) {

package/net.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
-import type { FormData, Headers, Response, RequestInit } from 'undici';
+/// <reference types="node" resolution-mode="require"/>
+import type { Readable } from 'stream';
+import type { FormData } from 'undici';
 import type { WebSocket, CloseEvent, ErrorEvent } from 'ws';
 import type { Cookie, CookieJar, MemoryCookieStore } from 'tough-cookie';
 declare module 'tough-cookie' {
@@ -10,7 +12,7 @@ declare module 'tough-cookie' {
 import './prototype.js';
 import type { Encoding } from './file.js';
 import { inspect, Lock } from './utils.js';
-export type { WebSocket, Headers };
+export type { WebSocket };
 export declare const WebSocketConnecting = 0;
 export declare const WebSocketOpen = 1;
 export declare const WebSocketClosing = 2;
@@ -23,9 +25,18 @@ export declare const cookies: {
     store: MemoryCookieStore;
     jar: CookieJar;
     init(): Promise<void>;
-    get(domain_or_url: string, str?: boolean): Cookie[] | Promise<Cookie[] | string>;
 };
 export type { Cookie };
+export interface RawResponse {
+    status: number;
+    headers: Record<string, string>;
+    body: Readable;
+}
+export interface FullResponse<TBody extends Buffer | string> {
+    status: number;
+    headers: Record<string, string>;
+    body: TBody;
+}
 export interface BasicAuth {
     type: 'basic';
     username: string;
@@ -38,8 +49,8 @@ export interface BearerAuth {
 export interface RequestOptions {
     method?: 'GET' | 'POST' | 'PUT' | 'HEAD' | 'DELETE' | 'PATCH';
     queries?: Record<string, any>;
-    headers?: Record<string, string> | Headers;
-    body?: string | Record<string, any> | NodeJS.ArrayBufferView | ArrayBuffer | AsyncIterable<Uint8Array> | Iterable<Uint8Array> | URLSearchParams | FormData;
+    headers?: Record<string, string>;
+    body?: string | Record<string, any> | Uint8Array | URLSearchParams | FormData;
     type?: 'application/json' | 'application/x-www-form-urlencoded' | 'multipart/form-data';
     proxy?: boolean | MyProxy | string;
     encoding?: Encoding | 'binary';
@@ -49,22 +60,16 @@ export interface RequestOptions {
     cookies?: Record<string, string>;
     redirect?: RequestRedirect;
 }
+export interface RequestFullOptions extends RequestOptions {
+    full: true;
+}
 export interface RequestRawOptions extends RequestOptions {
     raw: true;
 }
 export interface RequestError extends Error {
     url: URL;
-    options: RequestInit;
-    response?: {
-        /** 状态码 */
-        status: number;
-        url: string;
-        headers: Headers;
-        ok: boolean;
-        type: ResponseType;
-        text: string;
-        redirected: boolean;
-    };
+    options: RequestOptions | RequestFullOptions | RequestRawOptions;
+    response?: FullResponse<string>;
     [inspect.custom]: Function;
 }
 /**
@@ -72,25 +77,34 @@ export interface RequestError extends Error {
     - options?:
         - method?: `有 body 时为 POST, 否则为 GET` 'GET' | 'POST' | ···
         - queries?: 添加到 url 上的参数，是 Record<string, any>，true/false 会被转换为 0/1
-        - headers?: http 请求头 (Record<string, string> 或者 Headers 类型)，其中 key 必须是小写的
-        - body?: http 请求体，可以是 string, Record<string, any> (会自动 JSON.stringify), ArrayBuffer(View), (Async)Iterable<Uint8Array>
-            URLSearchParams (type 为 x-www-form-urlencoded), FormData (type 为 form-data)
+        - headers?: http 请求头，是 Record<string, string>，其中 key 必须是小写的
+        - body?: http 请求体，可以是:
+            - string
+            - Uint8Array
+            - Record<string, any>: 会自动 JSON.stringify
+            - URLSearchParams: 仅限 type 为 x-www-form-urlencoded
+            - FormData: 仅限 type 为 form-data
         - type?: `'application/json'` 有 body 时设置 http 请求头中的 content-type 头
         - proxy?: `false`  通过代理发送请求
             - 为 true 时使用 MyProxy.socks5
             - 为非空 string 作为代理地址
             - 为 falsy 值时设为 false
-        - encoding?: `根据网页 content-type: charset=gb18030 提取 || 'utf-8'`  传入 'binary' 时返回 ArrayBuffer
+        - encoding?: `根据网页 content-type: charset=gb18030 提取 || 'utf-8'`  传入 'binary' 时返回 Buffer
         - retries?: `false` 可以传入 true (默认 2 次) 或 重试次数
         - timeout?: `5 * 1000`
         - auth?: BasicAuth | BearerAuth
         - cookies?: 需要额外添加到请求的 cookies, 默认情况下携带了 MemoryCookieStore 中保存的之前 http 响应中的 cookies
-        - raw?: `false` 传入后返回整个 response */
+        - raw?: `false` 传入后返回整个 response (RawResponse)，body 为 Readable
+        - full?: `false` 传入后返回整个 response (FullResponse)，body 根据 encoding 对应为 string 或 Buffer */
 export declare function request(url: string | URL): Promise<string>;
-export declare function request(url: string | URL, options: RequestRawOptions): Promise<Response>;
+export declare function request(url: string | URL, options: RequestRawOptions): Promise<RawResponse>;
+export declare function request(url: string | URL, options: RequestFullOptions & {
+    encoding: 'binary';
+}): Promise<FullResponse<Buffer>>;
+export declare function request(url: string | URL, options: RequestFullOptions): Promise<FullResponse<string>>;
 export declare function request(url: string | URL, options: RequestOptions & {
     encoding: 'binary';
-}): Promise<ArrayBuffer>;
+}): Promise<Buffer>;
 export declare function request(url: string | URL, options: RequestOptions): Promise<string>;
 /** 发起 http 请求并将响应体作为 json 解析 */
 export declare function request_json<T = any>(url: string | URL, options?: RequestOptions): Promise<T>;

package/net.js

@@ -1,6 +1,8 @@
+import zlib from 'zlib';
+import { buffer as stream_to_buffer, text as stream_to_text } from 'stream/consumers';
 import { t } from './i18n/instance.js';
 import './prototype.js';
-import { inspect, concat, assert, genid, delay, Lock, encode, decode } from './utils.js';
+import { inspect, concat, assert, genid, delay, Lock, encode, decode, pipe_with_error, map_values, unique } from './utils.js';
 export const WebSocketConnecting = 0;
 export const WebSocketOpen = 1;
 export const WebSocketClosing = 2;
@@ -20,20 +22,6 @@ export const cookies = {
         const { MemoryCookieStore, CookieJar } = await import('tough-cookie');
         this.jar = new CookieJar(this.store = new MemoryCookieStore());
     },
-    get(domain_or_url, str = false) {
-        if (domain_or_url.startsWith('http'))
-            if (str)
-                return this.jar.getCookieString(domain_or_url);
-            else
-                return this.jar.getCookies(domain_or_url);
-        let cookies;
-        this.store.findCookies(domain_or_url, null, true, (error, _cookies) => {
-            if (error)
-                throw error;
-            cookies = _cookies;
-        });
-        return cookies;
-    },
 };
 /** 对于 request() 函数来说无意义的 headers，会自动过滤掉 */
 const drop_request_headers = new Set([
@@ -48,30 +36,31 @@ const drop_request_headers = new Set([
     'upgrade',
 ]);
 let proxy_agents = {};
-let fetch_cookie;
-async function fetch_retry(url, options, timeout, retries = 0, count = 0) {
-    const { fetch } = await import('undici');
-    const { default: make_fetch_cookie } = await import('fetch-cookie');
-    await cookies.init();
-    fetch_cookie ||= make_fetch_cookie(fetch, cookies.jar, false);
+async function request_retry(url, options, timeout, retries = 0, count = 0) {
+    const { request: undici_request } = await import('undici');
     try {
         options.signal = AbortSignal.timeout(timeout);
-        return await fetch_cookie(url, options);
+        return await undici_request(url, options);
     }
     catch (error) {
-        if (count >= retries ||
-            error.name !== 'TimeoutError' && !['ECONNRESET', 'ETIMEDOUT', 'ESOCKETTIMEDOUT'].includes(error.cause?.code))
-            throw error;
-        else {
+        if (count < retries && (error.name === 'AbortError' || error.name === 'TimeoutError')) {
             const duration = 2 ** count;
             console.log(`${t('等待 {{duration}} 秒后重试 fetch ({{_count}}) …', { duration, _count: count }).yellow}  ${url.toString().blue.underline}`);
             await delay(1000 * duration);
-            return fetch_retry(url, options, timeout, retries, count + 1);
+            return request_retry(url, options, timeout, retries, count + 1);
         }
+        else if (error.name === 'AbortError' || error.name === 'TimeoutError')
+            throw Object.assign(new Error(`request 超时: ${url.toString()}`), { name: 'TimeoutError' });
+        else
+            throw error;
     }
 }
-export async function request(url, { method, queries, headers: _headers, body, type = 'application/json', proxy, encoding, retries, timeout = 5 * 1000, auth, cookies: _cookies, raw = false, redirect = 'follow', } = {}) {
-    const { Headers, ProxyAgent, FormData } = await import('undici');
+export async function request(url, options = {}) {
+    const { ProxyAgent, FormData } = await import('undici');
+    const { Cookie } = await import('tough-cookie');
+    await cookies.init();
+    const { queries, headers: _headers, body, type = 'application/json', timeout = 5 * 1000, auth, cookies: _cookies, raw = false, full = false, redirect = 'follow', } = options;
+    let { method, retries, encoding, proxy, } = options;
     url = new URL(url);
     if (queries)
         for (const key in queries) {
@@ -80,38 +69,46 @@ export async function request(url, { method, queries, headers: _headers, body, t
                 value = value ? '1' : '0';
             url.searchParams.append(key, value);
         }
+    const urlstr = url.toString();
     if (body !== undefined && !method)
         method = 'POST';
     if (retries === true)
         retries = 2;
     // --- headers, http/2 开始都用小写的 headers
-    let headers = new Headers({
+    let headers = {
         'accept-language': 'zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7,ja-JP;q=0.6,ja;q=0.5',
-        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
+        'accept-encoding': 'gzip, deflate, br',
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
         'sec-ch-ua-platform': '"Windows"',
         'sec-ch-ua-platform-version': '"15.0.0"',
-    });
+    };
     if (body !== undefined)
-        headers.set('content-type', type);
+        headers['content-type'] = type;
     if (auth)
-        headers.set('authorization', auth.type === 'basic' ? `Basic ${`${auth.username}:${auth.password}`.to_base64()}` : `Bearer ${auth.token}`);
-    if (_cookies)
-        headers.set('cookie', Object.entries(_cookies)
-            .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
-            .join('; '));
-    if (_headers)
-        if (_headers instanceof Headers)
-            for (const [key, value] of _headers) {
-                if (!key.startsWith(':') && !key.startsWith('sec-') && !drop_request_headers.has(key))
-                    headers.set(key, value);
+        headers.authorization = auth.type === 'basic' ?
+            `Basic ${`${auth.username}:${auth.password}`.to_base64()}`
+            :
+                `Bearer ${auth.token}`;
+    const request_cookies = unique([
+        ...cookies.jar.getCookiesSync(urlstr),
+        ..._cookies ?
+            Object.entries(_cookies).map(([key, value]) => new Cookie({ key, value }))
+            :
+                []
+    ], 'key');
+    if (request_cookies.length)
+        headers.cookie = request_cookies.map(cookie => cookie.cookieString())
+            .join('; ');
+    if (_headers) {
+        assert(Object.getPrototypeOf(_headers)?.constructor.name !== 'Headers');
+        for (const key in _headers)
+            // 可能在 http/2 的 response 中会有这样开头的保留 headers, 在透传时忽略比较好
+            if (!key.startsWith(':') && !key.startsWith('sec-') && !drop_request_headers.has(key)) {
+                assert(key === key.toLowerCase(), t('传入 request 的 headers 参数中 key 应该都是小写的，实际为 {{key}}', { key }));
+                headers[key] = _headers[key];
             }
-        else
-            for (const key in _headers)
-                if (!key.startsWith(':') && !key.startsWith('sec-') && !drop_request_headers.has(key)) { // 可能在 http/2 的 response 中会有这样开头的保留 headers, 在透传时忽略比较好
-                    assert(key === key.toLowerCase(), t('传入 request 的 headers 参数中 key 应该都是小写的，实际为 {{key}}', { key }));
-                    headers.set(key, _headers[key]);
-                }
-    let options = {
+    }
+    let undici_options = {
         ...method ? { method } : {},
         dispatcher: (() => {
             if (proxy) {
@@ -120,27 +117,29 @@ export async function request(url, { method, queries, headers: _headers, body, t
                 return proxy_agents[proxy] ??= new ProxyAgent({ uri: proxy });
             }
         })(),
-        keepalive: true,
-        redirect,
-        maxRedirect: 6,
-        credentials: 'include',
+        // todo: 强制手动处理重定向，来正确处理 cookie ?
+        maxRedirections: redirect === 'follow' ? 5 : 0,
+        // 下面这些 timeout 都不是总的时间，没法用
+        // headersTimeout: timeout - 1000,
+        // 从收完 headers 开始算
+        // bodyTimeout: timeout - 1000,
+        // @ts-ignore 没有类型声明，实际可用
+        // connectTimeout: timeout - 1000,
         headers,
         // --- body
         body: (() => {
             if (body === undefined)
                 return;
             switch (type) {
-                case 'application/json':
-                    return typeof body === 'string' ||
-                        ArrayBuffer.isView(body) ||
-                        body instanceof ArrayBuffer ||
-                        // 测试 Iterable<Uint8Array>, AsyncIterable<Uint8Array>
-                        (!Array.isArray(body) && (Symbol.iterator in Object(body) || Symbol.asyncIterator in Object(body))) ?
-                        body
-                        :
-                            JSON.stringify(body);
+                case 'application/json': // 可能的类型 string | Record<string, any> | Uint8Array
+                    if (typeof body === 'string')
+                        return body;
+                    if (body instanceof Uint8Array)
+                        return body;
+                    assert(!(body instanceof ArrayBuffer || ArrayBuffer.isView(body)));
+                    return JSON.stringify(body);
                 case 'application/x-www-form-urlencoded':
-                    return body instanceof URLSearchParams ? body : new URLSearchParams(body);
+                    return (body instanceof URLSearchParams ? body : new URLSearchParams(body)).toString();
                 case 'multipart/form-data':
                     if (body instanceof FormData)
                         return body;
@@ -157,29 +156,64 @@ export async function request(url, { method, queries, headers: _headers, body, t
     };
     let response;
     try {
-        response = await fetch_retry(url, options, timeout, retries);
-        if (!(response.ok || (redirect === 'manual' && 300 <= response.status && response.status < 400)))
+        const { statusCode: status, headers: _headers, body: _body } = await request_retry(url, undici_options, timeout, retries);
+        // 处理 cookie，自动保存到 cookie jar
+        let _cookies = _headers['set-cookie'] || [];
+        if (typeof _cookies === 'string')
+            _cookies = [_cookies];
+        _cookies.map(cookie => cookies.jar.setCookieSync(cookie, urlstr, { ignoreError: true }));
+        const headers = map_values(_headers, value => Array.isArray(value) ? value.join(', ') : (value || ''));
+        // UndiciResponse.body 没有自动根据 content-encoding 来解码，这里手动处理并替换 body 为解码后的 stream
+        let body = _body;
+        const content_encoding = headers['content-encoding']?.trim().toLowerCase();
+        if (content_encoding) {
+            assert(!content_encoding.includes(','));
+            switch (content_encoding) {
+                case 'gzip':
+                case 'x-gzip':
+                    body = pipe_with_error(_body, zlib.createGunzip({
+                        // Be less strict when decoding compressed responses, since sometimes
+                        // servers send slightly invalid responses that are still accepted
+                        // by common browsers.
+                        // Always using Z_SYNC_FLUSH is what cURL does.
+                        flush: zlib.constants.Z_SYNC_FLUSH,
+                        finishFlush: zlib.constants.Z_SYNC_FLUSH
+                    }));
+                    break;
+                case 'deflate':
+                    body = pipe_with_error(_body, zlib.createInflate());
+                    break;
+                case 'br':
+                    body = pipe_with_error(_body, zlib.createBrotliDecompress());
+                    break;
+                default:
+                    throw new Error(t('不支持 content-encoding: {{encoding}} 的 http 请求', { encoding: content_encoding.quote() }));
+            }
+        }
+        response = {
+            status,
+            headers,
+            body
+        };
+        if (!((200 <= status && status <= 299) || (redirect === 'manual' && 300 <= status && status < 400)))
             throw Object.assign(new Error(t('状态码 {{status}} 非 2xx', { status: response.status })), { name: 'StatusCodeError' });
     }
     catch (error) {
+        ;
         error.url = url;
         error.options = options;
         if (response)
             error.response = {
                 status: response.status,
-                url: response.url,
                 headers: response.headers,
-                ok: response.ok,
-                type: response.type,
-                text: await response.text(),
-                redirected: response.redirected
+                body: await stream_to_text(response.body),
             };
         error[inspect.custom] = (depth, options, inspect) => {
             const { colors } = options;
             let _method = method || 'GET';
             if (colors)
                 _method = _method.red;
-            let _url = url.toString();
+            let _url = urlstr;
             if (colors)
                 _url = _url.blue.underline;
             let s = '\n' +
@@ -218,14 +252,16 @@ export async function request(url, { method, queries, headers: _headers, body, t
                 if (colors)
                     _headers = _headers.yellow;
                 s += _headers + '\n';
-                for (const [key, value] of response.headers)
+                for (const key in response.headers) {
+                    const value = response.headers[key];
                     s += `${key}: ${value}\n`;
-                if (error.response.text) {
+                }
+                if (error.response.body) {
                     let _body = t('响应体:');
                     if (colors)
                         _body = _body.yellow;
                     s += _body + '\n' +
-                        error.response.text + '\n';
+                        error.response.body + '\n';
                 }
             }
             let _stack = t('调用栈:');
@@ -242,27 +278,35 @@ export async function request(url, { method, queries, headers: _headers, body, t
     }
     if (raw)
         return response;
-    if (!response.body)
-        return response.body;
-    // --- decode body
-    if (encoding === 'binary')
-        return response.arrayBuffer();
-    encoding ||= /charset=(.*)/.exec(response.headers.get('content-type'))?.[1] || 'utf-8';
-    if (/utf-?8/i.test(encoding))
-        return response.text();
-    return new TextDecoder(encoding)
-        .decode(await response.arrayBuffer());
+    const body_ = await (async () => {
+        if (!response.body)
+            return encoding === 'binary' ? Buffer.from([]) : '';
+        if (encoding === 'binary')
+            return stream_to_buffer(response.body);
+        encoding ||= /charset=(.*)/.exec(response.headers['content-type'])?.[1] || 'utf-8';
+        if (/utf-?8/i.test(encoding))
+            return stream_to_text(response.body);
+        return new TextDecoder(encoding)
+            .decode(await stream_to_buffer(response.body));
+    })();
+    return full ? {
+        status: response.status,
+        headers: response.headers,
+        body: body_
+    }
+        :
+            body_;
 }
 /** 发起 http 请求并将响应体作为 json 解析 */
 export async function request_json(url, options) {
-    const resp = await request(url, options);
-    if (!resp)
+    const body = await request(url, options);
+    if (!body)
         return;
     try {
-        return JSON.parse(resp);
+        return JSON.parse(body);
     }
     catch (error) {
-        console.error(resp);
+        console.error(body);
         throw error;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.78",
+    "version": "1.0.80",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -53,9 +53,9 @@
         ]
     },
     "dependencies": {
-        "@babel/core": "^7.23.6",
+        "@babel/core": "^7.23.7",
         "@babel/parser": "^7.23.6",
-        "@babel/traverse": "^7.23.6",
+        "@babel/traverse": "^7.23.7",
         "@koa/cors": "^5.0.0",
         "@types/ws": "^8.5.10",
         "ali-oss": "^6.19.0",
@@ -68,20 +68,19 @@
         "colors": "^1.4.0",
         "commander": "^11.1.0",
         "emoji-regex": "^10.3.0",
-        "fetch-cookie": "^2.1.0",
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
-        "i18next": "^23.7.11",
+        "i18next": "^23.7.13",
         "i18next-scanner": "^4.4.0",
         "js-cookie": "^3.0.5",
-        "koa": "^2.14.2",
+        "koa": "^2.15.0",
         "koa-compress": "^5.1.1",
         "lodash": "^4.17.21",
         "map-stream": "0.0.7",
         "mime-types": "^2.1.35",
-        "ora": "^7.0.1",
+        "ora": "^8.0.1",
         "react": "^18.2.0",
-        "react-i18next": "^13.5.0",
+        "react-i18next": "^14.0.0",
         "react-object-model": "^1.2.1",
         "resolve-path": "^1.4.0",
         "strip-ansi": "^7.1.0",
@@ -90,10 +89,10 @@
         "tslib": "^2.6.2",
         "typescript": "^5.3.3",
         "ua-parser-js": "2.0.0-alpha.2",
-        "undici": "^6.0.1",
+        "undici": "^6.2.1",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
-        "ws": "^8.15.1",
+        "ws": "^8.16.0",
         "xterm": "^5.3.0",
         "xterm-addon-fit": "^0.8.0",
         "xterm-addon-web-links": "^0.9.0",
@@ -103,7 +102,7 @@
         "@babel/types": "^7.23.6",
         "@types/ali-oss": "^6.16.11",
         "@types/archiver": "^6.0.2",
-        "@types/babel__traverse": "^7.20.4",
+        "@types/babel__traverse": "^7.20.5",
         "@types/byte-size": "^8.1.2",
         "@types/chardet": "^0.8.3",
         "@types/gulp-sort": "2.0.4",
@@ -112,15 +111,15 @@
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.14.202",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^20.10.5",
-        "@types/react": "^18.2.45",
+        "@types/node": "^20.10.6",
+        "@types/react": "^18.2.46",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",
         "@types/vinyl-fs": "^3.0.5",
         "@types/vscode": "^1.85.0",
-        "@typescript-eslint/eslint-plugin": "^6.14.0",
-        "@typescript-eslint/parser": "^6.14.0",
+        "@typescript-eslint/eslint-plugin": "^6.17.0",
+        "@typescript-eslint/parser": "^6.17.0",
         "eslint": "^8.56.0",
         "eslint-plugin-react": "^7.33.2",
         "eslint-plugin-xlint": "^1.0.11"
@@ -128,7 +127,7 @@
     "pnpm": {
         "patchedDependencies": {
             "@types/byte-size@8.1.2": "patches/@types__byte-size@8.1.2.patch",
-            "koa@2.14.2": "patches/koa@2.14.2.patch"
+            "koa@2.15.0": "patches/koa@2.15.0.patch"
         }
     }
 }

package/prototype.browser.d.ts

@@ -93,9 +93,19 @@ declare global {
     interface Date {
         /** - ms?: `false` 显示到 ms */
         to_str(this: Date, ms?: boolean): string;
+        /** 格式化为 2024.01.01 这样的日期 */
         to_date_str(this: Date): string;
-        /** - ms?: `false` 显示到 ms */
+        /** 格式化为 早上 09:00:00 这样的十二小时制可读友好的时间
+            - ms?: `false` 显示到 ms */
         to_time_str(this: Date, ms?: boolean): string;
+        /** 格式化为 17.00.00 这样的时间 */
+        to_dot_time_str(this: Date, ms?: boolean): string;
+        /** 格式化为 2024.01.01 17.00.00 这样的时间 */
+        to_dot_str(this: Date, ms?: boolean): string;
+        /** 格式化为 17:00:00 这样的时间 */
+        to_formal_time_str(this: Date, ms?: boolean): string;
+        /** 格式化为 2024.01.01 17:00:00 这样的时间 */
+        to_formal_str(this: Date, ms?: boolean): string;
     }
     interface Number {
         /** 12.4 KB (1 KB = 1024 B) */

package/prototype.browser.js

@@ -316,50 +316,62 @@ Object.defineProperties(String.prototype, {
 // ------------------------------------ Date.prototype
 Object.defineProperties(Date.prototype, to_method_property_descriptors({
     to_str(ms) {
-        const [ampm, hour] = (() => {
-            let hour = this.getHours();
-            if (hour <= 6)
-                return [t('凌晨'), hour];
-            if (hour <= 8)
-                return [t('清晨'), hour];
-            if (hour <= 9)
-                return [t('早上'), hour];
-            if (hour <= 10)
-                return [t('上午'), hour];
-            if (hour <= 12)
-                return [t('中午'), hour];
-            hour -= 12;
-            if (hour <= 5)
-                return [t('下午'), hour];
-            if (hour <= 10)
-                return [t('晚上'), hour];
-            return [t('深夜'), hour];
-        })();
-        const zero_padding = { character: '0', position: 'left' };
-        return '' +
-            // year.month.date
-            this.getFullYear() + '.' +
-            String(this.getMonth() + 1).pad(2, zero_padding) + '.' +
-            String(this.getDate()).pad(2, zero_padding) + ' ' +
-            // 上午
-            ampm + ' ' +
-            // 10:03:02
-            String(hour).pad(2, zero_padding) + ':' +
-            String(this.getMinutes()).pad(2, zero_padding) + ':' +
-            String(this.getSeconds()).pad(2, zero_padding) +
-            (ms ?
-                '.' + String(this.getMilliseconds()).pad(3, zero_padding)
-                :
-                    '');
+        return `${this.to_date_str()} ${this.to_time_str(ms)}`;
     },
     to_date_str() {
-        return this.to_str().split(' ')[0];
+        // 2024.01.01
+        return this.getFullYear() + '.' +
+            String(this.getMonth() + 1).padStart(2, '0') + '.' +
+            String(this.getDate()).padStart(2, '0');
     },
     to_time_str(ms) {
-        const [, ampm, time] = this.to_str(ms).split(' ');
-        return `${ampm} ${time}`;
+        // 早上 09:00:00
+        const [ampm, hour] = get_twelve_hour_clock(this);
+        return `${ampm} ${get_time_str(this, hour, ms, ':')}`;
     },
+    to_dot_time_str(ms) {
+        // 17.03.02
+        return get_time_str(this, this.getHours(), ms, '.');
+    },
+    to_dot_str(ms) {
+        return `${this.to_date_str()} ${this.to_dot_time_str(ms)}`;
+    },
+    to_formal_time_str(ms) {
+        // 17:03:02
+        return get_time_str(this, this.getHours(), ms, ':');
+    },
+    to_formal_str(ms) {
+        return `${this.to_date_str()} ${this.to_formal_time_str(ms)}`;
+    }
 }));
+function get_twelve_hour_clock(date) {
+    let hour = date.getHours();
+    if (hour <= 6)
+        return [t('凌晨'), hour];
+    if (hour <= 8)
+        return [t('清晨'), hour];
+    if (hour <= 9)
+        return [t('早上'), hour];
+    if (hour <= 10)
+        return [t('上午'), hour];
+    if (hour <= 12)
+        return [t('中午'), hour];
+    hour -= 12;
+    if (hour <= 5)
+        return [t('下午'), hour];
+    if (hour <= 10)
+        return [t('晚上'), hour];
+    return [t('深夜'), hour];
+}
+function get_time_str(date, hour, ms, splitter) {
+    return String(hour).padStart(2, '0') + splitter +
+        String(date.getMinutes()).padStart(2, '0') + splitter +
+        String(date.getSeconds()).padStart(2, '0') +
+        (ms ?
+            '.' + String(date.getMilliseconds()).padStart(3, '0')
+            :
+                '');
+}
 // ------------------------------------ Number.prototype
 Object.defineProperties(Number.prototype, to_method_property_descriptors({
     to_fsize_str(units = 'iec') {

package/prototype.d.ts

@@ -116,9 +116,19 @@ declare global {
     interface Date {
         /** - ms?: `false` 显示到 ms */
         to_str(this: Date, ms?: boolean): string;
+        /** 格式化为 2024.01.01 这样的日期 */
         to_date_str(this: Date): string;
-        /** - ms?: `false` 显示到 ms */
+        /** 格式化为 早上 09:00:00 这样的十二小时制可读友好的时间
+            - ms?: `false` 显示到 ms */
         to_time_str(this: Date, ms?: boolean): string;
+        /** 格式化为 17.00.00 这样的时间 */
+        to_dot_time_str(this: Date, ms?: boolean): string;
+        /** 格式化为 2024.01.01 17.00.00 这样的时间 */
+        to_dot_str(this: Date, ms?: boolean): string;
+        /** 格式化为 17:00:00 这样的时间 */
+        to_formal_time_str(this: Date, ms?: boolean): string;
+        /** 格式化为 2024.01.01 17:00:00 这样的时间 */
+        to_formal_str(this: Date, ms?: boolean): string;
     }
     interface Number {
         /** 12.4 KB (1 KB = 1024 B) */

package/prototype.js

@@ -342,50 +342,62 @@ if (!globalThis.my_prototype_defined) {
     // ------------------------------------ Date.prototype
     Object.defineProperties(Date.prototype, to_method_property_descriptors({
         to_str(ms) {
-            const [ampm, hour] = (() => {
-                let hour = this.getHours();
-                if (hour <= 6)
-                    return [t('凌晨'), hour];
-                if (hour <= 8)
-                    return [t('清晨'), hour];
-                if (hour <= 9)
-                    return [t('早上'), hour];
-                if (hour <= 10)
-                    return [t('上午'), hour];
-                if (hour <= 12)
-                    return [t('中午'), hour];
-                hour -= 12;
-                if (hour <= 5)
-                    return [t('下午'), hour];
-                if (hour <= 10)
-                    return [t('晚上'), hour];
-                return [t('深夜'), hour];
-            })();
-            const zero_padding = { character: '0', position: 'left' };
-            return '' +
-                // year.month.date
-                this.getFullYear() + '.' +
-                String(this.getMonth() + 1).pad(2, zero_padding) + '.' +
-                String(this.getDate()).pad(2, zero_padding) + ' ' +
-                // 上午
-                ampm + ' ' +
-                // 10:03:02
-                String(hour).pad(2, zero_padding) + ':' +
-                String(this.getMinutes()).pad(2, zero_padding) + ':' +
-                String(this.getSeconds()).pad(2, zero_padding) +
-                (ms ?
-                    '.' + String(this.getMilliseconds()).pad(3, zero_padding)
-                    :
-                        '');
+            return `${this.to_date_str()} ${this.to_time_str(ms)}`;
         },
         to_date_str() {
-            return this.to_str().split(' ')[0];
+            // 2024.01.01
+            return this.getFullYear() + '.' +
+                String(this.getMonth() + 1).padStart(2, '0') + '.' +
+                String(this.getDate()).padStart(2, '0');
         },
         to_time_str(ms) {
-            const [, ampm, time] = this.to_str(ms).split(' ');
-            return `${ampm} ${time}`;
+            // 早上 09:00:00
+            const [ampm, hour] = get_twelve_hour_clock(this);
+            return `${ampm} ${get_time_str(this, hour, ms, ':')}`;
         },
+        to_dot_time_str(ms) {
+            // 17.03.02
+            return get_time_str(this, this.getHours(), ms, '.');
+        },
+        to_dot_str(ms) {
+            return `${this.to_date_str()} ${this.to_dot_time_str(ms)}`;
+        },
+        to_formal_time_str(ms) {
+            // 17:03:02
+            return get_time_str(this, this.getHours(), ms, ':');
+        },
+        to_formal_str(ms) {
+            return `${this.to_date_str()} ${this.to_formal_time_str(ms)}`;
+        }
     }));
+    function get_twelve_hour_clock(date) {
+        let hour = date.getHours();
+        if (hour <= 6)
+            return [t('凌晨'), hour];
+        if (hour <= 8)
+            return [t('清晨'), hour];
+        if (hour <= 9)
+            return [t('早上'), hour];
+        if (hour <= 10)
+            return [t('上午'), hour];
+        if (hour <= 12)
+            return [t('中午'), hour];
+        hour -= 12;
+        if (hour <= 5)
+            return [t('下午'), hour];
+        if (hour <= 10)
+            return [t('晚上'), hour];
+        return [t('深夜'), hour];
+    }
+    function get_time_str(date, hour, ms, splitter) {
+        return String(hour).padStart(2, '0') + splitter +
+            String(date.getMinutes()).padStart(2, '0') + splitter +
+            String(date.getSeconds()).padStart(2, '0') +
+            (ms ?
+                '.' + String(date.getMilliseconds()).padStart(3, '0')
+                :
+                    '');
+    }
     // ------------------------------------ Number.prototype
     Object.defineProperties(Number.prototype, to_method_property_descriptors({
         to_fsize_str(units = 'iec') {

package/server.d.ts

@@ -4,7 +4,7 @@
 /// <reference types="node" resolution-mode="require"/>
 import { type Server as HttpServer, type IncomingHttpHeaders, type IncomingMessage } from 'http';
 import { type Http2SecureServer, type IncomingHttpHeaders as IncomingHttp2Headers } from 'http2';
-import { type Duplex } from 'stream';
+import type { Duplex } from 'stream';
 import type { WebSocketServer } from 'ws';
 import type { default as Koa, Context, Next } from 'koa';
 declare module 'koa' {
@@ -18,7 +18,7 @@ declare module 'koa' {
     }
 }
 import type { UAParser } from 'ua-parser-js';
-import { Remote, type Headers, type RequestOptions } from './net.js';
+import { Remote, type RequestOptions, type RawResponse } from './net.js';
 declare module 'http' {
     interface IncomingMessage {
         body?: Buffer;
@@ -93,7 +93,7 @@ export declare class Server {
     process_ua(ctx: Context): string;
     format_ua(headers: IncomingHttpHeaders | IncomingHttp2Headers): string;
     proxy(ctx: Context, url: string | URL, headers_?: Record<string, string>, redirect?: RequestOptions['redirect']): Promise<void>;
-    static filter_response_headers(headers: Headers): {};
+    static filter_response_headers(headers: RawResponse['headers']): Record<string, string>;
     /** 提供静态文件
         @example
         const prefix_docs = '/zh/'

package/server.js

@@ -3,12 +3,12 @@ import { createSecureServer as http2_create_server } from 'http2';
 import { createSecureContext } from 'tls';
 import zlib from 'zlib';
 import { createReadStream } from 'fs';
-import { Readable } from 'stream';
+import { buffer as stream_to_buffer } from 'stream/consumers';
 import util from 'util';
 // --- my libs
 import { t } from './i18n/instance.js';
 import { request as _request, Remote } from './net.js';
-import { stream_to_buffer, inspect, output_width, assert, range_to_numbers, encode } from './utils.js';
+import { inspect, output_width, assert, range_to_numbers, encode, filter_keys } from './utils.js';
 import { flist, fread, fstat } from './file.js';
 // ------------ my server
 export class Server {
@@ -451,20 +451,20 @@ export class Server {
             response.status = response_.status;
             response.set(Server.filter_response_headers(response_.headers));
             if (response_.body)
-                response.body = Readable.fromWeb(response_.body);
+                response.body = response_.body;
         }
         catch (error) {
             if (error.response?.status !== 404)
                 console.log(error);
             if (error.response) {
-                const { status, headers, text } = error.response;
+                const { status, headers, body } = error.response;
                 if (status === 404)
                     console.log(method, '404:', url);
                 else
                     console.log(error);
                 response.status = status;
                 response.set(Server.filter_response_headers(headers));
-                response.body = text;
+                response.body = body;
             }
             else {
                 console.log(error);
@@ -474,11 +474,7 @@ export class Server {
         }
     }
     static filter_response_headers(headers) {
-        let headers_ = {};
-        for (const [key, value] of headers)
-            if (!key.startsWith(':') && !this.drop_response_headers.has(key))
-                headers_[key] = value;
-        return headers_;
+        return filter_keys(headers, key => !key.startsWith(':') && !this.drop_response_headers.has(key));
     }
     /** 提供静态文件
         @example

package/utils.browser.d.ts

@@ -56,7 +56,7 @@ export declare function encode(str: string): Uint8Array;
     在流式处理 (buffer 可能不完整) 时，应使用独立的 TextDecoder 实例调用 decode(buffer, { stream: true }) */
 export declare function decode(buffer: Uint8Array): string;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 0 | 1 | -1;
+export declare function strcmp(l: string, r: string): 1 | 0 | -1;
 /** 比较 1.10.02 这种版本号 */
 export declare function vercmp(l: string, r: string): number;
 export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;

package/utils.d.ts

@@ -19,10 +19,20 @@ export declare function dedent(templ: TemplateStringsArray | string, ...values:
     - selector?: 可以是 key (string) 或 (obj: any) => any
 */
 export declare function unique<T>(iterable: T[] | Iterable<T>, selector?: string | ((obj: T) => any)): any[];
-/** 排序对象中 key 的顺序，返回新的对象 */
-export declare function sort_keys<T>(obj: T): T;
+/** 排序对象中 keys 的顺序，返回新的对象 */
+export declare function sort_keys<TObj>(obj: TObj): TObj;
+/** 映射对象中的 keys, 返回新对象 */
+export declare function map_keys<TObj>(obj: TObj, mapper: (key: string) => string): TObj;
+/** 映射对象中的 values, 返回新对象 */
+export declare function map_values<TValue, TNewValue>(obj: {
+    [key: string]: TValue;
+}, mapper: (value: TValue, key: string) => TNewValue): {
+    [k: string]: TNewValue;
+};
+/** 映射对象中的 keys, 返回新对象 */
+export declare function filter_keys<TObj>(obj: TObj, filter: (key: string) => any): TObj;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 0 | 1 | -1;
+export declare function strcmp(l: string, r: string): 1 | 0 | -1;
 /** 比较 1.10.02 这种版本号 */
 export declare function vercmp(l: string, r: string): number;
 export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;
@@ -126,8 +136,8 @@ export declare namespace inspect {
 export declare function map_stream<Out, In = Vinyl>(mapper: (obj: In, cb: Function) => any, options?: {
     failures?: boolean;
 }): Duplex;
-export declare function stream_to_buffer(stream: Readable): Promise<Buffer>;
 export declare function stream_to_lines(stream: Readable): AsyncGenerator<string, void, unknown>;
+export declare function pipe_with_error(readable: Readable, transform: Transform): Transform;
 export declare class WritableMemoryStream extends Writable {
     chunks: Buffer[];
     pbuffer: Deferred<Buffer>;

package/utils.js

@@ -77,11 +77,26 @@ export function unique(iterable, selector) {
         map.set(is_str_selector ? x[selector] : selector(x), x);
     return [...map.values()];
 }
-/** 排序对象中 key 的顺序，返回新的对象 */
+/** 排序对象中 keys 的顺序，返回新的对象 */
 export function sort_keys(obj) {
     return Object.fromEntries(Object.entries(obj)
         .sort(([key_l], [key_r]) => strcmp(key_l, key_r)));
 }
+/** 映射对象中的 keys, 返回新对象 */
+export function map_keys(obj, mapper) {
+    return Object.fromEntries(Object.entries(obj)
+        .map(([key, value]) => [mapper(key), value]));
+}
+/** 映射对象中的 values, 返回新对象 */
+export function map_values(obj, mapper) {
+    return Object.fromEntries(Object.entries(obj)
+        .map(([key, value]) => [key, mapper(value, key)]));
+}
+/** 映射对象中的 keys, 返回新对象 */
+export function filter_keys(obj, filter) {
+    return Object.fromEntries(Object.entries(obj)
+        .filter(([key, value]) => filter(key)));
+}
 /** 字符串字典序比较 */
 export function strcmp(l, r) {
     if (l === r)
@@ -444,12 +459,6 @@ export function map_stream(mapper, options) {
     }
     return stream;
 }
-export async function stream_to_buffer(stream) {
-    let chunks = [];
-    for await (const chunk of stream)
-        chunks.push(chunk);
-    return Buffer.concat(chunks);
-}
 export async function* stream_to_lines(stream) {
     let buf = '';
     for await (const chunk of stream) {
@@ -466,6 +475,11 @@ export async function* stream_to_lines(stream) {
         buf = chunk.slice(j);
     }
 }
+export function pipe_with_error(readable, transform) {
+    // 不知道 transform 作为 AsyncIterable 使用时， emit error 是否会在 for await (...) 循环中触发错误
+    readable.once('error', error => { transform.emit('error', error); });
+    return readable.pipe(transform);
+}
 export class WritableMemoryStream extends Writable {
     chunks = [];
     pbuffer = defer();