@fireproof/core 0.7.0 → 0.7.1

package/dist/storage/base.js

@@ -14,7 +14,7 @@ import { nocache as cache } from 'prolly-trees/cache';
 import { Buffer } from 'buffer';
 import { rawSha1 as sha1sync } from '../sha1.js';
 // @ts-ignore
-import * as codec from 'encrypted-block';
+import * as codec from '../encrypted-block.js';
 import { blocksToCarBlock, blocksToEncryptedCarBlock, blocksFromEncryptedCarBlock } from '../valet.js';
 const chunker = bf(30);
 const blockOpts = { cache, chunker, codec: dagcbor, hasher: sha256, compare };
@@ -232,6 +232,7 @@ export class Base {
                 const got = await reader.get(cid);
                 let useCodec = codec;
                 if (cid.toString().indexOf('bafy') === 0) {
+                    // @ts-ignore
                     useCodec = dagcbor; // todo this is a dirty check
                 }
                 const decoded = await Block.decode({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fireproof/core",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Live data for React, accelerated by proofs, powered by IPFS",
   "main": "dist/src/fireproof.js",
   "module": "dist/src/fireproof.mjs",
@@ -45,9 +45,9 @@
     "charwise": "^3.0.1",
     "cross-fetch": "^3.1.6",
     "crypto-browserify": "^3.12.0",
-    "encrypted-block": "jchris/encrypted-block#update",
     "idb": "^7.1.1",
     "ipld-hashmap": "^2.1.18",
+    "js-crypto-aes": "^1.0.4",
     "multiformats": "^11.0.1",
     "prolly-trees": "1.0.4",
     "randombytes": "^2.1.0",

package/src/crypto.js

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import * as codec from 'encrypted-block'
+import * as codec from './encrypted-block.js'
 import {
   create,
   load

package/src/encrypted-block.js

@@ -0,0 +1,57 @@
+// from https://github.com/mikeal/encrypted-block
+import randomBytes from 'randombytes'
+import aes from 'js-crypto-aes'
+import { CID } from 'multiformats'
+
+const enc32 = value => {
+  value = +value
+  const buff = new Uint8Array(4)
+  buff[3] = (value >>> 24)
+  buff[2] = (value >>> 16)
+  buff[1] = (value >>> 8)
+  buff[0] = (value & 0xff)
+  return buff
+}
+
+const readUInt32LE = (buffer) => {
+  const offset = buffer.byteLength - 4
+  return ((buffer[offset]) |
+          (buffer[offset + 1] << 8) |
+          (buffer[offset + 2] << 16)) +
+          (buffer[offset + 3] * 0x1000000)
+}
+
+const encode = ({ iv, bytes }) => concat([iv, bytes])
+const decode = bytes => {
+  const iv = bytes.subarray(0, 12)
+  bytes = bytes.slice(12)
+  return { iv, bytes }
+}
+
+const code = 0x300000 + 1337
+
+const concat = buffers => Uint8Array.from(buffers.map(b => [...b]).flat())
+
+const decrypt = async ({ key, value }) => {
+  let { bytes, iv } = value
+  bytes = await aes.decrypt(bytes, key, { name: 'AES-GCM', iv, tagLength: 16 })
+  const len = readUInt32LE(bytes.subarray(0, 4))
+  const cid = CID.decode(bytes.subarray(4, 4 + len))
+  bytes = bytes.subarray(4 + len)
+  return { cid, bytes }
+}
+const encrypt = async ({ key, cid, bytes }) => {
+  const len = enc32(cid.bytes.byteLength)
+  const iv = randomBytes(12)
+  const msg = concat([len, cid.bytes, bytes])
+  bytes = await aes.encrypt(msg, key, { name: 'AES-GCM', iv, tagLength: 16 })
+  return { value: { bytes, iv } }
+}
+
+const crypto = key => {
+  return { encrypt: opts => encrypt({ key, ...opts }), decrypt: opts => decrypt({ key, ...opts }) }
+}
+
+const name = 'mikeal@encrypted-block:aes-gcm'
+
+export { encode, decode, code, name, encrypt, decrypt, crypto }

package/src/storage/base.js

@@ -14,7 +14,7 @@ import { nocache as cache } from 'prolly-trees/cache'
 import { Buffer } from 'buffer'
 import { rawSha1 as sha1sync } from '../sha1.js'
 // @ts-ignore
-import * as codec from 'encrypted-block'
+import * as codec from '../encrypted-block.js'
 import { blocksToCarBlock, blocksToEncryptedCarBlock, blocksFromEncryptedCarBlock } from '../valet.js'
 
 const chunker = bf(30)
@@ -247,6 +247,7 @@ export class Base {
         const got = await reader.get(cid)
         let useCodec = codec
         if (cid.toString().indexOf('bafy') === 0) {
+          // @ts-ignore
           useCodec = dagcbor // todo this is a dirty check
         }
         const decoded = await Block.decode({