ruvector 0.2.6 → 0.2.8

package/bin/cli.js

@@ -115,6 +115,76 @@ function loadGnn() {
   }
 }
 
+// ── Proxy-aware fetch wrapper ───────────────────────────────────────────────
+// Detects HTTP_PROXY / HTTPS_PROXY / ALL_PROXY env vars and routes traffic
+// through the proxy when configured.  Falls back to native fetch() when no
+// proxy is set or the target matches NO_PROXY.
+let _proxyDispatcherSet = false;
+
+function getProxyUrl(targetUrl) {
+  const NO_PROXY = process.env.NO_PROXY || process.env.no_proxy || '';
+  if (NO_PROXY === '*') return null;
+  if (NO_PROXY) {
+    try {
+      const host = new URL(targetUrl).hostname.toLowerCase();
+      const patterns = NO_PROXY.split(',').map(p => p.trim().toLowerCase());
+      for (const p of patterns) {
+        if (!p) continue;
+        if (host === p || host.endsWith(p.startsWith('.') ? p : '.' + p)) return null;
+      }
+    } catch {}
+  }
+  return process.env.HTTPS_PROXY || process.env.https_proxy
+      || process.env.HTTP_PROXY  || process.env.http_proxy
+      || process.env.ALL_PROXY   || process.env.all_proxy
+      || null;
+}
+
+async function proxyFetch(url, opts) {
+  const target = typeof url === 'string' ? url : url.toString();
+  const proxy = getProxyUrl(target);
+  if (!proxy) return fetch(url, opts);
+
+  // Try undici ProxyAgent (bundled in Node 18+)
+  if (!_proxyDispatcherSet) {
+    try {
+      const undici = require('undici');
+      if (undici.ProxyAgent && undici.setGlobalDispatcher) {
+        undici.setGlobalDispatcher(new undici.ProxyAgent(proxy));
+        _proxyDispatcherSet = true;
+      }
+    } catch {}
+  }
+  if (_proxyDispatcherSet) return fetch(url, opts);
+
+  // Fallback: shell out to curl (which natively respects proxy env vars)
+  const { execFileSync } = require('child_process');
+  const args = ['-sS', '-L', '--max-time', '30'];
+  if (opts && opts.method) { args.push('-X', opts.method); }
+  if (opts && opts.headers) {
+    for (const [k, v] of Object.entries(opts.headers)) {
+      args.push('-H', `${k}: ${v}`);
+    }
+  }
+  if (opts && opts.body) { args.push('-d', typeof opts.body === 'string' ? opts.body : JSON.stringify(opts.body)); }
+  args.push(target);
+  try {
+    const stdout = execFileSync('curl', args, { encoding: 'utf8', timeout: 35000 });
+    const body = stdout.trim();
+    return {
+      ok: true,
+      status: 200,
+      statusText: 'OK',
+      text: async () => body,
+      json: async () => JSON.parse(body),
+      headers: new Map(),
+    };
+  } catch (e) {
+    const msg = e.stderr ? e.stderr.toString().trim() : e.message;
+    throw new Error(`Proxy curl failed: ${msg}`);
+  }
+}
+
 // Lazy load Attention (optional - loaded on first use, not at startup)
 let _attentionModule = undefined;
 let DotProductAttention, MultiHeadAttention, HyperbolicAttention, FlashAttention, LinearAttention, MoEAttention;
