npm - xshell - Versions diffs - 1.0.114 → 1.0.116 - Mend

xshell 1.0.114 → 1.0.116

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/net.browser.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { t } from './i18n/instance.js';
 import './prototype.browser.js'; // to_time_str()
-import { assert, concat, genid, delay, Lock, encode, decode } from './utils.browser.js';
+import { assert, concat, genid, delay, Lock, encode, decode, timeout } from './utils.browser.js';
 const drop_request_headers = new Set([
     // : 开头的 key
     // sec-*
@@ -290,6 +290,7 @@ export class Remote {
         const len_json = dv.getUint32(0, true);
         let offset = 4 + len_json;
         let message = JSON.parse(decode(buffer.subarray(4, offset)));
+        message.data ??= [];
         if (message.bins) {
             const { bins } = message;
             let { data } = message;
@@ -379,11 +380,15 @@ export class Remote {
                 this.reconnecting = false;
                 if (!this.disconnected)
                     try {
-                        await this.connect();
+                        await timeout(3000, async () => {
+                            await this.connect();
+                        });
                         this.first_error = true;
                     }
-                    catch {
-                        // 错误由 this.connect 里面处理
+                    catch (error) {
+                        // 重连失败的错误这里需要简单打印下，_on_error 不会打印，这里也不继续往上抛了
+                        console.log(error.message);
+                        // 重连由 this.connect 里面调用 this._on_error 处理
                     }
             })();
     };
@@ -441,9 +446,12 @@ export class Remote {
                                     break;
                                 if (!this.reconnecting)
                                     try {
-                                        await this.call('echo', []);
+                                        await timeout(1000 * 2, async () => {
+                                            await this.call('echo', []);
+                                        });
                                     }
                                     catch (error) {
+                                        console.log(error.message);
                                         this._on_error(error);
                                     }
                             }

package/net.js CHANGED Viewed

@@ -3,7 +3,7 @@ import { buffer as stream_to_buffer, text as stream_to_text } from 'stream/consu
 import { isReadable } from 'stream';
 import { t } from './i18n/instance.js';
 import './prototype.js';
-import { inspect, concat, assert, genid, delay, Lock, encode, decode, pipe_with_error, map_values, unique } from './utils.js';
+import { inspect, concat, assert, genid, delay, Lock, encode, decode, pipe_with_error, map_values, unique, timeout } from './utils.js';
 export const WebSocketConnecting = 0;
 export const WebSocketOpen = 1;
 export const WebSocketClosing = 2;
@@ -501,6 +501,7 @@ export class Remote {
         const len_json = dv.getUint32(0, true);
         let offset = 4 + len_json;
         let message = JSON.parse(decode(buffer.subarray(4, offset)));
+        message.data ??= [];
         if (message.bins) {
             const { bins } = message;
             let { data } = message;
@@ -590,11 +591,15 @@ export class Remote {
                 this.reconnecting = false;
                 if (!this.disconnected)
                     try {
-                        await this.connect();
+                        await timeout(3000, async () => {
+                            await this.connect();
+                        });
                         this.first_error = true;
                     }
-                    catch {
-                        // 错误由 this.connect 里面处理
+                    catch (error) {
+                        // 重连失败的错误这里需要简单打印下，_on_error 不会打印，这里也不继续往上抛了
+                        console.log(error.message);
+                        // 重连由 this.connect 里面调用 this._on_error 处理
                     }
             })();
     };
@@ -652,9 +657,12 @@ export class Remote {
                                     break;
                                 if (!this.reconnecting)
                                     try {
-                                        await this.call('echo', []);
+                                        await timeout(1000 * 2, async () => {
+                                            await this.call('echo', []);
+                                        });
                                     }
                                     catch (error) {
+                                        console.log(error.message);
                                         this._on_error(error);
                                     }
                             }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.114",
+    "version": "1.0.116",
     "type": "module",
     "main": "./index.js",
     "bin": {