xshell 1.0.105 → 1.0.107

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.105",
+    "version": "1.0.107",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -58,9 +58,9 @@
         "@babel/traverse": "^7.24.5",
         "@koa/cors": "^5.0.0",
         "@types/ws": "^8.5.10",
-        "@typescript-eslint/eslint-plugin": "^7.9.0",
-        "@typescript-eslint/parser": "^7.9.0",
-        "@typescript-eslint/utils": "^7.9.0",
+        "@typescript-eslint/eslint-plugin": "^7.10.0",
+        "@typescript-eslint/parser": "^7.10.0",
+        "@typescript-eslint/utils": "^7.10.0",
         "@xterm/addon-fit": "^0.10.0",
         "@xterm/addon-web-links": "^0.11.0",
         "@xterm/addon-webgl": "^0.18.0",
@@ -73,15 +73,15 @@
         "cli-table3": "^0.6.5",
         "cli-truncate": "^4.0.0",
         "colors": "^1.4.0",
-        "commander": "^12.0.0",
+        "commander": "^12.1.0",
         "emoji-regex": "^10.3.0",
-        "eslint": "^9.2.0",
+        "eslint": "^9.3.0",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-react": "^7.34.1",
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
         "https-proxy-agent": "^7.0.4",
-        "i18next": "^23.11.4",
+        "i18next": "^23.11.5",
         "i18next-scanner": "^4.4.0",
         "koa": "^2.15.3",
         "koa-compress": "^5.1.1",
@@ -90,7 +90,7 @@
         "mime-types": "^2.1.35",
         "ora": "^8.0.1",
         "react": "^18.3.1",
-        "react-i18next": "^14.1.1",
+        "react-i18next": "^14.1.2",
         "react-object-model": "^1.2.5",
         "resolve-path": "^1.4.0",
         "strip-ansi": "^7.1.0",
@@ -99,7 +99,7 @@
         "tslib": "^2.6.2",
         "typescript": "^5.4.5",
         "ua-parser-js": "^2.0.0-beta.2",
-        "undici": "^6.16.1",
+        "undici": "^6.18.1",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
         "ws": "^8.17.0"
@@ -108,7 +108,7 @@
         "@babel/types": "^7.24.5",
         "@types/ali-oss": "^6.16.11",
         "@types/archiver": "^6.0.2",
-        "@types/babel__traverse": "^7.20.5",
+        "@types/babel__traverse": "^7.20.6",
         "@types/byte-size": "^8.1.2",
         "@types/chardet": "^0.8.3",
         "@types/eslint": "^8.56.10",
@@ -119,7 +119,7 @@
         "@types/lodash": "^4.17.4",
         "@types/mime-types": "^2.1.4",
         "@types/node": "^20.12.12",
-        "@types/react": "^18.3.2",
+        "@types/react": "^18.3.3",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",

package/process.d.ts

@@ -135,6 +135,6 @@ export interface TermNodeOptions extends TermOptions {
     /** `false` --trace-warnings */
     trace_warnings?: boolean;
 }
-/** 在 term tab 中创建 node.exe 进程  create the node.exe process in term tab */
-export declare function term_nodejs(fp_js: string, args?: string[], { title, inspect, tsnode, break: _break, resolve, trace_warnings, ..._options }?: TermNodeOptions): Promise<ChildProcess>;
+/** 在 term tab 中创建 node.exe 进程 */
+export declare function term_nodejs(fp_js: string, args?: string[], { title, inspect, tsnode, break: _break, resolve, trace_warnings, ...options }?: TermNodeOptions): Promise<ChildProcess>;
 export {};

package/process.js

@@ -202,15 +202,13 @@ export async function term(exe, args = [], { cwd = process.cwd().fpd, print = tr
         envs
     });
 }
