xshell 1.0.58 → 1.0.60

package/.eslintrc.json

@@ -51,6 +51,9 @@
         
         "xlint/keep-indent": "error",
         
+        // 函数使用 function 来声明而不是 const foo = () => { }
+        "xlint/func-style": "error",
+        
         
         "@typescript-eslint/semi": ["error", "never"],
         "@typescript-eslint/no-extra-semi": "error",
@@ -170,6 +173,14 @@
         
         "@typescript-eslint/prefer-includes": "error",
         
-        "@typescript-eslint/prefer-regexp-exec": "error"
+        "@typescript-eslint/prefer-regexp-exec": "error",
+        
+        // 禁止使用 export default
+        "no-restricted-exports": ["error", { "restrictDefaultExports": { "direct": true, "named": true, "defaultFrom": true, "namedFrom": true, "namespaceFrom": true } }],
+        
+        "@typescript-eslint/consistent-type-imports": ["error", { "fixStyle": "inline-type-imports", "disallowTypeAnnotations": false }],
+        
+        // () => { 返回 void 的表达式 }
+        "@typescript-eslint/no-confusing-void-expression": "error"
     }
 }

package/file.d.ts

@@ -5,6 +5,7 @@ import { promises as fsp, default as fs } from 'fs';
 type FileHandle = fsp.FileHandle & {
     fp: string;
 };
+export { fsp };
 export type Encoding = 'utf-8' | 'gb18030' | 'shift-jis' | 'utf-16le';
 export declare const encodings: readonly ["utf-8", "gb18030", "shift-jis", "utf-16le"];
 /** fp 所指向的 文件/ 文件夹 是否存在
@@ -85,8 +86,8 @@ export interface FListOptions {
         - deep?: `false` 递归遍历 recursively
         - absolute?: `false` 返回、打印完整路径而不是相对路径，为 false 时返回的 FStats.fp 也会被修改 Return, print full path instead of relative path, FStats.fp returned when false will also be modified
         - print?: `true`
-        - filter?: `true`  RegExp | (fp: string) => any 注意当 deep = true 时被 filter 过滤掉的目录及目录中的文件不会包含在结果中
-                    Note that when deep = true, directories and files in directories that are filtered out by the filter will not be included in the results
+        - filter?: `() => true`  RegExp | (fp: string) => any
+            注意当 deep = true 时被 filter 过滤掉的目录及目录中的文件不会包含在结果中
         - stats?: `false` 启用后返回 FStats 列表
                    Returns the FStats list when enabled */
 export declare function flist(fpd: string): Promise<string[]>;
