xshell 1.3.0 → 1.3.2

package/apps.js

@@ -1,4 +1,4 @@
-import util from 'util';
+import util from 'node:util';
 import { call_nodejs, platform, username } from "./process.js";
 export let npm = {
     bin: platform == 'win32' ? `C:/Users/${username}/AppData/Roaming/npm/node_modules/pnpm/bin/pnpm.cjs` : '/usr/bin/pnpm',

package/builder.js

@@ -1,8 +1,8 @@
-import { fileURLToPath } from 'url';
+import { fileURLToPath } from 'node:url';
 import { not_empty } from "./prototype.js";
 import { noprint } from "./process.js";
 import { Lock, filter_values } from "./utils.js";
-import { fcopy, fmkdir, fwrite, fread, print_info } from "./file.js";
+import { fcopy, fmkdir, fwrite, fread, print_info, ramdisk } from "./file.js";
 import { path } from "./path.js";
 function get_react_js(production, src, map) {
     return `${src ? import.meta.dirname.fpd : 'vendors/react/'}react.${production ? 'production' : 'development'}.js${map ? '.map' : ''}`;
@@ -472,8 +472,12 @@ export class Bundler {
                             const { BundleAnalyzerPlugin } = await import('webpack-bundle-analyzer');
                             return [
                                 new BundleAnalyzerPlugin({
-                                    analyzerPort: 8880,
+                                    analyzerMode: 'static',
                                     openAnalyzer: false,
+                                    reportFilename: ramdisk ?
+                                        `T:/t/webpack-analysis/${this.name}.html`
+                                        :
+                                            'report.html'
                                 })
                             ];
                         })() : [],

package/development.js

@@ -1,4 +1,4 @@
-import process from 'process';
+import process from 'node:process';
 import { fcopy, fexists, ramdisk } from "./file.js";
 import { noprint } from "./process.js";
 /** 监听终端按键 (输入)，并调用 key_processor 处理

package/file.d.ts

@@ -1,4 +1,4 @@
-import { promises as fsp, default as fs } from 'fs';
+import { promises as fsp, default as fs } from 'node:fs';
 import type { UnzipFileFilter } from './fflate.ts';
 export { fsp };
 export type Encoding = 'utf-8' | 'gb18030' | 'shift-jis' | 'utf-16le';
@@ -208,11 +208,15 @@ export interface FMkdirOptions {
 export declare function fmkdir(fpd: string, { print }?: FMkdirOptions): Promise<string>;
 /** 创建软链接
     - fp_real: 现在真实文件/文件夹的路径
-    - fp_link: 目标链接文件/文件夹的路径 */
-export declare function flink(fp_real: string, fp_link: string, { junction, print, skip_existing }?: {
-    junction?: boolean;
-    print?: boolean;
+    - fp_link: 目标链接文件/文件夹的路径
+    - options?:
+        - skip_existing?: `false` 忽略已存在的同名的文件，文件夹
+        - print?: `true`
+        - junction? */
+export declare function flink(fp_real: string, fp_link: string, { skip_existing, print, junction }?: {
     skip_existing?: boolean;
+    print?: boolean;
+    junction?: boolean;
 }): Promise<void>;
 export interface ZipOptions {
     dirname?: string;

package/file.js

@@ -1,4 +1,4 @@
-import { promises as fsp, default as fs } from 'fs';
+import { promises as fsp, default as fs } from 'node:fs';
 import { isArrayBuffer, isUint8Array } from 'util/types';
 import { t } from "./i18n/instance.js";
 import { noop, to_json } from "./prototype.js";
@@ -456,8 +456,12 @@ export async function fmkdir(fpd, { print = true } = {}) {
 }
 /** 创建软链接
     - fp_real: 现在真实文件/文件夹的路径
-    - fp_link: 目标链接文件/文件夹的路径 */
-export async function flink(fp_real, fp_link, { junction = false, print = true, skip_existing = false } = {}) {
+    - fp_link: 目标链接文件/文件夹的路径
+    - options?:
+        - skip_existing?: `false` 忽略已存在的同名的文件，文件夹
+        - print?: `true`
+        - junction? */
+export async function flink(fp_real, fp_link, { skip_existing = false, print = true, junction = false } = {}) {
     check(path.isAbsolute(fp_real) && path.isAbsolute(fp_link), 'fp 必须是绝对路径');
     const is_fpd_real = fp_real.isdir;
     const is_fpd_link = fp_link.isdir;

package/net.browser.js

@@ -1,5 +1,5 @@
 import { t } from "./i18n/instance.js";
-import { assert, delay } from "./utils.browser.js";
+import { assert, check, delay } from "./utils.browser.js";
 import { drop_request_headers } from "./net.common.js";
 export * from "./net.common.js";
 async function fetch_retry(url, options, timeout, retries = 0, count = 0) {
@@ -63,33 +63,7 @@ export async function request(url, options = {}) {
         ...cors ? { mode: 'cors' } : {},
         headers,
         // --- body
-        body: (() => {
-            if (body === undefined)
-                return;
-            switch (type) {
-                case 'application/json':
-                    return typeof body === 'string' ||
-                        ArrayBuffer.isView(body) ||
-                        body instanceof ArrayBuffer ||
-                        body instanceof Blob ?
-                        body
-                        :
-                            JSON.stringify(body);
-                case 'application/x-www-form-urlencoded':
-                    return body instanceof URLSearchParams ? body : new URLSearchParams(body);
-                case 'multipart/form-data':
-                    if (body instanceof FormData)
-                        return body;
-                    else {
-                        let form = new FormData();
-                        for (const key in body) {
-                            let value = body[key];
-                            form.set(key, value);
-                        }
-                        return form;
-                    }
-            }
-        })(),
+        body: get_request_body(body, type),
     };
     let response;
     try {
@@ -111,14 +85,7 @@ export async function request(url, options = {}) {
     }
     if (raw)
         return response;
-    const body_ = await (async () => {
-        if (!response.body)
-            return encoding === 'binary' ? new ArrayBuffer(0) : '';
-        if (encoding === 'binary')
-            return response.arrayBuffer();
-        else
-            return response.text();
-    })();
+    const body_ = await get_response_body(response, encoding);
     return full ? {
         status: response.status,
         headers: response.headers,
@@ -127,6 +94,37 @@ export async function request(url, options = {}) {
         :
             body_;
 }
+function get_request_body(body, type) {
+    if (body === undefined)
+        return;
+    if (type === 'application/json') {
+        return typeof body === 'string' ||
+            ArrayBuffer.isView(body) ||
+            body instanceof ArrayBuffer ||
+            body instanceof Blob ?
+            body
+            :
+                JSON.stringify(body);
+    }
+    if (type === 'application/x-www-form-urlencoded')
+        return body instanceof URLSearchParams ? body : new URLSearchParams(body);
+    check(type === 'multipart/form-data');
+    if (body instanceof FormData)
+        return body;
+    let form = new FormData();
+    for (const key in body) {
+        let value = body[key];
+        form.set(key, value);
+    }
+    return form;
+}
+async function get_response_body(response, encoding) {
+    if (!response.body)
+        return encoding === 'binary' ? new ArrayBuffer(0) : '';
+    if (encoding === 'binary')
+        return response.arrayBuffer();
+    return response.text();
+}
 /** 发起 http 请求并将响应体作为 json 解析 */
 export async function request_json(url, options) {
     const body = await request(url, options);

package/net.common.d.ts

@@ -100,6 +100,8 @@ export interface RemoteOptions {
     /** 使用者自定义的在 websocket 连接出错时，或者 handlers 出错时的处理
         用户设置后会覆盖默认的 print 错误功能 */
     on_error?(error: WebSocketConnectionError | Error, remote: Remote): void;
+    /** 使用者自定义的，在重连之前调用的函数，比如可以修改 url，仅连接发起方有效 */
+    on_reconnect?(this: Remote): Promise<void>;
 }
 /** 通过创建 remote 对象对 websocket rpc 进行抽象
     使用 remote.call() 进行一元 rpc
@@ -146,10 +148,11 @@ export declare class Remote {
     error: WebSocketConnectionError | Error;
     /** 作为 websocket 连接发起方，传入 url
         作为 websocket 连接接收方，传入 websocket + name */
-    constructor({ name, url, websocket, funcs, print, verbose, probe, args, on_error, }?: RemoteOptions);
+    constructor({ name, url, websocket, funcs, print, verbose, probe, args, on_error, on_reconnect }?: RemoteOptions);
     /** 统一处理首次连接和连接后的 websocket 错误 */
     _on_error: (error: WebSocketConnectionError | Error) => void;
-    reconnect: () => void;
+    on_reconnect?: (this: Remote) => Promise<void>;
+    reconnect: () => Promise<void>;
     _on_message: (data: ArrayBuffer) => void;
     /** 使用者自定义的在 websocket 连接出错时，或者 handlers 出错时的处理
         用户设置后会覆盖默认的 print 错误功能 */

package/net.common.js

@@ -238,12 +238,14 @@ export class Remote {
     error;
     /** 作为 websocket 连接发起方，传入 url
         作为 websocket 连接接收方，传入 websocket + name */
-    constructor({ name, url, websocket, funcs, print, verbose, probe, args, on_error, } = {}) {
+    constructor({ name, url, websocket, funcs, print, verbose, probe, args, on_error, on_reconnect } = {}) {
         if (name)
             this.name = name;
         if (url) {
             check(!websocket, '构建 Remote 时 url 和 websocket 只能传其中一个');
             this.url = url;
+            if (on_reconnect)
+                this.on_reconnect = on_reconnect;
         }
         else { // 连接接收方，一定是 nodejs 环境
             check(websocket, '构建 Remote 时需传入 url 或者 websocket');
@@ -308,13 +310,16 @@ export class Remote {
             !this.reconnecting &&
             this.url &&
             (this.funcs || this.probe)) {
-            this.reconnecting = setTimeout(this.reconnect, this.error ? 10_000 : 2_000);
+            this.reconnecting = setTimeout(this.reconnect, this.error ? 20_000 : 2_000);
             this.error = error;
         }
         this.on_error(error, this);
     };
-    reconnect = () => {
+    on_reconnect;
+    reconnect = async () => {
         this.reconnecting = null;
+        if (this.on_reconnect)
+            await this.on_reconnect();
         this.try_connect();
     };
     _on_message = (data) => {

package/net.d.ts

@@ -1,4 +1,4 @@
-import { type Readable } from 'stream';
+import { type Readable } from 'node:stream';
 import type { Cookie, CookieJar, MemoryCookieStore } from 'tough-cookie';
 import type { Encoding } from './file.ts';
 import { inspect } from './utils.ts';
@@ -48,6 +48,7 @@ export interface RequestOptions {
         retry: boolean;
         timeout: boolean;
     };
+    long_connection?: true;
 }
 export interface RequestFullOptions extends RequestOptions {
     full: true;
@@ -96,7 +97,8 @@ export declare class StatusCodeError extends Error {
         - decode?: `true` 根据 content-encoding: br 等解码压缩后的 response.body
         - print?:
             - retry: `true` 是否打印 "等待 1 秒后重试 request" 提示信息
-            - timeout: `true` 是否打印最后一次超时重试失败时的错误  */
+            - timeout: `true` 是否打印最后一次超时重试失败时的错误
+        - long_connection?: 用于保持长 tcp 连接，保留 nat 端口映射记录 */
 export declare function request(url: string | URL): Promise<string>;
 export declare function request(url: string | URL, options: RequestRawOptions): Promise<RawResponse>;
 export declare function request(url: string | URL, options: RequestFullOptions & {

package/net.js

@@ -1,7 +1,7 @@
-import zlib from 'zlib';
-import { buffer as stream_to_buffer, text as stream_to_text } from 'stream/consumers';
-import { isReadable } from 'stream';
-import { inspect, assert, delay, pipe_with_error, map_values, unique, timeout, check, colored } from "./utils.js";
+import zlib from 'node:zlib';
+import { buffer as stream_to_buffer, text as stream_to_text } from 'node:stream/consumers';
+import { isReadable } from 'node:stream';
+import { inspect, assert, delay, pipe_with_error, map_values, unique, timeout, check, colored, encode } from "./utils.js";
 import { drop_request_headers } from "./net.common.js";
 export * from "./net.common.js";
 export var MyProxy;
@@ -24,9 +24,9 @@ export const cookies = {
         this.jar = new CookieJar(this.store = new MemoryCookieStore());
     },
 };
-let agents = {};
+let undici;
+let dispatchers = {};
 async function request_retry(url, options, _timeout, retries = 0, count = 0, print) {
-    const { default: undici } = await import('undici');
     try {
         if (_timeout > 0) {
             // 设置给 undici 设置 timeout, signal 不一定管用，还是得自己兜底
@@ -65,15 +65,13 @@ export class StatusCodeError extends Error {
     }
 }
 export async function request(url, options = {}) {
-    let { default: undici, ProxyAgent: UndiciProxyAgent, FormData: UndiciFormData } = await import('undici');
-    UndiciProxyAgent ??= undici.ProxyAgent;
-    UndiciFormData ??= undici.FormData;
+    undici ??= (await import('undici')).default;
     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', decode = true, print = {
         timeout: true,
         retry: true
-    } } = options;
+    }, long_connection } = options;
     let { method, retries, encoding, proxy, } = options;
     url = new URL(url);
     if (queries)
@@ -126,23 +124,11 @@ export async function request(url, options = {}) {
                 headers[key] = _headers[key];
             }
     }
+    if (proxy === true)
+        proxy = MyProxy.socks5;
     let undici_options = {
         ...method ? { method } : {},
-        dispatcher: await (async () => {
-            const { default: { 
-            // @ts-ignore
-            ProxyAgent, Agent, interceptors } } = await import('undici');
-            if (proxy === true)
-                proxy = MyProxy.socks5;
-            return agents[`${proxy || 'direct'}.${redirect}`] ??= (() => {
-                let dispatcher = proxy ? new ProxyAgent({ uri: proxy }) : new Agent();
-                if (redirect === 'follow')
-                    dispatcher = dispatcher.compose(
-                    // todo: 强制手动处理重定向，来正确处理 cookie ?
-                    interceptors.redirect({ maxRedirections: 5 }));
-                return dispatcher;
-            })();
-        })(),
+        dispatcher: get_dispatcher(proxy, redirect, long_connection),
         // 下面这些 timeout 都不是总的时间
         headersTimeout: timeout,
         // 从收完 headers 开始算
@@ -150,30 +136,7 @@ export async function request(url, options = {}) {
         // @ts-ignore 没有类型声明，实际可用
         connectTimeout: timeout,
         headers,
-        // --- body
-        body: (() => {
-            if (body === undefined)
-                return;
-            if (typeof body?.read === 'function' && isReadable(body))
-                return body;
-            switch (type) {
-                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)).toString();
-                case 'multipart/form-data': {
-                    let form = new UndiciFormData();
-                    for (const key in body)
-                        form.set(key, body[key]);
-                    return form;
-                }
-            }
-        })()
+        body: get_request_body(body, type)
     };
     let response;
     try {
@@ -265,25 +228,62 @@ export async function request(url, options = {}) {
     }
     if (raw)
         return response;
-    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_
-    }
+    const body_ = await get_response_body(response.body, encoding, response.headers);
+    return full ?
+        { status: response.status, headers: response.headers, body: body_ }
         :
             body_;
 }
+function get_dispatcher(proxy, redirect, long_connection) {
+    const key = `${proxy || (long_connection ? 'direct.long' : 'direct')}.${redirect}`;
+    let dispatcher = dispatchers[key];
+    if (dispatcher)
+        return dispatcher;
+    dispatcher = proxy ?
+        // @ts-ignore
+        new undici.ProxyAgent({ uri: proxy })
+        :
+            new undici.Agent({ keepAliveTimeout: long_connection ? 30_000 : undefined });
+    if (redirect === 'follow')
+        dispatcher = dispatcher.compose(
+        // todo: 强制手动处理重定向，来正确处理 cookie ?
+        undici.interceptors.redirect({ maxRedirections: 5 }));
+    return dispatchers[key] = dispatcher;
+}
+function get_request_body(body, type) {
+    if (body === undefined)
+        return undefined;
+    if (typeof body?.read === 'function' && isReadable(body))
+        return body;
+    if (type === 'application/json') {
+        // 可能的类型 string | Record<string, any> | Uint8Array
+        if (typeof body === 'string')
+            return encode(body);
+        if (body instanceof Uint8Array)
+            return body;
+        check(!(body instanceof ArrayBuffer || ArrayBuffer.isView(body)));
+        return JSON.stringify(body);
+    }
+    if (type === 'application/x-www-form-urlencoded')
+        return encode((body instanceof URLSearchParams ? body : new URLSearchParams(body)).toString());
+    check(type === 'multipart/form-data');
+    // undici.FormData 会和 globalThis.FormData 不一致，禁止传入 FormData 类型
+    let form = new undici.FormData();
+    for (const key in body)
+        form.set(key, body[key]);
+    return form;
+}
+async function get_response_body(body, encoding, headers) {
+    if (!body)
+        return encoding === 'binary' ? Buffer.from([]) : '';
+    if (encoding === 'binary')
+        return stream_to_buffer(body);
+    encoding ||= /charset=(.*)/.exec(headers['content-type'])?.[1] || 'utf-8';
+    if (/utf-?8/i.test(encoding))
+        return stream_to_text(body);
+    return new TextDecoder(encoding)
+        .decode(await stream_to_buffer(body));
+}
 /** 发起 http 请求并将响应体作为 json 解析 */
 export async function request_json(url, options) {
     const body = await request(url, options);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.3.0",
+    "version": "1.3.2",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -64,7 +64,7 @@
         "commander": "^14.0.2",
         "css-loader": "^7.1.2",
         "emoji-regex": "^10.6.0",
-        "eslint": "^9.38.0",
+        "eslint": "^9.39.0",
         "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-react": "^7.37.5",
         "https-proxy-agent": "^7.0.6",
@@ -76,9 +76,9 @@
         "mime-types": "^3.0.1",
         "p-map": "^7.0.3",
         "react": "^19.2.0",
-        "react-i18next": "^16.2.1",
+        "react-i18next": "^16.2.3",
         "resolve-path": "^1.4.0",
-        "sass": "^1.93.2",
+        "sass": "^1.93.3",
         "sass-loader": "^16.0.6",
         "source-map-loader": "^5.0.0",
         "strip-ansi": "^7.1.2",

package/path.d.ts

@@ -54,7 +54,7 @@ export declare function extname(path: string): string;
 /** `/` */
 export declare const sep = "/";
 /** The platform-specific file delimiter. ';' or ':'. */
-export declare const delimiter: ";" | ":";
+export declare const delimiter: ":" | ";";
 /** Returns an object from a path string - the opposite of format().
     @param path path to evaluate.
     @throws {TypeError} if `path` is not a string. */
@@ -81,7 +81,7 @@ export declare let path: {
     basename: typeof basename;
     extname: typeof extname;
     sep: string;
-    delimiter: ";" | ":";
+    delimiter: ":" | ";";
     parse: typeof parse;
     format: typeof format;
     toNamespacedPath: typeof toNamespacedPath;

package/platform.common.d.ts

@@ -1,4 +1,4 @@
-import type { TimerOptions } from 'timers';
+import type { TimerOptions } from 'node:timers';
 import type { HttpsProxyAgent } from 'https-proxy-agent';
 export declare let platform: Platform;
 export declare function set_platform(_platform: Platform): void;

package/process.d.ts

@@ -1,5 +1,5 @@
-import type { InspectOptions } from 'util';
-import { type ChildProcess } from 'child_process';
+import type { InspectOptions } from 'node:util';
+import { type ChildProcess } from 'node:child_process';
 import './prototype.ts';
 import { type Encoding } from './file.ts';
 import type { MyProxy } from './net.ts';

package/process.js

@@ -1,5 +1,5 @@
-import { spawn } from 'child_process';
-import os from 'os';
+import { spawn } from 'node:child_process';
+import os from 'node:os';
 import node_sea from 'node:sea';
 import "./prototype.js";
 import { fopen } from "./file.js";

package/prototype.js

@@ -1,4 +1,4 @@
-import util from 'util';
+import util from 'node:util';
 import { platform } from "./platform.js";
 import { to_method_property_descriptors } from "./prototype.common.js";
 export * from "./prototype.common.js";

package/repl.js

@@ -6,8 +6,8 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     }
     return path;
 };
-import repl from 'repl';
-import process from 'process';
+import repl from 'node:repl';
+import process from 'node:process';
 import { fileURLToPath } from 'url';
 import { path } from "./path.js";
 import { t } from "./i18n/instance.js";

package/server.d.ts

@@ -1,6 +1,6 @@
-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 Server as HttpServer, type IncomingHttpHeaders, type IncomingMessage } from 'node:http';
+import { type Http2SecureServer, type IncomingHttpHeaders as IncomingHttp2Headers } from 'node:http2';
+import type { Duplex } from 'node:stream';
 import type { WebSocketServer } from 'ws';
 import { default as Koa, type Context, type Next } from 'koa';
 import { Remote, type RequestOptions, type RawResponse, type MessageHandler } from './net.ts';

package/server.js

@@ -1,9 +1,9 @@
-import { createServer as http_create_server, } from 'http';
-import { createSecureServer as http2_create_server } from 'http2';
-import { createSecureContext } from 'tls';
-import zlib from 'zlib';
-import fs from 'fs';
-import { buffer as stream_to_buffer } from 'stream/consumers';
+import { createServer as http_create_server, } from 'node:http';
+import { createSecureServer as http2_create_server } from 'node:http2';
+import { createSecureContext } from 'node:tls';
+import zlib from 'node:zlib';
+import fs from 'node:fs';
+import { buffer as stream_to_buffer } from 'node:stream/consumers';
 import node_sea from 'node:sea';
 import { default as Koa } from 'koa';
 import KoaCors from '@koa/cors';

package/utils.common.d.ts

@@ -1,4 +1,4 @@
-import type { TimerOptions } from 'timers';
+import type { TimerOptions } from 'node:timers';
 import { type Mapper } from './prototype.common.ts';
 export declare function delay(milliseconds: number, options?: TimerOptions): Promise<void>;
 export declare function assert<T>(assertion: T, message?: string): T;
@@ -124,6 +124,13 @@ export interface Deferred<TValue> extends Promise<TValue> {
     - initial?: `undefined` 传入非 undefined 值（包括 null）时直接设置为 resolved 状态
     注: 下面的方法不能标记为 aysnc function, 否则会对返回值再做一层 Promise.resolve() 导致 reject, resolve 属性丢失 */
 export declare function defer<TValue>(initial?: TValue): Deferred<TValue>;
+export interface Deferred2<TValue> extends Promise<TValue> {
+    resolve(value: TValue | PromiseLike<TValue>): void;
+    reject(reason?: Error): void;
+    get settled(): boolean;
+}
+/** 有 settled 状态的 defer */
+export declare function defer2<TValue>(initial?: TValue): Deferred2<TValue>;
 export interface LockedAction<TResource, TResult> {
     (resource: TResource): TResult | Promise<TResult>;
 }
@@ -166,3 +173,13 @@ export declare function tomorrow(date?: Date | string | number): Date;
 export declare function to_csv_field(str: string): string;
 /** 设置 error.message 同时更新 error.stack */
 export declare function set_error_message(error: Error, message: string): Error;
+/** 比较两个数组中的元素完全相同，数组元素用引用比较 */
+export declare function array_equals(a: any[], b: any[]): boolean;
+export declare function nowstr(with_date?: boolean): string;
+interface MyTimeout {
+    clear(): void;
+    ref: NodeJS.Timeout | number;
+}
+/** 面向对象的 timeout, callback 在后的 timeout */
+export declare function set_timeout(delay: number, callback: VoidFunction): MyTimeout;
+export {};

package/utils.common.js

@@ -396,6 +396,33 @@ export function defer(initial) {
             reject: noop
         });
 }
+/** 有 settled 状态的 defer */
+// eslint-disable-next-line @typescript-eslint/promise-function-async
+export function defer2(initial) {
+    if (initial === undefined) {
+        let settled = false;
+        let { promise, resolve, reject } = Promise.withResolvers();
+        return Object.assign(promise, {
+            resolve(value) {
+                settled = true;
+                resolve(value);
+            },
+            reject(error) {
+                settled = true;
+                reject(error);
+            },
+            get settled() {
+                return settled;
+            }
+        });
+    }
+    else
+        return Object.assign(Promise.resolve(initial), {
+            resolve: noop,
+            reject: noop,
+            settled: true
+        });
+}
 /** @example
     let lock = new Lock(redis)
     
@@ -537,4 +564,29 @@ export function set_error_message(error, message) {
         error.stack.slice_from('\n', { optional: true });
     return error;
 }
+/** 比较两个数组中的元素完全相同，数组元素用引用比较 */
+export function array_equals(a, b) {
+    if (!a && !b)
+        return true;
+    if (a && !b || !a && b)
+        return false;
+    return a.every((x, i) => x === b[i]);
+}
+export function nowstr(with_date = false) {
+    const date = new Date();
+    return with_date ? date.to_str() : date.to_time_str();
+}
+/** 面向对象的 timeout, callback 在后的 timeout */
+export function set_timeout(delay, callback) {
+    let ret = {
+        ref: setTimeout(callback, delay),
+        clear() {
+            if (!ret.ref)
+                return;
+            clearTimeout(ret.ref);
+            ret.ref = null;
+        }
+    };
+    return ret;
+}
 //# sourceMappingURL=utils.common.js.map

package/utils.d.ts

@@ -1,5 +1,5 @@
-import { Writable, Transform, type Readable, type Duplex, type TransformCallback } from 'stream';
-import util from 'util';
+import { Writable, Transform, type Readable, type Duplex, type TransformCallback } from 'node:stream';
+import util from 'node:util';
 import './prototype.ts';
 import './platform.ts';
 export * from './utils.common.ts';

package/utils.js

@@ -1,6 +1,6 @@
-import { Stream, Writable, Transform } from 'stream';
-import util from 'util';
-import ncrypto from 'crypto';
+import { Stream, Writable, Transform } from 'node:stream';
+import util from 'node:util';
+import ncrypto from 'node:crypto';
 import "./prototype.js";
 import "./platform.js";
 import { assert, decode, defer, delay } from "./utils.common.js";