xshell 1.0.55 → 1.0.57

package/file.d.ts

@@ -51,6 +51,8 @@ export declare function fread_json<T = any>(fp: string, options?: {
     print?: boolean;
 }): Promise<T>;
 /** 写入 data 到 fp 路径所指的文件
+    会在因不存在父文件夹导致写入失败时，自动创建父文件夹，并再次尝试写入
+    最好预先创建父文件夹，减少文件系统操作，提升性能
     - fp: 目标文件完整路径
     - data: 支持下面几种类型
         - string: 写入文本
@@ -58,12 +60,10 @@ export declare function fread_json<T = any>(fp: string, options?: {
         - any: 通过 JSON.stringify 转为文本后写入文件
     - options?:
         - dir?: 文件夹
-        - print?
-        - mkdir: `false` 自动创建 fp 所在的文件夹 */
-export declare function fwrite(fp: string | FileHandle, data: string | Uint8Array | any, { dir, print, mkdir, }?: {
+        - print?: `true` */
+export declare function fwrite(fp: string | FileHandle, data: string | Uint8Array | any, { dir, print, }?: {
     dir?: string;
     print?: boolean;
-    mkdir?: boolean;
 }): Promise<void>;
 export declare function fappend(fp: string, data: string | Uint8Array, { dir, print }?: {
     dir?: string;
@@ -107,10 +107,11 @@ export declare function ffstat(handle: fsp.FileHandle): Promise<fs.BigIntStats>;
 export declare function fdelete(fp: string, { print }?: {
     print?: boolean;
 }): Promise<boolean>;
-/** 复制文件或文件夹  copy file or direcotry
-    会自动创建目标路径所在的文件夹
-    - fp_src: 源 文件/文件夹 完整路径  src file/directory absolute path
-    - fp_dst: 目标 文件/文件夹 完整路径  dst file/directory absolute path
+/** 复制文件或文件夹
+    会在因不存在父文件夹导致复制失败时，自动创建父文件夹，并再次尝试复制
+    最好预先创建父文件夹，减少文件系统操作，提升性能
+    - fp_src: 源 文件/文件夹 完整路径
+    - fp_dst: 目标 文件/文件夹 完整路径
     - options?:
         - print?: `true`
         - overwrite?: `true`
@@ -122,6 +123,7 @@ export declare function fcopy(fp_src: string, fp_dst: string, { print, overwrite
     overwrite?: boolean;
 }): Promise<void>;
 /** 移动文件或文件夹
+    相同分区 / 文件系统下使用 rename, 否则 fallback 到复制后删除源文件
     - src: 源 文件/文件夹 完整路径
     - dst: 目标 文件/文件夹 完整路径
     - options?:

package/file.js

@@ -55,6 +55,8 @@ export async function fread_json(fp, options = {}) {
     return JSON.parse(await fread(fp, options));
 }
 /** 写入 data 到 fp 路径所指的文件
+    会在因不存在父文件夹导致写入失败时，自动创建父文件夹，并再次尝试写入
+    最好预先创建父文件夹，减少文件系统操作，提升性能
     - fp: 目标文件完整路径
     - data: 支持下面几种类型
         - string: 写入文本
@@ -62,9 +64,8 @@ export async function fread_json(fp, options = {}) {
         - any: 通过 JSON.stringify 转为文本后写入文件
     - options?:
         - dir?: 文件夹
-        - print?
-        - mkdir: `false` 自动创建 fp 所在的文件夹 */
-export async function fwrite(fp, data, { dir, print = true, mkdir = false, } = {}) {
+        - print?: `true` */
+export async function fwrite(fp, data, { dir, print = true, } = {}) {
     const is_handle = typeof fp === 'object' && fp && 'fd' in fp;
     if (is_handle) {
         if (print)
@@ -85,8 +86,8 @@ export async function fwrite(fp, data, { dir, print = true, mkdir = false, } = {
         await fsp.writeFile(fp, data);
     }
     catch (error) {
-        if (mkdir && error.code === 'ENOENT' && !is_handle) {
-            await fmkdir(fp.fdir);
+        if (error.code === 'ENOENT' && !is_handle) {
+            await fmkdir(fp.fdir, { print: false });
             await fsp.writeFile(fp, data);
         }
         else
@@ -216,10 +217,11 @@ export async function fdelete(fp, { print = true } = {}) {
         throw error;
     }
 }
-/** 复制文件或文件夹  copy file or direcotry
-    会自动创建目标路径所在的文件夹
-    - fp_src: 源 文件/文件夹 完整路径  src file/directory absolute path
-    - fp_dst: 目标 文件/文件夹 完整路径  dst file/directory absolute path
+/** 复制文件或文件夹
+    会在因不存在父文件夹导致复制失败时，自动创建父文件夹，并再次尝试复制
+    最好预先创建父文件夹，减少文件系统操作，提升性能
+    - fp_src: 源 文件/文件夹 完整路径
+    - fp_dst: 目标 文件/文件夹 完整路径
     - options?:
         - print?: `true`
         - overwrite?: `true`
@@ -239,12 +241,21 @@ export async function fcopy(fp_src, fp_dst, { print = true, overwrite = true, }
             errorOnExist: !overwrite,
             mode: overwrite ? 0 : fs.constants.COPYFILE_EXCL,
         });
-    else {
-        await fmkdir(fp_dst.fdir, { print: false });
-        await fsp.copyFile(fp_src, fp_dst, overwrite ? 0 : fs.constants.COPYFILE_EXCL);
-    }
+    else
+        try {
+            await fsp.copyFile(fp_src, fp_dst, overwrite ? 0 : fs.constants.COPYFILE_EXCL);
+        }
+        catch (error) {
+            if (error.code === 'ENOENT') {
+                await fmkdir(fp_dst.fdir, { print });
+                await fsp.copyFile(fp_src, fp_dst, overwrite ? 0 : fs.constants.COPYFILE_EXCL);
+            }
+            else
+                throw error;
+        }
 }
 /** 移动文件或文件夹
+    相同分区 / 文件系统下使用 rename, 否则 fallback 到复制后删除源文件
     - src: 源 文件/文件夹 完整路径
     - dst: 目标 文件/文件夹 完整路径
     - options?:

package/net.browser.js

@@ -190,7 +190,7 @@ export async function connect_websocket(url, { protocols, on_message, on_error,
         let settled = false;
         websocket.addEventListener('open', event => {
             console.log(websocket.url +
-                (websocket.protocol ? websocket.protocol.bracket() : '') +
+                (websocket.protocol ? ' ' + websocket.protocol.bracket() : '') +
                 t(' 已连接'));
             settled = true;
             resolve(websocket);

package/net.d.ts

@@ -25,7 +25,7 @@ export declare const cookies: {
     init(): Promise<void>;
     get(domain_or_url: string, str?: boolean): Cookie[] | Promise<Cookie[] | string>;
 };
-export { Cookie };
+export type { Cookie };
 export interface BasicAuth {
     type: 'basic';
     username: string;
@@ -47,6 +47,7 @@ export interface RequestOptions {
     timeout?: number;
     auth?: BasicAuth | BearerAuth;
     cookies?: Record<string, string>;
+    redirect?: RequestRedirect;
 }
 export interface RequestRawOptions extends RequestOptions {
     raw: true;

package/net.js

@@ -70,7 +70,7 @@ async function fetch_retry(url, options, timeout, retries = 0, count = 0) {
         }
     }
 }
-export async function request(url, { method, queries, headers: _headers, body, type = 'application/json', proxy, encoding, retries, timeout = 5 * 1000, auth, cookies: _cookies, raw = false, } = {}) {
+export async function request(url, { method, queries, headers: _headers, body, type = 'application/json', proxy, encoding, retries, timeout = 5 * 1000, auth, cookies: _cookies, raw = false, redirect = 'follow', } = {}) {
     const { Headers, ProxyAgent, FormData } = await import('undici');
     url = new URL(url);
     if (queries)
@@ -121,7 +121,7 @@ export async function request(url, { method, queries, headers: _headers, body, t
             }
         })(),
         keepalive: true,
-        redirect: 'follow',
+        redirect,
         maxRedirect: 6,
         credentials: 'include',
         headers,
@@ -354,7 +354,7 @@ on_message, on_error, on_close }) {
         let settled = false;
         websocket.addEventListener('open', event => {
             console.log(websocket.url +
-                (websocket.protocol ? websocket.protocol.bracket() : '') +
+                (websocket.protocol ? ' ' + websocket.protocol.bracket() : '') +
                 t(' 已连接'));
             settled = true;
             resolve(websocket);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xshell",
-  "version": "1.0.55",
+  "version": "1.0.57",
   "type": "module",
   "main": "./index.js",
   "bin": {
@@ -16,8 +16,8 @@
     "interactive programming"
   ],
   "engines": {
-    "node": ">=20.5.1",
-    "vscode": ">=1.79.0"
+    "node": ">=20.6.0",
+    "vscode": ">=1.81.0"
   },
   "author": "ShenHongFei <shen.hongfei@outlook.com> (https://github.com/ShenHongFei)",
   "publisher": "ShenHongFei",
@@ -45,9 +45,9 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.22.10",
-    "@babel/parser": "^7.22.10",
-    "@babel/traverse": "^7.22.10",
+    "@babel/core": "^7.22.15",
+    "@babel/parser": "^7.22.15",
+    "@babel/traverse": "^7.22.15",
     "@koa/cors": "^4.0.0",
     "@types/ws": "^8.5.5",
     "byte-size": "^8.1.1",
@@ -61,8 +61,8 @@
     "fetch-cookie": "^2.1.0",
     "gulp-sort": "^2.0.0",
     "hash-string": "^1.0.0",
-    "i18next": "^23.4.5",
-    "i18next-scanner": "^4.3.0",
+    "i18next": "^23.4.6",
+    "i18next-scanner": "^4.4.0",
     "js-cookie": "^3.0.5",
     "koa": "^2.14.2",
     "koa-compress": "^5.1.1",
@@ -71,13 +71,13 @@
     "mime-types": "^2.1.35",
     "ora": "^7.0.1",
     "react": "^18.2.0",
-    "react-i18next": "^13.2.0",
+    "react-i18next": "^13.2.2",
     "resolve-path": "^1.4.0",
     "strip-ansi": "^7.1.0",
     "through2": "^4.0.2",
     "tough-cookie": "^4.1.3",
     "tslib": "^2.6.2",
-    "typescript": "^5.1.6",
+    "typescript": "^5.2.2",
     "ua-parser-js": "2.0.0-alpha.2",
     "undici": "^5.23.0",
     "vinyl": "^3.0.0",
@@ -85,7 +85,7 @@
     "ws": "^8.13.0"
   },
   "devDependencies": {
-    "@babel/types": "^7.22.10",
+    "@babel/types": "^7.22.15",
     "@types/babel__traverse": "^7.20.1",
     "@types/byte-size": "^8.1.0",
     "@types/chardet": "^0.8.1",
@@ -95,18 +95,18 @@
     "@types/koa-compress": "^4.0.3",
     "@types/lodash": "^4.14.197",
     "@types/mime-types": "^2.1.1",
-    "@types/node": "^20.5.4",
+    "@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.36",
+    "@types/ua-parser-js": "^0.7.37",
     "@types/vinyl-fs": "^3.0.2",
     "@types/vscode": "^1.81.0",
-    "@typescript-eslint/eslint-plugin": "^6.4.1",
-    "@typescript-eslint/parser": "^6.4.1",
-    "eslint": "^8.47.0",
+    "@typescript-eslint/eslint-plugin": "^6.6.0",
+    "@typescript-eslint/parser": "^6.6.0",
+    "eslint": "^8.48.0",
     "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-xlint": "^1.0.7"
+    "eslint-plugin-xlint": "^1.0.8"
   },
   "scripts": {
     "start": "node --title=xshell --inspect=0.0.0.0:8420 ./xshell.js",

package/prototype.browser.d.ts

@@ -10,8 +10,7 @@ declare global {
         truncate(this: string, width: number): string;
         /** pad string to `<width>`
             - character?: `' '`
-            - position?: `'right'`
-         */
+            - position?: `'right'` */
         pad(this: string, width: number, { character, position }?: {
             character?: string;
             position?: 'left' | 'right';

package/prototype.browser.js

@@ -149,7 +149,7 @@ Object.defineProperties(String.prototype, {
             add_part(last_end);
             // 最后一个 (.*?) 改为贪心匹配，满足 .{suffix} 的需要
             regx_parts = regx_parts.filter(part => part);
-            if (regx_parts.last === '(.*?)')
+            if (regx_parts[regx_parts.length - 1] === '(.*?)')
                 regx_parts[regx_parts.length - 1] = '(.*)';
             const pattern_regx = new RegExp(regx_parts.join(''), flags);
             // --- 根据 pattern_regx 去匹配原有字符串，获取匹配结果，生成 placeholders 词典
@@ -240,7 +240,7 @@ Object.defineProperties(String.prototype, {
         },
         split_lines(delimiter = /\r?\n/) {
             let lines = this.split(delimiter);
-            if (lines.last === '')
+            if (lines[lines.length - 1] === '')
                 lines.pop();
             return lines;
         },

package/prototype.d.ts

@@ -128,7 +128,6 @@ declare global {
         to_oct_str(this: number): string;
     }
     interface Array<T> {
-        last: T;
         log(this: string[], limit?: number): void;
         indent(this: string[], width: number, c?: string): string[];
         indent2to4(this: string[]): string[];

package/prototype.js

@@ -147,7 +147,7 @@ if (!globalThis.my_prototype_defined) {
                 add_part(last_end);
                 // 最后一个 (.*?) 改为贪心匹配，满足 .{suffix} 的需要
                 regx_parts = regx_parts.filter(part => part);
-                if (regx_parts.last === '(.*?)')
+                if (regx_parts.at(-1) === '(.*?)')
                     regx_parts[regx_parts.length - 1] = '(.*)';
                 const pattern_regx = new RegExp(regx_parts.join(''), flags);
                 // --- 根据 pattern_regx 去匹配原有字符串，获取匹配结果，生成 placeholders 词典
@@ -204,7 +204,7 @@ if (!globalThis.my_prototype_defined) {
                 add_part(last_end);
                 // 最后一个 (.*?) 改为贪心匹配，满足 .{suffix} 的需要
                 regx_parts = regx_parts.filter(part => part);
-                if (regx_parts[regx_parts.length - 1] === '(.*?)')
+                if (regx_parts.at(-1) === '(.*?)')
                     regx_parts[regx_parts.length - 1] = '(.*)';
                 const pattern_regx = new RegExp(regx_parts.join(''), flags);
                 // --- 根据 pattern_regx 去匹配原有字符串，获取匹配结果，生成 placeholders 词典
@@ -241,7 +241,7 @@ if (!globalThis.my_prototype_defined) {
             },
             split_lines(delimiter = /\r?\n/) {
                 let lines = this.split(delimiter);
-                if (lines.last === '')
+                if (lines.at(-1) === '')
                     lines.pop();
                 return lines;
             },
@@ -408,11 +408,6 @@ if (!globalThis.my_prototype_defined) {
     }));
     // ------------------------------------ Array.prototype
     Object.defineProperties(Array.prototype, {
-        ...to_getter_property_descriptors({
-            last() {
-                return this[this.length - 1];
-            }
-        }),
         // --- 文本处理工具方法
         ...to_method_property_descriptors({
             log(limit = 10000) {

package/server.d.ts

@@ -16,7 +16,7 @@ declare module 'koa' {
         compress: boolean;
     }
 }
-import { type Remote, type Headers } from './net.js';
+import { type Remote, type Headers, type RequestOptions } from './net.js';
 declare module 'http' {
     interface IncomingMessage {
         body?: Buffer;
@@ -66,7 +66,7 @@ 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>): Promise<void>;
+    proxy(ctx: Context, url: string | URL, headers_?: Record<string, string>, redirect?: RequestOptions['redirect']): Promise<void>;
     static filter_response_headers(headers: Headers): {};
     try_send(ctx: Context, fpd_root: string, fp: string, log_404: boolean): Promise<boolean>;
     /** 将 body 设置为 fp 所指文件的 ReadStream

package/server.js

@@ -262,7 +262,7 @@ export class Server {
         }
         return s;
     }
-    async proxy(ctx, url, headers_ = {}) {
+    async proxy(ctx, url, headers_ = {}, redirect = 'manual') {
         const { request: { method, headers, query, body, ip } } = ctx;
         let { response } = ctx;
         try {
@@ -276,6 +276,7 @@ export class Server {
                     ...headers_
                 },
                 raw: true,
+                redirect,
             });
             response.status = response_.status;
             response.set(Server.filter_response_headers(response_.headers));