xshell 1.0.89 → 1.0.91

package/i18n/scanner/index.js

@@ -213,7 +213,12 @@ export async function scanner(rootdir = path.normalize(process.cwd()), config =
         /** 生成 stats.json, unmarkeds.md； 打印 untranslated / unmarkeds */
         function flush(cb) {
             // ------------ stats.json
-            this.push(new_vinyl_file('stats.json', Object.fromEntries(Object.entries(stats).map(([l, { translateds, untranslateds }]) => [l, { translateds: Array.from(translateds), untranslateds: Array.from(untranslateds) }]))));
+            // this.push(new_vinyl_file('stats.json', 
+            //     Object.fromEntries(
+            //         Object.entries(stats).map( ([l, { translateds, untranslateds }]) => 
+            //             [l, { translateds: Array.from(translateds), untranslateds: Array.from(untranslateds) }])
+            //     )
+            // ))
             // ------------ 打印 cli 统计表
             const table = new CliTable({
                 head: [

package/net.browser.d.ts

@@ -26,6 +26,7 @@ export interface RequestOptions {
     auth?: BasicAuth | BearerAuth;
     cookies?: Record<string, string>;
     cors?: boolean;
+    credentials?: RequestCredentials;
 }
 export interface RequestRawOptions extends RequestOptions {
     raw: true;

package/net.browser.js

@@ -32,7 +32,7 @@ async function fetch_retry(url, options, timeout, retries = 0, count = 0) {
     }
 }
 export async function request(url, options = {}) {
-    const { queries, headers: _headers, body, type = 'application/json', encoding, timeout = 5 * 1000, auth, cors, raw = false, full = false, } = options;
+    const { queries, headers: _headers, body, type = 'application/json', encoding, timeout = 5 * 1000, auth, cors, raw = false, full = false, credentials = 'include', } = options;
     let { method, retries, } = options;
     url = new URL(url, location.href);
     if (queries)
@@ -69,7 +69,7 @@ export async function request(url, options = {}) {
         ...method ? { method } : {},
         keepalive: true,
         redirect: 'follow',
-        credentials: 'include',
+        credentials,
         ...cors ? { mode: 'cors' } : {},
         headers,
         // --- body

package/net.d.ts

@@ -19,7 +19,8 @@ export declare const WebSocketClosing = 2;
 export declare const WebSocketClosed = 3;
 export declare enum MyProxy {
     socks5 = "http://localhost:10080",
-    whistle = "http://localhost:8899"
+    whistle = "http://localhost:8899",
+    work = "http://localhost:10090"
 }
 export declare const cookies: {
     store: MemoryCookieStore;
@@ -152,12 +153,13 @@ export declare class WebSocketConnectionError extends Error {
         - on_close?: 和 websocket 的 'close' 事件不相同，只在正常关闭 (close code 为 1000) 时才调用，否则都会调用 on_error
             https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent#Status_codes  */
 export declare function connect_websocket(url: string | URL, { protocols, max_payload, // 8 GB
-on_message, on_error, on_close }: {
+on_message, on_error, on_close, proxy }: {
     protocols?: string[];
     max_payload?: number;
     on_message(data: ArrayBuffer | string, websocket: WebSocket): any;
     on_error?(error: WebSocketConnectionError, websocket: WebSocket): any;
     on_close?(event: CloseEvent, websocket: WebSocket): any;
+    proxy?: string;
 }): Promise<WebSocket>;
 /** 接收到消息后的处理函数
     返回值可以是:

package/net.js

@@ -11,6 +11,7 @@ export var MyProxy;
 (function (MyProxy) {
     MyProxy["socks5"] = "http://localhost:10080";
     MyProxy["whistle"] = "http://localhost:8899";
+    MyProxy["work"] = "http://localhost:10090";
 })(MyProxy || (MyProxy = {}));
 // ------------------------------------ fetch, request
 export const cookies = {
@@ -43,7 +44,7 @@ async function request_retry(url, options, timeout, retries = 0, count = 0) {
         return await undici_request(url, options);
     }
     catch (error) {
-        if (error.name === 'TimeoutError') {
+        if (error.name === 'TimeoutError')
             if (count < retries) {
                 const duration = 2 ** count;
                 console.log(`${t('等待 {{duration}} 秒后重试 request (已尝试 {{_count}} 次) …', { duration, _count: count + 1 }).yellow}  ${url.toString().blue.underline}`);
@@ -52,13 +53,12 @@ async function request_retry(url, options, timeout, retries = 0, count = 0) {
             }
             else
                 throw Object.assign(new Error(`request 超时: ${url.toString()}`), { name: 'TimeoutError' });
-        }
         else
             throw error;
     }
 }
 export async function request(url, options = {}) {
-    const { ProxyAgent, FormData } = await import('undici');
+    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;
@@ -116,7 +116,7 @@ export async function request(url, options = {}) {
             if (proxy) {
                 if (proxy === true)
                     proxy = MyProxy.socks5;
-                return proxy_agents[proxy] ??= new ProxyAgent({ uri: proxy });
+                return proxy_agents[proxy] ??= new UndiciProxyAgent({ uri: proxy });
             }
         })(),
         // todo: 强制手动处理重定向，来正确处理 cookie ?
@@ -369,6 +369,7 @@ export class WebSocketConnectionError extends Error {
         }
     }
 }
+let websocket_proxy_agents = {};
 /** 连接 websocket url, 设置各种事件监听器。在 open 事件后 resolve, 返回 websocket
     遇到 error 时会创建 WebSocketConnectionError:
         - reject 掉返回的 promise (若此时未 settle)
@@ -386,12 +387,16 @@ export class WebSocketConnectionError extends Error {
         - on_close?: 和 websocket 的 'close' 事件不相同，只在正常关闭 (close code 为 1000) 时才调用，否则都会调用 on_error
             https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent#Status_codes  */
 export async function connect_websocket(url, { protocols, max_payload = 2 ** 33, // 8 GB
-on_message, on_error, on_close }) {
+on_message, on_error, on_close, proxy }) {
     const { WebSocket } = await import('ws');
+    const { HttpsProxyAgent } = await import('https-proxy-agent');
     let websocket = new WebSocket(url, protocols, {
         maxPayload: max_payload,
         skipUTF8Validation: true,
         allowSynchronousEvents: true,
+        ...proxy ? {
+            agent: websocket_proxy_agents[proxy] ??= new HttpsProxyAgent(proxy)
+        } : {}
     });
     // https://stackoverflow.com/questions/11821096/what-is-the-difference-between-an-arraybuffer-and-a-blob/39951543
     websocket.binaryType = 'arraybuffer';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.89",
+    "version": "1.0.91",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -58,9 +58,9 @@
         "@babel/traverse": "^7.24.1",
         "@koa/cors": "^5.0.0",
         "@types/ws": "^8.5.10",
-        "@typescript-eslint/eslint-plugin": "^7.6.0",
-        "@typescript-eslint/parser": "^7.6.0",
-        "@typescript-eslint/utils": "^7.6.0",
+        "@typescript-eslint/eslint-plugin": "^7.7.1",
+        "@typescript-eslint/parser": "^7.7.1",
+        "@typescript-eslint/utils": "^7.7.1",
         "ali-oss": "^6.20.0",
         "archiver": "^7.0.1",
         "byte-size": "^8.1.1",
@@ -71,31 +71,32 @@
         "colors": "^1.4.0",
         "commander": "^12.0.0",
         "emoji-regex": "^10.3.0",
-        "eslint": "^9.0.0",
+        "eslint": "^9.1.1",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-react": "^7.34.1",
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
-        "i18next": "^23.11.0",
+        "https-proxy-agent": "^7.0.4",
+        "i18next": "^23.11.2",
         "i18next-scanner": "^4.4.0",
         "js-cookie": "^3.0.5",
-        "koa": "^2.15.2",
+        "koa": "^2.15.3",
         "koa-compress": "^5.1.1",
         "lodash": "^4.17.21",
         "map-stream": "0.0.7",
         "mime-types": "^2.1.35",
         "ora": "^8.0.1",
         "react": "^18.2.0",
-        "react-i18next": "^14.1.0",
+        "react-i18next": "^14.1.1",
         "react-object-model": "^1.2.3",
         "resolve-path": "^1.4.0",
         "strip-ansi": "^7.1.0",
         "through2": "^4.0.2",
         "tough-cookie": "^4.1.3",
         "tslib": "^2.6.2",
-        "typescript": "^5.4.4",
+        "typescript": "^5.4.5",
         "ua-parser-js": "2.0.0-alpha.2",
-        "undici": "^6.12.0",
+        "undici": "^6.14.1",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
         "ws": "^8.16.0",
@@ -111,7 +112,7 @@
         "@types/babel__traverse": "^7.20.5",
         "@types/byte-size": "^8.1.2",
         "@types/chardet": "^0.8.3",
-        "@types/eslint": "^8.56.7",
+        "@types/eslint": "^8.56.10",
         "@types/estree": "^1.0.5",
         "@types/gulp-sort": "2.0.4",
         "@types/js-cookie": "^3.0.6",
@@ -119,8 +120,8 @@
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.17.0",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^20.12.5",
-        "@types/react": "^18.2.75",
+        "@types/node": "^20.12.7",
+        "@types/react": "^18.2.79",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",
@@ -130,7 +131,7 @@
     "pnpm": {
         "patchedDependencies": {
             "@types/byte-size@8.1.2": "patches/@types__byte-size@8.1.2.patch",
-            "koa@2.15.2": "patches/koa@2.15.2.patch"
+            "koa@2.15.3": "patches/koa@2.15.3.patch"
         }
     }
 }

package/server.d.ts

@@ -87,8 +87,9 @@ export declare class Server {
     _router(ctx: Context, next: Next): Promise<void>;
     /** 被子类重写以自定义处理逻辑 */
     router(ctx: Context): Promise<boolean>;
-    /** 重定向 ctx 到 url (可以是完整 url 也可以是路径)，设置 status code 为 code */
-    redirect(ctx: Context, url: string, code?: 301 | 302): void;
+    /** 重定向 ctx 到 url (可以是完整 url 也可以是路径)，设置 status code 为 code
+        - code: 301 (永久重定向) | 302 (临时重定向) | 307 (非 GET 请求保持原有方法和 body 的临时重定向) */
+    redirect(ctx: Context, url: string, code: 301 | 302 | 307): true;
     logger(ctx: Context): void;
     process_ua(ctx: Context): string;
     format_ua(headers: IncomingHttpHeaders | IncomingHttp2Headers): string;

package/server.js

@@ -326,13 +326,15 @@ export class Server {
     async router(ctx) {
         return false;
     }
-    /** 重定向 ctx 到 url (可以是完整 url 也可以是路径)，设置 status code 为 code */
-    redirect(ctx, url, code = 301) {
+    /** 重定向 ctx 到 url (可以是完整 url 也可以是路径)，设置 status code 为 code
+        - code: 301 (永久重定向) | 302 (临时重定向) | 307 (非 GET 请求保持原有方法和 body 的临时重定向) */
+    redirect(ctx, url, code) {
         const { request: { _path } } = ctx;
         let { response } = ctx;
         response.redirect(url);
         response.status = code;
         console.log(`${code} 重定向  ${_path} -> ${url}`.yellow);
+        return true;
     }
     logger(ctx) {
         const { colors } = this;