thinkncollab-shell 0.0.8 → 0.0.10

package/src/core/project-config.js

@@ -1,100 +1,100 @@
-/**
- * src/core/project-config.js
- *
- * Shell-side reader for .tncproject binary files.
- * NO crypto code — shell only reads the plaintext roomId prefix,
- * then sends the raw file to the server for decryption.
- *
- * File layout (written by server):
- *   [4  bytes] "TNCP" magic
- *   [1  byte]  version 0x01
- *   [24 bytes] roomId ASCII hex  ← only readable part
- *   [12 bytes] AES-GCM IV        ← opaque
- *   [16 bytes] AES-GCM auth tag  ← opaque
- *   [N  bytes] encrypted payload ← opaque
- */
-
-const fs   = require('fs-extra');
-const path = require('path');
-const os   = require('os');
-
-const CONFIG_FILE  = 'tncproject';
-const MAGIC        = Buffer.from('TNCP');
-const ROOM_ID_SIZE = 24;
-const MIN_SIZE     = 4 + 1 + ROOM_ID_SIZE + 12 + 16 + 2;  // 59 bytes minimum
-
-function findConfigFile(startDir = process.cwd()) {
-    let dir    = path.resolve(startDir);
-    const root = path.parse(dir).root;
-
-    while (true) {
-        const candidate = path.join(dir, CONFIG_FILE);
-        if (fs.existsSync(candidate)) return candidate;
-        if (dir === root || dir === os.homedir()) break;
-        dir = path.dirname(dir);
-    }
-    return null;
-}
-
-/**
- * Read and lightly validate a .tncproject file.
- * Returns { filePath, roomId, fileBase64 } — no decryption.
- *
- * @throws if file is missing, wrong format, or roomId looks wrong  http://localhost:3001
- */
-function loadProjectConfig(startDir = process.cwd()) {
-    const filePath = findConfigFile(startDir);
-
-    if (!filePath) {
-        throw new Error(
-            'No .tncproject file found in this directory or any parent.\n' +
-            '  Download it from: ThinkNCollab → Room → Project Config'
-        );
-    }
-
-    const buf = fs.readFileSync(filePath);
-
-    if (buf.length < MIN_SIZE) {
-        throw new Error(
-            'Invalid .tncproject — file too small or corrupted.\n' +
-            '  Re-download it from the dashboard.'
-        );
-    }
-
-    if (!buf.slice(0, 4).equals(MAGIC)) {
-        throw new Error(
-            'Not a ThinkNCollab project config file.\n' +
-            '  Re-download from the dashboard.'
-        );
-    }
-
-    const version = buf.readUInt8(4);
-    if (version !== 0x01) {
-        throw new Error(
-            `Unsupported .tncproject version (${version}).\n` +
-            '  Update thinkncollab-shell: npm update -g thinkncollab-shell'
-        );
-    }
-
-    // Read roomId from plaintext prefix — bytes 5..28
-    const roomId = buf.slice(5, 5 + ROOM_ID_SIZE).toString('ascii').trim();
-
-    if (!/^[a-f0-9]{24}$/i.test(roomId)) {
-        throw new Error(
-            'Corrupted .tncproject — invalid roomId.\n' +
-            '  Re-download it from the dashboard.'
-        );
-    }
-
-    return {
-        filePath,
-        roomId,
-        fileBase64: buf.toString('base64'),   // sent as-is to server
-    };
-}
-
-function hasProjectConfig(startDir = process.cwd()) {
-    return !!findConfigFile(startDir);
-}
-
+/*
+ src/core/project-config.js
+
+ Shell-side reader for .tncproject binary files.
+ NO crypto code — shell only reads the plaintext roomId prefix,
+ then sends the raw file to the server for decryption.
+
+ File layout (written by server):
+   [4  bytes] "TNCP" magic
+   [1  byte]  version 0x01
+   [24 bytes] roomId ASCII hex  ← only readable part
+   [12 bytes] AES-GCM IV        ← opaque
+   [16 bytes] AES-GCM auth tag  ← opaque
+   [N  bytes] encrypted payload ← opaque
+ */
+
+const fs   = require('fs-extra');
+const path = require('path');
+const os   = require('os');
+
+const CONFIG_FILE  = 'tncproject';
+const MAGIC        = Buffer.from('TNCP');
+const ROOM_ID_SIZE = 24;
+const MIN_SIZE     = 4 + 1 + ROOM_ID_SIZE + 12 + 16 + 2;  // 59 bytes minimum
+
+function findConfigFile(startDir = process.cwd()) {
+    let dir    = path.resolve(startDir);
+    const root = path.parse(dir).root;
+
+    while (true) {
+        const candidate = path.join(dir, CONFIG_FILE);
+        if (fs.existsSync(candidate)) return candidate;
+        if (dir === root || dir === os.homedir()) break;
+        dir = path.dirname(dir);
+    }
+    return null;
+}
+
+/*
+ Read and lightly validate a .tncproject file.
+ Returns { filePath, roomId, fileBase64 } — no decryption.
+
+ @throws if file is missing, wrong format, or roomId looks wrong  http://localhost:3001
+ */
+function loadProjectConfig(startDir = process.cwd()) {
+    const filePath = findConfigFile(startDir);
+
+    if (!filePath) {
+        throw new Error(
+            'No .tncproject file found in this directory or any parent.\n' +
+            '  Download it from: ThinkNCollab → Room → Project Config'
+        );
+    }
+
+    const buf = fs.readFileSync(filePath);
+
+    if (buf.length < MIN_SIZE) {
+        throw new Error(
+            'Invalid .tncproject — file too small or corrupted.\n' +
+            '  Re-download it from the dashboard.'
+        );
+    }
+
+    if (!buf.slice(0, 4).equals(MAGIC)) {
+        throw new Error(
+            'Not a ThinkNCollab project config file.\n' +
+            '  Re-download from the dashboard.'
+        );
+    }
+
+    const version = buf.readUInt8(4);
+    if (version !== 0x01) {
+        throw new Error(
+            `Unsupported .tncproject version (${version}).\n` +
+            '  Update thinkncollab-shell: npm update -g thinkncollab-shell'
+        );
+    }
+
+    // Read roomId from plaintext prefix — bytes 5..28
+    const roomId = buf.slice(5, 5 + ROOM_ID_SIZE).toString('ascii').trim();
+
+    if (!/^[a-f0-9]{24}$/i.test(roomId)) {
+        throw new Error(
+            'Corrupted .tncproject — invalid roomId.\n' +
+            '  Re-download it from the dashboard.'
+        );
+    }
+
+    return {
+        filePath,
+        roomId,
+        fileBase64: buf.toString('base64'),   // sent as-is to server
+    };
+}
+
+function hasProjectConfig(startDir = process.cwd()) {
+    return !!findConfigFile(startDir);
+}
+
 module.exports = { loadProjectConfig, hasProjectConfig, CONFIG_FILE };

