xshell 1.0.157 → 1.0.158

package/git.d.ts

@@ -30,10 +30,11 @@ export declare class Git {
         print?: boolean;
         remote?: string;
     }): Promise<void>;
-    /** - branch?: `'main'` */
+    /** 创建或者切换到分支
+       - branch?: `'main'` */
     checkout(branch?: 'main'): Promise<void>;
     checkout(branch?: string): Promise<void>;
-    _checkout(branch?: string): Promise<void>;
+    _checkout(branch: string, create: boolean, remote_branch?: string): Promise<void>;
     get_version_info(version?: string): Promise<{
         version: string;
         branch: string;

package/git.js

@@ -86,20 +86,25 @@ export class Git {
             console.log('更新远程分支成功');
     }
     async checkout(branch = 'main') {
-        if (branch === 'main')
-            await this._checkout('main');
-        else {
+        let create = false;
+        if (branch !== 'main') {
             const branches = await this.get_branches(false);
-            if (branches.includes(branch) || branches.find(b => b.endsWith(`/${branch}`) && b.startsWith('remotes/')))
-                await this._checkout(branch);
-            else {
-                console.log(`创建分支 ${branch}`);
-                await this.call(['checkout', '-b', branch], print_no_command);
-            }
+            // 无本地及远程对应分支
+            if (!(branches.includes(branch) ||
+                branches.find(b => b.endsWith(`/${branch}`) && b.startsWith('remotes/'))))
+                create = true;
         }
+        if (create)
+            console.log(`创建分支 ${branch}`);
+        await this._checkout(branch, create);
     }
-    async _checkout(branch) {
-        await this.call(['checkout', branch], print_no_command);
+    async _checkout(branch, create, remote_branch) {
+        await this.call([
+            'checkout',
+            ...create ? ['-b'] : [],
+            branch,
+            ...remote_branch ? [remote_branch] : []
+        ], print_no_command);
     }
     async get_version_info(version) {
         const branch = await this.get_branch();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.157",
+    "version": "1.0.158",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -49,23 +49,24 @@
         ]
     },
     "dependencies": {
-        "@babel/core": "^7.24.9",
-        "@babel/parser": "^7.24.8",
-        "@babel/traverse": "^7.24.8",
+        "@babel/core": "^7.25.2",
+        "@babel/parser": "^7.25.3",
+        "@babel/traverse": "^7.25.3",
         "@koa/cors": "^5.0.0",
+        "@stylistic/eslint-plugin": "^2.6.0",
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.8",
-        "@types/ws": "^8.5.11",
-        "@typescript-eslint/eslint-plugin": "^7.16.1",
-        "@typescript-eslint/parser": "^7.16.1",
-        "@typescript-eslint/utils": "^7.16.1",
+        "@types/ws": "^8.5.12",
+        "@typescript-eslint/eslint-plugin": "^8.0.0",
+        "@typescript-eslint/parser": "^8.0.0",
+        "@typescript-eslint/utils": "^8.0.0",
         "@xterm/addon-fit": "^0.10.0",
         "@xterm/addon-web-links": "^0.11.0",
         "@xterm/addon-webgl": "^0.18.0",
         "@xterm/xterm": "^5.5.0",
         "ali-oss": "^6.20.0",
         "archiver": "^7.0.1",
-        "byte-size": "^8.1.1",
+        "byte-size": "^9.0.0",
         "chalk": "^5.3.0",
         "chardet": "^2.0.0",
         "cli-table3": "^0.6.5",
@@ -74,13 +75,13 @@
         "commander": "^12.1.0",
         "css-loader": "^7.1.2",
         "emoji-regex": "^10.3.0",
-        "eslint": "^9.7.0",
+        "eslint": "^9.8.0",
         "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-react": "^7.34.4",
+        "eslint-plugin-react": "^7.35.0",
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
         "https-proxy-agent": "^7.0.5",
-        "i18next": "^23.12.1",
+        "i18next": "^23.12.2",
         "i18next-scanner": "^4.5.0",
         "koa": "^2.15.3",
         "koa-compress": "^5.1.1",
@@ -90,11 +91,11 @@
         "mime-types": "^2.1.35",
         "ora": "^8.0.1",
         "react": "^18.3.1",
-        "react-i18next": "^14.1.3",
+        "react-i18next": "^15.0.0",
         "react-object-model": "^1.2.8",
         "resolve-path": "^1.4.0",
         "sass": "^1.77.8",
-        "sass-loader": "^14.2.1",
+        "sass-loader": "^16.0.0",
         "source-map-loader": "^5.0.0",
         "strip-ansi": "^7.1.0",
         "style-loader": "^4.0.0",
@@ -102,9 +103,9 @@
         "tough-cookie": "^4.1.4",
         "ts-loader": "^9.5.1",
         "tslib": "^2.6.3",
-        "typescript": "^5.5.3",
+        "typescript": "^5.5.4",
         "ua-parser-js": "^2.0.0-beta.3",
-        "undici": "^6.19.2",
+        "undici": "^6.19.5",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
         "webpack": "^5.93.0",
@@ -112,20 +113,20 @@
         "ws": "^8.18.0"
     },
     "devDependencies": {
-        "@babel/types": "^7.24.9",
+        "@babel/types": "^7.25.2",
         "@types/ali-oss": "^6.16.11",
         "@types/archiver": "^6.0.2",
         "@types/babel__traverse": "^7.20.6",
         "@types/byte-size": "^8.1.2",
         "@types/chardet": "^0.8.3",
-        "@types/eslint": "^8.56.10",
+        "@types/eslint": "^9.6.0",
         "@types/estree": "^1.0.5",
         "@types/gulp-sort": "^2.0.4",
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.17.7",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^20.14.10",
+        "@types/node": "^22.0.2",
         "@types/react": "^18.3.3",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",

package/path.d.ts

@@ -55,7 +55,7 @@ export declare function extname(path: string): string;
 /** `/` */
 export declare const sep = "/";
 /** The platform-specific file delimiter. ';' or ':'. */
-export declare const delimiter: ":" | ";";
+export declare const delimiter: ";" | ":";
 /** Returns an object from a path string - the opposite of format().
     @param path path to evaluate.
     @throws {TypeError} if `path` is not a string. */
@@ -83,7 +83,7 @@ export declare let path: {
     basename: typeof basename;
     extname: typeof extname;
     sep: string;
-    delimiter: ":" | ";";
+    delimiter: ";" | ":";
     parse: typeof parse;
     format: typeof format;
     toNamespacedPath: typeof toNamespacedPath;

package/process.d.ts

@@ -1,6 +1,7 @@
 import { type ChildProcess } from 'child_process';
 import './prototype.js';
 import { Encoding } from './file.js';
+import type { MyProxy } from './net.js';
 import { inspect } from './utils.js';
 export declare const exe_nodejs: string;
 export declare const platform: NodeJS.Platform;
@@ -21,6 +22,8 @@ interface StartOptions {
     cwd?: string;
     /** `process.env` 覆盖/添加到 process.env 的环境变量 */
     envs?: Record<string, string>;
+    /** 创建子进程时添加 http_proxy, https_proxy, no_proxy 环境变量以启用代理 */
+    proxy?: MyProxy | true;
     /** `'utf-8'` 子进程输出编码  child output encoding */
     encoding?: Encoding | 'binary';
     /** `true` print 选项，支持设置细项  print option (with details) */
@@ -57,7 +60,7 @@ interface StartOptions {
         - print?: `true` print 选项，支持设置细项  print option (with details)
         - stdio?: `'pipe'` 设置为 'ignore' 时忽略 stdio 处理  when 'ignore' then ignore stdio processing
         - detached?: `false` 是否断开和 child 的关系 (ignore stdio, unref)  whether to break the connection with child (ignore stdio, unref) */
-export declare function start(exe: string, args?: string[], { cwd, encoding, print, stdio, detached, envs, window: _window, }?: StartOptions): Promise<ChildProcess>;
+export declare function start(exe: string, args?: string[], { cwd, encoding, print, stdio, detached, envs, window: _window, proxy, }?: StartOptions): Promise<ChildProcess>;
 export declare function start_nodejs(js: string, args?: string[], options?: StartOptions): Promise<ChildProcess>;
 export interface CallOptions extends StartOptions {
     throw_code?: boolean;

package/process.js

@@ -18,14 +18,26 @@ export const print_no_command = { print: { command: false, code: false, stdout:
         - print?: `true` print 选项，支持设置细项  print option (with details)
         - stdio?: `'pipe'` 设置为 'ignore' 时忽略 stdio 处理  when 'ignore' then ignore stdio processing
         - detached?: `false` 是否断开和 child 的关系 (ignore stdio, unref)  whether to break the connection with child (ignore stdio, unref) */
-export async function start(exe, args = [], { cwd, encoding = 'utf-8', print = true, stdio = 'pipe', detached = false, envs, window: _window = true, } = {}) {
+export async function start(exe, args = [], { cwd, encoding = 'utf-8', print = true, stdio = 'pipe', detached = false, envs, window: _window = true, proxy, } = {}) {
+    if (proxy === true) {
+        const { MyProxy } = await import('./net.js');
+        proxy = MyProxy.socks5;
+    }
     const options = {
         cwd,
         shell: false,
         windowsHide: !_window,
         stdio,
-        ...envs ? {
-            env: { ...process.env, ...envs }
+        ...envs || proxy ? {
+            env: {
+                ...process.env,
+                ...proxy ? {
+                    http_proxy: proxy,
+                    https_proxy: proxy,
+                    no_proxy: '127.0.0.1,::1,localhost,192.168.0.0/20,192.168.100.0/24'
+                } : {},
+                ...envs
+            }
         } : {},
     };
     if (typeof print === 'boolean')

package/prototype.browser.d.ts

@@ -77,14 +77,22 @@ declare global {
             text: string;
         };
         space(this: string): string;
-        /** 返回去掉 prefix 开头的字符串，可选 validate = true 确保字符串以 prefix 开头（失败时抛出错误） */
+        /** 返回去掉 prefix 开头的字符串
+            - validate?: `false` 传 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 结尾（失败时抛出错误） */
+        /** 返回去掉 suffix 结尾的字符串
+            - validate?: `false` 传 true 时确保字符串以 suffix 结尾（失败时抛出错误） */
         strip_end(this: string, suffix: string, validate?: boolean): string;
         /** 返回去掉 suffix 结尾的字符串，如果没有以 suffix 结尾则返回原字符串 */
         strip_if_end(this: string, suffix: string): string;
+        /** 从 search 字符串出现的位置开始截取到最后
+            - include?: `false` 传 true 时包括 search 部分 */
+        slice_from(this: string, search: string, include?: boolean): string;
+        /** 从 search 字符串出现的位置开始截断，去掉尾部
+            - include?: `false` 传 true 时包括 search 部分 */
+        slice_to(this: string, search: string, include?: boolean): string;
         /** 等价于 .endsWith('/') */
         isdir: boolean;
         /** 以 `/` 分割的路径，可能以 / 结尾 */

package/prototype.browser.js

@@ -275,6 +275,20 @@ Object.defineProperties(String.prototype, {
         strip_if_end(suffix) {
             return this.endsWith(suffix) ? this.slice(0, -suffix.length) : this;
         },
+        slice_from(search, include = false) {
+            const i = this.indexOf(search);
+            if (i === -1)
+                throw new Error(`slice_from 在字符串 ${this} 中找不到 search: ${search}`);
+            else
+                return this.slice(include ? i : i + search.length);
+        },
+        slice_to(search, include) {
+            const i = this.lastIndexOf(search);
+            if (i === -1)
+                throw new Error(`slice_to 在字符串 ${this} 中找不到 search: ${search}`);
+            else
+                return this.slice(0, include ? i + search.length : i);
+        },
         space() {
             if (!this)
                 return this;

package/prototype.d.ts

@@ -99,14 +99,22 @@ declare global {
         decode_base64(this: string, buffer: true): Buffer;
         decode_base64(this: string, buffer?: boolean): string | Buffer;
         space(this: string): string;
-        /** 返回去掉 prefix 开头的字符串，可选 validate = true 确保字符串以 prefix 开头（失败时抛出错误） */
+        /** 返回去掉 prefix 开头的字符串
+            - validate?: `false` 传 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 结尾（失败时抛出错误） */
+        /** 返回去掉 suffix 结尾的字符串
+            - validate?: `false` 传 true 时确保字符串以 suffix 结尾（失败时抛出错误） */
         strip_end(this: string, suffix: string, validate?: boolean): string;
         /** 返回去掉 suffix 结尾的字符串，如果没有以 suffix 结尾则返回原字符串 */
         strip_if_end(this: string, suffix: string): string;
+        /** 从 search 字符串出现的位置开始截取到最后
+            - include?: `false` 传 true 时包括 search 部分 */
+        slice_from(this: string, search: string, include?: boolean): string;
+        /** 从 search 字符串出现的位置开始截断，去掉尾部
+            - include?: `false` 传 true 时包括 search 部分 */
+        slice_to(this: string, search: string, include?: boolean): string;
         /** 等价于 .endsWith('/') */
         isdir: boolean;
         /** 以 `/` 分割的路径，可能以 / 结尾 */

package/prototype.js

@@ -294,6 +294,20 @@ if (!globalThis.my_prototype_defined) {
             strip_if_end(suffix) {
                 return this.endsWith(suffix) ? this.slice(0, -suffix.length) : this;
             },
+            slice_from(search, include = false) {
+                const i = this.indexOf(search);
+                if (i === -1)
+                    throw new Error(`slice_from 在字符串 ${this} 中找不到 search: ${search}`);
+                else
+                    return this.slice(include ? i : i + search.length);
+            },
+            slice_to(search, include) {
+                const i = this.lastIndexOf(search);
+                if (i === -1)
+                    throw new Error(`slice_to 在字符串 ${this} 中找不到 search: ${search}`);
+                else
+                    return this.slice(0, include ? i + search.length : i);
+            },
             space() {
                 if (!this)
                     return this;

package/utils.browser.d.ts

@@ -68,7 +68,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 这种版本号
     - l, r: 两个版本号字符串
     - loose?: 宽松模式，允许两个版本号格式（位数）不一致 */

package/utils.d.ts

@@ -37,7 +37,7 @@ export declare function filter_values<TObj extends Record<string, any>>(obj: TOb
 /** 忽略对象中的 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 这种版本号
     - l, r: 两个版本号字符串
     - loose?: 宽松模式，允许两个版本号格式（位数）不一致 */

package/xlint.d.ts

@@ -1,3 +1,3 @@
 import type { ESLint, Linter } from 'eslint';
 export declare const xlint_plugin: ESLint.Plugin;
-export declare const xlint_config: Linter.FlatConfig;
+export declare const xlint_config: Linter.Config;

package/xlint.js

@@ -3,6 +3,7 @@ import TSParser from '@typescript-eslint/parser';
 import ts_plugin from '@typescript-eslint/eslint-plugin';
 import react_plugin from 'eslint-plugin-react';
 import import_plugin from 'eslint-plugin-import';
+import stylistic_plugin from '@stylistic/eslint-plugin';
 const line_break_pattern = /\r\n|[\r\n\u2028\u2029]/u;
 const meta = {
     fixable: 'whitespace',
@@ -85,11 +86,11 @@ export const xlint_plugin = {
                         if (node.alternate && node.alternate.type !== 'IfStatement')
                             lint(node.alternate, node);
                     },
-                    WhileStatement: node => lint(node.body, node),
-                    DoWhileStatement: node => lint(node.body, node),
-                    ForStatement: node => lint(node.body, node),
-                    ForInStatement: node => lint(node.body, node),
-                    ForOfStatement: node => lint(node.body, node)
+                    WhileStatement: node => { lint(node.body, node); },
+                    DoWhileStatement: node => { lint(node.body, node); },
+                    ForStatement: node => { lint(node.body, node); },
+                    ForInStatement: node => { lint(node.body, node); },
+                    ForOfStatement: node => { lint(node.body, node); }
                 };
             },
         },
@@ -741,7 +742,7 @@ export const xlint_config = {
         parserOptions: {
             ecmaVersion: 'latest',
             sourceType: 'module',
-            project: './tsconfig.json',
+            projectService: true,
             ecmaFeatures: {
                 jsx: true
             },
@@ -751,6 +752,7 @@ export const xlint_config = {
         '@typescript-eslint': ts_plugin,
         react: react_plugin,
         import: import_plugin,
+        '@stylistic': stylistic_plugin,
         xlint: xlint_plugin,
     },
     settings: {
@@ -770,9 +772,9 @@ export const xlint_config = {
         'xlint/keep-indent': 'error',
         // 函数使用 function 来声明而不是 const foo = () => { }
         'xlint/func-style': 'error',
-        '@typescript-eslint/semi': ['error', 'never'],
-        '@typescript-eslint/no-extra-semi': 'error',
-        'semi-style': ['error', 'first'],
+        '@stylistic/semi': ['error', 'never'],
+        '@stylistic/no-extra-semi': 'error',
+        '@stylistic/semi-style': ['error', 'first'],
         // 使用 ===
         eqeqeq: 'error',
         // 父类尽量返回 this 类型
@@ -780,7 +782,7 @@ export const xlint_config = {
         // 尽量使用 . 访问属性而不是 []
         '@typescript-eslint/dot-notation': 'error',
         // 必须 throw Error
-        '@typescript-eslint/no-throw-literal': 'error',
+        '@typescript-eslint/only-throw-error': 'error',
         // ------------ async
         // 返回 Promise 的函数一定要标记为 async 函数
         '@typescript-eslint/promise-function-async': 'error',
@@ -788,60 +790,60 @@ export const xlint_config = {
         '@typescript-eslint/return-await': 'error',
         // ------------ 括号
         // a => { } 而不是 (a) => { }
-        'arrow-parens': ['error', 'as-needed', { requireForBlockBody: false }],
+        '@stylistic/arrow-parens': ['error', 'as-needed', { requireForBlockBody: false }],
         // 不要多余的大括号
         // if (true)
         //     console.log()
         curly: ['error', 'multi'],
         // 简单属性不要冗余的大括号 <Component prop='simple-value' />
-        'react/jsx-curly-brace-presence': ['error', 'never'],
+        '@stylistic/jsx-curly-brace-presence': ['error', 'never'],
         // ------------ 空格
         // { a, b } 这样的对象，大括号里面要有空格
-        '@typescript-eslint/object-curly-spacing': ['error', 'always'],
+        '@stylistic/object-curly-spacing': ['error', 'always'],
         // [a, b, c]
-        '@typescript-eslint/comma-spacing': 'error',
+        '@stylistic/comma-spacing': 'error',
         // foo()
-        '@typescript-eslint/func-call-spacing': 'error',
+        '@stylistic/func-call-spacing': 'error',
         // a => { } 中箭头左右两边空格
-        'arrow-spacing': ['error'],
+        '@stylistic/arrow-spacing': ['error'],
         // 注释双斜杠后面要有空格
-        'spaced-comment': ['error', 'always', { markers: ['/'] }],
+        '@stylistic/spaced-comment': ['error', 'always', { markers: ['/'] }],
         // 函数声明中，名称后面要有空格
-        '@typescript-eslint/space-before-function-paren': 'error',
+        '@stylistic/space-before-function-paren': 'error',
         // { return true } 这样的 block 大括号里面要有空格
-        'block-spacing': ['error', 'always'],
+        '@stylistic/block-spacing': ['error', 'always'],
         // aaa: 123
-        '@typescript-eslint/key-spacing': ['error', { beforeColon: false, afterColon: true, mode: 'minimum' }],
+        '@stylistic/key-spacing': ['error', { beforeColon: false, afterColon: true, mode: 'minimum' }],
         // aaa: string
-        '@typescript-eslint/type-annotation-spacing': 'error',
+        '@stylistic/type-annotation-spacing': 'error',
         // if ()
-        '@typescript-eslint/keyword-spacing': ['error', { before: true, after: true }],
+        '@stylistic/keyword-spacing': ['error', { before: true, after: true }],
         // if (1) { }
-        '@typescript-eslint/space-before-blocks': 'error',
+        '@stylistic/space-before-blocks': 'error',
         // case 1: ...
-        'switch-colon-spacing': 'error',
+        '@stylistic/switch-colon-spacing': 'error',
         // <Hello name={firstname} />
-        'react/jsx-equals-spacing': ['error', 'never'],
+        '@stylistic/jsx-equals-spacing': ['error', 'never'],
         // 不允许使用 tab
-        'no-tabs': 'error',
+        '@stylistic/no-tabs': 'error',
         // 使用 \n 换行
-        'linebreak-style': ['error', 'unix'],
+        '@stylistic/linebreak-style': ['error', 'unix'],
         // 文件以 \n 结尾
-        'eol-last': ['error', 'always'],
+        '@stylistic/eol-last': ['error', 'always'],
         // ------------ 引号
         // 用单引号
-        'jsx-quotes': ['error', 'prefer-single'],
+        '@stylistic/jsx-quotes': ['error', 'prefer-single'],
         // 用单引号
-        quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: false }],
+        '@stylistic/quotes': ['error', 'single', { avoidEscape: true, allowTemplateLiterals: false }],
         // 不要冗余的引号包裹属性
-        'quote-props': ['error', 'as-needed', { keywords: false, unnecessary: true }],
+        '@stylistic/quote-props': ['error', 'as-needed', { keywords: false, unnecessary: true }],
         // ------------ 其它
         // boolean 属性不要冗余的 ={true} <Component boolprop />
         'react/jsx-boolean-value': ['error', 'never'],
         // 没有 children 的 Component 写成闭合标签 <Component />
         'react/self-closing-comp': 'error',
         // 单行类型声明用 `,` 分割，多行类型声明结尾不要加分号
-        '@typescript-eslint/member-delimiter-style': [
+        '@stylistic/member-delimiter-style': [
             'error',
             {
                 multiline: {