@tagea/capacitor-matrix 1.0.1 → 1.1.1

package/README.md

@@ -1280,6 +1280,7 @@ removeAllListeners() => Promise<void>
 | **`roomId`**         | <code>string</code>                                              |                                                                                     |
 | **`senderId`**       | <code>string</code>                                              |                                                                                     |
 | **`type`**           | <code>string</code>                                              |                                                                                     |
+| **`stateKey`**       | <code>string</code>                                              | State key for state events (e.g. target user ID for m.room.member)                  |
 | **`content`**        | <code><a href="#record">Record</a>&lt;string, unknown&gt;</code> |                                                                                     |
 | **`originServerTs`** | <code>number</code>                                              |                                                                                     |
 | **`status`**         | <code>'sending' \| 'sent' \| 'delivered' \| 'read'</code>        | Delivery/read status for own messages: 'sending' \| 'sent' \| 'delivered' \| 'read' |

package/android/src/main/kotlin/de/tremaze/capacitor/matrix/CapMatrix.kt

@@ -65,6 +65,8 @@ class MatrixSDKBridge(private val context: Context) {
     private val timelineListenerHandles = mutableListOf<Any>()
     // Rooms currently being paginated by getRoomMessages — live listener suppresses events for these
     private val paginatingRooms = Collections.synchronizedSet(mutableSetOf<String>())
+    // Per-room tracking of the oldest event ID returned to JS, used for pagination cursor
+    private val oldestReturnedEventId = mutableMapOf<String, String>()
     private var receiptSyncJob: Job? = null
     // Receipt cache: roomId → (eventId → set of userIds who sent a read receipt)
     // Populated by the parallel v2 receipt sync since sliding sync doesn't deliver
@@ -108,6 +110,15 @@ class MatrixSDKBridge(private val context: Context) {
         userId: String,
         deviceId: String,
     ): SessionInfo {
+        // Stop existing sync and clean up stale references before replacing the client
+        syncService?.stop()
+        syncService = null
+        receiptSyncJob?.cancel()
+        receiptSyncJob = null
+        timelineListenerHandles.clear()
+        roomTimelines.clear()
+        subscribedRoomIds.clear()
+
         val safeUserId = userId.replace(Regex("[^a-zA-Z0-9_.-]"), "_")
         val dataDir = context.filesDir.resolve("matrix_sdk/$safeUserId")
         dataDir.mkdirs()
@@ -223,6 +234,15 @@ class MatrixSDKBridge(private val context: Context) {
             try {
                 val timeline = getOrCreateTimeline(room)
                 val handle = timeline.addListener(object : TimelineListener {
+                    private fun emitRoomUpdate() {
+                        scope.launch {
+                            val unreadCount = try {
+                                room.roomInfo().numUnreadMessages?.toInt() ?: 0
+                            } catch (_: Exception) { 0 }
+                            onRoomUpdate(roomId, mapOf("roomId" to roomId, "unreadCount" to unreadCount))
+                        }
+                    }
+
                     override fun onUpdate(diff: List<TimelineDiff>) {
                         // Suppress live events while getRoomMessages is paginating this room
                         if (paginatingRooms.contains(roomId)) return
@@ -235,13 +255,13 @@ class MatrixSDKBridge(private val context: Context) {
                                         if (!isLocalEcho) {
                                             serializeTimelineItem(d.value, roomId)?.let { onMessage(it) }
                                         }
-                                        onRoomUpdate(roomId, mapOf("roomId" to roomId))
+                                        emitRoomUpdate()
                                     }
                                     is TimelineDiff.Append -> {
                                         d.values.forEach { item ->
                                             serializeTimelineItem(item, roomId)?.let { onMessage(it) }
                                         }
-                                        onRoomUpdate(roomId, mapOf("roomId" to roomId))
+                                        emitRoomUpdate()
                                     }
                                     is TimelineDiff.Set -> {
                                         serializeTimelineItem(d.value, roomId)?.let { onMessage(it) }
@@ -250,15 +270,15 @@ class MatrixSDKBridge(private val context: Context) {
                                         d.values.forEach { item ->
                                             serializeTimelineItem(item, roomId)?.let { onMessage(it) }
                                         }
-                                        onRoomUpdate(roomId, mapOf("roomId" to roomId))
+                                        emitRoomUpdate()
                                     }
                                     is TimelineDiff.Insert -> {
                                         serializeTimelineItem(d.value, roomId)?.let { onMessage(it) }
-                                        onRoomUpdate(roomId, mapOf("roomId" to roomId))
+                                        emitRoomUpdate()
                                     }
                                     is TimelineDiff.PushFront -> {
                                         serializeTimelineItem(d.value, roomId)?.let { onMessage(it) }
-                                        onRoomUpdate(roomId, mapOf("roomId" to roomId))
+                                        emitRoomUpdate()
                                     }
                                     else -> { /* Remove, Clear, Truncate, PopBack, PopFront — no JS event needed */ }
                                 }
@@ -416,13 +436,21 @@ class MatrixSDKBridge(private val context: Context) {
         val collector = TimelineItemCollector(roomId)
         val handle = timeline.addListener(collector)
 
+        val isPagination = from != null
+        var hitStart = false
         try {
             // Wait for the initial Reset snapshot before paginating
             collector.waitForUpdate(timeoutMs = 5000)
+            val countBefore = collector.events.size
 
-            // Only paginate if we don't have enough items yet
-            if (collector.events.size < requestedLimit) {
-                val hitStart = timeline.paginateBackwards(requestedLimit.toUShort())
+            // Reset cursor on initial load
+            if (!isPagination) {
+                oldestReturnedEventId.remove(roomId)
+            }
+
+            // Paginate when: first load with too few items, OR explicit pagination request
+            if (isPagination || countBefore < requestedLimit) {
+                hitStart = timeline.paginateBackwards(requestedLimit.toUShort())
                 if (!hitStart) {
                     collector.waitForUpdate(timeoutMs = 5000)
                 }
@@ -432,7 +460,28 @@ class MatrixSDKBridge(private val context: Context) {
             paginatingRooms.remove(roomId)
         }
 
-        var events = collector.events.takeLast(requestedLimit).map { it.toMutableMap() }
+        val allEvents = collector.events
+        val cursorId = oldestReturnedEventId[roomId]
+
+        var events = if (isPagination && cursorId != null) {
+            // Pagination: find the cursor event and return events before it
+            val cursorIdx = allEvents.indexOfFirst { (it["eventId"] as? String) == cursorId }
+            if (cursorIdx > 0) {
+                allEvents.take(cursorIdx).takeLast(requestedLimit).map { it.toMutableMap() }
+            } else {
+                emptyList<MutableMap<String, Any?>>()
+            }
+        } else {
+            // Initial load: return newest events
+            allEvents.takeLast(requestedLimit).map { it.toMutableMap() }
+        }
+
+        // Update cursor to the oldest event we're returning
+        events.firstOrNull()?.let { oldest ->
+            (oldest["eventId"] as? String)?.let { eid ->
+                oldestReturnedEventId[roomId] = eid
+            }
+        }
 
         // Apply receipt watermark: if any own event has readBy data,
         // all earlier own events in the timeline are also read.
@@ -466,9 +515,15 @@ class MatrixSDKBridge(private val context: Context) {
             }
         }
 
+        // Return a pagination token so the JS layer knows more messages are available.
+        // The Rust SDK timeline handles pagination state internally, so we use a
+        // synthetic token ("more") to signal that further back-pagination is possible.
+        // Also stop if pagination returned no new events (timeline fully loaded).
+        val nextBatch: String? = if (hitStart || events.isEmpty()) null else "more"
+
         return mapOf(
             "events" to events,
-            "nextBatch" to null,
+            "nextBatch" to nextBatch,
         )
     }
 
@@ -709,6 +764,20 @@ class MatrixSDKBridge(private val context: Context) {
         c.encryption().waitForE2eeInitializationTasks()
     }
 
+    /**
+     * Cross-signs the given device using the current cross-signing keys.
+     * After recoverAndSetup (which calls recover + waitForE2eeInitializationTasks),
+     * the SDK should already have cross-signed this device. This method ensures
+     * the E2EE initialization is complete and then resolves.
+     */
+    suspend fun verifyDevice(deviceId: String) {
+        val c = requireClient()
+        val enc = c.encryption()
+        // Ensure cross-signing keys are fully imported and the device is signed
+        enc.waitForE2eeInitializationTasks()
+        android.util.Log.d("CapMatrix", "verifyDevice($deviceId) — verificationState: ${enc.verificationState()}")
+    }
+
     suspend fun getEncryptionStatus(): Map<String, Any?> {
         val c = requireClient()
         val enc = c.encryption()
@@ -720,6 +789,15 @@ class MatrixSDKBridge(private val context: Context) {
         val verificationState = enc.verificationState()
         val isVerified = verificationState == VerificationState.VERIFIED
 
+        // recoveryState reflects the LOCAL device's state (.DISABLED on a returning
+        // device that hasn't recovered yet).  To decide whether encryption was
+        // set up server-side we also check if a backup exists on the server.
+        val ssReady = if (recoveryState == RecoveryState.ENABLED) {
+            true
+        } else {
+            try { enc.backupExistsOnServer() } catch (_: Exception) { false }
+        }
+
         return mapOf(
             "isCrossSigningReady" to isVerified,
             "crossSigningStatus" to mapOf(
@@ -729,7 +807,7 @@ class MatrixSDKBridge(private val context: Context) {
                 "isReady" to isVerified,
             ),
             "isKeyBackupEnabled" to isBackupEnabled,
-            "isSecretStorageReady" to (recoveryState == RecoveryState.ENABLED),
+            "isSecretStorageReady" to ssReady,
         )
     }
 
@@ -798,10 +876,103 @@ class MatrixSDKBridge(private val context: Context) {
         return c.encryption().recoveryState() == RecoveryState.ENABLED
     }
 
-    suspend fun recoverAndSetup(recoveryKey: String) {
+    suspend fun recoverAndSetup(recoveryKey: String?, passphrase: String?) {
         val c = requireClient()
-        c.encryption().recover(recoveryKey)
+        val key = recoveryKey ?: passphrase?.let { deriveRecoveryKeyFromPassphrase(c, it) }
+            ?: throw IllegalArgumentException("recoveryKey or passphrase required")
+
+        val enc = c.encryption()
+        enc.recover(key)
+
+        // Wait for the SDK to finish importing cross-signing keys and
+        // verifying the current device after recovery.
+        enc.waitForE2eeInitializationTasks()
+
+        // Enable key backup if not already active
+        if (enc.backupState() != BackupState.ENABLED) {
+            try { enc.enableBackups() } catch (_: Exception) { }
+        }
+    }
+
+    // region Passphrase → recovery key derivation
+
+    /**
+     * Derive a Matrix recovery key from a passphrase using PBKDF2 params
+     * stored in the account's secret storage.
+     */
+    private suspend fun deriveRecoveryKeyFromPassphrase(client: Client, passphrase: String): String {
+        // 1. Get the default key ID
+        val defaultKeyJson = client.accountData("m.secret_storage.default_key")
+            ?: throw IllegalStateException("No default secret storage key found")
+        val defaultKeyMap = org.json.JSONObject(defaultKeyJson)
+        val keyId = defaultKeyMap.getString("key")
+
+        // 2. Get the key info with PBKDF2 params
+        val keyInfoJson = client.accountData("m.secret_storage.key.$keyId")
+            ?: throw IllegalStateException("Secret storage key info not found for $keyId")
+        val keyInfoMap = org.json.JSONObject(keyInfoJson)
+        val ppObj = keyInfoMap.optJSONObject("passphrase")
+            ?: throw IllegalStateException("Secret storage key has no passphrase params — use recovery key instead")
+        val salt = ppObj.getString("salt")
+        val iterations = ppObj.getInt("iterations")
+        val bits = ppObj.optInt("bits", 256)
+
+        // 3. PBKDF2-SHA-512 derivation
+        val factory = javax.crypto.SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512")
+        val spec = javax.crypto.spec.PBEKeySpec(
+            passphrase.toCharArray(),
+            salt.toByteArray(Charsets.UTF_8),
+            iterations,
+            bits,
+        )
+        val derivedBytes = factory.generateSecret(spec).encoded
+
+        // 4. Encode as Matrix recovery key
+        return encodeRecoveryKey(derivedBytes)
+    }
+
+    /**
+     * Encode raw key bytes as a Matrix recovery key (base58 with 0x8b01 prefix + parity byte).
+     */
+    private fun encodeRecoveryKey(keyData: ByteArray): String {
+        val prefix = byteArrayOf(0x8b.toByte(), 0x01)
+        val buf = prefix + keyData
+        var parity: Byte = 0
+        for (b in buf) parity = (parity.toInt() xor b.toInt()).toByte()
+        val full = buf + byteArrayOf(parity)
+        val encoded = base58Encode(full)
+        return encoded.chunked(4).joinToString(" ")
+    }
+
+    private val base58Alphabet = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz".toCharArray()
+
+    private fun base58Encode(data: ByteArray): String {
+        var bytes = data.toMutableList()
+        val result = mutableListOf<Char>()
+
+        while (bytes.isNotEmpty()) {
+            var carry = 0
+            val newBytes = mutableListOf<Byte>()
+            for (b in bytes) {
+                carry = carry * 256 + (b.toInt() and 0xFF)
+                if (newBytes.isNotEmpty() || carry / 58 > 0) {
+                    newBytes.add((carry / 58).toByte())
+                }
+                carry %= 58
+            }
+            result.add(base58Alphabet[carry])
+            bytes = newBytes
+        }
+
+        // Preserve leading zeros
+        for (b in data) {
+            if (b.toInt() != 0) break
+            result.add(base58Alphabet[0])
+        }
+
+        return result.reversed().joinToString("")
     }
+    // endregion
 
     suspend fun resetRecoveryKey(): Map<String, Any?> {
         val c = requireClient()

package/android/src/main/kotlin/de/tremaze/capacitor/matrix/CapMatrixPlugin.kt

@@ -514,6 +514,20 @@ class MatrixPlugin : Plugin() {
         }
     }
 
+    @PluginMethod
+    fun verifyDevice(call: PluginCall) {
+        val deviceId = call.getString("deviceId") ?: return call.reject("Missing deviceId")
+
+        scope.launch {
+            try {
+                bridge.verifyDevice(deviceId)
+                call.resolve()
+            } catch (e: Exception) {
+                call.reject(e.message ?: "verifyDevice failed", e)
+            }
+        }
+    }
+
     @PluginMethod
     fun setPusher(call: PluginCall) {
         call.reject("setPusher is not yet supported on this platform")
@@ -733,12 +747,16 @@ class MatrixPlugin : Plugin() {
 
     @PluginMethod
     fun recoverAndSetup(call: PluginCall) {
-        val recoveryKey = call.getString("recoveryKey") ?: call.getString("passphrase")
-            ?: return call.reject("Missing recoveryKey or passphrase")
+        val recoveryKey = call.getString("recoveryKey")
+        val passphrase = call.getString("passphrase")
+
+        if (recoveryKey == null && passphrase == null) {
+            return call.reject("Missing recoveryKey or passphrase")
+        }
 
         scope.launch {
             try {
-                bridge.recoverAndSetup(recoveryKey)
+                bridge.recoverAndSetup(recoveryKey = recoveryKey, passphrase = passphrase)
                 call.resolve()
             } catch (e: Exception) {
                 call.reject(e.message ?: "recoverAndSetup failed", e)

package/dist/docs.json

@@ -1466,6 +1466,13 @@
           "complexTypes": [],
           "type": "string"
         },
+        {
+          "name": "stateKey",
+          "tags": [],
+          "docs": "State key for state events (e.g. target user ID for m.room.member)",
+          "complexTypes": [],
+          "type": "string | undefined"
+        },
         {
           "name": "content",
           "tags": [],

package/dist/esm/definitions.d.ts

@@ -104,6 +104,8 @@ export interface MatrixEvent {
     roomId: string;
     senderId: string;
     type: string;
+    /** State key for state events (e.g. target user ID for m.room.member) */
+    stateKey?: string;
     content: Record<string, unknown>;
     originServerTs: number;
     /** Delivery/read status for own messages: 'sending' | 'sent' | 'delivered' | 'read' */

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import type { PluginListenerHandle } from '@capacitor/core';\n\n// Auth & Session\n\nexport interface LoginOptions {\n  homeserverUrl: string;\n  userId: string;\n  password: string;\n}\n\nexport interface LoginWithTokenOptions {\n  homeserverUrl: string;\n  accessToken: string;\n  userId: string;\n  deviceId: string;\n}\n\nexport interface SessionInfo {\n  accessToken: string;\n  userId: string;\n  deviceId: string;\n  homeserverUrl: string;\n}\n\n// Messaging\n\nexport interface SendMessageOptions {\n  roomId: string;\n  body: string;\n  msgtype?: 'm.text' | 'm.notice' | 'm.emote' | 'm.image' | 'm.audio' | 'm.video' | 'm.file';\n  fileUri?: string;\n  fileName?: string;\n  mimeType?: string;\n  fileSize?: number;\n  /** Audio/video duration in milliseconds (sets info.duration per Matrix spec) */\n  duration?: number;\n  /** Image/video width in pixels (sets info.w per Matrix spec) */\n  width?: number;\n  /** Image/video height in pixels (sets info.h per Matrix spec) */\n  height?: number;\n}\n\n// Presence\n\nexport interface PresenceInfo {\n  presence: 'online' | 'offline' | 'unavailable';\n  statusMsg?: string;\n  lastActiveAgo?: number;\n}\n\n// Typing\n\nexport interface TypingEvent {\n  roomId: string;\n  userIds: string[];\n}\n\nexport interface ReceiptReceivedEvent {\n  roomId: string;\n  /** The event that was read */\n  eventId: string;\n  /** The user who sent the read receipt */\n  userId: string;\n}\n\nexport interface PresenceChangedEvent {\n  userId: string;\n  presence: PresenceInfo;\n}\n\n// Edit & Reply\n\nexport interface EditMessageOptions {\n  roomId: string;\n  eventId: string;\n  newBody: string;\n  /** Required when editing a media message; must match the original msgtype */\n  msgtype?: 'm.text' | 'm.notice' | 'm.emote' | 'm.image' | 'm.audio' | 'm.video' | 'm.file';\n  /** New file to replace the media content (optional for caption-only edits) */\n  fileUri?: string;\n  fileName?: string;\n  mimeType?: string;\n  fileSize?: number;\n  /** Audio/video duration in milliseconds */\n  duration?: number;\n  /** Image/video width in pixels */\n  width?: number;\n  /** Image/video height in pixels */\n  height?: number;\n}\n\nexport interface SendReplyOptions {\n  roomId: string;\n  body: string;\n  replyToEventId: string;\n  msgtype?: 'm.text' | 'm.notice' | 'm.emote' | 'm.image' | 'm.audio' | 'm.video' | 'm.file';\n  fileUri?: string;\n  fileName?: string;\n  mimeType?: string;\n  fileSize?: number;\n  /** Audio/video duration in milliseconds (sets info.duration per Matrix spec) */\n  duration?: number;\n  /** Image/video width in pixels (sets info.w per Matrix spec) */\n  width?: number;\n  /** Image/video height in pixels (sets info.h per Matrix spec) */\n  height?: number;\n}\n\n// Upload\n\nexport interface UploadContentOptions {\n  fileUri: string;\n  fileName: string;\n  mimeType: string;\n}\n\nexport interface UploadContentResult {\n  contentUri: string;\n}\n\n// Thumbnail\n\nexport interface ThumbnailUrlOptions {\n  mxcUrl: string;\n  width: number;\n  height: number;\n  method?: 'scale' | 'crop';\n}\n\nexport interface MatrixEvent {\n  eventId: string;\n  roomId: string;\n  senderId: string;\n  type: string;\n  content: Record<string, unknown>;\n  originServerTs: number;\n  /** Delivery/read status for own messages: 'sending' | 'sent' | 'delivered' | 'read' */\n  status?: 'sending' | 'sent' | 'delivered' | 'read';\n  /** User IDs that have read this event */\n  readBy?: string[];\n  /** Unsigned data (e.g. m.relations for edits, transaction_id for local echo) */\n  unsigned?: Record<string, unknown>;\n}\n\n// Rooms\n\nexport interface RoomSummary {\n  roomId: string;\n  name: string;\n  topic?: string;\n  memberCount: number;\n  isEncrypted: boolean;\n  unreadCount: number;\n  lastEventTs?: number;\n  membership?: 'join' | 'invite' | 'leave' | 'ban';\n  avatarUrl?: string;\n  isDirect?: boolean;\n}\n\nexport interface RoomMember {\n  userId: string;\n  displayName?: string;\n  membership: 'join' | 'invite' | 'leave' | 'ban';\n  avatarUrl?: string;\n}\n\n// Device Management\n\nexport interface DeviceInfo {\n  deviceId: string;\n  displayName?: string;\n  lastSeenTs?: number;\n  lastSeenIp?: string;\n  /** Whether this device is verified via cross-signing */\n  isCrossSigningVerified?: boolean;\n}\n\n// Pusher\n\nexport interface PusherOptions {\n  pushkey: string;\n  kind: string | null;\n  appId: string;\n  appDisplayName: string;\n  deviceDisplayName: string;\n  lang: string;\n  data: { url: string; format?: string };\n}\n\n// User Discovery\n\nexport interface UserProfile {\n  userId: string;\n  displayName?: string;\n  avatarUrl?: string;\n}\n\n// Encryption\n\nexport interface CrossSigningStatus {\n  hasMaster: boolean;\n  hasSelfSigning: boolean;\n  hasUserSigning: boolean;\n  isReady: boolean;\n}\n\nexport interface KeyBackupStatus {\n  exists: boolean;\n  version?: string;\n  enabled: boolean;\n}\n\nexport interface RecoveryKeyInfo {\n  recoveryKey: string;\n}\n\nexport interface EncryptionStatus {\n  isCrossSigningReady: boolean;\n  crossSigningStatus: CrossSigningStatus;\n  isKeyBackupEnabled: boolean;\n  keyBackupVersion?: string;\n  isSecretStorageReady: boolean;\n}\n\n// Events & Sync\n\nexport type SyncState = 'INITIAL' | 'SYNCING' | 'ERROR' | 'STOPPED';\n\nexport interface SyncStateChangeEvent {\n  state: SyncState;\n  error?: string;\n}\n\nexport interface MessageReceivedEvent {\n  event: MatrixEvent;\n}\n\nexport interface RoomUpdatedEvent {\n  roomId: string;\n  summary: RoomSummary;\n}\n\n// Plugin Interface\n\nexport interface MatrixPlugin {\n  // Auth\n  login(options: LoginOptions): Promise<SessionInfo>;\n  loginWithToken(options: LoginWithTokenOptions): Promise<SessionInfo>;\n  logout(): Promise<void>;\n  getSession(): Promise<SessionInfo | null>;\n\n  // Sync\n  startSync(): Promise<void>;\n  stopSync(): Promise<void>;\n  getSyncState(): Promise<{ state: SyncState }>;\n\n  // Rooms\n  createRoom(options: {\n    name?: string;\n    topic?: string;\n    isEncrypted?: boolean;\n    isDirect?: boolean;\n    invite?: string[];\n    preset?: 'private_chat' | 'trusted_private_chat' | 'public_chat';\n    historyVisibility?: 'invited' | 'joined' | 'shared' | 'world_readable';\n  }): Promise<{ roomId: string }>;\n  getRooms(): Promise<{ rooms: RoomSummary[] }>;\n  getRoomMembers(options: { roomId: string }): Promise<{ members: RoomMember[] }>;\n  joinRoom(options: { roomIdOrAlias: string }): Promise<{ roomId: string }>;\n  leaveRoom(options: { roomId: string }): Promise<void>;\n  forgetRoom(options: { roomId: string }): Promise<void>;\n\n  // Messaging\n  sendMessage(options: SendMessageOptions): Promise<{ eventId: string }>;\n  editMessage(options: EditMessageOptions): Promise<{ eventId: string }>;\n  sendReply(options: SendReplyOptions): Promise<{ eventId: string }>;\n  getRoomMessages(options: {\n    roomId: string;\n    limit?: number;\n    from?: string;\n  }): Promise<{ events: MatrixEvent[]; nextBatch?: string }>;\n  markRoomAsRead(options: {\n    roomId: string;\n    eventId: string;\n  }): Promise<void>;\n  refreshEventStatuses(options: {\n    roomId: string;\n    eventIds: string[];\n  }): Promise<{ events: MatrixEvent[] }>;\n  redactEvent(options: {\n    roomId: string;\n    eventId: string;\n    reason?: string;\n  }): Promise<void>;\n  sendReaction(options: {\n    roomId: string;\n    eventId: string;\n    key: string;\n  }): Promise<{ eventId: string }>;\n\n  // Room Management\n  setRoomName(options: { roomId: string; name: string }): Promise<void>;\n  setRoomTopic(options: { roomId: string; topic: string }): Promise<void>;\n  setRoomAvatar(options: { roomId: string; mxcUrl: string }): Promise<void>;\n  inviteUser(options: { roomId: string; userId: string }): Promise<void>;\n  kickUser(options: { roomId: string; userId: string; reason?: string }): Promise<void>;\n  banUser(options: { roomId: string; userId: string; reason?: string }): Promise<void>;\n  unbanUser(options: { roomId: string; userId: string }): Promise<void>;\n\n  // Typing\n  sendTyping(options: {\n    roomId: string;\n    isTyping: boolean;\n    timeout?: number;\n  }): Promise<void>;\n\n  // Media\n  getMediaUrl(options: { mxcUrl: string }): Promise<{ httpUrl: string }>;\n  getThumbnailUrl(options: ThumbnailUrlOptions): Promise<{ httpUrl: string }>;\n  uploadContent(options: UploadContentOptions): Promise<UploadContentResult>;\n\n  // User Discovery\n  searchUsers(options: {\n    searchTerm: string;\n    limit?: number;\n  }): Promise<{ results: UserProfile[]; limited: boolean }>;\n\n  // Presence\n  setPresence(options: {\n    presence: 'online' | 'offline' | 'unavailable';\n    statusMsg?: string;\n  }): Promise<void>;\n  getPresence(options: { userId: string }): Promise<PresenceInfo>;\n\n  // Device Management\n  getDevices(): Promise<{ devices: DeviceInfo[] }>;\n  deleteDevice(options: { deviceId: string; auth?: Record<string, unknown> }): Promise<void>;\n  verifyDevice(options: { deviceId: string }): Promise<void>;\n\n  // Push\n  setPusher(options: PusherOptions): Promise<void>;\n\n  // Encryption\n  initializeCrypto(): Promise<void>;\n  getEncryptionStatus(): Promise<EncryptionStatus>;\n  bootstrapCrossSigning(): Promise<void>;\n  setupKeyBackup(): Promise<KeyBackupStatus>;\n  getKeyBackupStatus(): Promise<KeyBackupStatus>;\n  restoreKeyBackup(options?: {\n    recoveryKey?: string;\n  }): Promise<{ importedKeys: number }>;\n  setupRecovery(options?: {\n    passphrase?: string;\n    /**\n     * Passphrase for the *existing* secret storage key, used by\n     * bootstrapSecretStorage to decrypt and migrate the current cross-signing\n     * and backup secrets into the newly created SSSS. Only needed on web;\n     * native platforms (Rust SDK) handle the migration internally.\n     */\n    existingPassphrase?: string;\n  }): Promise<RecoveryKeyInfo>;\n  /** Wipe all local Matrix state (crypto DB, session, caches). */\n  clearAllData(): Promise<void>;\n  isRecoveryEnabled(): Promise<{ enabled: boolean }>;\n  recoverAndSetup(options: {\n    recoveryKey?: string;\n    passphrase?: string;\n  }): Promise<void>;\n  resetRecoveryKey(options?: {\n    passphrase?: string;\n  }): Promise<RecoveryKeyInfo>;\n  exportRoomKeys(options: {\n    passphrase: string;\n  }): Promise<{ data: string }>;\n  importRoomKeys(options: {\n    data: string;\n    passphrase: string;\n  }): Promise<{ importedKeys: number }>;\n\n  // Listeners\n  addListener(\n    event: 'syncStateChange',\n    listenerFunc: (data: SyncStateChangeEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  addListener(\n    event: 'messageReceived',\n    listenerFunc: (data: MessageReceivedEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  addListener(\n    event: 'roomUpdated',\n    listenerFunc: (data: RoomUpdatedEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  addListener(\n    event: 'typingChanged',\n    listenerFunc: (data: TypingEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  addListener(\n    event: 'receiptReceived',\n    listenerFunc: (data: ReceiptReceivedEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  addListener(\n    event: 'presenceChanged',\n    listenerFunc: (data: PresenceChangedEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  removeAllListeners(): Promise<void>;\n}\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import type { PluginListenerHandle } from '@capacitor/core';\n\n// Auth & Session\n\nexport interface LoginOptions {\n  homeserverUrl: string;\n  userId: string;\n  password: string;\n}\n\nexport interface LoginWithTokenOptions {\n  homeserverUrl: string;\n  accessToken: string;\n  userId: string;\n  deviceId: string;\n}\n\nexport interface SessionInfo {\n  accessToken: string;\n  userId: string;\n  deviceId: string;\n  homeserverUrl: string;\n}\n\n// Messaging\n\nexport interface SendMessageOptions {\n  roomId: string;\n  body: string;\n  msgtype?: 'm.text' | 'm.notice' | 'm.emote' | 'm.image' | 'm.audio' | 'm.video' | 'm.file';\n  fileUri?: string;\n  fileName?: string;\n  mimeType?: string;\n  fileSize?: number;\n  /** Audio/video duration in milliseconds (sets info.duration per Matrix spec) */\n  duration?: number;\n  /** Image/video width in pixels (sets info.w per Matrix spec) */\n  width?: number;\n  /** Image/video height in pixels (sets info.h per Matrix spec) */\n  height?: number;\n}\n\n// Presence\n\nexport interface PresenceInfo {\n  presence: 'online' | 'offline' | 'unavailable';\n  statusMsg?: string;\n  lastActiveAgo?: number;\n}\n\n// Typing\n\nexport interface TypingEvent {\n  roomId: string;\n  userIds: string[];\n}\n\nexport interface ReceiptReceivedEvent {\n  roomId: string;\n  /** The event that was read */\n  eventId: string;\n  /** The user who sent the read receipt */\n  userId: string;\n}\n\nexport interface PresenceChangedEvent {\n  userId: string;\n  presence: PresenceInfo;\n}\n\n// Edit & Reply\n\nexport interface EditMessageOptions {\n  roomId: string;\n  eventId: string;\n  newBody: string;\n  /** Required when editing a media message; must match the original msgtype */\n  msgtype?: 'm.text' | 'm.notice' | 'm.emote' | 'm.image' | 'm.audio' | 'm.video' | 'm.file';\n  /** New file to replace the media content (optional for caption-only edits) */\n  fileUri?: string;\n  fileName?: string;\n  mimeType?: string;\n  fileSize?: number;\n  /** Audio/video duration in milliseconds */\n  duration?: number;\n  /** Image/video width in pixels */\n  width?: number;\n  /** Image/video height in pixels */\n  height?: number;\n}\n\nexport interface SendReplyOptions {\n  roomId: string;\n  body: string;\n  replyToEventId: string;\n  msgtype?: 'm.text' | 'm.notice' | 'm.emote' | 'm.image' | 'm.audio' | 'm.video' | 'm.file';\n  fileUri?: string;\n  fileName?: string;\n  mimeType?: string;\n  fileSize?: number;\n  /** Audio/video duration in milliseconds (sets info.duration per Matrix spec) */\n  duration?: number;\n  /** Image/video width in pixels (sets info.w per Matrix spec) */\n  width?: number;\n  /** Image/video height in pixels (sets info.h per Matrix spec) */\n  height?: number;\n}\n\n// Upload\n\nexport interface UploadContentOptions {\n  fileUri: string;\n  fileName: string;\n  mimeType: string;\n}\n\nexport interface UploadContentResult {\n  contentUri: string;\n}\n\n// Thumbnail\n\nexport interface ThumbnailUrlOptions {\n  mxcUrl: string;\n  width: number;\n  height: number;\n  method?: 'scale' | 'crop';\n}\n\nexport interface MatrixEvent {\n  eventId: string;\n  roomId: string;\n  senderId: string;\n  type: string;\n  /** State key for state events (e.g. target user ID for m.room.member) */\n  stateKey?: string;\n  content: Record<string, unknown>;\n  originServerTs: number;\n  /** Delivery/read status for own messages: 'sending' | 'sent' | 'delivered' | 'read' */\n  status?: 'sending' | 'sent' | 'delivered' | 'read';\n  /** User IDs that have read this event */\n  readBy?: string[];\n  /** Unsigned data (e.g. m.relations for edits, transaction_id for local echo) */\n  unsigned?: Record<string, unknown>;\n}\n\n// Rooms\n\nexport interface RoomSummary {\n  roomId: string;\n  name: string;\n  topic?: string;\n  memberCount: number;\n  isEncrypted: boolean;\n  unreadCount: number;\n  lastEventTs?: number;\n  membership?: 'join' | 'invite' | 'leave' | 'ban';\n  avatarUrl?: string;\n  isDirect?: boolean;\n}\n\nexport interface RoomMember {\n  userId: string;\n  displayName?: string;\n  membership: 'join' | 'invite' | 'leave' | 'ban';\n  avatarUrl?: string;\n}\n\n// Device Management\n\nexport interface DeviceInfo {\n  deviceId: string;\n  displayName?: string;\n  lastSeenTs?: number;\n  lastSeenIp?: string;\n  /** Whether this device is verified via cross-signing */\n  isCrossSigningVerified?: boolean;\n}\n\n// Pusher\n\nexport interface PusherOptions {\n  pushkey: string;\n  kind: string | null;\n  appId: string;\n  appDisplayName: string;\n  deviceDisplayName: string;\n  lang: string;\n  data: { url: string; format?: string };\n}\n\n// User Discovery\n\nexport interface UserProfile {\n  userId: string;\n  displayName?: string;\n  avatarUrl?: string;\n}\n\n// Encryption\n\nexport interface CrossSigningStatus {\n  hasMaster: boolean;\n  hasSelfSigning: boolean;\n  hasUserSigning: boolean;\n  isReady: boolean;\n}\n\nexport interface KeyBackupStatus {\n  exists: boolean;\n  version?: string;\n  enabled: boolean;\n}\n\nexport interface RecoveryKeyInfo {\n  recoveryKey: string;\n}\n\nexport interface EncryptionStatus {\n  isCrossSigningReady: boolean;\n  crossSigningStatus: CrossSigningStatus;\n  isKeyBackupEnabled: boolean;\n  keyBackupVersion?: string;\n  isSecretStorageReady: boolean;\n}\n\n// Events & Sync\n\nexport type SyncState = 'INITIAL' | 'SYNCING' | 'ERROR' | 'STOPPED';\n\nexport interface SyncStateChangeEvent {\n  state: SyncState;\n  error?: string;\n}\n\nexport interface MessageReceivedEvent {\n  event: MatrixEvent;\n}\n\nexport interface RoomUpdatedEvent {\n  roomId: string;\n  summary: RoomSummary;\n}\n\n// Plugin Interface\n\nexport interface MatrixPlugin {\n  // Auth\n  login(options: LoginOptions): Promise<SessionInfo>;\n  loginWithToken(options: LoginWithTokenOptions): Promise<SessionInfo>;\n  logout(): Promise<void>;\n  getSession(): Promise<SessionInfo | null>;\n\n  // Sync\n  startSync(): Promise<void>;\n  stopSync(): Promise<void>;\n  getSyncState(): Promise<{ state: SyncState }>;\n\n  // Rooms\n  createRoom(options: {\n    name?: string;\n    topic?: string;\n    isEncrypted?: boolean;\n    isDirect?: boolean;\n    invite?: string[];\n    preset?: 'private_chat' | 'trusted_private_chat' | 'public_chat';\n    historyVisibility?: 'invited' | 'joined' | 'shared' | 'world_readable';\n  }): Promise<{ roomId: string }>;\n  getRooms(): Promise<{ rooms: RoomSummary[] }>;\n  getRoomMembers(options: { roomId: string }): Promise<{ members: RoomMember[] }>;\n  joinRoom(options: { roomIdOrAlias: string }): Promise<{ roomId: string }>;\n  leaveRoom(options: { roomId: string }): Promise<void>;\n  forgetRoom(options: { roomId: string }): Promise<void>;\n\n  // Messaging\n  sendMessage(options: SendMessageOptions): Promise<{ eventId: string }>;\n  editMessage(options: EditMessageOptions): Promise<{ eventId: string }>;\n  sendReply(options: SendReplyOptions): Promise<{ eventId: string }>;\n  getRoomMessages(options: {\n    roomId: string;\n    limit?: number;\n    from?: string;\n  }): Promise<{ events: MatrixEvent[]; nextBatch?: string }>;\n  markRoomAsRead(options: {\n    roomId: string;\n    eventId: string;\n  }): Promise<void>;\n  refreshEventStatuses(options: {\n    roomId: string;\n    eventIds: string[];\n  }): Promise<{ events: MatrixEvent[] }>;\n  redactEvent(options: {\n    roomId: string;\n    eventId: string;\n    reason?: string;\n  }): Promise<void>;\n  sendReaction(options: {\n    roomId: string;\n    eventId: string;\n    key: string;\n  }): Promise<{ eventId: string }>;\n\n  // Room Management\n  setRoomName(options: { roomId: string; name: string }): Promise<void>;\n  setRoomTopic(options: { roomId: string; topic: string }): Promise<void>;\n  setRoomAvatar(options: { roomId: string; mxcUrl: string }): Promise<void>;\n  inviteUser(options: { roomId: string; userId: string }): Promise<void>;\n  kickUser(options: { roomId: string; userId: string; reason?: string }): Promise<void>;\n  banUser(options: { roomId: string; userId: string; reason?: string }): Promise<void>;\n  unbanUser(options: { roomId: string; userId: string }): Promise<void>;\n\n  // Typing\n  sendTyping(options: {\n    roomId: string;\n    isTyping: boolean;\n    timeout?: number;\n  }): Promise<void>;\n\n  // Media\n  getMediaUrl(options: { mxcUrl: string }): Promise<{ httpUrl: string }>;\n  getThumbnailUrl(options: ThumbnailUrlOptions): Promise<{ httpUrl: string }>;\n  uploadContent(options: UploadContentOptions): Promise<UploadContentResult>;\n\n  // User Discovery\n  searchUsers(options: {\n    searchTerm: string;\n    limit?: number;\n  }): Promise<{ results: UserProfile[]; limited: boolean }>;\n\n  // Presence\n  setPresence(options: {\n    presence: 'online' | 'offline' | 'unavailable';\n    statusMsg?: string;\n  }): Promise<void>;\n  getPresence(options: { userId: string }): Promise<PresenceInfo>;\n\n  // Device Management\n  getDevices(): Promise<{ devices: DeviceInfo[] }>;\n  deleteDevice(options: { deviceId: string; auth?: Record<string, unknown> }): Promise<void>;\n  verifyDevice(options: { deviceId: string }): Promise<void>;\n\n  // Push\n  setPusher(options: PusherOptions): Promise<void>;\n\n  // Encryption\n  initializeCrypto(): Promise<void>;\n  getEncryptionStatus(): Promise<EncryptionStatus>;\n  bootstrapCrossSigning(): Promise<void>;\n  setupKeyBackup(): Promise<KeyBackupStatus>;\n  getKeyBackupStatus(): Promise<KeyBackupStatus>;\n  restoreKeyBackup(options?: {\n    recoveryKey?: string;\n  }): Promise<{ importedKeys: number }>;\n  setupRecovery(options?: {\n    passphrase?: string;\n    /**\n     * Passphrase for the *existing* secret storage key, used by\n     * bootstrapSecretStorage to decrypt and migrate the current cross-signing\n     * and backup secrets into the newly created SSSS. Only needed on web;\n     * native platforms (Rust SDK) handle the migration internally.\n     */\n    existingPassphrase?: string;\n  }): Promise<RecoveryKeyInfo>;\n  /** Wipe all local Matrix state (crypto DB, session, caches). */\n  clearAllData(): Promise<void>;\n  isRecoveryEnabled(): Promise<{ enabled: boolean }>;\n  recoverAndSetup(options: {\n    recoveryKey?: string;\n    passphrase?: string;\n  }): Promise<void>;\n  resetRecoveryKey(options?: {\n    passphrase?: string;\n  }): Promise<RecoveryKeyInfo>;\n  exportRoomKeys(options: {\n    passphrase: string;\n  }): Promise<{ data: string }>;\n  importRoomKeys(options: {\n    data: string;\n    passphrase: string;\n  }): Promise<{ importedKeys: number }>;\n\n  // Listeners\n  addListener(\n    event: 'syncStateChange',\n    listenerFunc: (data: SyncStateChangeEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  addListener(\n    event: 'messageReceived',\n    listenerFunc: (data: MessageReceivedEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  addListener(\n    event: 'roomUpdated',\n    listenerFunc: (data: RoomUpdatedEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  addListener(\n    event: 'typingChanged',\n    listenerFunc: (data: TypingEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  addListener(\n    event: 'receiptReceived',\n    listenerFunc: (data: ReceiptReceivedEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  addListener(\n    event: 'presenceChanged',\n    listenerFunc: (data: PresenceChangedEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  removeAllListeners(): Promise<void>;\n}\n"]}

package/dist/esm/web.js

@@ -1,7 +1,8 @@
 import { WebPlugin } from '@capacitor/core';
+import { initAsync as initCryptoWasm } from '@matrix-org/matrix-sdk-crypto-wasm';
 import { createClient, ClientEvent, RoomEvent, RoomMemberEvent, Direction, MsgType, EventType, RelationType, UserEvent, } from 'matrix-js-sdk';
-import { decodeRecoveryKey } from 'matrix-js-sdk/lib/crypto-api/recovery-key';
 import { deriveRecoveryKeyFromPassphrase } from 'matrix-js-sdk/lib/crypto-api/key-passphrase';
+import { decodeRecoveryKey } from 'matrix-js-sdk/lib/crypto-api/recovery-key';
 const SESSION_KEY = 'matrix_session';
 export class MatrixWeb extends WebPlugin {
     constructor() {
@@ -137,8 +138,11 @@ export class MatrixWeb extends WebPlugin {
                 error: (_a = data === null || data === void 0 ? void 0 : data.error) === null || _a === void 0 ? void 0 : _a.message,
             });
         });
-        this.client.on(RoomEvent.Timeline, (event, room) => {
+        this.client.on(RoomEvent.Timeline, (event, room, toStartOfTimeline) => {
             var _a;
+            // Skip back-paginated events — they're loaded via getRoomMessages.
+            if (toStartOfTimeline)
+                return;
             this.notifyListeners('messageReceived', {
                 event: this.serializeEvent(event, room === null || room === void 0 ? void 0 : room.roomId),
             });
@@ -444,7 +448,6 @@ export class MatrixWeb extends WebPlugin {
                 return t !== EventType.Reaction && t !== EventType.RoomRedaction;
             });
             const events = displayableEvents
-                .slice(-limit)
                 .map((e) => this.serializeEvent(e, options.roomId))
                 .sort((a, b) => a.originServerTs - b.originServerTs);
             const backToken = (_b = timeline.getPaginationToken(Direction.Backward)) !== null && _b !== void 0 ? _b : undefined;
@@ -666,6 +669,18 @@ export class MatrixWeb extends WebPlugin {
     async initializeCrypto() {
         var _a, _b;
         this.requireClient();
+        // Pre-initialize the WASM module with a root-relative URL before
+        // matrix-js-sdk tries with a URL relative to the bundled chunk
+        // (which breaks in bundlers like esbuild/Vite that relocate modules).
+        // The host app must serve the WASM file at /matrix_sdk_crypto_wasm_bg.wasm
+        // (e.g. via an asset copy in angular.json / project.json).
+        // initAsync's internal guard ensures this is a no-op if already loaded.
+        try {
+            await initCryptoWasm(new URL('/matrix_sdk_crypto_wasm_bg.wasm', window.location.origin));
+        }
+        catch (e) {
+            console.warn('[CapMatrix] WASM pre-init failed, falling back to default URL:', e);
+        }
         const cryptoOpts = { cryptoDatabasePrefix: 'matrix-js-sdk' };
         try {
             await this.client.initRustCrypto(cryptoOpts);
@@ -804,16 +819,11 @@ export class MatrixWeb extends WebPlugin {
             this.fallbackPassphrase = options.existingPassphrase;
         }
         try {
-            const bootstrapPromise = crypto.bootstrapSecretStorage({
+            await crypto.bootstrapSecretStorage({
                 createSecretStorageKey: async () => keyInfo,
                 setupNewSecretStorage: true,
                 setupNewKeyBackup: true,
             });
-            // Guard against SDK hanging when it can't retrieve the old SSSS key
-            const timeoutPromise = new Promise((_, reject) => {
-                setTimeout(() => reject(new Error('bootstrapSecretStorage timed out — the old SSSS key could not be retrieved')), 30000);
-            });
-            await Promise.race([bootstrapPromise, timeoutPromise]);
         }
         finally {
             // Always clear transient crypto state so it doesn't bleed into subsequent calls.
@@ -948,7 +958,7 @@ export class MatrixWeb extends WebPlugin {
         localStorage.setItem(SESSION_KEY, JSON.stringify(session));
     }
     serializeEvent(event, fallbackRoomId) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const roomId = (_b = (_a = event.getRoomId()) !== null && _a !== void 0 ? _a : fallbackRoomId) !== null && _b !== void 0 ? _b : '';
         // Redacted events should be marked clearly
         if (event.isRedacted()) {
@@ -980,7 +990,7 @@ export class MatrixWeb extends WebPlugin {
                         }
                     }
                 }
-                catch (_k) {
+                catch (_l) {
                     // relations may not be available
                 }
             }
@@ -1010,7 +1020,7 @@ export class MatrixWeb extends WebPlugin {
                             }
                         }
                     }
-                    catch (_l) {
+                    catch (_m) {
                         // ignore errors
                     }
                 }
@@ -1029,7 +1039,7 @@ export class MatrixWeb extends WebPlugin {
                     }
                 }
             }
-            catch (_m) {
+            catch (_o) {
                 // ignore
             }
         }
@@ -1038,17 +1048,9 @@ export class MatrixWeb extends WebPlugin {
         const unsigned = unsignedData && Object.keys(unsignedData).length > 0
             ? unsignedData
             : undefined;
-        return {
-            eventId: eventId !== null && eventId !== void 0 ? eventId : '',
-            roomId,
-            senderId: sender !== null && sender !== void 0 ? sender : '',
-            type: event.getType(),
-            content,
-            originServerTs: event.getTs(),
-            status,
-            readBy: readBy.length > 0 ? readBy : undefined,
-            unsigned,
-        };
+        // Include state_key for state events (e.g. target user in m.room.member)
+        const sk = (_k = event.getStateKey) === null || _k === void 0 ? void 0 : _k.call(event);
+        return Object.assign(Object.assign({ eventId: eventId !== null && eventId !== void 0 ? eventId : '', roomId, senderId: sender !== null && sender !== void 0 ? sender : '', type: event.getType() }, (sk !== undefined && { stateKey: sk })), { content, originServerTs: event.getTs(), status, readBy: readBy.length > 0 ? readBy : undefined, unsigned });
     }
     serializeRoom(room) {
         var _a, _b, _c, _d, _e, _f;