xshell 1.3.51 → 1.3.52

package/file.d.ts

@@ -282,5 +282,5 @@ export declare function fp_sorter(l: {
     fp: string;
 }, r: {
     fp: string;
-}): 1 | 0 | -1;
+}): 0 | 1 | -1;
 export declare function log_action(action: string, fp_src: string, fp_dst: string, sep?: string): void;

package/net.d.ts

@@ -37,7 +37,7 @@ export interface RequestOptions {
     queries?: Record<string, any>;
     headers?: Record<string, string>;
     body?: string | Record<string, any> | Uint8Array | URLSearchParams | Readable;
-    type?: 'application/json' | 'application/x-www-form-urlencoded' | 'multipart/form-data' | 'application/jose+json';
+    type?: 'application/json' | 'application/x-www-form-urlencoded' | 'multipart/form-data' | 'application/jose+json' | 'text/plain';
     proxy?: boolean | ValueOf<typeof MyProxy> | string;
     encoding?: Encoding | 'binary';
     retries?: true | number;

package/net.js

@@ -269,10 +269,16 @@ function get_request_body(body, type) {
         if (body instanceof Uint8Array)
             return body;
         check(!(body instanceof ArrayBuffer || ArrayBuffer.isView(body)));
-        return JSON.stringify(body);
+        return encode(JSON.stringify(body));
     }
     if (type === 'application/x-www-form-urlencoded')
         return encode((body instanceof URLSearchParams ? body : new URLSearchParams(body)).toString());
+    if (type === 'text/plain') {
+        if (typeof body === 'string')
+            return encode(body);
+        check(body instanceof Uint8Array);
+        return body;
+    }
     check(type === 'multipart/form-data');
     // undici.FormData 会和 globalThis.FormData 不一致，禁止传入 FormData 类型
     let form = new undici.FormData();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.3.51",
+    "version": "1.3.52",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -56,9 +56,9 @@
         "@stylistic/eslint-plugin": "^5.10.0",
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.10",
-        "@typescript-eslint/eslint-plugin": "^8.57.2",
-        "@typescript-eslint/parser": "^8.57.2",
-        "@typescript-eslint/utils": "^8.57.2",
+        "@typescript-eslint/eslint-plugin": "^8.58.0",
+        "@typescript-eslint/parser": "^8.58.0",
+        "@typescript-eslint/utils": "^8.58.0",
         "archiver": "^7.0.1",
         "chalk": "^5.6.2",
         "commander": "^14.0.3",
@@ -66,7 +66,7 @@
         "emoji-regex": "^10.6.0",
         "eslint": "^10.1.0",
         "eslint-plugin-react": "^7.37.5",
-        "https-proxy-agent": "^8.0.0",
+        "https-proxy-agent": "^9.0.0",
         "i18next": "25.8.1",
         "i18next-scanner": "^4.6.0",
         "koa": "^3.2.0",
@@ -75,7 +75,7 @@
         "mime-types": "^3.0.2",
         "p-map": "^7.0.4",
         "react": "^19.2.4",
-        "react-i18next": "^17.0.1",
+        "react-i18next": "^17.0.2",
         "resolve-path": "^1.4.0",
         "sass": "^1.98.0",
         "sass-loader": "^16.0.7",
@@ -86,7 +86,7 @@
         "ts-loader": "^9.5.4",
         "tslib": "^2.8.1",
         "typescript": "^6.0.2",
-        "undici": "^7.24.6",
+        "undici": "^7.24.7",
         "webpack": "^5.105.4",
         "webpack-bundle-analyzer": "^5.3.0",
         "ws": "^8.20.0"

package/utils.common.d.ts

@@ -21,7 +21,7 @@ export declare function seq<T = number>(n: number, generator?: (index: number) =
     - mapper?: 可以是 key (string, number, symbol) 或 (obj: any) => any */
 export declare function unique<TObj>(iterable: TObj[] | Iterable<TObj>, mapper?: keyof TObj | Mapper<TObj>): TObj[];
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 1 | 0 | -1;
+export declare function strcmp(l: string, r: string): 0 | 1 | -1;
 /** 排序对象中 keys 的顺序，返回新的对象 */
 export declare function sort_keys<TObj>(obj: TObj): TObj;
 /** 比较 1.10.02 这种版本号
@@ -193,3 +193,5 @@ 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;
+export declare function has_chinese(str: string): boolean;
+export declare function fold_spaces(str: string): string;

package/utils.common.js

@@ -634,4 +634,11 @@ export function nowstr(with_date = false) {
     const date = new Date();
     return with_date ? date.to_str() : date.to_time_str();
 }
+export function has_chinese(str) {
+    return /[\u4E00-\u9FA5]/.test(str);
+}
+export function fold_spaces(str) {
+    return str.replaceAll(/[^\S\n]+/g, ' ')
+        .replaceAll(/\n(?: ?\n)+/g, '\n');
+}
 //# sourceMappingURL=utils.common.js.map

package/utils.d.ts

@@ -12,7 +12,6 @@ export declare function typed_array_to_buffer(view: ArrayBufferView): Buffer<Arr
 export declare function log_line(): void;
 export declare function sha256(data: string | Uint8Array): string;
 export declare function sha1(data: string | Uint8Array): string;
-export declare function has_chinese(str: string): boolean;
 export declare function escape_line_feed(str: string): string;
 /** util.inspect(obj)
     - options

package/utils.js

@@ -37,9 +37,6 @@ export function sha256(data) {
 export function sha1(data) {
     return ncrypto.hash('sha1', data);
 }
-export function has_chinese(str) {
-    return /[\u4E00-\u9FA5]/.test(str);
-}
 export function escape_line_feed(str) {
     return str.replace(/\n/g, '\\n');
 }