thinkncollab-shell 0.0.5 → 0.0.6

package/src/core/api-client.js

@@ -1,6 +1,5 @@
 /**
- * ThinkNCollab API Client
- * Handles HTTP requests to the backend
+ * src/core/api-client.js
  */
 
 const https = require('https');
@@ -12,22 +11,19 @@ const os    = require('os');
 class ThinkNCollabAPI {
 
     constructor(options = {}) {
-        this.apiUrl   = (options.apiUrl || 'https://thinkncollab.com').replace(/\/$/, '');
-        this.wsUrl    = (options.wsUrl  || 'https://thinkncollab.com').replace(/\/$/, '');
-        this.session  = null;
+        this.apiUrl      = (options.apiUrl || 'https://thinkncollab.com').replace(/\/$/, '');
+        this.wsUrl       = (options.wsUrl  || 'https://thinkncollab.com').replace(/\/$/, '');
+        this.session     = null;
         this.sessionPath = path.join(os.homedir(), '.thinkncollab', 'session.json');
-
-        // Load existing session on startup
         this._loadSession();
     }
 
-    // ─── Session management ───────────────────────────────────────────────────
+    // ─── Session ──────────────────────────────────────────────────────────────
 
     _loadSession() {
         try {
-            if (fs.existsSync(this.sessionPath)) {
+            if (fs.existsSync(this.sessionPath))
                 this.session = fs.readJsonSync(this.sessionPath);
-            }
         } catch {}
     }
 
@@ -40,33 +36,40 @@ class ThinkNCollabAPI {
     }
 
     _clearSession() {
-        try {
-            fs.removeSync(this.sessionPath);
-            this.session = null;
-        } catch {}
+        try { fs.removeSync(this.sessionPath); } catch {}
+        this.session = null;
     }
 
-    isAuthenticated() {
-        return !!(this.session?.token);
-    }
-
-    getToken() {
-        return this.session?.token || null;
-    }
+    isAuthenticated() { return !!(this.session?.token); }
+    getToken()        { return this.session?.token || null; }
 
+    /**
+     * Returns user in a CONSISTENT shape used everywhere:
+     *   { _id, userId, email, name, userType }
+     *
+     * Both _id and userId are the same string so callers can use either.
+     */
     getUser() {
-        return this.session?.user || null;
+        const u = this.session?.user;
+        if (!u) return null;
+        const id = (u._id || u.userId || '').toString();
+        return {
+            _id:      id,
+            userId:   id,           // ws.setUser / _emitJoin use userId
+            email:    u.email  || '',
+            name:     u.name   || '',
+            userType: u.userType || u.model || 'User',
+        };
     }
 
     // ─── HTTP helper ──────────────────────────────────────────────────────────
 
     _request(method, endpoint, body = null, headers = {}) {
         return new Promise((resolve, reject) => {
-            const url      = new URL(this.apiUrl + endpoint);
-            const isHttps  = url.protocol === 'https:';
-            const lib      = isHttps ? https : http;
-
-            const bodyStr  = body ? JSON.stringify(body) : null;
+            const url     = new URL(this.apiUrl + endpoint);
+            const isHttps = url.protocol === 'https:';
+            const lib     = isHttps ? https : http;
+            const bodyStr = body ? JSON.stringify(body) : null;
 
             const options = {
                 hostname: url.hostname,
@@ -74,8 +77,9 @@ class ThinkNCollabAPI {
                 path:     url.pathname + url.search,
                 method,
                 headers: {
-                    'Content-Type':  'application/json',
-                    'Accept':        'application/json',
+                    'Content-Type': 'application/json',
+                    'Accept':       'application/json',
+                    ...(this.session?.token ? { 'x-shell-token': this.session.token } : {}),
                     ...headers,
                     ...(bodyStr ? { 'Content-Length': Buffer.byteLength(bodyStr) } : {})
                 }
@@ -87,23 +91,21 @@ class ThinkNCollabAPI {
                 res.on('end', () => {
                     try {
                         const parsed = JSON.parse(data);
-                        if (res.statusCode >= 400) {
+                        if (res.statusCode >= 400)
                             reject(new Error(parsed.error || parsed.message || `HTTP ${res.statusCode}`));
-                        } else {
+                        else
                             resolve(parsed);
-                        }
                     } catch {
-                        reject(new Error(`Invalid response: ${data}`));
+                        reject(new Error(`Invalid response: ${data.slice(0, 100)}`));
                     }
                 });
             });
 
             req.on('error', (err) => {
-                if (err.code === 'ECONNREFUSED') {
+                if (err.code === 'ECONNREFUSED')
                     reject(new Error(`Cannot connect to server at ${this.apiUrl} — is it running?`));
-                } else {
+                else
                     reject(err);
-                }
             });
 
             if (bodyStr) req.write(bodyStr);
@@ -111,34 +113,31 @@ class ThinkNCollabAPI {
         });
     }
 
-    // ─── Auth API ─────────────────────────────────────────────────────────────
+    // ─── Auth ─────────────────────────────────────────────────────────────────
 
     async login(email, password) {
-        // Your backend reads from headers
         const result = await this._request('POST', '/thinknsh/login', null, {
-            'x-email':    email,
-            'x-password': password,
-            'x-machine-id': require('os').hostname()
+            'x-email':      email,
+            'x-password':   password,
+            'x-machine-id': os.hostname()
         });
 
-        // Save session
+        // Normalise: store with BOTH _id and userId so getUser() always works
         this._saveSession({
             token: result.shellToken,
             user: {
-                _id:   result._id,
-                email: result.email,
-                name:  result.name,
+                _id:      result._id,
+                userId:   result._id,   // explicit — ws needs this
+                email:    result.email,
+                name:     result.name,
+                userType: result.userType || result.model || 'User',
             },
             timestamp: new Date().toISOString()
         });
 
         return {
             token: result.shellToken,
-            user: {
-                _id:   result._id,
-                email: result.email,
-                name:  result.name,
-            }
+            user:  this.getUser()       // return normalised shape
         };
     }
 
@@ -151,6 +150,61 @@ class ThinkNCollabAPI {
         if (!this.isAuthenticated()) throw new Error('Not logged in');
         return this.getUser();
     }
+
+    // ─── Rooms ────────────────────────────────────────────────────────────────
+
+    /**
+     * joinRoom — validates membership server-side and returns room meta.
+     * Called by commands/room/join.js BEFORE the WebSocket thinknsh:join emit.
+     */
+    async joinRoom(roomId, password) {
+        if (!roomId) throw new Error('roomId is required');
+
+        const result = await this._request('POST', `/thinknsh/rooms/${roomId}/join`,
+            password ? { password } : null
+        );
+
+        // Normalise response — server may return different shapes
+        return {
+            room: result.room || result,
+            participants: result.participants || result.members || [],
+            recentMessages: result.recentMessages || result.history || [],
+        };
+    }
+
+    /**
+     * getRooms — list rooms the user belongs to
+     */
+    async getRooms() {
+        return this._request('GET', '/thinknsh/rooms');
+    }
+
+    // ─── Tasks ────────────────────────────────────────────────────────────────
+
+    async mytasks(roomId, limit) {
+        if (!roomId) throw new Error('roomId is required');
+        const user = this.getUser();
+        let ep = `/thinknsh/tasks?roomId=${encodeURIComponent(roomId)}`;
+        if (user?._id) ep += `&userId=${encodeURIComponent(user._id)}`;
+        if (limit)     ep += `&n=${limit}`;
+        return this._request('GET', ep);
+    }
+
+    /**
+     * Generic request wrapper for task command modules that call
+     * shell.api.request(method, path, { params, body })
+     */
+    async request(method, endpoint, options = {}) {
+        let ep = endpoint;
+
+        // Append query params
+        if (options.params && Object.keys(options.params).length) {
+            const qs = new URLSearchParams(options.params).toString();
+            ep += (ep.includes('?') ? '&' : '?') + qs;
+        }
+
+        return this._request(method.toUpperCase(), ep, options.body || null);
+    }
 }
 
 module.exports = ThinkNCollabAPI;

package/src/core/notification-window.js

@@ -93,7 +93,7 @@ function connect() {
     let buffer   = '';
 
     client.connect(PORT, HOST, () => {
-        console.log(chalk.green('  ✅ Connected to shell!\n'));
+        console.log(chalk.green('   Connected to shell!\n'));
     });
 
     client.on('data', (chunk) => {

package/src/core/project-config.js

@@ -0,0 +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
+ */
+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 };