herdr-remote 0.2.11 → 0.2.12

package/dist/tui.mjs

@@ -4015,7 +4015,7 @@ function About({ ctx }) {
         children: updateLabel
       }
     ) }),
-    /* @__PURE__ */ jsx10(Row, { label: t("about.version"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: "0.2.11" }) }),
+    /* @__PURE__ */ jsx10(Row, { label: t("about.version"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: "0.2.12" }) }),
     /* @__PURE__ */ jsx10(Row, { label: t("about.configPath"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: (0, import_config.configPath)() }) }),
     /* @__PURE__ */ jsx10(Row, { label: t("about.statePath"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: (0, import_config.stateDir)() }) }),
     /* @__PURE__ */ jsx10(Box9, { marginTop: 1, children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: t("about.docs") }) }),

package/herdr-plugin.toml

@@ -1,6 +1,6 @@
 id = "herdr.remote.web"
 name = "Herdr Remote Web"
-version = "0.2.11"
+version = "0.2.12"
 min_herdr_version = "0.9.0"
 description = "Browser access to Herdr workspaces via local or self-hosted relay"
 platforms = ["linux", "macos"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdr-remote",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "description": "Browser access to Herdr workspaces: plugin, host connector, and configuration TUI",
   "license": "MIT",
   "repository": {

package/src/host-connector.js

@@ -36,6 +36,19 @@ function closeSocket(ws, reason = 'host connector stopping') {
   try { ws.close(1000, reason); } catch {}
 }
 
+function terminateSocket(ws) {
+  if (!ws || ws.readyState === WebSocket.CLOSED) return;
+  try {
+    if (typeof ws.terminate === 'function') {
+      ws.terminate();
+    } else if (typeof ws.destroy === 'function') {
+      ws.destroy();
+    } else if (typeof ws.close === 'function') {
+      ws.close();
+    }
+  } catch {}
+}
+
 function pidAlive(pid) {
   if (!Number.isInteger(pid) || pid <= 0) return false;
   try {
@@ -88,6 +101,7 @@ class HostConnector {
     this.fastFailures = 0;
     this.reconnectTimer = null;
     this.heartbeatTimer = null;
+    this.keepaliveTimer = null;
     this.reconnectAttempts = 0;
     this.clientCount = 0;
     this.legacyHeartbeat = false;
@@ -154,6 +168,7 @@ class HostConnector {
     this.stopping = true;
     if (this.reconnectTimer) clearTimeout(this.reconnectTimer);
     if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
+    this.stopKeepalive();
     this.reconnectTimer = null;
     this.heartbeatTimer = null;
     sendJson(this.ws, { type: 'host_shutdown' });
@@ -168,6 +183,7 @@ class HostConnector {
 
   connect() {
     if (this.stopping || (this.ws && [WebSocket.OPEN, WebSocket.CONNECTING].includes(this.ws.readyState))) return;
+    this.stopKeepalive();
     let ws;
     try {
       ws = new WebSocket(this.relayUrl);
@@ -208,6 +224,7 @@ class HostConnector {
       this.ws = null;
       if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
       this.heartbeatTimer = null;
+      this.stopKeepalive();
       this.ready = false;
       this.clientCount = 0;
       this.legacyHeartbeat = false;
@@ -276,6 +293,7 @@ class HostConnector {
     if (message.type === 'host_ready') {
       this.ready = true;
       this.reconnectAttempts = 0;
+      this.startKeepalive();
       if (Object.hasOwn(message, 'clientCount')) {
         this.legacyHeartbeat = false;
         this.setClientCount(message.clientCount);
@@ -460,6 +478,49 @@ class HostConnector {
     this.sendHeartbeat();
   }
 
+  startKeepalive() {
+    this.stopKeepalive();
+    if (!this.ws || this.stopping) return;
+    this.ws.isAlive = true;
+    const interval = this.config?.cleanup?.heartbeatIntervalMs || 30_000;
+    this.keepaliveTimer = setInterval(() => this.tickKeepalive(), interval);
+  }
+
+  stopKeepalive() {
+    if (this.keepaliveTimer) {
+      clearInterval(this.keepaliveTimer);
+      this.keepaliveTimer = null;
+    }
+  }
+
+  tickKeepalive() {
+    const ws = this.ws;
+    if (!ws || this.stopping) return;
+    if (ws.readyState === WebSocket.CLOSING) {
+      terminateSocket(ws);
+      return;
+    }
+    if (ws.readyState !== WebSocket.OPEN) return;
+
+    if (!ws.isAlive) {
+      terminateSocket(ws);
+      return;
+    }
+
+    ws.isAlive = false;
+    try {
+      if (typeof ws.ping === 'function') ws.ping();
+    } catch {}
+
+    if (this.clientCount <= 0 && !this.legacyHeartbeat) {
+      sendJson(ws, {
+        type: 'heartbeat',
+        load: {},
+        ptys: [],
+      });
+    }
+  }
+
   setClientCount(value) {
     const next = Number.isInteger(value) ? Math.max(0, value) : 0;
     if (next === this.clientCount && (next === 0 || this.heartbeatTimer)) return;