xshell 1.4.2 → 1.4.4

package/net.d.ts

@@ -42,7 +42,6 @@ export interface RequestOptions {
     retries?: true | number;
     timeout?: number;
     auth?: BasicAuth | BearerAuth;
-    cookies?: Record<string, string>;
     redirect?: 'follow' | 'manual';
     decode?: boolean;
     dryrun?: boolean;
@@ -94,7 +93,6 @@ export declare class StatusCodeError extends Error {
         - retries?: `false` 可以传入 true (默认 2 次) 或 重试次数
         - timeout?: `5 * 1000` 超时后会抛出 error.name 为 'TimeoutError' 的 error (但类型不是 utils.ts 中的 TimeoutError), 可以传入 0 来禁用超时
         - auth?: BasicAuth | BearerAuth
-        - cookies?: 需要额外添加到请求的 cookies, 默认情况下携带了 MemoryCookieStore 中保存的之前 http 响应中的 cookies
         - raw?: `false` 传入后返回整个 response (RawResponse)，body 为 Readable
         - full?: `false` 传入后返回整个 response (FullResponse)，body 根据 encoding 对应为 string 或 Buffer
         - decode?: `true` 根据 content-encoding: br 等解码压缩后的 response.body

package/net.js

@@ -3,7 +3,7 @@ import net from 'node:net';
 import { buffer as stream_to_buffer, text as stream_to_text } from 'node:stream/consumers';
 import { pipeline, isReadable } from 'node:stream';
 import { noop } from './prototype.js';
-import { inspect, assert, delay, map_values, unique, timeout, check, colored, encode, TimeoutError, set_error_message, defer2, nowstr } from './utils.js';
+import { inspect, assert, delay, map_values, timeout, check, colored, encode, TimeoutError, set_error_message, defer2, nowstr } from './utils.js';
 import { drop_request_headers } from './net.common.js';
 export * from './net.common.js';
 export const MyProxy = {
@@ -70,9 +70,8 @@ export class StatusCodeError extends Error {
 }
 export async function request(url, options = {}) {
     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, dryrun, ua, browser: browser_ua, signal, print = {
+    const { queries, headers: _headers, body, type = 'application/json', timeout = 5 * 1000, auth, raw = false, full = false, redirect = 'follow', decode = true, dryrun, ua, browser: browser_ua, signal, print = {
         timeout: true,
         retry: true
     } } = options;
@@ -114,16 +113,6 @@ export async function request(url, options = {}) {
             `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) {
         check(Object.getPrototypeOf(_headers)?.constructor.name !== 'Headers');
         for (const key in _headers)
@@ -155,11 +144,6 @@ export async function request(url, options = {}) {
     let response;
     try {
         const { statusCode: status, headers: _headers, body: _body } = await request_retry(url, undici_options, timeout, retries, 0, print);
-        // 处理 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;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.4.2",
+    "version": "1.4.4",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -79,7 +79,6 @@
         "rollup-plugin-visualizer": "^7.0.1",
         "sass": "^1.101.0",
         "strip-ansi": "^7.2.0",
-        "tough-cookie": "^6.0.1",
         "typescript": "^6.0.3",
         "undici": "^8.5.0",
         "ws": "^8.21.0"