@@ -177,4 +178,3 @@ export declare function ftail(fp: string, handler: (lines: string[]) => void | P
 export declare function freplace(fp: string, pattern: string | RegExp, replacement: string, { print }?: {
     print?: boolean;
 }): Promise<void>;
-export {};

package/file.js

@@ -4,6 +4,7 @@ import { path } from './path.js';
 import { t } from './i18n/instance.js';
 import { to_json } from './prototype.js';
 import { assert, Lock } from './utils.js';
+export { fsp };
 export const encodings = ['utf-8', 'gb18030', 'shift-jis', 'utf-16le'];
 /** fp 所指向的 文件/ 文件夹 是否存在
     Does the file/folder pointed to by fp exist?  */
@@ -269,14 +270,14 @@ export async function fmove(fp_src, fp_dst, { overwrite = false, print = true }
     assert(path.isAbsolute(fp_src) && path.isAbsolute(fp_dst), t('fp_src 和 fp_dst 必须为完整路径'));
     if (print)
         console.log(t('移动'), fp_src, '->', fp_dst);
-    if (!overwrite && fexists(fp_dst))
+    if (!overwrite && fexists(fp_dst, { print: false }))
         throw new Error(`${t('已存在')} ${fp_dst}`);
     await fmkdir(fp_dst.fdir, { print: false });
     async function copy_and_delete() {
-        await fcopy(fp_src, fp_dst, { overwrite, print });
-        await fdelete(fp_src, { print });
+        await fcopy(fp_src, fp_dst, { overwrite, print: false });
+        await fdelete(fp_src, { print: false });
     }
-    if (fp_src[0] !== fp_dst[0])
+    if (fp_src[0] !== fp_dst[0] || overwrite)
         await copy_and_delete();
     else
         try {
@@ -349,9 +350,9 @@ export async function flink(fp_real, fp_link, { junction = false, print = true }
     const is_fpd_link = fp_link.isdir;
     assert(is_fpd_real === is_fpd_link, t('fp_real 和 fp_link 必须同为文件路径或文件夹路径'));
     if (fexists(fp_link))
-        throw new Error(t('存在同名') + (is_fpd_link ? t('文件夹') : t('文件')) + ': ' + fp_link + t('，无法创建链接'));
+        throw new Error(`${t('存在同名')}${is_fpd_link ? t('文件夹') : t('文件')}: ${fp_link}${t('，无法创建链接')}`);
     if (print)
-        console.log(t('已将源文件 ') + fp_real + t(' 链接到 ') + fp_link);
+        console.log(`${t('已将源文件 ')}${fp_real}${t(' 链接到 ')}${fp_link}`);
     if (junction)
         fsp.symlink(fp_real, fp_link, 'junction');
     else

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/116.0.0.0 Safari/537.36',
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.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.58",
+  "version": "1.0.60",
   "type": "module",
   "main": "./index.js",
   "bin": {
@@ -16,7 +16,7 @@
     "interactive programming"
   ],
   "engines": {
-    "node": ">=20.6.0",
+    "node": ">=20.6.1",
     "vscode": ">=1.81.0"
   },
   "author": "ShenHongFei <shen.hongfei@outlook.com> (https://github.com/ShenHongFei)",
@@ -45,23 +45,23 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.22.15",
-    "@babel/parser": "^7.22.15",
-    "@babel/traverse": "^7.22.15",
+    "@babel/core": "^7.23.3",
+    "@babel/parser": "^7.23.3",
+    "@babel/traverse": "^7.23.3",
     "@koa/cors": "^4.0.0",
-    "@types/ws": "^8.5.5",
+    "@types/ws": "^8.5.9",
     "byte-size": "^8.1.1",
     "chalk": "^5.3.0",
-    "chardet": "^1.6.0",
+    "chardet": "^2.0.0",
     "cli-table3": "^0.6.3",
-    "cli-truncate": "^3.1.0",
+    "cli-truncate": "^4.0.0",
     "colors": "^1.4.0",
-    "commander": "^11.0.0",
-    "emoji-regex": "^10.2.1",
+    "commander": "^11.1.0",
+    "emoji-regex": "^10.3.0",
     "fetch-cookie": "^2.1.0",
     "gulp-sort": "^2.0.0",
     "hash-string": "^1.0.0",
-    "i18next": "^23.4.6",
+    "i18next": "^23.6.0",
     "i18next-scanner": "^4.4.0",
     "js-cookie": "^3.0.5",
     "koa": "^2.14.2",
@@ -71,7 +71,7 @@
     "mime-types": "^2.1.35",
     "ora": "^7.0.1",
     "react": "^18.2.0",
-    "react-i18next": "^13.2.2",
+    "react-i18next": "^13.3.1",
     "resolve-path": "^1.4.0",
     "strip-ansi": "^7.1.0",
     "through2": "^4.0.2",
@@ -79,34 +79,34 @@
     "tslib": "^2.6.2",
     "typescript": "^5.2.2",
     "ua-parser-js": "2.0.0-alpha.2",
-    "undici": "^5.23.0",
+    "undici": "^5.27.2",
     "vinyl": "^3.0.0",
     "vinyl-fs": "^4.0.0",
-    "ws": "^8.13.0"
+    "ws": "^8.14.2"
   },
   "devDependencies": {
-    "@babel/types": "^7.22.15",
-    "@types/babel__traverse": "^7.20.1",
-    "@types/byte-size": "^8.1.0",
-    "@types/chardet": "^0.8.1",
-    "@types/gulp-sort": "2.0.1",
-    "@types/js-cookie": "^3.0.3",
-    "@types/koa": "^2.13.8",
-    "@types/koa-compress": "^4.0.3",
-    "@types/lodash": "^4.14.197",
-    "@types/mime-types": "^2.1.1",
-    "@types/node": "^20.5.9",
-    "@types/react": "^18.2.21",
-    "@types/through2": "^2.0.38",
-    "@types/tough-cookie": "^4.0.2",
-    "@types/ua-parser-js": "^0.7.37",
-    "@types/vinyl-fs": "^3.0.2",
-    "@types/vscode": "^1.81.0",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "@typescript-eslint/parser": "^6.6.0",
-    "eslint": "^8.48.0",
+    "@babel/types": "^7.23.3",
+    "@types/babel__traverse": "^7.20.4",
+    "@types/byte-size": "^8.1.2",
+    "@types/chardet": "^0.8.3",
+    "@types/gulp-sort": "2.0.4",
+    "@types/js-cookie": "^3.0.6",
+    "@types/koa": "^2.13.11",
+    "@types/koa-compress": "^4.0.6",
+    "@types/lodash": "^4.14.201",
+    "@types/mime-types": "^2.1.4",
+    "@types/node": "^20.9.0",
+    "@types/react": "^18.2.37",
+    "@types/through2": "^2.0.41",
+    "@types/tough-cookie": "^4.0.5",
+    "@types/ua-parser-js": "^0.7.39",
+    "@types/vinyl-fs": "^3.0.5",
+    "@types/vscode": "^1.84.1",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
+    "eslint": "^8.53.0",
     "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-xlint": "^1.0.8"
+    "eslint-plugin-xlint": "^1.0.10"
   },
   "scripts": {
     "start": "node --title=xshell --inspect=0.0.0.0:8420 ./xshell.js",

package/patches/{@types__byte-size@8.1.0.patch → @types__byte-size@8.1.2.patch}

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

package/path.d.ts

@@ -54,7 +54,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. */
@@ -81,7 +81,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

@@ -9,8 +9,8 @@ export declare const exe_nodejs: string;
 interface StartOptions {
     /** `继承当前工作目录 process.cwd()` 子进程的工作目录  `inherit the cwd` cwd of the child process. */
     cwd?: string;
-    /** `process.env` 覆盖/添加到 process.env 的环境变量  overwrite/add to process.env */
-    env?: Record<string, string>;
+    /** `process.env` 覆盖/添加到 process.env 的环境变量 */
+    envs?: Record<string, string>;
     /** `'utf-8'` 子进程输出编码  child output encoding */
     encoding?: Encoding | 'binary';
     /** `true` print 选项，支持设置细项  print option (with details) */
@@ -41,13 +41,13 @@ interface StartOptions {
     - args: `[]` 参数列表  arguments list
     - options
         - cwd?: `继承当前工作目录 process.cwd()` 子进程的工作目录  `inherit the cwd` cwd of the child process.
-        - env?: `process.env` 覆盖／添加到 process.env 的环境变量  overwrite/add to process.env
+        - envs?: `process.env` 覆盖／添加到 process.env 的环境变量
         - encoding?: `'utf-8'` 子进程输出编码  child output encoding
         - 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, env, window: _window, }?: StartOptions): Promise<ChildProcess>;
+export declare function start(exe: string, args?: string[], { cwd, encoding, print, stdio, detached, envs, window: _window, }?: StartOptions): Promise<ChildProcess>;
 export declare function start_nodejs(js: string, args?: string[], options?: StartOptions): Promise<ChildProcess>;
 export interface CallOptions extends StartOptions {
     throw_code?: boolean;
@@ -67,7 +67,7 @@ export interface CallResult<TOutput extends string | Buffer = string> {
     - args: `[]` 参数列表  arguments list
     - options?:
         - cwd?: `process.cwd()`
-        - env?: `process.env` 覆盖／添加到 process.env 的环境变量  overwrite/add to process.env
+        - envs?: `process.env` 覆盖／添加到 process.env 的环境变量  overwrite/add to process.env
         - encoding?: `'utf-8'` 子进程输出编码, 设置为 binary 时返回 stdout, stderr 类型为 Buffer; 否则是 string
             child output encoding. When set to binary, return stdout, stderr is of type Buffer; otherwise it is string
         - print?: `true` print 选项，支持设置细项  print option (with details)
@@ -80,18 +80,22 @@ export declare function call(exe: string, args?: string[], options?: CallOptions
     encoding: 'binary';
 }): Promise<CallResult<Buffer>>;
 export declare function call(exe: string, args?: string[], options?: CallOptions): Promise<CallResult<string>>;
+export interface CallNodeJsOptions extends CallOptions {
+    inspect?: number;
+    break?: boolean;
+}
 /** call node <js> for result
     - js: .js 路径 (相对路径根据 cwd 解析)  path (relative path will resolve based on cwd)
     - args: `[]` 参数列表  arguments list
     - options
         - cwd?: `process.cwd()`
-        - env?: `process.env` 覆盖／添加到 process.env 的环境变量  overwrite/add to process.env
+        - envs?: `process.env` 覆盖／添加到 process.env 的环境变量  overwrite/add to process.env
         - encoding?: `'utf-8'` 子进程输出编码  child process output encoding
         - 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)
         - throw_code?: `true` code 不为 0 时是否抛出异常  whether to throw Error when code is not 0 */
-export declare function call_nodejs(js: string, args?: string[], options?: CallOptions): Promise<CallResult<string>>;
+export declare function call_nodejs(js: string, args?: string[], { inspect, break: _break, ...options }?: CallNodeJsOptions): Promise<CallResult<string>>;
 export interface TermOptions {
     /** `process.cwd()` */
     cwd?: string;

package/process.js

@@ -9,20 +9,20 @@ export const exe_nodejs = process.execPath.fp;
     - args: `[]` 参数列表  arguments list
     - options
         - cwd?: `继承当前工作目录 process.cwd()` 子进程的工作目录  `inherit the cwd` cwd of the child process.
-        - env?: `process.env` 覆盖／添加到 process.env 的环境变量  overwrite/add to process.env
+        - envs?: `process.env` 覆盖／添加到 process.env 的环境变量
         - encoding?: `'utf-8'` 子进程输出编码  child output encoding
         - 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, env, window: _window = true, } = {}) {
+export async function start(exe, args = [], { cwd, encoding = 'utf-8', print = true, stdio = 'pipe', detached = false, envs, window: _window = true, } = {}) {
     const options = {
         cwd,
         shell: false,
         windowsHide: !_window,
         stdio,
-        ...env ? {
-            env: { ...process.env, ...env }
+        ...envs ? {
+            env: { ...process.env, ...envs }
         } : {},
     };
     if (typeof print === 'boolean')
@@ -169,14 +169,20 @@ export async function call(exe, args = [], options = {}) {
     - args: `[]` 参数列表  arguments list
     - options
         - cwd?: `process.cwd()`
-        - env?: `process.env` 覆盖／添加到 process.env 的环境变量  overwrite/add to process.env
+        - envs?: `process.env` 覆盖／添加到 process.env 的环境变量  overwrite/add to process.env
         - encoding?: `'utf-8'` 子进程输出编码  child process output encoding
         - 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)
         - throw_code?: `true` code 不为 0 时是否抛出异常  whether to throw Error when code is not 0 */
-export async function call_nodejs(js, args = [], options) {
-    return call(exe_nodejs, [js, ...args], options);
+export async function call_nodejs(js, args = [], { inspect, break: _break, ...options } = {}) {
+    return call(exe_nodejs, [
+        ...inspect ? [
+            _break ? `--inspect-brk=localhost:${inspect}` : `--inspect=localhost:${inspect}`
+        ] : [],
+        js,
+        ...args
+    ], options);
 }
 export const exe_winterm = `C:/Users/${userInfo().username}/AppData/Local/Microsoft/WindowsApps/wt.exe`;
 /** 新建 terminal 窗口执行进程  New Terminal window execution process

package/server.d.ts

@@ -68,6 +68,18 @@ export declare class Server {
     format_ua(headers: IncomingHttpHeaders | IncomingHttp2Headers): string;
     proxy(ctx: Context, url: string | URL, headers_?: Record<string, string>, redirect?: RequestOptions['redirect']): Promise<void>;
     static filter_response_headers(headers: Headers): {};
+    /** 提供静态文件
+        @example
+        const prefix_docs = '/zh/'
+        if (path.startsWith(prefix_docs)) {
+            await this.try_send(
+                ctx,
+                `T:/t/docs${prefix_docs}`,
+                (path.endsWith('/') ? `${path}index.html` : path).slice(prefix_docs.length),
+                true
+            )
+            return
+        } */
     try_send(ctx: Context, fpd_root: string, fp: string, log_404: boolean): Promise<boolean>;
     /** 将 body 设置为 fp 所指文件的 ReadStream
         检查 fp 是否合法，设置对应的 content-type，支持缓存，支持分块下载

package/server.js

@@ -310,6 +310,18 @@ export class Server {
                 headers_[key] = value;
         return headers_;
     }
+    /** 提供静态文件
+        @example
+        const prefix_docs = '/zh/'
+        if (path.startsWith(prefix_docs)) {
+            await this.try_send(
+                ctx,
+                `T:/t/docs${prefix_docs}`,
+                (path.endsWith('/') ? `${path}index.html` : path).slice(prefix_docs.length),
+                true
+            )
+            return
+        } */
     async try_send(ctx, fpd_root, fp, log_404) {
         const { request: { _path, path, method }, response, } = ctx;
         if (response.body !== undefined || response.status !== 404)

package/utils.browser.d.ts

@@ -1,5 +1,6 @@
 export declare const noop: () => void;
 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 生成各个元素
     @example seq(10, i => `item-${i}`) */
 export declare function seq<T = number>(n: number, generator?: (index: number) => T): T[];
@@ -70,3 +71,4 @@ export declare class Timer {
     getstr(): string;
     print(): void;
 }
+export declare function lowercase_first_letter(str: string): string;

package/utils.browser.js

@@ -6,6 +6,10 @@ export function assert(assertion, message) {
         throw Object.assign(new Error(`断言失败: ${message ? `${message}: ` : ''}${assertion}`), { assertion });
     }
 }
+export function log(obj) {
+    console.log(obj);
+    return obj;
+}
 /** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素
     @example seq(10, i => `item-${i}`) */
 export function seq(n, generator) {
@@ -193,4 +197,7 @@ export class Timer {
         console.log(this.getstr());
     }
 }
+export function lowercase_first_letter(str) {
+    return str[0].toLowerCase() + str.slice(1);
+}
 //# sourceMappingURL=utils.browser.js.map

package/utils.d.ts

@@ -10,6 +10,7 @@ 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;
+export declare function log<T>(obj: T): T;
 /** 生成 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[];
@@ -92,6 +93,7 @@ export declare class Lock<TResource = void> {
 }
 export declare function has_chinese(str: string): boolean;
 export declare function escape_line_feed(str: string): string;
+export declare function lowercase_first_letter(str: string): string;
 /** util.inspect(obj)
     - options
         - limit?: `10000`  传 0 时不限制

package/utils.js

@@ -27,6 +27,10 @@ export function assert(assertion, message) {
         throw Object.assign(new Error(`断言失败: ${message ? `${message}: ` : ''}${inspect(assertion, { colors: false, compact: true })}`), { assertion });
     }
 }
+export function log(obj) {
+    console.log(obj);
+    return obj;
+}
 /** 生成 0, 1, ..., n - 1 (不包括 n) 的数组，支持传入 generator 函数，通过 index 生成各个元素
     @example seq(10, i => `item-${i}`) */
 export function seq(n, generator) {
@@ -271,6 +275,9 @@ export function has_chinese(str) {
 export function escape_line_feed(str) {
     return str.replace(/\n/g, '\\n');
 }
+export function lowercase_first_letter(str) {
+    return str[0].toLowerCase() + str.slice(1);
+}
 /** util.inspect(obj)
     - options
         - limit?: `10000`  传 0 时不限制