xshell 1.1.8 → 1.1.9

package/antd.sass

@@ -0,0 +1,43 @@
+.ant-modal-root
+    // 增加 modal 标题下方空白
+    .ant-modal-header
+        margin-bottom: 18px
+    
+    .ant-modal-mask
+        background-color: unset
+    
+    .ant-modal
+        .ant-modal-content
+            padding: 20px
+
+
+@mixin height()
+    .ant-table-wrapper
+        height: 100%
+        
+        .ant-spin-nested-loading
+            height: 100%
+            
+            .ant-spin-container
+                height: 100%
+                display: flex
+                flex-direction: column
+            
+            .ant-table-container
+                height: 100%
+                display: flex
+                flex-direction: column
+                
+                .ant-table-body
+                    position: relative
+                    flex: 1
+                    
+                    table
+                        position: absolute
+                        left: 0
+                        top: 0
+                        right: 0
+                        bottom: 0
+            
+            .ant-table
+                flex: 1

package/file.js

@@ -154,7 +154,10 @@ export async function flist(fpd, options = {}) {
         return _stats;
     }
     if (deep)
-        return (await Promise.all(fps.map(async (fp) => {
+        return (await Promise.all(
+        // 顶层文件/文件夹
+        fps.map(async (fp) => {
+            /** 顶层文件夹的大小 */
             let fpd_stats;
             return fp.isdir ?
                 [
@@ -163,7 +166,9 @@ export async function flist(fpd, options = {}) {
                         if (stats) {
                             if (!absolute)
                                 fp_or_stats.fp = fp + fp_or_stats.fp;
-                            fpd_stats.size += fp_or_stats.size;
+                            // 所有顶层文件夹中的文件（不包括文件夹）大小总和加起来作为文件夹大小
+                            if (!fp_or_stats.fp.isdir)
+                                fpd_stats.size += fp_or_stats.size;
                             return fp_or_stats;
                         }
                         else

package/i18n/dict.json

@@ -382,5 +382,8 @@
     },
     "等待 {{duration}} 秒后重试 request (已尝试 {{_count}} 次) …": {
         "en": "Wait {{duration}} seconds before retrying request (tried {{_count}} times) …"
+    },
+    "fsend 必须传 absolute 选项, sea 选项, 或 fpd_root 文件夹": {
+        "en": "fsend must be passed the absolute option, the sea option, or the fpd_root folder"
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.1.8",
+    "version": "1.1.9",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -66,7 +66,6 @@
         "@xterm/xterm": "^5.5.0",
         "ali-oss": "^6.22.0",
         "archiver": "^7.0.1",
-        "byte-size": "^9.0.1",
         "chalk": "^5.4.0",
         "chardet": "^2.0.0",
         "cli-table3": "^0.6.5",
@@ -81,7 +80,7 @@
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
         "https-proxy-agent": "^7.0.6",
-        "i18next": "^24.1.2",
+        "i18next": "^24.2.0",
         "i18next-scanner": "^4.6.0",
         "koa": "^2.15.3",
         "koa-compress": "^5.1.1",
@@ -92,7 +91,7 @@
         "ora": "^8.1.1",
         "react": "^19.0.0",
         "react-i18next": "^15.2.0",
-        "react-object-model": "^1.2.20",
+        "react-object-model": "^1.2.21",
         "resolve-path": "^1.4.0",
         "sass": "^1.83.0",
         "sass-loader": "^16.0.4",
@@ -117,7 +116,6 @@
         "@types/ali-oss": "^6.16.11",
         "@types/archiver": "^6.0.3",
         "@types/babel__traverse": "^7.20.6",
-        "@types/byte-size": "^8.1.2",
         "@types/chardet": "^0.8.3",
         "@types/eslint": "^9.6.1",
         "@types/estree": "^1.0.6",
@@ -137,7 +135,6 @@
     },
     "pnpm": {
         "patchedDependencies": {
-            "@types/byte-size@8.1.2": "patches/@types__byte-size@8.1.2.patch",
             "koa@2.15.3": "patches/koa@2.15.3.patch"
         }
     }

package/prototype.browser.d.ts

@@ -60,6 +60,8 @@ declare global {
             - pattern_placeholder?: `/\{.*?\}/g`
         */
         find(this: string, pattern: string, preservations?: string, flags?: string, pattern_placeholder?: RegExp): Record<string, string>;
+        /** 查找子串或字符出现的次数 */
+        count(this: string, search: string): number;
         /** - type?: `'single'` */
         quote(this: string, type?: keyof typeof quotes | 'psh'): string;
         /** - shape?: `'parenthesis'` */
@@ -134,8 +136,8 @@ declare global {
         to_formal_str(this: Date, ms?: boolean): string;
     }
     interface Number {
-        /** 12.4 KB (1 KB = 1024 B) */
-        to_fsize_str(this: number, units?: 'iec' | 'metric'): string;
+        /** 12.4 kb (1 kb = 1024 b) */
+        to_fsize_str(this: number): string;
         to_bin_str(this: number): string;
         /** 转换为 0x???? 这样的十六进制形式
             - length?: 位数自动对齐到 4 的倍数 */
@@ -146,8 +148,8 @@ declare global {
         /** 等价于 .at(-1) */
         last: T;
         indent(this: string[], width?: number, c?: string): string[];
-        /** 对数组中所有元素求和 (+), 返回结果 */
-        sum(this: T[]): T;
+        /** 对数组中所有元素求和 (+), 返回结果，可传入 selector 选择某个属性，或者计算出某个值，用作求和 */
+        sum<TReturn = T>(this: T[], selector?: keyof T | KeySelector<T>): TReturn;
         /** 查找数组中最大的元素，可传入 selector 选择某个属性，或者计算出某个值，用作大小比较 */
         max(this: T[], selector?: keyof T | KeySelector<T>): T;
         /** 查找数组中最小的元素，可传入 selector 选择某个属性，或者计算出某个值，用作大小比较 */
@@ -169,6 +171,8 @@ declare global {
         join_lines(append?: boolean): string;
     }
     interface BigInt {
+        /** 12.4 kb (1 kb = 1024 b) */
+        to_fsize_str(this: bigint): string;
         toJSON(this: bigint): string;
     }
     interface Error {
@@ -215,4 +219,5 @@ export declare const brackets: {
 };
 export declare function to_json(obj: any, replacer?: any): string;
 export declare function is_codepoint_fullwidth(codepoint: number): boolean;
+export declare function byte_size(bytes: number | bigint): string;
 export {};

package/prototype.browser.js

@@ -1,5 +1,4 @@
 /** 在浏览器端修改 prototype，需要更加小心 */
-import byte_size from 'byte-size';
 import EmojiRegex from 'emoji-regex';
 import { t } from "./i18n/instance.js";
 export const emoji_regex = EmojiRegex();
@@ -224,6 +223,14 @@ Object.defineProperties(String.prototype, {
             return Object.fromEntries(Object.entries($placeholders)
                 .map(([name, $i]) => [name, matches[$i] || '']));
         },
+        count(search) {
+            if (!search)
+                throw new Error('count 的 search 不能为空');
+            let count = 0;
+            for (let i = 0; (i = this.indexOf(search, i)) !== -1; i += search.length)
+                count++;
+            return count;
+        },
         quote(type = 'single') {
             if (type === 'psh')
                 return `& ${this.quote()}`;
@@ -418,9 +425,8 @@ function get_time_str(date, hour, ms, splitter) {
 }
 // ------------------------------------ Number.prototype
 Object.defineProperties(Number.prototype, to_method_property_descriptors({
-    to_fsize_str(units = 'iec') {
-        const { value, unit } = byte_size(this, { units });
-        return `${value} ${unit.replace('i', '')}`;
+    to_fsize_str() {
+        return byte_size(this);
     },
     to_bin_str() {
         return `0b${this.toString(2)}`;
@@ -467,10 +473,17 @@ Object.defineProperties(Array.prototype, {
             const indent = character.repeat(width);
             return this.map(line => indent + line);
         },
-        sum() {
-            return this.length
-                ? this.reduce((acc, x) => acc + x)
-                : undefined;
+        sum(selector) {
+            if (!this.length)
+                return undefined;
+            // 快捷路径
+            const first = this[0];
+            if ((typeof first === 'number' || typeof first === 'bigint') && !selector)
+                return this.reduce((acc, x) => acc + x, first);
+            if (is_key_type(selector))
+                selector = build_selector(selector);
+            selector ??= ident;
+            return this.reduce((acc, x) => acc + selector(x), selector(first));
         },
         max(selector = ident) {
             if (!this.length)
@@ -520,6 +533,9 @@ Object.defineProperties(Array.prototype, {
     })
 });
 Object.defineProperties(BigInt.prototype, to_method_property_descriptors({
+    to_fsize_str() {
+        return byte_size(this);
+    },
     toJSON() {
         return this.toString();
     }
@@ -583,4 +599,17 @@ export function is_codepoint_fullwidth(codepoint) {
             // cjk unified ideographs extension b .. tertiary ideographic plane
             (0x20000 <= codepoint && codepoint <= 0x3fffd)));
 }
+const units = ['b', 'kb', 'mb', 'gb', 'tb', 'pb', 'eb', 'zb', 'yb'];
+const bytes_table = units.map((unit, i) => ({
+    start: i === 0 ? 0 : 2 ** (i * 10),
+    end: 2 ** ((i + 1) * 10),
+    unit
+}));
+export function byte_size(bytes) {
+    bytes = Number(bytes);
+    const sign = bytes < 0 ? '-' : '';
+    bytes = Math.abs(bytes);
+    const { unit, start } = bytes_table.find(range => bytes >= range.start && bytes < range.end);
+    return `${sign}${start === 0 ? bytes : (bytes / start).toFixed()} ${unit}`;
+}
 //# sourceMappingURL=prototype.browser.js.map

package/prototype.d.ts

@@ -59,6 +59,8 @@ declare global {
             - flags?: `''` 正则匹配选项
             - pattern_placeholder?: `/\{.*?\}/g` */
         find(this: string, pattern: string, preservations?: string, flags?: string, pattern_placeholder?: RegExp): Record<string, string>;
+        /** 查找子串或字符出现的次数 */
+        count(this: string, search: string): number;
         /** - type?: `'single'` 引号类型 */
         quote(this: string, type?: keyof typeof quotes | 'psh'): string;
         /** - type?: `'single'` 引号类型 */
@@ -157,8 +159,8 @@ declare global {
         to_formal_str(this: Date, ms?: boolean): string;
     }
     interface Number {
-        /** 12.4 KB (1 KB = 1024 B) */
-        to_fsize_str(this: number, units?: 'iec' | 'metric'): string;
+        /** 12.4 kb (1 kb = 1024 b) */
+        to_fsize_str(this: number): string;
         to_bin_str(this: number): string;
         /** 转换为 0x???? 这样的十六进制形式
             - length?: 位数自动对齐到 4 的倍数 */
@@ -171,8 +173,8 @@ declare global {
         log(this: string[], limit?: number): void;
         indent(this: string[], width?: number, c?: string): string[];
         indent2to4(this: string[]): string[];
-        /** 对数组中所有元素求和 (+), 返回结果 */
-        sum(this: T[]): T;
+        /** 对数组中所有元素求和 (+), 返回结果，可传入 selector 选择某个属性，或者计算出某个值，用作求和 */
+        sum<TReturn = T>(this: T[], selector?: keyof T | KeySelector<T>): TReturn;
         /** 查找数组中最大的元素，可传入 selector 选择某个属性，或者计算出某个值，用作大小比较 */
         max(this: T[], selector?: keyof T | KeySelector<T>): T;
         /** 查找数组中最小的元素，可传入 selector 选择某个属性，或者计算出某个值，用作大小比较 */
@@ -199,6 +201,8 @@ declare global {
         join_lines(append?: boolean): string;
     }
     interface BigInt {
+        /** 12.4 kb (1 kb = 1024 b) */
+        to_fsize_str(this: bigint): string;
         toJSON(this: bigint): string;
     }
     interface Error {
@@ -212,9 +216,7 @@ interface SliceOptions {
     include?: boolean;
     last?: boolean;
 }
-import chalk from 'chalk';
 export declare const emoji_regex: RegExp;
-export { chalk };
 export declare const noop: () => void;
 export declare const ident: <T>(x: T) => T;
 export declare const build_selector: <TObj>(key: keyof TObj) => (obj: TObj) => TObj[keyof TObj];
@@ -248,3 +250,5 @@ export declare const brackets: {
 export declare function to_json(obj: any, replacer?: any): string;
 export declare function to_json_safely(obj: any, replacer?: any): string;
 export declare function is_codepoint_fullwidth(codepoint: number): boolean;
+export declare function byte_size(bytes: number | bigint): string;
+export {};

package/prototype.js

@@ -1,12 +1,9 @@
-import byte_size from 'byte-size';
+import util from 'util';
 import EmojiRegex from 'emoji-regex';
+export const emoji_regex = EmojiRegex();
 import strip_ansi from 'strip-ansi';
-import chalk from 'chalk';
 import { to_fp, dirname, basename, extname } from "./path.js";
 import { t } from "./i18n/instance.js";
-chalk.level = 2;
-export const emoji_regex = EmojiRegex();
-export { chalk };
 export const noop = () => { };
 export const ident = (x) => x;
 export const build_selector = (key) => (obj) => obj[key];
@@ -47,7 +44,6 @@ export const brackets = {
     fat: ['【', '】'],
     tortoise_shell: ['〔', '〕'],
 };
-const color_map = Object.fromEntries(['red_', 'green_', 'yellow_', 'blue_', 'magenta_', 'cyan_'].map(color => [color, `${color.slice(0, -1)}Bright`]));
 if (!globalThis.my_prototype_defined) {
     // ------------------------------------ String.prototype
     Object.defineProperties(String.prototype, {
@@ -222,6 +218,15 @@ if (!globalThis.my_prototype_defined) {
                 return Object.fromEntries(Object.entries($placeholders)
                     .map(([name, $i]) => [name, matches[$i] || '']));
             },
+            /** 查找子串或字符出现的次数 */
+            count(search) {
+                if (!search)
+                    throw new Error('count 的 search 不能为空');
+                let count = 0;
+                for (let i = 0; (i = this.indexOf(search, i)) !== -1; i += search.length)
+                    count++;
+                return count;
+            },
             quote(type = 'single') {
                 if (type === 'psh')
                     return `& ${this.quote()}`;
@@ -345,17 +350,21 @@ if (!globalThis.my_prototype_defined) {
                     .replace(new RegExp('([A-Za-z0-9`\\$%\\^&\\*\\-=\\+\\\\\\|\\/@\u00a1-\u00ff\u2022\u2027\u2150-\u218f])' + cjk, 'g'), '$1 $2');
             }
         }),
-        // ------------ chalk colors
+        // ------------ colors
         ...Object.fromEntries([
             'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'grey',
             'red_', 'green_', 'yellow_', 'blue_', 'magenta_', 'cyan_',
             'underline',
-        ].map(color => ([color, {
-                configurable: true,
-                get() {
-                    return chalk[color_map[color] || color](this);
-                }
-            }]))),
+        ].map(color => {
+            const style = color.endsWith('_') ? `${color.slice(0, -1)}Bright` : color;
+            return [color, {
+                    configurable: true,
+                    get() {
+                        // @ts-ignore
+                        return util.styleText(style, this, { validateStream: false });
+                    }
+                }];
+        })),
         // ------------ 文件路径操作
         ...to_getter_property_descriptors({
             isdir() {
@@ -447,9 +456,8 @@ if (!globalThis.my_prototype_defined) {
     }
     // ------------------------------------ Number.prototype
     Object.defineProperties(Number.prototype, to_method_property_descriptors({
-        to_fsize_str(units = 'iec') {
-            const { value, unit } = byte_size(this, { units });
-            return `${value} ${unit.replace('i', '')}`;
+        to_fsize_str() {
+            return byte_size(this);
         },
         to_bin_str() {
             return `0b${this.toString(2)}`;
@@ -520,10 +528,17 @@ if (!globalThis.my_prototype_defined) {
                 return this.split_indents()
                     .map(line => ' '.repeat(line.indent * 2) + line.text);
             },
-            sum() {
-                return this.length
-                    ? this.reduce((acc, x) => acc + x)
-                    : undefined;
+            sum(selector) {
+                if (!this.length)
+                    return undefined;
+                // 快捷路径
+                const first = this[0];
+                if ((typeof first === 'number' || typeof first === 'bigint') && !selector)
+                    return this.reduce((acc, x) => acc + x, first);
+                if (is_key_type(selector))
+                    selector = build_selector(selector);
+                selector ??= ident;
+                return this.reduce((acc, x) => acc + selector(x), selector(first));
             },
             max(selector = ident) {
                 if (!this.length)
@@ -573,6 +588,9 @@ if (!globalThis.my_prototype_defined) {
         })
     });
     Object.defineProperties(BigInt.prototype, to_method_property_descriptors({
+        to_fsize_str() {
+            return byte_size(this);
+        },
         toJSON() {
             return this.toString();
         }
@@ -643,4 +661,17 @@ export function is_codepoint_fullwidth(codepoint) {
             // cjk unified ideographs extension b .. tertiary ideographic plane
             (0x20000 <= codepoint && codepoint <= 0x3fffd)));
 }
+const units = ['b', 'kb', 'mb', 'gb', 'tb', 'pb', 'eb', 'zb', 'yb'];
+const bytes_table = units.map((unit, i) => ({
+    start: i === 0 ? 0 : 2 ** (i * 10),
+    end: 2 ** ((i + 1) * 10),
+    unit
+}));
+export function byte_size(bytes) {
+    bytes = Number(bytes);
+    const sign = bytes < 0 ? '-' : '';
+    bytes = Math.abs(bytes);
+    const { unit, start } = bytes_table.find(range => bytes >= range.start && bytes < range.end);
+    return `${sign}${start === 0 ? bytes : (bytes / start).toFixed()} ${unit}`;
+}
 //# sourceMappingURL=prototype.js.map

package/server.d.ts

@@ -2,7 +2,7 @@ import { type Server as HttpServer, type IncomingHttpHeaders, type IncomingMessa
 import { type Http2SecureServer, type IncomingHttpHeaders as IncomingHttp2Headers } from 'http2';
 import type { Duplex } from 'stream';
 import type { WebSocketServer } from 'ws';
-import type { default as Koa, Context, Next } from 'koa';
+import { default as Koa, type Context, type Next } from 'koa';
 declare module 'koa' {
     interface Request {
         /** 经过 decodeURIComponent 后，在路径重写之前的路径 */
@@ -13,7 +13,6 @@ declare module 'koa' {
         compress: boolean;
     }
 }
-import type { UAParser } from 'ua-parser-js';
 import { Remote, type RequestOptions, type RawResponse } from './net.ts';
 declare module 'http' {
     interface IncomingMessage {
@@ -34,7 +33,6 @@ export declare class Server {
     };
     /** sea 下最后修改时间，用于 http 资源缓存 */
     last_modified_str?: string;
-    UAParser: typeof UAParser;
     js_exts: Set<string>;
     empty_body_statuses: Set<number>;
     empty_body_methods: Set<string>;

package/server.js

@@ -6,6 +6,12 @@ import fs from 'fs';
 import { buffer as stream_to_buffer } from 'stream/consumers';
 import util from 'util';
 import node_sea from 'node:sea';
+import { default as Koa } from 'koa';
+import KoaCors from '@koa/cors';
+import KoaCompress from 'koa-compress';
+import { UAParser } from 'ua-parser-js';
+import resolve_safely from 'resolve-path';
+import { contentType as get_content_type } from 'mime-types';
 // --- my libs
 import { t } from "./i18n/instance.js";
 import { request as _request, Remote } from "./net.js";
@@ -31,7 +37,6 @@ export class Server {
     };
     /** sea 下最后修改时间，用于 http 资源缓存 */
     last_modified_str;
-    UAParser;
     js_exts = new Set(['.js', '.mjs', '.cjs']);
     empty_body_statuses = new Set([304, 204, 205]);
     empty_body_methods = new Set(['HEAD', 'OPTIONS']);
@@ -93,14 +98,9 @@ export class Server {
     }
     /** start http server and listen */
     async start() {
-        const { default: Koa } = await import('koa');
-        const { default: KoaCors } = await import('@koa/cors');
-        const { default: KoaCompress } = await import('koa-compress');
         if (sea)
             this.last_modified_str = (await fstat(exe_nodejs))
                 .mtime.toUTCString();
-        const { UAParser } = await import('ua-parser-js');
-        this.UAParser = UAParser;
         // --- init koa app
         let app = new Koa();
         app.on('error', this.on_error.bind(this));
@@ -442,7 +442,7 @@ export class Server {
     }
     format_ua(headers) {
         const { rtt, 'device-memory': memory } = headers;
-        const { device, os, browser } = this.UAParser(headers).withClientHints();
+        const { device, os, browser } = UAParser(headers).withClientHints();
         const vendor = device.vendor?.toLowerCase();
         const model = device.model?.toLowerCase();
         const osname = os.name?.toLowerCase();
@@ -603,7 +603,6 @@ export class Server {
         let { response } = ctx;
         if (!absolute && !_sea) {
             fp = fp.strip_if_start(fpd_root).strip_if_start('/');
-            const { default: resolve_safely } = await import('resolve-path');
             try {
                 fp = resolve_safely(fpd_root, fp).fp;
             }
@@ -652,7 +651,6 @@ export class Server {
         if (download)
             response.set('content-disposition', `attachment; filename="${encodeURIComponent(fp.fname)}"`);
         if (!response.get('content-type')) {
-            const { contentType: get_content_type } = await import('mime-types');
             const { fext } = fp;
             response.set('content-type', (this.js_exts.has(fext) ? 'text/javascript; chatset=utf-8' : get_content_type(fext))
                 || 'application/octet-stream');

package/patches/@types__byte-size@8.1.2.patch

@@ -1,14 +0,0 @@
-# 用来修复 `byte_size()` 函数的 ts 类型报错
-
-diff --git a/package.json b/package.json
-index dd8ed66fcb8b1ab93f0a3a015bad95bc31d3b18d..6a3753f42610451163fd7d502a93779fe3dca8db 100644
---- a/package.json
-+++ b/package.json
-@@ -11,6 +11,7 @@
-             "url": "https://github.com/lntel"
-         }
-     ],
-+    "type": "module",
-     "main": "",
-     "types": "index.d.ts",
-     "repository": {