@hile/micro 1.0.8 → 1.0.9

package/dist/application.d.ts

@@ -34,16 +34,12 @@ export declare class Application extends Server {
     private readonly _registryLookupTimeoutMs;
     private readonly _requestTimeoutMs;
     private readonly namespaces;
-    private static readonly HEARTBEAT_INTERVAL;
-    private heartbeatTimer?;
     private static readonly CB_COOLDOWN_MS;
     private readonly circuitBreakers;
     constructor(props: ApplicationProps);
     listen(port?: number): Promise<() => Promise<void>>;
     private scheduleRegistryRetry;
     private reconnectToRegistry;
-    private startHeartbeat;
-    private stopHeartbeat;
     private recordSuccess;
     private recordFailure;
     private getActiveExcludes;

package/dist/application.js

@@ -46,8 +46,6 @@ export class Application extends Server {
     _registryLookupTimeoutMs;
     _requestTimeoutMs;
     namespaces = new Map();
-    static HEARTBEAT_INTERVAL = 10000;
-    heartbeatTimer;
     static CB_COOLDOWN_MS = 30_000;
     circuitBreakers = new Map();
     constructor(props) {
@@ -69,7 +67,6 @@ export class Application extends Server {
         const callback = await super.listen(port);
         try {
             await this.reconnectToRegistry();
-            this.startHeartbeat();
         }
         catch (err) {
             try {
@@ -82,7 +79,6 @@ export class Application extends Server {
         }
         return async () => {
             this.stopped = true;
-            this.stopHeartbeat();
             if (this.reconnectTimeout) {
                 clearTimeout(this.reconnectTimeout);
                 this.reconnectTimeout = undefined;
@@ -134,25 +130,6 @@ export class Application extends Server {
         });
         return this.registryReconnectPromise;
     }
-    startHeartbeat() {
-        this.stopHeartbeat();
-        this.heartbeatTimer = setInterval(() => {
-            if (!this.registry)
-                return;
-            try {
-                this.registry.push('/-/heartbeat', {});
-            }
-            catch {
-                // registry connection may have dropped between null-check and push
-            }
-        }, Application.HEARTBEAT_INTERVAL);
-    }
-    stopHeartbeat() {
-        if (this.heartbeatTimer) {
-            clearInterval(this.heartbeatTimer);
-            this.heartbeatTimer = undefined;
-        }
-    }
     recordSuccess(ns, host, port) {
         const excludes = this.circuitBreakers.get(ns);
         if (excludes) {

package/dist/client.d.ts

@@ -14,8 +14,12 @@ export declare class Client extends MessageWs {
     readonly host: string;
     readonly port: number;
     private _online;
+    private lastHeartbeat;
+    private heartbeatTimer?;
+    private checkTimer?;
     readonly events: EventEmitter<any>;
     constructor(props: ClientProps);
+    private startHeartbeat;
     protected exec(data: {
         url: string;
         data: any;

package/dist/client.js

@@ -7,6 +7,9 @@ export class Client extends MessageWs {
     host;
     port;
     _online = true;
+    lastHeartbeat = Date.now();
+    heartbeatTimer;
+    checkTimer;
     events = new EventEmitter();
     constructor(props) {
         const { server, ws, host, port } = props;
@@ -17,8 +20,32 @@ export class Client extends MessageWs {
         this.port = port;
         this.events.on('connect', () => this._online = true);
         this.events.on('disconnect', () => this._online = false);
+        this.lastHeartbeat = Date.now();
+        this.startHeartbeat();
+    }
+    startHeartbeat() {
+        const interval = Number(process.env.MICRO_HEARTBEAT_INTERVAL) || 10_000;
+        const timeout = Number(process.env.MICRO_HEARTBEAT_TIMEOUT) || 20_000;
+        const checkInterval = Number(process.env.MICRO_HEARTBEAT_CHECK_INTERVAL) || 5_000;
+        this.heartbeatTimer = setInterval(() => {
+            try {
+                this._push({ url: '/-/heartbeat', data: {} });
+            }
+            catch {
+                // connection closed — will be cleaned up by checkTimer or close event
+            }
+        }, interval);
+        this.checkTimer = setInterval(() => {
+            if (Date.now() - this.lastHeartbeat > timeout) {
+                this.dispose();
+            }
+        }, checkInterval);
     }
     async exec(data) {
+        if (data.url === '/-/heartbeat') {
+            this.lastHeartbeat = Date.now();
+            return;
+        }
         if (!this._online)
             throw new Error('Client is not online');
         return this.server.dispatch(data.url, data.data, {
@@ -36,6 +63,10 @@ export class Client extends MessageWs {
         return this._push({ url, data }, timeout);
     }
     dispose() {
+        if (this.heartbeatTimer)
+            clearInterval(this.heartbeatTimer);
+        if (this.checkTimer)
+            clearInterval(this.checkTimer);
         super.dispose();
         if (this.socket.readyState === WebSocket.OPEN || this.socket.readyState === WebSocket.CONNECTING) {
             this.socket.close();

package/dist/registry.d.ts

@@ -16,9 +16,6 @@ export declare function parseConfigFilename(filename: string): string | null;
 export declare class Registry extends Server {
     private readonly namespaces;
     private unregisterFind?;
-    private static readonly HEARTBEAT_INTERVAL;
-    private static readonly HEARTBEAT_TIMEOUT;
-    private readonly heartbeats;
     private readonly workspace;
     private readonly configFileSuffix;
     private readonly configs;

package/dist/registry.js

@@ -42,9 +42,6 @@ export function parseConfigFilename(filename) {
 export class Registry extends Server {
     namespaces = new Map();
     unregisterFind;
-    static HEARTBEAT_INTERVAL = 1000;
-    static HEARTBEAT_TIMEOUT = 20000;
-    heartbeats = new Map();
     workspace;
     configFileSuffix = '.config.yaml';
     configs = new Map();
@@ -57,7 +54,6 @@ export class Registry extends Server {
         this.workspace = workspace;
         this.events.on('connect', (client, extras) => {
             const key = client.host + ':' + client.port;
-            this.heartbeats.set(key, Date.now());
             const namespace = extras.join('/');
             if (!this.namespaces.has(namespace)) {
                 this.namespaces.set(namespace, new Set());
@@ -66,7 +62,6 @@ export class Registry extends Server {
         });
         this.events.on('disconnect', (client, extras) => {
             const key = client.host + ':' + client.port;
-            this.heartbeats.delete(key);
             const namespace = extras.join('/');
             if (this.namespaces.has(namespace)) {
                 const keys = this.namespaces.get(namespace);
@@ -80,12 +75,6 @@ export class Registry extends Server {
         });
         this.mountFindHandler();
         this.registerEnvVariables();
-        this.register('/-/heartbeat', async ({ client }) => {
-            if (!client)
-                return;
-            const key = client.host + ':' + client.port;
-            this.heartbeats.set(key, Date.now());
-        });
     }
     watchEnvFile() {
         const configFile = resolve(this.workspace, 'configs');
@@ -119,23 +108,10 @@ export class Registry extends Server {
         if (!_port || _port <= 0)
             throw new Error('Unable to resolve registry port: pass `port` in constructor options, or ensure process.env.REGISTRY_PORT is set.');
         const teardown = await super.listen(_port);
-        const timer = setInterval(() => {
-            const now = Date.now();
-            for (const [key, lastTime] of this.heartbeats) {
-                if (now - lastTime >= Registry.HEARTBEAT_TIMEOUT) {
-                    const client = this.clients.get(key);
-                    if (client) {
-                        this.heartbeats.delete(key);
-                        client.dispose();
-                    }
-                }
-            }
-        }, Registry.HEARTBEAT_INTERVAL);
         const watcher = this.watchEnvFile();
         return async () => {
             if (watcher)
                 watcher.close();
-            clearInterval(timer);
             await teardown();
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hile/micro",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -29,5 +29,5 @@
     "ws": "^8.19.0",
     "yaml": "^2.9.0"
   },
-  "gitHead": "6c83f2e29de07a48e8467456b56351d304e45932"
+  "gitHead": "fa7d6d442ab080e6a395ee2a1dacac9eae340cf6"
 }