matrix-js-sdk 21.2.0 → 22.0.0-rc.1

package/dist/browser-matrix.js

@@ -41853,7 +41853,7 @@ module.exports={
   "⑧": "➇",
   "🄉": "8,",
   "⒏": "8.",
-  "��": "8日",
+  "㏧": "8日",
   "㋇": "8月",
   "㍠": "8点",
   "੧": "9",
@@ -45893,7 +45893,7 @@ module.exports={
   "𠠄": "𠠄",
   "カ": "力",
   "力": "力",
-  "���": "力",
+  "⼒": "力",
   "劣": "劣",
   "㔕": "㔕",
   "劳": "劳",
@@ -48826,13 +48826,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReceiptType = void 0;
+exports.MAIN_ROOM_TIMELINE = exports.ReceiptType = void 0;
 var ReceiptType;
 (function (ReceiptType) {
     ReceiptType["Read"] = "m.read";
     ReceiptType["FullyRead"] = "m.fully_read";
     ReceiptType["ReadPrivate"] = "m.read.private";
 })(ReceiptType = exports.ReceiptType || (exports.ReceiptType = {}));
+exports.MAIN_ROOM_TIMELINE = "main";
 
 },{}],295:[function(require,module,exports){
 "use strict";
@@ -49919,7 +49920,6 @@ const thread_1 = require("./models/thread");
 const beacon_1 = require("./@types/beacon");
 const NamespacedValue_1 = require("./NamespacedValue");
 const ToDeviceMessageQueue_1 = require("./ToDeviceMessageQueue");
-const read_receipt_1 = require("./models/read-receipt");
 const invites_ignorer_1 = require("./models/invites-ignorer");
 const sync_2 = require("./@types/sync");
 const feature_1 = require("./feature");
@@ -51115,7 +51115,7 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
         if (!this.crypto) {
             throw new Error("End-to-end encryption disabled");
         }
-        return this.crypto.prepareToEncrypt(room);
+        this.crypto.prepareToEncrypt(room);
     }
     /**
      * Checks whether cross signing:
@@ -51184,7 +51184,7 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
         if (!this.crypto) {
             throw new Error("End-to-end encryption disabled");
         }
-        return this.crypto.setCryptoTrustCrossSignedDevices(val);
+        this.crypto.setCryptoTrustCrossSignedDevices(val);
     }
     /**
      * Counts the number of end to end session keys that are waiting to be backed up
@@ -52190,7 +52190,9 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
             }
             let signPromise = Promise.resolve();
             if (opts.inviteSignUrl) {
-                signPromise = this.http.requestOtherUrl(http_api_1.Method.Post, new URL(opts.inviteSignUrl), { mxid: this.credentials.userId });
+                const url = new URL(opts.inviteSignUrl);
+                url.searchParams.set("mxid", this.credentials.userId);
+                signPromise = this.http.requestOtherUrl(http_api_1.Method.Post, url);
             }
             const queryString = {};
             if (opts.viaServers) {
@@ -52792,7 +52794,7 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
                 const isThread = !!event.threadRootId;
                 body = Object.assign(Object.assign({}, body), { thread_id: isThread
                         ? event.threadRootId
-                        : read_receipt_1.MAIN_ROOM_TIMELINE });
+                        : read_receipts_1.MAIN_ROOM_TIMELINE });
             }
             const promise = this.http.authedRequest(http_api_1.Method.Post, path, undefined, body || {});
             const room = this.getRoom(event.getRoomId());
@@ -53086,8 +53088,8 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
             return this.leave(roomId).then(() => {
                 delete populationResults[roomId];
             }).catch((err) => {
+                // suppress error
                 populationResults[roomId] = err;
-                return null; // suppress error
             });
         };
         for (const room of eligibleToLeave) {
@@ -57114,7 +57116,7 @@ exports.fixNotificationCountOnDecryption = fixNotificationCountOnDecryption;
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 
-},{"./@types/PushRules":288,"./@types/beacon":289,"./@types/event":290,"./@types/partials":293,"./@types/read_receipts":294,"./@types/search":296,"./@types/sync":297,"./NamespacedValue":299,"./ReEmitter":300,"./ToDeviceMessageQueue":301,"./autodiscovery":302,"./content-helpers":305,"./content-repo":306,"./crypto":324,"./crypto/RoomList":312,"./crypto/api":319,"./crypto/backup":320,"./crypto/dehydration":322,"./crypto/key_passphrase":325,"./crypto/olmlib":326,"./crypto/recoverykey":327,"./event-mapper":343,"./feature":344,"./filter":346,"./http-api":349,"./logger":356,"./models/MSC3089TreeSpace":359,"./models/event":365,"./models/event-timeline":364,"./models/invites-ignorer":366,"./models/read-receipt":367,"./models/room":373,"./models/search-result":374,"./models/thread":375,"./models/typed-event-emitter":376,"./models/user":377,"./pushprocessor":378,"./randomstring":379,"./service-types":382,"./sliding-sync-sdk":383,"./store/stub":389,"./sync":391,"./utils":393,"./webrtc/call":395,"./webrtc/callEventHandler":396,"./webrtc/groupCall":399,"./webrtc/groupCallEventHandler":400,"./webrtc/mediaHandler":401,"matrix-events-sdk":168}],305:[function(require,module,exports){
+},{"./@types/PushRules":288,"./@types/beacon":289,"./@types/event":290,"./@types/partials":293,"./@types/read_receipts":294,"./@types/search":296,"./@types/sync":297,"./NamespacedValue":299,"./ReEmitter":300,"./ToDeviceMessageQueue":301,"./autodiscovery":302,"./content-helpers":305,"./content-repo":306,"./crypto":324,"./crypto/RoomList":312,"./crypto/api":319,"./crypto/backup":320,"./crypto/dehydration":322,"./crypto/key_passphrase":325,"./crypto/olmlib":326,"./crypto/recoverykey":327,"./event-mapper":343,"./feature":344,"./filter":346,"./http-api":349,"./logger":356,"./models/MSC3089TreeSpace":359,"./models/event":365,"./models/event-timeline":364,"./models/invites-ignorer":366,"./models/room":373,"./models/search-result":374,"./models/thread":375,"./models/typed-event-emitter":376,"./models/user":377,"./pushprocessor":378,"./randomstring":379,"./service-types":382,"./sliding-sync-sdk":383,"./store/stub":389,"./sync":391,"./utils":393,"./webrtc/call":395,"./webrtc/callEventHandler":396,"./webrtc/groupCall":399,"./webrtc/groupCallEventHandler":400,"./webrtc/mediaHandler":401,"matrix-events-sdk":168}],305:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2018 - 2022 The Matrix.org Foundation C.I.C.
@@ -60160,6 +60162,7 @@ class OlmDevice {
     }
     recordSessionProblem(deviceKey, type, fixed) {
         return __awaiter(this, void 0, void 0, function* () {
+            logger_1.logger.info(`Recording problem on olm session with ${deviceKey} of type ${type}. Recreating: ${fixed}`);
             yield this.cryptoStore.storeEndToEndSessionProblem(deviceKey, type, fixed);
         });
     }
@@ -60339,15 +60342,14 @@ class OlmDevice {
                                 senderKey);
                         }
                         if (existingSession) {
-                            logger_1.logger.log("Update for megolm session "
-                                + senderKey + "/" + sessionId);
+                            logger_1.logger.log(`Update for megolm session ${senderKey}|${sessionId}`);
                             if (existingSession.first_known_index() <= session.first_known_index()) {
                                 if (!existingSessionData.untrusted || extraSessionData.untrusted) {
                                     // existing session has less-than-or-equal index
                                     // (i.e. can decrypt at least as much), and the
                                     // new session's trust does not win over the old
                                     // session's trust, so keep it
-                                    logger_1.logger.log(`Keeping existing megolm session ${sessionId}`);
+                                    logger_1.logger.log(`Keeping existing megolm session ${senderKey}|${sessionId}`);
                                     return;
                                 }
                                 if (existingSession.first_known_index() < session.first_known_index()) {
@@ -60359,12 +60361,12 @@ class OlmDevice {
                                     if (existingSession.export_session(session.first_known_index())
                                         === session.export_session(session.first_known_index())) {
                                         logger_1.logger.info("Upgrading trust of existing megolm session " +
-                                            sessionId + " based on newly-received trusted session");
+                                            `${senderKey}|${sessionId} based on newly-received trusted session`);
                                         existingSessionData.untrusted = false;
                                         this.cryptoStore.storeEndToEndInboundGroupSession(senderKey, sessionId, existingSessionData, txn);
                                     }
                                     else {
-                                        logger_1.logger.warn("Newly-received megolm session " + sessionId +
+                                        logger_1.logger.warn(`Newly-received megolm session ${senderKey}|$sessionId}` +
                                             " does not match existing session! Keeping existing session");
                                     }
                                     return;
@@ -60372,8 +60374,8 @@ class OlmDevice {
                                 // If the sessions have the same index, go ahead and store the new trusted one.
                             }
                         }
-                        logger_1.logger.info("Storing megolm session " + senderKey + "/" + sessionId +
-                            " with first index " + session.first_known_index());
+                        logger_1.logger.info(`Storing megolm session ${senderKey}|${sessionId} with first index ` +
+                            session.first_known_index());
                         const sessionData = Object.assign({}, extraSessionData, {
                             room_id: roomId,
                             session: session.pickle(this.pickleKey),
@@ -62635,30 +62637,29 @@ class MegolmEncryption extends base_1.EncryptionAlgorithm {
         return __awaiter(this, void 0, void 0, function* () {
             const obSessionInfo = this.outboundSessions[sessionId];
             if (!obSessionInfo) {
-                logger_1.logger.debug(`megolm session ${sessionId} not found: not re-sharing keys`);
+                logger_1.logger.debug(`megolm session ${senderKey}|${sessionId} not found: not re-sharing keys`);
                 return;
             }
             // The chain index of the key we previously sent this device
             if (obSessionInfo.sharedWithDevices[userId] === undefined) {
-                logger_1.logger.debug(`megolm session ${sessionId} never shared with user ${userId}`);
+                logger_1.logger.debug(`megolm session ${senderKey}|${sessionId} never shared with user ${userId}`);
                 return;
             }
             const sessionSharedData = obSessionInfo.sharedWithDevices[userId][device.deviceId];
             if (sessionSharedData === undefined) {
-                logger_1.logger.debug("megolm session ID " + sessionId + " never shared with device " +
-                    userId + ":" + device.deviceId);
+                logger_1.logger.debug(`megolm session ${senderKey}|${sessionId} never shared with device ${userId}:${device.deviceId}`);
                 return;
             }
             if (sessionSharedData.deviceKey !== device.getIdentityKey()) {
-                logger_1.logger.warn(`Session has been shared with device ${device.deviceId} but with identity ` +
-                    `key ${sessionSharedData.deviceKey}. Key is now ${device.getIdentityKey()}!`);
+                logger_1.logger.warn(`Megolm session ${senderKey}|${sessionId} has been shared with device ${device.deviceId} but ` +
+                    `with identity key ${sessionSharedData.deviceKey}. Key is now ${device.getIdentityKey()}!`);
                 return;
             }
             // get the key from the inbound session: the outbound one will already
             // have been ratcheted to the next chain index.
             const key = yield this.olmDevice.getInboundGroupSessionKey(this.roomId, senderKey, sessionId, sessionSharedData.messageIndex);
             if (!key) {
-                logger_1.logger.warn(`No inbound session key found for megolm ${sessionId}: not re-sharing keys`);
+                logger_1.logger.warn(`No inbound session key found for megolm session ${senderKey}|${sessionId}: not re-sharing keys`);
                 return;
             }
             yield olmlib.ensureOlmSessionsForDevices(this.olmDevice, this.baseApis, {
@@ -62689,7 +62690,7 @@ class MegolmEncryption extends base_1.EncryptionAlgorithm {
                     [device.deviceId]: encryptedContent,
                 },
             });
-            logger_1.logger.debug(`Re-shared key for megolm session ${sessionId} with ${userId}:${device.deviceId}`);
+            logger_1.logger.debug(`Re-shared key for megolm session ${senderKey}|${sessionId} with ${userId}:${device.deviceId}`);
         });
     }
     /**
@@ -63130,6 +63131,8 @@ class MegolmDecryption extends base_1.DecryptionAlgorithm {
                 // event was sent.  Use a fuzz factor of 2 minutes.
                 const problem = yield this.olmDevice.sessionMayHaveProblems(content.sender_key, event.getTs() - 120000);
                 if (problem) {
+                    logger_1.logger.info(`When handling UISI from ${event.getSender()} (sender key ${content.sender_key}): ` +
+                        `recent session problem with that sender: ${problem}`);
                     let problemDescription = PROBLEM_DESCRIPTIONS[problem.type] || PROBLEM_DESCRIPTIONS.unknown;
                     if (problem.fixed) {
                         problemDescription +=
@@ -63573,9 +63576,8 @@ class MegolmDecryption extends base_1.DecryptionAlgorithm {
     sendSharedHistoryInboundSessions(devicesByUser) {
         return __awaiter(this, void 0, void 0, function* () {
             yield olmlib.ensureOlmSessionsForDevices(this.olmDevice, this.baseApis, devicesByUser);
-            logger_1.logger.log("sendSharedHistoryInboundSessions to users", Object.keys(devicesByUser));
             const sharedHistorySessions = yield this.olmDevice.getSharedHistoryInboundGroupSessions(this.roomId);
-            logger_1.logger.log("shared-history sessions", sharedHistorySessions);
+            logger_1.logger.log(`Sharing history in ${this.roomId} with users ${Object.keys(devicesByUser)}`, sharedHistorySessions.map(([senderKey, sessionId]) => `${senderKey}|${sessionId}`));
             for (const [senderKey, sessionId] of sharedHistorySessions) {
                 const payload = yield this.buildKeyForwardingMessage(this.roomId, senderKey, sessionId);
                 // FIXME: use encryptAndSendToDevices() rather than duplicating it here.
@@ -65013,15 +65015,6 @@ var DeviceVerification;
   * @param {string} deviceId id of the device
   */
 class DeviceInfo {
-    constructor(deviceId) {
-        this.deviceId = deviceId;
-        this.algorithms = [];
-        this.keys = {};
-        this.verified = DeviceVerification.Unverified;
-        this.known = false;
-        this.unsigned = {};
-        this.signatures = {};
-    }
     /**
      * rehydrate a DeviceInfo from the session store
      *
@@ -65039,6 +65032,15 @@ class DeviceInfo {
         }
         return res;
     }
+    constructor(deviceId) {
+        this.deviceId = deviceId;
+        this.algorithms = [];
+        this.keys = {};
+        this.verified = DeviceVerification.Unverified;
+        this.known = false;
+        this.unsigned = {};
+        this.signatures = {};
+    }
     /**
      * Prepare a DeviceInfo for JSON serialisation in the session store
      *
@@ -65255,6 +65257,12 @@ var CryptoEvent;
     CryptoEvent["KeysChanged"] = "crossSigning.keysChanged";
 })(CryptoEvent = exports.CryptoEvent || (exports.CryptoEvent = {}));
 class Crypto extends typed_event_emitter_1.TypedEventEmitter {
+    /**
+     * @return {string} The version of Olm.
+     */
+    static getOlmVersion() {
+        return OlmDevice_1.OlmDevice.getOlmVersion();
+    }
     /**
      * Cryptography bits
      *
@@ -65505,12 +65513,6 @@ class Crypto extends typed_event_emitter_1.TypedEventEmitter {
             });
         }
     }
-    /**
-     * @return {string} The version of Olm.
-     */
-    static getOlmVersion() {
-        return OlmDevice_1.OlmDevice.getOlmVersion();
-    }
     /**
      * Initialise the crypto module so that it is ready for use
      *
@@ -67806,9 +67808,9 @@ class Crypto extends typed_event_emitter_1.TypedEventEmitter {
             logger_1.logger.error("key withheld event is missing fields");
             return;
         }
-        logger_1.logger.info(`Got room key withheld event from ${event.getSender()} (${content.sender_key}) `
-            + `for ${content.algorithm}/${content.room_id}/${content.session_id} `
-            + `with reason ${content.code} (${content.reason})`);
+        logger_1.logger.info(`Got room key withheld event from ${event.getSender()} `
+            + `for ${content.algorithm} session ${content.sender_key}|${content.session_id} `
+            + `in room ${content.room_id} with code ${content.code} (${content.reason})`);
         const alg = this.getRoomDecryptor(content.room_id, content.algorithm);
         if (alg.onRoomKeyWithheldEvent) {
             alg.onRoomKeyWithheldEvent(event);
@@ -70052,6 +70054,9 @@ const IndexedDBHelpers = __importStar(require("../../indexeddb-helpers"));
  * @implements {module:crypto/store/base~CryptoStore}
  */
 class IndexedDBCryptoStore {
+    static exists(indexedDB, dbName) {
+        return IndexedDBHelpers.exists(indexedDB, dbName);
+    }
     /**
      * Create a new IndexedDBCryptoStore
      *
@@ -70062,9 +70067,6 @@ class IndexedDBCryptoStore {
         this.indexedDB = indexedDB;
         this.dbName = dbName;
     }
-    static exists(indexedDB, dbName) {
-        return IndexedDBHelpers.exists(indexedDB, dbName);
-    }
     /**
      * Ensure the database exists and is up-to-date, or fall back to
      * a local storage or in-memory store.
@@ -70645,10 +70647,6 @@ function keyEndToEndRoomsPrefix(roomId) {
  * @implements {module:crypto/store/base~CryptoStore}
  */
 class LocalStorageCryptoStore extends memory_crypto_store_1.MemoryCryptoStore {
-    constructor(store) {
-        super();
-        this.store = store;
-    }
     static exists(store) {
         var _a;
         const length = store.length;
@@ -70659,6 +70657,10 @@ class LocalStorageCryptoStore extends memory_crypto_store_1.MemoryCryptoStore {
         }
         return false;
     }
+    constructor(store) {
+        super();
+        this.store = store;
+    }
     // Olm Sessions
     countEndToEndSessions(txn, func) {
         var _a;
@@ -74382,28 +74384,37 @@ class RoomWidgetClient extends client_1.MatrixClient {
         });
     }
     watchTurnServers() {
-        var e_1, _a;
+        var _a, e_1, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const servers = this.widgetApi.getTurnServers();
-            const onClientStopped = () => servers.return(undefined);
+            const onClientStopped = () => {
+                servers.return(undefined);
+            };
             this.lifecycle.signal.addEventListener("abort", onClientStopped);
             try {
                 try {
-                    for (var servers_1 = __asyncValues(servers), servers_1_1; servers_1_1 = yield servers_1.next(), !servers_1_1.done;) {
-                        const server = servers_1_1.value;
-                        this.turnServers = [{
-                                urls: server.uris,
-                                username: server.username,
-                                credential: server.password,
-                            }];
-                        this.emit(client_1.ClientEvent.TurnServers, this.turnServers);
-                        logger_1.logger.log(`Received TURN server: ${server.uris}`);
+                    for (var _d = true, servers_1 = __asyncValues(servers), servers_1_1; servers_1_1 = yield servers_1.next(), _a = servers_1_1.done, !_a;) {
+                        _c = servers_1_1.value;
+                        _d = false;
+                        try {
+                            const server = _c;
+                            this.turnServers = [{
+                                    urls: server.uris,
+                                    username: server.username,
+                                    credential: server.password,
+                                }];
+                            this.emit(client_1.ClientEvent.TurnServers, this.turnServers);
+                            logger_1.logger.log(`Received TURN server: ${server.uris}`);
+                        }
+                        finally {
+                            _d = true;
+                        }
                     }
                 }
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (servers_1_1 && !servers_1_1.done && (_a = servers_1.return)) yield _a.call(servers_1);
+                        if (!_d && !_a && (_b = servers_1.return)) yield _b.call(servers_1);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
@@ -74842,11 +74853,6 @@ function setProp(obj, keyNesting, val) {
  * @prop {?string} filterId The filter ID
  */
 class Filter {
-    constructor(userId, filterId) {
-        this.userId = userId;
-        this.filterId = filterId;
-        this.definition = {};
-    }
     /**
      * Create a filter from existing data.
      * @static
@@ -74860,6 +74866,11 @@ class Filter {
         filter.setDefinition(jsonObj);
         return filter;
     }
+    constructor(userId, filterId) {
+        this.userId = userId;
+        this.filterId = filterId;
+        this.definition = {};
+    }
     /**
      * Get the ID of this filter on your homeserver (if known)
      * @return {?string} The filter ID
@@ -75921,7 +75932,7 @@ function exists(indexedDB, dbName) {
             }
             resolve(exists);
         };
-        req.onerror = ev => reject(req.error);
+        req.onerror = () => reject(req.error);
     });
 }
 exports.exists = exists;
@@ -77093,7 +77104,7 @@ class MSC3089TreeSpace {
             const currentPls = this.room.currentState.getStateEvents(event_1.EventType.RoomPowerLevels, "");
             if (Array.isArray(currentPls))
                 throw new Error("Unexpected return type for power levels");
-            const pls = currentPls.getContent() || {};
+            const pls = (currentPls === null || currentPls === void 0 ? void 0 : currentPls.getContent()) || {};
             const viewLevel = pls['users_default'] || 0;
             const editLevel = pls['events_default'] || 50;
             const adminLevel = ((_a = pls['events']) === null || _a === void 0 ? void 0 : _a[event_1.EventType.RoomPowerLevels]) || 100;
@@ -77127,7 +77138,7 @@ class MSC3089TreeSpace {
         const currentPls = this.room.currentState.getStateEvents(event_1.EventType.RoomPowerLevels, "");
         if (Array.isArray(currentPls))
             throw new Error("Unexpected return type for power levels");
-        const pls = currentPls.getContent() || {};
+        const pls = (currentPls === null || currentPls === void 0 ? void 0 : currentPls.getContent()) || {};
         const viewLevel = pls['users_default'] || 0;
         const editLevel = pls['events_default'] || 50;
         const adminLevel = ((_a = pls['events']) === null || _a === void 0 ? void 0 : _a[event_1.EventType.RoomPowerLevels]) || 100;
@@ -78276,7 +78287,7 @@ class EventTimelineSet extends typed_event_emitter_1.TypedEventEmitter {
                 '`EventTimelineSet.addEventToTimeline(event, timeline, IAddEventToTimelineOptions)`');
         }
         if (timeline.getTimelineSet() !== this) {
-            throw new Error(`EventTimelineSet.addEventToTimeline: Timeline=${timeline.toString()} does not belong " + 
+            throw new Error(`EventTimelineSet.addEventToTimeline: Timeline=${timeline.toString()} does not belong " +
                 "in timelineSet(threadId=${(_a = this.thread) === null || _a === void 0 ? void 0 : _a.id})`);
         }
         // Make sure events don't get mixed in timelines they shouldn't be in (e.g. a
@@ -78513,6 +78524,36 @@ var Direction;
     Direction["Forward"] = "f";
 })(Direction = exports.Direction || (exports.Direction = {}));
 class EventTimeline {
+    /**
+     * Static helper method to set sender and target properties
+     *
+     * @param {MatrixEvent} event   the event whose metadata is to be set
+     * @param {RoomState} stateContext  the room state to be queried
+     * @param {boolean} toStartOfTimeline  if true the event's forwardLooking flag is set false
+     */
+    static setEventMetadata(event, stateContext, toStartOfTimeline) {
+        var _a, _b, _c, _d;
+        // When we try to generate a sentinel member before we have that member
+        // in the members object, we still generate a sentinel but it doesn't
+        // have a membership event, so test to see if events.member is set. We
+        // check this to avoid overriding non-sentinel members by sentinel ones
+        // when adding the event to a filtered timeline
+        if (!((_b = (_a = event.sender) === null || _a === void 0 ? void 0 : _a.events) === null || _b === void 0 ? void 0 : _b.member)) {
+            event.sender = stateContext.getSentinelMember(event.getSender());
+        }
+        if (!((_d = (_c = event.target) === null || _c === void 0 ? void 0 : _c.events) === null || _d === void 0 ? void 0 : _d.member) && event.getType() === event_1.EventType.RoomMember) {
+            event.target = stateContext.getSentinelMember(event.getStateKey());
+        }
+        if (event.isState()) {
+            // room state has no concept of 'old' or 'current', but we want the
+            // room state to regress back to previous values if toStartOfTimeline
+            // is set, which means inspecting prev_content if it exists. This
+            // is done by toggling the forwardLooking flag.
+            if (toStartOfTimeline) {
+                event.forwardLooking = false;
+            }
+        }
+    }
     /**
      * Construct a new EventTimeline
      *
@@ -78557,36 +78598,6 @@ class EventTimeline {
         this.paginationRequests = { 'b': null, 'f': null };
         this.name = this.roomId + ":" + new Date().toISOString();
     }
-    /**
-     * Static helper method to set sender and target properties
-     *
-     * @param {MatrixEvent} event   the event whose metadata is to be set
-     * @param {RoomState} stateContext  the room state to be queried
-     * @param {boolean} toStartOfTimeline  if true the event's forwardLooking flag is set false
-     */
-    static setEventMetadata(event, stateContext, toStartOfTimeline) {
-        var _a, _b, _c, _d;
-        // When we try to generate a sentinel member before we have that member
-        // in the members object, we still generate a sentinel but it doesn't
-        // have a membership event, so test to see if events.member is set. We
-        // check this to avoid overriding non-sentinel members by sentinel ones
-        // when adding the event to a filtered timeline
-        if (!((_b = (_a = event.sender) === null || _a === void 0 ? void 0 : _a.events) === null || _b === void 0 ? void 0 : _b.member)) {
-            event.sender = stateContext.getSentinelMember(event.getSender());
-        }
-        if (!((_d = (_c = event.target) === null || _c === void 0 ? void 0 : _c.events) === null || _d === void 0 ? void 0 : _d.member) && event.getType() === event_1.EventType.RoomMember) {
-            event.target = stateContext.getSentinelMember(event.getStateKey());
-        }
-        if (event.isState()) {
-            // room state has no concept of 'old' or 'current', but we want the
-            // room state to regress back to previous values if toStartOfTimeline
-            // is set, which means inspecting prev_content if it exists. This
-            // is done by toggling the forwardLooking flag.
-            if (toStartOfTimeline) {
-                event.forwardLooking = false;
-            }
-        }
-    }
     /**
      * Initialise the start and end state with the given events
      *
@@ -80071,10 +80082,19 @@ class MatrixEvent extends typed_event_emitter_1.TypedEventEmitter {
      * Checks if this event is associated with another event. See `getAssociatedId`.
      *
      * @return {boolean}
+     * @deprecated use hasAssociation instead.
      */
     hasAssocation() {
         return !!this.getAssociatedId();
     }
+    /**
+     * Checks if this event is associated with another event. See `getAssociatedId`.
+     *
+     * @return {boolean}
+     */
+    hasAssociation() {
+        return !!this.getAssociatedId();
+    }
     /**
      * Update the related id with a new one.
      *
@@ -80640,13 +80660,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReadReceipt = exports.synthesizeReceipt = exports.MAIN_ROOM_TIMELINE = void 0;
+exports.ReadReceipt = exports.synthesizeReceipt = void 0;
 const read_receipts_1 = require("../@types/read_receipts");
 const typed_event_emitter_1 = require("./typed-event-emitter");
 const utils = __importStar(require("../utils"));
 const event_1 = require("./event");
 const event_2 = require("../@types/event");
-exports.MAIN_ROOM_TIMELINE = "main";
 function synthesizeReceipt(userId, event, receiptType) {
     var _a;
     return new event_1.MatrixEvent({
@@ -80655,7 +80674,7 @@ function synthesizeReceipt(userId, event, receiptType) {
                 [receiptType]: {
                     [userId]: {
                         ts: event.getTs(),
-                        threadId: (_a = event.threadRootId) !== null && _a !== void 0 ? _a : exports.MAIN_ROOM_TIMELINE,
+                        threadId: (_a = event.threadRootId) !== null && _a !== void 0 ? _a : read_receipts_1.MAIN_ROOM_TIMELINE,
                     },
                 },
             },
@@ -82938,7 +82957,7 @@ class Room extends read_receipt_1.ReadReceipt {
                     // If this is in the current state, replace it with the redacted version
                     if (redactedEvent.isState()) {
                         const currentStateEvent = this.currentState.getStateEvents(redactedEvent.getType(), redactedEvent.getStateKey());
-                        if (currentStateEvent.getId() === redactedEvent.getId()) {
+                        if ((currentStateEvent === null || currentStateEvent === void 0 ? void 0 : currentStateEvent.getId()) === redactedEvent.getId()) {
                             this.currentState.setStateEvents([redactedEvent]);
                         }
                     }
@@ -84884,7 +84903,7 @@ class Room extends read_receipt_1.ReadReceipt {
                 Object.keys(content[eventId][receiptType]).forEach((userId) => {
                     var _a;
                     const receipt = content[eventId][receiptType][userId];
-                    const receiptForMainTimeline = !receipt.thread_id || receipt.thread_id === read_receipt_1.MAIN_ROOM_TIMELINE;
+                    const receiptForMainTimeline = !receipt.thread_id || receipt.thread_id === read_receipts_1.MAIN_ROOM_TIMELINE;
                     const receiptDestination = receiptForMainTimeline
                         ? this
                         : this.threads.get((_a = receipt.thread_id) !== null && _a !== void 0 ? _a : "");
@@ -85574,19 +85593,6 @@ exports.SearchResult = void 0;
  */
 const event_context_1 = require("./event-context");
 class SearchResult {
-    /**
-     * Construct a new SearchResult
-     *
-     * @param {number} rank   where this SearchResult ranks in the results
-     * @param {event-context.EventContext} context  the matching event and its
-     *    context
-     *
-     * @constructor
-     */
-    constructor(rank, context) {
-        this.rank = rank;
-        this.context = context;
-    }
     /**
      * Create a SearchResponse from the response to /search
      * @static
@@ -85609,6 +85615,19 @@ class SearchResult {
         context.setPaginateToken(jsonContext.end, false);
         return new SearchResult(jsonObj.rank, context);
     }
+    /**
+     * Construct a new SearchResult
+     *
+     * @param {number} rank   where this SearchResult ranks in the results
+     * @param {event-context.EventContext} context  the matching event and its
+     *    context
+     *
+     * @constructor
+     */
+    constructor(rank, context) {
+        this.rank = rank;
+        this.context = context;
+    }
 }
 exports.SearchResult = SearchResult;
 
@@ -87060,6 +87079,58 @@ const DEBUG = false; // set true to enable console logging.
  */
 // eslint-disable-next-line camelcase
 class MatrixScheduler {
+    /**
+     * Retries events up to 4 times using exponential backoff. This produces wait
+     * times of 2, 4, 8, and 16 seconds (30s total) after which we give up. If the
+     * failure was due to a rate limited request, the time specified in the error is
+     * waited before being retried.
+     * @param {MatrixEvent} event
+     * @param {Number} attempts Number of attempts that have been made, including the one that just failed (ie. starting at 1)
+     * @param {MatrixError} err
+     * @return {Number}
+     * @see module:scheduler~retryAlgorithm
+     */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    static RETRY_BACKOFF_RATELIMIT(event, attempts, err) {
+        if (err.httpStatus === 400 || err.httpStatus === 403 || err.httpStatus === 401) {
+            // client error; no amount of retrying with save you now.
+            return -1;
+        }
+        if (err instanceof http_api_1.ConnectionError) {
+            return -1;
+        }
+        // if event that we are trying to send is too large in any way then retrying won't help
+        if (err.name === "M_TOO_LARGE") {
+            return -1;
+        }
+        if (err.name === "M_LIMIT_EXCEEDED") {
+            const waitTime = err.data.retry_after_ms;
+            if (waitTime > 0) {
+                return waitTime;
+            }
+        }
+        if (attempts > 4) {
+            return -1; // give up
+        }
+        return (1000 * Math.pow(2, attempts));
+    }
+    /**
+     * Queues <code>m.room.message</code> events and lets other events continue
+     * concurrently.
+     * @param {MatrixEvent} event
+     * @return {string}
+     * @see module:scheduler~queueAlgorithm
+     */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    static QUEUE_MESSAGES(event) {
+        // enqueue messages or events that associate with another event (redactions and relations)
+        if (event.getType() === event_1.EventType.RoomMessage || event.hasAssociation()) {
+            // put these events in the 'message' queue.
+            return "message";
+        }
+        // allow all other events continue concurrently.
+        return null;
+    }
     constructor(retryAlgorithm = MatrixScheduler.RETRY_BACKOFF_RATELIMIT, queueAlgorithm = MatrixScheduler.QUEUE_MESSAGES) {
         this.retryAlgorithm = retryAlgorithm;
         this.queueAlgorithm = queueAlgorithm;
@@ -87118,58 +87189,6 @@ class MatrixScheduler {
             });
         };
     }
-    /**
-     * Retries events up to 4 times using exponential backoff. This produces wait
-     * times of 2, 4, 8, and 16 seconds (30s total) after which we give up. If the
-     * failure was due to a rate limited request, the time specified in the error is
-     * waited before being retried.
-     * @param {MatrixEvent} event
-     * @param {Number} attempts Number of attempts that have been made, including the one that just failed (ie. starting at 1)
-     * @param {MatrixError} err
-     * @return {Number}
-     * @see module:scheduler~retryAlgorithm
-     */
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    static RETRY_BACKOFF_RATELIMIT(event, attempts, err) {
-        if (err.httpStatus === 400 || err.httpStatus === 403 || err.httpStatus === 401) {
-            // client error; no amount of retrying with save you now.
-            return -1;
-        }
-        if (err instanceof http_api_1.ConnectionError) {
-            return -1;
-        }
-        // if event that we are trying to send is too large in any way then retrying won't help
-        if (err.name === "M_TOO_LARGE") {
-            return -1;
-        }
-        if (err.name === "M_LIMIT_EXCEEDED") {
-            const waitTime = err.data.retry_after_ms;
-            if (waitTime > 0) {
-                return waitTime;
-            }
-        }
-        if (attempts > 4) {
-            return -1; // give up
-        }
-        return (1000 * Math.pow(2, attempts));
-    }
-    /**
-     * Queues <code>m.room.message</code> events and lets other events continue
-     * concurrently.
-     * @param {MatrixEvent} event
-     * @return {string}
-     * @see module:scheduler~queueAlgorithm
-     */
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    static QUEUE_MESSAGES(event) {
-        // enqueue messages or events that associate with another event (redactions and relations)
-        if (event.getType() === event_1.EventType.RoomMessage || event.hasAssocation()) {
-            // put these events in the 'message' queue.
-            return "message";
-        }
-        // allow all other events continue concurrently.
-        return null;
-    }
     /**
      * Retrieve a queue based on an event. The event provided does not need to be in
      * the queue.
@@ -87578,6 +87597,60 @@ class ExtensionAccountData {
         });
     }
 }
+class ExtensionTyping {
+    constructor(client) {
+        this.client = client;
+    }
+    name() {
+        return "typing";
+    }
+    when() {
+        return sliding_sync_1.ExtensionState.PostProcess;
+    }
+    onRequest(isInitial) {
+        if (!isInitial) {
+            return undefined; // don't send a JSON object for subsequent requests, we don't need to.
+        }
+        return {
+            enabled: true,
+        };
+    }
+    onResponse(data) {
+        if (!data || !data.rooms) {
+            return;
+        }
+        for (const roomId in data.rooms) {
+            processEphemeralEvents(this.client, roomId, [data.rooms[roomId]]);
+        }
+    }
+}
+class ExtensionReceipts {
+    constructor(client) {
+        this.client = client;
+    }
+    name() {
+        return "receipts";
+    }
+    when() {
+        return sliding_sync_1.ExtensionState.PostProcess;
+    }
+    onRequest(isInitial) {
+        if (isInitial) {
+            return {
+                enabled: true,
+            };
+        }
+        return undefined; // don't send a JSON object for subsequent requests, we don't need to.
+    }
+    onResponse(data) {
+        if (!data || !data.rooms) {
+            return;
+        }
+        for (const roomId in data.rooms) {
+            processEphemeralEvents(this.client, roomId, [data.rooms[roomId]]);
+        }
+    }
+}
 /**
  * A copy of SyncApi such that it can be used as a drop-in replacement for sync v2. For the actual
  * sliding sync API, see sliding-sync.ts or the class SlidingSync.
@@ -87613,6 +87686,8 @@ class SlidingSyncSdk {
         const extensions = [
             new ExtensionToDevice(this.client),
             new ExtensionAccountData(this.client),
+            new ExtensionTyping(this.client),
+            new ExtensionReceipts(this.client),
         ];
         if (this.opts.crypto) {
             extensions.push(new ExtensionE2EE(this.opts.crypto));
@@ -88184,6 +88259,18 @@ function mapEvents(client, roomId, events, decrypt = true) {
         return mapper(e);
     });
 }
+function processEphemeralEvents(client, roomId, ephEvents) {
+    const ephemeralEvents = mapEvents(client, roomId, ephEvents);
+    const room = client.getRoom(roomId);
+    if (!room) {
+        logger_1.logger.warn("got ephemeral events for room but room doesn't exist on client:", roomId);
+        return;
+    }
+    room.addEphemeralEvents(ephemeralEvents);
+    ephemeralEvents.forEach((e) => {
+        client.emit(client_1.ClientEvent.Event, e);
+    });
+}
 
 },{"./@types/event":290,"./client":304,"./http-api":349,"./logger":356,"./models/event-timeline":364,"./models/room":373,"./models/room-member":370,"./models/room-state":371,"./pushprocessor":378,"./sliding-sync":384,"./sync":391,"./utils":393}],384:[function(require,module,exports){
 "use strict";
@@ -88212,7 +88299,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SlidingSync = exports.SlidingSyncEvent = exports.ExtensionState = exports.SlidingSyncState = void 0;
+exports.SlidingSync = exports.SlidingSyncEvent = exports.ExtensionState = exports.SlidingSyncState = exports.MSC3575_STATE_KEY_LAZY = exports.MSC3575_STATE_KEY_ME = exports.MSC3575_WILDCARD = void 0;
 const logger_1 = require("./logger");
 const typed_event_emitter_1 = require("./models/typed-event-emitter");
 const utils_1 = require("./utils");
@@ -88221,6 +88308,9 @@ const utils_1 = require("./utils");
 // to keep open the connection. This constant is *ADDED* to the timeout= value
 // to determine the max time we're willing to wait.
 const BUFFER_PERIOD_MS = 10 * 1000;
+exports.MSC3575_WILDCARD = "*";
+exports.MSC3575_STATE_KEY_ME = "$ME";
+exports.MSC3575_STATE_KEY_LAZY = "$LAZY";
 var SlidingSyncState;
 (function (SlidingSyncState) {
     /**
@@ -89045,6 +89135,10 @@ function reqAsCursorPromise(req) {
     return reqAsEventPromise(req).then((event) => req.result);
 }
 class LocalIndexedDBStoreBackend {
+    static exists(indexedDB, dbName) {
+        dbName = "matrix-js-sdk:" + (dbName || "default");
+        return IndexedDBHelpers.exists(indexedDB, dbName);
+    }
     /**
      * Does the actual reading from and writing to the indexeddb
      *
@@ -89065,10 +89159,6 @@ class LocalIndexedDBStoreBackend {
         this.dbName = "matrix-js-sdk:" + dbName;
         this.syncAccumulator = new sync_accumulator_1.SyncAccumulator();
     }
-    static exists(indexedDB, dbName) {
-        dbName = "matrix-js-sdk:" + (dbName || "default");
-        return IndexedDBHelpers.exists(indexedDB, dbName);
-    }
     /**
      * Attempt to connect to the database. This can fail if the user does not
      * grant permission.
@@ -89099,7 +89189,7 @@ class LocalIndexedDBStoreBackend {
             logger_1.logger.log(`can't yet open LocalIndexedDBStoreBackend because it is open elsewhere`);
         };
         logger_1.logger.log(`LocalIndexedDBStoreBackend.connect: awaiting connection...`);
-        return reqAsEventPromise(req).then(() => {
+        return reqAsEventPromise(req).then(() => __awaiter(this, void 0, void 0, function* () {
             logger_1.logger.log(`LocalIndexedDBStoreBackend.connect: connected`);
             this.db = req.result;
             // add a poorly-named listener for when deleteDatabase is called
@@ -89108,8 +89198,8 @@ class LocalIndexedDBStoreBackend {
                 var _a;
                 (_a = this.db) === null || _a === void 0 ? void 0 : _a.close();
             };
-            return this.init();
-        });
+            yield this.init();
+        }));
     }
     /** @return {boolean} whether or not the database was newly created in this session. */
     isNewlyCreated() {
@@ -89718,6 +89808,9 @@ const typed_event_emitter_1 = require("../models/typed-event-emitter");
 // response is persisted each time.
 const WRITE_DELAY_MS = 1000 * 60 * 5; // once every 5 minutes
 class IndexedDBStore extends memory_1.MemoryStore {
+    static exists(indexedDB, dbName) {
+        return indexeddb_local_backend_1.LocalIndexedDBStoreBackend.exists(indexedDB, dbName);
+    }
     /**
      * Construct a new Indexed Database store, which extends MemoryStore.
      *
@@ -89864,9 +89957,6 @@ class IndexedDBStore extends memory_1.MemoryStore {
             this.backend = new indexeddb_local_backend_1.LocalIndexedDBStoreBackend(opts.indexedDB, opts.dbName);
         }
     }
-    static exists(indexedDB, dbName) {
-        return indexeddb_local_backend_1.LocalIndexedDBStoreBackend.exists(indexedDB, dbName);
-    }
     /**
      * @return {Promise} Resolved when loaded from indexed db.
      */
@@ -90716,6 +90806,7 @@ exports.SyncAccumulator = exports.Category = void 0;
 const logger_1 = require("./logger");
 const utils_1 = require("./utils");
 const event_1 = require("./@types/event");
+const read_receipts_1 = require("./@types/read_receipts");
 const sync_1 = require("./@types/sync");
 /* eslint-enable camelcase */
 var Category;
@@ -90907,6 +90998,7 @@ class SyncAccumulator {
                 _unreadThreadNotifications: {},
                 _summary: {},
                 _readReceipts: {},
+                _threadReadReceipts: {},
             };
         }
         const currentData = this.joinRooms[roomId];
@@ -90957,16 +91049,23 @@ class SyncAccumulator {
             // getJSON() is called.
             Object.keys(e.content).forEach((eventId) => {
                 Object.entries(e.content[eventId]).forEach(([key, value]) => {
+                    var _a;
                     if (!(0, utils_1.isSupportedReceiptType)(key))
                         return;
-                    Object.keys(value).forEach((userId) => {
-                        // clobber on user ID
-                        currentData._readReceipts[userId] = {
+                    for (const userId of Object.keys(value)) {
+                        const data = e.content[eventId][key][userId];
+                        const receipt = {
                             data: e.content[eventId][key][userId],
                             type: key,
                             eventId: eventId,
                         };
-                    });
+                        if (!data.thread_id || data.thread_id === read_receipts_1.MAIN_ROOM_TIMELINE) {
+                            currentData._readReceipts[userId] = receipt;
+                        }
+                        else {
+                            currentData._threadReadReceipts = Object.assign(Object.assign({}, currentData._threadReadReceipts), { [data.thread_id]: Object.assign(Object.assign({}, ((_a = currentData._threadReadReceipts[data.thread_id]) !== null && _a !== void 0 ? _a : {})), { [userId]: receipt }) });
+                        }
+                    }
                 });
             });
         });
@@ -91084,8 +91183,7 @@ class SyncAccumulator {
                 // $event_id: { "m.read": { $user_id: $json } }
                 },
             };
-            Object.keys(roomData._readReceipts).forEach((userId) => {
-                const receiptData = roomData._readReceipts[userId];
+            for (const [userId, receiptData] of Object.entries(roomData._readReceipts)) {
                 if (!receiptEvent.content[receiptData.eventId]) {
                     receiptEvent.content[receiptData.eventId] = {};
                 }
@@ -91093,7 +91191,18 @@ class SyncAccumulator {
                     receiptEvent.content[receiptData.eventId][receiptData.type] = {};
                 }
                 receiptEvent.content[receiptData.eventId][receiptData.type][userId] = (receiptData.data);
-            });
+            }
+            for (const threadReceipts of Object.values(roomData._threadReadReceipts)) {
+                for (const [userId, receiptData] of Object.entries(threadReceipts)) {
+                    if (!receiptEvent.content[receiptData.eventId]) {
+                        receiptEvent.content[receiptData.eventId] = {};
+                    }
+                    if (!receiptEvent.content[receiptData.eventId][receiptData.type]) {
+                        receiptEvent.content[receiptData.eventId][receiptData.type] = {};
+                    }
+                    receiptEvent.content[receiptData.eventId][receiptData.type][userId] = (receiptData.data);
+                }
+            }
             // add only if we have some receipt data
             if (Object.keys(receiptEvent.content).length > 0) {
                 roomJson.ephemeral.events.push(receiptEvent);
@@ -91193,7 +91302,7 @@ function setState(eventMap, event) {
     eventMap[event.type][event.state_key] = event;
 }
 
-},{"./@types/event":290,"./@types/sync":297,"./logger":356,"./utils":393}],391:[function(require,module,exports){
+},{"./@types/event":290,"./@types/read_receipts":294,"./@types/sync":297,"./logger":356,"./utils":393}],391:[function(require,module,exports){
 (function (global){(function (){
 "use strict";
 /*
@@ -93321,7 +93430,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSupportedReceiptType = exports.sortEventsByLatestContentTimestamp = exports.recursivelyAssign = exports.compare = exports.lexicographicCompare = exports.prevString = exports.nextString = exports.averageBetweenStrings = exports.stringToBase = exports.baseToString = exports.alphabetPad = exports.DEFAULT_ALPHABET = exports.simpleRetryOperation = exports.chunkPromises = exports.promiseTry = exports.promiseMapSeries = exports.defer = exports.isNullOrUndefined = exports.sleep = exports.ensureNoTrailingSlash = exports.globToRegexp = exports.escapeRegExp = exports.normalize = exports.removeDirectionOverrideChars = exports.removeHiddenChars = exports.isNumber = exports.deepSortedObjectEntries = exports.deepCompare = exports.deepCopy = exports.checkObjectHasKeys = exports.isFunction = exports.removeElement = exports.encodeUri = exports.decodeParams = exports.replaceParam = exports.encodeParams = exports.internaliseString = void 0;
+exports.mapsEqual = exports.isSupportedReceiptType = exports.sortEventsByLatestContentTimestamp = exports.recursivelyAssign = exports.compare = exports.lexicographicCompare = exports.prevString = exports.nextString = exports.averageBetweenStrings = exports.stringToBase = exports.baseToString = exports.alphabetPad = exports.DEFAULT_ALPHABET = exports.simpleRetryOperation = exports.chunkPromises = exports.promiseTry = exports.promiseMapSeries = exports.defer = exports.isNullOrUndefined = exports.sleep = exports.ensureNoTrailingSlash = exports.globToRegexp = exports.escapeRegExp = exports.normalize = exports.removeDirectionOverrideChars = exports.removeHiddenChars = exports.isNumber = exports.deepSortedObjectEntries = exports.deepCompare = exports.deepCopy = exports.checkObjectHasKeys = exports.isFunction = exports.removeElement = exports.encodeUri = exports.decodeParams = exports.replaceParam = exports.encodeParams = exports.internaliseString = void 0;
 /**
  * This is an internal module.
  * @module utils
@@ -93949,6 +94058,21 @@ function isSupportedReceiptType(receiptType) {
     return [read_receipts_1.ReceiptType.Read, read_receipts_1.ReceiptType.ReadPrivate].includes(receiptType);
 }
 exports.isSupportedReceiptType = isSupportedReceiptType;
+/**
+ * Determines whether two maps are equal.
+ * @param eq The equivalence relation to compare values by. Defaults to strict equality.
+ */
+function mapsEqual(x, y, eq = (v1, v2) => v1 === v2) {
+    if (x.size !== y.size)
+        return false;
+    for (const [k, v1] of x) {
+        const v2 = y.get(k);
+        if (v2 === undefined || !eq(v1, v2))
+            return false;
+    }
+    return true;
+}
+exports.mapsEqual = mapsEqual;
 
 },{"./@types/location":292,"./@types/read_receipts":294,"p-retry":226,"unhomoglyph":282}],394:[function(require,module,exports){
 "use strict";
@@ -94496,6 +94620,9 @@ class MatrixCall extends typed_event_emitter_1.TypedEventEmitter {
     getOpponentMember() {
         return this.opponentMember;
     }
+    getOpponentDeviceId() {
+        return this.opponentDeviceId;
+    }
     getOpponentSessionId() {
         return this.opponentSessionId;
     }
@@ -94660,6 +94787,7 @@ class MatrixCall extends typed_event_emitter_1.TypedEventEmitter {
             client: this.client,
             roomId: this.roomId,
             userId,
+            deviceId: this.getOpponentDeviceId(),
             stream,
             purpose,
             audioMuted,
@@ -94696,6 +94824,7 @@ class MatrixCall extends typed_event_emitter_1.TypedEventEmitter {
             audioMuted: false,
             videoMuted: false,
             userId,
+            deviceId: this.getOpponentDeviceId(),
             stream,
             purpose,
         }));
@@ -94719,6 +94848,7 @@ class MatrixCall extends typed_event_emitter_1.TypedEventEmitter {
             audioMuted: false,
             videoMuted: false,
             userId,
+            deviceId: this.getOpponentDeviceId(),
             stream,
             purpose,
         }), addToPeerConnection);
@@ -94952,6 +95082,7 @@ class MatrixCall extends typed_event_emitter_1.TypedEventEmitter {
      * Answer a call.
      */
     answer(audio, video) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.inviteOrAnswerSent)
                 return;
@@ -94971,6 +95102,7 @@ class MatrixCall extends typed_event_emitter_1.TypedEventEmitter {
                         client: this.client,
                         roomId: this.roomId,
                         userId: this.client.getUserId(),
+                        deviceId: (_a = this.client.getDeviceId()) !== null && _a !== void 0 ? _a : undefined,
                         stream,
                         purpose: callEventTypes_1.SDPStreamMetadataPurpose.Usermedia,
                         audioMuted: false,
@@ -95041,7 +95173,7 @@ class MatrixCall extends typed_event_emitter_1.TypedEventEmitter {
         logger_1.logger.debug(`Ending call ${this.callId} with reason ${reason}`);
         this.terminate(CallParty.Local, reason, !suppressEvent);
         // We don't want to send hangup here if we didn't even get to sending an invite
-        if (this.state === CallState.WaitLocalMedia)
+        if ([CallState.Fledgling, CallState.WaitLocalMedia].includes(this.state))
             return;
         const content = {};
         // Don't send UserHangup reason to older clients
@@ -96203,6 +96335,7 @@ class MatrixCall extends typed_event_emitter_1.TypedEventEmitter {
      * @throws if have passed audio=false.
      */
     placeCall(audio, video) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!audio) {
                 throw new Error("You CANNOT start a call without audio");
@@ -96218,6 +96351,7 @@ class MatrixCall extends typed_event_emitter_1.TypedEventEmitter {
                     client: this.client,
                     roomId: this.roomId,
                     userId: this.client.getUserId(),
+                    deviceId: (_a = this.client.getDeviceId()) !== null && _a !== void 0 ? _a : undefined,
                     stream,
                     purpose: callEventTypes_1.SDPStreamMetadataPurpose.Usermedia,
                     audioMuted: false,
@@ -96576,7 +96710,6 @@ class CallEventHandler {
             const groupCallId = content.conf_id;
             const type = event.getType();
             const senderId = event.getSender();
-            const weSentTheEvent = senderId === this.client.credentials.userId;
             let call = content.call_id ? this.calls.get(content.call_id) : undefined;
             let opponentDeviceId;
             let groupCall;
@@ -96597,6 +96730,8 @@ class CallEventHandler {
                     return;
                 }
             }
+            const weSentTheEvent = senderId === this.client.credentials.userId
+                && (opponentDeviceId === undefined || opponentDeviceId === this.client.getDeviceId());
             if (!callRoomId)
                 return;
             if (type === event_1.EventType.CallInvite) {
@@ -96861,6 +96996,7 @@ class CallFeed extends typed_event_emitter_1.TypedEventEmitter {
         this.client = opts.client;
         this.roomId = opts.roomId;
         this.userId = opts.userId;
+        this.deviceId = opts.deviceId;
         this.purpose = opts.purpose;
         this.audioMuted = opts.audioMuted;
         this.videoMuted = opts.videoMuted;
@@ -96918,7 +97054,8 @@ class CallFeed extends typed_event_emitter_1.TypedEventEmitter {
      * @returns {boolean} is local?
      */
     isLocal() {
-        return this.userId === this.client.getUserId();
+        return this.userId === this.client.getUserId()
+            && (this.deviceId === undefined || this.deviceId === this.client.getDeviceId());
     }
     /**
      * Returns true if audio is muted or if there are no audio
@@ -97001,6 +97138,7 @@ class CallFeed extends typed_event_emitter_1.TypedEventEmitter {
             client: this.client,
             roomId: this.roomId,
             userId: this.userId,
+            deviceId: this.deviceId,
             stream,
             purpose: this.purpose,
             audioMuted: this.audioMuted,
@@ -97051,12 +97189,14 @@ exports.GroupCall = exports.GroupCallState = exports.OtherUserSpeakingError = ex
 const typed_event_emitter_1 = require("../models/typed-event-emitter");
 const callFeed_1 = require("./callFeed");
 const call_1 = require("./call");
+const room_state_1 = require("../models/room-state");
 const logger_1 = require("../logger");
 const ReEmitter_1 = require("../ReEmitter");
 const callEventTypes_1 = require("./callEventTypes");
 const event_1 = require("../@types/event");
 const callEventHandler_1 = require("./callEventHandler");
 const groupCallEventHandler_1 = require("./groupCallEventHandler");
+const utils_1 = require("../utils");
 var GroupCallIntent;
 (function (GroupCallIntent) {
     GroupCallIntent["Ring"] = "m.ring";
@@ -97121,24 +97261,17 @@ var GroupCallState;
     GroupCallState["LocalCallFeedUninitialized"] = "local_call_feed_uninitialized";
     GroupCallState["InitializingLocalCallFeed"] = "initializing_local_call_feed";
     GroupCallState["LocalCallFeedInitialized"] = "local_call_feed_initialized";
-    GroupCallState["Entering"] = "entering";
     GroupCallState["Entered"] = "entered";
     GroupCallState["Ended"] = "ended";
 })(GroupCallState = exports.GroupCallState || (exports.GroupCallState = {}));
-const CALL_MEMBER_STATE_TIMEOUT = 1000 * 60 * 60; // 1 hour
-const callMemberStateIsExpired = (event) => {
-    var _a;
-    const now = Date.now();
-    const content = (_a = event === null || event === void 0 ? void 0 : event.getContent()) !== null && _a !== void 0 ? _a : {};
-    const expiresAt = typeof content["m.expires_ts"] === "number" ? content["m.expires_ts"] : -Infinity;
-    return expiresAt <= now;
-};
+const DEVICE_TIMEOUT = 1000 * 60 * 60; // 1 hour
 function getCallUserId(call) {
     var _a;
     return ((_a = call.getOpponentMember()) === null || _a === void 0 ? void 0 : _a.userId) || call.invitee || null;
 }
 class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
     constructor(client, room, type, isPtt, intent, groupCallId, dataChannelsEnabled, dataChannelOptions) {
+        var _a, _b;
         super();
         this.client = client;
         this.room = room;
@@ -97152,19 +97285,20 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
         this.retryCallInterval = 5000;
         this.participantTimeout = 1000 * 15;
         this.pttMaxTransmitTime = 1000 * 20;
-        this.state = GroupCallState.LocalCallFeedUninitialized;
-        this.calls = [];
-        this.participants = [];
+        this.calls = new Map();
         this.userMediaFeeds = [];
         this.screenshareFeeds = [];
-        this.callHandlers = new Map();
+        this.callHandlers = new Map(); // User ID -> device ID -> handlers
         this.retryCallCounts = new Map();
         this.transmitTimer = null;
-        this.memberStateExpirationTimers = new Map();
+        this.participantsExpirationTimer = null;
         this.resendMemberStateTimer = null;
         this.initWithAudioMuted = false;
         this.initWithVideoMuted = false;
-        /**
+        this._state = GroupCallState.LocalCallFeedUninitialized;
+        this._participants = new Map();
+        this._creationTs = null;
+        /*
          * Call Setup
          *
          * There are two different paths for calls to be created:
@@ -97187,148 +97321,55 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
                 newCall.reject();
                 return;
             }
-            const opponentMemberId = (_a = newCall.getOpponentMember()) === null || _a === void 0 ? void 0 : _a.userId;
-            const existingCall = opponentMemberId ? this.getCallByUserId(opponentMemberId) : null;
-            if (existingCall && existingCall.callId === newCall.callId) {
+            const opponent = newCall.getOpponentMember();
+            if (opponent === undefined) {
+                logger_1.logger.warn("Incoming call with no member. Ignoring.");
                 return;
             }
-            logger_1.logger.log(`GroupCall: incoming call from: ${opponentMemberId} with ID ${newCall.callId}`);
-            // we are handlng this call as a PTT call, so enable PTT semantics
-            newCall.isPtt = this.isPtt;
-            // Check if the user calling has an existing call and use this call instead.
-            if (existingCall) {
-                this.replaceCall(existingCall, newCall);
-            }
-            else {
-                this.addCall(newCall);
-            }
+            const deviceMap = (_a = this.calls.get(opponent)) !== null && _a !== void 0 ? _a : new Map();
+            const prevCall = deviceMap.get(newCall.getOpponentDeviceId());
+            if ((prevCall === null || prevCall === void 0 ? void 0 : prevCall.callId) === newCall.callId)
+                return;
+            logger_1.logger.log(`GroupCall: incoming call from ${opponent.userId} with ID ${newCall.callId}`);
+            if (prevCall)
+                this.disposeCall(prevCall, call_1.CallErrorCode.Replaced);
+            this.initCall(newCall);
             newCall.answerWithCallFeeds(this.getLocalFeeds().map((feed) => feed.clone()));
+            deviceMap.set(newCall.getOpponentDeviceId(), newCall);
+            this.calls.set(opponent, deviceMap);
+            this.emit(GroupCallEvent.CallsChanged, this.calls);
         };
-        this.onMemberStateChanged = (event) => __awaiter(this, void 0, void 0, function* () {
-            // If we haven't entered the call yet, we don't care
-            if (this.state !== GroupCallState.Entered) {
-                return;
-            }
-            // The member events may be received for another room, which we will ignore.
-            if (event.getRoomId() !== this.room.roomId)
-                return;
-            const member = this.room.getMember(event.getStateKey());
-            if (!member) {
-                logger_1.logger.warn(`Couldn't find room member for ${event.getStateKey()}: ignoring member state event!`);
-                return;
-            }
-            // Don't process your own member.
-            const localUserId = this.client.getUserId();
-            if (member.userId === localUserId)
-                return;
-            logger_1.logger.debug(`Processing member state event for ${member.userId}`);
-            const ignore = () => {
-                this.removeParticipant(member);
-                clearTimeout(this.memberStateExpirationTimers.get(member.userId));
-                this.memberStateExpirationTimers.delete(member.userId);
-            };
-            const content = event.getContent();
-            const callsState = !callMemberStateIsExpired(event) && Array.isArray(content["m.calls"])
-                ? content["m.calls"].filter((call) => call)
-                : []; // Ignore expired device data
-            if (callsState.length === 0) {
-                logger_1.logger.info(`Ignoring member state from ${member.userId} member not in any calls.`);
-                ignore();
-                return;
-            }
-            // Currently we only support a single call per room. So grab the first call.
-            const callState = callsState[0];
-            const callId = callState["m.call_id"];
-            if (!callId) {
-                logger_1.logger.warn(`Room member ${member.userId} does not have a valid m.call_id set. Ignoring.`);
-                ignore();
-                return;
-            }
-            if (callId !== this.groupCallId) {
-                logger_1.logger.warn(`Call id ${callId} does not match group call id ${this.groupCallId}, ignoring.`);
-                ignore();
-                return;
-            }
-            this.addParticipant(member);
-            clearTimeout(this.memberStateExpirationTimers.get(member.userId));
-            this.memberStateExpirationTimers.set(member.userId, setTimeout(() => {
-                logger_1.logger.warn(`Call member state for ${member.userId} has expired`);
-                this.removeParticipant(member);
-            }, content["m.expires_ts"] - Date.now()));
-            // Only initiate a call with a user who has a userId that is lexicographically
-            // less than your own. Otherwise, that user will call you.
-            if (member.userId < localUserId) {
-                logger_1.logger.debug(`Waiting for ${member.userId} to send call invite.`);
-                return;
-            }
-            const opponentDevice = this.getDeviceForMember(member.userId);
-            if (!opponentDevice) {
-                logger_1.logger.warn(`No opponent device found for ${member.userId}, ignoring.`);
-                this.emit(GroupCallEvent.Error, new GroupCallUnknownDeviceError(member.userId));
-                return;
-            }
-            const existingCall = this.getCallByUserId(member.userId);
-            if (existingCall &&
-                existingCall.getOpponentSessionId() === opponentDevice.session_id) {
-                return;
-            }
-            const newCall = (0, call_1.createNewMatrixCall)(this.client, this.room.roomId, {
-                invitee: member.userId,
-                opponentDeviceId: opponentDevice.device_id,
-                opponentSessionId: opponentDevice.session_id,
-                groupCallId: this.groupCallId,
-            });
-            if (!newCall) {
-                logger_1.logger.error("Failed to create call!");
-                return;
-            }
-            if (existingCall) {
-                logger_1.logger.debug(`Replacing call ${existingCall.callId} to ${member.userId} with ${newCall.callId}`);
-                this.replaceCall(existingCall, newCall, call_1.CallErrorCode.NewSession);
-            }
-            else {
-                logger_1.logger.debug(`Adding call ${newCall.callId} to ${member.userId}`);
-                this.addCall(newCall);
-            }
-            newCall.isPtt = this.isPtt;
-            const requestScreenshareFeed = opponentDevice.feeds.some((feed) => feed.purpose === callEventTypes_1.SDPStreamMetadataPurpose.Screenshare);
-            logger_1.logger.debug(`Placing call to ${member.userId}/${opponentDevice.device_id} session ID ${opponentDevice.session_id}.`);
-            try {
-                yield newCall.placeCallWithCallFeeds(this.getLocalFeeds().map(feed => feed.clone()), requestScreenshareFeed);
-            }
-            catch (e) {
-                logger_1.logger.warn(`Failed to place call to ${member.userId}!`, e);
-                if (e instanceof call_1.CallError && e.code === GroupCallErrorCode.UnknownDevice) {
-                    this.emit(GroupCallEvent.Error, e);
-                }
-                else {
-                    this.emit(GroupCallEvent.Error, new GroupCallError(GroupCallErrorCode.PlaceCallFailed, `Failed to place call to ${member.userId}.`));
-                }
-                this.removeCall(newCall, call_1.CallErrorCode.SignallingFailed);
-                return;
-            }
-            if (this.dataChannelsEnabled) {
-                newCall.createDataChannel("datachannel", this.dataChannelOptions);
-            }
-        });
         this.onRetryCallLoop = () => {
-            for (const event of this.getMemberStateEvents()) {
-                const memberId = event.getStateKey();
-                const existingCall = this.calls.find((call) => getCallUserId(call) === memberId);
-                const retryCallCount = this.retryCallCounts.get(memberId) || 0;
-                if (!existingCall && retryCallCount < 3) {
-                    this.retryCallCounts.set(memberId, retryCallCount + 1);
-                    this.onMemberStateChanged(event);
+            var _a;
+            let needsRetry = false;
+            for (const [member, participantMap] of this.participants) {
+                const callMap = this.calls.get(member);
+                let retriesMap = this.retryCallCounts.get(member);
+                for (const [deviceId, participant] of participantMap) {
+                    const call = callMap === null || callMap === void 0 ? void 0 : callMap.get(deviceId);
+                    const retries = (_a = retriesMap === null || retriesMap === void 0 ? void 0 : retriesMap.get(deviceId)) !== null && _a !== void 0 ? _a : 0;
+                    if ((call === null || call === void 0 ? void 0 : call.getOpponentSessionId()) !== participant.sessionId
+                        && this.wantsOutgoingCall(member.userId, deviceId)
+                        && retries < 3) {
+                        if (retriesMap === undefined) {
+                            retriesMap = new Map();
+                            this.retryCallCounts.set(member, retriesMap);
+                        }
+                        retriesMap.set(deviceId, retries + 1);
+                        needsRetry = true;
+                    }
                 }
             }
-            this.retryCallLoopTimeout = setTimeout(this.onRetryCallLoop, this.retryCallInterval);
+            if (needsRetry)
+                this.placeOutgoingCalls();
         };
         this.onCallFeedsChanged = (call) => {
             const opponentMemberId = getCallUserId(call);
+            const opponentDeviceId = call.getOpponentDeviceId();
             if (!opponentMemberId) {
                 throw new Error("Cannot change call feeds without user id");
             }
-            const currentUserMediaFeed = this.getUserMediaFeedByUserId(opponentMemberId);
+            const currentUserMediaFeed = this.getUserMediaFeed(opponentMemberId, opponentDeviceId);
             const remoteUsermediaFeed = call.remoteUsermediaFeed;
             const remoteFeedChanged = remoteUsermediaFeed !== currentUserMediaFeed;
             if (remoteFeedChanged) {
@@ -97342,7 +97383,7 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
                     this.removeUserMediaFeed(currentUserMediaFeed);
                 }
             }
-            const currentScreenshareFeed = this.getScreenshareFeedByUserId(opponentMemberId);
+            const currentScreenshareFeed = this.getScreenshareFeed(opponentMemberId, opponentDeviceId);
             const remoteScreensharingFeed = call.remoteScreensharingFeed;
             const remoteScreenshareFeedChanged = remoteScreensharingFeed !== currentScreenshareFeed;
             if (remoteScreenshareFeedChanged) {
@@ -97369,48 +97410,91 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
                 call.setLocalVideoMuted(videoMuted);
             }
             if (state === call_1.CallState.Connected) {
-                this.retryCallCounts.delete(getCallUserId(call));
+                const opponent = call.getOpponentMember();
+                const retriesMap = this.retryCallCounts.get(opponent);
+                retriesMap === null || retriesMap === void 0 ? void 0 : retriesMap.delete(call.getOpponentDeviceId());
+                if ((retriesMap === null || retriesMap === void 0 ? void 0 : retriesMap.size) === 0)
+                    this.retryCallCounts.delete(opponent);
             }
         };
         this.onCallHangup = (call) => {
-            if (call.hangupReason === call_1.CallErrorCode.Replaced) {
+            var _a;
+            if (call.hangupReason === call_1.CallErrorCode.Replaced)
                 return;
+            const opponent = (_a = call.getOpponentMember()) !== null && _a !== void 0 ? _a : this.room.getMember(call.invitee);
+            const deviceMap = this.calls.get(opponent);
+            // Sanity check that this call is in fact in the map
+            if ((deviceMap === null || deviceMap === void 0 ? void 0 : deviceMap.get(call.getOpponentDeviceId())) === call) {
+                this.disposeCall(call, call.hangupReason);
+                deviceMap.delete(call.getOpponentDeviceId());
+                if (deviceMap.size === 0)
+                    this.calls.delete(opponent);
+                this.emit(GroupCallEvent.CallsChanged, this.calls);
             }
-            this.removeCall(call, call.hangupReason);
+        };
+        this.onCallReplaced = (prevCall, newCall) => {
+            const opponent = prevCall.getOpponentMember();
+            let deviceMap = this.calls.get(opponent);
+            if (deviceMap === undefined) {
+                deviceMap = new Map();
+                this.calls.set(opponent, deviceMap);
+            }
+            this.disposeCall(prevCall, call_1.CallErrorCode.Replaced);
+            this.initCall(newCall);
+            deviceMap.set(prevCall.getOpponentDeviceId(), newCall);
+            this.emit(GroupCallEvent.CallsChanged, this.calls);
         };
         this.onActiveSpeakerLoop = () => {
             let topAvg = undefined;
             let nextActiveSpeaker = undefined;
             for (const callFeed of this.userMediaFeeds) {
-                if (callFeed.userId === this.client.getUserId() && this.userMediaFeeds.length > 1) {
+                if (callFeed.isLocal() && this.userMediaFeeds.length > 1)
                     continue;
-                }
-                let total = 0;
-                for (let i = 0; i < callFeed.speakingVolumeSamples.length; i++) {
-                    const volume = callFeed.speakingVolumeSamples[i];
-                    total += Math.max(volume, callFeed_1.SPEAKING_THRESHOLD);
-                }
+                const total = callFeed.speakingVolumeSamples.reduce((acc, volume) => acc + Math.max(volume, callFeed_1.SPEAKING_THRESHOLD));
                 const avg = total / callFeed.speakingVolumeSamples.length;
                 if (!topAvg || avg > topAvg) {
                     topAvg = avg;
-                    nextActiveSpeaker = callFeed.userId;
+                    nextActiveSpeaker = callFeed;
                 }
             }
             if (nextActiveSpeaker && this.activeSpeaker !== nextActiveSpeaker && topAvg && topAvg > callFeed_1.SPEAKING_THRESHOLD) {
                 this.activeSpeaker = nextActiveSpeaker;
                 this.emit(GroupCallEvent.ActiveSpeakerChanged, this.activeSpeaker);
             }
-            this.activeSpeakerLoopTimeout = setTimeout(this.onActiveSpeakerLoop, this.activeSpeakerInterval);
+        };
+        this.onRoomState = () => this.updateParticipants();
+        this.onParticipantsChanged = () => {
+            if (this.state === GroupCallState.Entered)
+                this.placeOutgoingCalls();
+        };
+        this.onStateChanged = (newState, oldState) => {
+            if (newState === GroupCallState.Entered
+                || oldState === GroupCallState.Entered
+                || newState === GroupCallState.Ended) {
+                // We either entered, left, or ended the call
+                this.updateParticipants();
+                this.updateMemberState().catch(e => logger_1.logger.error("Failed to update member state devices", e));
+            }
+        };
+        this.onLocalFeedsChanged = () => {
+            if (this.state === GroupCallState.Entered) {
+                this.updateMemberState().catch(e => logger_1.logger.error("Failed to update member state feeds", e));
+            }
         };
         this.reEmitter = new ReEmitter_1.ReEmitter(this);
-        this.groupCallId = groupCallId || (0, call_1.genCallID)();
-        for (const stateEvent of this.getMemberStateEvents()) {
-            this.onMemberStateChanged(stateEvent);
-        }
+        this.groupCallId = groupCallId !== null && groupCallId !== void 0 ? groupCallId : (0, call_1.genCallID)();
+        this.creationTs = (_b = (_a = room.currentState.getStateEvents(event_1.EventType.GroupCallPrefix, this.groupCallId)) === null || _a === void 0 ? void 0 : _a.getTs()) !== null && _b !== void 0 ? _b : null;
+        this.updateParticipants();
+        room.on(room_state_1.RoomStateEvent.Update, this.onRoomState);
+        this.on(GroupCallEvent.ParticipantsChanged, this.onParticipantsChanged);
+        this.on(GroupCallEvent.GroupCallStateChanged, this.onStateChanged);
+        this.on(GroupCallEvent.LocalScreenshareStateChanged, this.onLocalFeedsChanged);
     }
     create() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.creationTs = Date.now();
             this.client.groupCallEventHandler.groupCalls.set(this.room.roomId, this);
+            this.client.emit(groupCallEventHandler_1.GroupCallEventHandlerEvent.Outgoing, this);
             yield this.client.sendStateEvent(this.room.roomId, event_1.EventType.GroupCallPrefix, {
                 "m.intent": this.intent,
                 "m.type": this.type,
@@ -97422,10 +97506,55 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
             return this;
         });
     }
-    setState(newState) {
-        const oldState = this.state;
-        this.state = newState;
-        this.emit(GroupCallEvent.GroupCallStateChanged, newState, oldState);
+    /**
+     * The group call's state.
+     */
+    get state() {
+        return this._state;
+    }
+    set state(value) {
+        const prevValue = this._state;
+        if (value !== prevValue) {
+            this._state = value;
+            this.emit(GroupCallEvent.GroupCallStateChanged, value, prevValue);
+        }
+    }
+    /**
+     * The current participants in the call, as a map from members to device IDs
+     * to participant info.
+     */
+    get participants() {
+        return this._participants;
+    }
+    set participants(value) {
+        const prevValue = this._participants;
+        const participantStateEqual = (x, y) => x.sessionId === y.sessionId && x.screensharing === y.screensharing;
+        const deviceMapsEqual = (x, y) => (0, utils_1.mapsEqual)(x, y, participantStateEqual);
+        // Only update if the map actually changed
+        if (!(0, utils_1.mapsEqual)(value, prevValue, deviceMapsEqual)) {
+            this._participants = value;
+            this.emit(GroupCallEvent.ParticipantsChanged, value);
+        }
+    }
+    /**
+     * The timestamp at which the call was created, or null if it has not yet
+     * been created.
+     */
+    get creationTs() {
+        return this._creationTs;
+    }
+    set creationTs(value) {
+        this._creationTs = value;
+    }
+    /**
+     * Executes the given callback on all calls in this group call.
+     * @param f The callback.
+     */
+    forEachCall(f) {
+        for (const deviceMap of this.calls.values()) {
+            for (const call of deviceMap.values())
+                f(call);
+        }
     }
     getLocalFeeds() {
         const feeds = [];
@@ -97436,8 +97565,8 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
         return feeds;
     }
     hasLocalParticipant() {
-        const userId = this.client.getUserId();
-        return this.participants.some((member) => member.userId === userId);
+        var _a, _b;
+        return (_b = (_a = this.participants.get(this.room.getMember(this.client.getUserId()))) === null || _a === void 0 ? void 0 : _a.has(this.client.getDeviceId())) !== null && _b !== void 0 ? _b : false;
     }
     initLocalCallFeed() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -97445,7 +97574,7 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
             if (this.state !== GroupCallState.LocalCallFeedUninitialized) {
                 throw new Error(`Cannot initialize local call feed in the "${this.state}" state.`);
             }
-            this.setState(GroupCallState.InitializingLocalCallFeed);
+            this.state = GroupCallState.InitializingLocalCallFeed;
             let stream;
             let disposed = false;
             const onState = (state) => {
@@ -97458,7 +97587,7 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
                 stream = yield this.client.getMediaHandler().getUserMediaStream(true, this.type === GroupCallType.Video);
             }
             catch (error) {
-                this.setState(GroupCallState.LocalCallFeedUninitialized);
+                this.state = GroupCallState.LocalCallFeedUninitialized;
                 throw error;
             }
             finally {
@@ -97467,11 +97596,11 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
             // The call could've been disposed while we were waiting
             if (disposed)
                 throw new Error("Group call disposed");
-            const userId = this.client.getUserId();
             const callFeed = new callFeed_1.CallFeed({
                 client: this.client,
                 roomId: this.room.roomId,
-                userId,
+                userId: this.client.getUserId(),
+                deviceId: this.client.getDeviceId(),
                 stream,
                 purpose: callEventTypes_1.SDPStreamMetadataPurpose.Usermedia,
                 audioMuted: this.initWithAudioMuted || stream.getAudioTracks().length === 0 || this.isPtt,
@@ -97481,7 +97610,7 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
             (0, call_1.setTracksEnabled)(stream.getVideoTracks(), !callFeed.isVideoMuted());
             this.localCallFeed = callFeed;
             this.addUserMediaFeed(callFeed);
-            this.setState(GroupCallState.LocalCallFeedInitialized);
+            this.state = GroupCallState.LocalCallFeedInitialized;
             return callFeed;
         });
     }
@@ -97501,30 +97630,22 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
     }
     enter() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!(this.state === GroupCallState.LocalCallFeedUninitialized ||
-                this.state === GroupCallState.LocalCallFeedInitialized)) {
-                throw new Error(`Cannot enter call in the "${this.state}" state`);
-            }
             if (this.state === GroupCallState.LocalCallFeedUninitialized) {
                 yield this.initLocalCallFeed();
             }
-            this.addParticipant(this.room.getMember(this.client.getUserId()));
-            yield this.sendMemberStateEvent();
-            this.activeSpeaker = undefined;
-            this.setState(GroupCallState.Entered);
+            else if (this.state !== GroupCallState.LocalCallFeedInitialized) {
+                throw new Error(`Cannot enter call in the "${this.state}" state`);
+            }
             logger_1.logger.log(`Entered group call ${this.groupCallId}`);
+            this.state = GroupCallState.Entered;
             this.client.on(callEventHandler_1.CallEventHandlerEvent.Incoming, this.onIncomingCall);
-            const calls = this.client.callEventHandler.calls.values();
-            for (const call of calls) {
+            for (const call of this.client.callEventHandler.calls.values()) {
                 this.onIncomingCall(call);
             }
-            // Set up participants for the members currently in the room.
-            // Other members will be picked up by the RoomState.members event.
-            for (const stateEvent of this.getMemberStateEvents()) {
-                this.onMemberStateChanged(stateEvent);
-            }
-            this.retryCallLoopTimeout = setTimeout(this.onRetryCallLoop, this.retryCallInterval);
+            this.retryCallLoopInterval = setInterval(this.onRetryCallLoop, this.retryCallInterval);
+            this.activeSpeaker = undefined;
             this.onActiveSpeakerLoop();
+            this.activeSpeakerLoopInterval = setInterval(this.onActiveSpeakerLoop, this.activeSpeakerInterval);
         });
     }
     dispose() {
@@ -97539,54 +97660,43 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
             this.localDesktopCapturerSourceId = undefined;
         }
         this.client.getMediaHandler().stopAllStreams();
+        if (this.transmitTimer !== null) {
+            clearTimeout(this.transmitTimer);
+            this.transmitTimer = null;
+        }
+        if (this.retryCallLoopInterval !== undefined) {
+            clearInterval(this.retryCallLoopInterval);
+            this.retryCallLoopInterval = undefined;
+        }
         if (this.state !== GroupCallState.Entered) {
             return;
         }
-        this.removeParticipant(this.room.getMember(this.client.getUserId()));
-        this.removeMemberStateEvent();
-        while (this.calls.length > 0) {
-            this.removeCall(this.calls[this.calls.length - 1], call_1.CallErrorCode.UserHangup);
-        }
+        this.forEachCall(call => this.disposeCall(call, call_1.CallErrorCode.UserHangup));
+        this.calls.clear();
         this.activeSpeaker = undefined;
-        clearTimeout(this.activeSpeakerLoopTimeout);
+        clearInterval(this.activeSpeakerLoopInterval);
         this.retryCallCounts.clear();
-        clearTimeout(this.retryCallLoopTimeout);
-        for (const [userId] of this.memberStateExpirationTimers) {
-            clearTimeout(this.memberStateExpirationTimers.get(userId));
-            this.memberStateExpirationTimers.delete(userId);
-        }
-        if (this.transmitTimer !== null) {
-            clearTimeout(this.transmitTimer);
-            this.transmitTimer = null;
-        }
+        clearInterval(this.retryCallLoopInterval);
         this.client.removeListener(callEventHandler_1.CallEventHandlerEvent.Incoming, this.onIncomingCall);
     }
     leave() {
-        if (this.transmitTimer !== null) {
-            clearTimeout(this.transmitTimer);
-            this.transmitTimer = null;
-        }
         this.dispose();
-        this.setState(GroupCallState.LocalCallFeedUninitialized);
+        this.state = GroupCallState.LocalCallFeedUninitialized;
     }
     terminate(emitStateEvent = true) {
         return __awaiter(this, void 0, void 0, function* () {
             this.dispose();
-            if (this.transmitTimer !== null) {
-                clearTimeout(this.transmitTimer);
-                this.transmitTimer = null;
-            }
-            this.participants = [];
+            this.room.off(room_state_1.RoomStateEvent.Update, this.onRoomState);
             this.client.groupCallEventHandler.groupCalls.delete(this.room.roomId);
+            this.client.emit(groupCallEventHandler_1.GroupCallEventHandlerEvent.Ended, this);
+            this.state = GroupCallState.Ended;
             if (emitStateEvent) {
                 const existingStateEvent = this.room.currentState.getStateEvents(event_1.EventType.GroupCallPrefix, this.groupCallId);
-                yield this.client.sendStateEvent(this.room.roomId, event_1.EventType.GroupCallPrefix, Object.assign(Object.assign({}, existingStateEvent.getContent()), { ["m.terminated"]: GroupCallTerminationReason.CallEnded }), this.groupCallId);
+                yield this.client.sendStateEvent(this.room.roomId, event_1.EventType.GroupCallPrefix, Object.assign(Object.assign({}, existingStateEvent.getContent()), { "m.terminated": GroupCallTerminationReason.CallEnded }), this.groupCallId);
             }
-            this.client.emit(groupCallEventHandler_1.GroupCallEventHandlerEvent.Ended, this);
-            this.setState(GroupCallState.Ended);
         });
     }
-    /**
+    /*
      * Local Usermedia
      */
     isLocalVideoMuted() {
@@ -97607,7 +97717,6 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
      * @returns {Promise<boolean>} Whether muting/unmuting was successful
      */
     setMicrophoneMuted(muted) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             // hasAudioDevice can block indefinitely if the window has lost focus,
             // and it doesn't make much sense to keep a device from being muted, so
@@ -97630,17 +97739,14 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
                     this.transmitTimer = null;
                 }
             }
-            for (const call of this.calls) {
-                (_a = call.localUsermediaFeed) === null || _a === void 0 ? void 0 : _a.setAudioVideoMuted(muted, null);
-            }
-            if (sendUpdatesBefore) {
-                try {
-                    yield Promise.all(this.calls.map(c => c.sendMetadataUpdate()));
-                }
-                catch (e) {
-                    logger_1.logger.info("Failed to send one or more metadata updates", e);
-                }
-            }
+            this.forEachCall(call => { var _a; return (_a = call.localUsermediaFeed) === null || _a === void 0 ? void 0 : _a.setAudioVideoMuted(muted, null); });
+            const sendUpdates = () => __awaiter(this, void 0, void 0, function* () {
+                const updates = [];
+                this.forEachCall(call => updates.push(call.sendMetadataUpdate()));
+                yield Promise.all(updates).catch(e => logger_1.logger.info("Failed to send some metadata updates", e));
+            });
+            if (sendUpdatesBefore)
+                yield sendUpdates();
             if (this.localCallFeed) {
                 logger_1.logger.log(`groupCall ${this.groupCallId} setMicrophoneMuted stream ${this.localCallFeed.stream.id} muted ${muted}`);
                 this.localCallFeed.setAudioVideoMuted(muted, null);
@@ -97654,18 +97760,10 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
                 logger_1.logger.log(`groupCall ${this.groupCallId} setMicrophoneMuted no stream muted ${muted}`);
                 this.initWithAudioMuted = muted;
             }
-            for (const call of this.calls) {
-                (0, call_1.setTracksEnabled)(call.localUsermediaFeed.stream.getAudioTracks(), !muted);
-            }
+            this.forEachCall(call => (0, call_1.setTracksEnabled)(call.localUsermediaFeed.stream.getAudioTracks(), !muted));
             this.emit(GroupCallEvent.LocalMuteStateChanged, muted, this.isLocalVideoMuted());
-            if (!sendUpdatesBefore) {
-                try {
-                    yield Promise.all(this.calls.map(c => c.sendMetadataUpdate()));
-                }
-                catch (e) {
-                    logger_1.logger.info("Failed to send one or more metadata updates", e);
-                }
-            }
+            if (!sendUpdatesBefore)
+                yield sendUpdates();
             return true;
         });
     }
@@ -97691,9 +97789,9 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
                 logger_1.logger.log(`groupCall ${this.groupCallId} setLocalVideoMuted no stream muted ${muted}`);
                 this.initWithVideoMuted = muted;
             }
-            for (const call of this.calls) {
-                call.setLocalVideoMuted(muted);
-            }
+            const updates = [];
+            this.forEachCall(call => updates.push(call.setLocalVideoMuted(muted)));
+            yield Promise.all(updates);
             this.emit(GroupCallEvent.LocalMuteStateChanged, this.isMicrophoneMuted(), muted);
             return true;
         });
@@ -97720,6 +97818,7 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
                         client: this.client,
                         roomId: this.room.roomId,
                         userId: this.client.getUserId(),
+                        deviceId: this.client.getDeviceId(),
                         stream,
                         purpose: callEventTypes_1.SDPStreamMetadataPurpose.Screenshare,
                         audioMuted: false,
@@ -97728,8 +97827,7 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
                     this.addScreenshareFeed(this.localScreenshareFeed);
                     this.emit(GroupCallEvent.LocalScreenshareStateChanged, true, this.localScreenshareFeed, this.localDesktopCapturerSourceId);
                     // TODO: handle errors
-                    yield Promise.all(this.calls.map(call => call.pushLocalFeed(this.localScreenshareFeed.clone())));
-                    yield this.sendMemberStateEvent();
+                    this.forEachCall(call => call.pushLocalFeed(this.localScreenshareFeed.clone()));
                     return true;
                 }
                 catch (error) {
@@ -97741,15 +97839,14 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
                 }
             }
             else {
-                yield Promise.all(this.calls.map(call => {
+                this.forEachCall(call => {
                     if (call.localScreensharingFeed)
                         call.removeLocalFeed(call.localScreensharingFeed);
-                }));
+                });
                 this.client.getMediaHandler().stopScreensharingStream(this.localScreenshareFeed.stream);
                 this.removeScreenshareFeed(this.localScreenshareFeed);
                 this.localScreenshareFeed = undefined;
                 this.localDesktopCapturerSourceId = undefined;
-                yield this.sendMemberStateEvent();
                 this.emit(GroupCallEvent.LocalScreenshareStateChanged, false, undefined, undefined);
                 return false;
             }
@@ -97758,128 +97855,86 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
     isScreensharing() {
         return !!this.localScreenshareFeed;
     }
-    getMemberStateEvents(userId) {
-        if (userId != null) {
-            const event = this.room.currentState.getStateEvents(event_1.EventType.GroupCallMemberPrefix, userId);
-            return callMemberStateIsExpired(event) ? null : event;
-        }
-        else {
-            return this.room.currentState.getStateEvents(event_1.EventType.GroupCallMemberPrefix)
-                .filter(event => !callMemberStateIsExpired(event));
-        }
-    }
-    sendMemberStateEvent() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const send = () => this.updateMemberCallState({
-                "m.call_id": this.groupCallId,
-                "m.devices": [
-                    {
-                        "device_id": this.client.getDeviceId(),
-                        "session_id": this.client.getSessionId(),
-                        "feeds": this.getLocalFeeds().map((feed) => ({
-                            purpose: feed.purpose,
-                        })),
-                        // TODO: Add data channels
-                    },
-                ],
-                // TODO "m.foci"
-            });
-            const res = yield send();
-            // Clear the old interval first, so that it isn't forgot
-            if (this.resendMemberStateTimer !== null)
-                clearInterval(this.resendMemberStateTimer);
-            // Resend the state event every so often so it doesn't become stale
-            this.resendMemberStateTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                logger_1.logger.log("Resending call member state");
-                yield send();
-            }), CALL_MEMBER_STATE_TIMEOUT * 3 / 4);
-            return res;
-        });
-    }
-    removeMemberStateEvent() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.resendMemberStateTimer !== null)
-                clearInterval(this.resendMemberStateTimer);
-            this.resendMemberStateTimer = null;
-            return yield this.updateMemberCallState(undefined, true);
-        });
+    /**
+     * Determines whether a given participant expects us to call them (versus
+     * them calling us).
+     * @param userId The participant's user ID.
+     * @param deviceId The participant's device ID.
+     * @returns Whether we need to place an outgoing call to the participant.
+     */
+    wantsOutgoingCall(userId, deviceId) {
+        const localUserId = this.client.getUserId();
+        const localDeviceId = this.client.getDeviceId();
+        return (
+        // If a user's ID is less than our own, they'll call us
+        userId >= localUserId
+            // If this is another one of our devices, compare device IDs to tell whether it'll call us
+            && (userId !== localUserId || deviceId > localDeviceId));
     }
