matrix-nodejs-homeserver 0.2.0 → 0.3.2

package/dist/api/federation.js

@@ -1,5 +1,6 @@
 import { isObject } from "../core/json.js";
 import { randomToken, signJson, verifyJsonSignature } from "../core/crypto.js";
+import { M } from "../core/m.js";
 import { SUPPORTED_ROOM_VERSIONS, eventIdOf, redact, roomVersionFeatures, splitStateKey, stateKey } from "../core/events.js";
 import { MatrixError, errors } from "../core/errors.js";
 import { isValidUserId } from "../core/ids.js";
@@ -7,26 +8,27 @@ import { authEventKeys, checkAuth, getState, membershipOf, powerLevels, userLeve
 import { inviteDecision } from "../core/invitefilter.js";
 import { parseXMatrix } from "../federation/client.js";
 import { domainOf, serverAllowedByAcl } from "../federation/index.js";
+import { array, looseObject, record, string, unknown } from "../vendor/zod/v4/classic/schemas.js";
 import { body, lenient } from "../http/input.js";
+import { procedure } from "../http/procedure.js";
 import { roomDetails } from "./spaces.js";
 import { fullProfile } from "../core/profile.js";
 import { relationshipsForServer } from "./relationships.js";
 import { canonicalJsonResponse } from "../http/handler.js";
-import { z } from "zod";
 //#region src/api/federation.ts
-const objectMap = lenient(z.record(z.string(), z.unknown()));
+const objectMap = lenient(record(string(), unknown()));
 const keyQueryBody = body({ server_keys: objectMap });
 const missingEventsBody = body({
-	earliest_events: lenient(z.array(z.string())),
-	latest_events: lenient(z.array(z.string())),
-	limit: z.unknown().optional(),
-	min_depth: z.unknown().optional()
+	earliest_events: lenient(array(string())),
+	latest_events: lenient(array(string())),
+	limit: unknown().optional(),
+	min_depth: unknown().optional()
 });
 const userKeysQueryBody = body({ device_keys: objectMap });
 const userKeysClaimBody = body({ one_time_keys: objectMap });
 const publicRoomsBody = body({
-	limit: z.unknown().optional(),
-	filter: lenient(z.looseObject({ generic_search_term: lenient(z.string()) }))
+	limit: unknown().optional(),
+	filter: lenient(looseObject({ generic_search_term: lenient(string()) }))
 });
 const F = "/_matrix/federation";
 /** Authenticate a server-server request; returns the origin server name. */
@@ -66,12 +68,12 @@ async function checkAcl(hs, roomId, origin) {
 /** Whether `server` may see an event, per history visibility. */
 async function serverCanSee(hs, server, ev) {
 	const ids = await hs.rooms.snapshotIds(ev.snapshot);
-	const hvId = ids[stateKey("m.room.history_visibility", "")];
+	const hvId = ids[stateKey(M.ROOM.HISTORY_VISIBILITY, "")];
 	const hv = hvId ? (await hs.rooms.getPdu(hvId))?.content?.history_visibility ?? "shared" : "shared";
 	if (hv === "world_readable" || hv === "shared") return true;
 	for (const [key, id] of Object.entries(ids)) {
 		const [type, userId] = splitStateKey(key);
-		if (type !== "m.room.member" || domainOf(userId) !== server) continue;
+		if (type !== M.ROOM.MEMBER || domainOf(userId) !== server) continue;
 		const m = (await hs.rooms.getPdu(id))?.content?.membership;
 		if (m === "join" || hv === "invited" && m === "invite") return true;
 	}
@@ -119,7 +121,7 @@ async function makeMembership(hs, roomId, version, userId, membership, content =
 	const prevs = [...(await hs.rooms.getPdus(extremities)).values()].sort((a, b) => b.depth - a.depth).slice(0, 10);
 	const f = roomVersionFeatures(version);
 	const draft = {
-		type: "m.room.member",
+		type: M.ROOM.MEMBER,
 		sender: userId,
 		state_key: userId,
 		content: {
@@ -131,7 +133,7 @@ async function makeMembership(hs, roomId, version, userId, membership, content =
 	const ref = (id, pdu) => f.legacyEventIds ? [id, pdu?.hashes ?? {}] : id;
 	const authPdus = await hs.rooms.getPdus(authIds);
 	const event = {
-		type: "m.room.member",
+		type: M.ROOM.MEMBER,
 		room_id: roomId,
 		sender: userId,
 		state_key: userId,
@@ -152,7 +154,7 @@ async function makeMembership(hs, roomId, version, userId, membership, content =
 }
 /** For restricted rooms: a local user who can authorise a remote join, or why not. */
 async function restrictedAuthoriser(hs, state, version, userId) {
-	const joinRules = getState(state, "m.room.join_rules")?.content;
+	const joinRules = getState(state, M.ROOM.JOIN_RULES)?.content;
 	const rule = joinRules?.join_rule;
 	const f = roomVersionFeatures(version);
 	if (!(rule === "restricted" && f.restricted || rule === "knock_restricted" && f.knockRestricted)) return null;
@@ -161,7 +163,7 @@ async function restrictedAuthoriser(hs, state, version, userId) {
 	let allowed = false;
 	let unverifiable = false;
 	for (const allow of Array.isArray(joinRules?.allow) ? joinRules.allow : []) {
-		if (allow?.type !== "m.room_membership" || typeof allow.room_id !== "string") continue;
+		if (allow?.type !== M.ROOM_MEMBERSHIP || typeof allow.room_id !== "string") continue;
 		if (!await hs.rooms.serverIsJoined(allow.room_id)) {
 			unverifiable = true;
 			continue;
@@ -178,7 +180,7 @@ async function restrictedAuthoriser(hs, state, version, userId) {
 	const pl = powerLevels(state, version);
 	for (const [key, ev] of state) {
 		const [type, member] = splitStateKey(key);
-		if (type === "m.room.member" && hs.isLocalUser(member) && ev.content?.membership === "join" && userLevel(pl, member) >= pl.invite) return member;
+		if (type === M.ROOM.MEMBER && hs.isLocalUser(member) && ev.content?.membership === "join" && userLevel(pl, member) >= pl.invite) return member;
 	}
 	throw new MatrixError(400, "M_UNABLE_TO_GRANT_JOIN", "No local user can authorise this join");
 }
@@ -187,7 +189,7 @@ async function restrictedAuthoriser(hs, state, version, userId) {
 async function exchangeThirdPartyInvite(hs, roomId, sender, invitee, signed) {
 	const token = signed.token;
 	if (typeof token !== "string") throw errors.badJson("signed.token is required");
-	const pending = getState(await hs.rooms.currentState(roomId), "m.room.third_party_invite", token);
+	const pending = getState(await hs.rooms.currentState(roomId), M.ROOM.THIRD_PARTY_INVITE, token);
 	if (!pending) throw errors.forbidden("No such third-party invite");
 	if (pending.sender !== sender) throw errors.forbidden("The third-party invite was sent by someone else");
 	await hs.rooms.invite(roomId, sender, invitee, { thirdPartyInvite: {
@@ -201,7 +203,7 @@ async function sendMembership(ctx, origin, membership) {
 	const version = await roomOr404(hs, roomId);
 	await checkAcl(hs, roomId, origin);
 	const raw = await ctx.json();
-	if (raw.type !== "m.room.member" || raw.content?.membership !== membership || raw.state_key !== raw.sender) throw errors.badJson(`Expected a ${membership} event`);
+	if (raw.type !== M.ROOM.MEMBER || raw.content?.membership !== membership || raw.state_key !== raw.sender) throw errors.badJson(`Expected a ${membership} event`);
 	if (domainOf(raw.sender) !== origin) throw errors.forbidden("Sender does not belong to the origin server");
 	let { pdu, joinAuthorisedSignatureValid } = await hs.federation.verifyPdu(raw, version, roomId);
 	if (pdu.event_id !== ctx.params.eventId) throw errors.badJson("Event ID mismatch");
@@ -235,8 +237,12 @@ async function sendMembership(ctx, origin, membership) {
 	};
 }
 function registerFederationRoutes(r) {
-	const fed = (method, path, handler, options = {}) => {
-		r.add(method, `${F}${path}`, async (ctx) => handler(ctx, await authenticate(ctx)), options);
+	const fed = (method, path, def) => {
+		r.add(method, `${F}${path}`, procedure({
+			input: def.input,
+			guard: async (ctx) => ({ origin: await authenticate(ctx) }),
+			handler: (ctx) => def.handler(ctx, ctx.origin)
+		}));
 	};
 	const notary = async (ctx, servers) => {
 		const out = [];
@@ -262,16 +268,26 @@ function registerFederationRoutes(r) {
 		}
 		return { server_keys: out };
 	};
-	r.post("/_matrix/key/v2/query", { input: keyQueryBody }, async (ctx) => {
-		return canonicalJsonResponse(await notary(ctx, Object.keys(ctx.input.server_keys ?? {})));
-	});
-	r.get("/_matrix/key/v2/query/:serverName", async (ctx) => canonicalJsonResponse(await notary(ctx, [ctx.params.serverName])));
-	fed("PUT", "/v1/send/:txnId", async (ctx, origin) => {
+	const requireFederation = (ctx) => {
+		if (!ctx.hs.federation.enabled) throw errors.unrecognized("Federation is disabled");
+	};
+	r.post("/_matrix/key/v2/query", procedure({
+		input: keyQueryBody,
+		handler: async (ctx) => {
+			requireFederation(ctx);
+			return canonicalJsonResponse(await notary(ctx, Object.keys(ctx.input.server_keys ?? {})));
+		}
+	}));
+	r.get("/_matrix/key/v2/query/:serverName", procedure({ handler: async (ctx) => {
+		requireFederation(ctx);
+		return canonicalJsonResponse(await notary(ctx, [ctx.params.serverName]));
+	} }));
+	fed("PUT", "/v1/send/:txnId", { handler: async (ctx, origin) => {
 		const body = await ctx.json();
 		if (body.origin !== void 0 && body.origin !== origin) throw errors.forbidden("Transaction origin mismatch");
 		return ctx.hs.federation.receiveTransaction(origin, ctx.params.txnId, body);
-	});
-	fed("GET", "/v1/make_join/:roomId/:userId", async (ctx, origin) => {
+	} });
+	fed("GET", "/v1/make_join/:roomId/:userId", { handler: async (ctx, origin) => {
 		const hs = ctx.hs;
 		const { roomId, userId } = ctx.params;
 		if (domainOf(userId) !== origin) throw errors.forbidden("User does not belong to the origin server");
@@ -286,7 +302,7 @@ function registerFederationRoutes(r) {
 			event: await makeMembership(hs, roomId, version, userId, "join", via ? { join_authorised_via_users_server: via } : {}),
 			room_version: version
 		};
-	});
+	} });
 	const sendJoin = async (ctx, origin) => {
 		const hs = ctx.hs;
 		await rejectIfPartial(hs, ctx.params.roomId);
@@ -304,9 +320,9 @@ function registerFederationRoutes(r) {
 			servers_in_room: servers
 		};
 	};
-	fed("PUT", "/v2/send_join/:roomId/:eventId", sendJoin);
-	fed("PUT", "/v1/send_join/:roomId/:eventId", async (ctx, origin) => [200, await sendJoin(ctx, origin)]);
-	fed("GET", "/v1/make_leave/:roomId/:userId", async (ctx, origin) => {
+	fed("PUT", "/v2/send_join/:roomId/:eventId", { handler: sendJoin });
+	fed("PUT", "/v1/send_join/:roomId/:eventId", { handler: async (ctx, origin) => [200, await sendJoin(ctx, origin)] });
+	fed("GET", "/v1/make_leave/:roomId/:userId", { handler: async (ctx, origin) => {
 		const { roomId, userId } = ctx.params;
 		if (domainOf(userId) !== origin) throw errors.forbidden("User does not belong to the origin server");
 		const version = await roomOr404(ctx.hs, roomId);
@@ -315,16 +331,16 @@ function registerFederationRoutes(r) {
 			event: await makeMembership(ctx.hs, roomId, version, userId, "leave"),
 			room_version: version
 		};
-	});
-	fed("PUT", "/v2/send_leave/:roomId/:eventId", async (ctx, origin) => {
+	} });
+	fed("PUT", "/v2/send_leave/:roomId/:eventId", { handler: async (ctx, origin) => {
 		await sendMembership(ctx, origin, "leave");
 		return {};
-	});
-	fed("PUT", "/v1/send_leave/:roomId/:eventId", async (ctx, origin) => {
+	} });
+	fed("PUT", "/v1/send_leave/:roomId/:eventId", { handler: async (ctx, origin) => {
 		await sendMembership(ctx, origin, "leave");
 		return [200, {}];
-	});
-	fed("GET", "/v1/make_knock/:roomId/:userId", async (ctx, origin) => {
+	} });
+	fed("GET", "/v1/make_knock/:roomId/:userId", { handler: async (ctx, origin) => {
 		const { roomId, userId } = ctx.params;
 		if (domainOf(userId) !== origin) throw errors.forbidden("User does not belong to the origin server");
 		const version = await roomOr404(ctx.hs, roomId);
@@ -336,19 +352,19 @@ function registerFederationRoutes(r) {
 			event: await makeMembership(ctx.hs, roomId, version, userId, "knock"),
 			room_version: version
 		};
-	});
-	fed("PUT", "/v1/send_knock/:roomId/:eventId", async (ctx, origin) => {
+	} });
+	fed("PUT", "/v1/send_knock/:roomId/:eventId", { handler: async (ctx, origin) => {
 		await rejectIfPartial(ctx.hs, ctx.params.roomId);
 		await sendMembership(ctx, origin, "knock");
 		return { knock_room_state: ctx.hs.rooms.strippedState(await ctx.hs.rooms.currentState(ctx.params.roomId)) };
-	});
+	} });
 	const invite = async (ctx, origin, v2) => {
 		const hs = ctx.hs;
 		const body = await ctx.json();
 		const raw = v2 ? body.event : body;
 		const version = v2 ? String(body.room_version ?? "1") : "1";
 		if (!SUPPORTED_ROOM_VERSIONS.includes(version)) throw new MatrixError(400, "M_INCOMPATIBLE_ROOM_VERSION", "Unsupported room version", { room_version: version });
-		if (!isObject(raw) || raw.type !== "m.room.member" || raw.content?.membership !== "invite" || typeof raw.state_key !== "string") throw errors.badJson("Expected an invite event");
+		if (!isObject(raw) || raw.type !== M.ROOM.MEMBER || raw.content?.membership !== "invite" || typeof raw.state_key !== "string") throw errors.badJson("Expected an invite event");
 		if (raw.room_id !== ctx.params.roomId) throw errors.badJson("Room ID mismatch");
 		if (domainOf(raw.sender) !== origin) throw errors.forbidden("Sender does not belong to the origin server");
 		const target = raw.state_key;
@@ -373,7 +389,7 @@ function registerFederationRoutes(r) {
 			},
 			{
 				field: "type",
-				value: "m.ignored_user_list"
+				value: M.IGNORED_USER_LIST
 			}
 		]);
 		const signedRedacted = signJson(redact({ ...raw }, version), hs.serverName, hs.signingKey);
@@ -382,7 +398,7 @@ function registerFederationRoutes(r) {
 			[hs.serverName]: signedRedacted.signatures[hs.serverName]
 		};
 		const inviteState = Array.isArray(body.invite_room_state) ? body.invite_room_state : Array.isArray(raw.unsigned?.invite_room_state) ? raw.unsigned.invite_room_state : [];
-		const createInState = inviteState.find((e) => e?.type === "m.room.create");
+		const createInState = inviteState.find((e) => e?.type === M.ROOM.CREATE);
 		if (v2 && !createInState && roomVersionFeatures(version).v12) throw errors.missingParam("invite_room_state must include the m.room.create event");
 		if (createInState && roomVersionFeatures(version).v12 && createInState.event_id === void 0) try {
 			if (hs.federation.computeEventId(createInState, version) !== `$${raw.room_id.slice(1)}`) throw new Error("mismatch");
@@ -404,9 +420,9 @@ function registerFederationRoutes(r) {
 		}, version);
 		return v2 ? { event: wire } : [200, { event: wire }];
 	};
-	fed("PUT", "/v2/invite/:roomId/:eventId", (ctx, origin) => invite(ctx, origin, true));
-	fed("PUT", "/v1/invite/:roomId/:eventId", (ctx, origin) => invite(ctx, origin, false));
-	fed("GET", "/v1/event/:eventId", async (ctx, origin) => {
+	fed("PUT", "/v2/invite/:roomId/:eventId", { handler: (ctx, origin) => invite(ctx, origin, true) });
+	fed("PUT", "/v1/invite/:roomId/:eventId", { handler: (ctx, origin) => invite(ctx, origin, false) });
+	fed("GET", "/v1/event/:eventId", { handler: async (ctx, origin) => {
 		const hs = ctx.hs;
 		const ev = await hs.rooms.getEvent(ctx.params.eventId);
 		const pdu = ev?.pdu ?? await hs.rooms.getPdu(ctx.params.eventId);
@@ -419,7 +435,7 @@ function registerFederationRoutes(r) {
 			origin_server_ts: Date.now(),
 			pdus: [hs.federation.toFederationPdu(pdu, version)]
 		};
-	});
+	} });
 	const stateHandler = (idsOnly) => async (ctx, origin) => {
 		const hs = ctx.hs;
 		const roomId = ctx.params.roomId;
@@ -440,15 +456,15 @@ function registerFederationRoutes(r) {
 			auth_chain: chain.map((p) => hs.federation.toFederationPdu(p, version))
 		};
 	};
-	fed("GET", "/v1/state/:roomId", stateHandler(false));
-	fed("GET", "/v1/state_ids/:roomId", stateHandler(true));
-	fed("GET", "/v1/event_auth/:roomId/:eventId", async (ctx, origin) => {
+	fed("GET", "/v1/state/:roomId", { handler: stateHandler(false) });
+	fed("GET", "/v1/state_ids/:roomId", { handler: stateHandler(true) });
+	fed("GET", "/v1/event_auth/:roomId/:eventId", { handler: async (ctx, origin) => {
 		const hs = ctx.hs;
 		const version = await roomOr404(hs, ctx.params.roomId);
 		await checkAcl(hs, ctx.params.roomId, origin);
 		return { auth_chain: (await authChainOf(hs, [ctx.params.eventId])).map((p) => hs.federation.toFederationPdu(p, version)) };
-	});
-	fed("GET", "/v1/backfill/:roomId", async (ctx, origin) => {
+	} });
+	fed("GET", "/v1/backfill/:roomId", { handler: async (ctx, origin) => {
 		const hs = ctx.hs;
 		const roomId = ctx.params.roomId;
 		const version = await roomOr404(hs, roomId);
@@ -475,40 +491,43 @@ function registerFederationRoutes(r) {
 			origin_server_ts: Date.now(),
 			pdus: out.map((p) => hs.federation.toFederationPdu(p, version))
 		};
-	});
-	fed("POST", "/v1/get_missing_events/:roomId", async (ctx, origin) => {
-		const hs = ctx.hs;
-		const roomId = ctx.params.roomId;
-		const version = await roomOr404(hs, roomId);
-		const state = await checkAcl(hs, roomId, origin);
-		if (!FederationJoinGuard.serverInRoom(state, origin)) throw errors.forbidden("Your server is not in the room");
-		const body = ctx.input;
-		const earliest = new Set(body.earliest_events ?? []);
-		const limit = Math.min(Number(body.limit ?? 10) || 10, 100);
-		const minDepth = Number(body.min_depth ?? 0) || 0;
-		const out = [];
-		const seen = new Set(body.latest_events ?? []);
-		let frontier = [];
-		for (const id of seen) {
-			const ev = await hs.rooms.getEvent(id);
-			if (ev) frontier.push(...(ev.pdu.prev_events ?? []).map(eventIdOf));
-		}
-		while (frontier.length && out.length < limit) {
-			const next = [];
-			for (const id of frontier) {
-				if (seen.has(id) || earliest.has(id) || out.length >= limit) continue;
-				seen.add(id);
+	} });
+	fed("POST", "/v1/get_missing_events/:roomId", {
+		input: missingEventsBody,
+		handler: async (ctx, origin) => {
+			const hs = ctx.hs;
+			const roomId = ctx.params.roomId;
+			const version = await roomOr404(hs, roomId);
+			const state = await checkAcl(hs, roomId, origin);
+			if (!FederationJoinGuard.serverInRoom(state, origin)) throw errors.forbidden("Your server is not in the room");
+			const body = ctx.input;
+			const earliest = new Set(body.earliest_events ?? []);
+			const limit = Math.min(Number(body.limit ?? 10) || 10, 100);
+			const minDepth = Number(body.min_depth ?? 0) || 0;
+			const out = [];
+			const seen = new Set(body.latest_events ?? []);
+			let frontier = [];
+			for (const id of seen) {
 				const ev = await hs.rooms.getEvent(id);
-				if (!ev || ev.pdu.depth < minDepth) continue;
-				out.push(await serverCanSee(hs, origin, ev) ? ev.pdu : redact(ev.pdu, version));
-				next.push(...(ev.pdu.prev_events ?? []).map(eventIdOf));
+				if (ev) frontier.push(...(ev.pdu.prev_events ?? []).map(eventIdOf));
 			}
-			frontier = next;
+			while (frontier.length && out.length < limit) {
+				const next = [];
+				for (const id of frontier) {
+					if (seen.has(id) || earliest.has(id) || out.length >= limit) continue;
+					seen.add(id);
+					const ev = await hs.rooms.getEvent(id);
+					if (!ev || ev.pdu.depth < minDepth) continue;
+					out.push(await serverCanSee(hs, origin, ev) ? ev.pdu : redact(ev.pdu, version));
+					next.push(...(ev.pdu.prev_events ?? []).map(eventIdOf));
+				}
+				frontier = next;
+			}
+			out.sort((a, b) => a.depth - b.depth);
+			return { events: out.map((p) => hs.federation.toFederationPdu(p, version)) };
 		}
-		out.sort((a, b) => a.depth - b.depth);
-		return { events: out.map((p) => hs.federation.toFederationPdu(p, version)) };
-	}, { input: missingEventsBody });
-	fed("GET", "/v1/timestamp_to_event/:roomId", async (ctx, origin) => {
+	});
+	fed("GET", "/v1/timestamp_to_event/:roomId", { handler: async (ctx, origin) => {
 		const hs = ctx.hs;
 		const roomId = ctx.params.roomId;
 		await roomOr404(hs, roomId);
@@ -534,8 +553,8 @@ function registerFederationRoutes(r) {
 			};
 		}
 		throw errors.notFound("No event found");
-	});
-	fed("GET", "/v1/query/directory", async (ctx) => {
+	} });
+	fed("GET", "/v1/query/directory", { handler: async (ctx) => {
 		const alias = ctx.query.get("room_alias");
 		if (!alias) throw errors.missingParam("Missing room_alias");
 		const row = await ctx.hs.db.findOne("room_aliases", [{
@@ -548,8 +567,8 @@ function registerFederationRoutes(r) {
 			room_id: row.room_id,
 			servers: [...new Set(servers)]
 		};
-	});
-	fed("GET", "/v1/query/profile", async (ctx) => {
+	} });
+	fed("GET", "/v1/query/profile", { handler: async (ctx) => {
 		const userId = ctx.query.get("user_id");
 		if (!userId) throw errors.missingParam("Missing user_id");
 		if (!isValidUserId(userId)) throw errors.invalidParam("Invalid user ID");
@@ -560,24 +579,33 @@ function registerFederationRoutes(r) {
 		if (!field) return profile;
 		if (profile[field] === void 0) throw errors.notFound("Profile field not set");
 		return { [field]: profile[field] };
+	} });
+	fed("POST", "/unstable/event_relationships", {
+		input: body({}),
+		handler: async (ctx, origin) => relationshipsForServer(ctx.hs, origin, ctx.input, (ids) => authChainOf(ctx.hs, ids))
 	});
-	fed("POST", "/unstable/event_relationships", async (ctx, origin) => relationshipsForServer(ctx.hs, origin, ctx.input, (ids) => authChainOf(ctx.hs, ids)), { input: body({}) });
-	fed("POST", "/v1/user/keys/query", async (ctx) => {
-		const local = {};
-		for (const [userId, devices] of Object.entries(ctx.input.device_keys ?? {})) if (ctx.hs.isLocalUser(userId)) local[userId] = Array.isArray(devices) ? devices : [];
-		const res = await ctx.hs.keys.query("", local);
-		return {
-			device_keys: res.device_keys,
-			master_keys: res.master_keys,
-			self_signing_keys: res.self_signing_keys
-		};
-	}, { input: userKeysQueryBody });
-	fed("POST", "/v1/user/keys/claim", async (ctx) => {
-		const local = {};
-		for (const [userId, devices] of Object.entries(ctx.input.one_time_keys ?? {})) if (ctx.hs.isLocalUser(userId) && isObject(devices)) local[userId] = devices;
-		return { one_time_keys: await ctx.hs.keys.claim(local) };
-	}, { input: userKeysClaimBody });
-	fed("GET", "/v1/user/devices/:userId", async (ctx) => {
+	fed("POST", "/v1/user/keys/query", {
+		input: userKeysQueryBody,
+		handler: async (ctx) => {
+			const local = {};
+			for (const [userId, devices] of Object.entries(ctx.input.device_keys ?? {})) if (ctx.hs.isLocalUser(userId)) local[userId] = Array.isArray(devices) ? devices : [];
+			const res = await ctx.hs.keys.query("", local);
+			return {
+				device_keys: res.device_keys,
+				master_keys: res.master_keys,
+				self_signing_keys: res.self_signing_keys
+			};
+		}
+	});
+	fed("POST", "/v1/user/keys/claim", {
+		input: userKeysClaimBody,
+		handler: async (ctx) => {
+			const local = {};
+			for (const [userId, devices] of Object.entries(ctx.input.one_time_keys ?? {})) if (ctx.hs.isLocalUser(userId) && isObject(devices)) local[userId] = devices;
+			return { one_time_keys: await ctx.hs.keys.claim(local) };
+		}
+	});
+	fed("GET", "/v1/user/devices/:userId", { handler: async (ctx) => {
 		const hs = ctx.hs;
 		const userId = ctx.params.userId;
 		if (!hs.isLocalUser(userId)) throw errors.forbidden("User is not local");
@@ -601,7 +629,7 @@ function registerFederationRoutes(r) {
 		if (keys.master_keys[userId]) out.master_key = keys.master_keys[userId];
 		if (keys.self_signing_keys[userId]) out.self_signing_key = keys.self_signing_keys[userId];
 		return out;
-	});
+	} });
 	const publicRooms = async (ctx) => {
 		const hs = ctx.hs;
 		const body = (ctx.method === "POST" ? ctx.input : void 0) ?? {};
@@ -626,9 +654,12 @@ function registerFederationRoutes(r) {
 		if (limit && since + limit < chunk.length) out.next_batch = `o${since + limit}`;
 		return out;
 	};
-	fed("GET", "/v1/publicRooms", (ctx) => publicRooms(ctx));
-	fed("POST", "/v1/publicRooms", (ctx) => publicRooms(ctx), { input: publicRoomsBody });
-	fed("GET", "/v1/hierarchy/:roomId", async (ctx, origin) => {
+	fed("GET", "/v1/publicRooms", { handler: (ctx) => publicRooms(ctx) });
+	fed("POST", "/v1/publicRooms", {
+		input: publicRoomsBody,
+		handler: (ctx) => publicRooms(ctx)
+	});
+	fed("GET", "/v1/hierarchy/:roomId", { handler: async (ctx, origin) => {
 		const hs = ctx.hs;
 		const roomId = ctx.params.roomId;
 		await roomOr404(hs, roomId);
@@ -636,14 +667,14 @@ function registerFederationRoutes(r) {
 		const suggestedOnly = ctx.query.get("suggested_only") === "true";
 		const summary = async (id, s) => {
 			const details = await roomDetails(hs, id);
-			const jr = getState(s, "m.room.join_rules")?.content;
-			if (["restricted", "knock_restricted"].includes(jr?.join_rule)) details.allowed_room_ids = (Array.isArray(jr?.allow) ? jr.allow : []).filter((a) => a?.type === "m.room_membership").map((a) => a.room_id);
+			const jr = getState(s, M.ROOM.JOIN_RULES)?.content;
+			if (["restricted", "knock_restricted"].includes(jr?.join_rule)) details.allowed_room_ids = (Array.isArray(jr?.allow) ? jr.allow : []).filter((a) => a?.type === M.ROOM_MEMBERSHIP).map((a) => a.room_id);
 			return details;
 		};
 		const accessible = async (s) => {
-			const jr = getState(s, "m.room.join_rules")?.content;
+			const jr = getState(s, M.ROOM.JOIN_RULES)?.content;
 			const rule = jr?.join_rule ?? "invite";
-			const hv = getState(s, "m.room.history_visibility")?.content?.history_visibility;
+			const hv = getState(s, M.ROOM.HISTORY_VISIBILITY)?.content?.history_visibility;
 			if ([
 				"public",
 				"knock",
@@ -651,7 +682,7 @@ function registerFederationRoutes(r) {
 			].includes(rule) || hv === "world_readable" || FederationJoinGuard.serverInRoom(s, origin)) return true;
 			if (rule !== "restricted") return false;
 			for (const allow of Array.isArray(jr?.allow) ? jr.allow : []) {
-				if (allow?.type !== "m.room_membership" || typeof allow.room_id !== "string" || !await hs.rooms.exists(allow.room_id)) continue;
+				if (allow?.type !== M.ROOM_MEMBERSHIP || typeof allow.room_id !== "string" || !await hs.rooms.exists(allow.room_id)) continue;
 				if (FederationJoinGuard.serverInRoom(await hs.rooms.currentState(allow.room_id), origin)) return true;
 			}
 			return false;
@@ -662,7 +693,7 @@ function registerFederationRoutes(r) {
 		const inaccessible = [];
 		for (const [key, ev] of state) {
 			const [type, childId] = splitStateKey(key);
-			if (type !== "m.space.child" || !Array.isArray(ev.content?.via) || !ev.content.via.length) continue;
+			if (type !== M.SPACE.CHILD || !Array.isArray(ev.content?.via) || !ev.content.via.length) continue;
 			if (suggestedOnly && ev.content.suggested !== true) continue;
 			childrenState.push({
 				type,
@@ -688,7 +719,7 @@ function registerFederationRoutes(r) {
 			children,
 			inaccessible_children: inaccessible
 		};
-	});
+	} });
 	const mediaHandler = async (ctx) => {
 		const hs = ctx.hs;
 		const meta = await hs.db.findOne("media", [{
@@ -710,40 +741,43 @@ function registerFederationRoutes(r) {
 			headers: { "content-type": `multipart/mixed; boundary=${boundary}` }
 		});
 	};
-	fed("GET", "/v1/media/download/:mediaId", (ctx) => mediaHandler(ctx));
-	fed("GET", "/v1/media/thumbnail/:mediaId", (ctx) => mediaHandler(ctx));
-	r.get(`${F}/v1/openid/userinfo`, async (ctx) => {
+	fed("GET", "/v1/media/download/:mediaId", { handler: (ctx) => mediaHandler(ctx) });
+	fed("GET", "/v1/media/thumbnail/:mediaId", { handler: (ctx) => mediaHandler(ctx) });
+	r.get(`${F}/v1/openid/userinfo`, procedure({ handler: async (ctx) => {
 		const token = ctx.query.get("access_token");
 		const userId = token ? await ctx.hs.cluster.get(`openid:${token}`) : null;
 		if (!userId) throw new MatrixError(401, "M_UNKNOWN_TOKEN", "Invalid OpenID token");
 		return { sub: userId };
-	});
-	r.client("POST", "/user/:userId/openid/request_token", async (ctx) => {
-		const s = await ctx.auth();
-		if (ctx.params.userId !== s.userId) throw errors.forbidden("Cannot request tokens for other users");
-		const token = randomToken();
-		await ctx.hs.cluster.set(`openid:${token}`, s.userId, 36e5);
-		return {
-			access_token: token,
-			token_type: "Bearer",
-			matrix_server_name: ctx.hs.serverName,
-			expires_in: 3600
-		};
-	});
-	fed("PUT", "/v1/exchange_third_party_invite/:roomId", async (ctx, origin) => {
+	} }));
+	r.client("POST", "/user/:userId/openid/request_token", procedure({
+		auth: "user",
+		handler: async (ctx) => {
+			const s = ctx.session;
+			if (ctx.params.userId !== s.userId) throw errors.forbidden("Cannot request tokens for other users");
+			const token = randomToken();
+			await ctx.hs.cluster.set(`openid:${token}`, s.userId, 36e5);
+			return {
+				access_token: token,
+				token_type: "Bearer",
+				matrix_server_name: ctx.hs.serverName,
+				expires_in: 3600
+			};
+		}
+	}));
+	fed("PUT", "/v1/exchange_third_party_invite/:roomId", { handler: async (ctx, origin) => {
 		const hs = ctx.hs;
 		const roomId = ctx.params.roomId;
 		const event = await ctx.json();
 		const signed = event.content?.third_party_invite?.signed;
-		if (event.type !== "m.room.member" || event.room_id !== roomId || event.content?.membership !== "invite" || !isObject(signed)) throw errors.badJson("Expected an m.room.member invite with third_party_invite");
+		if (event.type !== M.ROOM.MEMBER || event.room_id !== roomId || event.content?.membership !== "invite" || !isObject(signed)) throw errors.badJson("Expected an m.room.member invite with third_party_invite");
 		if (typeof event.sender !== "string" || !hs.isLocalUser(event.sender)) throw errors.forbidden("The sender is not a user of this server");
 		if (typeof event.state_key !== "string" || domainOf(event.state_key) !== origin || signed.mxid !== event.state_key) throw errors.forbidden("The invitee does not belong to the requesting server");
 		await roomOr404(hs, roomId);
 		await checkAcl(hs, roomId, origin);
 		await exchangeThirdPartyInvite(hs, roomId, event.sender, event.state_key, signed);
 		return {};
-	});
-	r.put(`${F}/v1/3pid/onbind`, async (ctx) => {
+	} });
+	r.put(`${F}/v1/3pid/onbind`, procedure({ handler: async (ctx) => {
 		const hs = ctx.hs;
 		const body = await ctx.json();
 		const invites = Array.isArray(body.invites) ? body.invites : [];
@@ -752,7 +786,7 @@ function registerFederationRoutes(r) {
 			if (!isObject(signed) || typeof signed.mxid !== "string" || !hs.isLocalUser(signed.mxid)) continue;
 			if (typeof invite.room_id !== "string" || typeof invite.sender !== "string") continue;
 			const event = {
-				type: "m.room.member",
+				type: M.ROOM.MEMBER,
 				room_id: invite.room_id,
 				sender: invite.sender,
 				state_key: signed.mxid,
@@ -769,21 +803,21 @@ function registerFederationRoutes(r) {
 			}
 		}
 		return {};
-	});
+	} }));
 }
 /** Helpers for "is a server in the room" checks. */
 const FederationJoinGuard = {
 	serverInRoom(state, server) {
 		for (const [key, ev] of state) {
 			const [type, userId] = splitStateKey(key);
-			if (type === "m.room.member" && domainOf(userId) === server && ev.content?.membership === "join") return true;
+			if (type === M.ROOM.MEMBER && domainOf(userId) === server && ev.content?.membership === "join") return true;
 		}
 		return false;
 	},
 	noLocalMembers(hs, state) {
 		for (const [key, ev] of state) {
 			const [type, userId] = splitStateKey(key);
-			if (type === "m.room.member" && hs.isLocalUser(userId) && ev.content?.membership === "join") return false;
+			if (type === M.ROOM.MEMBER && hs.isLocalUser(userId) && ev.content?.membership === "join") return false;
 		}
 		return true;
 	}

package/dist/api/filters.js

@@ -1,4 +1,5 @@
 import { isObject } from "../core/json.js";
+import { M, UNSTABLE } from "../core/m.js";
 import { errors } from "../core/errors.js";
 import { globMatch as globMatch$1 } from "../core/glob.js";
 //#region src/api/filters.ts
@@ -17,10 +18,10 @@ function matchesFilter(filter, ev) {
 		if (filter.not_rooms?.includes(ev.room_id)) return false;
 		if (filter.rooms && !filter.rooms.includes(ev.room_id)) return false;
 	}
-	const relTypes = filter.rel_types ?? filter["org.matrix.msc3874.rel_types"];
-	const notRelTypes = filter.not_rel_types ?? filter["org.matrix.msc3874.not_rel_types"];
+	const relTypes = filter.rel_types ?? filter[UNSTABLE.ORG.MATRIX.MSC3874.REL_TYPES];
+	const notRelTypes = filter.not_rel_types ?? filter[UNSTABLE.ORG.MATRIX.MSC3874.NOT_REL_TYPES];
 	if (relTypes || notRelTypes) {
-		const relType = ev.content?.["m.relates_to"]?.rel_type;
+		const relType = ev.content?.[M.RELATES_TO]?.rel_type;
 		if (relTypes && !relTypes.includes(relType)) return false;
 		if (notRelTypes && typeof relType === "string" && notRelTypes.includes(relType)) return false;
 	}