update to use new ssb-config

bin.js

@@ -7,7 +7,8 @@ var toPull       = require('stream-to-pull-stream')
 var File         = require('pull-file')
 var explain      = require('explain-error')
 var ssbKeys      = require('ssb-keys')
-var stringify    = require('pull-stringify')
+var Config       = require('ssb-config/inject')
+var Client       = require('ssb-client')
 var createHash   = require('multiblob/util').createHash
 var minimist     = require('minimist')
 var muxrpcli     = require('muxrpcli')
@@ -22,23 +23,28 @@ var i = argv.indexOf('--')
 var conf = argv.slice(i+1)
 argv = ~i ? argv.slice(0, i) : argv
 
-var config = require('ssb-config/inject')(process.env.ssb_appname, minimist(conf))
+var config = Config(process.env.ssb_appname, minimist(conf))
 
-var keys = ssbKeys.loadOrCreateSync(path.join(config.path, 'secret'))
-if(keys.curve === 'k256')
+// TODO when ssb-config includes keys by default, rm this
+if (!config.keys) {
+  config.keys = ssbKeys.loadOrCreateSync(path.join(config.path, 'secret'))
+}
+if (config.keys.curve === 'k256')
   throw new Error('k256 curves are no longer supported,'+
                   'please delete' + path.join(config.path, 'secret'))
 
 var manifestFile = path.join(config.path, 'manifest.json')
 
+console.log('>>>>', JSON.stringify(config, null, 2))
+
 if (argv[0] == 'server') {
   console.log('WARNING-DEPRECATION: `sbot server` has been renamed to `ssb-server start`')
   argv[0] = 'start'
 }
 
 if (argv[0] == 'start') {
   console.log(packageJson.name, packageJson.version, config.path, 'logging.level:'+config.logging.level)
-  console.log('my key ID:', keys.public)
+  console.log('my key ID:', config.keys.public)
 
   // special start command:
   // import ssbServer and start the server
@@ -71,8 +77,6 @@ if (argv[0] == 'start') {
   }
 
   // start server
-
-  config.keys = keys
   var server = createSsbServer(config)
 
   // write RPC manifest to ~/.ssb/manifest.json
@@ -81,7 +85,6 @@ if (argv[0] == 'start') {
   if(process.stdout.isTTY && (config.logging.level != 'info'))
     ProgressBar(server.progress)
 } else {
-
   // normal command:
   // create a client connection to the server
 
@@ -96,18 +99,20 @@ if (argv[0] == 'start') {
     )
   }
 
-  // connect
-  require('ssb-client')(keys, {
+  var opts = {
     manifest: manifest,
-    port: config.port,
-    host: config.host||'localhost',
+    port: getPort(config),
+    host: getHost(config),
     caps: config.caps,
-    key: config.key || keys.id
-  }, function (err, rpc) {
+    key: config.key || config.keys.id
+  }
+  console.log('OOOOOpts', opts)
+
+  // connect
+  Client(config.keys, opts, function (err, rpc) {
     if(err) {
       if (/could not connect/.test(err.message)) {
-        var serverAddr = (config.host || 'localhost') + ":" + config.port;
-        console.error('Error: Could not connect to ssb-server ' + serverAddr)
+        console.error('Error: Could not connect to ssb-server ' + opts.host + ':' + opts.port)
         console.error('Use the "start" command to start it.')
         if(config.verbose) throw err
         process.exit(1)
@@ -167,3 +172,29 @@ if (argv[0] == 'start') {
   })
 }
 
+function getConnection (config) {
+  return config.connections &&
+    config.connections.incoming &&
+    config.connections.incoming.net &&
+    config.connections.incoming.net.find(function (transport) {
+      return transport.scope === 'public' &&
+        transport.port
+    })
+}
+
+function getPort (config) {
+  return config.port // TEMP
+  var connection = getConnection(config)
+
+  if (connection && connection.port) return connection.port
+  return config.port
+}
+
+function getHost (config) {
+  return config.host || 'localhost' // TEMP
+  var connection = getConnection(config)
+
+  if (connection && connection.host) return connection.host
+  if (config.host) return config.host
+  return 'localhost'
+}

package.json

@@ -40,12 +40,11 @@
     "pull-ping": "^2.0.2",
     "pull-pushable": "^2.2.0",
     "pull-stream": "^3.6.2",
-    "pull-stringify": "^2.0.0",
     "rimraf": "^2.4.2",
     "secret-stack": "^5.1.0",
     "ssb-blobs": "^1.1.4",
     "ssb-client": "^4.5.7",
-    "ssb-config": "^2.3.9",
+    "ssb-config": "^2.3.7",
     "ssb-db": "^18.6.2",
     "ssb-ebt": "^5.1.4",
     "ssb-friends": "^3.1.3",