-    updateMemberCallState(memberCallState, keepAlive = false) {
+    /**
+     * Places calls to all participants that we're responsible for calling.
+     */
+    placeOutgoingCalls() {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const localUserId = this.client.getUserId();
-            const memberState = (_a = this.getMemberStateEvents(localUserId)) === null || _a === void 0 ? void 0 : _a.getContent();
-            let calls = [];
-            // Sanitize existing member state event
-            if (memberState && Array.isArray(memberState["m.calls"])) {
-                calls = memberState["m.calls"].filter((call) => !!call);
-            }
-            const existingCallIndex = calls.findIndex((call) => call && call["m.call_id"] === this.groupCallId);
-            if (existingCallIndex !== -1) {
-                if (memberCallState) {
-                    calls.splice(existingCallIndex, 1, memberCallState);
-                }
-                else {
-                    calls.splice(existingCallIndex, 1);
+        let callsChanged = false;
+        for (const [member, participantMap] of this.participants) {
+            const callMap = (_a = this.calls.get(member)) !== null && _a !== void 0 ? _a : new Map();
+            for (const [deviceId, participant] of participantMap) {
+                const prevCall = callMap.get(deviceId);
+                if ((prevCall === null || prevCall === void 0 ? void 0 : prevCall.getOpponentSessionId()) !== participant.sessionId
+                    && this.wantsOutgoingCall(member.userId, deviceId)) {
+                    callsChanged = true;
+                    if (prevCall !== undefined) {
+                        logger_1.logger.debug(`Replacing call ${prevCall.callId} to ${member.userId} ${deviceId}`);
+                        this.disposeCall(prevCall, call_1.CallErrorCode.NewSession);
+                    }
+                    const newCall = (0, call_1.createNewMatrixCall)(this.client, this.room.roomId, {
+                        invitee: member.userId,
+                        opponentDeviceId: deviceId,
+                        opponentSessionId: participant.sessionId,
+                        groupCallId: this.groupCallId,
+                    });
+                    if (newCall === null) {
+                        logger_1.logger.error(`Failed to create call with ${member.userId} ${deviceId}`);
+                        callMap.delete(deviceId);
+                    }
+                    else {
+                        this.initCall(newCall);
+                        callMap.set(deviceId, newCall);
+                        logger_1.logger.debug(`Placing call to ${member.userId} ${deviceId} (session ${participant.sessionId})`);
+                        newCall.placeCallWithCallFeeds(this.getLocalFeeds().map(feed => feed.clone()), participant.screensharing).then(() => {
+                            if (this.dataChannelsEnabled) {
+                                newCall.createDataChannel("datachannel", this.dataChannelOptions);
+                            }
+                        }).catch(e => {
+                            logger_1.logger.warn(`Failed to place call to ${member.userId}`, e);
+                            if (e instanceof call_1.CallError && e.code === GroupCallErrorCode.UnknownDevice) {
+                                this.emit(GroupCallEvent.Error, e);
+                            }
+                            else {
+                                this.emit(GroupCallEvent.Error, new GroupCallError(GroupCallErrorCode.PlaceCallFailed, `Failed to place call to ${member.userId}`));
+                            }
+                            this.disposeCall(newCall, call_1.CallErrorCode.SignallingFailed);
+                            if (callMap.get(deviceId) === newCall)
+                                callMap.delete(deviceId);
+                        });
+                    }
                 }
             }
-            else if (memberCallState) {
-                calls.push(memberCallState);
+            if (callMap.size > 0) {
+                this.calls.set(member, callMap);
+            }
+            else {
+                this.calls.delete(member);
             }
-            const content = {
-                "m.calls": calls,
-                "m.expires_ts": Date.now() + CALL_MEMBER_STATE_TIMEOUT,
-            };
-            return this.client.sendStateEvent(this.room.roomId, event_1.EventType.GroupCallMemberPrefix, content, localUserId, { keepAlive });
-        });
-    }
-    getDeviceForMember(userId) {
-        var _a;
-        const memberStateEvent = this.getMemberStateEvents(userId);
-        if (!memberStateEvent) {
-            return undefined;
-        }
-        const memberState = memberStateEvent.getContent();
-        const memberGroupCallState = (_a = memberState["m.calls"]) === null || _a === void 0 ? void 0 : _a.find((call) => call && call["m.call_id"] === this.groupCallId);
-        if (!memberGroupCallState) {
-            return undefined;
-        }
-        const memberDevices = memberGroupCallState["m.devices"];
-        if (!memberDevices || memberDevices.length === 0) {
-            return undefined;
-        }
-        // NOTE: For now we only support one device so we use the device id in the first source.
-        return memberDevices[0];
-    }
-    /**
-     * Call Event Handlers
-     */
-    getCallByUserId(userId) {
-        return this.calls.find((call) => getCallUserId(call) === userId);
-    }
-    addCall(call) {
-        this.calls.push(call);
-        this.initCall(call);
-        this.emit(GroupCallEvent.CallsChanged, this.calls);
-    }
-    replaceCall(existingCall, replacementCall, hangupReason = call_1.CallErrorCode.Replaced) {
-        const existingCallIndex = this.calls.indexOf(existingCall);
-        if (existingCallIndex === -1) {
-            throw new Error("Couldn't find call to replace");
         }
-        this.calls.splice(existingCallIndex, 1, replacementCall);
-        this.disposeCall(existingCall, hangupReason);
-        this.initCall(replacementCall);
-        this.emit(GroupCallEvent.CallsChanged, this.calls);
+        if (callsChanged)
+            this.emit(GroupCallEvent.CallsChanged, this.calls);
     }
-    removeCall(call, hangupReason) {
-        this.disposeCall(call, hangupReason);
-        const callIndex = this.calls.indexOf(call);
-        if (callIndex === -1) {
-            throw new Error("Couldn't find call to remove");
-        }
-        this.calls.splice(callIndex, 1);
-        this.emit(GroupCallEvent.CallsChanged, this.calls);
+    getMemberStateEvents(userId) {
+        return userId === undefined
+            ? this.room.currentState.getStateEvents(event_1.EventType.GroupCallMemberPrefix)
+            : this.room.currentState.getStateEvents(event_1.EventType.GroupCallMemberPrefix, userId);
     }
     initCall(call) {
         const opponentMemberId = getCallUserId(call);
@@ -97889,8 +97944,13 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
         const onCallFeedsChanged = () => this.onCallFeedsChanged(call);
         const onCallStateChanged = (state, oldState) => this.onCallStateChanged(call, state, oldState);
         const onCallHangup = this.onCallHangup;
-        const onCallReplaced = (newCall) => this.replaceCall(call, newCall);
-        this.callHandlers.set(opponentMemberId, {
+        const onCallReplaced = (newCall) => this.onCallReplaced(call, newCall);
+        let deviceMap = this.callHandlers.get(opponentMemberId);
+        if (deviceMap === undefined) {
+            deviceMap = new Map();
+            this.callHandlers.set(opponentMemberId, deviceMap);
+        }
+        deviceMap.set(call.getOpponentDeviceId(), {
             onCallFeedsChanged,
             onCallStateChanged,
             onCallHangup,
@@ -97900,40 +97960,45 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
         call.on(call_1.CallEvent.State, onCallStateChanged);
         call.on(call_1.CallEvent.Hangup, onCallHangup);
         call.on(call_1.CallEvent.Replaced, onCallReplaced);
+        call.isPtt = this.isPtt;
         this.reEmitter.reEmit(call, Object.values(call_1.CallEvent));
         onCallFeedsChanged();
     }
     disposeCall(call, hangupReason) {
         const opponentMemberId = getCallUserId(call);
+        const opponentDeviceId = call.getOpponentDeviceId();
         if (!opponentMemberId) {
             throw new Error("Cannot dispose call without user id");
         }
-        const { onCallFeedsChanged, onCallStateChanged, onCallHangup, onCallReplaced, } = this.callHandlers.get(opponentMemberId);
+        const deviceMap = this.callHandlers.get(opponentMemberId);
+        const { onCallFeedsChanged, onCallStateChanged, onCallHangup, onCallReplaced, } = deviceMap.get(opponentDeviceId);
         call.removeListener(call_1.CallEvent.FeedsChanged, onCallFeedsChanged);
         call.removeListener(call_1.CallEvent.State, onCallStateChanged);
         call.removeListener(call_1.CallEvent.Hangup, onCallHangup);
         call.removeListener(call_1.CallEvent.Replaced, onCallReplaced);
-        this.callHandlers.delete(opponentMemberId);
+        deviceMap.delete(opponentMemberId);
+        if (deviceMap.size === 0)
+            this.callHandlers.delete(opponentMemberId);
         if (call.hangupReason === call_1.CallErrorCode.Replaced) {
             return;
         }
         if (call.state !== call_1.CallState.Ended) {
             call.hangup(hangupReason, false);
         }
-        const usermediaFeed = this.getUserMediaFeedByUserId(opponentMemberId);
+        const usermediaFeed = this.getUserMediaFeed(opponentMemberId, opponentDeviceId);
         if (usermediaFeed) {
             this.removeUserMediaFeed(usermediaFeed);
         }
-        const screenshareFeed = this.getScreenshareFeedByUserId(opponentMemberId);
+        const screenshareFeed = this.getScreenshareFeed(opponentMemberId, opponentDeviceId);
         if (screenshareFeed) {
             this.removeScreenshareFeed(screenshareFeed);
         }
     }
-    /**
+    /*
      * UserMedia CallFeed Event Handlers
      */
-    getUserMediaFeedByUserId(userId) {
-        return this.userMediaFeeds.find((feed) => feed.userId === userId);
+    getUserMediaFeed(userId, deviceId) {
+        return this.userMediaFeeds.find(f => f.userId === userId && f.deviceId === deviceId);
     }
     addUserMediaFeed(callFeed) {
         this.userMediaFeeds.push(callFeed);
@@ -97941,7 +98006,7 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
         this.emit(GroupCallEvent.UserMediaFeedsChanged, this.userMediaFeeds);
     }
     replaceUserMediaFeed(existingFeed, replacementFeed) {
-        const feedIndex = this.userMediaFeeds.findIndex((feed) => feed.userId === existingFeed.userId);
+        const feedIndex = this.userMediaFeeds.findIndex(f => f.userId === existingFeed.userId && f.deviceId === existingFeed.deviceId);
         if (feedIndex === -1) {
             throw new Error("Couldn't find user media feed to replace");
         }
@@ -97951,31 +98016,30 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
         this.emit(GroupCallEvent.UserMediaFeedsChanged, this.userMediaFeeds);
     }
     removeUserMediaFeed(callFeed) {
-        const feedIndex = this.userMediaFeeds.findIndex((feed) => feed.userId === callFeed.userId);
+        const feedIndex = this.userMediaFeeds.findIndex(f => f.userId === callFeed.userId && f.deviceId === callFeed.deviceId);
         if (feedIndex === -1) {
             throw new Error("Couldn't find user media feed to remove");
         }
         this.userMediaFeeds.splice(feedIndex, 1);
         callFeed.dispose();
         this.emit(GroupCallEvent.UserMediaFeedsChanged, this.userMediaFeeds);
-        if (this.activeSpeaker === callFeed.userId &&
-            this.userMediaFeeds.length > 0) {
-            this.activeSpeaker = this.userMediaFeeds[0].userId;
+        if (this.activeSpeaker === callFeed) {
+            this.activeSpeaker = this.userMediaFeeds[0];
             this.emit(GroupCallEvent.ActiveSpeakerChanged, this.activeSpeaker);
         }
     }
-    /**
+    /*
      * Screenshare Call Feed Event Handlers
      */
-    getScreenshareFeedByUserId(userId) {
-        return this.screenshareFeeds.find((feed) => feed.userId === userId);
+    getScreenshareFeed(userId, deviceId) {
+        return this.screenshareFeeds.find(f => f.userId === userId && f.deviceId === deviceId);
     }
     addScreenshareFeed(callFeed) {
         this.screenshareFeeds.push(callFeed);
         this.emit(GroupCallEvent.ScreenshareFeedsChanged, this.screenshareFeeds);
     }
     replaceScreenshareFeed(existingFeed, replacementFeed) {
-        const feedIndex = this.screenshareFeeds.findIndex((feed) => feed.userId === existingFeed.userId);
+        const feedIndex = this.screenshareFeeds.findIndex(f => f.userId === existingFeed.userId && f.deviceId === existingFeed.deviceId);
         if (feedIndex === -1) {
             throw new Error("Couldn't find screenshare feed to replace");
         }
@@ -97984,7 +98048,7 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
         this.emit(GroupCallEvent.ScreenshareFeedsChanged, this.screenshareFeeds);
     }
     removeScreenshareFeed(callFeed) {
-        const feedIndex = this.screenshareFeeds.findIndex((feed) => feed.userId === callFeed.userId);
+        const feedIndex = this.screenshareFeeds.findIndex(f => f.userId === callFeed.userId && f.deviceId === callFeed.deviceId);
         if (feedIndex === -1) {
             throw new Error("Couldn't find screenshare feed to remove");
         }
@@ -97993,29 +98057,180 @@ class GroupCall extends typed_event_emitter_1.TypedEventEmitter {
         this.emit(GroupCallEvent.ScreenshareFeedsChanged, this.screenshareFeeds);
     }
     /**
-     * Participant Management
+     * Recalculates and updates the participant map to match the room state.
      */
-    addParticipant(member) {
-        if (this.participants.find((m) => m.userId === member.userId)) {
-            return;
+    updateParticipants() {
+        if (this.participantsExpirationTimer !== null) {
+            clearTimeout(this.participantsExpirationTimer);
+            this.participantsExpirationTimer = null;
         }
-        this.participants.push(member);
-        this.emit(GroupCallEvent.ParticipantsChanged, this.participants);
-        this.client.emit(groupCallEventHandler_1.GroupCallEventHandlerEvent.Participants, this.participants, this);
-    }
-    removeParticipant(member) {
-        const index = this.participants.findIndex((m) => m.userId === member.userId);
-        if (index === -1) {
+        if (this.state === GroupCallState.Ended) {
+            this.participants = new Map();
             return;
         }
-        this.participants.splice(index, 1);
-        this.emit(GroupCallEvent.ParticipantsChanged, this.participants);
-        this.client.emit(groupCallEventHandler_1.GroupCallEventHandlerEvent.Participants, this.participants, this);
+        const participants = new Map();
+        const now = Date.now();
+        const entered = this.state === GroupCallState.Entered;
+        let nextExpiration = Infinity;
+        for (const e of this.getMemberStateEvents()) {
+            const member = this.room.getMember(e.getStateKey());
+            const content = e.getContent();
+            const calls = Array.isArray(content["m.calls"]) ? content["m.calls"] : [];
+            const call = calls.find(call => call["m.call_id"] === this.groupCallId);
+            const devices = Array.isArray(call === null || call === void 0 ? void 0 : call["m.devices"]) ? call["m.devices"] : [];
+            // Filter out invalid and expired devices
+            let validDevices = devices.filter(d => (typeof d.device_id === "string"
+                && typeof d.session_id === "string"
+                && typeof d.expires_ts === "number"
+                && d.expires_ts > now
+                && Array.isArray(d.feeds)));
+            // Apply local echo for the unentered case
+            if (!entered && (member === null || member === void 0 ? void 0 : member.userId) === this.client.getUserId()) {
+                validDevices = validDevices.filter(d => d.device_id !== this.client.getDeviceId());
+            }
+            // Must have a connected device and be joined to the room
+            if (validDevices.length > 0 && (member === null || member === void 0 ? void 0 : member.membership) === "join") {
+                const deviceMap = new Map();
+                participants.set(member, deviceMap);
+                for (const d of validDevices) {
+                    deviceMap.set(d.device_id, {
+                        sessionId: d.session_id,
+                        screensharing: d.feeds.some(f => f.purpose === callEventTypes_1.SDPStreamMetadataPurpose.Screenshare),
+                    });
+                    if (d.expires_ts < nextExpiration)
+                        nextExpiration = d.expires_ts;
+                }
+            }
+        }
+        // Apply local echo for the entered case
+        if (entered) {
+            const localMember = this.room.getMember(this.client.getUserId());
+            let deviceMap = participants.get(localMember);
+            if (deviceMap === undefined) {
+                deviceMap = new Map();
+                participants.set(localMember, deviceMap);
+            }
+            if (!deviceMap.has(this.client.getDeviceId())) {
+                deviceMap.set(this.client.getDeviceId(), {
+                    sessionId: this.client.getSessionId(),
+                    screensharing: this.getLocalFeeds().some(f => f.purpose === callEventTypes_1.SDPStreamMetadataPurpose.Screenshare),
+                });
+            }
+        }
+        this.participants = participants;
+        if (nextExpiration < Infinity) {
+            this.participantsExpirationTimer = setTimeout(() => this.updateParticipants(), nextExpiration - now);
+        }
+    }
+    /**
+     * Updates the local user's member state with the devices returned by the given function.
+     * @param fn A function from the current devices to the new devices. If it
+     *   returns null, the update will be skipped.
+     * @param keepAlive Whether the request should outlive the window.
+     */
+    updateDevices(fn, keepAlive = false) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const now = Date.now();
+            const localUserId = this.client.getUserId();
+            const event = this.getMemberStateEvents(localUserId);
+            const content = (_a = event === null || event === void 0 ? void 0 : event.getContent()) !== null && _a !== void 0 ? _a : {};
+            const calls = Array.isArray(content["m.calls"]) ? content["m.calls"] : [];
+            let call = null;
+            const otherCalls = [];
+            for (const c of calls) {
+                if (c["m.call_id"] === this.groupCallId) {
+                    call = c;
+                }
+                else {
+                    otherCalls.push(c);
+                }
+            }
+            if (call === null)
+                call = {};
+            const devices = Array.isArray(call["m.devices"]) ? call["m.devices"] : [];
+            // Filter out invalid and expired devices
+            const validDevices = devices.filter(d => (typeof d.device_id === "string"
+                && typeof d.session_id === "string"
+                && typeof d.expires_ts === "number"
+                && d.expires_ts > now
+                && Array.isArray(d.feeds)));
+            const newDevices = fn(validDevices);
+            if (newDevices === null)
+                return;
+            const newCalls = [...otherCalls];
+            if (newDevices.length > 0) {
+                newCalls.push(Object.assign(Object.assign({}, call), { "m.call_id": this.groupCallId, "m.devices": newDevices }));
+            }
+            const newContent = { "m.calls": newCalls };
+            yield this.client.sendStateEvent(this.room.roomId, event_1.EventType.GroupCallMemberPrefix, newContent, localUserId, { keepAlive });
+        });
+    }
+    addDeviceToMemberState() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.updateDevices(devices => [
+                ...devices.filter(d => d.device_id !== this.client.getDeviceId()),
+                {
+                    "device_id": this.client.getDeviceId(),
+                    "session_id": this.client.getSessionId(),
+                    "expires_ts": Date.now() + DEVICE_TIMEOUT,
+                    "feeds": this.getLocalFeeds().map(feed => ({ purpose: feed.purpose })),
+                    // TODO: Add data channels
+                },
+            ]);
+        });
+    }
+    updateMemberState() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Clear the old update interval before proceeding
+            if (this.resendMemberStateTimer !== null) {
+                clearInterval(this.resendMemberStateTimer);
+                this.resendMemberStateTimer = null;
+            }
+            if (this.state === GroupCallState.Entered) {
+                // Add the local device
+                yield this.addDeviceToMemberState();
+                // Resend the state event every so often so it doesn't become stale
+                this.resendMemberStateTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+                    logger_1.logger.log("Resending call member state");
+                    try {
+                        yield this.addDeviceToMemberState();
+                    }
+                    catch (e) {
+                        logger_1.logger.error("Failed to resend call member state", e);
+                    }
+                }), DEVICE_TIMEOUT * 3 / 4);
+            }
+            else {
+                // Remove the local device
+                yield this.updateDevices(devices => devices.filter(d => d.device_id !== this.client.getDeviceId()), true);
+            }
+        });
+    }
+    /**
+     * Cleans up our member state by filtering out logged out devices, inactive
+     * devices, and our own device (if we know we haven't entered).
+     */
+    cleanMemberState() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { devices: myDevices } = yield this.client.getDevices();
+            const deviceMap = new Map(myDevices.map(d => [d.device_id, d]));
+            // updateDevices takes care of filtering out inactive devices for us
+            yield this.updateDevices(devices => {
+                const newDevices = devices.filter(d => {
+                    const device = deviceMap.get(d.device_id);
+                    return (device === null || device === void 0 ? void 0 : device.last_seen_ts) !== undefined
+                        && !(d.device_id === this.client.getDeviceId() && this.state !== GroupCallState.Entered);
+                });
+                // Skip the update if the devices are unchanged
+                return newDevices.length === devices.length ? null : newDevices;
+            });
+        });
     }
 }
 exports.GroupCall = GroupCall;
 
