matrix-nodejs-homeserver 0.2.0 → 0.3.2

package/dist/core/rooms.js

@@ -1,4 +1,5 @@
 import { isObject } from "./json.js";
+import { M, UNSTABLE } from "./m.js";
 import { SUPPORTED_ROOM_VERSIONS, eventIdOf, finalisePdu, redact, roomVersionFeatures, splitStateKey, stateKey, toClientEvent } from "./events.js";
 import { MatrixError, errors } from "./errors.js";
 import { generateRoomId, isValidUserId, parseId } from "./ids.js";
@@ -280,7 +281,7 @@ var RoomService = class {
 		return state;
 	}
 	async createEventOf(roomId) {
-		return getState(await this.currentState(roomId), "m.room.create");
+		return getState(await this.currentState(roomId), M.ROOM.CREATE);
 	}
 	/**
 	* State before an event with the given prev_events: the snapshot of a single
@@ -384,7 +385,7 @@ var RoomService = class {
 			pdu.auth_events = pdu.auth_events.map((id) => [id, {}]);
 		}
 		if (!skipAuth) {
-			if (features.v12) before.set(stateKey("m.room.create", ""), await this.createEventOf(roomId));
+			if (features.v12) before.set(stateKey(M.ROOM.CREATE, ""), await this.createEventOf(roomId));
 			checkAuth(pdu, before, version);
 		}
 		if (Buffer.byteLength(JSON.stringify(pdu)) > MAX_EVENT_SIZE) throw errors.tooLarge("Event too large");
@@ -401,7 +402,7 @@ var RoomService = class {
 			eventId,
 			status: "persisted"
 		};
-		const createEvent = features.v12 ? pdu.type === "m.room.create" ? void 0 : opts.createEvent ?? await this.createEventOf(roomId) ?? await this.findCreateEvent(roomId) : void 0;
+		const createEvent = features.v12 ? pdu.type === M.ROOM.CREATE ? void 0 : opts.createEvent ?? await this.createEventOf(roomId) ?? await this.findCreateEvent(roomId) : void 0;
 		const prevIds = (pdu.prev_events ?? []).map(eventIdOf);
 		if (!opts.local) {
 			const reject = async (reason) => {
@@ -436,7 +437,7 @@ var RoomService = class {
 		};
 		else before = await this.stateBefore(roomId, version, prevIds, createEvent);
 		const beforeMap = await this.stateIdsToMap(before.ids);
-		if (createEvent) beforeMap.set(stateKey("m.room.create", ""), createEvent);
+		if (createEvent) beforeMap.set(stateKey(M.ROOM.CREATE, ""), createEvent);
 		const partial = !opts.local && !opts.backfill && await this.hs.partialState.isPartial(roomId);
 		if (partial) {
 			const authPdus = await this.getPdus((pdu.auth_events ?? []).map(eventIdOf));
@@ -469,7 +470,7 @@ var RoomService = class {
 			}
 			if (!opts.backfill && !opts.stateBefore && !partial) {
 				const current = new Map(await this.currentState(roomId));
-				if (createEvent) current.set(stateKey("m.room.create", ""), createEvent);
+				if (createEvent) current.set(stateKey(M.ROOM.CREATE, ""), createEvent);
 				const softFail = async () => {
 					const ids = pdu.state_key !== void 0 ? {
 						...before.ids,
@@ -539,7 +540,7 @@ var RoomService = class {
 			}], { state_snapshot: snapshot });
 			this.eventCache.delete(eventId);
 		};
-		const joinKey = stateKey("m.room.member", join.pdu.state_key);
+		const joinKey = stateKey(M.ROOM.MEMBER, join.pdu.state_key);
 		await setSnapshot(joinEventId, await writeSnapshot({
 			...fullBefore,
 			[joinKey]: joinEventId
@@ -586,7 +587,7 @@ var RoomService = class {
 				continue;
 			}
 			const beforeMap = await this.stateIdsToMap(before.ids);
-			if (createEvent) beforeMap.set(stateKey("m.room.create", ""), createEvent);
+			if (createEvent) beforeMap.set(stateKey(M.ROOM.CREATE, ""), createEvent);
 			let allowed = true;
 			let reason = "";
 			if (!this.hs.isLocalUser(pdu.sender)) try {
@@ -627,7 +628,7 @@ var RoomService = class {
 				touched.push(pdu.event_id);
 				continue;
 			}
-			if (pdu.type === "m.room.member" && pdu.content?.membership === "join") joinedServers.add(pdu.state_key.slice(pdu.state_key.indexOf(":") + 1));
+			if (pdu.type === M.ROOM.MEMBER && pdu.content?.membership === "join") joinedServers.add(pdu.state_key.slice(pdu.state_key.indexOf(":") + 1));
 			const isState = pdu.state_key !== void 0;
 			const snapshot = !isState && before.snapshot !== null && before.snapshot !== 0 ? before.snapshot : await writeSnapshot(isState ? {
 				...before.ids,
@@ -698,7 +699,7 @@ var RoomService = class {
 				];
 				if (!newIds[k]) {
 					await db.delete("current_state", where);
-					if (type === "m.room.member") await db.delete("memberships", [{
+					if (type === M.ROOM.MEMBER) await db.delete("memberships", [{
 						field: "room_id",
 						value: roomId
 					}, {
@@ -713,7 +714,7 @@ var RoomService = class {
 					state_key: sk,
 					event_id: newIds[k]
 				});
-				if (type === "m.room.member") await db.upsert("memberships", {
+				if (type === M.ROOM.MEMBER) await db.upsert("memberships", {
 					room_id: roomId,
 					user_id: sk,
 					membership: pdus.get(newIds[k])?.content?.membership ?? "leave",
@@ -732,7 +733,7 @@ var RoomService = class {
 		});
 		for (const k of Object.keys(oldIds)) {
 			const [type, userId] = splitStateKey(k);
-			if (type !== "m.room.member" || this.hs.isLocalUser(userId) || oldIds[k] === newIds[k]) continue;
+			if (type !== M.ROOM.MEMBER || this.hs.isLocalUser(userId) || oldIds[k] === newIds[k]) continue;
 			if (!await this.hs.keys.isTracked(userId)) await this.hs.keys.dropRemoteCache(userId);
 		}
 		for (const s of this.hs.federation.serversInRoom(await this.currentState(roomId), false)) joinedServers.add(s);
@@ -784,7 +785,7 @@ var RoomService = class {
 				unsigned.prev_sender = prevState.sender;
 				unsigned.replaces_state = prevState.event_id;
 			}
-			if (pdu.type === "m.room.member" && ["invite", "knock"].includes(pdu.content.membership) && opts.local) unsigned[pdu.content.membership === "invite" ? "invite_room_state" : "knock_room_state"] = this.strippedState(beforeMap);
+			if (pdu.type === M.ROOM.MEMBER && ["invite", "knock"].includes(pdu.content.membership) && opts.local) unsigned[pdu.content.membership === "invite" ? "invite_room_state" : "knock_room_state"] = this.strippedState(beforeMap);
 			const stored = Object.keys(unsigned).length ? {
 				...pdu,
 				unsigned
@@ -794,9 +795,9 @@ var RoomService = class {
 				room_id: roomId
 			};
 			const txnToken = opts.txnId && opts.deviceId ? txnTokenOf(sender, opts.deviceId) : null;
-			const relation = pdu.content?.["m.relates_to"];
+			const relation = pdu.content?.[M.RELATES_TO];
 			const redactsId = features.v11 ? pdu.content?.redacts : pdu.redacts;
-			const redaction = pdu.type === "m.room.redaction" && typeof redactsId === "string" ? await this.prepareRedaction(redactsId, view, version) : null;
+			const redaction = pdu.type === M.ROOM.REDACTION && typeof redactsId === "string" ? await this.prepareRedaction(redactsId, view, version) : null;
 			let newExtremities = null;
 			let stateChanges = [];
 			let newCurrentIds = null;
@@ -812,7 +813,7 @@ var RoomService = class {
 						const snap = await this.snapshotOf(ext);
 						if (snap !== null) sets.push(await this.snapshotIds(snap));
 					}
-					const createEvent = features.v12 ? beforeMap.get(stateKey("m.room.create", "")) ?? (pdu.type === "m.room.create" ? pdu : void 0) : void 0;
+					const createEvent = features.v12 ? beforeMap.get(stateKey(M.ROOM.CREATE, "")) ?? (pdu.type === M.ROOM.CREATE ? pdu : void 0) : void 0;
 					newCurrentIds = await resolveState(sets, version, async (ids) => {
 						const found = await this.getPdus(ids);
 						if (ids.includes(eventId)) found.set(eventId, view);
@@ -847,7 +848,7 @@ var RoomService = class {
 					field: "event_id",
 					value: eventId
 				}]);
-				const edge = pdu.content?.["m.relationship"];
+				const edge = pdu.content?.[M.RELATIONSHIP];
 				if (isObject(edge) && typeof edge.event_id === "string" && typeof edge.rel_type === "string") await db.upsert("event_edges", {
 					event_id: eventId,
 					room_id: roomId,
@@ -896,7 +897,7 @@ var RoomService = class {
 					];
 					if (change.eventId === null) {
 						await db.delete("current_state", where);
-						if (type === "m.room.member") await db.delete("memberships", [{
+						if (type === M.ROOM.MEMBER) await db.delete("memberships", [{
 							field: "room_id",
 							value: roomId
 						}, {
@@ -911,7 +912,7 @@ var RoomService = class {
 						state_key: sk,
 						event_id: change.eventId
 					});
-					if (type === "m.room.member") {
+					if (type === M.ROOM.MEMBER) {
 						const member = changedPdus.get(change.eventId);
 						await db.upsert("memberships", {
 							room_id: roomId,
@@ -1052,6 +1053,31 @@ var RoomService = class {
 			value: membership
 		}] })).map((r) => r.room_id);
 	}
+	/**
+	* Membership changes after `since` in the rooms where `userId` has a membership (in any state),
+	* given the user's own membership rows if the caller has them.
+	*
+	* https://github.com/k18k/matrix-nodejs-homeserver/issues/31: /sync and device-list tracking
+	* read every membership change on the server since their token and kept those in the user's
+	* rooms; while many users joined, each sync parsed thousands of rows. This reads those rooms only.
+	*/
+	async membershipChangesSince(userId, since, mine) {
+		const own = mine ?? await this.hs.db.findMany("memberships", { where: [{
+			field: "user_id",
+			value: userId
+		}] });
+		const rooms = [...new Set(own.map((m) => m.room_id))];
+		if (rooms.length === 0) return [];
+		return this.hs.db.findMany("memberships", { where: [{
+			field: "room_id",
+			operator: "in",
+			value: rooms
+		}, {
+			field: "stream",
+			operator: "gt",
+			value: since
+		}] });
+	}
 	/** All users sharing at least one joined room with `userId` (including themselves). */
 	async usersSharingRooms(userId) {
 		const cached = this.sharingCache.get(userId);
@@ -1106,15 +1132,15 @@ var RoomService = class {
 	*/
 	strippedState(state) {
 		const types = [
-			"m.room.create",
-			"m.room.join_rules",
-			"m.room.name",
-			"m.room.avatar",
-			"m.room.canonical_alias",
-			"m.room.encryption",
-			"m.room.topic"
+			M.ROOM.CREATE,
+			M.ROOM.JOIN_RULES,
+			M.ROOM.NAME,
+			M.ROOM.AVATAR,
+			M.ROOM.CANONICAL_ALIAS,
+			M.ROOM.ENCRYPTION,
+			M.ROOM.TOPIC
 		];
-		const create = getState(state, "m.room.create");
+		const create = getState(state, M.ROOM.CREATE);
 		const version = typeof create?.content?.room_version === "string" ? create.content.room_version : "1";
 		const f = roomVersionFeatures(version);
 		const out = [];
@@ -1124,7 +1150,7 @@ var RoomService = class {
 			const { unsigned, ...full } = ev;
 			const wire = { ...full };
 			if (!f.legacyEventIds) delete wire.event_id;
-			if (f.v12 && t === "m.room.create") delete wire.room_id;
+			if (f.v12 && t === M.ROOM.CREATE) delete wire.room_id;
 			out.push(wire);
 		}
 		return out;
@@ -1143,7 +1169,7 @@ var RoomService = class {
 				},
 				{
 					field: "type",
-					value: "m.room.member"
+					value: M.ROOM.MEMBER
 				},
 				{
 					field: "state_key",
@@ -1160,18 +1186,18 @@ var RoomService = class {
 			const ids = await this.snapshotIds(raw.snapshot);
 			let membership = "leave";
 			if (userId) {
-				const memId = ids[stateKey("m.room.member", userId)];
+				const memId = ids[stateKey(M.ROOM.MEMBER, userId)];
 				membership = memId ? (await this.getEvent(memId))?.pdu.content?.membership ?? "leave" : "leave";
 			}
 			const ev = userId ? {
 				...raw,
 				viewerMembership: membership
 			} : raw;
-			if (userId && ev.pdu.type === "m.room.member" && ev.pdu.state_key === userId) {
+			if (userId && ev.pdu.type === M.ROOM.MEMBER && ev.pdu.state_key === userId) {
 				out.push(ev);
 				continue;
 			}
-			const hvId = ids[stateKey("m.room.history_visibility", "")];
+			const hvId = ids[stateKey(M.ROOM.HISTORY_VISIBILITY, "")];
 			const hv = hvId ? (await this.getEvent(hvId))?.pdu.content?.history_visibility ?? "shared" : "shared";
 			if (hv === "world_readable") {
 				out.push(ev);
@@ -1200,7 +1226,7 @@ var RoomService = class {
 	async canPeek(roomId, userId) {
 		const state = await this.currentState(roomId);
 		const membership = membershipOf(state, userId);
-		const hv = getState(state, "m.room.history_visibility")?.content?.history_visibility ?? "shared";
+		const hv = getState(state, M.ROOM.HISTORY_VISIBILITY)?.content?.history_visibility ?? "shared";
 		return {
 			joined: membership === "join",
 			worldReadable: hv === "world_readable",
@@ -1210,7 +1236,7 @@ var RoomService = class {
 	/** The state snapshot visible to a user who is no longer joined (state at their leave). */
 	async membershipEvent(roomId, userId) {
 		const state = await this.currentState(roomId);
-		const ev = getState(state, "m.room.member", userId);
+		const ev = getState(state, M.ROOM.MEMBER, userId);
 		return ev?.event_id ? this.getEvent(ev.event_id) : null;
 	}
 	formatEvent(ev, viewer, opts = {}) {
@@ -1278,7 +1304,7 @@ var RoomService = class {
 		if (features.v12) {
 			prebuiltCreate = finalisePdu({
 				sender,
-				type: "m.room.create",
+				type: M.ROOM.CREATE,
 				state_key: "",
 				content: createContent,
 				origin_server_ts: Date.now(),
@@ -1301,30 +1327,31 @@ var RoomService = class {
 			const pdu = prebuiltCreate;
 			await this.withLock(roomId, () => this.persistEvent(roomId, version, pdu, { local: true }));
 		} else await send({
-			type: "m.room.create",
+			type: M.ROOM.CREATE,
 			state_key: "",
 			content: createContent
 		});
+		const profile = await this.hs.profile(sender);
 		await send({
-			type: "m.room.member",
+			type: M.ROOM.MEMBER,
 			state_key: sender,
 			content: {
 				membership: "join",
-				...await this.hs.profile(sender)
+				...profile
 			}
 		});
 		const pl = {
 			users: features.v12 ? {} : { [sender]: 100 },
 			users_default: 0,
 			events: {
-				"m.room.name": 50,
-				"m.room.power_levels": 100,
-				"m.room.history_visibility": 100,
-				"m.room.canonical_alias": 50,
-				"m.room.avatar": 50,
-				"m.room.tombstone": features.v12 ? 150 : 100,
-				"m.room.server_acl": 100,
-				"m.room.encryption": 100
+				[M.ROOM.NAME]: 50,
+				[M.ROOM.POWER_LEVELS]: 100,
+				[M.ROOM.HISTORY_VISIBILITY]: 100,
+				[M.ROOM.CANONICAL_ALIAS]: 50,
+				[M.ROOM.AVATAR]: 50,
+				[M.ROOM.TOMBSTONE]: features.v12 ? 150 : 100,
+				[M.ROOM.SERVER_ACL]: 100,
+				[M.ROOM.ENCRYPTION]: 100
 			},
 			events_default: 0,
 			state_default: 50,
@@ -1338,7 +1365,7 @@ var RoomService = class {
 		const override = body.power_level_content_override;
 		if (override !== void 0 && !isObject(override)) throw errors.badJson("power_level_content_override must be an object");
 		const initialState = body.initial_state ?? [];
-		const initialPl = initialState.find((e) => e?.type === "m.room.power_levels" && (e.state_key ?? "") === "");
+		const initialPl = initialState.find((e) => e?.type === M.ROOM.POWER_LEVELS && (e.state_key ?? "") === "");
 		const predecessor = createContent.predecessor?.room_id;
 		if (typeof predecessor === "string") await copyRoomPushRules(this.hs, sender, predecessor, roomId);
 		const plContent = {
@@ -1348,7 +1375,7 @@ var RoomService = class {
 		};
 		validatePowerLevelContent(plContent, creators);
 		await send({
-			type: "m.room.power_levels",
+			type: M.ROOM.POWER_LEVELS,
 			state_key: "",
 			content: plContent
 		});
@@ -1359,13 +1386,13 @@ var RoomService = class {
 				creator: sender
 			});
 			await send({
-				type: "m.room.canonical_alias",
+				type: M.ROOM.CANONICAL_ALIAS,
 				state_key: "",
 				content: { alias }
 			});
 		}
-		const presetState = [["m.room.join_rules", { join_rule: preset === "public_chat" ? "public" : "invite" }], ["m.room.history_visibility", { history_visibility: "shared" }]];
-		if (preset !== "public_chat") presetState.push(["m.room.guest_access", { guest_access: "can_join" }]);
+		const presetState = [[M.ROOM.JOIN_RULES, { join_rule: preset === "public_chat" ? "public" : "invite" }], [M.ROOM.HISTORY_VISIBILITY, { history_visibility: "shared" }]];
+		if (preset !== "public_chat") presetState.push([M.ROOM.GUEST_ACCESS, { guest_access: "can_join" }]);
 		const initialKeys = new Set(initialState.map((e) => stateKey(e?.type, e?.state_key ?? "")));
 		for (const [type, content] of presetState) if (!initialKeys.has(stateKey(type, ""))) await send({
 			type,
@@ -1374,7 +1401,7 @@ var RoomService = class {
 		});
 		for (const ev of initialState) {
 			if (!isObject(ev) || typeof ev.type !== "string" || !isObject(ev.content)) throw errors.badJson("Invalid initial_state event");
-			if (ev.type === "m.room.power_levels" || ev.type === "m.room.create" || ev.type === "m.room.member") continue;
+			if (ev.type === M.ROOM.POWER_LEVELS || ev.type === M.ROOM.CREATE || ev.type === M.ROOM.MEMBER) continue;
 			await send({
 				type: ev.type,
 				state_key: ev.state_key ?? "",
@@ -1382,16 +1409,16 @@ var RoomService = class {
 			});
 		}
 		if (body.name !== void 0) await send({
-			type: "m.room.name",
+			type: M.ROOM.NAME,
 			state_key: "",
 			content: { name: body.name }
 		});
 		if (body.topic !== void 0) await send({
-			type: "m.room.topic",
+			type: M.ROOM.TOPIC,
 			state_key: "",
 			content: {
 				topic: body.topic,
-				"m.topic": { "m.text": [{
+				[M.TOPIC]: { [M.TEXT]: [{
 					mimetype: "text/plain",
 					body: body.topic
 				}] }
@@ -1451,7 +1478,7 @@ var RoomService = class {
 		if (!await this.exists(roomId)) return false;
 		for (const [key, ev] of await this.currentState(roomId)) {
 			const [type, userId] = splitStateKey(key);
-			if (type === "m.room.member" && ev.content?.membership === "join" && this.hs.isLocalUser(userId)) return true;
+			if (type === M.ROOM.MEMBER && ev.content?.membership === "join" && this.hs.isLocalUser(userId)) return true;
 		}
 		return false;
 	}
@@ -1536,9 +1563,9 @@ var RoomService = class {
 			...await this.hs.profile(userId)
 		};
 		if (extra.reason) content.reason = extra.reason;
-		const existing = getState(state, "m.room.member", userId);
+		const existing = getState(state, M.ROOM.MEMBER, userId);
 		if (existing?.content?.membership === "join" && JSON.stringify(existing.content) === JSON.stringify(content)) return roomId;
-		const joinRule = getState(state, "m.room.join_rules")?.content?.join_rule;
+		const joinRule = getState(state, M.ROOM.JOIN_RULES)?.content?.join_rule;
 		const current = membershipOf(state, userId);
 		if ((joinRule === "restricted" || joinRule === "knock_restricted") && current !== "join" && current !== "invite") {
 			const via = await this.findRestrictedAuthoriser(userId, state, version);
@@ -1548,7 +1575,7 @@ var RoomService = class {
 				const servers = /* @__PURE__ */ new Set();
 				for (const [k, ev] of state) {
 					const [type, member] = splitStateKey(k);
-					if (type === "m.room.member" && ev.content?.membership === "join" && !this.hs.isLocalUser(member) && userLevel(pl, member) >= pl.invite) servers.add(member.slice(member.indexOf(":") + 1));
+					if (type === M.ROOM.MEMBER && ev.content?.membership === "join" && !this.hs.isLocalUser(member) && userLevel(pl, member) >= pl.invite) servers.add(member.slice(member.indexOf(":") + 1));
 				}
 				if (servers.size) {
 					await this.hs.federation.joinRemoteRoom(userId, roomId, [...servers], content);
@@ -1557,30 +1584,30 @@ var RoomService = class {
 			}
 		}
 		await this.sendEvent(roomId, userId, {
-			type: "m.room.member",
+			type: M.ROOM.MEMBER,
 			state_key: userId,
 			content
 		});
-		const predecessor = getState(state, "m.room.create")?.content?.predecessor?.room_id;
+		const predecessor = getState(state, M.ROOM.CREATE)?.content?.predecessor?.room_id;
 		if (typeof predecessor === "string") await copyRoomPushRules(this.hs, userId, predecessor, roomId);
 		return roomId;
 	}
 	/** Whether an allowed room exists that we can't check (or the user is joined to), so another server might authorise. */
 	async mayQualifyRemotely(userId, state) {
-		const allow = getState(state, "m.room.join_rules")?.content?.allow;
+		const allow = getState(state, M.ROOM.JOIN_RULES)?.content?.allow;
 		if (!Array.isArray(allow)) return false;
 		for (const rule of allow) {
-			if (rule?.type !== "m.room_membership" || typeof rule.room_id !== "string") continue;
+			if (rule?.type !== M.ROOM_MEMBERSHIP || typeof rule.room_id !== "string") continue;
 			if (!await this.serverIsJoined(rule.room_id)) return true;
 			if (await this.membership(rule.room_id, userId) === "join") return true;
 		}
 		return false;
 	}
 	async findRestrictedAuthoriser(userId, state, version) {
-		const allow = getState(state, "m.room.join_rules")?.content?.allow;
+		const allow = getState(state, M.ROOM.JOIN_RULES)?.content?.allow;
 		if (!Array.isArray(allow)) return null;
 		let permitted = false;
-		for (const rule of allow) if (rule?.type === "m.room_membership" && typeof rule.room_id === "string" && await this.exists(rule.room_id)) {
+		for (const rule of allow) if (rule?.type === M.ROOM_MEMBERSHIP && typeof rule.room_id === "string" && await this.exists(rule.room_id)) {
 			if (await this.membership(rule.room_id, userId) === "join") {
 				permitted = true;
 				break;
@@ -1590,7 +1617,7 @@ var RoomService = class {
 		const pl = powerLevels(state, version);
 		for (const [k, ev] of state) {
 			const [type, key] = splitStateKey(k);
-			if (type === "m.room.member" && ev.content?.membership === "join" && this.hs.isLocalUser(key) && userLevel(pl, key) >= pl.invite) return key;
+			if (type === M.ROOM.MEMBER && ev.content?.membership === "join" && this.hs.isLocalUser(key) && userLevel(pl, key) >= pl.invite) return key;
 		}
 		return null;
 	}
@@ -1601,7 +1628,7 @@ var RoomService = class {
 			field: "user_id",
 			value: target
 		}]) && !await this.hs.appservices.queryUser(target)) throw errors.notFound("Unknown user");
-		if (local && await inviteDecision(this.hs, target, sender) === "block") throw new MatrixError(403, "M_FORBIDDEN", "This user does not accept invites from you", { "org.matrix.msc4155.errcode": "M_INVITE_BLOCKED" });
+		if (local && await inviteDecision(this.hs, target, sender) === "block") throw new MatrixError(403, "M_FORBIDDEN", "This user does not accept invites from you", { [UNSTABLE.ORG.MATRIX.MSC4155.ERRCODE]: "M_INVITE_BLOCKED" });
 		await this.requireJoined(roomId, sender);
 		const state = await this.currentState(roomId);
 		if (membershipOf(state, target) === "invite") return;
@@ -1612,7 +1639,7 @@ var RoomService = class {
 		if (opts.thirdPartyInvite) content.third_party_invite = opts.thirdPartyInvite;
 		if (local) {
 			await this.sendEvent(roomId, sender, {
-				type: "m.room.member",
+				type: M.ROOM.MEMBER,
 				state_key: target,
 				content
 			});
@@ -1622,12 +1649,12 @@ var RoomService = class {
 		await this.withLock(roomId, async () => {
 			const version = await this.roomVersion(roomId);
 			const pdu = await this.buildLocalEvent(roomId, version, sender, {
-				type: "m.room.member",
+				type: M.ROOM.MEMBER,
 				state_key: target,
 				content
 			});
 			const inviteState = [...this.strippedState(await this.currentState(roomId))];
-			const senderMember = getState(await this.currentState(roomId), "m.room.member", sender);
+			const senderMember = getState(await this.currentState(roomId), M.ROOM.MEMBER, sender);
 			if (senderMember) {
 				const { unsigned, ...full } = senderMember;
 				inviteState.push(this.hs.federation.toFederationPdu(full, version));
@@ -1646,11 +1673,11 @@ var RoomService = class {
 		const content = { membership };
 		if (reason) content.reason = reason;
 		if (membership === "ban" || membership === "leave" && sender !== target) {
-			const prev = getState(await this.currentState(roomId), "m.room.member", target);
+			const prev = getState(await this.currentState(roomId), M.ROOM.MEMBER, target);
 			if (prev?.content?.displayname) content.displayname = prev.content.displayname;
 		}
 		await this.sendEvent(roomId, sender, {
-			type: "m.room.member",
+			type: M.ROOM.MEMBER,
 			state_key: target,
 			content
 		});
@@ -1689,7 +1716,7 @@ var RoomService = class {
 			leave = finalisePdu({
 				room_id: roomId,
 				sender: userId,
-				type: "m.room.member",
+				type: M.ROOM.MEMBER,
 				state_key: userId,
 				content,
 				origin_server_ts: Date.now(),
@@ -1704,7 +1731,7 @@ var RoomService = class {
 	async propagateProfile(userId) {
 		const profile = await this.hs.profile(userId);
 		for (const roomId of await this.roomsForUser(userId)) {
-			const prev = getState(await this.currentState(roomId), "m.room.member", userId);
+			const prev = getState(await this.currentState(roomId), M.ROOM.MEMBER, userId);
 			if (!prev) continue;
 			const content = {
 				...prev.content,
@@ -1715,7 +1742,7 @@ var RoomService = class {
 			if (profile.avatar_url === void 0) delete content.avatar_url;
 			try {
 				await this.sendEvent(roomId, userId, {
-					type: "m.room.member",
+					type: M.ROOM.MEMBER,
 					state_key: userId,
 					content
 				});

package/dist/core/semaphore.js

@@ -0,0 +1,23 @@
+//#region src/core/semaphore.ts
+/** Runs at most `limit` tasks at once; the others wait their turn, first come first served. */
+var Semaphore = class {
+	limit;
+	active = 0;
+	waiting = [];
+	constructor(limit) {
+		this.limit = limit;
+	}
+	async run(fn) {
+		if (this.active >= this.limit) await new Promise((resolve) => this.waiting.push(resolve));
+		else this.active++;
+		try {
+			return await fn();
+		} finally {
+			const next = this.waiting.shift();
+			if (next) next();
+			else this.active--;
+		}
+	}
+};
+//#endregion
+export { Semaphore };

package/dist/core/sso.d.ts

@@ -28,11 +28,25 @@ export interface SsoProvider {
 }
 export interface SsoOptions {
   providers: SsoProvider[];
+  /**
+   * Clients that receive the login token straight away, as URL prefixes such as
+   * `"https://app.element.io/"` (same scheme and host, path starting with the prefix's path).
+   * Other clients get a page naming them, where the user confirms before the token is sent.
+   */
+  clientAllowlist?: string[];
+}
+/** Where the browser goes after login, and whether the user has to confirm that client first. */
+export interface SsoResult {
+  url: string;
+  confirm: boolean;
+  /** The client as shown to the user: its host, or its scheme for app links. */
+  client: string;
 }
 /** Upstream OIDC login (authorization code + PKCE) issuing Matrix login tokens. */
 export declare class SsoService {
   private hs;
   readonly providers: SsoProvider[];
+  private clientAllowlist;
   private discovery;
   constructor(hs: Homeserver, options: SsoOptions);
   private callbackUrl;
@@ -40,7 +54,7 @@ export declare class SsoService {
   /** URL to send the user's browser to. */
   startLogin(providerId: string | null, redirectUrl: string): Promise<string>;
   /** Handle the provider's redirect; returns the client URL carrying a login token. */
-  finishLogin(providerId: string, params: URLSearchParams): Promise<string>;
+  finishLogin(providerId: string, params: URLSearchParams): Promise<SsoResult>;
   private resolveUser;
 }
 //#endregion