SRP rc for socket 0.5

socketsupply · Oct 2, 2023 · 9f613ed · 9f613ed
1 parent 4852089
commit 9f613ed
Show file tree

Hide file tree

Showing 6 changed files with 640 additions and 431 deletions.
diff --git a/api/stream-relay/cache.js b/api/stream-relay/cache.js
@@ -220,7 +220,7 @@ export class Cache {
       if (!key || !key.slice) continue
       if (prefix.length && !key.startsWith(prefix)) continue
       const hex = key.slice(prefix.length, prefix.length + 1)
-      children[parseInt(hex, 16)].push(key)
+      if (children[parseInt(hex, 16)]) children[parseInt(hex, 16)].push(key)
     }
 
     // compute a checksum for all child members (deterministically)

diff --git a/api/stream-relay/encryption.js b/api/stream-relay/encryption.js
@@ -13,21 +13,27 @@ export class Encryption {
     return sodium.randombytes_buf(32)
   }
 
-  static async createClusterId (sharedKey) {
-    const key = sharedKey || await Encryption.createSharedKey()
-    return Buffer.from(key || '').toString('base64')
-  }
-
   static async createKeyPair (seed) {
     await sodium.ready
-    seed = seed || await Encryption.createSharedKey()
+    seed = seed || sodium.randombytes_buf(32)
+
+    if (typeof seed === 'string') {
+      seed = sodium.crypto_generichash(32, seed)
+    }
+
     return sodium.crypto_sign_seed_keypair(seed)
   }
 
   static async createId (str = randomBytes(32)) {
     return (await sha256(str)).toString('hex')
   }
 
+  static async createClusterId (value) {
+    await sodium.ready
+    value = value || sodium.randombytes_buf(32)
+    return Buffer.from(value).toString('base64')
+  }
+
   static async createSubclusterId (value) {
     return Buffer.from(value).toString('base64')
   }