thinkncollab-shell 0.0.6 → 0.0.8

package/src/core/shell.js

@@ -138,49 +138,67 @@ class ThinkNCollabShell extends EventEmitter {
 
     // ─── WebSocket → Shell + TCP bridge ──────────────────────────────────────
 
-    setupWebSocketHandlers() {
-        this.ws.on('connected',    (d) => this.pushNotification({ type: 'connected',    socketId: d.socketId }));
-        this.ws.on('disconnected', (d) => this.pushNotification({ type: 'disconnected', reason: d.reason }));
-        this.ws.on('reconnected',  ()  => this.pushNotification({ type: 'connected',    socketId: 'reconnected' }));
-
-        this.ws.on('message', (d) => {
-            const myId = this.api.getUser()?._id;
-            if (myId && d.userId === myId) return;
-            this.pushNotification({ type: 'message', from: d.username, text: d.message });
-        });
+setupWebSocketHandlers() {
+    this.ws.on('connected', (d) => {
+        this.api.logEvent('connected', null, { socketId: d?.socketId });
+        this.api.startHeartbeat();
+        this.pushNotification({ type: 'connected', socketId: d?.socketId });
+    });
 
-        this.ws.on('messageHistory', (messages) => {
-            if (!messages?.length) return;
-            console.log(chalk.dim('\n  ─── Room History ───────────────────────────────'));
-            messages.forEach(msg => {
-                const from    = msg.name || msg.username || msg.sender?.name || 'Unknown';
-                const text    = msg.message || msg.content || msg.text || '';
-                const ts      = msg.timestamp || msg.createdAt;
-                const timeStr = ts ? chalk.dim(`[${new Date(ts).toLocaleTimeString()}]`) : '';
-                console.log(`  ${timeStr} ${chalk.cyan(from + ':')} ${chalk.white(text)}`);
-            });
-            console.log(chalk.dim('  ────────────────────────────────────────────────\n'));
-        });
+    this.ws.on('disconnected', (d) => {
+        this.api.logEvent('disconnected', null, { reason: d?.reason });
+        this.api.stopHeartbeat();
+        this.pushNotification({ type: 'disconnected', reason: d?.reason });
+    });
 
-        this.ws.on('userJoined',   (d) => this.pushNotification({ type: 'userJoined',   username: d.username }));
-        this.ws.on('userLeft',     (d) => this.pushNotification({ type: 'userLeft',     username: d.username }));
-
-        this.ws.on('notification', (d) => {
-            this.pushNotification({
-                type:       'notification',
-                level:      d.type,
-                title:      d.title,
-                message:    d.message,
-                taskTitle:  d.taskTitle,
-                assignedBy: d.assignedBy,
-            });
+    this.ws.on('reconnected', () => {
+        this.api.logEvent('reconnected');
+        this.api.startHeartbeat();
+        this.pushNotification({ type: 'connected', socketId: 'reconnected' });
+    });
+
+    this.ws.on('message', (d) => {
+        const myId = this.api.getUser()?._id;
+        if (myId && d.userId === myId) return;
+        this.pushNotification({ type: 'message', from: d.username, text: d.message });
+    });
+
+    this.ws.on('messageHistory', (messages) => {
+        if (!messages?.length) return;
+        console.log(chalk.dim('\n  ─── Room History ───────────────────────────────'));
+        messages.forEach(msg => {
+            const from    = msg.name || msg.username || msg.sender?.name || 'Unknown';
+            const text    = msg.message || msg.content || msg.text || '';
+            const ts      = msg.timestamp || msg.createdAt;
+            const timeStr = ts ? chalk.dim(`[${new Date(ts).toLocaleTimeString()}]`) : '';
+            console.log(`  ${timeStr} ${chalk.cyan(from + ':')} ${chalk.white(text)}`);
         });
+        console.log(chalk.dim('  ────────────────────────────────────────────────\n'));
+    });
 
-        this.ws.on('error', (e) => {
-            console.log(chalk.red(`⚠️  WebSocket error: ${e.message}`));
-            this.pushNotification({ type: 'notification', level: 'error', title: 'WebSocket Error', message: e.message });
+    this.ws.on('userJoined', (d) => this.pushNotification({ type: 'userJoined', username: d.username }));
+    this.ws.on('userLeft',   (d) => this.pushNotification({ type: 'userLeft',   username: d.username }));
+
+    // room join/leave events
+    this.ws.on('joined', (roomId) => this.api.logEvent('room_join',  roomId));
+    this.ws.on('left',   (roomId) => this.api.logEvent('room_leave', roomId));
+
+    this.ws.on('notification', (d) => {
+        this.pushNotification({
+            type:       'notification',
+            level:      d.type,
+            title:      d.title,
+            message:    d.message,
+            taskTitle:  d.taskTitle,
+            assignedBy: d.assignedBy,
         });
-    }
+    });
+
+    this.ws.on('error', (e) => {
+        console.log(chalk.red(`⚠️  WebSocket error: ${e.message}`));
+        this.pushNotification({ type: 'notification', level: 'error', title: 'WebSocket Error', message: e.message });
+    });
+}
 
     // ─── Start ────────────────────────────────────────────────────────────────
 
@@ -233,11 +251,11 @@ class ThinkNCollabShell extends EventEmitter {
         try {
             cfg = loadProjectConfig();
         } catch (err) {
-            console.log(chalk.yellow(`⚠️  .tncproject: ${err.message}\n`));
+            console.log(chalk.yellow(`⚠️  tncproject: ${err.message}\n`));
             return false;
         }
 
-        console.log(chalk.dim(`  📄 .tncproject found`));
+        console.log(chalk.dim(`  📄 tncproject found`));
         console.log(chalk.dim(`     Room : ${cfg.roomId}`));
         console.log(chalk.dim(`     File : ${cfg.filePath}\n`));
 
@@ -249,7 +267,7 @@ class ThinkNCollabShell extends EventEmitter {
                 roomId:     cfg.roomId,
             });
         } catch (err) {
-            console.log(chalk.red(`❌ .tncproject auth failed: ${err.message}`));
+            console.log(chalk.red(`❌ tncproject auth failed: ${err.message}`));
             console.log(chalk.dim('   Falling back to manual login.\n'));
             return false;
         }
@@ -505,7 +523,7 @@ async execute(input) {
                 stdio: 'inherit'
             });
             child.on('close', (code) => {
-                // Update currentDir in case command changed it (cd won't but others might)
+                // Update currentDir in case command changed it (cd won't but others might)  https://thinkncollab.com
                 try { this.currentDir = process.cwd(); } catch {}
                 process.stdout.write('\r\n');
                 resolve();
@@ -521,7 +539,7 @@ async execute(input) {
         try { const figlet = require('figlet'); console.log(chalk.cyan(figlet.textSync('ThinkNCollab', { font: 'Standard' }))); } catch {}
         console.log(chalk.cyan(`
 ╔══════════════════════════════════════════════════════╗
-║     ThinkNCollab Shell v0.0.5                        ║
+║     ThinkNCollab Shell v0.0.8                        ║
 ║     Type 'help' for commands                         ║
 ╚══════════════════════════════════════════════════════╝`));
     }
@@ -537,11 +555,12 @@ async execute(input) {
         try { fs.writeFileSync(this.config.historyFile, this.history.slice(-this.config.maxHistory).join('\n')); } catch {}
     }
 
-    cleanup() {
-        if (this.tcpServer) { try { this.tcpServer.close(); } catch {} }
-        if (this.ws) this.ws.disconnect();
-        this.saveHistory();
-    }
+cleanup() {
+    this.api.logout();  // session end + heartbeat stop + lastSeen update
+    if (this.tcpServer) { try { this.tcpServer.close(); } catch {} }
+    if (this.ws) this.ws.disconnect();
+    this.saveHistory();
+}
 }
 
 module.exports = ThinkNCollabShell;