nostr-double-ratchet 0.0.37 → 0.0.48

package/dist/types.d.ts

@@ -55,6 +55,14 @@ export type Unsubscribe = () => void;
 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>;
+/**
+ * Identity key for cryptographic operations.
+ * Either a raw private key (Uint8Array) or encrypt/decrypt functions for extension login (NIP-07).
+ */
+export type IdentityKey = Uint8Array | {
+    encrypt: EncryptFunction;
+    decrypt: DecryptFunction;
+};
 export type NostrPublish = (_event: UnsignedEvent) => Promise<VerifiedEvent>;
 export type Rumor = UnsignedEvent & {
     id: string;
@@ -74,8 +82,8 @@ export declare const MESSAGE_EVENT_KIND = 1060;
  */
 export declare const INVITE_EVENT_KIND = 30078;
 export declare const INVITE_RESPONSE_KIND = 1059;
+export declare const APP_KEYS_EVENT_KIND = 30078;
 export declare const CHAT_MESSAGE_KIND = 14;
-export declare const MAX_SKIP = 100;
 export type NostrEvent = {
     id: string;
     pubkey: string;
@@ -85,4 +93,27 @@ export type NostrEvent = {
     content: string;
     sig: string;
 };
+/**
+ * Payload for reaction messages sent through NDR.
+ * Reactions are regular messages with a JSON payload indicating they're a reaction.
+ */
+export interface ReactionPayload {
+    type: 'reaction';
+    /** ID of the message being reacted to */
+    messageId: string;
+    /** Emoji or reaction content */
+    emoji: string;
+}
+/**
+ * Kind constant for reaction inner events
+ */
+export declare const REACTION_KIND = 7;
+/**
+ * Kind constant for read/delivery receipt inner events
+ */
+export declare const RECEIPT_KIND = 15;
+/**
+ * Kind constant for typing indicator inner events
+ */
+export declare const TYPING_KIND = 25;
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEnE,MAAM,MAAM,MAAM,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,EAAE,MAAM,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAA;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,iEAAiE;IACjE,OAAO,EAAE,UAAU,CAAC;IAEpB,iDAAiD;IACjD,0BAA0B,CAAC,EAAE,MAAM,CAAC;IAEpC,8CAA8C;IAC9C,uBAAuB,EAAE,MAAM,CAAC;IAEhC,sDAAsD;IACtD,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,kGAAkG;IAClG,eAAe,EAAE,OAAO,CAAC;IAEzB,4DAA4D;IAC5D,iBAAiB,CAAC,EAAE,UAAU,CAAC;IAE/B,4DAA4D;IAC5D,eAAe,CAAC,EAAE,UAAU,CAAC;IAE7B,uDAAuD;IACvD,yBAAyB,EAAE,MAAM,CAAC;IAElC,6DAA6D;IAC7D,2BAA2B,EAAE,MAAM,CAAC;IAEpC,wDAAwD;IACxD,gCAAgC,EAAE,MAAM,CAAC;IAEzC,wEAAwE;IACxE,WAAW,EAAE;QACX,CAAC,MAAM,EAAE,MAAM,GAAG;YAChB,UAAU,EAAE,UAAU,EAAE,CAAC;YACzB,WAAW,EAAE;gBAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAAA;aAAC,CAAA;SAC9C,CAAC;KACH,CAAC;CACH;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;AAErC;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,IAAI,KAAK,WAAW,CAAC;AACrG,MAAM,MAAM,eAAe,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AACvF,MAAM,MAAM,eAAe,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AACxF,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;AAE7E,MAAM,MAAM,KAAK,GAAG,aAAa,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAA;AAElD;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,KAAK,IAAI,CAAC;AAEhF;;GAEG;AACH,eAAO,MAAM,kBAAkB,OAAO,CAAC;AAEvC;;GAEG;AACH,eAAO,MAAM,iBAAiB,QAAQ,CAAC;AAEvC,eAAO,MAAM,oBAAoB,OAAO,CAAC;AAEzC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAEpC,eAAO,MAAM,QAAQ,MAAM,CAAC;AAE5B,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/utils.d.ts

@@ -1,10 +1,28 @@
-import { Rumor, SessionState } from "./types";
+import { Rumor, SessionState, ReactionPayload } from "./types";
 import { Session } from "./Session.ts";
 export declare function serializeSessionState(state: SessionState): string;
 export declare function deserializeSessionState(data: string): SessionState;
 export declare function deepCopyState(s: SessionState): SessionState;
 export declare function createEventStream(session: Session): AsyncGenerator<Rumor, void, unknown>;
 export declare function kdf(input1: Uint8Array, input2?: Uint8Array, numOutputs?: number): Uint8Array[];
-export declare function skippedMessageIndexKey(_nostrSender: string, _number: number): string;
 export declare function getMillisecondTimestamp(event: Rumor): number;
+/**
+ * Check if a message content is a reaction payload.
+ * @param content The message content to check
+ * @returns The parsed ReactionPayload if valid, null otherwise
+ */
+export declare function parseReaction(content: string): ReactionPayload | null;
+/**
+ * Check if a message content is a reaction.
+ * @param content The message content to check
+ * @returns true if the content is a reaction payload
+ */
+export declare function isReaction(content: string): boolean;
+/**
+ * Create a reaction payload JSON string.
+ * @param messageId The ID of the message being reacted to
+ * @param emoji The emoji or reaction content
+ * @returns JSON string of the reaction payload
+ */
+export declare function createReactionPayload(messageId: string, emoji: string): string;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAMvC,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAkCjE;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAuElE;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,YAAY,GAAG,YAAY,CAgC3D;AAGD,wBAAuB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CA0B/F;AAED,wBAAgB,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,GAAE,UAA+B,EAAE,UAAU,GAAE,MAAU,GAAG,UAAU,EAAE,CAQrH;AAED,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAEpF;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,UAMnD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAMvC,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAkCjE;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAuElE;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,YAAY,GAAG,YAAY,CAgC3D;AAGD,wBAAuB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CA0B/F;AAED,wBAAgB,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,GAAE,UAA+B,EAAE,UAAU,GAAE,MAAU,GAAG,UAAU,EAAE,CAQrH;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,UAMnD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAUrE;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAO9E"}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "nostr-double-ratchet",
-  "version": "0.0.37",
+  "version": "0.0.48",
   "type": "module",
-  "packageManager": "yarn@1.22.22",
+  "packageManager": "pnpm@9.15.0",
   "description": "Nostr double ratchet library",
   "main": "dist/nostr-double-ratchet.umd.js",
   "module": "dist/nostr-double-ratchet.es.js",
@@ -12,29 +12,19 @@
     "test:once": "vitest run --exclude '**/*.integration.test.ts'",
     "test:integration": "DEBUG='ndk:*' vitest '**/*.integration.test.ts'",
     "build": "vite build && tsc",
-    "examples": "cd examples && vite build && tsc",
-    "examples-dev": "cd examples && vite && tsc",
-    "docs": "typedoc --out docs src/index.ts",
     "lint": "eslint src --ext .ts --fix"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mmalmi/nostr-double-ratchet.git"
-  },
+  "repository": "https://files.iris.to/#/npub1xndmdgymsf4a34rzr7346vp8qcptxf75pjqweh8naa8rklgxpfqqmfjtce/nostr-double-ratchet",
   "author": "Martti Malmi",
   "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/mmalmi/nostr-double-ratchet/issues"
-  },
-  "homepage": "https://github.com/mmalmi/nostr-double-ratchet",
-  "documentation": "https://mmalmi.github.io/nostr-double-ratchet/",
+  "homepage": "https://files.iris.to/#/npub1xndmdgymsf4a34rzr7346vp8qcptxf75pjqweh8naa8rklgxpfqqmfjtce/nostr-double-ratchet",
   "files": [
     "src",
     "dist"
   ],
   "devDependencies": {
+    "@noble/hashes": "^1.3.1",
     "@nostr-dev-kit/ndk": "2.14.23",
-    "@types/lodash": "^4.17.17",
     "@types/node": "^22.15.21",
     "@typescript-eslint/eslint-plugin": "^8.33.1",
     "@typescript-eslint/parser": "^8.33.1",
@@ -42,12 +32,8 @@
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-prettier": "^5.4.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "lodash": "^4.17.21",
-    "react-blurhash": "^0.3.0",
     "tsx": "^4.19.4",
-    "typedoc": "^0.28.4",
     "typescript": "^5.8.3",
-    "typescript-lru-cache": "^2.0.0",
     "vite": "^6.3.5",
     "vitest": "^3.1.4",
     "ws": "^8.18.2"

package/src/AppKeys.ts

@@ -0,0 +1,210 @@
+import { VerifiedEvent, UnsignedEvent, verifyEvent } from "nostr-tools"
+import { APP_KEYS_EVENT_KIND, NostrSubscribe, Unsubscribe } from "./types"
+
+const now = () => Math.round(Date.now() / 1000)
+
+// Simplified tag format: ["device", identityPubkey, createdAt]
+type DeviceTag = [
+  type: "device",
+  identityPubkey: string,
+  createdAt: string,
+]
+
+const isDeviceTag = (tag: string[]): tag is DeviceTag =>
+  tag.length >= 3 &&
+  tag[0] === "device" &&
+  typeof tag[1] === "string" &&
+  typeof tag[2] === "string"
+
+/**
+ * Device identity entry - contains only identity information.
+ * identityPubkey serves as the device identifier.
+ * Invite crypto material (ephemeral keys, shared secret) is in separate Invite events.
+ */
+export interface DeviceEntry {
+  /** Identity public key - also serves as device identifier */
+  identityPubkey: string
+  createdAt: number
+}
+
+/**
+ * Manages a consolidated list of device invites (kind 30078, d-tag "double-ratchet/app-keys").
+ * Single atomic event containing all device invites for a user.
+ * Uses union merge strategy for conflict resolution.
+ *
+ * Note: ownerPublicKey is not stored - it's passed to getEvent() when publishing,
+ * and NDK's signer sets the correct pubkey during signing anyway.
+ */
+export class AppKeys {
+  private devices: Map<string, DeviceEntry> = new Map()
+
+  constructor(devices: DeviceEntry[] = []) {
+    devices.forEach((device) => this.devices.set(device.identityPubkey, device))
+  }
+
+  /**
+   * Creates a new device identity entry.
+   * Note: This only creates the identity entry. The device must separately
+   * create and publish its own Invite event with ephemeral keys.
+   */
+  createDeviceEntry(identityPubkey: string): DeviceEntry {
+    return {
+      identityPubkey,
+      createdAt: now(),
+    }
+  }
+
+  addDevice(device: DeviceEntry): void {
+    if (!this.devices.has(device.identityPubkey)) {
+      this.devices.set(device.identityPubkey, device)
+    }
+  }
+
+  removeDevice(identityPubkey: string): void {
+    this.devices.delete(identityPubkey)
+  }
+
+  getDevice(identityPubkey: string): DeviceEntry | undefined {
+    return this.devices.get(identityPubkey)
+  }
+
+  getAllDevices(): DeviceEntry[] {
+    return Array.from(this.devices.values())
+  }
+
+  getEvent(): UnsignedEvent {
+    const deviceTags = this.getAllDevices().map((device) => [
+      "device",
+      device.identityPubkey,
+      String(device.createdAt),
+    ])
+
+    return {
+      kind: APP_KEYS_EVENT_KIND,
+      pubkey: "", // Signer will set this
+      content: "",
+      created_at: now(),
+      tags: [
+        ["d", "double-ratchet/app-keys"],
+        ["version", "1"],
+        ...deviceTags,
+      ],
+    }
+  }
+
+  static fromEvent(event: VerifiedEvent): AppKeys {
+    if (!event.sig) {
+      throw new Error("Event is not signed")
+    }
+    if (!verifyEvent(event)) {
+      throw new Error("Event signature is invalid")
+    }
+
+    // Simplified tag format: ["device", identityPubkey, createdAt]
+    // Note: "removed" tags are ignored for backwards compatibility with old events
+    const devices = event.tags
+      .filter(isDeviceTag)
+      .map(([, identityPubkey, createdAt]) => ({
+        identityPubkey,
+        createdAt: parseInt(createdAt, 10) || event.created_at,
+      }))
+
+    return new AppKeys(devices)
+  }
+
+  serialize(): string {
+    return JSON.stringify({
+      devices: this.getAllDevices(),
+    })
+  }
+
+  static deserialize(json: string): AppKeys {
+    const data = JSON.parse(json) as {
+      devices: DeviceEntry[]
+    }
+    return new AppKeys(data.devices)
+  }
+
+  merge(other: AppKeys): AppKeys {
+    // Merge devices, preferring the one with earlier createdAt for same identityPubkey
+    const mergedDevices = [...this.devices.values(), ...other.devices.values()]
+      .reduce((map, device) => {
+        const existing = map.get(device.identityPubkey)
+        if (!existing || device.createdAt < existing.createdAt) {
+          map.set(device.identityPubkey, device)
+        }
+        return map
+      }, new Map<string, DeviceEntry>())
+
+    return new AppKeys(Array.from(mergedDevices.values()))
+  }
+
+  /**
+   * Subscribe to AppKeys events from a user.
+   * Similar to Invite.fromUser pattern.
+   */
+  static fromUser(
+    user: string,
+    subscribe: NostrSubscribe,
+    onAppKeysList: (appKeys: AppKeys) => void
+  ): Unsubscribe {
+    return subscribe(
+      {
+        kinds: [APP_KEYS_EVENT_KIND],
+        authors: [user],
+        "#d": ["double-ratchet/app-keys"],
+      },
+      (event) => {
+        if (event.pubkey !== user) return
+        try {
+          const appKeys = AppKeys.fromEvent(event)
+          onAppKeysList(appKeys)
+        } catch {
+          // Invalid event
+        }
+      }
+    )
+  }
+
+  /**
+   * Wait for AppKeys from a user with timeout.
+   * Returns the most recent AppKeys received within the timeout, or null.
+   * Note: Uses the most recent event by created_at, not merging, since
+   * device revocation is determined by absence from the list.
+   */
+  static waitFor(
+    user: string,
+    subscribe: NostrSubscribe,
+    timeoutMs = 500
+  ): Promise<AppKeys | null> {
+    return new Promise((resolve) => {
+      let latest: { list: AppKeys; createdAt: number } | null = null
+
+      setTimeout(() => {
+        unsubscribe()
+        resolve(latest?.list ?? null)
+      }, timeoutMs)
+
+      const unsubscribe = subscribe(
+        {
+          kinds: [APP_KEYS_EVENT_KIND],
+          authors: [user],
+          "#d": ["double-ratchet/app-keys"],
+        },
+        (event) => {
+          if (event.pubkey !== user) return
+          try {
+            const list = AppKeys.fromEvent(event)
+            // Use >= to prefer later-delivered events when timestamps are equal
+            // This handles replaceable events created within the same second
+            if (!latest || event.created_at >= latest.createdAt) {
+              latest = { list, createdAt: event.created_at }
+            }
+          } catch {
+            // Invalid event
+          }
+        }
+      )
+    })
+  }
+}