[RFC] Multiple Cabals Continuation

.cabal.yml-example

@@ -0,0 +1,4 @@
+cabals:
+  - cabal://bd45fde0ad866d4069af490f0ca9b07110808307872d4b659a4ff7a4ef85315a
+  - 22f7763be0e939160dd04137b66aaac8f2179350eec740e57a656dfdf1f4dc29
+  - cbl://3d45fde0ad866d4069af490f0ca9b07110808307872d4b659a4ff7a4ef853132

.gitignore

@@ -11,6 +11,9 @@ config.js
 *.pdf
 archives
 
+# Cabal config files
+.cabal.yml
+
 #################
 ## Eclipse
 #################

README.md

@@ -20,7 +20,7 @@ $ cabal --key cabal://0c6247a6378074257854a66ea5bc90fd6268a0eb5f0d896e55e59e2c3c
 ## Usage
 #### Start a new instance:
 ```
-cabal --db <file path>
+cabal --new
 ```
 
 #### Connect to an existing instance:
@@ -90,3 +90,5 @@ cabal --key <key> --seeder
 &nbsp;&nbsp;&nbsp;&nbsp;scroll down through backlog  
 `alt-[1,9]`  
 &nbsp;&nbsp;&nbsp;&nbsp;select channels  1-9  
+`alt-n`
+&nbsp;&nbsp;&nbsp;&nbsp;tab between the cabals & channels panes 

cli.js

@@ -2,25 +2,34 @@
 var Cabal = require('cabal-core')
 var swarm = require('cabal-core/swarm.js')
 var minimist = require('minimist')
+var os = require('os')
+var fs = require('fs')
+var yaml = require('js-yaml')
+var mkdirp = require('mkdirp')
 var frontend = require('./neat-screen.js')
+var crypto = require('hypercore-crypto')
 
 var args = minimist(process.argv.slice(2))
 
