thinknagent 0.1.4 → 0.1.6

package/lib/agent.js

@@ -38,65 +38,62 @@ class Agent {
     this._active = false;
   }
 
-  start() {
-    const cfg = store.read();
-    if (!cfg.serverUrl) {
-      console.error('[agent] No serverUrl configured. Run: thinknagent init');
-      process.exit(1);
-    }
-
-    console.log(`[agent] Connecting to ${cfg.serverUrl}...`);
-    this.conn.connect();
+start() {
+  const cfg = store.read();
+  if (!cfg.serverUrl) {
+    console.error('[agent] Not initialized.');
+    process.exit(1);
+  }
 
-    // Wire metrics → alert engine
-    this.conn.socket.on('agent:metrics_internal', (m) => this.alerts.evaluate(m));
+  console.log(`[agent] Connecting to ${cfg.serverUrl}...`);
+  
+  // ✅ Pehle connect karo
+  this.conn.connect();
+
+  // ✅ Socket ready hone ke baad events bind karo
+  //    conn.socket ab available hai kyunki connect() sync mein socket banata hai
+  this.conn.socket.on('agent:rules_updated', ({ rules }) => {
+    store.set('alerts', rules);
+    this.alerts.reloadRules(rules);
+  });
+
+  this.conn.socket.on('agent:send_metrics_now', () => {
+    console.log('[agent] Metrics poll requested');
+    this.metrics.pollNow();
+  });
+
+  this.conn.socket.on('agent:logs_updated', ({ logs }) => {
+    store.set('logs', logs);
+    this.logs.stop();
+    this.logs = new LogWatcher({ connection: this.conn, logPaths: logs });
+    if (this._active) this.logs.start(); // ✅ sirf tab start karo agar active ho
+  });
 
-    // Allow server to push updated alert rules at runtime (Owner changed thresholds)
-    this.conn.socket.on('agent:rules_updated', ({ rules }) => {
-      store.set('alerts', rules);
-      this.alerts.reloadRules(rules);
-    });
+  process.on('SIGTERM', () => this._shutdown('SIGTERM'));
+  process.on('SIGINT',  () => this._shutdown('SIGINT'));
+}
 
-    // Allow server to push updated log paths at runtime
-    this.conn.socket.on('agent:logs_updated', ({ logs }) => {
-      store.set('logs', logs);
-      this.logs.stop();
-      this.logs = new LogWatcher({ connection: this.conn, logPaths: logs });
-      this.logs.start();
-    });
+_onReady(role, roomId) {
+  if (this._active) {
+    // Reconnect case — metrics/logs already chal rahe hain
+    console.log(`[agent] Reconnected. Role: ${role}`);
+    return;
+  }
 
-this.conn.socket.on('agent:send_metrics_now', () => {
-  console.log('[agent] send_metrics_now received — polling now');
-  this.metrics.pollNow();
-});
+  this._active = true;
+  console.log(`[agent] Active! Role: ${role} | Room: ${roomId}`);
 
-    // Graceful shutdown
-    process.on('SIGTERM', () => this._shutdown('SIGTERM'));
-    process.on('SIGINT',  () => this._shutdown('SIGINT'));
-  }
+  // ✅ Metrics emit ko alert engine se connect karo
+  const origEmit = this.conn.emit.bind(this.conn);
+  this.conn.emit = (event, data) => {
+    if (event === 'agent:metrics') this.alerts.evaluate(data);
+    origEmit(event, data);
+  };
 
-  _onReady(role, roomId) {
-    if (this._active) return; // reconnect — already running
-    this._active = true;
-    console.log(`[agent] Active. Role: ${role} | Room: ${roomId}`);
-
-    this.metrics.start();
-    this.logs.start();
-    this.shell.start();
-
-    // Patch metrics poller to also feed alert engine
-    const origEmit = this.conn.emit.bind(this.conn);
-    this.conn.emit = (event, data) => {
-      if (event === 'agent:metrics') this.alerts.evaluate(data);
-      origEmit(event, data);
-    };
-
-    this.conn.emit('agent:ready', {
-      hostname: require('os').hostname(),
-      platform: process.platform,
-      nodeVersion: process.version,
-    });
-  }
+  this.metrics.start();
+  this.logs.start();
+  this.shell.start();
+}
   
 
   _onDisconnect(reason) {

package/lib/connect.js

@@ -31,22 +31,26 @@ class Connection {
   const cfg = store.read();
 
   this.socket = io(`${this.serverUrl}${NAMESPACE}`, {
-    reconnection:        true,
-    reconnectionDelay:   RECONNECT_DELAY,
+    reconnection: true,
+    reconnectionDelay: RECONNECT_DELAY,
     reconnectionAttempts: Infinity,
-    auth: {
-      agentId:    cfg.agentId,
-      agentToken: cfg.agentToken || null,
-      name:       cfg.name,
-      hostname:   require('os').hostname(),
-      version:    require('../package.json').version,
-      roomId:     cfg.roomId || null,   // ← yeh add karo
+    auth: (cb) => {
+      // ← YE CHANGE KARO — har reconnect pe fresh config read karo
+      const freshCfg = store.read();
+      cb({
+        agentId:    freshCfg.agentId,
+        agentToken: freshCfg.agentToken || null,
+        name:       freshCfg.name,
+        hostname:   require('os').hostname(),
+        version:    require('../package.json').version,
+        roomId:     freshCfg.roomId || null,
+      });
     }
   });
 
-    this._bind();
-    return this.socket;
-  }
+  this._bind();
+  return this.socket;
+}
 
   _bind() {
     const s = this.socket;
@@ -61,17 +65,18 @@ class Connection {
     });
 
     // Server says: "Owner approved, here is your token + assigned role"
-    s.on('agent:approved', ({ agentToken, role, roomId }) => {
-      store.set('agentToken', agentToken);
-      store.set('agentId',    this.agentId);
-      store.set('role',       role);
-      store.set('roomId',     roomId);
-      this.agentToken = agentToken;
-      this.role       = role;
-      console.log(`[thinknagent] Approved! Role: ${role} | Room: ${roomId}`);
-      this.onReady?.({ role, roomId });
-    });
-
+   s.on('agent:approved', ({ agentToken, role, roomId }) => {
+  store.set('agentToken', agentToken);
+  store.set('agentId',    this.agentId);
+  store.set('role',       role);
+  store.set('roomId',     roomId);
+  this.agentToken = agentToken;
+  this.role       = role;
+  console.log(`[thinknagent] Approved! Reconnecting with token...`);
+  
+  // ← YE ADD KARO — disconnect karo, socket.io auto-reconnect karega naye token ke saath
+  this.socket.disconnect();
+});
     // Server says: "Owner rejected this agent"
     s.on('agent:rejected', ({ reason }) => {
       console.error(`[thinknagent] Registration rejected: ${reason}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinknagent",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "ThinkNCollab server agent — metrics, logs, alerts, shell bridge",
   "main": "lib/agent.js",
   "bin": {