@tabcat/encrypted-docstore - npm Package Compare versions

Comparing version 1.0.1 to 1.0.2

package.json

 {
   "name": "@tabcat/encrypted-docstore",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "mount encrypted docstores with a key",	
@@ -5,0 +5,0 @@ "repository": {

src/encryptedDocstore.js

@@ -9,7 +9,7 @@
   constructor(encryptedDocstore, key) {
-    if (!isDefined(encryptedDocstore)) throw new Error('encryptedDocstore must be defined')
-    if (!isDefined(key)) throw new Error('key must be defined')
+    if (!encryptedDocstore) throw new Error('encryptedDocstore must be defined')
+    if (!key) throw new Error('key must be defined')
     this._docstore = encryptedDocstore
-    this.indexBy = this.docstore.options.indexBy
     this._key = key
+    this.indexBy = this._docstore.options.indexBy
   }
@@ -195,1 +195,2 @@
 module.exports = EncryptedDocstore
+

src/key.js

@@ -31,3 +31,3 @@
   constructor(cryptoKey) {
-    this.key = cryptoKey
+    this.cryptoKey = cryptoKey
   }
@@ -78,4 +78,4 @@
   static async importKey(rawKey) {
-    if (cryptoKeyAb === undefined) {
-      throw new Error('cryptoKeyAb must be defined')
+    if (rawKey === undefined) {
+      throw new Error('rawKey must be defined')
     }
@@ -98,5 +98,5 @@ const cryptoKey = await crypto.subtle.importKey(
     iv = iv || await randomBytes(12)
-    const algo = { ...this.key.algorithm, iv }
+    const algo = { ...this.cryptoKey.algorithm, iv }
     const cipherbytes = new Uint8Array(
-      await crypto.subtle.encrypt(algo, this.key, bytes)
+      await crypto.subtle.encrypt(algo, this.cryptoKey, bytes)
     )
@@ -109,4 +109,4 @@ return { cipherbytes, iv }
     }
-    const algo = { ...this.key.algorithm, iv }
-    return await crypto.subtle.decrypt(algo, this.key, bytes)
+    const algo = { ...this.cryptoKey.algorithm, iv }
+    return await crypto.subtle.decrypt(algo, this.cryptoKey, bytes)
   }
@@ -128,4 +128,7 @@
   const bytes = str2ab(JSON.stringify(doc))
-  const { cipherbytes, iv } = await this.encrypt(bytes)
-  return { _id:`entry-${iv.join('')}`, cipherbytes, iv }
+  const enc = await this.encrypt(bytes)
+  const prepUint = (uint) => Object.values(uint)
+  const cipherbytes = prepUint(enc.cipherbytes)
+  const iv = prepUint(enc.iv)
+  return { _id:`entry-${iv.join('')}`, cipherbytes, iv, }
 }
@@ -137,3 +140,6 @@
   }
-  const decrypted = await this.decrypt(encDoc.cipherbytes, encDoc.iv)
+  const deserializeUint = (obj) => new Uint8Array(Object.values(obj))
+  const cipherbytes = deserializeUint(encDoc.cipherbytes)
+  const iv = deserializeUint(encDoc.iv)
+  const decrypted = await this.decrypt(cipherbytes, iv, )
   const clearObj = JSON.parse(ab2str(decrypted))
@@ -144,1 +150,2 @@ return { internal:clearObj, external:encDoc }
 module.exports = Key
+

No alert changes

Improved metrics

Total package byte prevSize

17743

1.54%

Lines of code

304

2.01%

No dependency changes