xshell 1.0.111 → 1.0.113

package/i18n/index.js

@@ -6,7 +6,7 @@ export const LANGUAGES = ['zh', 'en', 'ja', 'ko'];
     @see https://github.com/ShenHongFei/xshell/tree/master/i18n
 */
 export class I18N {
-    static LANGUAGE_REGEXP = /^(zh|en|ja|jp|ko)$/;
+    static LANGUAGE_REGEXP = /^(zh|en|ja|ko)$/;
     /** (ISO 639-1 标准语言代码) 可能取 zh, en, ja, ko */
     language;
     /** hostname shortcuts */
@@ -81,8 +81,7 @@ export class I18N {
             fallbackLng: {
                 en: ['zh'],
                 ja: ['en', 'zh'],
-                ko: ['en', 'zh'],
-                default: ['en', 'zh']
+                ko: ['en', 'zh']
             },
             // 禁用 : 和 . 作为 seperator
             keySeparator: false,

package/net.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
-import type { Readable } from 'stream';
+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';
@@ -20,7 +20,7 @@ export declare const WebSocketClosed = 3;
 export declare enum MyProxy {
     socks5 = "http://localhost:10080",
     whistle = "http://localhost:8899",
-    work = "http://127.0.0.1:10090"
+    work = "http://localhost:10090"
 }
 export declare const cookies: {
     store: MemoryCookieStore;
@@ -51,7 +51,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;
+    body?: string | Record<string, any> | Uint8Array | URLSearchParams | FormData | Readable;
     type?: 'application/json' | 'application/x-www-form-urlencoded' | 'multipart/form-data';
     proxy?: boolean | MyProxy | string;
     encoding?: Encoding | 'binary';
@@ -60,6 +60,7 @@ export interface RequestOptions {
     auth?: BasicAuth | BearerAuth;
     cookies?: Record<string, string>;
     redirect?: RequestRedirect;
+    decode?: boolean;
 }
 export interface RequestFullOptions extends RequestOptions {
     full: true;
@@ -97,7 +98,8 @@ export interface RequestError extends Error {
         - auth?: BasicAuth | BearerAuth
         - cookies?: 需要额外添加到请求的 cookies, 默认情况下携带了 MemoryCookieStore 中保存的之前 http 响应中的 cookies
         - raw?: `false` 传入后返回整个 response (RawResponse)，body 为 Readable
-        - full?: `false` 传入后返回整个 response (FullResponse)，body 根据 encoding 对应为 string 或 Buffer */
+        - full?: `false` 传入后返回整个 response (FullResponse)，body 根据 encoding 对应为 string 或 Buffer
+        - decode?: 根据 content-encoding: br 等解码压缩后的 response.body */
 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,5 +1,6 @@
 import zlib from 'zlib';
 import { buffer as stream_to_buffer, text as stream_to_text } from 'stream/consumers';
+import { isReadable } from 'stream';
 import { t } from './i18n/instance.js';
 import './prototype.js';
 import { inspect, concat, assert, genid, delay, Lock, encode, decode, pipe_with_error, map_values, unique } from './utils.js';
@@ -11,7 +12,7 @@ export var MyProxy;
 (function (MyProxy) {
     MyProxy["socks5"] = "http://localhost:10080";
     MyProxy["whistle"] = "http://localhost:8899";
-    MyProxy["work"] = "http://127.0.0.1:10090";
+    MyProxy["work"] = "http://localhost:10090";
 })(MyProxy || (MyProxy = {}));
 // ------------------------------------ fetch, request
 export const cookies = {
@@ -62,7 +63,7 @@ export async function request(url, options = {}) {
     const { ProxyAgent: UndiciProxyAgent, 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;
+    const { queries, headers: _headers, body, type = 'application/json', timeout = 5 * 1000, auth, cookies: _cookies, raw = false, full = false, redirect = 'follow', decode = true, } = options;
     let { method, retries, encoding, proxy, } = options;
     url = new URL(url);
     if (queries)
@@ -133,6 +134,8 @@ export async function request(url, options = {}) {
         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')
@@ -169,7 +172,7 @@ export async function request(url, options = {}) {
         // UndiciResponse.body 没有自动根据 content-encoding 来解码，这里手动处理并替换 body 为解码后的 stream
         let body = _body;
         const content_encoding = headers['content-encoding']?.trim().toLowerCase();
-        if (content_encoding) {
+        if (decode && content_encoding) {
             assert(!content_encoding.includes(','));
             switch (content_encoding) {
                 case 'gzip':

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.111",
+    "version": "1.0.113",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -99,7 +99,7 @@
         "tslib": "^2.6.2",
         "typescript": "^5.4.5",
         "ua-parser-js": "^2.0.0-beta.2",
-        "undici": "^6.18.1",
+        "undici": "^6.18.2",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
         "ws": "^8.17.0"
@@ -118,7 +118,7 @@
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.17.4",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^20.12.12",
+        "@types/node": "^20.12.13",
         "@types/react": "^18.3.3",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",

package/utils.browser.d.ts

@@ -63,7 +63,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

@@ -39,7 +39,7 @@ export declare function filter_values<TObj extends Record<string, any>>(obj: TOb
 /** 忽略对象中的 keys, 返回新对象 */
 export declare function omit<TObj>(obj: TObj, omit_keys: string[]): 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;