xshell 1.2.46 → 1.2.47

package/net.d.ts

@@ -44,7 +44,7 @@ export interface RequestOptions {
     method?: 'GET' | 'POST' | 'PUT' | 'HEAD' | 'DELETE' | 'PATCH';
     queries?: Record<string, any>;
     headers?: Record<string, string>;
-    body?: string | Record<string, any> | Uint8Array | URLSearchParams | FormData | Readable;
+    body?: string | Record<string, any> | Uint8Array | URLSearchParams | Readable;
     type?: 'application/json' | 'application/x-www-form-urlencoded' | 'multipart/form-data';
     proxy?: boolean | MyProxy | string;
     encoding?: Encoding | 'binary';
@@ -89,7 +89,7 @@ export declare class StatusCodeError extends Error {
             - Uint8Array
             - Record<string, any>: 会自动 JSON.stringify
             - URLSearchParams: 仅限 type 为 x-www-form-urlencoded
-            - FormData: 仅限 type 为 form-data
+            - Record<string, string | Blob | File> 自动转为 FormData: 仅限 type 为 form-data, 可以传 File 对象设置文件名
         - type?: `'application/json'` 有 body 时设置 http 请求头中的 content-type 头
         - proxy?: `false`  通过代理发送请求
             - 为 true 时使用 MyProxy.socks5
@@ -103,7 +103,7 @@ export declare class StatusCodeError extends Error {
         - cookies?: 需要额外添加到请求的 cookies, 默认情况下携带了 MemoryCookieStore 中保存的之前 http 响应中的 cookies
         - raw?: `false` 传入后返回整个 response (RawResponse)，body 为 Readable
         - full?: `false` 传入后返回整个 response (FullResponse)，body 根据 encoding 对应为 string 或 Buffer
-        - decode?: 根据 content-encoding: br 等解码压缩后的 response.body
+        - decode?: `true` 根据 content-encoding: br 等解码压缩后的 response.body
         - print?:
             - retry: `true` 是否打印 "等待 1 秒后重试 request" 提示信息
             - timeout: `true` 是否打印最后一次超时重试失败时的错误  */
@@ -297,5 +297,5 @@ export declare class RemoteClient {
     [inspect.custom](): {
         remote: string;
         websocket: string;
-    } & Omit<this, "websocket" | typeof import("util").inspect.custom | "call" | "remote" | "send">;
+    } & Omit<this, typeof import("util").inspect.custom | "websocket" | "remote" | "call" | "send">;
 }

package/net.js

@@ -41,8 +41,7 @@ const drop_request_headers = new Set([
 ]);
 let agents = {};
 async function request_retry(url, options, _timeout, retries = 0, count = 0, print) {
-    let { default: undici, request: undici_request } = await import('undici');
-    undici_request ??= undici.request;
+    const { default: undici } = await import('undici');
     try {
         if (_timeout > 0) {
             // 设置给 undici 设置 timeout, signal 不一定管用，还是得自己兜底
@@ -81,9 +80,9 @@ export class StatusCodeError extends Error {
     }
 }
 export async function request(url, options = {}) {
-    let { default: undici, ProxyAgent: UndiciProxyAgent, FormData } = await import('undici');
+    let { default: undici, ProxyAgent: UndiciProxyAgent, FormData: UndiciFormData } = await import('undici');
     UndiciProxyAgent ??= undici.ProxyAgent;
-    FormData ??= undici.FormData;
+    UndiciFormData ??= undici.FormData;
     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 = {
@@ -108,11 +107,15 @@ export async function request(url, options = {}) {
     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',
         'accept-encoding': 'gzip, deflate, br',
-        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36',
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36',
         'sec-ch-ua-platform': '"Windows"',
-        'sec-ch-ua-platform-version': '"15.0.0"',
+        'sec-ch-ua-platform-version': '"19.0.0"',
     };
-    if (body !== undefined)
+    // https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest_API/Using_FormData_Objects
+    // When using FormData to submit POST requests using XMLHttpRequest or the Fetch API with the multipart/form-data content type (e.g., when uploading files and blobs to the server), 
+    // do not explicitly set the Content-Type header on the request. 
+    // Doing so will prevent the browser from being able to set the Content-Type header with the boundary expression it will use to delimit form fields in the request body.
+    if (body !== undefined && type !== 'multipart/form-data')
         headers['content-type'] = type;
     if (auth)
         headers.authorization = auth.type === 'basic' ?
@@ -178,17 +181,14 @@ export async function request(url, options = {}) {
                     return JSON.stringify(body);
                 case 'application/x-www-form-urlencoded':
                     return (body instanceof URLSearchParams ? body : new URLSearchParams(body)).toString();
-                case 'multipart/form-data':
-                    if (body && body[Symbol.toStringTag] === 'FormData')
-                        return body;
-                    else {
-                        let form = new FormData();
-                        for (const key in body)
-                            form.set(key, body[key]);
-                        return form;
-                    }
+                case 'multipart/form-data': {
+                    let form = new UndiciFormData();
+                    for (const key in body)
+                        form.set(key, body[key]);
+                    return form;
+                }
             }
-        })(),
+        })()
     };
     let response;
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.2.46",
+    "version": "1.2.47",
     "type": "module",
     "main": "./index.js",
     "bin": {

package/tsconfig.json

@@ -1,4 +1,8 @@
 {
+    "exclude": [
+        "./test.ts"
+    ],
+    
     "compilerOptions": {
         // --- module
         "module": "ESNext", // none, CommonJS, amd, system, umd, es6, es2015, ESNext