package/src/core/shell.js

@@ -62,7 +62,7 @@ class ThinkNCollabShell extends EventEmitter {
         this.aliases   = new Map();
         this.variables = new Map();
 
-        // ★ Restore persisted session on startup
+        //  Restore persisted session on startup
         // Handles both .tncproject boot AND manual login from a previous session
         if (this.api.isAuthenticated()) {
             this.ws.setUser(this.api.getUser(), this.api.getToken());
@@ -101,40 +101,166 @@ class ThinkNCollabShell extends EventEmitter {
     }
 
     // ─── Spawn notification window ────────────────────────────────────────────
+spawnNotificationWindow() {
+    const notifyScript = path.join(__dirname, 'notification-window.js');
+    const port = this.notifyPort;
+    const env = { ...process.env, THINKNSH_NOTIFY_PORT: String(port) };
+
+    const isWSL = process.platform === 'linux' &&
+        (() => { try { return fs.readFileSync('/proc/version', 'utf8').toLowerCase().includes('microsoft'); } catch { return false; } })();
+
+    const fallback = () => {
+        console.log(chalk.yellow(`\n  ⚠️  Could not open notification window.`));
+        console.log(chalk.dim(`  Open a new terminal and run:`));
+        console.log(chalk.cyan(`  THINKNSH_NOTIFY_PORT=${port} node "${notifyScript}"\n`));
+    };
+
+    try {
+        // ── WSL ──────────────────────────────────────────────────────────────
+     if (isWSL) {
+    const winScript = notifyScript
+        .replace(/^\/mnt\/([a-z])/, (_, d) => `${d.toUpperCase()}:`)
+        .replace(/\//g, '\\');
+
+    const launchWinNode = (winExe) => {
+        const p = spawn(
+            `start cmd.exe /k ""${winExe}" "${winScript}""`,
+            [],
+            { detached: true, stdio: 'ignore', env, shell: true }
+        );
+        p.on('error', fallback);
+        p.unref();
+    };
+
+    // 1. Known paths — instant
+    const known = [
+        '/mnt/c/Program Files/nodejs/node.exe',
+        '/mnt/c/Program Files (x86)/nodejs/node.exe',
+    ];
+    const found = known.find(p => { try { return fs.existsSync(p); } catch { return false; } });
+
+    if (found) {
+        const winExe = found
+            .replace(/^\/mnt\/([a-z])/, (_, d) => `${d.toUpperCase()}:`)
+            .replace(/\//g, '\\');
+        launchWinNode(winExe);
+    } else {
+        // 2. Async where node
+        const child = spawn('cmd.exe', ['/c', 'where', 'node'], {
+            stdio: ['ignore', 'pipe', 'ignore']
+        });
+        let out = '';
+        child.stdout.on('data', d => out += d);
+        child.on('close', () => {
+            const winExe = out.trim().split('\n')[0]?.trim();
+            if (winExe?.endsWith('.exe')) {
+                launchWinNode(winExe);
+            } else {
+                // 3. Last resort
+                const p = spawn(
+                    `start cmd.exe /k "wsl.exe -- bash -c 'THINKNSH_NOTIFY_PORT=${port} node \\"${notifyScript}\\"; read'"`,
+                    [],
+                    { detached: true, stdio: 'ignore', shell: true }
+                );
+                p.on('error', fallback);
+                p.unref();
+            }
+        });
+    }
 
-    spawnNotificationWindow() {
-        const notifyScript = path.join(__dirname, 'notification-window.js');
-        const env = { ...process.env, THINKNSH_NOTIFY_PORT: String(this.notifyPort) };
+        // ── Windows native ────────────────────────────────────────────────────
+} else if (process.platform === 'win32') {
+    const nodeExe = process.execPath;
+    const isVSCode = process.env.TERM_PROGRAM === 'vscode';
+
+    if (isVSCode) {
+        console.log(chalk.yellow('\n  VS Code detected — open a new terminal tab and run:'));
+        console.log(chalk.cyan(`  $env:THINKNSH_NOTIFY_PORT=${port}; node "${notifyScript}"\n`));
+    } else {
+        const launchCmd = () => {
+            // shell:true — Windows quoting issues handle ho jaate hain
+            const p = spawn(
+                `start cmd.exe /k ""${nodeExe}" "${notifyScript}""`,
+                [],
+                { detached: true, stdio: 'ignore', env, shell: true }
+            );
+            p.on('error', fallback);
+            p.unref();
+        };
 
-        try {
-            if (process.platform === 'win32') {
-                const isVSCode = process.env.TERM_PROGRAM === 'vscode';
-                if (isVSCode) {
-                    console.log(chalk.yellow('\n  VS Code detected — open a new terminal tab and run:'));
-                    console.log(chalk.cyan(`  $env:THINKNSH_NOTIFY_PORT=${this.notifyPort}; node "${notifyScript}"\n`));
-                } else {
-                    const nodeExe = process.execPath;
-                    spawn('cmd.exe', ['/c', 'start', 'cmd.exe', '/k', `"${nodeExe}" "${notifyScript}"`],
-                        { detached: true, stdio: 'ignore', env, shell: false }).unref();
-                }
-            } else if (process.platform === 'darwin') {
-                const script = `tell application "Terminal" to do script "THINKNSH_NOTIFY_PORT=${this.notifyPort} node '${notifyScript}'"`;
-                spawn('osascript', ['-e', script], { detached: true, stdio: 'ignore' }).unref();
-            } else {
-                const terminals = [
-                    ['gnome-terminal', ['--', 'node', notifyScript]],
-                    ['xterm',          ['-e', `node "${notifyScript}"`]],
-                    ['konsole',        ['--noclose', '-e', 'node', notifyScript]],
-                ];
-                for (const [cmd, args] of terminals) {
-                    try { spawn(cmd, args, { detached: true, stdio: 'ignore', env }).unref(); break; } catch {}
-                }
+        const wt = spawn('wt.exe', [
+            'cmd.exe', '/k', `"${nodeExe}" "${notifyScript}"`
+        ], { detached: true, stdio: 'ignore', env });
+        wt.on('error', launchCmd);
+        wt.unref();
+    }
+        // ── macOS ─────────────────────────────────────────────────────────────
+        } else if (process.platform === 'darwin') {
+            const nodeExe = process.execPath;
+             const isVSCode = process.env.TERM_PROGRAM === 'vscode';
+    if (isVSCode) {
+        console.log(chalk.yellow(`\n  VS Code detected — open a new terminal tab and run:`));
+        console.log(chalk.cyan(`  THINKNSH_NOTIFY_PORT=${port} node "${notifyScript}"\n`));
+        return;
+    }
+            const terminalScript = `
+                tell application "Terminal"
+                    do script "THINKNSH_NOTIFY_PORT=${port} '${nodeExe}' '${notifyScript}'"
+                    activate
+                end tell
+            `;
+            try {
+                spawn('osascript', ['-e', terminalScript], {
+                    detached: true, stdio: 'ignore'
+                }).unref();
+            } catch {
+                // iTerm2 fallback
+                const itermScript = `
+                    tell application "iTerm2"
+                        tell current window
+                            create tab with default profile
+                            tell current session of current tab
+                                write text "THINKNSH_NOTIFY_PORT=${port} '${nodeExe}' '${notifyScript}'"
+                            end tell
+                        end tell
+                    end tell
+                `;
+                try {
+                    spawn('osascript', ['-e', itermScript], {
+                        detached: true, stdio: 'ignore'
+                    }).unref();
+                } catch { fallback(); }
             }
-        } catch (err) {
-            console.log(chalk.yellow(`⚠️  Could not spawn notification window: ${err.message}`));
-            console.log(chalk.dim(`   Run manually: node "${notifyScript}"`));
+
+        // ── Linux native ──────────────────────────────────────────────────────
+        } else {
+            const nodeExe = process.execPath;
+            const bashCmd = `THINKNSH_NOTIFY_PORT=${port} '${nodeExe}' '${notifyScript}'; read`;
+            const terminals = [
+                ['gnome-terminal', ['--', 'bash', '-c', bashCmd]],
+                ['konsole',        ['--noclose', '-e', 'bash', '-c', bashCmd]],
+                ['xfce4-terminal', ['--hold', '-e', `bash -c "${bashCmd}"`]],
+                ['tilix',          ['-e', `bash -c "${bashCmd}"`]],
+                ['alacritty',      ['-e', 'bash', '-c', bashCmd]],
+                ['kitty',          ['bash', '-c', bashCmd]],
+                ['xterm',          ['-hold', '-e', `bash -c "${bashCmd}"`]],
+            ];
+
+            let spawned = false;
+            for (const [bin, args] of terminals) {
+                try {
+                    spawn(bin, args, { detached: true, stdio: 'ignore', env }).unref();
+                    spawned = true;
+                    break;
+                } catch {}
+            }
+            if (!spawned) fallback();
         }
+
+    } catch (err) {
+        fallback();
     }
+}
 
     // ─── WebSocket → Shell + TCP bridge ──────────────────────────────────────
 
@@ -308,8 +434,6 @@ setupWebSocketHandlers() {
         return true;
     }
 
-    // ─── Execute ──────────────────────────────────────────────────────────────
-// shell.js — execute() mein ye change karo
 async execute(input) {
     if (!input.trim()) return;
 
@@ -317,6 +441,12 @@ async execute(input) {
     const cmdName = args[0].toLowerCase();
     const cmdArgs = args.slice(1);
 
+    // Skip sensitive commands
+    const skipLog = ['login', 'logout', 'set', 'unset'];
+    if (!skipLog.includes(cmdName)) {
+        await this.api.logEvent('command', null, { cmd: cmdName });
+    }
+
     if (this.commands.has(cmdName)) {
         try { await this.commands.get(cmdName).handler(cmdArgs, this); }
         catch (err) { console.log(chalk.red(`Error: ${err.message}`)); }
@@ -332,8 +462,7 @@ async execute(input) {
         }
     }
 
-    // ★ Windows pe known-useless OS commands block karo
-    const blockedOnWindows = [ 'open', 'which', 'grep', 'touch', 'cat'];
+    const blockedOnWindows = ['open', 'which', 'grep', 'touch', 'cat'];
     if (process.platform === 'win32' && blockedOnWindows.includes(cmdName)) {
         console.log(chalk.red(`'${cmdName}' is not a thinknsh command.`));
         console.log(chalk.dim(`  Type 'help' to see available commands.`));
@@ -523,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();
@@ -539,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.8                        ║
+║     ThinkNCollab Shell v0.0.10                       ║
 ║     Type 'help' for commands                         ║
 ╚══════════════════════════════════════════════════════╝`));
     }

package/src/core/websocket.js

@@ -1,5 +1,5 @@
-/**
- * src/core/websocket.js — WebSocket Manager for ThinkNCollab Shell
+/*
+  src/core/websocket.js — WebSocket Manager for ThinkNCollab Shell
  */
 
 const { io }   = require('socket.io-client');
@@ -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) {

package/src/events/notifications.js

@@ -1,5 +1,5 @@
-/**
- * Notification System for ThinkNCollab Shell
+/*
+  Notification System for ThinkNCollab Shell
  */
 
 const EventEmitter = require('events');
@@ -20,8 +20,7 @@ class NotificationManager extends EventEmitter {
         this.unreadCount = 0;
     }
     
-    /**
-     * Show a notification
+    /* Show a notification
      */
     show(notification) {
         const notif = {
@@ -61,8 +60,7 @@ class NotificationManager extends EventEmitter {
         return notif;
     }
     
-    /**
-     * Show notification in console
+    /* Show notification in console
      */
     showInConsole(notification) {
         let color = chalk.blue;
@@ -91,8 +89,7 @@ class NotificationManager extends EventEmitter {
         console.log(color(`${symbol} ${notification.title}: ${notification.message}`));
     }
     
-    /**
-     * Show desktop notification (if supported)
+    /* Show desktop notification (if supported)
      */
     showDesktopNotification(notification) {
         // Check if running in Electron
@@ -110,16 +107,14 @@ class NotificationManager extends EventEmitter {
         }
     }
     
-    /**
-     * Play notification sound
+    /* Play notification sound
      */
     playSound() {
         // TODO: Implement sound playing
         // This would use 'sound-play' or similar package
     }
     
-    /**
-     * Mark notification as read
+    /* Mark notification as read
      */
     markAsRead(id) {
         const notif = this.notifications.find(n => n.id === id);
@@ -130,8 +125,7 @@ class NotificationManager extends EventEmitter {
         }
     }
     
-    /**
-     * Mark all as read
+    /* Mark all as read
      */
     markAllAsRead() {
         this.notifications.forEach(n => {
@@ -143,22 +137,19 @@ class NotificationManager extends EventEmitter {
         this.emit('allRead');
     }
     
-    /**
-     * Get unread notifications
+    /* Get unread notifications
      */
     getUnread() {
         return this.notifications.filter(n => !n.read);
     }
     
-    /**
-     * Get all notifications
+    /* Get all notifications
      */
     getAll() {
         return this.notifications;
     }
     
-    /**
-     * Clear all notifications
+    /* Clear all notifications
      */
     clear() {
         this.notifications = [];
@@ -166,29 +157,25 @@ class NotificationManager extends EventEmitter {
         this.emit('cleared');
     }
     
-    /**
-     * Create success notification
+    /* Create success notification
      */
     success(title, message, data = {}) {
         return this.show({ type: 'success', title, message, data });
     }
     
-    /**
-     * Create error notification
+    /* Create error notification
      */
     error(title, message, data = {}) {
         return this.show({ type: 'error', title, message, data });
     }
     
-    /**
-     * Create warning notification
+    /* Create warning notification
      */
     warning(title, message, data = {}) {
         return this.show({ type: 'warning', title, message, data });
     }
     
-    /**
-     * Create info notification
+    /* Create info notification
      */
     info(title, message, data = {}) {
         return this.show({ type: 'info', title, message, data });