Ephemeral returns

README.md

@@ -46,6 +46,9 @@ This will attempt to recombine the decrypted shards included in reply messages a
 
 This also works for forwarded shards, you just need to provide the root from on of the fwds.
 
+#### `darkCrystal.recover.async.deleteEphemeralKeyPairs(rootId, callback)`
+
+Deletes the ephemeral keypairs for all returned shards associated with the given rootId (effectively deleting the shards). If successful, no errors will be returned in the callback.
 
 ### Root methods
 

index.js

@@ -1,7 +1,7 @@
 const inject = require('scuttle-inject')
 
 const raw = require('./methods')
-const PLUGIN_DEPS = ['private', 'query', 'backlinks']
+const PLUGIN_DEPS = ['private', 'query', 'backlinks', 'ephemeral']
 
 const niceMappings = {}
 

isReply.js

@@ -1,5 +1,6 @@
 const { isReply: _isReply } = require('ssb-dark-crystal-schema')
 const getContent = require('ssb-msg-content')
+const isString = require('./lib/isString')
 const { validateShard } = require('dark-crystal-secrets')
 
 module.exports = function isReply (msg) {
@@ -11,10 +12,21 @@ module.exports = function isReply (msg) {
   const errors = []
 
   if (!_isReply(msg)) errors.push(new Error('invalid reply'))
-  if (!validateShard(shard, shareVersion)) errors.push(new Error('invalid shard'))
+  if (!isString(shard)) {
+    errors.push(new Error('body must contain a string'))
+  } else {
+    if (!isBoxedShare(shard) || shareVersion === '1.0.0') {
+      if (!validateShard(shard, shareVersion)) errors.push(new Error('invalid shard'))
+    }
+  }
 
   if (!errors.length) return true
 
   isReply.errors = errors
   return false
 }
+
+// TODO: should we use isCanonicalBase64 ?
+function isBoxedShare (message) {
+  return /\.box$/.test(message)
+}

methods.js

@@ -7,7 +7,8 @@ module.exports = {
     async: {
       recombine: require('./recover/async/recombine'),
       reply: require('./recover/async/reply'),
-      request: require('./recover/async/request')
+      request: require('./recover/async/request'),
+      deleteEphemeralKeyPairs: require('./recover/async/deleteEphemeralKeyPairs')
     },
     pull: {
       requests: require('./recover/pull/requests'),

package.json

@@ -52,6 +52,7 @@
   "devDependencies": {
     "scuttle-testbot": "^1.1.6",
     "ssb-backlinks": "^0.7.3",
+    "ssb-ephemeral-keys": "^1.0.2",
     "ssb-private": "^0.2.3",
     "ssb-query": "^2.3.0",
     "standard": "^12.0.1",

recover/async/deleteEphemeralKeyPair.js

@@ -0,0 +1,13 @@
+const { isMsgId, isFeed } = require('ssb-ref')
+
+module.exports = function (server) {
+  return function deleteEphemeralKeyPair (rootId, recipient, callback) {
+    if (!isMsgId(rootId)) return callback(new Error('Invalid root'))
+    if (!isFeed(recipient)) return callback(new Error('Invalid recipient'))
+
+    server.ephemeral.deleteKeyPair({ rootId, recp: recipient }, (err) => {
+      if (err) return callback(err)
+      callback(null, true)
+    })
+  }
+}

recover/async/deleteEphemeralKeyPairs.js

@@ -0,0 +1,23 @@
+const { isMsgId } = require('ssb-ref')
+const GetReplies = require('../pull/replies')
+const pull = require('pull-stream')
+const DeleteEphemeralKeyPair = require('./deleteEphemeralKeyPair')
+
+module.exports = function (server) {
+  const deleteEphemeralKeyPair = DeleteEphemeralKeyPair(server)
+  const getReplies = GetReplies(server)
+  return function deleteEphemeralKeyPairs (rootId, callback) {
+    if (!isMsgId(rootId)) return callback(new Error('Invalid root'))
+    pull(
+      getReplies(rootId, { live: false }),
+      // pull.filter body contains boxed msg?
+      pull.asyncMap((reply, cb) => {
+        deleteEphemeralKeyPair(rootId, reply.value.author, (err) => {
+          if (err) cb(err)
+          cb(null, reply)
+        })
+      }),
+      pull.collect(callback)
+    )
+  }
+}