omniwire 3.0.1 → 3.1.1

package/dist/update.js

@@ -1,11 +1,16 @@
-// OmniWire — self-update via npm registry
-// Checks for new versions and updates in-place
+// OmniWire — self-update via npm registry + GitHub releases
+// Supports: auto-update on startup, periodic checks, mesh-wide updates, GitHub + npm sources
 // Works on all architectures: x64, arm64, armv7l (RPi), darwin, linux, win32
-import { execFile } from 'node:child_process';
-import { readFileSync } from 'node:fs';
+import { exec } from 'node:child_process';
+import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 const __dirname = dirname(fileURLToPath(import.meta.url));
+const GITHUB_REPO = 'VoidChecksum/omniwire';
+const NPM_PACKAGE = 'omniwire';
+const UPDATE_CHECK_INTERVAL_MS = 3_600_000; // 1 hour
+const STATE_DIR = join(__dirname, '..', '.omniwire-state');
+const STATE_FILE = join(STATE_DIR, 'update-state.json');
 function getCurrentVersion() {
     try {
         const pkgPath = join(__dirname, '..', 'package.json');
@@ -16,9 +21,11 @@ function getCurrentVersion() {
         return '0.0.0';
     }
 }
-function runCommand(cmd, args) {
+function runCommand(cmd, args, timeoutMs = 60_000) {
     return new Promise((resolve) => {
-        execFile(cmd, args, { timeout: 60_000 }, (err, stdout, stderr) => {
+        // Quote args and use exec() — works on all platforms including .cmd/.bat on Windows
+        const escaped = args.map((a) => a.includes(' ') || a.includes('"') ? `"${a.replace(/"/g, '\\"')}"` : a);
+        exec(`${cmd} ${escaped.join(' ')}`, { timeout: timeoutMs, windowsHide: true }, (err, stdout, stderr) => {
             resolve({
                 stdout: (stdout ?? '').trim(),
                 stderr: (stderr ?? '').trim(),
@@ -27,73 +34,241 @@ function runCommand(cmd, args) {
         });
     });
 }
-/** Check if a newer version is available on npm */
-export async function checkForUpdate() {
+/** Compare semver strings: returns >0 if a > b, <0 if a < b, 0 if equal */
+function compareVersions(a, b) {
+    const pa = a.split('.').map(Number);
+    const pb = b.split('.').map(Number);
+    for (let i = 0; i < 3; i++) {
+        const diff = (pa[i] ?? 0) - (pb[i] ?? 0);
+        if (diff !== 0)
+            return diff;
+    }
+    return 0;
+}
+function loadState() {
+    try {
+        if (existsSync(STATE_FILE)) {
+            return JSON.parse(readFileSync(STATE_FILE, 'utf-8'));
+        }
+    }
+    catch { /* fresh state */ }
+    return { lastCheck: 0, lastVersion: getCurrentVersion(), autoUpdateEnabled: true, source: 'auto', checkIntervalMs: UPDATE_CHECK_INTERVAL_MS };
+}
+function saveState(state) {
+    try {
+        if (!existsSync(STATE_DIR))
+            mkdirSync(STATE_DIR, { recursive: true });
+        writeFileSync(STATE_FILE, JSON.stringify(state, null, 2));
+    }
+    catch { /* non-critical */ }
+}
+// --- Check sources ---
+/** Check npm registry for latest version */
+async function checkNpm() {
+    const result = await runCommand(process.platform === 'win32' ? 'npm.cmd' : 'npm', ['view', NPM_PACKAGE, 'version'], 15_000);
+    const version = result.stdout.trim();
+    if (version && result.code === 0)
+        return { version, source: 'npm' };
+    return null;
+}
+/** Check GitHub releases for latest version */
+async function checkGitHub() {
+    const url = `https://api.github.com/repos/${GITHUB_REPO}/releases/latest`;
+    // Try native fetch first (Node 18+), then curl, then PowerShell
+    let resultStdout = '';
+    try {
+        const controller = new AbortController();
+        const timeout = setTimeout(() => controller.abort(), 10_000);
+        const resp = await fetch(url, { headers: { Accept: 'application/vnd.github+json' }, signal: controller.signal });
+        clearTimeout(timeout);
+        resultStdout = await resp.text();
+    }
+    catch {
+        // Fallback: curl (Linux/macOS) or PowerShell (Windows)
+        const result = process.platform === 'win32'
+            ? await runCommand('powershell', ['-NoProfile', '-Command', `(Invoke-WebRequest -Uri '${url}' -Headers @{Accept='application/vnd.github+json'} -TimeoutSec 10 -UseBasicParsing).Content`], 15_000)
+            : await runCommand('curl', ['-s', '--max-time', '10', '-H', 'Accept: application/vnd.github+json', url], 15_000);
+        if (result.code !== 0 || !result.stdout)
+            return null;
+        resultStdout = result.stdout;
+    }
+    if (!resultStdout)
+        return null;
+    try {
+        const release = JSON.parse(resultStdout);
+        const tag = (release.tag_name ?? '').replace(/^v/, '');
+        const tarball = release.tarball_url ?? `https://github.com/${GITHUB_REPO}/archive/refs/tags/${release.tag_name}.tar.gz`;
+        if (tag)
+            return { version: tag, tarballUrl: tarball, source: 'github' };
+    }
+    catch { /* parse error */ }
+    return null;
+}
+/** Check for update from best available source */
+export async function checkForUpdate(source = 'auto') {
     const current = getCurrentVersion();
-    // Use npm view to check latest — works on all platforms/architectures
-    const result = await runCommand('npm', ['view', 'omniwire', 'version']);
-    const latest = result.stdout.trim();
-    if (!latest || result.code !== 0) {
-        return { current, latest: current, updateAvailable: false };
+    if (source === 'npm' || source === 'auto') {
+        const npm = await checkNpm();
+        if (npm && compareVersions(npm.version, current) > 0) {
+            return { current, latest: npm.version, updateAvailable: true, source: 'npm' };
+        }
+        if (source === 'npm')
+            return { current, latest: npm?.version ?? current, updateAvailable: false, source: 'npm' };
     }
-    return {
-        current,
-        latest,
-        updateAvailable: latest !== current && compareVersions(latest, current) > 0,
-    };
+    if (source === 'github' || source === 'auto') {
+        const gh = await checkGitHub();
+        if (gh && compareVersions(gh.version, current) > 0) {
+            return { current, latest: gh.version, updateAvailable: true, source: 'github' };
+        }
+        if (source === 'github')
+            return { current, latest: gh?.version ?? current, updateAvailable: false, source: 'github' };
+    }
+    return { current, latest: current, updateAvailable: false, source: 'auto' };
+}
+// --- Update methods ---
+/** Update via npm */
+async function updateViaNpm(version) {
+    const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+    // Try global update first
+    const global = await runCommand(npmCmd, ['install', '-g', `${NPM_PACKAGE}@${version}`]);
+    if (global.code === 0)
+        return { ok: true, message: `npm global: ${version}` };
+    // Fallback: local
+    const local = await runCommand(npmCmd, ['install', `${NPM_PACKAGE}@${version}`]);
+    if (local.code === 0)
+        return { ok: true, message: `npm local: ${version}` };
+    return { ok: false, message: global.stderr || local.stderr || 'npm update failed' };
+}
+/** Update via GitHub release tarball */
+async function updateViaGitHub(version) {
+    const tag = `v${version}`;
+    const tarball = `https://github.com/${GITHUB_REPO}/archive/refs/tags/${tag}.tar.gz`;
+    const tmpDir = process.platform === 'win32' ? '%TEMP%' : '/tmp';
+    const archive = `${tmpDir}/omniwire-${version}.tar.gz`;
+    // Download
+    const dl = await runCommand('curl', ['-sL', '-o', archive, tarball], 30_000);
+    if (dl.code !== 0)
+        return { ok: false, message: `download failed: ${dl.stderr}` };
+    // Determine install location
+    const installDir = join(__dirname, '..');
+    if (process.platform === 'win32') {
+        // Windows: extract with tar (available on Win10+)
+        const extract = await runCommand('tar', ['-xzf', archive, '-C', tmpDir]);
+        if (extract.code !== 0)
+            return { ok: false, message: `extract failed: ${extract.stderr}` };
+        // Copy files over (xcopy)
+        const src = `${tmpDir}\\omniwire-${version}`;
+        const copy = await runCommand('xcopy', ['/E', '/Y', '/I', src, installDir]);
+        return { ok: copy.code === 0, message: copy.code === 0 ? `github: ${version}` : copy.stderr };
+    }
+    // Linux/macOS: extract and install
+    const extract = await runCommand('tar', ['-xzf', archive, '-C', '/tmp']);
+    if (extract.code !== 0)
+        return { ok: false, message: `extract failed: ${extract.stderr}` };
+    const src = `/tmp/omniwire-${version}`;
+    // npm install from extracted dir to rebuild
+    const install = await runCommand('bash', ['-c', `cd ${src} && npm install --production && npm run build 2>/dev/null; cp -r dist/* ${installDir}/dist/ 2>/dev/null; cp package.json ${installDir}/ 2>/dev/null; echo "ok"`]);
+    return { ok: install.stdout.includes('ok'), message: install.stdout.includes('ok') ? `github: ${version}` : install.stderr };
 }
 /** Self-update OmniWire to the latest version */
-export async function selfUpdate() {
+export async function selfUpdate(source = 'auto') {
     const current = getCurrentVersion();
-    // Check latest version
-    const check = await checkForUpdate();
+    const check = await checkForUpdate(source);
     if (!check.updateAvailable) {
         return {
             currentVersion: current,
             latestVersion: check.latest,
             updated: false,
             message: `Already on latest version (${current})`,
+            source: check.source,
         };
     }
-    // Detect package manager (npm or global install)
-    const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-    // Try global update first
-    const globalResult = await runCommand(npmCmd, ['install', '-g', `omniwire@${check.latest}`]);
-    if (globalResult.code === 0) {
-        return {
-            currentVersion: current,
-            latestVersion: check.latest,
-            updated: true,
-            message: `Updated ${current} → ${check.latest} (global)`,
-        };
+    // Try npm first (most reliable), then GitHub
+    let result;
+    let usedSource;
+    if (check.source === 'npm' || source === 'npm') {
+        result = await updateViaNpm(check.latest);
+        usedSource = 'npm';
     }
-    // Fallback: local update (for non-global installs)
-    const localResult = await runCommand(npmCmd, ['install', `omniwire@${check.latest}`]);
-    if (localResult.code === 0) {
-        return {
-            currentVersion: current,
-            latestVersion: check.latest,
-            updated: true,
-            message: `Updated ${current} → ${check.latest} (local)`,
-        };
+    else if (check.source === 'github' || source === 'github') {
+        result = await updateViaGitHub(check.latest);
+        usedSource = 'github';
+    }
+    else {
+        // Auto: try npm, fallback to github
+        result = await updateViaNpm(check.latest);
+        usedSource = 'npm';
+        if (!result.ok) {
+            result = await updateViaGitHub(check.latest);
+            usedSource = 'github';
+        }
+    }
+    if (result.ok) {
+        const state = loadState();
+        saveState({ ...state, lastCheck: Date.now(), lastVersion: check.latest });
     }
     return {
         currentVersion: current,
         latestVersion: check.latest,
-        updated: false,
-        message: `Update failed: ${globalResult.stderr || localResult.stderr}`,
+        updated: result.ok,
+        message: result.ok ? `Updated ${current} → ${check.latest} via ${usedSource}` : `Update failed: ${result.message}`,
+        source: usedSource,
     };
 }
-/** Compare semver strings: returns >0 if a > b, <0 if a < b, 0 if equal */
-function compareVersions(a, b) {
-    const pa = a.split('.').map(Number);
-    const pb = b.split('.').map(Number);
-    for (let i = 0; i < 3; i++) {
-        const diff = (pa[i] ?? 0) - (pb[i] ?? 0);
-        if (diff !== 0)
-            return diff;
+// --- Auto-update ---
+let autoUpdateTimer = null;
+/** Start auto-update background checker */
+export function startAutoUpdate(intervalMs, onUpdate) {
+    stopAutoUpdate(); // Clear any existing timer
+    const state = loadState();
+    const interval = intervalMs ?? state.checkIntervalMs;
+    saveState({ ...state, autoUpdateEnabled: true, checkIntervalMs: interval });
+    // Run check immediately if enough time has passed
+    const timeSinceCheck = Date.now() - state.lastCheck;
+    if (timeSinceCheck >= interval) {
+        void autoUpdateCheck(onUpdate);
     }
-    return 0;
+    autoUpdateTimer = setInterval(() => void autoUpdateCheck(onUpdate), interval);
+    // Don't keep process alive just for updates
+    if (autoUpdateTimer && 'unref' in autoUpdateTimer) {
+        autoUpdateTimer.unref();
+    }
+}
+/** Stop auto-update background checker */
+export function stopAutoUpdate() {
+    if (autoUpdateTimer) {
+        clearInterval(autoUpdateTimer);
+        autoUpdateTimer = null;
+    }
+    const state = loadState();
+    saveState({ ...state, autoUpdateEnabled: false });
+}
+/** Single auto-update check + apply */
+async function autoUpdateCheck(onUpdate) {
+    try {
+        const check = await checkForUpdate('auto');
+        if (check.updateAvailable) {
+            const result = await selfUpdate('auto');
+            saveState({ ...loadState(), lastCheck: Date.now() });
+            onUpdate?.(result);
+        }
+        else {
+            saveState({ ...loadState(), lastCheck: Date.now() });
+        }
+    }
+    catch { /* silent fail for background checks */ }
+}
+/** Check if auto-update is enabled */
+export function isAutoUpdateEnabled() {
+    return loadState().autoUpdateEnabled;
+}
+/** Get auto-update state info */
+export function getAutoUpdateState() {
+    return {
+        ...loadState(),
+        currentVersion: getCurrentVersion(),
+        timerActive: autoUpdateTimer !== null,
+    };
 }
 /** Get system info for diagnostics */
 export function getSystemInfo() {

package/dist/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../src/update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../src/update.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "omniwire",
-  "version": "3.0.1",
-  "description": "Infrastructure layer for AI agent swarms — 75+ MCP tools · A2A · VPN · firewall · CDP · cookies · CyberBase · background dispatch",
+  "version": "3.1.1",
+  "description": "Infrastructure layer for AI agent swarms — 81 MCP tools · A2A · OmniMesh VPN · firewall · CDP · cookies · CyberBase · background dispatch",
+  "license": "GPL-3.0-only",
   "type": "module",
   "bin": {
     "omniwire": "./dist/index.js",
@@ -26,6 +27,7 @@
     "pg": "^8.13.0",
     "picomatch": "^4.0.3",
     "ssh2": "^1.16.0",
+    "ws": "^8.18.0",
     "zod": "^4.3.6"
   },
   "devDependencies": {
@@ -34,6 +36,7 @@
     "@types/pg": "^8.11.0",
     "@types/picomatch": "^4.0.2",
     "@types/ssh2": "^1.15.0",
+    "@types/ws": "^8.5.0",
     "typescript": "^5.7.0"
   }
 }