Merge pull request #1246 from ssbc/dht-invites

add DHT invites, only as a client

Author: christianbundy

index.js

@@ -201,14 +201,6 @@ function setupContext (appName, opts, cb) {
       dunbar: 150,
       hops: 2 // down from 3
     }
-    // connections: { // to support DHT invites
-    //   incoming: {
-    //     dht: [{ scope: 'public', transform: 'shs', port: 8423 }]
-    //   },
-    //   outgoing: {
-    //     dht: [{ transform: 'shs' }]
-    //   }
-    // }
   }, opts))
 
   // disable gossip auto-population from {type: 'pub'} messages as we handle this manually in sbot/index.js
@@ -233,6 +225,9 @@ function setupContext (appName, opts, cb) {
   ssbConfig.connections.incoming.tunnel = [{ scope: 'public', transform: 'shs' }]
   ssbConfig.connections.outgoing.tunnel = [{ transform: 'shs' }]
 
+  // Support DHT invites (only as a client, for now)
+  ssbConfig.connections.outgoing.dht = [{ transform: 'shs' }]
+
   const redactedConfig = JSON.parse(JSON.stringify(ssbConfig))
   redactedConfig.keys.private = null
   console.dir(redactedConfig, { depth: null })

lib/depject/index.js

@@ -85,8 +85,6 @@ module.exports = {
       }
     },
     invite: {
-      dhtAcceptSheet: require('./invite/dhtAcceptSheet.js'),
-      dhtCreateSheet: require('./invite/dhtCreateSheet.js'),
       invite: require('./invite/invite.js'),
       sheet: require('./invite/sheet.js')
     },

lib/depject/invite/dhtAcceptSheet.js

@@ -8,6 +8,7 @@ const nest = require('depnest')
 exports.needs = nest({
   'sbot.async.publish': 'first',
   'sbot.async.connRememberConnect': 'first',
+  'sbot.async.acceptDHT': 'first',
   'contact.async.followerOf': 'first',
   'keys.sync.id': 'first',
   'config.sync.load': 'first'
@@ -27,6 +28,10 @@ exports.create = function (api) {
       api.sbot.async.connRememberConnect(address, { type: 'room' }, cb)
       return
     }
+    if (invite.startsWith('dht:')) {
+      api.sbot.async.acceptDHT(invite, () => {})
+      return cb(null, true)
+    }
 
     const data = ref.parseInvite(invite)
     const id = api.keys.sync.id()

lib/depject/invite/dhtCreateSheet.js

@@ -18,8 +18,6 @@ exports.needs = nest({
   'about.html.image': 'first',
   'about.obs.name': 'first',
   'invite.sheet': 'first',
-  'dhtInvite.accept.sheet': 'first',
-  'dhtInvite.create.sheet': 'first',
 
   'message.html.compose': 'first',
   'message.async.publish': 'first',
@@ -117,17 +115,6 @@ exports.create = function (api) {
           'ev-click': api.invite.sheet
         }, i18n('+ Join Server')),
 
-        // disabling DHT invites until they work in sbot@13
-        //
-        // h('SplitButton', [
-        //   h('button -createInvite', {
-        //     'ev-click': api.dhtInvite.create.sheet
-        //   }, i18n('Create Invite')),
-        //   h('button -acceptInvite', {
-        //     'ev-click': api.dhtInvite.accept.sheet
-        //   }, i18n('Accept Invite'))
-        // ]),
-
         when(channelsLoading, [h('Loading')], [
           when(computed(recentChannels, x => x.length), [
             h('h2', i18n('Active Channels')),

lib/depject/invite/invite.js

@@ -30,8 +30,7 @@ exports.gives = {
       connConnect: true,
       connRememberConnect: true,
       friendsGet: true,
-      acceptDHT: true,
-      createDHT: true
+      acceptDHT: true
     },
     pull: {
       log: true,
@@ -214,9 +213,6 @@ exports.create = function (api) {
         }),
         acceptDHT: rec.async(function (opts, cb) {
           sbot.dhtInvite.accept(opts, cb)
-        }),
-        createDHT: rec.async(function (cb) {
-          sbot.dhtInvite.create(cb)
         })
       },
       pull: {

lib/depject/page/html/render/public.js

@@ -3,21 +3,6 @@ const Path = require('path')
 const electron = require('electron')
 const spawn = require('child_process').spawn
 const fixPath = require('fix-path')
-// var DHT = require('multiserver-dht')
-
-// removing DHT invites until they work in sbot@13
-//
-// function dhtTransport (sbot) {
-//   sbot.multiserver.transport({
-//     name: 'dht',
-//     create: dhtConfig => {
-//       return DHT({
-//         keys: sbot.dhtInvite.channels(),
-//         port: dhtConfig.por t
-//       })
-//     }
-//   })
-// }
 
 const createSbot = require('secret-stack')()
   .use(require('ssb-db'))
@@ -34,8 +19,7 @@ const createSbot = require('secret-stack')()
   .use(require('ssb-about'))
   .use(require('ssb-private'))
   .use(require('ssb-room/tunnel/client'))
-  // .use(require('ssb-dht-invite')) // this one must come before dhtTransport
-  // .use(dhtTransport)
+  .use(require('ssb-dht-invite'))
   .use(require('ssb-invite'))
   .use(require('ssb-query'))
   .use(require('ssb-search'))
@@ -55,9 +39,6 @@ module.exports = function (ssbConfig) {
   fs.writeFileSync(Path.join(ssbConfig.path, 'manifest.json'), JSON.stringify(ssbConfig.manifest))
   electron.ipcRenderer.send('server-started', ssbConfig)
 
-  // start dht invite support
-  // context.sbot.dhtInvite.start()
-
   // check if we are using a custom ssb path (which would break git-ssb-web)
   if (!ssbConfig.customPath) {
     // attempt to run git-ssb if it is installed and in path