xshell 1.0.48 → 1.0.49

package/file.js

@@ -207,7 +207,7 @@ export async function fcopy(fp_src, fp_dst, { print = true, overwrite = true, }
     assert(fp_src.isdir === fp_dst.isdir, t('fp_src 和 fp_dst 必须同为文件路径或文件夹路径'));
     assert(path.isAbsolute(fp_src) && path.isAbsolute(fp_dst), t('fp_src 和 fp_dst 必须为完整路径'));
     if (print)
-        console.log(t('复制'), fp_src, '→', fp_dst);
+        console.log(t('复制'), fp_src, '->', fp_dst);
     const { copy } = await import('fs-extra');
     await copy(fp_src, fp_dst, { overwrite, errorOnExist: true });
 }
@@ -222,7 +222,7 @@ export async function fmove(src, dst, { overwrite = false, print = true } = {})
     if (!path.isAbsolute(src) || !path.isAbsolute(dst))
         throw new Error(t('src 和 dst 必须为完整路径'));
     if (print)
-        console.log(t('移动'), src, '→', dst);
+        console.log(t('移动'), src, '->', dst);
     const { move } = await import('fs-extra');
     await move(src, dst, { overwrite });
 }
@@ -241,7 +241,7 @@ export async function frename(fp, fp_, { fpd, print = true, overwrite = true } =
     }
     assert(path.isAbsolute(fp) && path.isAbsolute(fp_), t('fp 和 fp_ 必须是绝对路径'));
     if (print)
-        console.log(t('重命名'), fp, '→', fp_);
+        console.log(t('重命名'), fp, '->', fp_);
     if (!overwrite && fexists(fp_))
         throw new Error(t('文件已存在：') + fp_);
     await fsp.rename(fp, fp_);

package/i18n/dict.json

@@ -337,5 +337,11 @@
     },
     "fsend 必须传 absolute 选项或 root 文件夹": {
         "en": "fsend must pass absolute option or root folder"
+    },
+    "message.data 数组中不能有 undefined 的项, 因为 json 序列化后会变为 null": {
+        "en": "There cannot be undefined items in the message.data array, because json will become null after serialization"
+    },
+    "xshell 启动成功，正在监听: http://localhost:8421": {
+        "en": "xshell started successfully and is listening: http://localhost:8421"
     }
 }

package/i18n/rwdict.js

