@dp-pcs/ogp 0.7.2 → 0.8.2

package/dist/cli/tunnel.js

@@ -0,0 +1,413 @@
+import { spawn, execFile, execFileSync } from 'node:child_process';
+import { promisify } from 'node:util';
+import { Command } from 'commander';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { loadConfig, requireConfig, getConfigDir } from '../shared/config.js';
+const execFileAsync = promisify(execFile);
+/**
+ * Parse the JSON array emitted by `cloudflared tunnel list --output json`.
+ * Filters out deleted tunnels and classifies live = has active connections.
+ * Returns [] on any parse failure (caller surfaces the raw error separately).
+ */
+export function parseCloudflaredTunnels(jsonText) {
+    let arr;
+    try {
+        arr = JSON.parse(jsonText);
+    }
+    catch {
+        return [];
+    }
+    if (!Array.isArray(arr))
+        return [];
+    return arr
+        .filter((t) => !t?.deleted_at || String(t.deleted_at).startsWith('0001-01-01'))
+        .map((t) => {
+        const conns = Array.isArray(t.connections) ? t.connections : [];
+        const colos = Array.from(new Set(conns.map((c) => c?.colo_name).filter(Boolean)));
+        return {
+            tool: 'cloudflared',
+            name: typeof t.name === 'string' ? t.name : undefined,
+            id: typeof t.id === 'string' ? t.id : undefined,
+            live: conns.length > 0,
+            detail: colos.length ? `via ${colos.join(', ')}` : undefined,
+            source: 'cloudflared tunnel list'
+        };
+    });
+}
+/**
+ * Parse the JSON from the ngrok local agent API (http://127.0.0.1:4040/api/tunnels).
+ * ngrok historically returns one entry per proto (http + https) for the same
+ * forward; we dedupe by public-URL host, preferring https. Returns [] on failure.
+ */
+export function parseNgrokAgentTunnels(jsonText) {
+    let obj;
+    try {
+        obj = JSON.parse(jsonText);
+    }
+    catch {
+        return [];
+    }
+    const tunnels = Array.isArray(obj?.tunnels) ? obj.tunnels : [];
+    const byHost = new Map();
+    for (const t of tunnels) {
+        const publicUrl = typeof t?.public_url === 'string' ? t.public_url : undefined;
+        if (!publicUrl)
+            continue;
+        let host;
+        try {
+            host = new URL(publicUrl).host;
+        }
+        catch {
+            continue;
+        }
+        const isHttps = publicUrl.startsWith('https://');
+        const existing = byHost.get(host);
+        if (existing && !isHttps)
+            continue; // keep https over http for same host
+        byHost.set(host, {
+            tool: 'ngrok',
+            name: typeof t.name === 'string' ? t.name : undefined,
+            publicUrl,
+            target: typeof t?.config?.addr === 'string' ? t.config.addr : undefined,
+            live: true,
+            detail: typeof t?.proto === 'string' ? t.proto : undefined,
+            source: 'ngrok agent (:4040)'
+        });
+    }
+    return Array.from(byHost.values());
+}
+/**
+ * Best-effort extraction of ingress hostnames from a cloudflared config.yml.
+ * Used to resolve a public hostname for named tunnels during reconcile.
+ */
+export function parseCloudflaredIngressHosts(yamlText) {
+    const hosts = [];
+    for (const line of yamlText.split('\n')) {
+        const m = line.match(/^\s*-?\s*hostname:\s*["']?([^"'#\s/]+)/);
+        if (m)
+            hosts.push(m[1]);
+    }
+    return hosts;
+}
+/**
+ * Compare resolvable live public hosts against config gatewayUrl.
+ * `liveHosts` is the precomputed set of hosts (ngrok public_url hosts + cloudflared
+ * ingress hosts when a cloudflared tunnel is live). Pure; returns null when there is
+ * nothing meaningful to report.
+ */
+export function reconcileGatewayUrl(liveHosts, gatewayUrl) {
+    if (!gatewayUrl)
+        return null;
+    let gwHost;
+    try {
+        gwHost = new URL(gatewayUrl).host;
+    }
+    catch {
+        return null;
+    }
+    if (liveHosts.length === 0) {
+        return {
+            verdict: 'none',
+            message: `⚠ gatewayUrl ${gwHost} is set but no live tunnel with a resolvable public URL serves it`
+        };
+    }
+    if (liveHosts.includes(gwHost)) {
+        return { verdict: 'match', message: `✓ gatewayUrl ${gwHost} is served by a live tunnel` };
+    }
+    return {
+        verdict: 'mismatch',
+        message: `✗ gatewayUrl ${gwHost} does not match any live tunnel (live: ${liveHosts.join(', ')})`
+    };
+}
+const PANE_LABEL = {
+    cloudflared: 'cloudflared — named tunnels registered to your Cloudflare account',
+    ngrok: 'ngrok — tunnels running on this machine'
+};
+/**
+ * Format tunnel panes for the terminal. Pure: takes resolved data, returns a string.
+ */
+export function renderTunnels(panes, reconcile) {
+    const lines = [];
+    for (const pane of panes) {
+        lines.push('');
+        lines.push(`▸ ${PANE_LABEL[pane.tool]}`);
+        if (pane.error) {
+            lines.push(`  ⚠ ${pane.error}`);
+            if (pane.note)
+                lines.push(`    ${pane.note}`);
+            continue;
+        }
+        if (pane.infos.length === 0) {
+            lines.push(`  (no ${pane.tool} tunnels found)`);
+            if (pane.note)
+                lines.push(`    ${pane.note}`);
+            continue;
+        }
+        for (const t of pane.infos) {
+            const status = t.live ? 'LIVE' : 'idle';
+            const label = t.name ?? t.publicUrl ?? t.id ?? '(unnamed)';
+            const bits = [
+                `  [${status}] ${label}`,
+                t.publicUrl && t.publicUrl !== label ? `→ ${t.publicUrl}` : '',
+                t.target ? `(${t.target})` : '',
+                t.id && t.id !== label ? `id=${t.id.slice(0, 8)}` : '',
+                t.detail ? t.detail : ''
+            ].filter(Boolean);
+            lines.push(bits.join(' '));
+        }
+        if (pane.note)
+            lines.push(`    ${pane.note}`);
+    }
+    if (reconcile) {
+        lines.push('');
+        lines.push(reconcile.message);
+    }
+    return lines.join('\n');
+}
+/** Check if a command exists in PATH (mirrors framework-detection.ts). */
+function commandExists(command) {
+    try {
+        const which = process.platform === 'win32' ? 'where' : 'which';
+        execFileSync(which, [command], { stdio: 'ignore' });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export async function listCloudflaredTunnels() {
+    if (!commandExists('cloudflared')) {
+        return { tool: 'cloudflared', infos: [], error: 'cloudflared not installed — `brew install cloudflared`' };
+    }
+    try {
+        const { stdout } = await execFileAsync('cloudflared', ['tunnel', 'list', '--output', 'json'], {
+            timeout: 15000
+        });
+        return { tool: 'cloudflared', infos: parseCloudflaredTunnels(stdout) };
+    }
+    catch (err) {
+        const stderr = (err?.stderr || err?.message || '').toString().trim();
+        const note = /login|cert|origincert|not.*authenticat/i.test(stderr)
+            ? 'Run `cloudflared tunnel login` to authenticate.'
+            : undefined;
+        return {
+            tool: 'cloudflared',
+            infos: [],
+            error: `cloudflared tunnel list failed: ${stderr.split('\n')[0] || 'unknown error'}`,
+            note
+        };
+    }
+}
+async function fetchNgrokAgent() {
+    // Probe the default agent port and the next two (multiple agents bump the port).
+    for (const port of [4040, 4041, 4042]) {
+        try {
+            const res = await fetch(`http://127.0.0.1:${port}/api/tunnels`, {
+                signal: AbortSignal.timeout(2000)
+            });
+            if (!res.ok)
+                continue;
+            const infos = parseNgrokAgentTunnels(await res.text());
+            if (infos.length > 0)
+                return infos;
+        }
+        catch {
+            // try next port
+        }
+    }
+    return null;
+}
+export async function listNgrokTunnels() {
+    if (!commandExists('ngrok')) {
+        return { tool: 'ngrok', infos: [], error: 'ngrok not installed — `brew install ngrok`' };
+    }
+    const agent = await fetchNgrokAgent();
+    if (agent && agent.length > 0) {
+        return { tool: 'ngrok', infos: agent };
+    }
+    return { tool: 'ngrok', infos: [], note: 'No local ngrok agent running on :4040.' };
+}
+export async function tunnelList(tool) {
+    const panes = [];
+    if (!tool || tool === 'cloudflared')
+        panes.push(await listCloudflaredTunnels());
+    if (!tool || tool === 'ngrok')
+        panes.push(await listNgrokTunnels());
+    // Build the set of resolvable live public hosts for reconcile.
+    const liveHosts = [];
+    for (const pane of panes) {
+        for (const info of pane.infos) {
+            if (info.live && info.publicUrl) {
+                try {
+                    liveHosts.push(new URL(info.publicUrl).host);
+                }
+                catch {
+                    /* skip */
+                }
+            }
+        }
+    }
+    // cloudflared named tunnels: if any is live, treat config.yml ingress hosts as live.
+    const cfPane = panes.find((p) => p.tool === 'cloudflared');
+    if (cfPane && cfPane.infos.some((i) => i.live)) {
+        const cfgPath = path.join(os.homedir(), '.cloudflared', 'config.yml');
+        if (fs.existsSync(cfgPath)) {
+            liveHosts.push(...parseCloudflaredIngressHosts(fs.readFileSync(cfgPath, 'utf-8')));
+        }
+    }
+    const config = loadConfig();
+    const reconcile = config ? reconcileGatewayUrl(liveHosts, config.gatewayUrl) : null;
+    console.log(renderTunnels(panes, reconcile));
+}
+function getTunnelPidFile() {
+    return path.join(getConfigDir(), 'tunnel.pid');
+}
+function getTunnelLogFile() {
+    return path.join(getConfigDir(), 'tunnel.log');
+}
+/** True if the ogp-managed tunnel PID file points at a live process. */
+function isManagedTunnelAlive() {
+    const pidFile = getTunnelPidFile();
+    if (!fs.existsSync(pidFile))
+        return false;
+    const pid = parseInt(fs.readFileSync(pidFile, 'utf-8').trim(), 10);
+    if (Number.isNaN(pid))
+        return false;
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function spawnTunnel(tool, port, background) {
+    const args = tool === 'cloudflared'
+        ? ['tunnel', '--url', `http://localhost:${port}`]
+        : ['http', port.toString()];
+    if (background) {
+        const logStream = fs.openSync(getTunnelLogFile(), 'a');
+        const proc = spawn(tool, args, { detached: true, stdio: ['ignore', logStream, logStream] });
+        proc.unref();
+        fs.closeSync(logStream);
+        fs.writeFileSync(getTunnelPidFile(), proc.pid.toString(), 'utf-8');
+        console.log(`${tool} tunnel started (PID: ${proc.pid})`);
+        console.log(`Logs: ${getTunnelLogFile()}`);
+        console.log('Run "ogp tunnel stop" to stop the tunnel');
+    }
+    else {
+        const proc = spawn(tool, args, { stdio: 'inherit' });
+        proc.on('error', (error) => {
+            console.error(`Failed to start ${tool}:`, error);
+            console.log(`Make sure ${tool} is installed and in your PATH`);
+        });
+        proc.on('close', (code) => console.log(`${tool} exited with code ${code}`));
+    }
+}
+/**
+ * Start a quick tunnel for the given tool. Idempotent: if an ogp-managed tunnel is
+ * already alive (or, for ngrok, a local agent is already serving), prints current
+ * status instead of starting a duplicate. Note: the duplicate-guard relies on the
+ * background PID file (and the ngrok :4040 agent), so a foreground cloudflared quick
+ * tunnel started twice cannot be detected — cloudflared exposes no local agent to query.
+ */
+export async function tunnelStart(tool, background = false) {
+    const config = requireConfig();
+    if (!commandExists(tool)) {
+        console.error(`${tool} not installed — \`brew install ${tool}\``);
+        process.exitCode = 1;
+        return;
+    }
+    if (isManagedTunnelAlive()) {
+        console.log('An ogp-managed tunnel is already running. Current tunnels:');
+        await tunnelList(tool);
+        return;
+    }
+    if (tool === 'ngrok') {
+        const agent = await fetchNgrokAgent();
+        if (agent && agent.length > 0) {
+            console.log('A local ngrok agent is already running. Current tunnels:');
+            await tunnelList('ngrok');
+            return;
+        }
+    }
+    console.log(`Exposing OGP daemon on port ${config.daemonPort} via ${tool}...`);
+    spawnTunnel(tool, config.daemonPort, background);
+}
+/** Stop the ogp-managed tunnel (PID file). Does not affect externally-started tunnels. */
+export function tunnelStop() {
+    const pidFile = getTunnelPidFile();
+    if (!fs.existsSync(pidFile)) {
+        console.log('No ogp-managed tunnel is running.');
+        console.log('(Tunnels started outside ogp are not tracked here — stop them with their own CLI.)');
+        return;
+    }
+    try {
+        const pid = parseInt(fs.readFileSync(pidFile, 'utf-8').trim(), 10);
+        if (Number.isNaN(pid)) {
+            console.error('Invalid PID in tunnel.pid file');
+            fs.unlinkSync(pidFile);
+            return;
+        }
+        try {
+            process.kill(pid, 0);
+        }
+        catch {
+            console.log('Tunnel is not running (stale PID file)');
+            fs.unlinkSync(pidFile);
+            return;
+        }
+        process.kill(pid, 'SIGTERM');
+        fs.unlinkSync(pidFile);
+        console.log('Tunnel stopped');
+    }
+    catch (error) {
+        if (error?.code === 'ESRCH') {
+            console.log('Tunnel already stopped (process exited between checks)');
+            try {
+                fs.unlinkSync(pidFile);
+            }
+            catch { /* already gone */ }
+        }
+        else {
+            console.error('Failed to stop tunnel:', error);
+        }
+    }
+}
+export const tunnelCommand = new Command('tunnel')
+    .description('Inspect and manage cloudflared / ngrok tunnels');
+tunnelCommand
+    .command('list')
+    .alias('show')
+    .description('List running tunnels (cloudflared, ngrok, or both)')
+    .argument('[tool]', 'Limit to one tool: cloudflared | ngrok')
+    .action(async (tool) => {
+    if (tool && tool !== 'cloudflared' && tool !== 'ngrok') {
+        console.error(`Unknown tool '${tool}'. Use 'cloudflared' or 'ngrok'.`);
+        process.exitCode = 1;
+        return;
+    }
+    await tunnelList(tool);
+});
+tunnelCommand
+    .command('start')
+    .description('Start a quick tunnel (idempotent — no-op if one is already running)')
+    .argument('<tool>', 'cloudflared | ngrok')
+    .option('-b, --background', 'Run in background')
+    .action(async (tool, options) => {
+    if (tool !== 'cloudflared' && tool !== 'ngrok') {
+        console.error(`Unknown tool '${tool}'. Use 'cloudflared' or 'ngrok'.`);
+        process.exitCode = 1;
+        return;
+    }
+    await tunnelStart(tool, options.background ?? false);
+});
+tunnelCommand
+    .command('stop')
+    .description('Stop the ogp-managed tunnel')
+    .action(() => {
+    tunnelStop();
+});
+//# sourceMappingURL=tunnel.js.map

package/dist/cli/tunnel.js.map

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

package/dist/cli.js

@@ -10,6 +10,7 @@ import { requireConfig, loadConfig } from './shared/config.js';
 import { loadMetaConfig } from './shared/meta-config.js';
 import { federationList, federationStatus, federationRequest, federationApprove, federationReject, federationRemove, federationSend, federationShowScopes, federationUpdateGrants, federationSendAgentComms, federationConnect, federationInvite, federationAccept, federationSetAlias, federationTagPeer, federationUntagPeer, federationUpdateIdentity } from './cli/federation.js';
 import { expose, stopExpose } from './cli/expose.js';
+import { tunnelCommand } from './cli/tunnel.js';
 import { installLaunchAgent, uninstallLaunchAgent } from './cli/install.js';
 import { installCompletion } from './cli/completion.js';
 import { showPolicies, configurePolicies, addTopic, removeTopic, resetPolicy, showActivity, clearActivity, setDefault, setLogging, setTopic, setPeerDefault } from './cli/agent-comms.js';
@@ -411,7 +412,14 @@ program
     console.log(`  Check interval: ${heartbeatConfig.intervalMs / 1000}s`);
     console.log(`  Check timeout: ${heartbeatConfig.timeoutMs / 1000}s`);
     console.log(`  Max consecutive failures: ${heartbeatConfig.maxConsecutiveFailures}`);
-    console.log(`  Heartbeat status: ${heartbeatConfig.isRunning ? 'Running' : 'Stopped'}`);
+    // The heartbeat loop runs inside the long-lived daemon process and is started
+    // unconditionally at daemon boot (see startHeartbeat()). This `ogp status` command
+    // runs in a *separate*, short-lived CLI process where the heartbeat timer is always
+    // null, so heartbeatConfig.isRunning here reflects the CLI process, not the daemon —
+    // it would always read 'Stopped' even while the daemon's heartbeat is actively
+    // checking peers (bd-d1l). The authoritative cross-process signal is whether the
+    // daemon itself is running.
+    console.log(`  Heartbeat status: ${status.running ? 'Running' : 'Stopped'}`);
 });
 /**
  * Pad string to the right with spaces
@@ -655,17 +663,18 @@ federation
         toAgent: options.toAgent
     });
 });
+program.addCommand(tunnelCommand);
 program
-    .command('expose')
-    .description('Expose daemon via tunnel (cloudflared or ngrok)')
+    .command('expose', { hidden: true })
+    .description('[deprecated] Use "ogp tunnel start"')
     .option('-m, --method <method>', 'Tunnel method (cloudflared|ngrok)', 'cloudflared')
     .option('-b, --background', 'Run in background')
     .action(async (options) => {
     await expose(options.method, options.background);
 });
 program
-    .command('expose-stop')
-    .description('Stop background tunnel')
+    .command('expose-stop', { hidden: true })
+    .description('[deprecated] Use "ogp tunnel stop"')
     .action(() => {
     stopExpose();
 });
@@ -896,11 +905,13 @@ project
     .option('--author <id>', 'Filter by author')
     .option('--search <text>', 'Search by text content')
     .option('--limit <n>', 'Maximum results to return', '20')
+    .option('--json', 'Output machine-readable JSON (includes contribution ids + ISO timestamps)')
     .action(async (projectId, options) => {
     const queryOptions = {
         ...options,
         entryType: options.type || options.topic, // --type takes precedence; --topic remains a legacy alias
-        limit: parseInt(options.limit, 10)
+        limit: parseInt(options.limit, 10),
+        json: options.json ?? false
     };
     await projectQuery(projectId, queryOptions);
 });
@@ -943,13 +954,15 @@ project
     .option('--topic <name>', 'Filter by entry type (alias for --type)')
     .option('--author <id>', 'Filter by author')
     .option('--limit <n>', 'Maximum results to return', '20')
-    .option('--timeout <ms>', 'Response timeout in milliseconds', '10000')
+    .option('--timeout <ms>', 'Response timeout in milliseconds', '30000')
+    .option('--json', 'Output machine-readable JSON (includes contribution ids + ISO timestamps)')
     .action(async (peerId, projectId, options) => {
     const queryOptions = {
         ...options,
         entryType: options.type || options.topic, // --type takes precedence; --topic remains a legacy alias
         limit: parseInt(options.limit, 10),
-        timeout: parseInt(options.timeout, 10)
+        timeout: parseInt(options.timeout, 10),
+        json: options.json ?? false
     };
     await projectQueryPeer(peerId, projectId, queryOptions);
 });