xshell 1.2.4 → 1.2.6

package/file.d.ts

@@ -28,13 +28,11 @@ export declare function fopen(fp: string, flags?: string | number, { mode, print
     mode: fs.Mode;
 }>;
 export declare function fread(fp: string): Promise<string>;
-export declare function fread(fp: string, { dir, encoding, print }?: {
-    dir?: string;
+export declare function fread(fp: string, options?: {
     encoding: 'binary';
     print?: boolean;
 }): Promise<Buffer>;
-export declare function fread(fp: string, { dir, encoding, print }?: {
-    dir?: string;
+export declare function fread(fp: string, options?: {
     encoding?: Encoding;
     print?: boolean;
 }): Promise<string>;
@@ -49,6 +47,9 @@ export declare function fread_json<T = any>(fp: string, options?: {
     encoding?: Encoding;
     print?: boolean;
 }): Promise<T>;
+export declare function fparse<TReturn>(fp: string, options?: {
+    print?: boolean;
+}): Promise<TReturn>;
 /** 比较两个文件是否一致，遇到任何文件系统错误都返回 false */
 export declare function fequals(fp_left: string, fp_right: string, { print }?: {
     print?: boolean;
@@ -70,6 +71,9 @@ interface FWriteOptions {
         - print?: `true` */
 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 fwrite(fp: string | FileHandle, data: string | Uint8Array | any, options?: FWriteOptions): Promise<string | FileHandle>;
+export declare function fpack(fp: string, data: any, options?: FWriteOptions): Promise<string>;
+export declare function fpack(fp: FileHandle, data: any, options?: FWriteOptions): Promise<FileHandle>;
 /** 追加内容到文件末尾，如果文件不存在会自动创建 */
 export declare function fappend(fp: string, data: string | Uint8Array, { print }?: {
     print?: boolean;

package/file.js

@@ -1,8 +1,9 @@
 import { promises as fsp, default as fs } from 'fs';
 import { isUint8Array } from 'util/types';
-import { path } from "./path.js";
 import { t } from "./i18n/instance.js";
 import { to_json } from "./prototype.js";
+import { pack, parse } from "./io.js";
+import { path } from "./path.js";
 import { check, Lock, WritableMemoryStream, url_width } from "./utils.js";
 export { fsp };
 export const encodings = ['utf-8', 'gb18030', 'shift-jis', 'utf-16le'];
@@ -53,6 +54,9 @@ export async function fread_lines(fp, options = {}) {
 export async function fread_json(fp, options = {}) {
     return JSON.parse(await fread(fp, options));
 }
+export async function fparse(fp, options) {
+    return parse(await fread(fp, { ...options, encoding: 'binary' }));
+}
 /** 比较两个文件是否一致，遇到任何文件系统错误都返回 false */
 export async function fequals(fp_left, fp_right, { print = true } = {}) {
     if (print)
@@ -97,6 +101,9 @@ export async function fwrite(fp, data, { print = true } = {}) {
     }
     return fp;
 }
+export async function fpack(fp, data, options) {
+    return fwrite(fp, pack(data), options);
+}
 /** 追加内容到文件末尾，如果文件不存在会自动创建 */
 export async function fappend(fp, data, { print = true } = {}) {
     check(path.isAbsolute(fp), `${t('fp 必须是绝对路径，当前为:')} ${fp}`);

package/io.browser.js

@@ -476,9 +476,12 @@ function _pack(value) {
                 }
                 nkv = 0;
                 for (const key in value) {
+                    const v = value[key];
+                    if (typeof v === 'function')
+                        continue;
                     _pack(key);
-                    _pack(value[key]);
-                    if (nkv++ > 0xffff)
+                    _pack(v);
+                    if (++nkv > 0xffff)
                         throw new Error('对象 key 数量大于 65535，无法序列化');
                 }
                 if (nkv >= 16)

package/io.js

@@ -476,9 +476,12 @@ function _pack(value) {
                 }
                 nkv = 0;
                 for (const key in value) {
+                    const v = value[key];
+                    if (typeof v === 'function')
+                        continue;
                     _pack(key);
-                    _pack(value[key]);
-                    if (nkv++ > 0xffff)
+                    _pack(v);
+                    if (++nkv > 0xffff)
                         throw new Error('对象 key 数量大于 65535，无法序列化');
                 }
                 if (nkv >= 16)

package/net.d.ts

@@ -66,10 +66,10 @@ export interface RequestFullOptions extends RequestOptions {
 export interface RequestRawOptions extends RequestOptions {
     raw: true;
 }
-export interface RequestError extends Error {
+export interface RequestError<TBody extends string | Buffer = string> extends Error {
     url: URL;
     options: RequestOptions | RequestFullOptions | RequestRawOptions;
-    response?: FullResponse<string>;
+    response?: FullResponse<TBody>;
     [inspect.custom]: Function;
 }
 export interface StatusCodeError {

package/net.js

@@ -245,7 +245,9 @@ export async function request(url, options = {}) {
                     value: {
                         status: response.status,
                         headers: response.headers,
-                        body: await stream_to_text(response.body),
+                        body: decode
+                            ? await stream_to_text(response.body)
+                            : await stream_to_buffer(response.body),
                     }
                 }
             } : {},

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.2.4",
+    "version": "1.2.6",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -60,16 +60,10 @@
         "@typescript-eslint/eslint-plugin": "^8.20.0",
         "@typescript-eslint/parser": "^8.20.0",
         "@typescript-eslint/utils": "^8.20.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",
         "archiver": "^7.0.1",
         "chalk": "^5.4.1",
-        "chardet": "^2.0.0",
         "cli-table3": "^0.6.5",
         "cli-truncate": "^4.0.0",
-        "colors": "^1.4.0",
         "commander": "^13.0.0",
         "css-loader": "^7.1.2",
         "emoji-regex": "^10.4.0",
@@ -77,7 +71,6 @@
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-react": "^7.37.4",
         "gulp-sort": "^2.0.0",
-        "hash-string": "^1.0.0",
         "https-proxy-agent": "^7.0.6",
         "i18next": "^24.2.1",
         "i18next-scanner": "^4.6.0",
@@ -103,7 +96,7 @@
         "tslib": "^2.8.1",
         "typescript": "^5.7.3",
         "ua-parser-js": "^2.0.0",
-        "undici": "^7.2.1",
+        "undici": "^7.2.2",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
         "webpack": "^5.97.1",
@@ -114,7 +107,6 @@
         "@babel/types": "^7.26.5",
         "@types/archiver": "^6.0.3",
         "@types/babel__traverse": "^7.20.6",
-        "@types/chardet": "^1.0.0",
         "@types/eslint": "^9.6.1",
         "@types/estree": "^1.0.6",
         "@types/gulp-sort": "^2.0.4",
@@ -122,7 +114,7 @@
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.17.14",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^22.10.6",
+        "@types/node": "^22.10.7",
         "@types/react": "^19.0.7",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",

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;