linkgravity 1.3.0 → 1.4.1

package/bin/cli.js

@@ -2,9 +2,16 @@
 
 const { spawn, spawnSync } = require('child_process');
 const path = require('path');
+const fs = require('fs');
+const {
+    PLATFORMS,
+    getSettings,
+    platformState,
+    getSessions,
+    LGY_PM2_NAME,
+    LGY_SCRIPT_PATH,
+} = require('./platforms');
 
-// Find the absolute path to the Python bot script
-const botPath = path.join(__dirname, '..', 'src', 'main.py');
 const { python: pythonExe, isWin } = require('../npm-scripts/venv-paths');
 
 const cmd = process.argv[2];
@@ -31,11 +38,7 @@ function runPm2(args, silent = true) {
     const result = spawnSync('npx', ['-y', 'pm2', ...args], {
         stdio: stdioOpt,
         cwd: path.join(__dirname, '..'),
-        // pm2 pipes the Python process's stdout rather than giving it a
-        // TTY, so Python defaults to block-buffering it - occasional
-        // log lines (like a single WARNING) can sit in that buffer
-        // indefinitely instead of reaching `pm2 logs`/bot.log. This
-        // forces line-by-line flushing regardless of interpreter/OS.
+        // pm2 gives Python a pipe not a TTY, so it block-buffers stdout and can sit on log lines indefinitely - force line buffering.
         env: { ...process.env, PYTHONUNBUFFERED: '1' },
     });
 
@@ -71,11 +74,7 @@ function runPm2(args, silent = true) {
     }
 }
 
-// Matches a leading timestamp in either format our logs actually use:
-//   "2026-07-19 19:11:25 INFO  ..."          (loguru)
-//   "[2026-07-19 14:31:53] [INFO    ] ..."   (aiohttp access log)
-// Only strips the FIRST bracket group if present, so aiohttp's second
-// "[INFO ]" bracket (not a timestamp) is left alone.
+// Matches a leading timestamp from either loguru or aiohttp's access-log format; only strips the first bracket group so aiohttp's second "[INFO ]" bracket is left alone.
 const TIMESTAMP_PREFIX = /^\[?\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}:\d{2}\]?\s*/;
 // loguru's colorize=True puts an ANSI code before the timestamp digits, breaking the '^' anchor above.
 // eslint-disable-next-line no-control-regex
@@ -97,25 +96,22 @@ function colorizeLevel(line) {
     });
 }
 
