fix(swarmtop): expose and render full peer identity/details from proc surfaces

2026-04-26 08:02:37 -04:00
parent 8c3d5f8795
commit 194fbd2c67
69 changed files with 13463 additions and 32 deletions
@@ -0,0 +1,384 @@
+/* BARE_OS_BIN_API 1.0.0 — bump when staged /bin script semantics change (see developer guide). */
+/** Shared helpers for drive-resident /bin scripts (prepended before each command). */
+function bareStdin(ctx) {
+  return typeof ctx.shellStdin === 'string' ? ctx.shellStdin : ''
+}
+
+/** @param {number} mode @param {'file' | 'directory' | 'symlink'} type */
+function bareFormatModeString(mode, type) {
+  const typeChar = type === 'directory' ? 'd' : type === 'symlink' ? 'l' : '-'
+  const perm = mode & 0o777
+  const r = (bit) => (perm & bit ? 'r' : '-')
+  const w = (bit) => (perm & bit ? 'w' : '-')
+  const x = (bit) => (perm & bit ? 'x' : '-')
+  return (
+    typeChar +
+    r(0o400) +
+    w(0o200) +
+    x(0o100) +
+    r(0o040) +
+    w(0o020) +
+    x(0o010) +
+    r(0o004) +
+    w(0o002) +
+    x(0o001)
+  )
+}
+
+/** @param {number} mtimeMs @param {number} [nowMs] */
+function bareFormatLsMtime(mtimeMs, nowMs) {
+  const now = nowMs != null ? nowMs : Date.now()
+  const d = new Date(mtimeMs)
+  const months = [
+    'Jan',
+    'Feb',
+    'Mar',
+    'Apr',
+    'May',
+    'Jun',
+    'Jul',
+    'Aug',
+    'Sep',
+    'Oct',
+    'Nov',
+    'Dec'
+  ]
+  const mon = months[d.getMonth()]
+  const day = String(d.getDate()).padStart(2, ' ')
+  const sixMo = 180 * 24 * 3600 * 1000
+  if (Math.abs(now - mtimeMs) > sixMo) {
+    const yr = String(d.getFullYear()).padStart(4, ' ')
+    return mon + ' ' + day + '  ' + yr
+  }
+  const hh = String(d.getHours()).padStart(2, '0')
+  const mm = String(d.getMinutes()).padStart(2, '0')
+  return mon + ' ' + day + ' ' + hh + ':' + mm
+}
+
+/** @param {number} size */
+function barePosixBlocks(size) {
+  return Math.ceil(Number(size) / 512) || 0
+}
+
+/**
+ * Raw stdout for NUL/binary when **`process.stdout.write`** is missing.
+ * If **`ctx.bareOsBinWrite(Uint8Array|string)`** is set (tests / host), use it.
+ * @param {Record<string, unknown>} ctx
+ * @param {string | Uint8Array} chunk
+ * @returns {boolean}
+ */
+function bareOsEmitRaw(ctx, chunk) {
+  if (typeof ctx.bareOsBinWrite === 'function') {
+    const b4 = ctx.b4a
+    const u8 =
+      typeof chunk === 'string'
+        ? b4 && typeof b4.from === 'function'
+          ? b4.from(chunk)
+          : new TextEncoder().encode(chunk)
+        : chunk
+    ctx.bareOsBinWrite(u8 instanceof Uint8Array ? u8 : new Uint8Array(u8))
+    return true
+  }
+  const w = globalThis.process?.stdout?.write
+  if (typeof w === 'function') {
+    w.call(globalThis.process.stdout, chunk)
+    return true
+  }
+  return false
+}
+
+const BARE_P2P_SUITE_PREFIX = '[bare-p2p-v1]'
+const BARE_P2P_SUITE_MAX_HISTORY = 2000
+
+function bareP2pNowMs() {
+  return Date.now()
+}
+
+function bareP2pId(prefix) {
+  const rnd = Math.floor(Math.random() * 0x7fffffff)
+  return prefix + '-' + bareP2pNowMs().toString(36) + '-' + rnd.toString(36)
+}
+
+function bareP2pHome(ctx) {
+  const env = ctx.env && typeof ctx.env === 'object' ? ctx.env : {}
+  const home = typeof env.HOME === 'string' && env.HOME ? env.HOME : '/home/guest'
+  return home
+}
+
+function bareP2pJoinPath(a, b) {
+  if (!a.endsWith('/')) return a + '/' + b
+  return a + b
+}
+
+function bareP2pDataDir(ctx) {
+  return bareP2pJoinPath(bareP2pHome(ctx), '.bare/p2p-suite')
+}
+
+function bareP2pDataFile(ctx, app) {
+  return bareP2pJoinPath(bareP2pDataDir(ctx), app + '.json')
+}
+
+async function bareP2pReadJson(ctx, path) {
+  try {
+    if (!ctx.vfs || typeof ctx.vfs.readFile !== 'function') return null
+    const b = await ctx.vfs.readFile(path)
+    if (!b) return null
+    const t = ctx.b4a.toString(b).trim()
+    if (!t) return null
+    return JSON.parse(t)
+  } catch {
+    return null
+  }
+}
+
+async function bareP2pWriteJson(ctx, path, obj) {
+  if (!ctx.vfs || typeof ctx.vfs.writeFile !== 'function') return false
+  const body = JSON.stringify(obj, null, 2) + '\n'
+  const b4 = ctx.b4a
+  const buf =
+    b4 && typeof b4.from === 'function'
+      ? b4.from(body)
+      : new TextEncoder().encode(body)
+  try {
+    await ctx.vfs.writeFile(path, buf)
+    return true
+  } catch {
+    return false
+  }
+}
+
+function bareP2pDecodeEnvelope(line) {
+  const s = String(line || '')
+  if (!s.startsWith(BARE_P2P_SUITE_PREFIX)) return null
+  const payload = s.slice(BARE_P2P_SUITE_PREFIX.length).trim()
+  if (!payload) return null
+  try {
+    const obj = JSON.parse(payload)
+    if (!obj || typeof obj !== 'object') return null
+    return obj
+  } catch {
+    return null
+  }
+}
+
+function bareP2pEncodeEnvelope(app, kind, payload) {
+  return (
+    BARE_P2P_SUITE_PREFIX +
+    ' ' +
+    JSON.stringify({
+      schema: 1,
+      suite: 'bare-p2p',
+      version: '1',
+      app,
+      kind,
+      tsMs: bareP2pNowMs(),
+      payload: payload || {}
+    })
+  )
+}
+
+function bareP2pSend(ctx, app, kind, payload) {
+  if (app === 'meshdrop' && typeof ctx.bareOsMeshdropSend === 'function') {
+    return ctx.bareOsMeshdropSend({
+      app,
+      kind,
+      payload: payload || {},
+      tsMs: bareP2pNowMs()
+    })
+  }
+  if (typeof ctx.bareOsChatSend !== 'function') {
+    return { ok: false, reason: 'bareOsChatSend unavailable' }
+  }
+  return ctx.bareOsChatSend(bareP2pEncodeEnvelope(app, kind, payload))
+}
+
+function bareP2pCollectFromHistory(ctx, app, limit) {
+  if (app === 'meshdrop' && typeof ctx.bareOsMeshdropHistory === 'function') {
+    let hist = []
+    try {
+      hist = ctx.bareOsMeshdropHistory(
+        Math.max(1, Math.min(BARE_P2P_SUITE_MAX_HISTORY, limit || 512))
+      )
+    } catch {
+      hist = []
+    }
+    if (!Array.isArray(hist)) return []
+    const out = []
+    for (const ev of hist) {
+      if (!ev || typeof ev !== 'object') continue
+      if (ev.app !== app) continue
+      out.push({
+        fromPeerKey: typeof ev.fromPeerKey === 'string' ? ev.fromPeerKey : '',
+        displayName: typeof ev.sender === 'string' ? ev.sender : '',
+        local: Boolean(ev.local),
+        receivedAtMs:
+          typeof ev.receivedAtMs === 'number' ? ev.receivedAtMs : bareP2pNowMs(),
+        packet: {
+          app,
+          kind: typeof ev.kind === 'string' ? ev.kind : 'unknown',
+          payload: ev.payload && typeof ev.payload === 'object' ? ev.payload : {}
+        }
+      })
+    }
+    return out
+  }
+  if (typeof ctx.bareOsChatHistory !== 'function') return []
+  let hist = []
+  try {
+    hist = ctx.bareOsChatHistory(
+      Math.max(1, Math.min(BARE_P2P_SUITE_MAX_HISTORY, limit || 512))
+    )
+  } catch {
+    hist = []
+  }
+  if (!Array.isArray(hist)) return []
+  const out = []
+  for (const ev of hist) {
+    if (!ev || typeof ev !== 'object') continue
+    const body = String(ev.body || '')
+    const decoded = bareP2pDecodeEnvelope(body)
+    if (!decoded || decoded.app !== app) continue
+    out.push({
+      fromPeerKey: typeof ev.fromPeerKey === 'string' ? ev.fromPeerKey : '',
+      displayName: typeof ev.displayName === 'string' ? ev.displayName : '',
+      local: Boolean(ev.local),
+      receivedAtMs:
+        typeof ev.receivedAtMs === 'number' ? ev.receivedAtMs : bareP2pNowMs(),
+      packet: decoded
+    })
+  }
+  return out
+}
+
+function bareP2pSubscribe(ctx, app, fn) {
+  if (app === 'meshdrop' && typeof ctx.bareOsMeshdropSubscribe === 'function') {
+    return ctx.bareOsMeshdropSubscribe((ev) => {
+      if (!ev || typeof ev !== 'object' || ev.app !== app) return
+      fn({
+        fromPeerKey: typeof ev.fromPeerKey === 'string' ? ev.fromPeerKey : '',
+        displayName: typeof ev.sender === 'string' ? ev.sender : '',
+        local: Boolean(ev.local),
+        receivedAtMs:
+          typeof ev.receivedAtMs === 'number' ? ev.receivedAtMs : bareP2pNowMs(),
+        packet: {
+          app,
+          kind: typeof ev.kind === 'string' ? ev.kind : 'unknown',
+          payload: ev.payload && typeof ev.payload === 'object' ? ev.payload : {}
+        }
+      })
+    })
+  }
+  if (typeof ctx.bareOsChatSubscribe !== 'function') return () => {}
+  return ctx.bareOsChatSubscribe((ev) => {
+    if (!ev || typeof ev !== 'object') return
+    const body = String(ev.body || '')
+    const decoded = bareP2pDecodeEnvelope(body)
+    if (!decoded || decoded.app !== app) return
+    fn({
+      fromPeerKey: typeof ev.fromPeerKey === 'string' ? ev.fromPeerKey : '',
+      displayName: typeof ev.displayName === 'string' ? ev.displayName : '',
+      local: Boolean(ev.local),
+      receivedAtMs:
+        typeof ev.receivedAtMs === 'number' ? ev.receivedAtMs : bareP2pNowMs(),
+      packet: decoded
+    })
+  })
+}
+
+async function bareP2pReadSwarmSnapshot(ctx) {
+  const out = {
+    atMs: bareP2pNowMs(),
+    peerCount: null,
+    topicCount: null,
+    peers: []
+  }
+  const snap = await bareP2pReadJson(ctx, '/proc/bare_os/swarm')
+  if (!snap || typeof snap !== 'object') return out
+  if (typeof snap.peerCount === 'number') out.peerCount = snap.peerCount
+  if (typeof snap.topicCount === 'number') out.topicCount = snap.topicCount
+  const peers = Array.isArray(snap.peers) ? snap.peers : []
+  const detailsRaw = await bareP2pReadJson(ctx, '/proc/bare_os/peer_details.json')
+  const details =
+    detailsRaw && typeof detailsRaw === 'object' && Array.isArray(detailsRaw.peers)
+      ? detailsRaw.peers
+      : []
+  /** @type {Map<string, Record<string, unknown>>} */
+  const byKey = new Map()
+  for (const d of details) {
+    if (!d || typeof d !== 'object') continue
+    const rk = typeof d.remotePublicKey === 'string' ? d.remotePublicKey : ''
+    const pid = typeof d.peerId === 'string' ? d.peerId : ''
+    if (rk) byKey.set('k:' + rk, d)
+    if (pid) byKey.set('p:' + pid, d)
+  }
+  const merged = []
+  for (const p of peers) {
+    if (!p || typeof p !== 'object') continue
+    const rk = typeof p.remotePublicKey === 'string' ? p.remotePublicKey : ''
+    const pid = typeof p.peerId === 'string' ? p.peerId : ''
+    const d = (rk && byKey.get('k:' + rk)) || (pid && byKey.get('p:' + pid)) || null
+    merged.push(d && typeof d === 'object' ? { ...p, ...d } : p)
+  }
+  out.peers = merged.slice(0, 128)
+  return out
+}
+
+async function bareP2pReadProcJson(ctx, path) {
+  const v = await bareP2pReadJson(ctx, path)
+  return v && typeof v === 'object' ? v : {}
+}
+
+async function run(ctx, argv) {
+  const argv0 = argv[0] || 'peerdiscover'
+  const args = argv.slice(1)
+  if (args.includes('-h') || args.includes('--help') || args.length === 0) {
+    ctx.console.log(
+      'usage: ' +
+        argv0 +
+        ' announce SERVICE [META]\n' +
+        '       ' +
+        argv0 +
+        ' list [N]\n' +
+        'Peer service announce/list over p2p event history.\n' +
+        'See man peerdiscover.'
+    )
+    if (args.length === 0) ctx.exitCode = 1
+    return
+  }
+  const sub = args[0]
+  if (sub === 'announce') {
+    const service = String(args[1] || '').trim()
+    if (!service) {
+      ctx.console.error(argv0 + ': announce requires SERVICE')
+      ctx.exitCode = 1
+      return
+    }
+    const meta = args.slice(2).join(' ').trim()
+    const r = bareP2pSend(ctx, 'peerdiscover', 'service.announce', {
+      service,
+      meta,
+      id: bareP2pId('svc')
+    })
+    if (r && r.ok === false) ctx.exitCode = 1
+    return
+  }
+  if (sub === 'list') {
+    const n = Math.max(1, Math.min(500, parseInt(args[1] || '50', 10) || 50))
+    const rows = bareP2pCollectFromHistory(ctx, 'peerdiscover', 2000)
+      .filter((r) => r.packet?.kind === 'service.announce')
+      .slice(-n)
+    for (const row of rows) {
+      const p = row.packet?.payload || {}
+      ctx.console.log(
+        '[' +
+          bareP2pFmtClock(row.receivedAtMs) +
+          '] ' +
+          String(p.service || 'unknown') +
+          (p.meta ? ' ' + String(p.meta) : '')
+      )
+    }
+    return
+  }
+  ctx.console.error(argv0 + ': unsupported subcommand')
+  ctx.exitCode = 1
+}