@kmmao/happy-agent 0.3.7 → 0.3.9

package/dist/index.cjs

@@ -18,7 +18,7 @@ var path = require('path');
 var fs = require('fs');
 var os = require('os');
 
-var version = "0.3.7";
+var version = "0.3.9";
 
 function loadConfig() {
   const serverUrl = (process.env.HAPPY_SERVER_URL ?? "https://happyserve.xycloud.info").replace(/\/+$/, "");
@@ -622,6 +622,7 @@ class RpcHandlerManager {
   logger;
   socket = null;
   reregisterInterval = null;
+  fastRetryTimer = null;
   constructor(config) {
     this.scopePrefix = config.scopePrefix;
     this.encryptionKey = config.encryptionKey;
@@ -681,11 +682,13 @@ class RpcHandlerManager {
   onSocketConnect(socket) {
     this.socket = socket;
     this.registerAllHandlers(socket);
+    this.scheduleFastRetry(socket);
     this.startReregisterInterval();
   }
   onSocketDisconnect() {
     this.socket = null;
     this.stopReregisterInterval();
+    this.cancelFastRetry();
   }
   getHandlerCount() {
     return this.handlers.size;
@@ -741,7 +744,27 @@ class RpcHandlerManager {
     }
   }
   /**
-   * Periodic re-registration every 60s as a safety net.
+   * Fast retry: 5 seconds after initial connect, re-register all handlers once.
+   * Covers the case where the first batch of registrations failed silently.
+   */
+  scheduleFastRetry(socket) {
+    this.cancelFastRetry();
+    this.fastRetryTimer = setTimeout(() => {
+      this.fastRetryTimer = null;
+      if (this.socket === socket && this.handlers.size > 0) {
+        this.logger("[RPC] Fast retry: re-registering all handlers");
+        this.registerAllHandlers(socket);
+      }
+    }, 5e3);
+  }
+  cancelFastRetry() {
+    if (this.fastRetryTimer) {
+      clearTimeout(this.fastRetryTimer);
+      this.fastRetryTimer = null;
+    }
+  }
+  /**
+   * Periodic re-registration every 30s as a safety net.
    */
   startReregisterInterval() {
     this.stopReregisterInterval();
@@ -749,7 +772,7 @@ class RpcHandlerManager {
       if (this.socket && this.handlers.size > 0) {
         this.registerAllHandlers(this.socket);
       }
-    }, 6e4);
+    }, 3e4);
   }
   stopReregisterInterval() {
     if (this.reregisterInterval) {
@@ -1460,6 +1483,7 @@ class MachineClient {
   keepAliveInterval = null;
   tailscaleRefreshInterval = null;
   lastTailscaleInfo = null;
+  tunnelManager = null;
   token;
   serverUrl;
   onEphemeral;
@@ -1629,6 +1653,10 @@ class MachineClient {
   setTailscaleInfo(info) {
     this.lastTailscaleInfo = info;
   }
+  /** Attach a TunnelManager for periodic tunnel state refresh. */
+  setTunnelManager(manager) {
+    this.tunnelManager = manager;
+  }
   shutdown() {
     logger.debug("[MACHINE] Shutting down");
     this.stopKeepAlive();
@@ -1660,14 +1688,22 @@ class MachineClient {
       const info = await detectTailscale();
       const serves = info.status === "connected" ? await detectTailscaleServe() : [];
       const fullInfo = { ...info, serves };
-      if (tailscaleChanged(this.lastTailscaleInfo, fullInfo)) {
+      const tsChanged = tailscaleChanged(this.lastTailscaleInfo, fullInfo);
+      if (tsChanged) {
         logger.debug(
           `[MACHINE] Tailscale changed: ${this.lastTailscaleInfo?.status} \u2192 ${fullInfo.status}, serves: ${serves.length}`
         );
         this.lastTailscaleInfo = fullInfo;
+      }
+      const tunnels = this.tunnelManager ? await this.tunnelManager.detectAll() : void 0;
+      if (tsChanged || tunnels) {
         this.updateDaemonState((state) => {
-          if (!state) return { status: "running", tailscale: fullInfo };
-          return { ...state, tailscale: fullInfo };
+          if (!state) return { status: "running", tailscale: fullInfo, tunnels };
+          return {
+            ...state,
+            ...tsChanged ? { tailscale: fullInfo } : {},
+            ...tunnels ? { tunnels } : {}
+          };
         });
       }
     }, TAILSCALE_REFRESH_MS);

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { MachineMetadata, DaemonState } from '@kmmao/happy-wire';
+import { MachineMetadata, DaemonState, TunnelProviderInfo, TunnelEntry, TunnelState } from '@kmmao/happy-wire';
 import { EventEmitter } from 'node:events';
 import { Socket } from 'socket.io-client';
 
@@ -175,6 +175,7 @@ declare class RpcHandlerManager {
     private readonly logger;
     private socket;
     private reregisterInterval;
+    private fastRetryTimer;
     constructor(config: RpcHandlerConfig);
     /**
      * Register an RPC handler for a specific method
@@ -196,7 +197,13 @@ declare class RpcHandlerManager {
     private emitRegisterWithRetry;
     private registerAllHandlers;
     /**
-     * Periodic re-registration every 60s as a safety net.
+     * Fast retry: 5 seconds after initial connect, re-register all handlers once.
+     * Covers the case where the first batch of registrations failed silently.
+     */
+    private scheduleFastRetry;
+    private cancelFastRetry;
+    /**
+     * Periodic re-registration every 30s as a safety net.
      */
     private startReregisterInterval;
     private stopReregisterInterval;
@@ -278,6 +285,66 @@ type TailscaleInfo = {
     serves?: TailscaleServeEntry[];
 };
 
+/**
+ * Tunnel Provider abstraction — unified interface for all tunnel backends.
+ *
+ * Each provider (Tailscale, UPnP, Cloudflare, FRP, etc.) implements this
+ * interface. TunnelManager aggregates all providers and exposes a single API.
+ */
+
+interface TunnelProvider {
+    /** Unique provider name: "tailscale" | "upnp" | "cloudflare" | "frp" */
+    readonly name: string;
+    /** Detect provider availability and list current tunnel entries. Never throws. */
+    detect(): Promise<TunnelProviderInfo>;
+    /** Add a tunnel mapping */
+    add(params: TunnelAddParams): Promise<TunnelOpResult>;
+    /** Remove a tunnel mapping */
+    remove(params: TunnelRemoveParams): Promise<TunnelOpResult>;
+    /** Toggle public/private access (not all providers support this) */
+    toggleAccess?(entry: TunnelEntry, publicAccess: boolean): Promise<TunnelOpResult>;
+}
+interface TunnelAddParams {
+    localPort: number;
+    remotePort?: number;
+    protocol?: string;
+    path?: string;
+    publicAccess?: boolean;
+    hostname?: string;
+}
+interface TunnelRemoveParams {
+    localPort?: number;
+    remotePort?: number;
+    path?: string;
+    hostname?: string;
+    /** Remove entire site (all routes for this hostname) */
+    removeEntireSite?: boolean;
+}
+interface TunnelOpResult {
+    success: boolean;
+    error?: string;
+}
+
+/**
+ * TunnelManager for happy-agent — aggregates all tunnel providers.
+ */
+
+declare class TunnelManager {
+    private readonly providers;
+    private refreshTimer;
+    private leaseRenewalTimer;
+    private lastState;
+    constructor(providers: TunnelProvider[]);
+    detectAll(): Promise<TunnelState>;
+    getLastState(): TunnelState;
+    getProvider(name: string): TunnelProvider | undefined;
+    add(providerName: string, params: TunnelAddParams): Promise<TunnelOpResult>;
+    remove(providerName: string, params: TunnelRemoveParams): Promise<TunnelOpResult>;
+    toggleAccess(providerName: string, entry: TunnelEntry, publicAccess: boolean): Promise<TunnelOpResult>;
+    startRefresh(onChange: (state: TunnelState) => void, intervalMs?: number): void;
+    stopRefresh(): void;
+}
+
 /**
  * Machine WebSocket client — trimmed from CLI's ApiMachineClient.
  *
@@ -313,6 +380,7 @@ declare class MachineClient {
     private keepAliveInterval;
     private tailscaleRefreshInterval;
     private lastTailscaleInfo;
+    private tunnelManager;
     private readonly token;
     private readonly serverUrl;
     private readonly onEphemeral?;
@@ -322,6 +390,8 @@ declare class MachineClient {
     updateDaemonState(handler: (state: DaemonState | null) => DaemonState): Promise<void>;
     /** Seed initial Tailscale info detected before connect. */
     setTailscaleInfo(info: TailscaleInfo): void;
+    /** Attach a TunnelManager for periodic tunnel state refresh. */
+    setTunnelManager(manager: TunnelManager): void;
     shutdown(): void;
     private startKeepAlive;
     private stopKeepAlive;

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { MachineMetadata, DaemonState } from '@kmmao/happy-wire';
+import { MachineMetadata, DaemonState, TunnelProviderInfo, TunnelEntry, TunnelState } from '@kmmao/happy-wire';
 import { EventEmitter } from 'node:events';
 import { Socket } from 'socket.io-client';
 
@@ -175,6 +175,7 @@ declare class RpcHandlerManager {
     private readonly logger;
     private socket;
     private reregisterInterval;
+    private fastRetryTimer;
     constructor(config: RpcHandlerConfig);
     /**
      * Register an RPC handler for a specific method
@@ -196,7 +197,13 @@ declare class RpcHandlerManager {
     private emitRegisterWithRetry;
     private registerAllHandlers;
     /**
-     * Periodic re-registration every 60s as a safety net.
+     * Fast retry: 5 seconds after initial connect, re-register all handlers once.
+     * Covers the case where the first batch of registrations failed silently.
+     */
+    private scheduleFastRetry;
+    private cancelFastRetry;
+    /**
+     * Periodic re-registration every 30s as a safety net.
      */
     private startReregisterInterval;
     private stopReregisterInterval;
@@ -278,6 +285,66 @@ type TailscaleInfo = {
     serves?: TailscaleServeEntry[];
 };
 
+/**
+ * Tunnel Provider abstraction — unified interface for all tunnel backends.
+ *
+ * Each provider (Tailscale, UPnP, Cloudflare, FRP, etc.) implements this
+ * interface. TunnelManager aggregates all providers and exposes a single API.
+ */
+
+interface TunnelProvider {
+    /** Unique provider name: "tailscale" | "upnp" | "cloudflare" | "frp" */
+    readonly name: string;
+    /** Detect provider availability and list current tunnel entries. Never throws. */
+    detect(): Promise<TunnelProviderInfo>;
+    /** Add a tunnel mapping */
+    add(params: TunnelAddParams): Promise<TunnelOpResult>;
+    /** Remove a tunnel mapping */
+    remove(params: TunnelRemoveParams): Promise<TunnelOpResult>;
+    /** Toggle public/private access (not all providers support this) */
+    toggleAccess?(entry: TunnelEntry, publicAccess: boolean): Promise<TunnelOpResult>;
+}
+interface TunnelAddParams {
+    localPort: number;
+    remotePort?: number;
+    protocol?: string;
+    path?: string;
+    publicAccess?: boolean;
+    hostname?: string;
+}
+interface TunnelRemoveParams {
+    localPort?: number;
+    remotePort?: number;
+    path?: string;
+    hostname?: string;
+    /** Remove entire site (all routes for this hostname) */
+    removeEntireSite?: boolean;
+}
+interface TunnelOpResult {
+    success: boolean;
+    error?: string;
+}
+
+/**
+ * TunnelManager for happy-agent — aggregates all tunnel providers.
+ */
+
+declare class TunnelManager {
+    private readonly providers;
+    private refreshTimer;
+    private leaseRenewalTimer;
+    private lastState;
+    constructor(providers: TunnelProvider[]);
+    detectAll(): Promise<TunnelState>;
+    getLastState(): TunnelState;
+    getProvider(name: string): TunnelProvider | undefined;
+    add(providerName: string, params: TunnelAddParams): Promise<TunnelOpResult>;
+    remove(providerName: string, params: TunnelRemoveParams): Promise<TunnelOpResult>;
+    toggleAccess(providerName: string, entry: TunnelEntry, publicAccess: boolean): Promise<TunnelOpResult>;
+    startRefresh(onChange: (state: TunnelState) => void, intervalMs?: number): void;
+    stopRefresh(): void;
+}
+
 /**
  * Machine WebSocket client — trimmed from CLI's ApiMachineClient.
  *
@@ -313,6 +380,7 @@ declare class MachineClient {
     private keepAliveInterval;
     private tailscaleRefreshInterval;
     private lastTailscaleInfo;
+    private tunnelManager;
     private readonly token;
     private readonly serverUrl;
     private readonly onEphemeral?;
@@ -322,6 +390,8 @@ declare class MachineClient {
     updateDaemonState(handler: (state: DaemonState | null) => DaemonState): Promise<void>;
     /** Seed initial Tailscale info detected before connect. */
     setTailscaleInfo(info: TailscaleInfo): void;
+    /** Attach a TunnelManager for periodic tunnel state refresh. */
+    setTunnelManager(manager: TunnelManager): void;
     shutdown(): void;
     private startKeepAlive;
     private stopKeepAlive;

package/dist/index.mjs

@@ -16,7 +16,7 @@ import { join as join$1, resolve } from 'path';
 import { realpathSync } from 'fs';
 import { tmpdir } from 'os';
 
-var version = "0.3.7";
+var version = "0.3.9";
 
 function loadConfig() {
   const serverUrl = (process.env.HAPPY_SERVER_URL ?? "https://happyserve.xycloud.info").replace(/\/+$/, "");
@@ -620,6 +620,7 @@ class RpcHandlerManager {
   logger;
   socket = null;
   reregisterInterval = null;
+  fastRetryTimer = null;
   constructor(config) {
     this.scopePrefix = config.scopePrefix;
     this.encryptionKey = config.encryptionKey;
@@ -679,11 +680,13 @@ class RpcHandlerManager {
   onSocketConnect(socket) {
     this.socket = socket;
     this.registerAllHandlers(socket);
+    this.scheduleFastRetry(socket);
     this.startReregisterInterval();
   }
   onSocketDisconnect() {
     this.socket = null;
     this.stopReregisterInterval();
+    this.cancelFastRetry();
   }
   getHandlerCount() {
     return this.handlers.size;
@@ -739,7 +742,27 @@ class RpcHandlerManager {
     }
   }
   /**
-   * Periodic re-registration every 60s as a safety net.
+   * Fast retry: 5 seconds after initial connect, re-register all handlers once.
+   * Covers the case where the first batch of registrations failed silently.
+   */
+  scheduleFastRetry(socket) {
+    this.cancelFastRetry();
+    this.fastRetryTimer = setTimeout(() => {
+      this.fastRetryTimer = null;
+      if (this.socket === socket && this.handlers.size > 0) {
+        this.logger("[RPC] Fast retry: re-registering all handlers");
+        this.registerAllHandlers(socket);
+      }
+    }, 5e3);
+  }
+  cancelFastRetry() {
+    if (this.fastRetryTimer) {
+      clearTimeout(this.fastRetryTimer);
+      this.fastRetryTimer = null;
+    }
+  }
+  /**
+   * Periodic re-registration every 30s as a safety net.
    */
   startReregisterInterval() {
     this.stopReregisterInterval();
@@ -747,7 +770,7 @@ class RpcHandlerManager {
       if (this.socket && this.handlers.size > 0) {
         this.registerAllHandlers(this.socket);
       }
-    }, 6e4);
+    }, 3e4);
   }
   stopReregisterInterval() {
     if (this.reregisterInterval) {
@@ -1458,6 +1481,7 @@ class MachineClient {
   keepAliveInterval = null;
   tailscaleRefreshInterval = null;
   lastTailscaleInfo = null;
+  tunnelManager = null;
   token;
   serverUrl;
   onEphemeral;
@@ -1627,6 +1651,10 @@ class MachineClient {
   setTailscaleInfo(info) {
     this.lastTailscaleInfo = info;
   }
+  /** Attach a TunnelManager for periodic tunnel state refresh. */
+  setTunnelManager(manager) {
+    this.tunnelManager = manager;
+  }
   shutdown() {
     logger.debug("[MACHINE] Shutting down");
     this.stopKeepAlive();
@@ -1658,14 +1686,22 @@ class MachineClient {
       const info = await detectTailscale();
       const serves = info.status === "connected" ? await detectTailscaleServe() : [];
       const fullInfo = { ...info, serves };
-      if (tailscaleChanged(this.lastTailscaleInfo, fullInfo)) {
+      const tsChanged = tailscaleChanged(this.lastTailscaleInfo, fullInfo);
+      if (tsChanged) {
         logger.debug(
           `[MACHINE] Tailscale changed: ${this.lastTailscaleInfo?.status} \u2192 ${fullInfo.status}, serves: ${serves.length}`
         );
         this.lastTailscaleInfo = fullInfo;
+      }
+      const tunnels = this.tunnelManager ? await this.tunnelManager.detectAll() : void 0;
+      if (tsChanged || tunnels) {
         this.updateDaemonState((state) => {
-          if (!state) return { status: "running", tailscale: fullInfo };
-          return { ...state, tailscale: fullInfo };
+          if (!state) return { status: "running", tailscale: fullInfo, tunnels };
+          return {
+            ...state,
+            ...tsChanged ? { tailscale: fullInfo } : {},
+            ...tunnels ? { tunnels } : {}
+          };
         });
       }
     }, TAILSCALE_REFRESH_MS);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmmao/happy-agent",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "description": "CLI client for controlling Happy Coder agents remotely",
   "author": "Kirill Dubovitskiy",
   "license": "MIT",