nostr-double-ratchet 0.0.25 → 0.0.27

package/src/Session.ts

@@ -46,29 +46,54 @@ export class Session {
    * @param name Optional name for the session (for debugging)
    * @returns A new Session instance
    */
-  static init(nostrSubscribe: NostrSubscribe, theirNextNostrPublicKey: string, ourCurrentPrivateKey: Uint8Array, isInitiator: boolean, sharedSecret: Uint8Array, name?: string): Session {
+  static init(
+    nostrSubscribe: NostrSubscribe,
+    theirEphemeralNostrPublicKey: string,
+    ourEphemeralNostrPrivateKey: Uint8Array,
+    isInitiator: boolean,
+    sharedSecret: Uint8Array,
+    name?: string
+  ): Session {
     const ourNextPrivateKey = generateSecretKey();
-    const [rootKey, sendingChainKey] = kdf(sharedSecret, nip44.getConversationKey(ourNextPrivateKey, theirNextNostrPublicKey), 2);
-    let ourCurrentNostrKey;
-    let ourNextNostrKey;
+    
+    let rootKey: Uint8Array;
+    let sendingChainKey: Uint8Array | undefined;
+    let ourCurrentNostrKey: { publicKey: string, privateKey: Uint8Array } | undefined;
+    let ourNextNostrKey: { publicKey: string, privateKey: Uint8Array };
+    
     if (isInitiator) {
-      ourCurrentNostrKey = { publicKey: getPublicKey(ourCurrentPrivateKey), privateKey: ourCurrentPrivateKey };
-      ourNextNostrKey = { publicKey: getPublicKey(ourNextPrivateKey), privateKey: ourNextPrivateKey };
+      [rootKey, sendingChainKey] = kdf(sharedSecret, nip44.getConversationKey(ourNextPrivateKey, theirEphemeralNostrPublicKey), 2);
+      ourCurrentNostrKey = { 
+        publicKey: getPublicKey(ourEphemeralNostrPrivateKey), 
+        privateKey: ourEphemeralNostrPrivateKey 
+      };
+      ourNextNostrKey = { 
+        publicKey: getPublicKey(ourNextPrivateKey), 
+        privateKey: ourNextPrivateKey 
+      };
     } else {
-      ourNextNostrKey = { publicKey: getPublicKey(ourCurrentPrivateKey), privateKey: ourCurrentPrivateKey };
+      rootKey = sharedSecret;
+      sendingChainKey = undefined;
+      ourCurrentNostrKey = undefined;
+      ourNextNostrKey = { 
+        publicKey: getPublicKey(ourEphemeralNostrPrivateKey), 
+        privateKey: ourEphemeralNostrPrivateKey 
+      };
     }
+    
     const state: SessionState = {
-      rootKey: isInitiator ? rootKey : sharedSecret,
-      theirNextNostrPublicKey,
+      rootKey,
+      theirNextNostrPublicKey: theirEphemeralNostrPublicKey,
       ourCurrentNostrKey,
       ourNextNostrKey,
       receivingChainKey: undefined,
-      sendingChainKey: isInitiator ? sendingChainKey : undefined,
+      sendingChainKey,
       sendingChainMessageNumber: 0,
       receivingChainMessageNumber: 0,
       previousSendingChainMessageCount: 0,
       skippedKeys: {},
     };
+    
     const session = new Session(nostrSubscribe, state);
     if (name) session.name = name;
     return session;
@@ -193,11 +218,10 @@ export class Session {
     }
   }
 
-  private ratchetStep(theirNextNostrPublicKey: string) {
+  private ratchetStep() {
     this.state.previousSendingChainMessageCount = this.state.sendingChainMessageNumber;
     this.state.sendingChainMessageNumber = 0;
     this.state.receivingChainMessageNumber = 0;
-    this.state.theirNextNostrPublicKey = theirNextNostrPublicKey;
 
     const conversationKey1 = nip44.getConversationKey(this.state.ourNextNostrKey.privateKey, this.state.theirNextNostrPublicKey!);
     const [theirRootKey, receivingChainKey] = kdf(this.state.rootKey, conversationKey1, 2);
@@ -219,7 +243,9 @@ export class Session {
 
   // 3. MESSAGE KEY FUNCTIONS
   private skipMessageKeys(until: number, nostrSender: string) {
-    if (this.state.receivingChainMessageNumber + MAX_SKIP < until) {
+    if (until <= this.state.receivingChainMessageNumber) return
+
+    if (until > this.state.receivingChainMessageNumber + MAX_SKIP) {
       throw new Error("Too many skipped messages");
     }
 
@@ -232,10 +258,14 @@ export class Session {
       // Store header keys
       if (this.state.ourCurrentNostrKey) {
         const currentSecret = nip44.getConversationKey(this.state.ourCurrentNostrKey.privateKey, nostrSender);
-        this.state.skippedKeys[nostrSender].headerKeys.push(currentSecret);
+        if (!this.state.skippedKeys[nostrSender].headerKeys.includes(currentSecret)) {
+          this.state.skippedKeys[nostrSender].headerKeys.push(currentSecret);
+        }
       }
       const nextSecret = nip44.getConversationKey(this.state.ourNextNostrKey.privateKey, nostrSender);
-      this.state.skippedKeys[nostrSender].headerKeys.push(nextSecret);
+      if (!this.state.skippedKeys[nostrSender].headerKeys.includes(nextSecret)) {
+        this.state.skippedKeys[nostrSender].headerKeys.push(nextSecret);
+      }
     }
 
     while (this.state.receivingChainMessageNumber < until) {
@@ -316,7 +346,7 @@ export class Session {
   
       if (shouldRatchet) {
         this.skipMessageKeys(header.previousChainLength, e.pubkey);
-        this.ratchetStep(header.nextPublicKey);
+        this.ratchetStep();
       }
     } else {
       if (!this.state.skippedKeys[e.pubkey]?.messageKeys[header.number]) {

package/src/types.ts

@@ -66,6 +66,9 @@ export type Unsubscribe = () => void;
  * Function that subscribes to Nostr events matching a filter and calls onEvent for each event.
  */
 export type NostrSubscribe = (filter: Filter, onEvent: (e: VerifiedEvent) => void) => Unsubscribe;
+export type EncryptFunction = (plaintext: string, pubkey: string) => Promise<string>;
+export type DecryptFunction = (ciphertext: string, pubkey: string) => Promise<string>;
+export type NostrPublish = (event: UnsignedEvent) => Promise<VerifiedEvent>;
 
 export type Rumor = UnsignedEvent & { id: string }
 
@@ -100,7 +103,3 @@ export type NostrEvent = {
   content: string;
   sig: string;
 }
-
-export type EncryptFunction = (plaintext: string, pubkey: string) => Promise<string>;
-export type DecryptFunction = (ciphertext: string, pubkey: string) => Promise<string>;
-export type NostrPublish = (event: UnsignedEvent) => Promise<VerifiedEvent>;