nostr-double-ratchet 0.0.31 → 0.0.32

package/dist/SessionManager.d.ts

@@ -1,6 +1,7 @@
 import { NostrPublish, NostrSubscribe, Rumor } from "./types";
 import { Invite } from "./Invite";
 import { StorageAdapter } from "./StorageAdapter";
+export type OnEventCallback = (event: Rumor, from: string) => void;
 export default class SessionManager {
     private userRecords;
     private nostrSubscribe;
@@ -28,7 +29,7 @@ export default class SessionManager {
     listenToUser(userPubkey: string): void;
     stopListeningToUser(userPubkey: string): void;
     private internalSubscriptions;
-    onEvent(callback: (event: Rumor) => void): () => void;
+    onEvent(callback: OnEventCallback): () => void;
     close(): void;
     /**
      * Accept an invite as our own device, persist the session, and publish the acceptance event.

package/dist/SessionManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionManager.d.ts","sourceRoot":"","sources":["../src/SessionManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,YAAY,EAAE,cAAc,EAAE,KAAK,EAAe,MAAM,SAAS,CAAA;AAE7F,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjC,OAAO,EAAE,cAAc,EAA0B,MAAM,kBAAkB,CAAA;AAIzE,MAAM,CAAC,OAAO,OAAO,cAAc;IAC/B,OAAO,CAAC,WAAW,CAAqC;IACxD,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,cAAc,CAAY;IAClC,OAAO,CAAC,kBAAkB,CAAsC;IAChE,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,MAAM,CAAC,CAAQ;IACvB,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,YAAY,CAA4F;gBAG5G,cAAc,EAAE,UAAU,EAC1B,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,YAAY,EAC1B,OAAO,GAAE,cAA6C;IAc1D,OAAO,CAAC,YAAY,CAAQ;IAE5B;;;;OAIG;IACU,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAmGpB,YAAY;YAiCZ,WAAW;IAOzB,WAAW,IAAI,MAAM;IAIrB,SAAS,IAAI,MAAM;IAOb,QAAQ,CAAC,oBAAoB,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAQnD,SAAS,CAAC,oBAAoB,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC;IA4DnE,YAAY,CAAC,UAAU,EAAE,MAAM;IA8D/B,mBAAmB,CAAC,UAAU,EAAE,MAAM;IAStC,OAAO,CAAC,qBAAqB,CAAyC;IAEtE,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI;IAkBxC,KAAK;IAiBL;;;OAGG;IACU,eAAe,CAAC,MAAM,EAAE,MAAM;CAgB9C"}
+{"version":3,"file":"SessionManager.d.ts","sourceRoot":"","sources":["../src/SessionManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,YAAY,EAAE,cAAc,EAAE,KAAK,EAAe,MAAM,SAAS,CAAA;AAE7F,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjC,OAAO,EAAE,cAAc,EAA0B,MAAM,kBAAkB,CAAA;AAIzE,MAAM,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;AAElE,MAAM,CAAC,OAAO,OAAO,cAAc;IAC/B,OAAO,CAAC,WAAW,CAAqC;IACxD,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,cAAc,CAAY;IAClC,OAAO,CAAC,kBAAkB,CAAsC;IAChE,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,MAAM,CAAC,CAAQ;IACvB,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,YAAY,CAA4F;gBAG5G,cAAc,EAAE,UAAU,EAC1B,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,YAAY,EAC1B,OAAO,GAAE,cAA6C;IAc1D,OAAO,CAAC,YAAY,CAAQ;IAE5B;;;;OAIG;IACU,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAwGpB,YAAY;YAiCZ,WAAW;IAOzB,WAAW,IAAI,MAAM;IAIrB,SAAS,IAAI,MAAM;IAOb,QAAQ,CAAC,oBAAoB,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAQnD,SAAS,CAAC,oBAAoB,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC;IA4DnE,YAAY,CAAC,UAAU,EAAE,MAAM;IA8D/B,mBAAmB,CAAC,UAAU,EAAE,MAAM;IAStC,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,QAAQ,EAAE,eAAe;IAkBjC,KAAK;IAiBL;;;OAGG;IACU,eAAe,CAAC,MAAM,EAAE,MAAM;CAgB9C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nostr-double-ratchet",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "type": "module",
   "packageManager": "yarn@1.22.22",
   "description": "Nostr double ratchet library",

package/src/SessionManager.ts

@@ -6,6 +6,8 @@ import { StorageAdapter, InMemoryStorageAdapter } from "./StorageAdapter"
 import { serializeSessionState, deserializeSessionState } from "./utils"
 import { Session } from "./Session"
 
+export type OnEventCallback = (event: Rumor, from: string) => void
+
 export default class SessionManager {
     private userRecords: Map<string, UserRecord> = new Map()
     private nostrSubscribe: NostrSubscribe
@@ -44,6 +46,7 @@ export default class SessionManager {
      * Can be awaited by callers that need deterministic readiness.
      */
     public async init(): Promise<void> {
+        console.log("Initialising SessionManager")
         if (this._initialised) return
 
         const ourPublicKey = getPublicKey(this.ourIdentityKey)
@@ -67,7 +70,11 @@ export default class SessionManager {
         this.invite = invite
 
         // Publish our own invite
-        this.nostrPublish(invite.getEvent())?.catch(() => {})
+        console.log("Publishing our own invite", invite)
+        const event = invite.getEvent()
+        this.nostrPublish(event).then((verifiedEvent) => {
+            console.log("Invite published", verifiedEvent)
+        }).catch((e) => console.error("Failed to publish our own invite", e))
 
         // 2b. Listen for acceptances of *our* invite and create sessions
         this.invite.listen(
@@ -90,7 +97,7 @@ export default class SessionManager {
                     this.saveSession(targetUserKey, deviceKey, session)
 
                     session.onEvent((_event: Rumor) => {
-                        this.internalSubscriptions.forEach(cb => cb(_event))
+                        this.internalSubscriptions.forEach(cb => cb(_event, targetUserKey))
                     })
                 } catch {/* ignore errors */}
             }
@@ -128,7 +135,7 @@ export default class SessionManager {
                 this.saveSession(ourPublicKey, deviceId, session)
 
                 session.onEvent((_event: Rumor) => {
-                    this.internalSubscriptions.forEach(cb => cb(_event))
+                    this.internalSubscriptions.forEach(cb => cb(_event, ourPublicKey))
                 })
             } catch (err) {
                 // eslint-disable-next-line no-console
@@ -167,7 +174,7 @@ export default class SessionManager {
                 this.saveSession(ownerPubKey, deviceId, session)
 
                 session.onEvent((_event: Rumor) => {
-                    this.internalSubscriptions.forEach(cb => cb(_event))
+                    this.internalSubscriptions.forEach(cb => cb(_event, ownerPubKey))
                 })
             } catch {
                 // corrupted entry — ignore
@@ -204,7 +211,7 @@ export default class SessionManager {
     async sendEvent(recipientIdentityKey: string, event: Partial<Rumor>) {
         console.log("Sending event to", recipientIdentityKey, event)
         // Immediately notify local subscribers so that UI can render sent message optimistically
-        this.internalSubscriptions.forEach(cb => cb(event as Rumor))
+        this.internalSubscriptions.forEach(cb => cb(event as Rumor, recipientIdentityKey))
 
         const results = []
         const publishPromises: Promise<any>[] = []
@@ -295,7 +302,7 @@ export default class SessionManager {
 
                 // Register all existing callbacks on the new session
                 session.onEvent((_event: Rumor) => {
-                    this.internalSubscriptions.forEach(callback => callback(_event))
+                    this.internalSubscriptions.forEach(callback => callback(_event, userPubkey))
                 })
 
                 const queuedMessages = this.messageQueue.get(userPubkey)
@@ -332,16 +339,16 @@ export default class SessionManager {
     }
 
     // Update onEvent to include internalSubscriptions management
-    private internalSubscriptions: Set<(event: Rumor) => void> = new Set()
+    private internalSubscriptions: Set<OnEventCallback> = new Set()
 
-    onEvent(callback: (event: Rumor) => void) {
+    onEvent(callback: OnEventCallback) {
         this.internalSubscriptions.add(callback)
 
         // Subscribe to existing sessions
-        for (const userRecord of this.userRecords.values()) {
+        for (const [pubkey, userRecord] of this.userRecords.entries()) {
             for (const session of userRecord.getActiveSessions()) {
-                session.onEvent((_event: Rumor) => {
-                    callback(_event)
+                session.onEvent((event: Rumor) => {
+                    callback(event, pubkey)
                 })
             }
         }