xshell 1.2.38 → 1.2.40

package/net.browser.js

@@ -1,7 +1,7 @@
 import { t } from "./i18n/instance.js";
 import { rethrow } from "./prototype.browser.js"; // to_time_str()
 import { message_symbol, pack, parse } from "./io.browser.js";
-import { assert, genid, delay, Lock, timeout, check, defer } from "./utils.browser.js";
+import { assert, genid, delay, Lock, timeout, check } from "./utils.browser.js";
 const drop_request_headers = new Set([
     // : 开头的 key
     // sec-*
@@ -526,27 +526,34 @@ export class Remote {
             - websocket?: 作为 websocket 连接接收方，必传 websocket 参数 */
     async subscribe(func, on_data, { on_error = rethrow, websocket } = {}) {
         const id = genid();
-        let psubscribed = defer();
-        let first = true;
-        this.handlers.set(id, ({ error, data }) => {
-            if (error) {
+        let psubscribed = new Promise((resolve, reject) => {
+            let first = true;
+            this.handlers.set(id, ({ error, data }) => {
+                if (error) {
+                    if (first) {
+                        first = false;
+                        this.handlers.delete(id);
+                        reject(error);
+                    }
+                    else
+                        on_error(error);
+                    return;
+                }
                 if (first) {
                     first = false;
-                    this.handlers.delete(id);
-                    psubscribed.reject(error);
+                    resolve({ id, data: data });
+                    return;
                 }
-                else
-                    on_error(error);
-                return;
-            }
-            if (first) {
-                first = false;
-                psubscribed.resolve({ id, data: data });
-                return;
-            }
-            on_data(data);
+                on_data(data);
+            });
         });
-        await this.send({ id, func }, websocket);
+        try {
+            await this.send({ id, func }, websocket);
+        }
+        catch (error) {
+            this.handlers.delete(id);
+            throw error;
+        }
         return psubscribed;
     }
 }

package/net.d.ts

@@ -298,5 +298,5 @@ export declare class RemoteClient {
     [inspect.custom](): {
         remote: string;
         websocket: string;
-    } & Omit<this, "websocket" | typeof import("util").inspect.custom | "call" | "remote" | "send">;
+    } & Omit<this, "call" | "remote" | "websocket" | typeof import("util").inspect.custom | "send">;
 }

package/net.js

@@ -4,7 +4,7 @@ import { isReadable } from 'stream';
 import { t } from "./i18n/instance.js";
 import { rethrow } from "./prototype.js";
 import { message_symbol, pack, parse } from "./io.js";
-import { inspect, assert, genid, delay, Lock, pipe_with_error, map_values, unique, timeout, check, colored, defer } from "./utils.js";
+import { inspect, assert, genid, delay, Lock, pipe_with_error, map_values, unique, timeout, check, colored } from "./utils.js";
 export const WebSocketConnecting = 0;
 export const WebSocketOpen = 1;
 export const WebSocketClosing = 2;
@@ -714,27 +714,34 @@ export class Remote {
             - websocket?: 作为 websocket 连接接收方，必传 websocket 参数 */
     async subscribe(func, on_data, { on_error = rethrow, websocket } = {}) {
         const id = genid();
-        let psubscribed = defer();
-        let first = true;
-        this.handlers.set(id, ({ error, data }) => {
-            if (error) {
+        let psubscribed = new Promise((resolve, reject) => {
+            let first = true;
+            this.handlers.set(id, ({ error, data }) => {
+                if (error) {
+                    if (first) {
+                        first = false;
+                        this.handlers.delete(id);
+                        reject(error);
+                    }
+                    else
+                        on_error(error);
+                    return;
+                }
                 if (first) {
                     first = false;
-                    this.handlers.delete(id);
-                    psubscribed.reject(error);
+                    resolve({ id, data: data });
+                    return;
                 }
-                else
-                    on_error(error);
-                return;
-            }
-            if (first) {
-                first = false;
-                psubscribed.resolve({ id, data: data });
-                return;
-            }
-            on_data(data);
+                on_data(data);
+            });
         });
-        await this.send({ id, func }, websocket);
+        try {
+            await this.send({ id, func }, websocket);
+        }
+        catch (error) {
+            this.handlers.delete(id);
+            throw error;
+        }
         return psubscribed;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.2.38",
+    "version": "1.2.40",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -57,9 +57,9 @@
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.9",
         "@types/ws": "^8.18.1",
-        "@typescript-eslint/eslint-plugin": "^8.29.1",
-        "@typescript-eslint/parser": "^8.29.1",
-        "@typescript-eslint/utils": "^8.29.1",
+        "@typescript-eslint/eslint-plugin": "^8.30.1",
+        "@typescript-eslint/parser": "^8.30.1",
+        "@typescript-eslint/utils": "^8.30.1",
         "archiver": "^7.0.1",
         "chalk": "^5.4.1",
         "cli-table3": "^0.6.5",
@@ -72,7 +72,7 @@
         "eslint-plugin-react": "^7.37.5",
         "gulp-sort": "^2.0.0",
         "https-proxy-agent": "^7.0.6",
-        "i18next": "^24.2.3",
+        "i18next": "^25.0.0",
         "i18next-scanner": "^4.6.0",
         "koa": "^2.16.1",
         "koa-compress": "^5.1.1",
@@ -82,7 +82,7 @@
         "ora": "^8.2.0",
         "react": "^19.1.0",
         "react-i18next": "^15.4.1",
-        "react-object-model": "^1.2.23",
+        "react-object-model": "^1.2.24",
         "resolve-path": "^1.4.0",
         "sass": "^1.86.3",
         "sass-loader": "^16.0.5",
@@ -112,8 +112,8 @@
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^22.14.0",
-        "@types/react": "^19.1.0",
+        "@types/node": "^22.14.1",
+        "@types/react": "^19.1.2",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",

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;