thinkncollab-shell 0.0.9 → 0.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkncollab-shell",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "ThinkNCollab Custom Shell with WebSocket collaboration",
   "main": "src/core/shell.js",
   "bin": {

package/src/commands/message/say.js

@@ -1,9 +1,7 @@
 /*
   Say Command
-  
   Usage: say <message>
- */
-
+*/
 const chalk = require('chalk');
 
 module.exports = {
@@ -12,30 +10,38 @@ module.exports = {
     aliases: ['msg', 'm', 'send'],
     requiresAuth: true,
     requiresRoom: true,
-    
+
     async execute(args, shell) {
-        const message = args.join(' ');
-        
+        const message = args.join(' ').trim();
         if (!message) {
             console.log(chalk.red('❌ Usage: say <message>'));
             return;
         }
-        
+
+        const room = shell.ws.getCurrentRoom?.();
+        if (!room) {
+            console.log(chalk.red('❌ Not in any room. Use: join <room-id>'));
+            return;
+        }
+
         try {
-            await shell.api.sendMessage(message);
-            
-            // Clear typing indicator
+            // Stop typing indicator if active
             if (shell.isTyping) {
-                shell.api.sendTyping(false);
+                shell.ws.socket?.emit('thinknsh:typing', { roomId: room, typing: false });
                 shell.isTyping = false;
                 clearTimeout(shell.typingTimeout);
             }
-            
-            // Echo locally (server will also broadcast)
+
+            await shell.ws.sendMessage(message);
+
             const user = shell.api.getUser();
             const time = new Date().toLocaleTimeString();
-            console.log(chalk.dim(`[${time}] `) + chalk.green(`You: ${message}`));
-            
+            console.log(
+                chalk.dim(`[${time}] `) +
+                chalk.green(`${user?.name || 'You'}: `) +
+                chalk.white(message)
+            );
+
         } catch (error) {
             console.log(chalk.red(`❌ Failed to send: ${error.message}`));
         }

package/src/core/shell.js

@@ -652,7 +652,7 @@ async execute(input) {
                 stdio: 'inherit'
             });
             child.on('close', (code) => {
-                // Update currentDir in case command changed it (cd won't but others might)  https://thinkncollab.com
+                // Update currentDir in case command changed it (cd won't but others might)  http://localhost:3001
                 try { this.currentDir = process.cwd(); } catch {}
                 process.stdout.write('\r\n');
                 resolve();
@@ -668,7 +668,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.08                       ║
+║     ThinkNCollab Shell v0.0.10                       ║
 ║     Type 'help' for commands                         ║
 ╚══════════════════════════════════════════════════════╝`));
     }

package/src/core/websocket.js

@@ -113,6 +113,7 @@ class WebSocketManager extends EventEmitter {
      *   { userId, name, userType }                ← legacy
      */
     setUser(user, token = null) {
+        this._user = user;
         if (!user) return;
 
         if (token) this._authToken = token;
@@ -295,27 +296,27 @@ class WebSocketManager extends EventEmitter {
         return Promise.resolve({ success: true });
     }
 
-    // ─── Send message ─────────────────────────────────────────────────────────
+ sendMessage(message, replyTo = null) {
+    return new Promise((resolve, reject) => {
+        if (!this.socket?.connected) return reject(new Error('Not connected'));
 
-    sendMessage(message) {
-        if (!this.connected || !this.socket) {
-            this.messageQueue.push(message);
-            return Promise.resolve({ queued: true });
-        }
-        if (!this.roomId)      return Promise.reject(new Error('Not in a room — run: join <room-id>'));
-        if (!this.currentUser) return Promise.reject(new Error('Not logged in — run: login'));
+        const roomId = this.roomId;
+        if (!roomId) return reject(new Error('Not in any room. Use: join <room-id>'));
+
+        if (!this.currentUser) return reject(new Error('Not authenticated. Run: login'));
 
         this.socket.emit('thinknsh:message', {
-            roomId:   this.roomId,
+            roomId,
             userId:   this.currentUser.userId,
             name:     this.currentUser.name,
-            userType: this.currentUser.userType,
+            userType: this.currentUser.userType || 'User',
             message,
+            replyTo:  replyTo || null
         });
 
-        return Promise.resolve({ success: true });
-    }
-
+        resolve();
+    });
+}
     // ─── History ──────────────────────────────────────────────────────────────
 
     getHistory(limit = 30, skip = 0) {