Clean out the output of info

Author: pfrazee

lib/commands/info.js

@@ -5,6 +5,12 @@ import { parseHyperUrl } from '../urls.js'
 import { HyperStructInfoTracker } from '../hyper/info-tracker.js'
 
 const FULL_USAGE = `
+  If no URLs are specified, will list all hypers currently seeded.
+
+Options:
+
+  -l/--long - List the full keys of the hypers.
+
 Examples:
 
   hyp info
@@ -19,6 +25,14 @@ export default {
     simple: '[urls...]',
     full: FULL_USAGE
   },
+  options: [
+    {
+      name: 'long',
+      default: false,
+      abbr: 'l',
+      boolean: true
+    }
+  ],
   command: async function (args) {
     var hyperClient = getClient()
     var mirroringClient = getMirroringClient()
@@ -51,20 +65,37 @@ export default {
 
       // periodically update stdout with the status-line
       const updateStatusLine = () => {
-        const networkStatusLine = network && network.announce ? 'but online (announcing)' : 'and not online'
-        const seedingStatusLine = mirror && mirror.mirroring ? 'Seeding' : `Not seeding ${networkStatusLine}`
-        statusLines[i] = `${tracker.genStatusLine()} - ${seedingStatusLine}`
+        if (!network && !mirror) {
+          statusLines[i] = `${tracker.genStatusIdent(args.long)}...`
+        } else {
+          const networkStatusLine = network && network.announce ? 'but online (announcing)' : 'and not online'
+          const seedingStatusLine = mirror && mirror.mirroring ? 'Seeding' : `Not seeding ${networkStatusLine}`
+          statusLines[i] = `
+            ${tracker.genStatusIdent(args.long)}:
+            ${tracker.genStatusPeerCount()} |
+            ${tracker.genStatusNetStats()}
+            - ${seedingStatusLine}
+          `.split('\n').map(s => s.trim()).join(' ')
+        }
         statusLog.print()
       }
       updateStatusLine()
       setInterval(updateStatusLine, 1e3).unref()
 
       // periodically calculate the size of the hyper structure
       const updateState = async () => {
-        if (tracker.struct) {
-          ;({ mirror, network } = await getStatus(key, tracker.struct.type, tracker.struct.api.discoveryKey))
+        try {
+          if (tracker.struct) {
+            ;({ mirror, network } = await getStatus(key, tracker.struct.type, tracker.struct.api.discoveryKey))
+          }
+          await tracker.fetchState()
+        } catch (e) {
+          if (e.toString().includes('RPC stream destroyed')) {
+            // ignore
+          } else {
+            console.error(e)
+          }
         }
-        await tracker.fetchState().catch(console.error)
         setTimeout(updateState, 1e3).unref()
       }
       updateState()

lib/hyper/info-tracker.js

@@ -26,29 +26,54 @@ export class HyperStructInfoTracker {
   }
 
   genStatusLine () {
-    var netCfg = 'Not swarming'
-    if (this.netCfg) {
-      if (this.netCfg.announce) netCfg = `Announced to seed`
-      else if (this.netCfg.lookup) netCfg = `Watching for announced seeders`
-    }
+    var netCfg = this.genStatusNetCfg()
     if (!this.struct) {
-      return `${chalk.bold(short(this.keyStr))}: ${netCfg}`
+      return `${this.genStatusIdent()}: ${netCfg}`
     }
 
-    var stats = this.netStats
-    var dl = bytes(stats.download[stats.download.length - 1], {unitSeparator: ' '})
-    var ul = bytes(stats.upload[stats.download.length - 1], {unitSeparator: ' '})
     return `
-      ${chalk.bold(short(this.keyStr))} (${chalk.bold(this.struct.type)}):
-      ${this.peers.length} connected |
-      ${typeof this.totalBlocks !== 'undefined'
-        ? `${this.totalBlocks ? Math.round(this.downloadedBlocks/this.totalBlocks*100) : 100}% downloaded (${bytes(this.size)} total)`
-        : 'Calculating...'}
-      [↓${dl}/s ↑${ul}/s]
+      ${this.genStatusIdent()}:
+      ${this.genStatusPeerCount()} |
+      ${this.genStatusPctDownloaded()}
+      ${this.genStatusNetStats()}
       - ${netCfg}
     `.split('\n').map(s => s.trim()).join(' ')
   }
 
+  genStatusIdent (long = false) {
+    if (!this.struct) return `${chalk.bold(maybeShort(this.keyStr, !long))}`
+    return `${chalk.bold(maybeShort(this.keyStr, !long))} (${chalk.bold(this.struct.type)})`
+  }
+
+  genStatusPeerCount () {
+    return `${this.peers.length} connected`
+  }
+
+  genStatusPctDownloaded () {
+    if (typeof this.totalBlocks === 'undefined') return ''
+    if (this.totalBlocks) {
+      return `${this.totalBlocks ? Math.round(this.downloadedBlocks/this.totalBlocks*100) : 100}% downloaded (${bytes(this.size)} total)`
+    }
+    return 'Calculating...'
+  }
+
+  genStatusNetStats () {
+    var stats = this.netStats
+    if (!stats) return ''
+    var dl = bytes(stats.download[stats.download.length - 1], {unitSeparator: ' '})
+    var ul = bytes(stats.upload[stats.download.length - 1], {unitSeparator: ' '})
+    return `[↓${dl}/s ↑${ul}/s]`
+  }
+
+  genStatusNetCfg () {
+    var netCfg = 'Not swarming'
+    if (this.netCfg) {
+      if (this.netCfg.announce) netCfg = `Announced to seed`
+      else if (this.netCfg.lookup) netCfg = `Watching for announced seeders`
+    }
+    return netCfg
+  }
+
   async fetchState () {
     this.netCfg = await hyper.getClient().network.status(this.discoveryKey)
 
@@ -104,6 +129,11 @@ function short (key) {
   return `${key.slice(0, 6)}..${key.slice(-2)}`
 }
 
+function maybeShort (key, yesShort) {
+  if (yesShort) return short(key)
+  return key
+}
+
 async function countHasCoreBlocks (core, from, to) {
   var count = 0
   for (let i = from; i < to; i++) {