xshell 1.0.95 → 1.0.96

package/Terminal.js

@@ -51,8 +51,11 @@ class TerminalModel extends Model {
     async subscribe_stdio(remote) {
         assert(!this.stdio_id);
         const id = this.stdio_id = genid();
-        remote.handlers.set(id, ({ data: [chunk] }) => {
-            this.term.write(chunk);
+        remote.handlers.set(id, ({ data, error }) => {
+            if (error)
+                throw error;
+            else
+                this.term.write(data[0]);
         });
         await remote.send({ id, func: 'subscribe_stdio' });
     }

package/apps.d.ts

@@ -6,9 +6,9 @@ export declare let npm: {
     bin: string;
     call(cwd: string, bin: string, args: string[], options?: CallOptions): Promise<import("./process.js").CallResult<string>>;
     /** node.exe E:/sdk/nodejs/node_modules/corepack/dist/pnpm.js install
-        - cwd?: `fpd_root`
+        - cwd
         - pkgs?: `[ ]` */
-    install(cwd?: string, pkgs?: string[], { save_dev, save_peer, legacy, force, term, inspect, break: _break, }?: {
+    install(cwd: string, pkgs?: string[], { save_dev, save_peer, legacy, force, term, inspect, break: _break, }?: {
         save_dev?: boolean;
         save_peer?: boolean;
         legacy?: boolean;

package/apps.js

@@ -1,14 +1,14 @@
 import util from 'util';
-import { call_nodejs, exe_nodejs, platform } from './process.js';
+import { call_nodejs, platform, username } from './process.js';
 import { assert } from './utils.js';
 import { path } from './path.js';
 export let npm = {
-    bin: `${platform === 'win32' ? exe_nodejs.fdir : '/usr/lib/'}node_modules/corepack/dist/pnpm.js`,
+    bin: platform == 'win32' ? `C:/Users/${username}/AppData/Roaming/npm/node_modules/pnpm/bin/pnpm.cjs` : '/usr/bin/pnpm',
     async call(cwd, bin, args, options) {
         return call_nodejs(bin, args, { cwd, ...options });
     },
     /** node.exe E:/sdk/nodejs/node_modules/corepack/dist/pnpm.js install
-        - cwd?: `fpd_root`
+        - cwd
         - pkgs?: `[ ]` */
     async install(cwd, pkgs = [], { save_dev = false, save_peer = false, legacy = false, force = false, term = false, inspect = false, break: _break = false, } = {}) {
         const args = [

package/net.d.ts

@@ -91,8 +91,9 @@ export interface RequestError extends Error {
             - 为非空 string 作为代理地址
             - 为 falsy 值时设为 false
         - encoding?: `根据网页 content-type: charset=gb18030 提取 || 'utf-8'`  传入 'binary' 时返回 Buffer
+             (只对非 raw 的请求起作用)
         - retries?: `false` 可以传入 true (默认 2 次) 或 重试次数
-        - timeout?: `5 * 1000`
+        - timeout?: `5 * 1000` 超时后会抛出 error.name 为 'TimeoutError' 的 error, 可以传入 0 来禁用超时
         - auth?: BasicAuth | BearerAuth
         - cookies?: 需要额外添加到请求的 cookies, 默认情况下携带了 MemoryCookieStore 中保存的之前 http 响应中的 cookies
         - raw?: `false` 传入后返回整个 response (RawResponse)，body 为 Readable

package/net.js

@@ -40,7 +40,8 @@ let proxy_agents = {};
 async function request_retry(url, options, timeout, retries = 0, count = 0) {
     const { request: undici_request } = await import('undici');
     try {
-        options.signal = AbortSignal.timeout(timeout);
+        if (timeout > 0)
+            options.signal = AbortSignal.timeout(timeout);
         return await undici_request(url, options);
     }
     catch (error) {
@@ -80,7 +81,7 @@ 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/123.0.0.0 Safari/537.36',
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
         'sec-ch-ua-platform': '"Windows"',
         'sec-ch-ua-platform-version': '"15.0.0"',
     };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.95",
+    "version": "1.0.96",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -53,14 +53,14 @@
         ]
     },
     "dependencies": {
-        "@babel/core": "^7.24.4",
-        "@babel/parser": "^7.24.4",
-        "@babel/traverse": "^7.24.1",
+        "@babel/core": "^7.24.5",
+        "@babel/parser": "^7.24.5",
+        "@babel/traverse": "^7.24.5",
         "@koa/cors": "^5.0.0",
         "@types/ws": "^8.5.10",
-        "@typescript-eslint/eslint-plugin": "^7.7.1",
-        "@typescript-eslint/parser": "^7.7.1",
-        "@typescript-eslint/utils": "^7.7.1",
+        "@typescript-eslint/eslint-plugin": "^7.8.0",
+        "@typescript-eslint/parser": "^7.8.0",
+        "@typescript-eslint/utils": "^7.8.0",
         "ali-oss": "^6.20.0",
         "archiver": "^7.0.1",
         "byte-size": "^8.1.1",
@@ -77,7 +77,7 @@
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
         "https-proxy-agent": "^7.0.4",
-        "i18next": "^23.11.2",
+        "i18next": "^23.11.3",
         "i18next-scanner": "^4.4.0",
         "js-cookie": "^3.0.5",
         "koa": "^2.15.3",
@@ -86,27 +86,27 @@
         "map-stream": "0.0.7",
         "mime-types": "^2.1.35",
         "ora": "^8.0.1",
-        "react": "^18.3.0",
+        "react": "^18.3.1",
         "react-i18next": "^14.1.1",
         "react-object-model": "^1.2.4",
         "resolve-path": "^1.4.0",
         "strip-ansi": "^7.1.0",
         "through2": "^4.0.2",
-        "tough-cookie": "^4.1.3",
+        "tough-cookie": "^4.1.4",
         "tslib": "^2.6.2",
         "typescript": "^5.4.5",
         "ua-parser-js": "2.0.0-alpha.2",
-        "undici": "^6.14.1",
+        "undici": "^6.15.0",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
-        "ws": "^8.16.0",
+        "ws": "^8.17.0",
         "xterm": "^5.3.0",
         "xterm-addon-fit": "^0.8.0",
         "xterm-addon-web-links": "^0.9.0",
         "xterm-addon-webgl": "^0.16.0"
     },
     "devDependencies": {
-        "@babel/types": "^7.24.0",
+        "@babel/types": "^7.24.5",
         "@types/ali-oss": "^6.16.11",
         "@types/archiver": "^6.0.2",
         "@types/babel__traverse": "^7.20.5",
@@ -121,7 +121,7 @@
         "@types/lodash": "^4.17.0",
         "@types/mime-types": "^2.1.4",
         "@types/node": "^20.12.7",
-        "@types/react": "^18.3.0",
+        "@types/react": "^18.3.1",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",

package/prototype.browser.d.ts

@@ -115,6 +115,8 @@ declare global {
         /** 12.4 KB (1 KB = 1024 B) */
         to_fsize_str(this: number, units?: 'iec' | 'metric'): string;
         to_bin_str(this: number): string;
+        /** 转换为 0x???? 这样的十六进制形式
+            - length?: 位数自动对齐到 4 的倍数 */
         to_hex_str(this: number, length?: number): string;
         to_oct_str(this: number): string;
     }

package/prototype.browser.js

@@ -394,11 +394,11 @@ Object.defineProperties(Number.prototype, to_method_property_descriptors({
         return `0b${this.toString(2)}`;
     },
     to_hex_str(length) {
-        const s = this.toString(16);
+        const s = Math.abs(this).toString(16);
         // 长度自动对齐到 4 的倍数
-        if (!length)
+        if (length === undefined)
             length = Math.ceil(s.length / 4) * 4;
-        return `0x${'0'.repeat(length - s.length)}${s}`;
+        return `${this < 0 ? '-' : ''}0x${'0'.repeat(length - s.length)}${s}`;
     },
     to_oct_str() {
         return `0o${this.toString(8)}`;

package/prototype.d.ts

@@ -139,6 +139,8 @@ declare global {
         /** 12.4 KB (1 KB = 1024 B) */
         to_fsize_str(this: number, units?: 'iec' | 'metric'): string;
         to_bin_str(this: number): string;
+        /** 转换为 0x???? 这样的十六进制形式
+            - length?: 位数自动对齐到 4 的倍数 */
         to_hex_str(this: number, length?: number): string;
         to_oct_str(this: number): string;
     }

package/prototype.js

@@ -423,11 +423,11 @@ if (!globalThis.my_prototype_defined) {
             return `0b${this.toString(2)}`;
         },
         to_hex_str(length) {
-            const s = this.toString(16);
+            const s = Math.abs(this).toString(16);
             // 长度自动对齐到 4 的倍数
-            if (!length)
+            if (length === undefined)
                 length = Math.ceil(s.length / 4) * 4;
-            return `0x${'0'.repeat(length - s.length)}${s}`;
+            return `${this < 0 ? '-' : ''}0x${'0'.repeat(length - s.length)}${s}`;
         },
         to_oct_str() {
             return `0o${this.toString(8)}`;

package/server.d.ts

@@ -93,9 +93,16 @@ export declare class Server {
     logger(ctx: Context): void;
     process_ua(ctx: Context): string;
     format_ua(headers: IncomingHttpHeaders | IncomingHttp2Headers): string;
-    proxy(ctx: Context, 
-    /** 只含 host, path, 不含 queries 的 url */
-    path_url: string | URL, headers_?: Record<string, string>, redirect?: RequestOptions['redirect']): Promise<true>;
+    /** 转发请求到其他 http 服务，实现网关的功能
+        - ctx
+        - path_url: 只含 host, path, 不含 queries 的 url, 如 http://localhost:8080/api/get-user
+            实际请求时会自动带上 ctx 中的 queries
+        - options?: ServerRequestOptions
+            - headers?: 修改 (添加、覆盖、null 值时删除) 请求的 http headers, Record<string, string | null>
+            - queries?: 修改 (添加、覆盖、null 值时删除) 请求的 http queries, Record<string, string | null>
+            - redirect?: `manual` 重定向处理策略，默认按原样返回给客户端
+            - timeout?: `1000 * 5` 请求超时时间，可以传入 0 禁用超时 */
+    request(ctx: Context, path_url: string | URL, { headers: headers_, redirect, queries, timeout }?: ServerRequestOptions): Promise<true>;
     static filter_response_headers(headers: RawResponse['headers']): Record<string, string>;
     /** 提供静态文件
         @example
@@ -127,3 +134,9 @@ export declare class Server {
         - reverse?: `false` 在 range 内从后往前尝试 */
     static get_available_port(range: string, reverse?: boolean): Promise<number>;
 }
+export interface ServerRequestOptions {
+    headers?: Record<string, string | null>;
+    queries?: Record<string, string>;
+    redirect?: RequestOptions['redirect'];
+    timeout?: RequestOptions['timeout'];
+}

package/server.js

@@ -8,7 +8,7 @@ import util from 'util';
 // --- my libs
 import { t } from './i18n/instance.js';
 import { request as _request, Remote } from './net.js';
-import { inspect, output_width, assert, range_to_numbers, encode, filter_keys } from './utils.js';
+import { inspect, output_width, assert, range_to_numbers, encode, filter_keys, filter_values } from './utils.js';
 import { flist, fread, fstat } from './file.js';
 // ------------ my server
 export class Server {
@@ -438,23 +438,36 @@ export class Server {
         }
         return s;
     }
-    async proxy(ctx, 
-    /** 只含 host, path, 不含 queries 的 url */
-    path_url, headers_ = {}, redirect = 'manual') {
+    /** 转发请求到其他 http 服务，实现网关的功能
+        - ctx
+        - path_url: 只含 host, path, 不含 queries 的 url, 如 http://localhost:8080/api/get-user
+            实际请求时会自动带上 ctx 中的 queries
+        - options?: ServerRequestOptions
+            - headers?: 修改 (添加、覆盖、null 值时删除) 请求的 http headers, Record<string, string | null>
+            - queries?: 修改 (添加、覆盖、null 值时删除) 请求的 http queries, Record<string, string | null>
+            - redirect?: `manual` 重定向处理策略，默认按原样返回给客户端
+            - timeout?: `1000 * 5` 请求超时时间，可以传入 0 禁用超时 */
+    async request(ctx, path_url, { headers: headers_, redirect, queries, timeout } = {}) {
         const { request: { method, headers, query, body, ip } } = ctx;
         let { response } = ctx;
+        const x_forwarded_for = headers['x-forwarded-for'] ? `${headers['x-forwarded-for']}, ${ip}` : ip;
         try {
             const response_ = await _request(path_url, {
                 method: method,
-                queries: query,
+                queries: queries
+                    ? filter_values({ ...query, ...queries })
+                    : query,
                 body,
-                headers: {
-                    ...headers,
-                    'x-forwarded-for': headers['x-forwarded-for'] ? `${headers['x-forwarded-for']}, ${ip}` : ip,
-                    ...headers_
-                },
+                headers: (headers_
+                    ? filter_values({
+                        ...headers,
+                        'x-forwarded-for': x_forwarded_for,
+                        ...headers_
+                    })
+                    : { ...headers, 'x-forwarded-for': x_forwarded_for }),
                 raw: true,
                 redirect,
+                timeout
             });
             response.status = response_.status;
             response.set(Server.filter_response_headers(response_.headers));

package/utils.browser.d.ts

@@ -1,4 +1,6 @@
 export declare const noop: () => void;
+/** value 不为 null 或 undefined */
+export declare const not_empty: (value: any) => boolean;
 export declare function assert(assertion: any, message?: string): never | void;
 export declare function log<T>(obj: T): T;
 /** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素
@@ -56,7 +58,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.browser.js

@@ -1,5 +1,7 @@
 import { t } from './i18n/instance.js';
 export const noop = () => { };
+/** value 不为 null 或 undefined */
+export const not_empty = (value) => value !== null && value !== undefined;
 export function assert(assertion, message) {
     if (!assertion) {
         debugger;

package/utils.d.ts

@@ -6,6 +6,8 @@ import util from 'util';
 import type Vinyl from 'vinyl';
 import './prototype.js';
 export declare const noop: () => void;
+/** value 不为 null 或 undefined */
+export declare const not_empty: (value: any) => boolean;
 /** `230` term 字符宽度 （实际上有 240） */
 export declare const output_width = 230;
 export declare function set_inspect_options(colors?: boolean): void;
@@ -31,10 +33,12 @@ export declare function map_values<TValue, TNewValue>(obj: {
 };
 /** 过滤对象中的 keys, 返回新对象 */
 export declare function filter_keys<TObj>(obj: TObj, filter: (key: string) => any): TObj;
+/** 过滤对象中的 keys, 返回新对象 */
+export declare function filter_values<TObj extends Record<string, any>>(obj: TObj, filter?: (value: TObj[string]) => any): TObj;
 /** 忽略对象中的 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;

package/utils.js

@@ -3,6 +3,8 @@ import util from 'util';
 import { t } from './i18n/instance.js';
 import './prototype.js';
 export const noop = () => { };
+/** value 不为 null 或 undefined */
+export const not_empty = (value) => value !== null && value !== undefined;
 /** `230` term 字符宽度 （实际上有 240） */
 export const output_width = 230;
 export function set_inspect_options(colors = true) {
@@ -97,6 +99,11 @@ export function filter_keys(obj, filter) {
     return Object.fromEntries(Object.entries(obj)
         .filter(([key]) => filter(key)));
 }
+/** 过滤对象中的 keys, 返回新对象 */
+export function filter_values(obj, filter = not_empty) {
+    return Object.fromEntries(Object.entries(obj)
+        .filter(([, value]) => filter(value)));
+}
 /** 忽略对象中的 keys, 返回新对象 */
 export function omit(obj, omit_keys) {
     const omit_keys_ = new Set(omit_keys);