Merge pull request #1219 from ssbc/rooms

Add support for SSB Rooms

Author: christianbundy

index.js

@@ -219,6 +219,10 @@ function setupContext (appName, opts, cb) {
     ssbConfig.remote = `unix:${socketPath}:~noauth:${pubkey}`
   }
 
+  // Support rooms
+  ssbConfig.connections.incoming.tunnel = [{ scope: 'public', transform: 'shs' }]
+  ssbConfig.connections.outgoing.tunnel = [{ transform: 'shs' }]
+
   const redactedConfig = JSON.parse(JSON.stringify(ssbConfig))
   redactedConfig.keys.private = null
   console.dir(redactedConfig, { depth: null })

lib/depject/invite/invite.js

@@ -1,6 +1,7 @@
 'use strict'
 const ref = require('ssb-ref')
 const ssbClient = require('ssb-client')
+const roomUtils = require('ssb-room/utils')
 const Value = require('mutant/value')
 const nest = require('depnest')
 
@@ -20,6 +21,13 @@ exports.gives = nest({
 exports.create = function (api) {
   function accept (invite, cb) {
     const progress = Value('Connecting...')
+
+    if (roomUtils.isInvite(invite)) {
+      const address = roomUtils.inviteToAddress(invite)
+      api.sbot.async.connRememberConnect(address, { type: 'room' }, cb)
+      return
+    }
+
     const data = ref.parseInvite(invite)
     const id = api.keys.sync.id()
     const config = api.config.sync.load()

lib/depject/invite/sheet.js

@@ -41,7 +41,7 @@ exports.create = function (api) {
             }
           }, [i18n('By default, Patchwork will only see other users that are on the same local area network as you.')]),
           h('div', [
-            i18n('In order to share with users on the internet, you need to be invited to a pub server.')
+            i18n('In order to share with users on the internet, you need to be invited to a pub server or a room server.')
           ]),
           input
         ]),

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

@@ -113,7 +113,7 @@ exports.create = function (api) {
       return [
         h('button -pub -full', {
           'ev-click': api.invite.sheet
-        }, i18n('+ Join Pub')),
+        }, i18n('+ Join Server')),
 
         // disabling DHT invites until they work in sbot@13
         //
@@ -151,7 +151,7 @@ exports.create = function (api) {
 
         PeerList(localPeers, i18n('Local')),
         SuggestedPeerList(stagedPeers, i18n('Possible connections')),
-        PeerList(connectedPubs, i18n('Connected Pubs')),
+        PeerList(connectedPubs, i18n('Connections')),
 
         when(computed(whoToFollow, x => x.length), h('h2', i18n('Who to follow'))),
         when(following.sync,

lib/plugins/index.js

@@ -107,7 +107,7 @@ exports.init = function (ssb, config) {
           if (value.sync && config.gossip && config.gossip.prune) {
             // clean up pubs announced by peers more than 2 hops away if `--gossip.prune=true`
             ssb.conn.query().peersConnectable('db').forEach(([addr, data]) => {
-              if (!discovered.has(data.key)) {
+              if (!discovered.has(data.key) && data.type === 'pub') {
                 ssb.conn.forget(addr)
               }
             })
@@ -116,14 +116,22 @@ exports.init = function (ssb, config) {
           if (!value.content) return
           const address = value.content.address
           if (replicating.has(value.author) && address && ref.isFeed(address.key)) {
+            // ignore blocked pubs
             const blocking = graph && graph[ssb.id] && graph[ssb.id][address.key] === false
-            if (!blocking) {
-              discovered.add(address.key)
-              try {
-                const msAddr = ref.toMultiServerAddress(address)
-                ssb.conn.remember(msAddr, { type: 'pub', key: address.key, autoconnect: true })
-              } catch (err) {}
+            if (blocking) return
+            // make multiserver address as a string
+            let msAddr
+            try {
+              msAddr = ref.toMultiServerAddress(address)
+            } catch (err) {
+              return
             }
+            // do not override room entries even if people declared them to be pubs
+            const oldEntry = ssb.conn.db().get(msAddr)
+            if (oldEntry && oldEntry.type === 'room') return
+            // add pub to the CONN database
+            discovered.add(address.key)
+            ssb.conn.remember(msAddr, { type: 'pub', key: address.key, autoconnect: true })
           }
         })
       )

lib/server-process.js

@@ -33,6 +33,7 @@ const createSbot = require('secret-stack')()
   .use(require('ssb-backlinks'))
   .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-invite'))

locales/en.json

@@ -8,7 +8,7 @@
 	"For help, see the 'Getting Started' guide at ": "For help, see the 'Getting Started' guide at ",
 	"update": "update",
 	"updates": "updates",
-	"+ Join Pub": "+ Join Pub",
+	"+ Join Server": "+ Join Server",
 	"Active Channels": "Active Channels",
 	"More Channels...": "More Channels...",
 	"Local": "Local",
@@ -316,5 +316,7 @@
 	"Attending": "Attending",
 	"Attending Gatherings": "Attending Gatherings",
 	"Possible connections": "Possible connections",
-	"Connect": "Connect"
-}
+	"Connections": "Connections",
+	"Connect": "Connect",
+	"In order to share with users on the internet, you need to be invited to a pub server or a room server.": "In order to share with users on the internet, you need to be invited to a pub server or a room server."
+}