Upgrade to db2

README.md

@@ -34,7 +34,7 @@ ssb.tribes.create({}, (err, info) => {
     test: 'kia ora, e te whānau',
     recps: [groupId] // <<< you can now put a groupId in the recps
   }
-  ssb.publish(content, (err, msg) => {
+  ssb.tribes.publish(content, (err, msg) => {
     // tada msg is encrypted to group!
 
     const cookie = '@YXkE3TikkY4GFMX3lzXUllRkNTbj5E+604AkaO1xbz8=.ed25519'

index.js

@@ -67,6 +67,7 @@ function init (ssb, config) {
 
   /* secret keys store / helper */
   const keystore = {} // HACK we create an Object so we have a reference to merge into
+  // TODO: ssb-box2 stores the keyring at config.path/keyring. we're gonna have to merge this right?
   KeyRing(join(config.path, 'tribes/keystore'), (err, api) => {
     if (err) throw err
 
@@ -85,8 +86,8 @@ function init (ssb, config) {
 
   /* register the boxer / unboxer */
   const { boxer, unboxer } = Envelope(keystore, state)
-  ssb.addBoxer({ init: onKeystoreReady, value: boxer })
-  ssb.addUnboxer({ init: onKeystoreReady, ...unboxer })
+  //ssb.addBoxer({ init: onKeystoreReady, value: boxer })
+  //ssb.addUnboxer({ init: onKeystoreReady, ...unboxer })
 
   function onKeystoreReady (done) {
     if (state.closed === true) return
@@ -135,7 +136,7 @@ function init (ssb, config) {
         const record = keystore.group.get(groupId)
         // if we haven't been in the group since before, register the group
         if (record == null) {
-          return keystore.group.add(groupId, { key: groupKey, root }, (err) => {
+          return ssb.box2.addGroupInfo(groupId, { key: groupKey, root }, (err) => {
             if (err) return cb(err)
             processAuthors(groupId, authors, m.value.author, cb)
           })
@@ -219,37 +220,38 @@ function init (ssb, config) {
   /* Tangle: auto-add tangles.group info to all private-group messages */
   const getGroupTangle = GetGroupTangle(ssb, keystore, 'group')
   const getMembersTangle = GetGroupTangle(ssb, keystore, 'members')
-  ssb.publish.hook(function (publish, args) {
-    const [content, cb] = args
-    if (!content.recps) return publish.apply(this, args)
+  // TODO: make this a ssb.tribes.publish function instead of a hook
+  //ssb.publish.hook(function (publish, args) {
+  //  const [content, cb] = args
+  //  if (!content.recps) return publish.apply(this, args)
 
-    if (!isGroup(content.recps[0])) return publish.apply(this, args)
+  //  if (!isGroup(content.recps[0])) return publish.apply(this, args)
 
-    onKeystoreReady(() => {
-      if (!keystore.group.has(content.recps[0])) return cb(Error('unknown groupId'))
+  //  onKeystoreReady(() => {
+  //    if (!keystore.group.has(content.recps[0])) return cb(Error('unknown groupId'))
 
-      getGroupTangle(content.recps[0], (err, groupTangle) => {
-        if (err) return cb(Error("Couldn't get group tangle", { cause: err }))
+  //    getGroupTangle(content.recps[0], (err, groupTangle) => {
+  //      if (err) return cb(Error("Couldn't get group tangle", { cause: err }))
 
-        set(content, 'tangles.group', groupTangle)
-        tanglePrune(content) // prune the group tangle down if needed
+  //      set(content, 'tangles.group', groupTangle)
+  //      tanglePrune(content) // prune the group tangle down if needed
 
-        // we only want to have to calculate the members tangle if it's gonna be used
-        if (!isMemberType(content.type)) {
-          return publish.call(this, content, cb)
-        }
+  //      // we only want to have to calculate the members tangle if it's gonna be used
+  //      if (!isMemberType(content.type)) {
+  //        return publish.call(this, content, cb)
+  //      }
 
-        getMembersTangle(content.recps[0], (err, membersTangle) => {
-          if (err) return cb(Error("Couldn't get members tangle", { cause: err }))
+  //      getMembersTangle(content.recps[0], (err, membersTangle) => {
+  //        if (err) return cb(Error("Couldn't get members tangle", { cause: err }))
 
-          set(content, 'tangles.members', membersTangle)
-          tanglePrune(content, 'members')
+  //        set(content, 'tangles.members', membersTangle)
+  //        tanglePrune(content, 'members')
 
-          publish.call(this, content, cb)
-        })
-      })
-    })
-  })
+  //        publish.call(this, content, cb)
+  //      })
+  //    })
+  //  })
+  //})
 
   /* API */
   const scuttle = Method(ssb, keystore, state) // ssb db methods
@@ -260,14 +262,6 @@ function init (ssb, config) {
       scuttle.group.init((err, data) => {
         if (err) return cb(err)
 
-        // NOTE this checks out group/init message was encrypted with the right `previous`.
-        // There is a potential race condition where the init method calls `ssb.getFeedState` to
-        // access `previous` but while encrypting the `group/init` message content another
-        // message is pushed into the queue, making our enveloping invalid.
-        const initValue = data.groupInitMsg.value
-        const readKey = unboxer.key(initValue.content, initValue)
-        if (!readKey) return cb(new Error('tribes.group.init failed, please try again while not publishing other messages'))
-
         // addMember the admin
         scuttle.group.addMember(data.groupId, [ssb.id], {}, (err) => {
           if (err) return cb(err)
@@ -286,8 +280,8 @@ function init (ssb, config) {
   }
 
   const tribeGet = (id, cb) => {
-    onKeystoreReady(() => {
-      const data = keystore.group.get(id)
+    ssb.box2.getGroupInfo(id, (err, data) => {
+      if (err) return cb(err)
       if (!data) return cb(new Error(`unknown groupId ${id})`))
 
       scuttle.link.findParentGroupLinks(id, (err, parentGroupLinks) => {
@@ -310,22 +304,26 @@ function init (ssb, config) {
   function tribeList (opts, cb) {
     if (typeof opts === 'function') return tribeList({}, opts)
 
-    onKeystoreReady(() => {
-      pull(
-        pull.values(keystore.group.listSync()),
-        paraMap(tribeGet, 4),
-        opts.subtribes
-          ? null
-          : pull.filter(tribe => tribe.parentGroupId === undefined),
-        pull.map(tribe => tribe.groupId),
-        pull.collect(cb)
-      )
-    })
+    pull(
+      ssb.box2.listGroupIds(),
+      paraMap(tribeGet, 4),
+      opts.subtribes
+        ? null
+        : pull.filter(tribe => tribe.parentGroupId === undefined),
+      pull.map(tribe => tribe.groupId),
+      pull.collect(cb)
+    )
   }
 
   return {
+    publish (content, cb) {
+      ssb.db.create({
+        content,
+        encryptionFormat: 'box2',
+      }, cb)
+    },
     register (groupId, info, cb) {
-      keystore.group.add(groupId, info, cb)
+      ssb.box2.addGroupInfo(groupId, info, cb)
     },
     create: tribeCreate,
     list: tribeList,

lib/get-group-tangle.js

@@ -2,6 +2,7 @@ const { isCloakedMsg: isGroup } = require('ssb-ref')
 const pull = require('pull-stream')
 const Reduce = require('@tangle/reduce')
 const Strategy = require('@tangle/strategy')
+const { where, and, type, isDecrypted, live: dbLive, toPullStream } = require('ssb-db2/operators')
 
 // for figuring out what "previous" should be for the group
 
@@ -15,7 +16,11 @@ module.exports = function GetGroupTangle (server, keystore, tangle = 'group') {
   // update the value in the cache (this will use our new addNodes functionality)
 
   pull(
-    server.createLogStream({ live: true, old: false, private: true }),
+    server.db.query(
+      where(isDecrypted('box2')),
+      dbLive({ old: false }),
+      toPullStream()
+    ),
     // we need to have this here because rebuilds cause the stream to start again and updateCache isn't idempotent
     pull.unique('key'),
     pull.drain(updateCache)

lib/group-id.js

@@ -42,7 +42,8 @@ function fromMsgKey (msg, msgKey) {
 }
 
 function fromGroupKey (msg, groupKey) {
-  const { author, previous, content } = msg.value
+  const { author, previous } = msg.value
+  const content = msg.meta.originalContent
 
   const envelope = Buffer.from(content.replace('.box2', ''), 'base64')
   const feed_id = bfe.encode(author)

listen.js

@@ -1,18 +1,26 @@
 // const flumeView = require('flumeview-reduce')
 const pull = require('pull-stream')
 const CRUT = require('ssb-crut')
+const { where, and, type, isDecrypted, live: dbLive, toPullStream } = require('ssb-db2/operators')
 
 const { isValid: isAddMember } = require('./spec/group/add-member')
 const { isValid: isExcludeMember } = require('./spec/group/exclude-member')
 
 const poBoxSpec = require('./spec/group/po-box')
-const mockSSB = { backlinks: true, query: true }
-const { isUpdate: isPOBox } = new CRUT(mockSSB, poBoxSpec).spec
 
 module.exports = {
   addMember (ssb) {
     return pull(
-      ssb.messagesByType({ type: 'group/add-member', private: true, live: true }),
+      ssb.db.query(
+        where(
+          and(
+            isDecrypted('box2'),
+            type('group/add-member'),
+          )
+        ),
+        dbLive({ old: true }),
+        toPullStream()
+      ),
       // NOTE this will run through all messages on each startup, which will help guarentee
       // all messages have been emitted AND processed
       // (same not true if we used a dummy flume-view)
@@ -25,15 +33,35 @@ module.exports = {
   },
   excludeMember (ssb) {
     return pull(
-      ssb.messagesByType({ type: 'group/exclude-member', private: true, live: true }),
+      ssb.db.query(
+        where(
+          and(
+            isDecrypted('box2'),
+            type('group/exclude-member'),
+          )
+        ),
+        dbLive({ old: true }),
+        toPullStream()
+      ),
       pull.filter(m => m.sync !== true),
       pull.filter(isExcludeMember),
       pull.unique('key')
     )
   },
   poBox (ssb, emit) {
+    const { isUpdate: isPOBox } = new CRUT(ssb, poBoxSpec).spec
+
     pull(
-      ssb.messagesByType({ type: 'group/po-box', private: true, live: true }),
+      ssb.db.query(
+        where(
+          and(
+            isDecrypted('box2'),
+            type('group/po-box'),
+          )
+        ),
+        dbLive({ old: true }),
+        toPullStream()
+      ),
       // NOTE this will run through all messages on each startup, which will help guarentee
       // all messages have been emitted AND processed
       // (same not true if we used a dummy flume-view)