xshell 1.0.56 → 1.0.58

package/net.d.ts

@@ -47,6 +47,7 @@ export interface RequestOptions {
     timeout?: number;
     auth?: BasicAuth | BearerAuth;
     cookies?: Record<string, string>;
+    redirect?: RequestRedirect;
 }
 export interface RequestRawOptions extends RequestOptions {
     raw: true;

package/net.js

@@ -70,7 +70,7 @@ async function fetch_retry(url, options, timeout, retries = 0, count = 0) {
         }
     }
 }
-export async function request(url, { method, queries, headers: _headers, body, type = 'application/json', proxy, encoding, retries, timeout = 5 * 1000, auth, cookies: _cookies, raw = false, } = {}) {
+export async function request(url, { method, queries, headers: _headers, body, type = 'application/json', proxy, encoding, retries, timeout = 5 * 1000, auth, cookies: _cookies, raw = false, redirect = 'follow', } = {}) {
     const { Headers, ProxyAgent, FormData } = await import('undici');
     url = new URL(url);
     if (queries)
@@ -121,7 +121,7 @@ export async function request(url, { method, queries, headers: _headers, body, t
             }
         })(),
         keepalive: true,
-        redirect: 'follow',
+        redirect,
         maxRedirect: 6,
         credentials: 'include',
         headers,
@@ -158,7 +158,7 @@ export async function request(url, { method, queries, headers: _headers, body, t
     let response;
     try {
         response = await fetch_retry(url, options, timeout, retries);
-        if (!response.ok)
+        if (!(response.ok || (redirect === 'manual' && 300 <= response.status && response.status < 400)))
             throw Object.assign(new Error(t('状态码 {{status}} 非 2xx', { status: response.status })), { name: 'StatusCodeError' });
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xshell",
-  "version": "1.0.56",
+  "version": "1.0.58",
   "type": "module",
   "main": "./index.js",
   "bin": {
@@ -16,8 +16,8 @@
     "interactive programming"
   ],
   "engines": {
-    "node": ">=20.5.1",
-    "vscode": ">=1.79.0"
+    "node": ">=20.6.0",
+    "vscode": ">=1.81.0"
   },
   "author": "ShenHongFei <shen.hongfei@outlook.com> (https://github.com/ShenHongFei)",
   "publisher": "ShenHongFei",
@@ -45,9 +45,9 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.22.11",
-    "@babel/parser": "^7.22.11",
-    "@babel/traverse": "^7.22.11",
+    "@babel/core": "^7.22.15",
+    "@babel/parser": "^7.22.15",
+    "@babel/traverse": "^7.22.15",
     "@koa/cors": "^4.0.0",
     "@types/ws": "^8.5.5",
     "byte-size": "^8.1.1",
@@ -71,7 +71,7 @@
     "mime-types": "^2.1.35",
     "ora": "^7.0.1",
     "react": "^18.2.0",
-    "react-i18next": "^13.2.0",
+    "react-i18next": "^13.2.2",
     "resolve-path": "^1.4.0",
     "strip-ansi": "^7.1.0",
     "through2": "^4.0.2",
@@ -85,7 +85,7 @@
     "ws": "^8.13.0"
   },
   "devDependencies": {
-    "@babel/types": "^7.22.11",
+    "@babel/types": "^7.22.15",
     "@types/babel__traverse": "^7.20.1",
     "@types/byte-size": "^8.1.0",
     "@types/chardet": "^0.8.1",
@@ -95,15 +95,15 @@
     "@types/koa-compress": "^4.0.3",
     "@types/lodash": "^4.14.197",
     "@types/mime-types": "^2.1.1",
-    "@types/node": "^20.5.7",
+    "@types/node": "^20.5.9",
     "@types/react": "^18.2.21",
     "@types/through2": "^2.0.38",
     "@types/tough-cookie": "^4.0.2",
-    "@types/ua-parser-js": "^0.7.36",
+    "@types/ua-parser-js": "^0.7.37",
     "@types/vinyl-fs": "^3.0.2",
     "@types/vscode": "^1.81.0",
-    "@typescript-eslint/eslint-plugin": "^6.4.1",
-    "@typescript-eslint/parser": "^6.4.1",
+    "@typescript-eslint/eslint-plugin": "^6.6.0",
+    "@typescript-eslint/parser": "^6.6.0",
     "eslint": "^8.48.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-xlint": "^1.0.8"

package/server.d.ts

@@ -16,7 +16,7 @@ declare module 'koa' {
         compress: boolean;
     }
 }
-import { type Remote, type Headers } from './net.js';
+import { type Remote, type Headers, type RequestOptions } from './net.js';
 declare module 'http' {
     interface IncomingMessage {
         body?: Buffer;
@@ -66,7 +66,7 @@ export declare class Server {
     logger(ctx: Context): void;
     process_ua(ctx: Context): string;
     format_ua(headers: IncomingHttpHeaders | IncomingHttp2Headers): string;
-    proxy(ctx: Context, url: string | URL, headers_?: Record<string, string>): Promise<void>;
+    proxy(ctx: Context, url: string | URL, headers_?: Record<string, string>, redirect?: RequestOptions['redirect']): Promise<void>;
     static filter_response_headers(headers: Headers): {};
     try_send(ctx: Context, fpd_root: string, fp: string, log_404: boolean): Promise<boolean>;
     /** 将 body 设置为 fp 所指文件的 ReadStream

package/server.js

@@ -262,7 +262,7 @@ export class Server {
         }
         return s;
     }
-    async proxy(ctx, url, headers_ = {}) {
+    async proxy(ctx, url, headers_ = {}, redirect = 'manual') {
         const { request: { method, headers, query, body, ip } } = ctx;
         let { response } = ctx;
         try {
@@ -276,6 +276,7 @@ export class Server {
                     ...headers_
                 },
                 raw: true,
+                redirect,
             });
             response.status = response_.status;
             response.set(Server.filter_response_headers(response_.headers));