@electerm/ssh2 1.17.0 → 1.17.1

package/lib/client.js

@@ -362,6 +362,10 @@ class Client extends EventEmitter {
       },
       onHandshakeComplete: (negotiated) => {
         this.emit('handshake', negotiated);
+        // Start keepalive monitoring after handshake
+        if (this.config.keepaliveInterval > 0) {
+          resetKA();
+        }
         if (!ready) {
           ready = true;
           proto.service('ssh-userauth');
@@ -540,10 +544,14 @@ class Client extends EventEmitter {
           }
         },
         REQUEST_SUCCESS: (p, data) => {
+          // Reset keepalive on any protocol activity
+          this._resetKA();
           if (callbacks.length)
             callbacks.shift()(false, data);
         },
         REQUEST_FAILURE: (p) => {
+          // Reset keepalive on any protocol activity
+          this._resetKA();
           if (callbacks.length)
             callbacks.shift()(true);
         },
@@ -748,39 +756,71 @@ class Client extends EventEmitter {
 
     sock.pause();
 
-    // TODO: check keepalive implementation
-    // Keepalive-related
+    // Enhanced keepalive implementation with TCP-level and SSH protocol-level keepalives
     const kainterval = this.config.keepaliveInterval;
     const kacountmax = this.config.keepaliveCountMax;
     let kacount = 0;
     let katimer;
+    let lastActivity = Date.now();
+
+    // Enable TCP keepalive for network-level connection monitoring
+    // This helps detect dead connections even when SSH protocol keepalive is not used
+    if (typeof sock.setKeepAlive === 'function') {
+      sock.setKeepAlive(true, 10000);  // Start probing after 10 seconds idle
+    }
+
     const sendKA = () => {
+      const now = Date.now();
+      const timeSinceLastActivity = now - lastActivity;
+
+      // If we've received any activity recently, reset counter and continue
+      if (timeSinceLastActivity < kainterval) {
+        kacount = 0;
+        return;
+      }
+
       if (++kacount > kacountmax) {
         clearInterval(katimer);
         if (sock.readable) {
-          const err = new Error('Keepalive timeout');
+          const err = new Error(
+            `Keepalive timeout: no response after ${kacountmax} attempts`
+          );
           err.level = 'client-timeout';
           this.emit('error', err);
           sock.destroy();
         }
         return;
       }
+
       if (isWritable(sock)) {
-        // Append dummy callback to keep correct callback order
-        callbacks.push(resetKA);
+        if (debug) {
+          debug(
+            `Client: Sending keepalive (${kacount}/${kacountmax}), ` +
+            `${timeSinceLastActivity}ms since last activity`
+          );
+        }
+        // Send SSH protocol-level keepalive
+        // Use global request instead of relying on callbacks
         proto.ping();
+        
+        // Don't rely on callback - we'll reset based on any activity
       } else {
         clearInterval(katimer);
       }
     };
+
     function resetKA() {
+      lastActivity = Date.now();
+      kacount = 0;
+      
       if (kainterval > 0) {
-        kacount = 0;
         clearInterval(katimer);
-        if (isWritable(sock))
+        if (isWritable(sock)) {
           katimer = setInterval(sendKA, kainterval);
+        }
       }
     }
+    
     this._resetKA = resetKA;
 
     const onDone = (() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electerm/ssh2",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "author": "Brian White <mscdex@mscdex.net>",
   "description": "SSH2 client and server modules written in pure JavaScript for node.js",
   "main": "./lib/index.js",