@@ -60,14 +60,14 @@ export class RWDict extends Dict {
         if (_translation !== translation)
             if (!overwrite) {
                 console.error(`${`已存在 ${id} 词条:`.red} ${JSON.stringify(item)}`);
-                console.error(`${'M? '.yellow}${_translation.replace(/\n/g, '\\n')} → ${translation.replace(/\n/g, '\\n')}`);
+                console.error(`${'M? '.yellow}${_translation.replace(/\n/g, '\\n')} -> ${translation.replace(/\n/g, '\\n')}`);
                 if (!dryrun)
                     console.error('如要更新翻译请设置 { overwrite: true }，否则使用 i18n.t(\'text\', { context: \'xxx\' }) 标记文本以区分。\n');
                 return;
             }
             else {
                 if (print)
-                    console.log(`${'M '.yellow}${_translation.replace(/\n/g, '\\n')} → ${translation.replace(/\n/g, '\\n')}`);
+                    console.log(`${'M '.yellow}${_translation.replace(/\n/g, '\\n')} -> ${translation.replace(/\n/g, '\\n')}`);
                 if (!dryrun)
                     item[language] = translation;
             }

package/net.browser.js

@@ -380,6 +380,7 @@ export class Remote {
         作为 websocket 连接接收方，必传 websocket 参数
         发送或连接出错时自动清理 message.id 对应的 handler */
     async send(message, websocket) {
+        assert(!message.data || message.data.every(arg => arg !== undefined), t('message.data 数组中不能有 undefined 的项, 因为 json 序列化后会变为 null'));
         if (this.print)
             console.log('remote.send:', message);
         try {

package/net.js

@@ -87,7 +87,7 @@ export async function request(url, { method, queries, headers: _headers, body, t
     // --- headers, http/2 开始都用小写的 headers
     let headers = new 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',
-        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36',
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36',
     });
     if (body !== undefined)
         headers.set('content-type', type);
@@ -541,6 +541,7 @@ export class Remote {
         作为 websocket 连接接收方，必传 websocket 参数
         发送或连接出错时自动清理 message.id 对应的 handler */
     async send(message, websocket) {
+        assert(!message.data || message.data.every(arg => arg !== undefined), 'message.data 数组中不能有 undefined 的项, 因为 json 序列化后会变为 null');
         if (this.print)
             console.log('remote.send:', message);
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xshell",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "type": "module",
   "main": "./index.js",
   "bin": {
@@ -67,19 +67,19 @@
     "js-cookie": "^3.0.5",
     "koa": "^2.14.2",
     "koa-compress": "^5.1.1",
-    "koa-useragent": "^4.1.0",
     "lodash": "^4.17.21",
     "map-stream": "0.0.7",
     "mime-types": "^2.1.35",
     "ora": "^7.0.1",
     "react": "^18.2.0",
-    "react-i18next": "^13.1.1",
+    "react-i18next": "^13.1.2",
     "resolve-path": "^1.4.0",
     "strip-ansi": "^7.1.0",
     "through2": "^4.0.2",
     "tough-cookie": "^4.1.3",
     "tslib": "^2.6.1",
     "typescript": "^5.1.6",
+    "ua-parser-js": "2.0.0-alpha.2",
     "undici": "^5.23.0",
     "vinyl": "^3.0.0",
     "vinyl-fs": "^4.0.0",
@@ -97,15 +97,16 @@
     "@types/koa-compress": "^4.0.3",
     "@types/lodash": "^4.14.197",
     "@types/mime-types": "^2.1.1",
-    "@types/node": "^20.4.9",
+    "@types/node": "^20.4.10",
     "@types/react": "^18.2.20",
     "@types/through2": "^2.0.38",
     "@types/tough-cookie": "^4.0.2",
+    "@types/ua-parser-js": "^0.7.36",
     "@types/vinyl-fs": "^3.0.2",
     "@types/vscode": "^1.81.0",
     "@typescript-eslint/eslint-plugin": "^6.3.0",
     "@typescript-eslint/parser": "^6.3.0",
-    "eslint": "^8.46.0",
+    "eslint": "^8.47.0",
     "eslint-plugin-react": "^7.33.1",
     "eslint-plugin-xlint": "^1.0.6"
   },

package/prototype.js

@@ -93,7 +93,8 @@ if (!globalThis.my_prototype_defined) {
                     cur_width += w;
                     if (cur_width > width) {
                         const i_fitted_next = i_fitted + 1;
-                        const t = s.slice(0, i_fitted_next) + ' '.repeat(width - 2 - fitted_width) + '…';
+                        // … 在 winterm 中对不齐，使用 ··· 代替
+                        const t = s.slice(0, i_fitted_next) + ' '.repeat(width - 2 - fitted_width) + '··';
                         return color_bak ? color_bak + t + '\u001b[39m' : t;
                     }
                 }

package/repl.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from 'url';
 import { path } from './path.js';
 import { t } from './i18n/instance.js';
 import './prototype.js';
-import { delay, set_inspect_options, delta2str } from './utils.js';
+import { delay, set_inspect_options } from './utils.js';
 import { Remote } from './net.js';
 set_inspect_options();
 let server;
@@ -12,7 +12,6 @@ let server;
 export const fpd_root = path.dirname(fileURLToPath(import.meta.url)) + '/';
 export async function start_repl() {
     // ------------ 加载库
-    console.log(t('xshell 开始启动').yellow);
     // --- prevent from exiting
     process.on('uncaughtException', error => {
         console.error(error);
@@ -25,7 +24,6 @@ export async function start_repl() {
         useColors: true,
         terminal: true,
     });
-    console.log(t('nodejs.repl 启动成功'));
     process.title = 'xshell';
     await Promise.all([
         pollute_global(),
@@ -44,13 +42,9 @@ export async function start_repl() {
                 })
             });
             await server.start();
-            console.log(t('server 启动成功'));
         })(),
     ]);
-    console.log(('-'.repeat(30) + '\n' +
-        t('xshell 启动成功，用时 ') + delta2str(new Date().getTime() - globalThis.tstarted.getTime()) + '\n' +
-        t('正在监听: http://localhost:8421\n') +
-        '-'.repeat(30)).green);
+    console.log(t('xshell 启动成功，正在监听: http://localhost:8421').green);
 }
 export async function stop() {
     console.log(t('xshell 正在退出').red);
@@ -88,7 +82,6 @@ export async function pollute_global() {
         pollute_module_exports('./server.js'),
         pollute_module_exports('./repl.js'),
     ]);
-    console.log(t('所有模块加载成功'));
 }
 export async function pollute_module_exports(fp_mod) {
     Object.assign(globalThis, await import(fp_mod));

package/server.d.ts

@@ -1,9 +1,11 @@
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="ua-parser-js" />
 /// <reference types="node" resolution-mode="require"/>
-import { type Server as HttpServer } from 'http';
+/// <reference types="node" resolution-mode="require"/>
+import { type Server as HttpServer, type IncomingHttpHeaders } from 'http';
+import type { IncomingHttpHeaders as IncomingHttp2Headers } from 'http2';
 import type { WebSocketServer } from 'ws';
 import type { default as Koa, Context, Next } from 'koa';
-import type { UserAgentContext } from 'koa-useragent';
 declare module 'koa' {
     interface Request {
         /** 经过 decodeURIComponent 后，在路径重写之前的路径 */
@@ -12,9 +14,6 @@ declare module 'koa' {
     }
     interface Context {
         compress: boolean;
-        userAgent: UserAgentContext['userAgent'] & {
-            isWechat: boolean;
-        };
     }
 }
 import { type Remote, type Headers } from './net.js';
@@ -29,6 +28,19 @@ declare module 'http' {
 export declare class Server {
     /** proxy 时需要丢弃的 resposne headers */
     static drop_response_headers: Set<string>;
+    UAParser: {
+        (uastring?: string, extensions?: Record<string, unknown>): import("ua-parser-js").IResult;
+        (extensions?: Record<string, unknown>): import("ua-parser-js").IResult;
+        new (uastring?: string, extensions?: Record<string, unknown>): import("ua-parser-js").UAParserInstance;
+        new (extensions?: Record<string, unknown>): import("ua-parser-js").UAParserInstance;
+        VERSION: string;
+        BROWSER: import("ua-parser-js").BROWSER;
+        CPU: import("ua-parser-js").CPU;
+        DEVICE: import("ua-parser-js").DEVICE;
+        ENGINE: import("ua-parser-js").ENGINE;
+        OS: import("ua-parser-js").OS;
+        UAParser: any;
+    };
     js_exts: Set<string>;
     app: Koa;
     handler: ReturnType<Koa['callback']>;
@@ -45,15 +57,15 @@ export declare class Server {
     start(): Promise<void>;
     stop(): void;
     entry(ctx: Context, next: Next): Promise<void>;
-    /**
-        parse req.body to request.body
-        process request.ip
-    */
+    /** 解析 req.body to request.body
+        处理 request.ip */
     parse(ctx: Context): Promise<void>;
     _router(ctx: Context, next: Next): Promise<void>;
     /** 被子类重写以自定义处理逻辑 */
     router(ctx: Context): Promise<boolean>;
     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>;
     static filter_response_headers(headers: Headers): {};
     try_send(ctx: Context, fp: string, { root, log_404, }: {

package/server.js

@@ -3,7 +3,6 @@ import zlib from 'zlib';
 import { createReadStream } from 'fs';
 import { Readable } from 'stream';
 import util from 'util';
-import querystring from 'querystring';
 // --- my libs
 import { t } from './i18n/instance.js';
 import { request as _request } from './net.js';
@@ -20,6 +19,7 @@ export class Server {
         'transfer-encoding',
         'x-powered-by'
     ]);
+    UAParser = null;
     js_exts = new Set(['.js', '.mjs', '.cjs']);
     app;
     handler;
@@ -39,7 +39,8 @@ export class Server {
         const { default: Koa } = await import('koa');
         const { default: KoaCors } = await import('@koa/cors');
         const { default: KoaCompress } = await import('koa-compress');
-        const { userAgent: KoaUserAgent } = await import('koa-useragent');
+        const { UAParser } = await import('ua-parser-js');
+        this.UAParser = UAParser;
         const { WebSocketServer } = await import('ws');
         // --- init koa app
         let app = new Koa();
@@ -60,7 +61,6 @@ export class Server {
             threshold: 512
         }));
         app.use(KoaCors({ credentials: true }));
-        app.use(KoaUserAgent);
         app.use(this._router.bind(this));
         this.app = app;
         this.handler = this.app.callback();
@@ -79,9 +79,23 @@ export class Server {
             });
             this.server_http.on('upgrade', (request, socket, head) => {
                 // url 只有路径部分
-                const { url, headers: { host = '', 'user-agent': ua }, } = request;
+                const { url, headers, headers: { host = '' }, } = request;
                 const ip = request.socket.remoteAddress.replace(/^::ffff:/, '');
-                console.log(`${new Date().to_time_str()}    ${(ip || '').pad(40)}  ${(ua || '').limit(40)}  ${'websocket'.pad(10).magenta}    ${'connect'.pad(10).magenta}${host.pad(20)}  ${url.pad(60).yellow}`);
+                console.log(
+                // 时间
+                `${new Date().to_time_str()}  ` +
+                    // ip（位置）
+                    (ip || '').limit(60) + '  ' +
+                    // ua
+                    this.format_ua(headers).limit(56) + '  ' +
+                    // https／2.0
+                    `${this.colors ? 'websocket'.limit(10).magenta : 'websocket'.limit(10)}  ` +
+                    // method
+                    ''.limit(6) + ' ' +
+                    // host
+                    `${host.limit(24)}  ` +
+                    // path
+                    (this.colors ? url.yellow : url));
                 switch (url) {
                     case '/':
                         this.server_ws.handleUpgrade(request, socket, head, ws => {
@@ -117,10 +131,8 @@ export class Server {
             response.type = 'text/plain';
         }
     }
-    /**
-        parse req.body to request.body
-        process request.ip
-    */
+    /** 解析 req.body to request.body
+        处理 request.ip */
     async parse(ctx) {
         let { req, request } = ctx;
         const buf = await stream_to_buffer(req);
@@ -131,14 +143,10 @@ export class Server {
         // --- parse body
         if (!req.body)
             return;
-        if (ctx.is('application/json') || ctx.is('text/plain'))
-            request.body = JSON.parse(req.body.toString());
-        else if (ctx.is('application/x-www-form-urlencoded'))
-            request.body = querystring.parse(req.body.toString());
-        else if (ctx.is('multipart/form-data'))
-            throw new Error('multipart/form-data is not supported');
-        else
-            request.body = req.body;
+        request.body = ctx.is('application/json') || ctx.is('text/plain') ?
+            JSON.parse(req.body.toString())
+            :
+                req.body;
     }
     async _router(ctx, next) {
         let { request } = ctx;
@@ -167,49 +175,32 @@ export class Server {
         const { request } = ctx;
         const { query, body, path, _path, protocol, host, req: { httpVersion: http_version }, ip, } = request;
         let { method } = request;
-        const ua = ctx.userAgent;
         let s = '';
-        // --- time
-        s += `${new Date().to_time_str()}    `;
-        // --- ip
-        s += (ip || '').pad(40) + '  ';
-        // --- ua
-        s += (() => {
-            let t = '';
-            if (ua.isMobile)
-                t += 'mobile';
-            if (ua.isDesktop)
-                t += 'desktop';
-            if (ua.isBot)
-                t += `${t ? ' ' : ''}${colors ? 'robot'.blue : 'robot'}`;
-            if (ua.platform !== 'unknown' && !ua.os.startsWith('Windows'))
-                t += '／' + ua.platform.toLowerCase().replace('apple mac', 'mac');
-            if (ua.os !== 'unknown' && ua.platform !== 'Android')
-                t += '／' + ua.os.toLowerCase();
-            if (ua.browser !== 'unknown')
-                t += '／' + ua.browser.toLowerCase();
-            if (ua.isWechat)
-                t += '／weixin';
-            if (ua.version !== 'unknown')
-                t += '／' + ua.version.split('.').slice(0, 2).join('.');
-            return t;
-        })().pad(40) + '  ';
-        // --- https／2.0
-        s += `${`${protocol.pad(5)}／${http_version}`.pad(10)}    `;
-        // --- method
+        // 时间
+        s += `${new Date().to_time_str()}  `;
+        // ip（位置）
+        s += (ip || '').limit(60) + '  ';
+        // ua
+        s += this.process_ua(ctx).limit(56) + '  ';
+        // https／2.0
+        s += `${`${protocol.limit(5)} ${http_version}`.limit(10)}  `;
+        // method
         method = method.toLowerCase();
-        s += (method === 'get' || !colors) ? method.pad(10) : method.pad(10).yellow;
-        // --- host
-        s += `${host.pad(20)}  `;
-        // --- path
+        let t = method.limit(6) + ' ';
+        if (colors && method !== 'get')
+            method = t.yellow;
+        s += t;
+        // host
+        s += `${host.limit(24)}  `;
+        // path
         s += (() => {
             if (path.toLowerCase() !== _path.toLowerCase())
-                return `${_path.blue} → ${path}`;
+                return `${_path.blue} -> ${path}`;
             if (!path.includes('.'))
                 return colors ? path.yellow : path;
             return path;
         })();
-        // --- query
+        // query
         if (Object.keys(query).length) {
             let t = inspect(query, { compact: true })
                 .replace('[Object: null prototype] ', '');
@@ -218,12 +209,59 @@ export class Server {
             s += (s + t).width > output_width ? '\n' : '    ';
             s += t;
         }
-        // --- body
+        // body
         if (body && Object.keys(body).length)
             s += '\n' + inspect(body).replace('[Object: null prototype] ', '');
-        // --- print log
+        // 打印日志
         console.log(s);
     }
+    process_ua(ctx) {
+        const { headers, headers: { 'user-agent': ua_str } } = ctx.request;
+        if (!ua_str)
+            return '';
+        ctx.response.set('accept-ch', 'Sec-CH-UA, Sec-CH-UA-Mobile, Sec-CH-UA-Model, Sec-CH-UA-Platform, Sec-CH-UA-Platform-Version, RTT, Device-Memory');
+        return this.format_ua(headers);
+    }
+    format_ua(headers) {
+        const { rtt, 'device-memory': memory } = headers;
+        const { device, os, browser } = this.UAParser(headers).withClientHints();
+        const vendor = device.vendor?.toLowerCase();
+        const model = device.model?.toLowerCase();
+        const osname = os.name?.toLowerCase();
+        const browser_name = browser.name?.toLowerCase();
+        let s = '';
+        if (vendor && vendor !== 'apple')
+            s += vendor;
+        if (model && model !== 'k' && model !== 'macintosh') {
+            if (s)
+                s += ' ';
+            s += model.replace('22127rk46c', 'redmi k60 pro');
+        }
+        if (osname) {
+            if (s)
+                s += '／';
+            s += osname;
+            if (os.version)
+                s += ` ${os.version.split('.')[0].toLowerCase()}`;
+        }
+        if (browser_name) {
+            if (s)
+                s += '／';
+            s += browser_name.replace('mobile chrome', 'chrome');
+            if (browser.version) {
+                const [major, minor] = browser.version.toLowerCase().split('.');
+                s += ` ${major}`;
+                if (minor && minor !== '0')
+                    s += `.${minor}`;
+            }
+        }
+        if (memory) {
+            s += `／${memory}g`;
+            if (rtt && rtt !== '0')
+                s += ` ${rtt}ms`;
+        }
+        return s;
+    }
     async proxy(ctx, url, headers_ = {}) {
         const { request: { method, headers, query, body } } = ctx;
         let { response } = ctx;
@@ -277,7 +315,7 @@ export class Server {
         if (method !== 'HEAD' && method !== 'GET')
             return false;
         function _log_404() {
-            let s = `${' '.repeat(13)}    ${method.toLowerCase()} 404: ${path}`;
+            let s = `${' '.repeat(11)}    ${method.toLowerCase()} 404: ${path}`;
             if (_path !== path)
                 s += ` ${_path.bracket()}`;
             console.log(s.red);

package/utils.browser.d.ts

@@ -1,5 +1,8 @@
 export declare const noop: () => void;
 export declare function assert(assertion: any, message?: string): never | void;
+/** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素
+    @example seq(10, i => `item-${i}`) */
+export declare function seq<T = number>(n: number, generator?: (index: number) => T): T[];
 export declare function delay(milliseconds: number): Promise<void>;
 export declare function timeout(milliseconds: number): Promise<void>;
 /** https://stackoverflow.com/questions/63297164/how-to-only-accept-arraybuffer-as-parameter */

package/utils.browser.js

@@ -6,6 +6,14 @@ export function assert(assertion, message) {
         throw Object.assign(new Error(`断言失败: ${message ? `${message}: ` : ''}${assertion}`), { assertion });
     }
 }
+/** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素
+    @example seq(10, i => `item-${i}`) */
+export function seq(n, generator) {
+    let a = new Array(n);
+    for (let i = 0; i < n; i++)
+        a[i] = generator ? generator(i) : i;
+    return a;
+}
 export async function delay(milliseconds) {
     return new Promise(resolve => {
         setTimeout(resolve, milliseconds);

package/utils.d.ts

@@ -10,6 +10,9 @@ export declare const noop: () => void;
 export declare const output_width = 230;
 export declare function set_inspect_options(colors?: boolean): void;
 export declare function assert(assertion: any, message?: string): never | void;
+/** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素
+    @example seq(10, i => `item-${i}`) */
+export declare function seq<T = number>(n: number, generator?: (index: number) => T): T[];
 export declare function dedent(templ: TemplateStringsArray | string, ...values: any[]): string;
 /** 数组或 iterable 去重（可按 selector 去重）
     - selector?: 可以是 key (string) 或 (obj: any) => any

package/utils.js

@@ -27,6 +27,14 @@ export function assert(assertion, message) {
         throw Object.assign(new Error(`断言失败: ${message ? `${message}: ` : ''}${inspect(assertion, { colors: false, compact: true })}`), { assertion });
     }
 }
+/** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素
+    @example seq(10, i => `item-${i}`) */
+export function seq(n, generator) {
+    let a = new Array(n);
+    for (let i = 0; i < n; i++)
+        a[i] = generator ? generator(i) : i;
+    return a;
+}
 export function dedent(templ, ...values) {
     let strings = Array.from(typeof templ === 'string' ? [templ] : templ.raw);
     // 1. remove trailing whitespace