@@ -7250,7 +7320,7 @@ async function getRvfManifest(opts = {}) {
 
   // Try GCS
   try {
-    const resp = await fetch(GCS_MANIFEST_URL);
+    const resp = await proxyFetch(GCS_MANIFEST_URL, { signal: AbortSignal.timeout(15000) });
     if (resp.ok) {
       const manifest = await resp.json();
       fs.mkdirSync(cacheDir, { recursive: true });
@@ -7877,11 +7947,12 @@ async function brainFetch(config, endpoint, opts = {}) {
   const fetchOpts = { headers: brainHeaders(config), signal: AbortSignal.timeout(30000) };
   if (opts.method) fetchOpts.method = opts.method;
   if (opts.body) { fetchOpts.method = opts.method || 'POST'; fetchOpts.body = JSON.stringify(opts.body); }
-  const resp = await fetch(url.toString(), fetchOpts);
+  const resp = await proxyFetch(url.toString(), fetchOpts);
   if (!resp.ok) {
     const errText = await resp.text().catch(() => resp.statusText);
     throw new Error(`${resp.status} ${errText}`);
   }
+  if (resp.status === 204 || resp.headers.get('content-length') === '0') return {};
   return resp.json();
 }
 
@@ -7927,10 +7998,12 @@ brainCmd.command('share <title>')
   .option('--code <snippet>', 'Code snippet')
   .option('--url <url>', 'Brain server URL')
   .option('--key <key>', 'Pi key')
+  .option('--json', 'Output as JSON')
   .action(async (title, opts) => {
     const config = getBrainConfig(opts);
     try {
       const result = await brainFetch(config, '/v1/memories', { body: { title, content: opts.content || title, category: opts.category, tags: opts.tags ? opts.tags.split(',').map(t => t.trim()) : [], code_snippet: opts.code } });
+      if (opts.json || !process.stdout.isTTY) { console.log(JSON.stringify(result, null, 2)); return; }
       console.log(chalk.green(`Shared: ${result.id || 'OK'}`));
     } catch (e) { console.error(chalk.red(`Error: ${e.message}`)); process.exit(1); }
   });
@@ -7957,10 +8030,12 @@ brainCmd.command('vote <id> <direction>')
   .description('Quality vote on a memory (up or down)')
   .option('--url <url>', 'Brain server URL')
   .option('--key <key>', 'Pi key')
+  .option('--json', 'Output as JSON')
   .action(async (id, direction, opts) => {
     const config = getBrainConfig(opts);
     try {
-      await brainFetch(config, `/v1/memories/${id}/vote`, { body: { direction } });
+      const result = await brainFetch(config, `/v1/memories/${id}/vote`, { body: { direction } });
+      if (opts.json || !process.stdout.isTTY) { console.log(JSON.stringify(result, null, 2)); return; }
       console.log(chalk.green(`Voted ${direction} on ${id}`));
     } catch (e) { console.error(chalk.red(`Error: ${e.message}`)); process.exit(1); }
   });
@@ -7972,14 +8047,21 @@ brainCmd.command('list')
   .option('--url <url>', 'Brain server URL')
   .option('--key <key>', 'Pi key')
   .option('--json', 'Output as JSON')
+  .option('--offset <n>', 'Skip first N results (pagination)', '0')
+  .option('--sort <field>', 'Sort by: updated_at, quality, votes', 'updated_at')
+  .option('--tags <tags>', 'Filter by tags (comma-separated)')
   .action(async (opts) => {
     const config = getBrainConfig(opts);
     try {
-      const results = await brainFetch(config, '/v1/memories/list', { params: { category: opts.category, limit: opts.limit } });
-      if (opts.json || !process.stdout.isTTY) { console.log(JSON.stringify(results, null, 2)); return; }
+      const data = await brainFetch(config, '/v1/memories/list', { params: { category: opts.category, limit: opts.limit, offset: opts.offset, sort: opts.sort, tags: opts.tags } });
+      if (opts.json || !process.stdout.isTTY) { console.log(JSON.stringify(data, null, 2)); return; }
       console.log(chalk.bold.cyan('\nShared Brain Memories\n'));
-      if (!results.length) { console.log(chalk.dim('  No memories found.\n')); return; }
-      results.forEach((r, i) => {
+      const memories = Array.isArray(data) ? data : data.memories || [];
+      if (data.total_count !== undefined) {
+        console.log(chalk.dim(`  Showing ${memories.length} of ${data.total_count} (offset ${data.offset || 0})\n`));
+      }
+      if (!memories.length) { console.log(chalk.dim('  No memories found.\n')); return; }
+      memories.forEach((r, i) => {
         console.log(`  ${chalk.yellow(i + 1 + '.')} ${chalk.bold(r.title || r.id)} ${chalk.dim(`[${r.category || 'unknown'}]`)}`);
       });
       console.log();
@@ -7990,10 +8072,12 @@ brainCmd.command('delete <id>')
   .description('Delete your own contribution')
   .option('--url <url>', 'Brain server URL')
   .option('--key <key>', 'Pi key')
+  .option('--json', 'Output as JSON')
   .action(async (id, opts) => {
     const config = getBrainConfig(opts);
     try {
-      await brainFetch(config, `/v1/memories/${id}`, { method: 'DELETE' });
+      const result = await brainFetch(config, `/v1/memories/${id}`, { method: 'DELETE' });
+      if (opts.json || !process.stdout.isTTY) { console.log(JSON.stringify(result, null, 2)); return; }
       console.log(chalk.green(`Deleted: ${id}`));
     } catch (e) { console.error(chalk.red(`Error: ${e.message}`)); process.exit(1); }
   });
@@ -8088,10 +8172,12 @@ brainCmd.command('sync [direction]')
   .description('Synchronize LoRA weights (pull, push, or both)')
   .option('--url <url>', 'Brain server URL')
   .option('--key <key>', 'Pi key')
+  .option('--json', 'Output as JSON')
   .action(async (direction, opts) => {
     const config = getBrainConfig(opts);
     try {
       const result = await brainFetch(config, '/v1/lora/latest', { params: { direction: direction || 'both' } });
+      if (opts.json || !process.stdout.isTTY) { console.log(JSON.stringify(result, null, 2)); return; }
       console.log(chalk.green(`Sync ${direction || 'both'}: ${result.status || 'OK'}`));
     } catch (e) { console.error(chalk.red(`Error: ${e.message}`)); process.exit(1); }
   });
@@ -8191,7 +8277,7 @@ async function fetchBrainEndpoint(config, endpoint) {
   const url = (config.url || 'https://pi.ruv.io') + endpoint;
   const headers = {};
   if (config.key) headers['Authorization'] = `Bearer ${config.key}`;
-  const resp = await fetch(url, { headers });
+  const resp = await proxyFetch(url, { headers, signal: AbortSignal.timeout(30000) });
   if (!resp.ok) throw new Error(`${resp.status} ${resp.statusText}`);
   return resp.json();
 }
@@ -8420,7 +8506,7 @@ midstreamCmd.command('benchmark')
 
     async function timeRequest(url, label) {
       const start = performance.now();
-      const resp = await fetch(url, { headers });
+      const resp = await proxyFetch(url, { headers, signal: AbortSignal.timeout(30000) });
       const elapsed = performance.now() - start;
       return { label, status: resp.status, elapsed };
     }
@@ -8490,7 +8576,7 @@ edgeCmd.command('status')
   .option('--json', 'Output as JSON')
   .action(async (opts) => {
     try {
-      const resp = await fetch(`${EDGE_GENESIS}/status`);
+      const resp = await proxyFetch(`${EDGE_GENESIS}/status`, { signal: AbortSignal.timeout(30000) });
       const data = await resp.json();
       if (opts.json || !process.stdout.isTTY) { console.log(JSON.stringify(data, null, 2)); return; }
       console.log(chalk.bold.cyan('\nEdge Network Status\n'));
@@ -8506,10 +8592,11 @@ edgeCmd.command('join')
     const piKey = process.env.PI;
     if (!piKey) { console.error(chalk.red('Set PI environment variable first. Run: npx ruvector identity generate')); process.exit(1); }
     try {
-      const resp = await fetch(`${EDGE_GENESIS}/join`, {
+      const resp = await proxyFetch(`${EDGE_GENESIS}/join`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${piKey}` },
-        body: JSON.stringify({ contribution: parseFloat(opts.contribution), pi_key: piKey })
+        body: JSON.stringify({ contribution: parseFloat(opts.contribution), pi_key: piKey }),
+        signal: AbortSignal.timeout(30000)
       });
       const data = await resp.json();
       console.log(chalk.green(`Joined edge network: ${data.node_id || 'OK'}`));
@@ -8524,7 +8611,7 @@ edgeCmd.command('balance')
     if (!piKey) { console.error(chalk.red('Set PI environment variable first.')); process.exit(1); }
     try {
       const pseudonym = require('crypto').createHash('shake256', { outputLength: 16 }).update(piKey).digest('hex');
-      const resp = await fetch(`${EDGE_GENESIS}/balance/${pseudonym}`, { headers: { 'Authorization': `Bearer ${piKey}` } });
+      const resp = await proxyFetch(`${EDGE_GENESIS}/balance/${pseudonym}`, { headers: { 'Authorization': `Bearer ${piKey}` }, signal: AbortSignal.timeout(30000) });
       if (!resp.ok) { console.error(chalk.red(`Edge network returned ${resp.status} ${resp.statusText}`)); process.exit(1); }
       const data = await resp.json();
       if (opts.json || !process.stdout.isTTY) { console.log(JSON.stringify(data, null, 2)); return; }
@@ -8540,7 +8627,7 @@ edgeCmd.command('tasks')
   .option('--json', 'Output as JSON')
   .action(async (opts) => {
     try {
-      const resp = await fetch(`${EDGE_GENESIS}/tasks?limit=${opts.limit}`);
+      const resp = await proxyFetch(`${EDGE_GENESIS}/tasks?limit=${opts.limit}`, { signal: AbortSignal.timeout(30000) });
       const data = await resp.json();
       if (opts.json || !process.stdout.isTTY) { console.log(JSON.stringify(data, null, 2)); return; }
       console.log(chalk.bold.cyan('\nEdge Compute Tasks\n'));

package/bin/mcp-server.js

@@ -95,6 +95,71 @@ function sanitizeNumericArg(arg, defaultVal) {
   return Number.isFinite(n) && n > 0 ? n : (defaultVal || 0);
 }
 
+// ── Proxy-aware fetch wrapper ───────────────────────────────────────────────
+let _proxyDispatcherSet = false;
+
+function getProxyUrl(targetUrl) {
+  const NO_PROXY = process.env.NO_PROXY || process.env.no_proxy || '';
+  if (NO_PROXY === '*') return null;
+  if (NO_PROXY) {
+    try {
+      const host = new URL(targetUrl).hostname.toLowerCase();
+      const patterns = NO_PROXY.split(',').map(p => p.trim().toLowerCase());
+      for (const p of patterns) {
+        if (!p) continue;
+        if (host === p || host.endsWith(p.startsWith('.') ? p : '.' + p)) return null;
+      }
+    } catch {}
+  }
+  return process.env.HTTPS_PROXY || process.env.https_proxy
+      || process.env.HTTP_PROXY  || process.env.http_proxy
+      || process.env.ALL_PROXY   || process.env.all_proxy
+      || null;
+}
+
+async function proxyFetch(url, opts) {
+  const target = typeof url === 'string' ? url : url.toString();
+  const proxy = getProxyUrl(target);
+  if (!proxy) return fetch(url, opts);
+
+  if (!_proxyDispatcherSet) {
+    try {
+      const undici = require('undici');
+      if (undici.ProxyAgent && undici.setGlobalDispatcher) {
+        undici.setGlobalDispatcher(new undici.ProxyAgent(proxy));
+        _proxyDispatcherSet = true;
+      }
+    } catch {}
+  }
+  if (_proxyDispatcherSet) return fetch(url, opts);
+
+  const { execFileSync } = require('child_process');
+  const args = ['-sS', '-L', '--max-time', '30'];
+  if (opts && opts.method) { args.push('-X', opts.method); }
+  if (opts && opts.headers) {
+    for (const [k, v] of Object.entries(opts.headers)) {
+      args.push('-H', `${k}: ${v}`);
+    }
+  }
+  if (opts && opts.body) { args.push('-d', typeof opts.body === 'string' ? opts.body : JSON.stringify(opts.body)); }
+  args.push(target);
+  try {
+    const stdout = execFileSync('curl', args, { encoding: 'utf8', timeout: 35000 });
+    const body = stdout.trim();
+    return {
+      ok: true,
+      status: 200,
+      statusText: 'OK',
+      text: async () => body,
+      json: async () => JSON.parse(body),
+      headers: new Map(),
+    };
+  } catch (e) {
+    const msg = e.stderr ? e.stderr.toString().trim() : e.message;
+    throw new Error(`Proxy curl failed: ${msg}`);
+  }
+}
+
 // Try to load the full IntelligenceEngine
 let IntelligenceEngine = null;
 let engineAvailable = false;
@@ -363,7 +428,7 @@ class Intelligence {
 const server = new Server(
   {
     name: 'ruvector',
-    version: '0.2.6',
+    version: '0.2.8',
   },
   {
     capabilities: {
@@ -3122,7 +3187,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         // Fetch from GCS if no fresh cache
         if (!manifest) {
           try {
-            const resp = await fetch(GCS_MANIFEST);
+            const resp = await proxyFetch(GCS_MANIFEST, { signal: AbortSignal.timeout(15000) });
             if (resp.ok) {
               manifest = await resp.json();
               try {
@@ -3320,6 +3385,9 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
               const p = new URLSearchParams();
               if (args.category) p.set('category', args.category);
               p.set('limit', String(args.limit || 20));
+              if (args.offset) p.set('offset', String(args.offset));
+              if (args.sort) p.set('sort', args.sort);
+              if (args.tags) p.set('tags', args.tags);
               url = `${brainUrl}/v1/memories/list?${p}`;
               break;
             }
@@ -3350,7 +3418,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             }
             case 'sync': url = `${brainUrl}/v1/lora/latest`; break;
           }
-          const resp = await fetch(url, fetchOpts);
+          const resp = await proxyFetch(url, fetchOpts);
           if (!resp.ok) {
             const errText = await resp.text().catch(() => resp.statusText);
             return { content: [{ type: 'text', text: JSON.stringify({ success: false, error: `${resp.status} ${errText}` }, null, 2) }], isError: true };
@@ -3384,7 +3452,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             brain_flags: '/v1/status',
           };
           const endpoint = endpointMap[name];
-          const resp = await fetch(`${brainUrl}${endpoint}`, { headers: hdrs });
+          const resp = await proxyFetch(`${brainUrl}${endpoint}`, { headers: hdrs, signal: AbortSignal.timeout(30000) });
           if (!resp.ok) {
             const errText = await resp.text().catch(() => resp.statusText);
             return { content: [{ type: 'text', text: JSON.stringify({ success: false, error: `${resp.status} ${errText}` }, null, 2) }], isError: true };
@@ -3428,7 +3496,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           const hdrs = { 'Content-Type': 'application/json' };
           if (brainKey) hdrs['Authorization'] = `Bearer ${brainKey}`;
 
-          const resp = await fetch(`${brainUrl}/v1/midstream`, { headers: hdrs });
+          const resp = await proxyFetch(`${brainUrl}/v1/midstream`, { headers: hdrs, signal: AbortSignal.timeout(30000) });
           if (!resp.ok) {
             const errText = await resp.text().catch(() => resp.statusText);
             return { content: [{ type: 'text', text: JSON.stringify({ success: false, error: `${resp.status} ${errText}` }, null, 2) }], isError: true };
@@ -3458,7 +3526,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 
           async function timeFetch(url) {
             const start = performance.now();
-            const resp = await fetch(url, { headers: hdrs });
+            const resp = await proxyFetch(url, { headers: hdrs });
             return { status: resp.status, elapsed: performance.now() - start };
           }
 
@@ -3511,7 +3579,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           if (brainKey) hdrs['Authorization'] = `Bearer ${brainKey}`;
           const limit = Math.min(Math.max(parseInt(args.limit) || 10, 1), 100);
           const q = encodeURIComponent(args.query);
-          const resp = await fetch(`${brainUrl}/v1/memories/search?q=${q}&limit=${limit}`, { headers: hdrs });
+          const resp = await proxyFetch(`${brainUrl}/v1/memories/search?q=${q}&limit=${limit}`, { headers: hdrs, signal: AbortSignal.timeout(30000) });
           if (!resp.ok) {
             const errText = await resp.text().catch(() => resp.statusText);
             return { content: [{ type: 'text', text: JSON.stringify({ success: false, error: `${resp.status} ${errText}` }, null, 2) }], isError: true };
@@ -3531,8 +3599,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           if (brainKey) hdrs['Authorization'] = `Bearer ${brainKey}`;
 
           const [healthResp, midResp] = await Promise.all([
-            fetch(`${brainUrl}/v1/health`, { headers: hdrs }).then(r => r.json()).catch(e => ({ error: e.message })),
-            fetch(`${brainUrl}/v1/midstream`, { headers: hdrs }).then(r => r.json()).catch(e => ({ error: e.message })),
+            proxyFetch(`${brainUrl}/v1/health`, { headers: hdrs, signal: AbortSignal.timeout(15000) }).then(r => r.json()).catch(e => ({ error: e.message })),
+            proxyFetch(`${brainUrl}/v1/midstream`, { headers: hdrs, signal: AbortSignal.timeout(15000) }).then(r => r.json()).catch(e => ({ error: e.message })),
           ]);
 
           return { content: [{ type: 'text', text: JSON.stringify({
@@ -3560,7 +3628,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             case 'balance': { const ps = process.env.PI ? require('crypto').createHash('shake256', { outputLength: 16 }).update(process.env.PI).digest('hex') : 'anonymous'; endpoint = `/balance/${ps}`; break; }
             case 'tasks': endpoint = `/tasks?limit=${args.limit || 20}`; break;
           }
-          const resp = await fetch(`${genesisUrl}${endpoint}`, {
+          const resp = await proxyFetch(`${genesisUrl}${endpoint}`, {
             method,
             headers: { 'Content-Type': 'application/json', ...(process.env.PI ? { 'Authorization': `Bearer ${process.env.PI}` } : {}) },
             ...(body ? { body } : {})
@@ -3831,7 +3899,7 @@ async function main() {
           transport: 'sse',
           sessions: sessions.size,
           tools: 91,
-          version: '0.2.6'
+          version: '0.2.8'
         }));
 
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ruvector",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "High-performance vector database for Node.js with automatic native/WASM fallback",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",