use hypercore-crypto-encoder

index.js

@@ -2,6 +2,7 @@ const sodium = require('sodium-native')
 const crypto = require('hypercore-crypto')
 const assert = require('assert')
 const bip39 = require('bip39')
+const encoder = require('crypto-encoder')
 const zero = sodium.sodium_memzero
 
 class Crypto {
@@ -24,10 +25,11 @@ class Crypto {
   }
 
   encryptionKey (encryptionKey) {
+    if (!encryptionKey) return encoder.encryptionKey()
     var key = sodium.sodium_malloc(sodium.crypto_secretbox_KEYBYTES)
     if (encryptionKey && Buffer.isBuffer(encryptionKey)) key.copy(encryptionKey)
     else if (encryptionKey && typeof encryptionKey === 'string') key.write(encryptionKey, 'hex')
-    else sodium.randombytes_buf(key)
+    else return encoder.encryptionKey()
     return key
   }
 
@@ -100,44 +102,7 @@ class Crypto {
   }
 
   encoder (encryptionKey, opts = {}) {
-    var can = Buffer.isBuffer(encryptionKey) &&
-      (encryptionKey.length === sodium.crypto_secretbox_KEYBYTES)
-
-    assert(can, 'cobox-crypto: key must be a buffer of length ' + sodium.crypto_secretbox_KEYBYTES)
-
-    opts.valueEncoding = this._resolveStringEncoder(opts.valueEncoding)
-
-    return {
-      encode (message, buffer, offset) {
-        // Run originally provided encoder if any
-        if (opts.valueEncoding && typeof opts.valueEncoding.encode === 'function') {
-          message = opts.valueEncoding.encode(message, buffer, offset)
-        }
-        if (!Buffer.isBuffer(message)) message = Buffer.from(message, 'utf-8')
-        var ciphertext = Buffer.alloc(message.length + sodium.crypto_secretbox_MACBYTES)
-        var nonce = Buffer.alloc(sodium.crypto_secretbox_NONCEBYTES)
-        sodium.randombytes_buf(nonce)
-        sodium.crypto_secretbox_easy(ciphertext, message, nonce, encryptionKey)
-        zero(message)
-        return Buffer.concat([nonce, ciphertext])
-      },
-
-      decode (buffer, start, end) {
-        const nonce = buffer.slice(0, sodium.crypto_secretbox_NONCEBYTES)
-        const messageWithMAC = buffer.slice(sodium.crypto_secretbox_NONCEBYTES)
-        var message = Buffer.alloc(messageWithMAC.length - sodium.crypto_secretbox_MACBYTES)
-        if (!sodium.crypto_secretbox_open_easy(message, messageWithMAC, nonce, encryptionKey)) {
-          throw new Error('Decryption failed!')
-        } else {
-          // Run originally provided encoder if any
-          if (opts.valueEncoding && typeof opts.valueEncoding.decode === 'function') {
-            return opts.valueEncoding.decode(message, start, end)
-          } else {
-            return message
-          }
-        }
-      }
-    }
+    return encoder(encryptionKey, opts)
   }
 
   boxKeypair (seed) {

package.json

@@ -13,6 +13,7 @@
   "dependencies": {
     "assert": "^2.0.0",
     "bip39": "^3.0.2",
+    "crypto-encoder": "^1.0.1",
     "hypercore-crypto": "^1.0.0",
     "sodium-native": "^2.4.2"
   },