-function runPm2LogsClean(args, showStamps = false) {
+function runPm2LogsStream(args, printLine) {
     const cp = spawn('npx', ['-y', 'pm2', ...args], { cwd: path.join(__dirname, '..') });
 
-    const printLine = (line) => {
-        if (line.trim().length === 0) return;
-        if (
-            line.includes('In-memory PM2') ||
-            line.includes('pm2 update') ||
-            line.includes('[TAILING]') ||
-            line.includes('.pm2/logs/lgy') ||
-            line.includes('In memory PM2 version') ||
-            line.includes('Local PM2 version') ||
-            line.match(/^>+ /)
-        ) {
-            return;
-        }
-        const clean = line.replace(ANSI_ESCAPE, '');
-        const displayLine = colorizeLevel(showStamps ? clean : clean.replace(TIMESTAMP_PREFIX, ''));
-        console.log(displayLine);
+    const isNoise = (line) =>
+        line.trim().length === 0 ||
+        line.includes('In-memory PM2') ||
+        line.includes('pm2 update') ||
+        line.includes('[TAILING]') ||
+        line.includes('.pm2/logs/lgy') ||
+        line.includes('In memory PM2 version') ||
+        line.includes('Local PM2 version') ||
+        line.match(/^>+ /);
+
+    const handleLine = (line) => {
+        if (isNoise(line)) return;
+        printLine(line);
     };
 
     // A line can arrive split across two 'data' events, so buffer until '\n' is seen.
@@ -125,10 +121,10 @@ function runPm2LogsClean(args, showStamps = false) {
             buffer += data.toString();
             const lines = buffer.split('\n');
             buffer = lines.pop(); // last element: '' if buffer ended in '\n', else the incomplete tail
-            for (const line of lines) printLine(line);
+            for (const line of lines) handleLine(line);
         };
         handler.flush = () => {
-            if (buffer) printLine(buffer);
+            if (buffer) handleLine(buffer);
             buffer = '';
         };
         return handler;
@@ -144,53 +140,99 @@ function runPm2LogsClean(args, showStamps = false) {
     });
 }
 
-function verifyStartup() {
-    process.stdout.write(
-        `${color.cyan}▶${color.reset} Verifying startup status (waiting for bot to come online)...`,
-    );
-
-    let cp = spawn('npx', ['-y', 'pm2', 'logs', 'lgy', '--raw', '--lines', '0'], {
-        cwd: path.join(__dirname, '..'),
+function runPm2LogsClean(args, showStamps = false) {
+    runPm2LogsStream(args, (line) => {
+        const clean = line.replace(ANSI_ESCAPE, '');
+        console.log(colorizeLevel(showStamps ? clean : clean.replace(TIMESTAMP_PREFIX, '')));
     });
+}
 
-    let timer = setTimeout(() => {
-        console.log(
-            `\n\n${color.yellow}⏳ Startup verification timed out. Run 'lgy logs' to check status manually.${color.reset}`,
+function verifyStartup() {
+    return new Promise((resolve) => {
+        process.stdout.write(
+            `${color.cyan}▶${color.reset} Verifying startup status (waiting for bot to come online)...`,
         );
-        cp.kill();
-        process.exit(1);
-    }, 15000);
 
-    const checkLog = (data) => {
-        const str = data.toString();
-        if (str.includes('Bot is fully online and ready!')) {
+        let cp = spawn('npx', ['-y', 'pm2', 'logs', LGY_PM2_NAME, '--raw', '--lines', '20'], {
+            cwd: path.join(__dirname, '..'),
+        });
+
+        let settled = false;
+        const finish = (ok) => {
+            if (settled) return;
+            settled = true;
             clearTimeout(timer);
+            cp.kill();
+            resolve(ok);
+        };
+
+        // Give the --lines 20 replay burst a moment to flush before treating error text as a fresh crash, not old log noise.
+        let errorDetectionArmed = false;
+        setTimeout(() => {
+            errorDetectionArmed = true;
+        }, 1500);
+
+        let timer = setTimeout(() => {
             console.log(
-                `\n${color.green}✔${color.reset} Bot successfully came online and is connected to Discord!\n`,
+                `\n\n${color.yellow}⏳ Startup verification timed out. Run 'lgy logs' to check status manually.${color.reset}`,
             );
-            cp.kill();
-            process.exit(0);
-        } else if (
-            str.includes('Traceback (most recent call last):') ||
-            str.includes('Error:') ||
-            str.includes('Exception:')
-        ) {
-            clearTimeout(timer);
-            console.log(`\n\n${color.yellow}❌ Error detected during startup:${color.reset}`);
-            const errorLines = str
-                .split('\n')
-                .filter(
-                    (l) =>
-                        !l.includes('In-memory') && !l.includes('[TAILING]') && l.trim().length > 0,
-                );
-            console.log(errorLines.join('\n'));
-            cp.kill();
-            process.exit(1);
-        }
-    };
+            finish(false);
+        }, 30000);
+
+        const checkLog = (data) => {
+            if (settled) return;
+            const str = data.toString();
+            if (str.includes('Bot is fully online and ready!')) {
+                console.log(`\n${color.green}✔${color.reset} Bot successfully came online!\n`);
+                finish(true);
+            } else if (
+                errorDetectionArmed &&
+                (str.includes('Traceback (most recent call last):') ||
+                    str.includes('Error:') ||
+                    str.includes('Exception:'))
+            ) {
+                console.log(`\n\n${color.yellow}❌ Error detected during startup:${color.reset}`);
+                const errorLines = str
+                    .split('\n')
+                    .filter(
+                        (l) =>
+                            !l.includes('In-memory') &&
+                            !l.includes('[TAILING]') &&
+                            l.trim().length > 0,
+                    );
+                console.log(errorLines.join('\n'));
+                finish(false);
+            }
+        };
+
+        cp.stdout.on('data', checkLog);
+        cp.stderr.on('data', checkLog);
+    });
+}
+
+function formatUptime(pmUptimeMs) {
+    const seconds = Math.floor((Date.now() - pmUptimeMs) / 1000);
+    if (seconds < 60) return `${seconds}s`;
+    const minutes = Math.floor(seconds / 60);
+    if (minutes < 60) return `${minutes}m`;
+    const hours = Math.floor(minutes / 60);
+    if (hours < 24) return `${hours}h ${minutes % 60}m`;
+    const days = Math.floor(hours / 24);
+    return `${days}d ${hours % 24}h`;
+}
 
-    cp.stdout.on('data', checkLog);
-    cp.stderr.on('data', checkLog);
+function renderTable(headers, rows) {
+    const widths = headers.map((h, i) =>
+        Math.max(h.length, ...rows.map((r) => String(r[i]).length)),
+    );
+    const pad = (s, w) => ` ${String(s).padEnd(w)} `;
+    const sepLine = (l, m, r) => l + widths.map((w) => '─'.repeat(w + 2)).join(m) + r;
+    const rowLine = (cells) => '│' + cells.map((c, i) => pad(c, widths[i])).join('│') + '│';
+
+    const lines = [sepLine('┌', '┬', '┐'), rowLine(headers), sepLine('├', '┼', '┤')];
+    for (const row of rows) lines.push(rowLine(row));
+    lines.push(sepLine('└', '┴', '┘'));
+    return lines.join('\n');
 }
 
 if (cmd === 'version' || cmd === '-v' || cmd === '--version') {
@@ -198,16 +240,16 @@ if (cmd === 'version' || cmd === '-v' || cmd === '--version') {
     console.log(`linkgravity v${pkg.version}`);
 } else if (cmd === 'start') {
     info('Starting LinkGravity daemon...');
-    runPm2(['start', botPath, '--interpreter', pythonExe, '--name', 'lgy']);
-    verifyStartup();
+    runPm2(['start', LGY_SCRIPT_PATH, '--interpreter', pythonExe, '--name', LGY_PM2_NAME]);
+    verifyStartup().then((ok) => process.exit(ok ? 0 : 1));
 } else if (cmd === 'stop') {
     info('Stopping LinkGravity daemon...');
-    runPm2(['stop', 'lgy']);
+    runPm2(['stop', LGY_PM2_NAME]);
     success('Daemon stopped successfully.\n');
 } else if (cmd === 'restart') {
     info('Restarting LinkGravity daemon...');
-    runPm2(['restart', 'lgy', '--update-env']);
-    verifyStartup();
+    runPm2(['restart', LGY_PM2_NAME, '--update-env']);
+    verifyStartup().then((ok) => process.exit(ok ? 0 : 1));
 } else if (cmd === 'logs') {
     const SHORT_FLAGS = ['-f', '-n', '-t'];
     let args = process.argv.slice(3).flatMap((arg) => {
@@ -217,7 +259,7 @@ if (cmd === 'version' || cmd === '-v' || cmd === '--version') {
         if (!chars.every((c) => SHORT_FLAGS.includes(`-${c}`))) return [arg];
         return chars.map((c) => `-${c}`);
     });
-    let pm2Args = ['logs', 'lgy'];
+    let pm2Args = ['logs', LGY_PM2_NAME];
     let isFollow = false;
     let showStamps = false;
 
@@ -244,6 +286,38 @@ if (cmd === 'version' || cmd === '-v' || cmd === '--version') {
     }
     pm2Args.push('--raw');
     runPm2LogsClean(pm2Args, showStamps);
+} else if (cmd === 'status') {
+    const settings = getSettings();
+    const sessions = getSessions();
+
+    let pm2Procs = [];
+    const jlist = spawnSync('npx', ['-y', 'pm2', 'jlist'], { stdio: 'pipe' });
+    if (jlist.status === 0) {
+        try {
+            pm2Procs = JSON.parse(jlist.stdout.toString());
+        } catch (e) {}
+    }
+
+    const proc = pm2Procs.find((p) => p.name === LGY_PM2_NAME);
+    if (!proc) {
+        console.log(`\n${color.cyan}▶${color.reset} daemon: not running\n`);
+    } else {
+        const mem = proc.monit ? `${Math.round(proc.monit.memory / 1024 / 1024)}mb` : '?';
+        const cpu = proc.monit ? `${proc.monit.cpu}%` : '?';
+        const uptime =
+            proc.pm2_env.status === 'online' ? formatUptime(proc.pm2_env.pm_uptime) : '-';
+        console.log(
+            `\n${color.cyan}▶${color.reset} daemon: ${proc.pm2_env.status} (uptime: ${uptime}, restarts: ${proc.pm2_env.restart_time}, cpu: ${cpu}, mem: ${mem})\n`,
+        );
+    }
+
+    const rows = Object.entries(PLATFORMS).map(([key, def]) => {
+        const { enabled } = platformState(key, settings);
+        const sessionCount = Object.values(sessions).filter((s) => s.platform === key).length;
+        return [def.label, enabled ? 'yes' : 'no', String(sessionCount)];
+    });
+    console.log(renderTable(['platform', 'enabled', 'sessions'], rows));
+    console.log();
 } else if (cmd === 'enable') {
     if (isWin) {
         console.log(
@@ -304,19 +378,19 @@ if (cmd === 'version' || cmd === '-v' || cmd === '--version') {
     success(`Installed v${latestVersion}.`);
 
     info('Restarting daemon to apply the update...');
-    const restartResult = spawnSync('npx', ['-y', 'pm2', 'restart', 'lgy', '--update-env'], {
+    const restartResult = spawnSync('npx', ['-y', 'pm2', 'restart', LGY_PM2_NAME, '--update-env'], {
         stdio: 'pipe',
         cwd: path.join(__dirname, '..'),
         env: { ...process.env, PYTHONUNBUFFERED: '1' },
     });
 
     if (restartResult.status === 0) {
-        verifyStartup();
+        verifyStartup().then((ok) => process.exit(ok ? 0 : 1));
     } else if ((restartResult.stderr || '').toString().includes('not found')) {
         // Wasn't running before the update - start fresh instead of a false "restarted".
         info("Daemon wasn't running - starting it fresh...");
-        runPm2(['start', botPath, '--interpreter', pythonExe, '--name', 'lgy']);
-        verifyStartup();
+        runPm2(['start', LGY_SCRIPT_PATH, '--interpreter', pythonExe, '--name', LGY_PM2_NAME]);
+        verifyStartup().then((ok) => process.exit(ok ? 0 : 1));
     } else {
         console.error((restartResult.stderr || '').toString().trim());
         console.error(
@@ -338,6 +412,7 @@ if (cmd === 'version' || cmd === '-v' || cmd === '--version') {
             '  stop       Stop the background bot',
             '  restart    Restart the background bot',
             '  logs       View bot logs (Options: --tail, -n, -f, -t/--timestamp)',
+            '  status     Show daemon status and per-platform enabled/session counts',
             '  enable     Register bot to start automatically on system boot',
             '  disable    Remove bot from system boot',
             '  setup      Run the configuration wizard (init)',
@@ -359,6 +434,11 @@ if (cmd === 'version' || cmd === '-v' || cmd === '--version') {
                 { label: 'Stop', value: 'stop', hint: 'Stop the running daemon' },
                 { label: 'Restart', value: 'restart', hint: 'Restart the running daemon' },
                 { label: 'Logs', value: 'logs', hint: 'View the live console logs' },
+                {
+                    label: 'Status',
+                    value: 'status',
+                    hint: 'Show daemon status and per-platform sessions',
+                },
                 { label: 'Setup', value: 'setup', hint: 'Configure bot tokens and settings' },
                 {
                     label: 'Update',

package/bin/platforms.js

@@ -0,0 +1,63 @@
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+const workspaceDir = path.join(os.homedir(), '.gemini', 'linkgravity');
+const settingsPath = path.join(workspaceDir, 'lgy.json');
+const sessionsPath = path.join(workspaceDir, 'data', 'sessions.json');
+
+if (!fs.existsSync(workspaceDir)) fs.mkdirSync(workspaceDir, { recursive: true });
+
+function getSettings() {
+    if (fs.existsSync(settingsPath)) {
+        try {
+            return JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
+        } catch (e) {}
+    }
+    return {};
+}
+
+function updateSettings(updates) {
+    const settings = getSettings();
+    for (const [key, value] of Object.entries(updates)) {
+        settings[key] = value;
+    }
+    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 4));
+}
+
+function getSessions() {
+    if (fs.existsSync(sessionsPath)) {
+        try {
+            return JSON.parse(fs.readFileSync(sessionsPath, 'utf8'));
+        } catch (e) {}
+    }
+    return {};
+}
+
+// Both platforms now run in one shared pm2 process - main.py checks discord_enabled/telegram_enabled at startup.
+const LGY_PM2_NAME = 'lgy';
+const LGY_SCRIPT_PATH = path.join(__dirname, '..', 'src', 'main.py');
+
+const PLATFORMS = {
+    discord: { label: 'Discord' },
+    telegram: { label: 'Telegram' },
+};
+
+function platformState(key, settings) {
+    const configured = !!settings[`${key}_token`];
+    const enabled = settings[`${key}_enabled`] ?? (key === 'discord' && configured);
+    return { configured, enabled };
+}
+
+module.exports = {
+    workspaceDir,
+    settingsPath,
+    sessionsPath,
+    getSettings,
+    updateSettings,
+    getSessions,
+    LGY_PM2_NAME,
+    LGY_SCRIPT_PATH,
+    PLATFORMS,
+    platformState,
+};