xshell 1.0.82 → 1.0.83

package/apps.d.ts

@@ -41,14 +41,15 @@ export declare let oss: {
         access_id: string;
         access_key: string;
     }): Promise<void>;
-    /** 上传文件到 OSS，返回文件 URL
-        - fp: 上传到 OSS 的路径, 如 assets/web.latest.zip
+    /** 上传文件到 oss，返回文件 url
+        - fp: 上传到 oss 的路径, 如 assets/web.latest.zip
         - data: 文件 (Uint8Array) | 本地文件完整路径 (string) | ReadableStream
         - options?:
             - private?: `false` 设置为私有，需要通过 URL 签名参数访问
+            - print?: `true` 打印消息
             - cdn?: `false` false 时返回 oss 链接，true 时返回 cdn 链接
-            - print?: `true` 打印消息 */
-    upload(fp: string, data: Uint8Array | string | Readable, { private: _private, print, cdn, }?: {
+            - copy?: `false` 是否复制到剪贴板 */
+    upload(fp_remote: string, data: Uint8Array | string | Readable, { private: _private, print, cdn, }?: {
         private?: boolean;
         print?: boolean;
         cdn?: boolean;

package/apps.js

@@ -59,31 +59,32 @@ export let oss = {
             secure: true
         });
     },
-    /** 上传文件到 OSS，返回文件 URL
-        - fp: 上传到 OSS 的路径, 如 assets/web.latest.zip
+    /** 上传文件到 oss，返回文件 url
+        - fp: 上传到 oss 的路径, 如 assets/web.latest.zip
         - data: 文件 (Uint8Array) | 本地文件完整路径 (string) | ReadableStream
         - options?:
             - private?: `false` 设置为私有，需要通过 URL 签名参数访问
+            - print?: `true` 打印消息
             - cdn?: `false` false 时返回 oss 链接，true 时返回 cdn 链接
-            - print?: `true` 打印消息 */
-    async upload(fp, data, { private: _private = false, print = true, cdn = false, } = {}) {
+            - copy?: `false` 是否复制到剪贴板 */
+    async upload(fp_remote, data, { private: _private = false, print = true, cdn = false, } = {}) {
         assert(this.client, 'OSS 应该已经初始化了');
-        assert(!fp.startsWith('/'), 'fp 不能以 / 开头');
-        assert(!fp.isdir, '不能使用 oss.upload 上传文件夹，请使用 oss.upload_dir');
+        assert(!fp_remote.startsWith('/'), 'fp 不能以 / 开头');
+        assert(!fp_remote.isdir, '不能使用 oss.upload 上传文件夹，请使用 oss.upload_dir');
         if (typeof data === 'string')
-            assert(data[1] === ':' && path.isAbsolute(data), 'oss.upload 传入 data 参数类型为 string 时，必须为本地文件完整路径');
+            assert(path.isAbsolute(data), 'oss.upload 传入 data 参数类型为 string 时，必须为本地文件完整路径');
         if (data instanceof Uint8Array && !Buffer.isBuffer(data))
             data = Buffer.from(data.buffer, data.byteOffset, data.byteLength);
-        await this.client.put(fp, data);
+        await this.client.put(fp_remote, data);
         let url;
         if (_private) {
-            await this.client.putACL(fp, 'private');
-            url = await this.get_url(fp);
+            await this.client.putACL(fp_remote, 'private');
+            url = await this.get_url(fp_remote);
         }
         else
-            url = new URL(`${cdn ? this.fpd_cdn : this.fpd_oss}${fp}`).toString();
+            url = new URL(`${cdn ? this.fpd_cdn : this.fpd_oss}${fp_remote}`).toString();
         if (print)
-            console.log(`已上传到 OSS${_private ? ' (私有)' : ''}:`, url);
+            console.log(`已上传到 oss${_private ? ' (私有)' : ''}:`, url);
         return url;
     },
     /** 获取经过签名后可访问的 url */

package/file.d.ts

@@ -51,6 +51,9 @@ export declare function fread_json<T = any>(fp: string, options?: {
     encoding?: Encoding;
     print?: boolean;
 }): Promise<T>;
+interface FWriteOptions {
+    print?: boolean;
+}
 /** 写入 data 到 fp 路径所指的文件
     会在因不存在父文件夹导致写入失败时，自动创建父文件夹，并再次尝试写入
     最好预先创建父文件夹，减少文件系统操作，提升性能
@@ -62,10 +65,8 @@ export declare function fread_json<T = any>(fp: string, options?: {
     - options?:
         - dir?: 文件夹
         - print?: `true` */
-export declare function fwrite(fp: string | FileHandle, data: string | Uint8Array | any, { dir, print, }?: {
-    dir?: string;
-    print?: boolean;
-}): Promise<void>;
+export declare function fwrite(fp: string, data: string | Uint8Array | any, options?: FWriteOptions): Promise<string>;
+export declare function fwrite(fp: FileHandle, data: string | Uint8Array | any, options?: FWriteOptions): Promise<FileHandle>;
 export declare function fappend(fp: string, data: string | Uint8Array, { dir, print }?: {
     dir?: string;
     print?: boolean;
@@ -98,17 +99,18 @@ export declare function flist(fpd: string, options?: FListOptions): Promise<stri
 export declare function fstat(fp: string): Promise<FStats>;
 export declare function flstat(fp: string): Promise<FStats>;
 export declare function ffstat(handle: fsp.FileHandle): Promise<fs.BigIntStats>;
-/** 删除文件或文件夹  delete files or folders
-    - fp: 文件或文件夹的完整路径  The full path to the file or folder
+/** 删除文件或文件夹，返回是否实际进行了删除操作
+    - fp: 文件或文件夹的完整路径
     - options?:
-        - print?: `true`
-    
-    返回是否实际进行了删除操作
-    Returns whether the delete operation actually took place */
+        - print?: `true` */
 export declare function fdelete(fp: string, { print }?: {
     print?: boolean;
     red?: boolean;
 }): Promise<boolean>;
+/** 清空文件夹中的内容，实际为删除该文件夹后新建 */
+export declare function fdclear(fpd: string, { print }?: {
+    print?: boolean;
+}): Promise<void>;
 /** 复制文件或文件夹
     会在因不存在父文件夹导致复制失败时，自动创建父文件夹，并再次尝试复制
     最好预先创建父文件夹，减少文件系统操作，提升性能

package/file.js

@@ -55,28 +55,13 @@ export async function fread_lines(fp, options = {}) {
 export async function fread_json(fp, options = {}) {
     return JSON.parse(await fread(fp, options));
 }
-/** 写入 data 到 fp 路径所指的文件
-    会在因不存在父文件夹导致写入失败时，自动创建父文件夹，并再次尝试写入
-    最好预先创建父文件夹，减少文件系统操作，提升性能
-    - fp: 目标文件完整路径
-    - data: 支持下面几种类型
-        - string: 写入文本
-        - Uint8Array, Buffer: 写入二进制 buffer
-        - any: 通过 JSON.stringify 转为文本后写入文件
-    - options?:
-        - dir?: 文件夹
-        - print?: `true` */
-export async function fwrite(fp, data, { dir, print = true, } = {}) {
+export async function fwrite(fp, data, { print = true } = {}) {
     const is_handle = typeof fp === 'object' && fp && 'fd' in fp;
     if (is_handle) {
         if (print)
             console.log(t('写入'), fp.fp);
     }
     else {
-        if (dir) {
-            assert(dir.isdir, t('dir 必须以 / 结尾'));
-            fp = dir + fp;
-        }
         assert(path.isAbsolute(fp), `${t('fp 必须是绝对路径，当前为:')} ${fp}`);
         if (print)
             console.log(t('写入'), fp);
@@ -94,6 +79,7 @@ export async function fwrite(fp, data, { dir, print = true, } = {}) {
         else
             throw error;
     }
+    return fp;
 }
 export async function fappend(fp, data, { dir, print = true } = {}) {
     if (dir) {
@@ -187,13 +173,10 @@ export async function ffstat(handle) {
         });
     });
 }
-/** 删除文件或文件夹  delete files or folders
-    - fp: 文件或文件夹的完整路径  The full path to the file or folder
+/** 删除文件或文件夹，返回是否实际进行了删除操作
+    - fp: 文件或文件夹的完整路径
     - options?:
-        - print?: `true`
-    
-    返回是否实际进行了删除操作
-    Returns whether the delete operation actually took place */
+        - print?: `true` */
 export async function fdelete(fp, { print = true } = {}) {
     assert(fp.length >= 6, `fp: ${fp} ${t('不能太短，防止误删文件')}`);
     assert(path.isAbsolute(fp), t('fp 必须是绝对路径'));
@@ -213,6 +196,13 @@ export async function fdelete(fp, { print = true } = {}) {
         throw error;
     }
 }
+/** 清空文件夹中的内容，实际为删除该文件夹后新建 */
+export async function fdclear(fpd, { print = true } = {}) {
+    await fdelete(fpd, { print: false });
+    await fmkdir(fpd, { print: false });
+    if (print)
+        console.log(`清空了文件夹 ${fpd}`);
+}
 /** 复制文件或文件夹
     会在因不存在父文件夹导致复制失败时，自动创建父文件夹，并再次尝试复制
     最好预先创建父文件夹，减少文件系统操作，提升性能

package/i18n/dict.json

@@ -170,8 +170,8 @@
     "所有模块全部加载": {
         "en": "all modules were loaded"
     },
-    "状态码 {{code}}, 非 2xx": {
-        "en": "status code {{code}} is not 2xx"
+    "状态码 {{status}}, 非 2xx: {{url}}": {
+        "en": "status code {{code}} is not 2xx: {{url}}"
     },
     "请求参数:": {
         "en": "request.params:"

package/net.browser.js

@@ -105,7 +105,7 @@ export async function request(url, options = {}) {
     try {
         response = await fetch_retry(url, fetch_options, timeout, retries);
         if (!response.ok)
-            throw Object.assign(new Error(t('状态码 {{status}}, 非 2xx', { status: response.status })), { name: 'StatusCodeError' });
+            throw Object.assign(new Error(t('状态码 {{status}}, 非 2xx: {{url}}', { status: response.status, url })), { name: 'StatusCodeError' });
     }
     catch (error) {
         ;

package/net.js

@@ -198,7 +198,7 @@ export async function request(url, options = {}) {
             body
         };
         if (!((200 <= status && status <= 299) || (redirect === 'manual' && 300 <= status && status < 400)))
-            throw Object.assign(new Error(t('状态码 {{status}} 非 2xx', { status: response.status })), { name: 'StatusCodeError' });
+            throw Object.assign(new Error(t('状态码 {{status}}, 非 2xx: {{url}}', { status: response.status, url })), { name: 'StatusCodeError' });
     }
     catch (error) {
         ;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.82",
+    "version": "1.0.83",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -53,12 +53,12 @@
         ]
     },
     "dependencies": {
-        "@babel/core": "^7.23.7",
-        "@babel/parser": "^7.23.6",
-        "@babel/traverse": "^7.23.7",
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@babel/traverse": "^7.23.9",
         "@koa/cors": "^5.0.0",
         "@types/ws": "^8.5.10",
-        "ali-oss": "^6.19.0",
+        "ali-oss": "^6.20.0",
         "archiver": "^6.0.1",
         "byte-size": "^8.1.1",
         "chalk": "^5.3.0",
@@ -66,11 +66,11 @@
         "cli-table3": "^0.6.3",
         "cli-truncate": "^4.0.0",
         "colors": "^1.4.0",
-        "commander": "^11.1.0",
+        "commander": "^12.0.0",
         "emoji-regex": "^10.3.0",
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
-        "i18next": "^23.7.16",
+        "i18next": "^23.9.0",
         "i18next-scanner": "^4.4.0",
         "js-cookie": "^3.0.5",
         "koa": "^2.15.0",
@@ -80,8 +80,8 @@
         "mime-types": "^2.1.35",
         "ora": "^8.0.1",
         "react": "^18.2.0",
-        "react-i18next": "^14.0.0",
-        "react-object-model": "^1.2.1",
+        "react-i18next": "^14.0.5",
+        "react-object-model": "^1.2.2",
         "resolve-path": "^1.4.0",
         "strip-ansi": "^7.1.0",
         "through2": "^4.0.2",
@@ -89,7 +89,7 @@
         "tslib": "^2.6.2",
         "typescript": "^5.3.3",
         "ua-parser-js": "2.0.0-alpha.2",
-        "undici": "^6.3.0",
+        "undici": "^6.6.2",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
         "ws": "^8.16.0",
@@ -99,7 +99,7 @@
         "xterm-addon-webgl": "^0.16.0"
     },
     "devDependencies": {
-        "@babel/types": "^7.23.6",
+        "@babel/types": "^7.23.9",
         "@types/ali-oss": "^6.16.11",
         "@types/archiver": "^6.0.2",
         "@types/babel__traverse": "^7.20.5",
@@ -111,13 +111,13 @@
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.14.202",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^20.11.0",
-        "@types/react": "^18.2.47",
+        "@types/node": "^20.11.19",
+        "@types/react": "^18.2.57",
         "@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.85.0"
+        "@types/vscode": "^1.86.0"
     },
     "pnpm": {
         "patchedDependencies": {

package/process.d.ts

@@ -115,13 +115,15 @@ export interface TermOptions {
     /** `true` 打印参数 */
     print?: boolean;
     title?: string;
+    /** `process.env` 覆盖/添加到 process.env 的环境变量 */
+    envs?: Record<string, string>;
 }
 export declare const exe_winterm: string;
 /** 新建 terminal 窗口执行进程  New Terminal window execution process
     - exe: exe 文件路径  exe file path
     - args: 调用参数  call parameter
     - options?: WinTermOptions */
-export declare function term(exe: string, args?: string[], { cwd, print, title, }?: TermOptions): Promise<ChildProcess>;
+export declare function term(exe: string, args?: string[], { cwd, print, title, envs }?: TermOptions): Promise<ChildProcess>;
 export interface TermNodeOptions extends TermOptions {
     /** nodejs debugger port */
     inspect?: number;

package/process.js

@@ -37,10 +37,10 @@ export async function start(exe, args = [], { cwd, encoding = 'utf-8', print = t
     if (typeof stdio === 'string')
         stdio = [stdio, stdio, stdio];
     if (print.command)
-        console.log(((short_exe_names[exe] || (exe.includes(' ') ? exe.quote() : exe)) +
+        console.log(((short_exe_names[exe] || exe.quote_if_space()) +
             (args.length ?
                 ' ' + args.filter(arg => arg !== '--suppressApplicationTitle')
-                    .map(arg => arg.includes(' ') ? arg.quote() : arg)
+                    .map(arg => arg.quote_if_space())
                     .join(' ')
                 :
                     '')).blue);
@@ -97,8 +97,8 @@ export async function call(exe, args = [], options = {}) {
         };
     if (typeof stdio === 'string')
         stdio = [stdio, stdio, stdio];
-    const cmd = (short_exe_names[exe] || (exe.includes(' ') ? exe.quote() : exe)) +
-        (args.length ? (' ' + args.map(arg => arg.includes(' ') ? arg.quote() : arg)
+    const cmd = (short_exe_names[exe] || exe.quote_if_space()) +
+        (args.length ? (' ' + args.map(arg => arg.quote_if_space())
             .join(' '))
             :
                 '');
@@ -191,9 +191,7 @@ export const exe_winterm = `C:/Users/${username}/AppData/Local/Microsoft/Windows
     - exe: exe 文件路径  exe file path
     - args: 调用参数  call parameter
     - options?: WinTermOptions */
-export async function term(exe, args = [], { cwd = process.cwd().fpd, print = true, title,
-// env
- } = {}) {
+export async function term(exe, args = [], { cwd = process.cwd().fpd, print = true, title, envs } = {}) {
     return start(exe_winterm, [
         'new-tab',
         '-d', cwd,
@@ -204,7 +202,7 @@ export async function term(exe, args = [], { cwd = process.cwd().fpd, print = tr
         print,
         detached: true,
         cwd,
-        // env
+        envs
     });
 }
 /** 在 term tab 中创建 node.exe 进程  create the node.exe process in term tab */

package/prototype.d.ts

@@ -56,11 +56,12 @@ declare global {
             
             - preservations?: `''` 保留的正则表达式字符
             - flags?: `''` 正则匹配选项
-            - pattern_placeholder?: `/\{.*?\}/g`
-        */
+            - pattern_placeholder?: `/\{.*?\}/g` */
         find(this: string, pattern: string, preservations?: string, flags?: string, pattern_placeholder?: RegExp): Record<string, string>;
-        /** - type?: `'single'` */
+        /** - type?: `'single'` 引号类型 */
         quote(this: string, type?: keyof typeof quotes | 'psh'): string;
+        /** - type?: `'single'` 引号类型 */
+        quote_if_space(this: string, type?: keyof typeof quotes | 'psh'): string;
         /** - shape?: `'parenthesis'` */
         bracket(this: string, shape?: keyof typeof brackets): string;
         surround(this: string, left: string, right?: string): string;

package/prototype.js

@@ -219,6 +219,9 @@ if (!globalThis.my_prototype_defined) {
                     return `& ${this.quote()}`;
                 return this.surround(quotes[type]);
             },
+            quote_if_space(type = 'single') {
+                return this.includes(' ') ? this.quote(type) : this;
+            },
             bracket(shape = 'round') {
                 return this.surround(...brackets[shape]);
             },

package/server.d.ts

@@ -92,7 +92,9 @@ export declare class Server {
     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>, redirect?: RequestOptions['redirect']): Promise<void>;
+    proxy(ctx: Context, 
+    /** 只含 host, path, 不含 queries 的 url */
+    path_url: string | URL, headers_?: Record<string, string>, redirect?: RequestOptions['redirect']): Promise<void>;
     static filter_response_headers(headers: RawResponse['headers']): Record<string, string>;
     /** 提供静态文件
         @example

package/server.js

@@ -436,13 +436,14 @@ export class Server {
         }
         return s;
     }
-    async proxy(ctx, url, headers_ = {}, redirect = 'manual') {
-        const { request: { method, headers, query, body, ip } } = ctx;
+    async proxy(ctx, 
+    /** 只含 host, path, 不含 queries 的 url */
+    path_url, headers_ = {}, redirect = 'manual') {
+        const { request: { method, headers, body, ip } } = ctx;
         let { response } = ctx;
         try {
-            const response_ = await _request(url, {
+            const response_ = await _request(path_url, {
                 method: method,
-                queries: query,
                 body,
                 headers: {
                     ...headers,
@@ -463,7 +464,7 @@ export class Server {
             if (error.response) {
                 const { status, headers, body } = error.response;
                 if (status === 404)
-                    console.log(method, '404:', url);
+                    console.log(method, '404:', path_url);
                 else
                     console.log(error);
                 response.status = status;

package/utils.browser.d.ts

@@ -56,7 +56,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): 1 | 0 | -1;
+export declare function strcmp(l: string, r: string): 0 | 1 | -1;
 /** 比较 1.10.02 这种版本号 */
 export declare function vercmp(l: string, r: string): number;
 export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;

package/utils.d.ts

@@ -29,10 +29,12 @@ export declare function map_values<TValue, TNewValue>(obj: {
 }, mapper: (value: TValue, key: string) => TNewValue): {
     [k: string]: TNewValue;
 };
-/** 映射对象中的 keys, 返回新对象 */
+/** 过滤对象中的 keys, 返回新对象 */
 export declare function filter_keys<TObj>(obj: TObj, filter: (key: string) => any): TObj;
+/** 忽略对象中的 keys, 返回新对象 */
+export declare function omit<TObj>(obj: TObj, omit_keys: string[]): TObj;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 1 | 0 | -1;
+export declare function strcmp(l: string, r: string): 0 | 1 | -1;
 /** 比较 1.10.02 这种版本号 */
 export declare function vercmp(l: string, r: string): number;
 export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;

package/utils.js

@@ -92,10 +92,15 @@ export function map_values(obj, mapper) {
     return Object.fromEntries(Object.entries(obj)
         .map(([key, value]) => [key, mapper(value, key)]));
 }
-/** 映射对象中的 keys, 返回新对象 */
+/** 过滤对象中的 keys, 返回新对象 */
 export function filter_keys(obj, filter) {
     return Object.fromEntries(Object.entries(obj)
-        .filter(([key, value]) => filter(key)));
+        .filter(([key]) => filter(key)));
+}
+/** 忽略对象中的 keys, 返回新对象 */
+export function omit(obj, omit_keys) {
+    const omit_keys_ = new Set(omit_keys);
+    return filter_keys(obj, key => !omit_keys_.has(key));
 }
 /** 字符串字典序比较 */
 export function strcmp(l, r) {