-var homedir = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE
-var rootdir = args.dir || (homedir + '/.cabal/archives/')
+var protocolMajorVersion = Cabal.protocolVersion.split('.')[0]
+var homedir = os.homedir()
+var rootdir = args.dir || (homedir + `/.cabal/v${protocolMajorVersion}`)
+var archivesdir = `${rootdir}/archives/`
 
 var usage = `Usage
 
   cabal --key cabal://key
 
   OR
 
-  cabal --db /path/to/db
+  cabal --new
 
   Options:
 
     --seed    Start a headless seed for the specified cabal key
 
+    --nick    Your nickname
+    --new     Start a new cabal
     --message Publish a single message; then quit after \`timeout\`
     --channel Channel name to publish to for \`message\` option; default: "default"
     --timeout Delay in milliseconds to wait on swarm before quitting for \`message\` option; default: 5000
@@ -29,57 +38,109 @@ var usage = `Usage
 Work in progress! Learn more at github.com/cabal-club
 `
 
+var cabalKeys = []
+
+// Attempt to load local or homedir config file
+try {
+  var config
+  var configFilePath
+  var configFilename = 'config.yml'
+  var currentDirConfigFilename = '.cabal.yml'
+  mkdirp.sync(rootdir)
+  if (args.config && fs.existsSync(args.config)) {
+    configFilePath = args.config
+  } else if (fs.existsSync(currentDirConfigFilename)) {
+    configFilePath = currentDirConfigFilename
+  } else if (fs.existsSync(rootdir + '/' + configFilename)) {
+    configFilePath = rootdir + '/' + configFilename
+  }
+  if (configFilePath) {
+    config = yaml.safeLoad(fs.readFileSync(configFilePath, 'utf8'))
+    if (config && config.cabals) {
+      cabalKeys = config.cabals
+    }
+  }
+} catch (e) {
+  console.log(e)
+}
+
 if (args.key) {
-  args.key = args.key.replace('cabal://', '').replace('cbl://', '').replace('dat://', '').replace(/\//g, '')
-  args.db = rootdir + args.key
+  // If a key is provided, place it at the top of the list
+  cabalKeys.unshift(args.key)
+}
 
-  var cabal = Cabal(args.db, args.key)
+if (args.new) {
+  var key = crypto.keyPair().publicKey.toString('hex')
+  var db = archivesdir + key
+  var cabal = Cabal(db, key)
   cabal.db.ready(function () {
-    start(args.key)
+    if (!args.seed) {
+      start([cabal])
+    }
   })
-} else {
-  cabal = Cabal(args.db, null)
-  cabal.db.ready(function () {
-    cabal.getLocalKey(function (err, key) {
-      if (err) throw err
-      start(key)
+} else if (cabalKeys.length) {
+  Promise.all(cabalKeys.map((key) => {
+    key = key.replace('cabal://', '').replace('cbl://', '').replace('dat://', '').replace(/\//g, '')
+    var db = archivesdir + key
+    var cabal = Cabal(db, key)
+    return new Promise((resolve) => {
+      cabal.db.ready(() => {
+        resolve(cabal)
+      })
     })
+  })).then((cabals) => {
+    start(cabals)
   })
-}
-
-if (!args.db) {
+} else {
   process.stderr.write(usage)
   process.exit(1)
 }
 
-function start (key) {
+function start (cabals) {
   if (!args.seed) {
-    if (args.message) {
+    if (args.key && args.message) {
       publishSingleMessage({
+        key: args.key,
         channel: args.channel,
         message: args.message,
         messageType: args.type,
         timeout: args.timeout
       })
       return
     }
-    frontend(cabal)
-    setTimeout(function () { swarm(cabal) }, 300)
+    frontend({
+      archivesdir,
+      cabals,
+      configFilePath,
+      homedir,
+      protocolMajorVersion,
+      rootdir
+    })
+    setTimeout(() => {
+      cabals.forEach((cabal) => {
+        swarm(cabal)
+      })
+    }, 300)
   } else {
-    console.log('Seeding', key)
-    swarm(cabal)
+    cabals.forEach((cabal) => {
+      console.log('Seeding', cabal.key)
+      swarm(cabal)
+    })
   }
 }
 
-function publishSingleMessage ({channel, message, messageType, timeout}) {
-  console.log('Publishing message to channel - ' + channel + ': "' + message + '"...')
-  cabal.publish({
-    type: messageType || 'chat/text',
-    content: {
-      channel: channel || 'default',
-      text: message
-    }
+function publishSingleMessage ({key, channel, message, messageType, timeout}) {
+  console.log(`Publishing message to channel - ${channel || 'default'}: ${message}`)
+  var cabal = Cabal(archivesdir + key, key)
+  cabal.db.ready(() => {
+    cabal.publish({
+      type: messageType || 'chat/text',
+      content: {
+        channel: channel || 'default',
+        text: message
+      }
+    })
+    swarm(cabal)
+    setTimeout(function () { process.exit(0) }, timeout || 5000)
   })
-  swarm(cabal)
-  setTimeout(function () { process.exit(0) }, timeout || 5000)
 }

commands.js

@@ -10,6 +10,17 @@ function Commander (view, cabal) {
 
   var self = this
   this.commands = {
+    add: {
+      help: () => 'add a cabal',
+      call: (arg) => {
+        if (arg === '') {
+          self.view.writeLine('* Usage example: /add cabalkey')
+          return
+        }
+        self.channel = arg
+        self.view.addCabal(arg)
+      }
+    },
     nick: {
       help: () => 'change your display name',
       call: (arg) => {
@@ -71,6 +82,10 @@ function Commander (view, cabal) {
           self.view.writeLine.bind(self.view)(`/${key}`)
           self.view.writeLine.bind(self.view)(`  ${self.commands[key].help()}`)
         }
+        self.view.writeLine.bind(self.view)(`alt-n`)
+        self.view.writeLine.bind(self.view)(`  move between channels/cabals panes`)
+        self.view.writeLine.bind(self.view)(`ctrl+{n,p}`)
+        self.view.writeLine.bind(self.view)(`  move up/down channels/cabals`)
       }
     },
     debug: {
@@ -91,6 +106,12 @@ function Commander (view, cabal) {
         process.exit(0)
       }
     },
+    exit: {
+      help: () => 'exit the cabal process',
+      call: (arg) => {
+        process.exit(0)
+      }
+    },
     topic: {
       help: () => 'set the topic/description/`message of the day` for a channel',
       call: (arg) => {
@@ -99,9 +120,10 @@ function Commander (view, cabal) {
     }
   }
   // add aliases to commands
+  this.alias('add', 'cabal')
+  this.alias('emote', 'me')
   this.alias('join', 'j')
   this.alias('nick', 'n')
-  this.alias('emote', 'me')
   this.alias('topic', 'motd')
 }