-},{"../@types/event":290,"../ReEmitter":300,"../logger":356,"../models/typed-event-emitter":376,"./call":395,"./callEventHandler":396,"./callEventTypes":397,"./callFeed":398,"./groupCallEventHandler":400}],400:[function(require,module,exports){
+},{"../@types/event":290,"../ReEmitter":300,"../logger":356,"../models/room-state":371,"../models/typed-event-emitter":376,"../utils":393,"./call":395,"./callEventHandler":396,"./callEventTypes":397,"./callFeed":398,"./groupCallEventHandler":400}],400:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
@@ -98052,6 +98267,7 @@ const sync_1 = require("../sync");
 var GroupCallEventHandlerEvent;
 (function (GroupCallEventHandlerEvent) {
     GroupCallEventHandlerEvent["Incoming"] = "GroupCall.incoming";
+    GroupCallEventHandlerEvent["Outgoing"] = "GroupCall.outgoing";
     GroupCallEventHandlerEvent["Ended"] = "GroupCall.ended";
     GroupCallEventHandlerEvent["Participants"] = "GroupCall.participants";
 })(GroupCallEventHandlerEvent = exports.GroupCallEventHandlerEvent || (exports.GroupCallEventHandlerEvent = {}));
@@ -98090,13 +98306,6 @@ class GroupCallEventHandler {
                     logger_1.logger.warn(`Multiple group calls detected for room: ${state.roomId}. Multiple group calls are currently unsupported.`);
                 }
             }
-            else if (eventType === event_1.EventType.GroupCallMemberPrefix) {
-                const groupCall = this.groupCalls.get(state.roomId);
-                if (!groupCall) {
-                    return;
-                }
-                groupCall.onMemberStateChanged(event);
-            }
         };
     }
     start() {