omnibiofex 2.8.1 → 2.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnibiofex",
-  "version": "2.8.1",
+  "version": "2.8.3",
   "description": "OmniBioFex X - The Autonomous Research Terminal for AI-powered research missions",
   "main": "bin/obx",
   "bin": {

package/src/auth.js

@@ -3,22 +3,19 @@ const { URL } = require('url');
 const axios = require('axios');
 const chalk = require('chalk');
 const inquirer = require('inquirer');
-const { initializeApp } = require('firebase/app');
-const { getAuth, sendSignInLinkToEmail } = require('firebase/auth');
-const config = require('./config');
-
-const firebaseConfig = {
-  apiKey: "AIzaSyDlgXId4pLlYqm-MDuhfz3dLH24KBRHkw8",
-  authDomain: "omnibiofex-x.firebaseapp.com",
-  projectId: "omnibiofex-x",
-  storageBucket: "omnibiofex-x.firebasestorage.app",
-  messagingSenderId: "292246591666",
-  appId: "1:292246591666:web:a182851585e4b0f79511ab",
-  measurementId: "G-RLQH7BDNHB"
-};
-
-const app = initializeApp(firebaseConfig);
-const auth = getAuth(app);
+const Conf = require('conf');
+const { sendSignInLinkToEmail } = require('firebase/auth');
+const { app, auth, db } = require('./firebase');
+
+// Use the shared auth instance
+const config = new Conf({
+  projectName: 'omnibiofex',
+  schema: {
+    token: { type: 'string' },
+    refreshToken: { type: 'string' },
+    expiresAt: { type: 'number' }
+  }
+});
 
 const LOCAL_PORT = 8765;
 const CALLBACK_PATH = '/auth/callback';
@@ -157,12 +154,10 @@ function startLocalServer() {
     console.log('Local server received request:', req.url);
     
     if (url.pathname === CALLBACK_PATH) {
-      // 🔥 FIX: Properly decode URL parameters
       let token = url.searchParams.get('token');
       let refreshToken = url.searchParams.get('refreshToken');
       const error = url.searchParams.get('error');
 
-      // 🔥 FIX: Replace spaces with + (URL decoding issue)
       if (token && token.includes(' ')) {
         console.log(chalk.yellow('⚠️  Token contains spaces, fixing...'));
         token = token.replace(/ /g, '+');
@@ -177,7 +172,6 @@ function startLocalServer() {
         console.log('Token length:', token.length);
         console.log('Token starts with:', token.substring(0, 20));
         
-        // 🔥 Validate token format
         if (!token.startsWith('eyJ')) {
           console.error('✗ Invalid token format');
           res.writeHead(400, { 'Content-Type': 'text/html' });
@@ -279,8 +273,10 @@ async function refreshAuthToken() {
   try {
     console.log(chalk.gray('🔄 Refreshing authentication token...'));
     
+    const apiKey = app.options.apiKey; // Get API key from the shared Firebase app
+
     const response = await axios.post(
-      `https://securetoken.googleapis.com/v1/token?key=${firebaseConfig.apiKey}`,
+      `https://securetoken.googleapis.com/v1/token?key=${apiKey}`,
       new URLSearchParams({
         grant_type: 'refresh_token',
         refresh_token: refreshToken
@@ -294,7 +290,6 @@ async function refreshAuthToken() {
 
     const { id_token, refresh_token, expires_in } = response.data;
 
-    // 🔥 Validate new token
     if (!id_token || !id_token.startsWith('eyJ')) {
       throw new Error('Invalid token received from refresh endpoint');
     }
@@ -347,7 +342,6 @@ async function getAuthToken() {
     process.exit(1);
   }
   
-  // 🔥 Validate token before returning
   if (!token.startsWith('eyJ')) {
     console.error(chalk.red('Stored token is corrupted. Please login again.'));
     config.delete('authToken');

package/src/commands/account.js

@@ -1,22 +1,9 @@
 const chalk = require('chalk');
 const open = require('open');
 const { getAuthToken, isAuthenticated } = require('../auth');
+const { db, getCurrentUserUid, getCurrentUserEmail } = require('../firebase');
 const { PremiumSpinner, sleep } = require('../utils/display');
-const { initializeApp } = require('firebase/app');
-const { getAuth } = require('firebase/auth');
-const { getFirestore, collection, query, where, getDocs } = require('firebase/firestore');
-
-const firebaseConfig = {
-  apiKey: "AIzaSyDlgXId4pLlYqm-MDuhfz3dLH24KBRHkw8",
-  authDomain: "omnibiofex-x.firebaseapp.com",
-  projectId: "omnibiofex-x",
-  storageBucket: "omnibiofex-x.firebasestorage.app",
-  messagingSenderId: "292246591666",
-  appId: "1:292246591666:web:a182851585e4b0f79511ab"
-};
-
-const app = initializeApp(firebaseConfig);
-const db = getFirestore(app);
+const { collection, query, where, getDocs } = require('firebase/firestore');
 
 async function credits() {
   if (!isAuthenticated()) {
@@ -74,23 +61,24 @@ async function usage() {
     return;
   }
 
+  // Get user UID from stored token
+  const uid = getCurrentUserUid();
+  const email = getCurrentUserEmail();
+  
+  if (!uid) {
+    console.error(chalk.red('✗ Could not extract user ID from token.'));
+    console.error(chalk.gray('Please run: obx login'));
+    return;
+  }
+
   const spinner = new PremiumSpinner('Fetching usage statistics');
   spinner.start();
 
   try {
-    const auth = getAuth(app);
-    const user = auth.currentUser;
-    
-    if (!user) {
-      spinner.fail('Not authenticated');
-      console.error(chalk.red('Please run: obx login'));
-      return;
-    }
-
     // Fetch ALL missions (real data)
     const allMissionsQuery = query(
       collection(db, 'missions'),
-      where('uid', '==', user.uid)
+      where('uid', '==', uid)
     );
 
     const allMissionsSnapshot = await getDocs(allMissionsQuery);
@@ -113,7 +101,7 @@ async function usage() {
     // Fetch published missions for earnings
     const publishedQuery = query(
       collection(db, 'missions'),
-      where('uid', '==', user.uid),
+      where('uid', '==', uid),
       where('isPublished', '==', true)
     );
 
@@ -136,7 +124,10 @@ async function usage() {
     console.log(chalk.white.bold('📊 USAGE STATISTICS'));
     console.log(chalk.hex('#F24E1E')('═══════════════════════════════════════════════════════════\n'));
 
-    console.log(chalk.white(`  🎯 Total Missions: ${chalk.green(totalMissions)}`));
+    console.log(chalk.gray(`  👤 User: ${chalk.white(email || 'Unknown')}`));
+    console.log(chalk.gray(`  🆔 UID: ${chalk.gray(uid.substring(0, 16))}...`));
+
+    console.log(chalk.white(`\n  🎯 Total Missions: ${chalk.green(totalMissions)}`));
     console.log(chalk.white(`  ✅ Completed: ${chalk.green(completedMissions)}`));
     console.log(chalk.white(`  ⏳ Active: ${chalk.yellow(activeMissions)}`));
     console.log(chalk.white(`  ⛽ RCC Spent: ${chalk.green(totalRCCSpent.toLocaleString())}`));

package/src/commands/earnings.js

@@ -1,21 +1,8 @@
 const chalk = require('chalk');
-const { getAuthToken, isAuthenticated } = require('../auth');
+const { isAuthenticated } = require('../auth');
+const { db, getCurrentUserUid, getCurrentUserEmail, isTokenValid } = require('../firebase');
 const { PremiumSpinner, sleep } = require('../utils/display');
-const { initializeApp } = require('firebase/app');
-const { getAuth } = require('firebase/auth');
-const { getFirestore, collection, query, where, orderBy, limit, getDocs } = require('firebase/firestore');
-
-const firebaseConfig = {
-  apiKey: "AIzaSyDlgXId4pLlYqm-MDuhfz3dLH24KBRHkw8",
-  authDomain: "omnibiofex-x.firebaseapp.com",
-  projectId: "omnibiofex-x",
-  storageBucket: "omnibiofex-x.firebasestorage.app",
-  messagingSenderId: "292246591666",
-  appId: "1:292246591666:web:a182851585e4b0f79511ab"
-};
-
-const app = initializeApp(firebaseConfig);
-const db = getFirestore(app);
+const { collection, query, where, orderBy, limit, getDocs } = require('firebase/firestore');
 
 async function earnings() {
   if (!isAuthenticated()) {
@@ -23,23 +10,24 @@ async function earnings() {
     return;
   }
 
+  // Get user UID from stored token (NOT from auth.currentUser)
+  const uid = getCurrentUserUid();
+  const email = getCurrentUserEmail();
+  
+  if (!uid) {
+    console.error(chalk.red('✗ Could not extract user ID from token.'));
+    console.error(chalk.gray('Please run: obx login'));
+    return;
+  }
+
   const spinner = new PremiumSpinner('Fetching your earnings data');
   spinner.start();
 
   try {
-    const auth = getAuth(app);
-    const user = auth.currentUser;
-    
-    if (!user) {
-      spinner.fail('Not authenticated');
-      console.error(chalk.red('Please run: obx login'));
-      return;
-    }
-
     // Fetch real published missions with earnings data
     const publishedQuery = query(
       collection(db, 'missions'),
-      where('uid', '==', user.uid),
+      where('uid', '==', uid),
       where('isPublished', '==', true),
       orderBy('publishedAt', 'desc'),
       limit(100)
@@ -87,8 +75,11 @@ async function earnings() {
     console.log(chalk.hex('#F24E1E')('\n═══════════════════════════════════════════════════════════'));
     console.log(chalk.white.bold('💰 EARNINGS DASHBOARD'));
     console.log(chalk.hex('#F24E1E')('═══════════════════════════════════════════════════════════\n'));
+    
+    console.log(chalk.gray(`  👤 User: ${chalk.white(email || 'Unknown')}`));
+    console.log(chalk.gray(`  🆔 UID: ${chalk.gray(uid.substring(0, 16))}...`));
 
-    console.log(chalk.white.bold('📊 OVERVIEW'));
+    console.log(chalk.white.bold('\n\n📊 OVERVIEW'));
     console.log(chalk.gray('─'.repeat(60)));
     console.log(chalk.white(`\n  💰 Total Earnings: ${chalk.green('₹' + totalEarnings.toLocaleString())}`));
     console.log(chalk.white(`  📅 This Month: ${chalk.green('₹' + thisMonthEarnings.toLocaleString())}`));
@@ -126,6 +117,9 @@ async function earnings() {
         console.log(chalk.white(`     💰 Earnings: ${chalk.green('₹' + (m.earnings || 0).toLocaleString())}`));
         console.log(chalk.gray(`     📅 Published: ${publishedDate}`));
       });
+    } else {
+      console.log(chalk.yellow('\n\n  ⚠️  No published research yet.'));
+      console.log(chalk.gray('  Run "obx publish" to publish your first research and start earning.\n'));
     }
 
     console.log(chalk.hex('#F24E1E')('\n═══════════════════════════════════════════════════════════\n'));

package/src/commands/publish.js

@@ -1,22 +1,9 @@
 const chalk = require('chalk');
 const inquirer = require('inquirer');
 const { getAuthToken, isAuthenticated } = require('../auth');
+const { db, getCurrentUserUid, getCurrentUserEmail } = require('../firebase');
 const { PremiumSpinner, sleep } = require('../utils/display');
-const { initializeApp } = require('firebase/app');
-const { getAuth } = require('firebase/auth');
-const { getFirestore, collection, query, where, orderBy, limit, getDocs, doc, updateDoc } = require('firebase/firestore');
-
-const firebaseConfig = {
-  apiKey: "AIzaSyDlgXId4pLlYqm-MDuhfz3dLH24KBRHkw8",
-  authDomain: "omnibiofex-x.firebaseapp.com",
-  projectId: "omnibiofex-x",
-  storageBucket: "omnibiofex-x.firebasestorage.app",
-  messagingSenderId: "292246591666",
-  appId: "1:292246591666:web:a182851585e4b0f79511ab"
-};
-
-const app = initializeApp(firebaseConfig);
-const db = getFirestore(app);
+const { collection, query, where, orderBy, limit, getDocs, doc, updateDoc } = require('firebase/firestore');
 
 async function publish(missionId) {
   if (!isAuthenticated()) {
@@ -24,34 +11,35 @@ async function publish(missionId) {
     return;
   }
 
+  // Get user UID from stored token
+  const uid = getCurrentUserUid();
+  const email = getCurrentUserEmail();
+  
+  if (!uid) {
+    console.error(chalk.red('✗ Could not extract user ID from token.'));
+    console.error(chalk.gray('Please run: obx login'));
+    return;
+  }
+
   console.log(chalk.hex('#F24E1E')('\n═══════════════════════════════════════════════════════════'));
   console.log(chalk.white.bold('📤 PUBLISH RESEARCH'));
   console.log(chalk.hex('#F24E1E')('═══════════════════════════════════════════════════════════\n'));
-
-  const token = await getAuthToken();
+  
+  console.log(chalk.gray(`  👤 User: ${chalk.white(email || 'Unknown')}`));
+  console.log(chalk.gray(`  🆔 UID: ${chalk.gray(uid.substring(0, 16))}...`));
 
   // If no mission ID provided, fetch real missions from Firestore
   if (!missionId) {
-    console.log(chalk.gray('Fetching your completed missions...\n'));
+    console.log(chalk.gray('\nFetching your completed missions...\n'));
     
     const spinner = new PremiumSpinner('Loading missions from database');
     spinner.start();
 
     try {
-      // Get authenticated user
-      const auth = getAuth(app);
-      const user = auth.currentUser;
-      
-      if (!user) {
-        spinner.fail('Not authenticated');
-        console.error(chalk.red('Please run: obx login'));
-        return;
-      }
-
       // Fetch real completed missions from Firestore
       const missionsQuery = query(
         collection(db, 'missions'),
-        where('uid', '==', user.uid),
+        where('uid', '==', uid),
         where('status', '==', 'completed'),
         where('isPublished', '==', false),
         orderBy('createdAt', 'desc'),
@@ -117,6 +105,8 @@ async function publish(missionId) {
   try {
     spinner.update('Fetching mission data');
     const missionRef = doc(db, 'missions', missionId);
+    
+    // Get the mission document
     const missionSnap = await getDocs(query(collection(db, 'missions'), where('__name__', '==', missionId)));
     
     if (missionSnap.empty) {
@@ -155,8 +145,8 @@ async function publish(missionId) {
       downloads: 0,
       citations: 0,
       earnings: 0,
-      authorName: missionData.authorName || 'Anonymous Researcher',
-      authorEmail: missionData.authorEmail || 'unknown@example.com'
+      authorName: email || 'Anonymous Researcher',
+      authorEmail: email || 'unknown@example.com'
     });
     
     spinner.succeed('Research published successfully!');

package/src/firebase.js

@@ -0,0 +1,104 @@
+const { initializeApp, getApps } = require('firebase/app');
+const { getAuth } = require('firebase/auth');
+const { getFirestore } = require('firebase/firestore');
+const Conf = require('conf');
+
+const firebaseConfig = {
+  apiKey: "AIzaSyDlgXId4pLlYqm-MDuhfz3dLH24KBRHkw8",
+  authDomain: "omnibiofex-x.firebaseapp.com",
+  projectId: "omnibiofex-x",
+  storageBucket: "omnibiofex-x.firebasestorage.app",
+  messagingSenderId: "292246591666",
+  appId: "1:292246591666:web:a182851585e4b0f79511ab"
+};
+
+// Initialize Firebase only once
+let app;
+if (getApps().length === 0) {
+  app = initializeApp(firebaseConfig);
+} else {
+  app = getApps()[0];
+}
+
+const auth = getAuth(app);
+const db = getFirestore(app);
+
+// Shared Conf storage for tokens
+const tokenStore = new Conf({
+  projectName: 'omnibiofex',
+  schema: {
+    token: { type: 'string' },
+    refreshToken: { type: 'string' },
+    expiresAt: { type: 'number' }
+  }
+});
+
+/**
+ * Decode JWT token to extract user info
+ * @returns {Object|null} - { uid, email } or null if no token
+ */
+function decodeToken() {
+  const token = tokenStore.get('token');
+  if (!token) return null;
+  
+  try {
+    // JWT format: header.payload.signature
+    const parts = token.split('.');
+    if (parts.length !== 3) return null;
+    
+    // Decode payload (base64url)
+    const payload = parts[1];
+    const decoded = Buffer.from(payload, 'base64').toString('utf8');
+    const data = JSON.parse(decoded);
+    
+    return {
+      uid: data.user_id || data.sub,
+      email: data.email,
+      exp: data.exp
+    };
+  } catch (error) {
+    return null;
+  }
+}
+
+/**
+ * Get current user UID from stored token
+ * @returns {string|null} - User UID or null
+ */
+function getCurrentUserUid() {
+  const decoded = decodeToken();
+  return decoded ? decoded.uid : null;
+}
+
+/**
+ * Get current user email from stored token
+ * @returns {string|null} - User email or null
+ */
+function getCurrentUserEmail() {
+  const decoded = decodeToken();
+  return decoded ? decoded.email : null;
+}
+
+/**
+ * Check if token is valid (not expired)
+ * @returns {boolean}
+ */
+function isTokenValid() {
+  const decoded = decodeToken();
+  if (!decoded || !decoded.exp) return false;
+  
+  // JWT exp is in seconds, Date.now() is in milliseconds
+  const now = Math.floor(Date.now() / 1000);
+  return decoded.exp > now;
+}
+
+module.exports = { 
+  app, 
+  auth, 
+  db, 
+  tokenStore,
+  decodeToken,
+  getCurrentUserUid,
+  getCurrentUserEmail,
+  isTokenValid
+};