-/** 在 term tab 中创建 node.exe 进程  create the node.exe process in term tab */
-export async function term_nodejs(fp_js, args = [], { title, inspect, tsnode = false, break: _break, resolve = false, trace_warnings = false, ..._options } = {}) {
+/** 在 term tab 中创建 node.exe 进程 */
+export async function term_nodejs(fp_js, args = [], { title, inspect, tsnode = false, break: _break, resolve = false, trace_warnings = false, ...options } = {}) {
     return term(exe_nodejs, [
         ...trace_warnings ? ['--trace-warnings'] : [],
         ...resolve ? ['--experimental-specifier-resolution=node'] : [],
         ...title ? [`--title=${title}`] : [],
-        ...inspect ? [
-            _break ? `--inspect-brk=localhost:${inspect}` : `--inspect=localhost:${inspect}`
-        ] : [],
+        ...inspect ? [`--inspect${_break ? '-brk' : ''}=localhost:${inspect}`] : [],
         ...tsnode ? [
             '--loader=ts-node/esm',
             '--experimental-specifier-resolution=node'
@@ -219,7 +217,7 @@ export async function term_nodejs(fp_js, args = [], { title, inspect, tsnode = f
         ...args
     ], {
         title,
-        ..._options,
+        ...options,
     });
 }
 const short_exe_names = {

package/prototype.browser.d.ts

@@ -75,10 +75,14 @@ declare global {
             text: string;
         };
         space(this: string): string;
-        /** assert 确保字符串以 prefix 开头（失败时抛出错误），并返回去掉该 prefix 的字符串 */
-        strip_start(this: string, prefix: string): string;
-        /** assert 确保字符串以 suffix 结尾（失败时抛出错误），并返回去掉该 suffix 的字符串 */
-        strip_end(this: string, suffix: string): string;
+        /** 返回去掉 prefix 开头的字符串，可选 validate = true 确保字符串以 prefix 开头（失败时抛出错误） */
+        strip_start(this: string, prefix: string, validate?: boolean): string;
+        /** 返回去掉 prefix 开头的字符串，如果没有以 prefix 开头则返回原字符串 */
+        strip_if_start(this: string, prefix: string): string;
+        /** 返回去掉 suffix 结尾的字符串，可选 validate = true 确保字符串以 suffix 结尾（失败时抛出错误） */
+        strip_end(this: string, suffix: string, validate?: boolean): string;
+        /** 返回去掉 suffix 结尾的字符串，如果没有以 suffix 结尾则返回原字符串 */
+        strip_if_end(this: string, suffix: string): string;
         /** 等价于 .endsWith('/') */
         isdir: boolean;
         /** 以 `/` 分割的路径，可能以 / 结尾 */

package/prototype.browser.js

@@ -259,17 +259,21 @@ Object.defineProperties(String.prototype, {
                 text: this.slice(i)
             };
         },
-        strip_start(prefix) {
-            if (this.startsWith(prefix))
-                return this.slice(prefix.length);
-            else
+        strip_start(prefix, validate) {
+            if (validate && !this.startsWith(prefix))
                 throw new Error(`字符串没有以前缀 ${prefix} 开头: ${this}`);
+            return this.slice(prefix.length);
         },
-        strip_end(suffix) {
-            if (this.endsWith(suffix))
-                return this.slice(0, -suffix.length);
-            else
+        strip_if_start(prefix) {
+            return this.startsWith(prefix) ? this.slice(prefix.length) : this;
+        },
+        strip_end(suffix, validate) {
+            if (validate && !this.endsWith(suffix))
                 throw new Error(`字符串没有以后缀 ${suffix} 结尾: ${this}`);
+            return this.slice(0, -suffix.length);
+        },
+        strip_if_end(suffix) {
+            return this.endsWith(suffix) ? this.slice(0, -suffix.length) : this;
         },
         space() {
             if (!this)

package/prototype.d.ts

@@ -98,10 +98,14 @@ declare global {
         decode_base64(this: string, buffer: true): Buffer;
         decode_base64(this: string, buffer?: boolean): string | Buffer;
         space(this: string): string;
-        /** assert 确保字符串以 prefix 开头（失败时抛出错误），并返回去掉该 prefix 的字符串 */
-        strip_start(this: string, prefix: string): string;
-        /** assert 确保字符串以 suffix 结尾（失败时抛出错误），并返回去掉该 suffix 的字符串 */
-        strip_end(this: string, suffix: string): string;
+        /** 返回去掉 prefix 开头的字符串，可选 validate = true 确保字符串以 prefix 开头（失败时抛出错误） */
+        strip_start(this: string, prefix: string, validate?: boolean): string;
+        /** 返回去掉 prefix 开头的字符串，如果没有以 prefix 开头则返回原字符串 */
+        strip_if_start(this: string, prefix: string): string;
+        /** 返回去掉 suffix 结尾的字符串，可选 validate = true 确保字符串以 suffix 结尾（失败时抛出错误） */
+        strip_end(this: string, suffix: string, validate?: boolean): string;
+        /** 返回去掉 suffix 结尾的字符串，如果没有以 suffix 结尾则返回原字符串 */
+        strip_if_end(this: string, suffix: string): string;
         /** 等价于 .endsWith('/') */
         isdir: boolean;
         /** 以 `/` 分割的路径，可能以 / 结尾 */

package/prototype.js

@@ -278,17 +278,21 @@ if (!globalThis.my_prototype_defined) {
             strip_ansi() {
                 return strip_ansi(this);
             },
-            strip_start(prefix) {
-                if (this.startsWith(prefix))
-                    return this.slice(prefix.length);
-                else
+            strip_start(prefix, validate) {
+                if (validate && !this.startsWith(prefix))
                     throw new Error(`字符串没有以前缀 ${prefix} 开头: ${this}`);
+                return this.slice(prefix.length);
             },
-            strip_end(suffix) {
-                if (this.endsWith(suffix))
-                    return this.slice(0, -suffix.length);
-                else
+            strip_if_start(prefix) {
+                return this.startsWith(prefix) ? this.slice(prefix.length) : this;
+            },
+            strip_end(suffix, validate) {
+                if (validate && !this.endsWith(suffix))
                     throw new Error(`字符串没有以后缀 ${suffix} 结尾: ${this}`);
+                return this.slice(0, -suffix.length);
+            },
+            strip_if_end(suffix) {
+                return this.endsWith(suffix) ? this.slice(0, -suffix.length) : this;
             },
             space() {
                 if (!this)

package/server.d.ts

@@ -112,7 +112,7 @@ export declare class Server {
             await this.try_send(
                 ctx,
                 `T:/t/docs${prefix_docs}`,
-                (path.endsWith('/') ? `${path}index.html` : path).slice(prefix_docs.length),
+                (path.endsWith('/') ? `${path}index.html` : path).strip_start(prefix_docs),
                 true
             )
             return

package/server.js

@@ -110,13 +110,13 @@ export class Server {
             // fpd_certs 文件夹下面的每个 .key 对应一个证书及域名
             (await flist(fpd_certs, { print: false, filter: /\.key$/ }))
                 .map(async (fname) => {
-                let domain = fname.slice(0, -'.key'.length);
+                let domain = fname.strip_end('.key');
                 const [key, cert] = await Promise.all([
                     fname,
                     `${domain}.crt`,
                 ].map(async (fname) => fread(`${fpd_certs}${fname}`, { print: false })));
                 if (domain.startsWith('star.'))
-                    domain = `*.${domain.slice('star.'.length)}`;
+                    domain = `*.${domain.strip_start('star.')}`;
                 return [domain, { key, cert }];
             })));
             const default_ctx = lazy_secure_ctxs[this.default_hostnames.find(hostname => hostname in lazy_secure_ctxs)];
@@ -125,6 +125,7 @@ export class Server {
                 SNICallback(servername, callback) {
                     let lazy_ctx = lazy_secure_ctxs[servername] ||
                         lazy_secure_ctxs[servername.replace(/^.*?\./, '*.')] ||
+                        lazy_secure_ctxs[`*.${servername}`] ||
                         default_ctx;
                     callback(null, lazy_ctx.ctx ??= createSecureContext(lazy_ctx));
                 },
@@ -247,7 +248,7 @@ export class Server {
         // 时间
         `${new Date().to_time_str()}  ` +
             // ip（位置）
-            (ip || '').limit(60) + '  ' +
+            (ip || '').limit(40) + '  ' +
             // ua
             this.format_ua(headers).limit(56) + '  ' +
             // https／2.0
@@ -346,7 +347,7 @@ export class Server {
         // 时间
         s += `${new Date().to_time_str()}  `;
         // ip（位置）
-        s += (ip || '').limit(60) + '  ';
+        s += (ip || '').limit(40) + '  ';
         // ua
         s += this.process_ua(ctx).limit(56) + '  ';
         // https／2.0
@@ -380,9 +381,8 @@ export class Server {
         // query
         if (Object.keys(query).length) {
             let t = inspect(query, { compact: true })
-                .replace('[Object: null prototype] ', '');
-            if (t.endsWith('\n'))
-                t = t.slice(0, -1);
+                .replace('[Object: null prototype] ', '')
+                .strip_if_end('\n');
             s += (s + t).width > output_width ? '\n' : '    ';
             s += t;
         }
@@ -516,7 +516,7 @@ export class Server {
             await this.try_send(
                 ctx,
                 `T:/t/docs${prefix_docs}`,
-                (path.endsWith('/') ? `${path}index.html` : path).slice(prefix_docs.length),
+                (path.endsWith('/') ? `${path}index.html` : path).strip_start(prefix_docs),
                 true
             )
             return
@@ -556,10 +556,7 @@ export class Server {
         const { request, request: { method } } = ctx;
         let { response } = ctx;
         if (!absolute) {
-            if (fp.startsWith(root))
-                fp = fp.slice(root.length);
-            if (fp.startsWith('/'))
-                fp = fp.slice(1);
+            fp = fp.strip_if_start(root).strip_if_start('/');
             const { default: resolve_safely } = await import('resolve-path');
             try {
                 fp = resolve_safely(root, fp).fp;