avg-nexus 1.0.7 → 1.0.10

package/bin/avg-nexus.js

@@ -6,7 +6,6 @@ const http = require('http');
 const path = require('path');
 const fs = require('fs');
 
-// ── Ranglar ──
 const C = {
   reset: '\x1b[0m',
   green: '\x1b[32m',
@@ -21,72 +20,76 @@ function log(icon, msg, color = C.reset) {
   console.log(`${color}${icon} ${msg}${C.reset}`);
 }
 
-// ── Ollama topish (barcha disklar) ──
+function sleep(ms) {
+  return new Promise(r => setTimeout(r, ms));
+}
+
+// ── Ollama topish — PATH + barcha disklar ──
 function findOllama() {
-  // 1. PATH dan
   try {
     const r = execSync('where ollama', { encoding: 'utf8', stdio: ['pipe','pipe','pipe'] }).trim();
     if (r) return r.split('\n')[0].trim();
   } catch {}
 
-  // 2. Barcha disklarda qidirish
   const drives = ['A','B','C','D','E','F','G','H','I','J'];
   const locations = [
     'Ollama\\ollama.exe',
     'Program Files\\Ollama\\ollama.exe',
     `Users\\${process.env.USERNAME || 'user'}\\AppData\\Local\\Programs\\Ollama\\ollama.exe`,
-    'AppData\\Local\\Programs\\Ollama\\ollama.exe',
   ];
 
-  for (const drive of drives) {
-    for (const loc of locations) {
-      const full = `${drive}:\\${loc}`;
-      try {
-        if (fs.existsSync(full)) return full;
-      } catch {}
+  for (const d of drives) {
+    for (const l of locations) {
+      const p = `${d}:\\${l}`;
+      try { if (fs.existsSync(p)) return p; } catch {}
     }
   }
   return null;
 }
 
-// ── Model topish (barcha disklar) ──
-async function findBestModel() {
-  // 10 marta urinib ko'rish
-  for (let i = 0; i < 10; i++) {
-    await sleep(4000);
-    try {
-      const res = await fetch('http://localhost:11434/api/tags');
-      const data = await res.json();
-      const models = data.models || [];
-      if (models.length > 0) {
-        const preferred = ['gemma4', 'gemma3', 'gemma2', 'qwen', 'llama', 'mistral', 'deepseek', 'phi'];
-        for (const pref of preferred) {
-          const found = models.find(m => m.name.toLowerCase().includes(pref));
-          if (found) {
-            log('✅', `Model topildi: ${found.name}`, C.green);
-            return found.name;
-          }
+// ── Model topish — ollama list CLI orqali ──
+function findBestModel() {
+  const preferred = ['gemma4', 'gemma3', 'gemma2', 'qwen', 'llama', 'mistral', 'deepseek', 'phi'];
+  try {
+    const result = execSync('ollama list', {
+      encoding: 'utf8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+      timeout: 10000,
+    });
+    const lines = result
+      .split('\n')
+      .filter(l => l.trim() && !l.toLowerCase().startsWith('name'));
+
+    if (lines.length > 0) {
+      for (const pref of preferred) {
+        const found = lines.find(l => l.toLowerCase().includes(pref));
+        if (found) {
+          const name = found.split(/\s+/)[0].trim();
+          log('✅', `Model topildi: ${name}`, C.green);
+          return name;
         }
-        return models[0].name;
       }
-      log('⏳', `Model kutilmoqda... (${i+1}/10)`, C.yellow);
-    } catch {
-      log('⏳', `Ollama kutilmoqda... (${i+1}/10)`, C.yellow);
+      const name = lines[0].split(/\s+/)[0].trim();
+      log('✅', `Model: ${name}`, C.green);
+      return name;
     }
+  } catch (e) {
+    log('⚠️', `ollama list xatosi: ${e.message}`, C.yellow);
   }
-  log('📥', 'Model topilmadi, gemma4:e4b yuklanmoqda...', C.yellow);
+
+  // Model topilmadi — gemma4:e4b yuklab olish
+  log('📥', 'Model topilmadi. gemma4:e4b yuklanmoqda...', C.yellow);
   execSync('ollama pull gemma4:e4b', { stdio: 'inherit' });
   return 'gemma4:e4b';
 }
 
-// ── Ollama ishga tushirish ──
+// ── Ollama serve ishga tushirish ──
 function startOllama(ollamaPath) {
   try {
-    execSync('curl -s http://localhost:11434', { timeout: 1000, stdio: 'pipe' });
+    execSync('curl -s http://localhost:11434', { timeout: 2000, stdio: 'pipe' });
     log('✅', 'Ollama allaqachon ishlamoqda', C.green);
     return;
   } catch {}
-
   log('🚀', 'Ollama ishga tushirilmoqda...', C.cyan);
   const proc = spawn(ollamaPath, ['serve'], {
     detached: true,
@@ -97,27 +100,19 @@ function startOllama(ollamaPath) {
   log('✅', 'Ollama serve ishga tushdi', C.green);
 }
 
-// ── OpenRouter Proxy ──
+// ── OpenRouter → Ollama Proxy ──
 function startProxy(model) {
-  const PROXY_PORT = 11435;
-
+  const PORT = 11435;
   const server = http.createServer(async (req, res) => {
     res.setHeader('Access-Control-Allow-Origin', '*');
     res.setHeader('Access-Control-Allow-Headers', '*');
     res.setHeader('Access-Control-Allow-Methods', 'POST, GET, OPTIONS');
 
-    if (req.method === 'OPTIONS') {
-      res.writeHead(200);
-      res.end();
-      return;
-    }
+    if (req.method === 'OPTIONS') { res.writeHead(200); res.end(); return; }
 
-    // Models endpoint
     if (req.url && req.url.includes('/models')) {
       res.writeHead(200, { 'Content-Type': 'application/json' });
-      res.end(JSON.stringify({
-        data: [{ id: model, name: model, context_length: 8192 }]
-      }));
+      res.end(JSON.stringify({ data: [{ id: model, name: model, context_length: 8192 }] }));
       return;
     }
 
@@ -125,151 +120,104 @@ function startProxy(model) {
     req.on('data', c => body += c);
     req.on('end', async () => {
       try {
-        let reqData = {};
-        try { reqData = JSON.parse(body); } catch {}
-
+        let d = {};
+        try { d = JSON.parse(body); } catch {}
         const ollamaRes = await fetch('http://localhost:11434/api/chat', {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({
-            model: reqData.model || model,
-            messages: reqData.messages || [],
-            stream: true,
-          }),
+          body: JSON.stringify({ model: d.model || model, messages: d.messages || [], stream: true }),
         });
-
         res.writeHead(200, { 'Content-Type': 'text/event-stream' });
-
         const reader = ollamaRes.body.getReader();
-        const decoder = new TextDecoder();
-
+        const dec = new TextDecoder();
         while (true) {
           const { done, value } = await reader.read();
           if (done) break;
-          const text = decoder.decode(value);
-          for (const line of text.split('\n').filter(l => l.trim())) {
+          for (const line of dec.decode(value).split('\n').filter(l => l.trim())) {
             try {
-              const json = JSON.parse(line);
-              const content = json.message?.content || '';
-              const isDone = json.done || false;
+              const j = JSON.parse(line);
               res.write('data: ' + JSON.stringify({
                 id: 'chatcmpl-' + Date.now(),
                 object: 'chat.completion.chunk',
-                choices: [{ delta: { content }, finish_reason: isDone ? 'stop' : null }],
+                choices: [{ delta: { content: j.message?.content || '' }, finish_reason: j.done ? 'stop' : null }],
               }) + '\n\n');
             } catch {}
           }
         }
         res.write('data: [DONE]\n\n');
         res.end();
-      } catch (err) {
-        res.writeHead(500);
-        res.end(JSON.stringify({ error: err.message }));
-      }
+      } catch (e) { res.writeHead(500); res.end(JSON.stringify({ error: e.message })); }
     });
   });
-
-  server.listen(PROXY_PORT, () => {
-    log('✅', `OpenRouter proxy: http://localhost:${PROXY_PORT}`, C.green);
-  });
-
+  server.listen(PORT, () => log('✅', `Proxy: http://localhost:${PORT}`, C.green));
   return server;
 }
 
-// ── NexusAI loyihasini topish ──
+// ── NexusAI loyiha topish ──
 function findProject() {
+  const cfgs = ['next.config.js', 'next.config.ts', 'next.config.mjs'];
   const cwd = process.cwd();
-
-  // Hozirgi papkada next.config bormi?
-  const nextConfigs = ['next.config.js', 'next.config.ts', 'next.config.mjs'];
-  for (const cfg of nextConfigs) {
-    if (fs.existsSync(path.join(cwd, cfg))) return cwd;
+  for (const c of cfgs) {
+    if (fs.existsSync(path.join(cwd, c))) return cwd;
   }
-
-  // Barcha disklarda qidirish
-  const drives = ['E', 'D', 'C', 'F', 'G'];
-  const names = ['nexusai-team', 'NexusAi-team', 'NexusAI-team', 'nexus-team', 'nexusai'];
-
-  for (const drive of drives) {
-    for (const name of names) {
-      const p = `${drive}:\\${name}`;
+  const drives = ['E','D','C','F','G'];
+  const names = ['nexusai-team','NexusAi-team','NexusAI-team','nexus-team','nexusai'];
+  for (const d of drives) {
+    for (const n of names) {
+      const p = `${d}:\\${n}`;
       try {
-        if (fs.existsSync(p) && nextConfigs.some(c => fs.existsSync(path.join(p, c)))) {
-          return p;
-        }
+        if (fs.existsSync(p) && cfgs.some(c => fs.existsSync(path.join(p, c)))) return p;
       } catch {}
     }
   }
   return null;
 }
 
-// ── .env.local sozlash ──
-function setupEnv(projectDir) {
-  const envPath = path.join(projectDir, '.env.local');
+// ── .env.local yozish ──
+function setupEnv(dir) {
+  const envPath = path.join(dir, '.env.local');
   const content = [
     'OPENROUTER_BASE_URL=http://localhost:11435/api/v1',
     'OPENROUTER_API_KEY_1=ollama-local',
     'OPENROUTER_API_KEY_2=ollama-local',
     'OPENROUTER_API_KEY_3=ollama-local',
   ].join('\n');
-
-  // Agar mavjud bo'lsa OpenRouter kalitlarini saqlab qolamiz
   if (fs.existsSync(envPath)) {
-    const existing = fs.readFileSync(envPath, 'utf8');
-    if (existing.includes('OLLAMA') || existing.includes('ollama-local')) return;
-    // OpenRouter kalitlari bor bo'lsa ularga proxy qo'shamiz
-    fs.writeFileSync(envPath, content + '\n' + existing);
+    const ex = fs.readFileSync(envPath, 'utf8');
+    if (ex.includes('ollama-local')) return;
+    fs.writeFileSync(envPath, content + '\n' + ex);
   } else {
     fs.writeFileSync(envPath, content);
   }
   log('✅', '.env.local sozlandi', C.green);
 }
 
-// ── Next.js serverni ishga tushirish ──
-function startNextJS(projectDir) {
-  return new Promise((resolve) => {
-    setupEnv(projectDir);
-
-    // node_modules bormi?
-    if (!fs.existsSync(path.join(projectDir, 'node_modules'))) {
+// ── Next.js ishga tushirish ──
+function startNextJS(dir) {
+  return new Promise(resolve => {
+    setupEnv(dir);
+    if (!fs.existsSync(path.join(dir, 'node_modules'))) {
       log('📦', 'npm install...', C.yellow);
-      execSync('npm install', { cwd: projectDir, stdio: 'inherit' });
+      execSync('npm install', { cwd: dir, stdio: 'inherit' });
     }
-
-    log('🌐', 'NexusAI sayt ishga tushmoqda...', C.cyan);
-
+    log('🌐', 'NexusAI ishga tushmoqda...', C.cyan);
     const dev = spawn('npm', ['run', 'dev'], {
-      cwd: projectDir,
-      shell: true,
+      cwd: dir, shell: true,
       stdio: ['ignore', 'pipe', 'pipe'],
-      env: {
-        ...process.env,
-        PORT: '3000',
-        OPENROUTER_BASE_URL: 'http://localhost:11435/api/v1',
-        OPENROUTER_API_KEY_1: 'ollama-local',
-      },
+      env: { ...process.env, PORT: '3000', OPENROUTER_BASE_URL: 'http://localhost:11435/api/v1', OPENROUTER_API_KEY_1: 'ollama-local' },
     });
-
-    dev.stdout.on('data', (data) => {
-      const text = data.toString();
-      if (text.includes('Ready') || text.includes('ready') || text.includes('localhost:3000')) {
+    dev.stdout.on('data', d => {
+      const t = d.toString();
+      if (t.includes('Ready') || t.includes('ready') || t.includes('localhost:3000')) {
         log('✅', 'Sayt tayyor: http://localhost:3000', C.green);
         setTimeout(resolve, 500);
       }
     });
-
-    dev.stderr.on('data', () => {});
-    dev.on('error', (err) => log('❌', err.message, C.red));
-
-    // Max 60 sekund
+    dev.on('error', e => log('❌', e.message, C.red));
     setTimeout(resolve, 60000);
   });
 }
 
-function sleep(ms) {
-  return new Promise(r => setTimeout(r, ms));
-}
-
 // ── MAIN ──
 async function main() {
   console.log(`\n${C.bold}${C.cyan}
@@ -281,54 +229,37 @@ async function main() {
   ╚═╝  ╚═══╝╚══════╝╚═╝  ╚═╝ ╚═════╝ ╚══════╝╚═╝  ╚═╝╚═╝
   ${C.reset}${C.dim}  TEAM v3.0 — 15 AI Agents${C.reset}\n`);
 
-  // 1. Ollama topish
   log('🔍', 'Ollama qidirilmoqda...', C.cyan);
   const ollamaPath = findOllama();
-
   if (!ollamaPath) {
-    log('❌', 'Ollama topilmadi!', C.red);
-    log('💡', 'Yuklab oling: https://ollama.com/download', C.yellow);
+    log('❌', 'Ollama topilmadi! https://ollama.com/download', C.red);
     process.exit(1);
   }
   log('✅', `Ollama: ${ollamaPath}`, C.green);
 
-  // 2. Ollama ishga tushirish
   startOllama(ollamaPath);
   await sleep(2000);
 
-  // 3. Model topish
   log('🔍', 'AI model qidirilmoqda...', C.cyan);
-  const model = await findBestModel();
+  const model = findBestModel();
 
-  // 4. Proxy
   startProxy(model);
 
-  // 5. Loyiha topish
   log('🔍', 'NexusAI loyiha qidirilmoqda...', C.cyan);
-  const projectDir = findProject();
-
-  if (!projectDir) {
+  const dir = findProject();
+  if (!dir) {
     log('❌', 'NexusAI loyiha topilmadi!', C.red);
-    log('💡', 'Loyiha papkasida turib avg-nexus buyrug\'ini bering', C.yellow);
+    log('💡', 'nexusai-team papkasida turib avg-nexus bering', C.yellow);
     process.exit(1);
   }
-  log('✅', `Loyiha: ${projectDir}`, C.green);
+  log('✅', `Loyiha: ${dir}`, C.green);
 
-  // 6. Next.js ishga tushirish
-  await startNextJS(projectDir);
+  await startNextJS(dir);
 
-  log('', `\n${C.bold}${C.green}🎉 NexusAI tayyor!${C.reset}`, '');
-  log('🌐', 'http://localhost:3000', C.cyan);
-  log('', `${C.dim}To\'xtatish uchun: Ctrl+C${C.reset}\n`, '');
+  log('', `\n${C.bold}${C.green}🎉 NexusAI tayyor! http://localhost:3000${C.reset}\n`, '');
+  log('', `${C.dim}To'xtatish: Ctrl+C${C.reset}\n`, '');
 
-  // Jarayon tirik qolsin
-  process.on('SIGINT', () => {
-    log('👋', 'NexusAI to\'xtatildi', C.yellow);
-    process.exit(0);
-  });
+  process.on('SIGINT', () => { log('👋', 'To\'xtatildi', C.yellow); process.exit(0); });
 }
 
-main().catch(err => {
-  log('❌', `Xato: ${err.message}`, C.red);
-  process.exit(1);
-});
+main().catch(e => { log('❌', e.message, C.red); process.exit(1); });

package/package.json

@@ -1,18 +1,15 @@
 {
   "name": "avg-nexus",
-  "version": "1.0.7",
+  "version": "1.0.10",
   "description": "Offline/Online proxy for NexusAI Team — runs with local Ollama",
   "main": "bin/avg-nexus.js",
   "type": "commonjs",
   "bin": {
-    "avg-nexus": "./bin/avg-nexus.js"
+    "avgnexus": "./bin/avg-nexus.js"
   },
   "scripts": {
     "start": "node bin/avg-nexus.js"
   },
-  "dependencies": {
-    "node-fetch": "^2.7.0"
-  },
   "keywords": [
     "ollama",
     "openrouter",