matrix-nodejs-homeserver 0.2.0 → 0.3.2

package/dist/api/profile.js

@@ -1,11 +1,13 @@
 import { isObject } from "../core/json.js";
+import { M } from "../core/m.js";
 import { MatrixError, errors } from "../core/errors.js";
 import { isValidUserId } from "../core/ids.js";
 import { getState } from "../core/authrules.js";
 import { assertNotSuspended } from "../core/auth.js";
+import { number, string } from "../vendor/zod/v4/classic/schemas.js";
 import { body, fail, lenient } from "../http/input.js";
+import { procedure } from "../http/procedure.js";
 import { BUILTIN_FIELDS, fullProfile, profileSize, setProfileField } from "../core/profile.js";
-import { z } from "zod";
 //#region src/api/profile.ts
 async function remoteProfile(ctx, field) {
 	if (!isValidUserId(ctx.params.userId)) throw errors.invalidParam("Invalid user ID");
@@ -26,17 +28,17 @@ function checkField(field) {
 	if (!field || Buffer.byteLength(field) > 255) throw new MatrixError(400, "M_KEY_TOO_LARGE", "Profile key too long");
 }
 function registerProfileRoutes(r) {
-	r.client("GET", "/profile/:userId", async (ctx) => {
+	r.client("GET", "/profile/:userId", procedure({ handler: async (ctx) => {
 		if (!ctx.hs.isLocalUser(ctx.params.userId)) return remoteProfile(ctx);
 		return localProfile(ctx);
-	});
-	r.client("GET", "/profile/:userId/:field", async (ctx) => {
+	} }));
+	r.client("GET", "/profile/:userId/:field", procedure({ handler: async (ctx) => {
 		const field = ctx.params.field;
 		checkField(field);
 		const profile = ctx.hs.isLocalUser(ctx.params.userId) ? await localProfile(ctx) : await remoteProfile(ctx, field);
 		if (profile[field] === void 0 || profile[field] === null) throw errors.notFound("Profile field not set");
 		return { [field]: profile[field] };
-	});
+	} }));
 	async function owner(ctx) {
 		const s = await ctx.auth();
 		if (!isValidUserId(ctx.params.userId) || ctx.params.userId !== s.userId) throw errors.forbidden("Cannot change another user's profile");
@@ -44,7 +46,7 @@ function registerProfileRoutes(r) {
 		await assertNotSuspended(ctx.hs, s);
 		return s;
 	}
-	r.client("PUT", "/profile/:userId/:field", async (ctx) => {
+	r.client("PUT", "/profile/:userId/:field", procedure({ handler: async (ctx) => {
 		const s = await owner(ctx);
 		const field = ctx.params.field;
 		const body = await ctx.json();
@@ -60,106 +62,115 @@ function registerProfileRoutes(r) {
 		if (profileSize(profile) > 65536) throw new MatrixError(400, "M_PROFILE_TOO_LARGE", "Profile too large");
 		await setProfileField(ctx.hs, s.userId, field, value);
 		return {};
-	});
-	r.client("DELETE", "/profile/:userId/:field", async (ctx) => {
+	} }));
+	r.client("DELETE", "/profile/:userId/:field", procedure({ handler: async (ctx) => {
 		const s = await owner(ctx);
 		await setProfileField(ctx.hs, s.userId, ctx.params.field, null);
 		return {};
-	});
+	} }));
 	const directoryBody = body({
-		search_term: z.string(fail("M_MISSING_PARAM", "Missing search_term")),
-		limit: lenient(z.number().int())
+		search_term: string(fail("M_MISSING_PARAM", "Missing search_term")),
+		limit: lenient(number().int())
 	});
-	r.client("POST", "/user_directory/search", { input: directoryBody }, async (ctx) => {
-		const s = await ctx.auth();
-		const body = ctx.input;
-		const term = body.search_term.toLowerCase();
-		const limit = body.limit !== void 0 ? Math.min(body.limit, 50) : 10;
-		const visible = await ctx.hs.rooms.usersSharingRooms(s.userId);
-		visible.delete(s.userId);
-		for (const room of await ctx.hs.db.findMany("rooms", {})) {
-			const state = await ctx.hs.rooms.currentState(room.room_id);
-			if (room.is_public || getState(state, "m.room.join_rules")?.content?.join_rule === "public" || getState(state, "m.room.history_visibility")?.content?.history_visibility === "world_readable") for (const u of await ctx.hs.rooms.joinedMembers(room.room_id)) visible.add(u);
-		}
-		const candidates = (await ctx.hs.db.findMany("users", { where: [{
-			field: "user_id",
-			operator: "in",
-			value: [...visible].filter((u) => ctx.hs.isLocalUser(u))
-		}] })).filter((u) => !u.deactivated).map((u) => ({
-			user_id: u.user_id,
-			displayname: u.displayname,
-			avatar_url: u.avatar_url
-		}));
-		for (const userId of visible) {
-			if (ctx.hs.isLocalUser(userId)) continue;
-			const row = (await ctx.hs.db.findMany("memberships", {
-				where: [{
-					field: "user_id",
-					value: userId
-				}, {
-					field: "membership",
-					value: "join"
-				}],
-				limit: 1
-			}))[0];
-			const member = row ? await ctx.hs.rooms.getPdu(row.event_id) : null;
-			candidates.push({
-				user_id: userId,
-				displayname: member?.content?.displayname,
-				avatar_url: member?.content?.avatar_url
-			});
+	r.client("POST", "/user_directory/search", procedure({
+		auth: "user",
+		input: directoryBody,
+		handler: async (ctx) => {
+			const s = ctx.session;
+			const body = ctx.input;
+			const term = body.search_term.toLowerCase();
+			const limit = body.limit !== void 0 ? Math.min(body.limit, 50) : 10;
+			const visible = await ctx.hs.rooms.usersSharingRooms(s.userId);
+			visible.delete(s.userId);
+			for (const room of await ctx.hs.db.findMany("rooms", {})) {
+				const state = await ctx.hs.rooms.currentState(room.room_id);
+				if (room.is_public || getState(state, M.ROOM.JOIN_RULES)?.content?.join_rule === "public" || getState(state, M.ROOM.HISTORY_VISIBILITY)?.content?.history_visibility === "world_readable") for (const u of await ctx.hs.rooms.joinedMembers(room.room_id)) visible.add(u);
+			}
+			const candidates = (await ctx.hs.db.findMany("users", { where: [{
+				field: "user_id",
+				operator: "in",
+				value: [...visible].filter((u) => ctx.hs.isLocalUser(u))
+			}] })).filter((u) => !u.deactivated).map((u) => ({
+				user_id: u.user_id,
+				displayname: u.displayname,
+				avatar_url: u.avatar_url
+			}));
+			for (const userId of visible) {
+				if (ctx.hs.isLocalUser(userId)) continue;
+				const row = (await ctx.hs.db.findMany("memberships", {
+					where: [{
+						field: "user_id",
+						value: userId
+					}, {
+						field: "membership",
+						value: "join"
+					}],
+					limit: 1
+				}))[0];
+				const member = row ? await ctx.hs.rooms.getPdu(row.event_id) : null;
+				candidates.push({
+					user_id: userId,
+					displayname: member?.content?.displayname,
+					avatar_url: member?.content?.avatar_url
+				});
+			}
+			const results = candidates.filter((u) => u.user_id.toLowerCase().includes(term) || typeof u.displayname === "string" && u.displayname.toLowerCase().includes(term)).map((u) => ({
+				user_id: u.user_id,
+				display_name: u.displayname ?? void 0,
+				avatar_url: u.avatar_url ?? void 0
+			}));
+			return {
+				results: results.slice(0, limit),
+				limited: results.length > limit
+			};
 		}
-		const results = candidates.filter((u) => u.user_id.toLowerCase().includes(term) || typeof u.displayname === "string" && u.displayname.toLowerCase().includes(term)).map((u) => ({
-			user_id: u.user_id,
-			display_name: u.displayname ?? void 0,
-			avatar_url: u.avatar_url ?? void 0
-		}));
-		return {
-			results: results.slice(0, limit),
-			limited: results.length > limit
-		};
-	});
-	r.client("GET", "/presence/:userId/status", async (ctx) => {
-		await ctx.auth();
-		const row = await ctx.hs.db.findOne("presence", [{
-			field: "user_id",
-			value: ctx.params.userId
-		}]);
-		if (!row) {
-			if (!await ctx.hs.db.findOne("users", [{
+	}));
+	r.client("GET", "/presence/:userId/status", procedure({
+		auth: "user",
+		handler: async (ctx) => {
+			const row = await ctx.hs.db.findOne("presence", [{
 				field: "user_id",
 				value: ctx.params.userId
-			}])) throw errors.notFound("Unknown user");
-			return { presence: "offline" };
+			}]);
+			if (!row) {
+				if (!await ctx.hs.db.findOne("users", [{
+					field: "user_id",
+					value: ctx.params.userId
+				}])) throw errors.notFound("Unknown user");
+				return { presence: "offline" };
+			}
+			const out = {
+				presence: row.presence,
+				last_active_ago: Date.now() - row.last_active_ts
+			};
+			if (row.status_msg) out.status_msg = row.status_msg;
+			if (row.presence === "online") out.currently_active = true;
+			return out;
 		}
-		const out = {
-			presence: row.presence,
-			last_active_ago: Date.now() - row.last_active_ts
-		};
-		if (row.status_msg) out.status_msg = row.status_msg;
-		if (row.presence === "online") out.currently_active = true;
-		return out;
-	});
-	r.client("PUT", "/presence/:userId/status", async (ctx) => {
-		const s = await ctx.auth();
-		if (ctx.params.userId !== s.userId) throw errors.forbidden("Cannot set another user's presence");
-		const body = await ctx.json();
-		if (![
-			"online",
-			"offline",
-			"unavailable"
-		].includes(body.presence)) throw errors.invalidParam("Invalid presence");
-		await ctx.hs.streams.write((stream) => ctx.hs.db.upsert("presence", {
-			user_id: s.userId,
-			presence: body.presence,
-			status_msg: typeof body.status_msg === "string" ? body.status_msg : null,
-			last_active_ts: Date.now(),
-			stream
-		}));
-		await ctx.hs.federation.onPresence(s.userId, body.presence, typeof body.status_msg === "string" ? body.status_msg : null).catch(() => {});
-		ctx.hs.notifier.notify(await ctx.hs.rooms.usersSharingRooms(s.userId));
-		return {};
-	});
+	}));
+	r.client("PUT", "/presence/:userId/status", procedure({
+		auth: "user",
+		handler: async (ctx) => {
+			const s = ctx.session;
+			if (ctx.params.userId !== s.userId) throw errors.forbidden("Cannot set another user's presence");
+			const body = await ctx.json();
+			if (![
+				"online",
+				"offline",
+				"unavailable"
+			].includes(body.presence)) throw errors.invalidParam("Invalid presence");
+			await ctx.hs.streams.write((stream) => ctx.hs.db.upsert("presence", {
+				user_id: s.userId,
+				presence: body.presence,
+				status_msg: typeof body.status_msg === "string" ? body.status_msg : null,
+				last_active_ts: Date.now(),
+				stream
+			}));
+			await ctx.hs.federation.onPresence(s.userId, body.presence, typeof body.status_msg === "string" ? body.status_msg : null).catch(() => {});
+			ctx.hs.notifier.notify(await ctx.hs.rooms.usersSharingRooms(s.userId));
+			return {};
+		}
+	}));
 }
 //#endregion
 export { registerProfileRoutes };

package/dist/api/push.js

@@ -1,18 +1,20 @@
+import { M } from "../core/m.js";
 import { errors } from "../core/errors.js";
 import { KINDS, loadRules, saveRules, withRulesLock } from "../core/pushrules.js";
+import { looseObject, string, unknown } from "../vendor/zod/v4/classic/schemas.js";
 import { body, fail, lenient } from "../http/input.js";
-import { z } from "zod";
+import { procedure } from "../http/procedure.js";
 //#region src/api/push.ts
-const pusherKey = z.string(fail("M_MISSING_PARAM", "Missing app_id or pushkey"));
+const pusherKey = string(fail("M_MISSING_PARAM", "Missing app_id or pushkey"));
 const pusherBody = body({
 	app_id: pusherKey,
 	pushkey: pusherKey,
-	kind: lenient(z.string().nullable()),
-	app_display_name: lenient(z.string()),
-	device_display_name: lenient(z.string()),
-	lang: lenient(z.string()),
-	data: lenient(z.looseObject({ url: lenient(z.string()) })),
-	append: z.unknown().optional()
+	kind: lenient(string().nullable()),
+	app_display_name: lenient(string()),
+	device_display_name: lenient(string()),
+	lang: lenient(string()),
+	data: lenient(looseObject({ url: lenient(string()) })),
+	append: unknown().optional()
 });
 function findRule(rules, kind, ruleId) {
 	if (!KINDS.includes(kind)) throw errors.invalidParam("Unknown rule kind");
@@ -29,27 +31,30 @@ async function ruleCtx(ctx) {
 	};
 }
 function registerPushRoutes(r) {
-	r.client("GET", "/pushrules", async (ctx) => {
-		const s = await ctx.auth();
-		return { global: await loadRules(ctx.hs, s.userId) };
-	});
-	r.client("GET", "/pushrules/:scope", async (ctx) => {
+	r.client("GET", "/pushrules", procedure({
+		auth: "user",
+		handler: async (ctx) => {
+			const s = ctx.session;
+			return { global: await loadRules(ctx.hs, s.userId) };
+		}
+	}));
+	r.client("GET", "/pushrules/:scope", procedure({ handler: async (ctx) => {
 		const { rules } = await ruleCtx(ctx);
 		return rules;
-	});
-	r.client("GET", "/pushrules/:scope/:kind/:ruleId", async (ctx) => {
+	} }));
+	r.client("GET", "/pushrules/:scope/:kind/:ruleId", procedure({ handler: async (ctx) => {
 		const { rules } = await ruleCtx(ctx);
 		return findRule(rules, ctx.params.kind, ctx.params.ruleId);
-	});
-	r.client("DELETE", "/pushrules/:scope/:kind/:ruleId", async (ctx) => withRulesLock(ctx.hs, (await ctx.auth()).userId, async () => {
+	} }));
+	r.client("DELETE", "/pushrules/:scope/:kind/:ruleId", procedure({ handler: async (ctx) => withRulesLock(ctx.hs, (await ctx.auth()).userId, async () => {
 		const { s, rules } = await ruleCtx(ctx);
 		const rule = findRule(rules, ctx.params.kind, ctx.params.ruleId);
 		if (rule.default) throw errors.forbidden("Cannot delete a default rule");
 		rules[ctx.params.kind] = rules[ctx.params.kind].filter((x) => x !== rule);
 		await saveRules(ctx.hs, s.userId, rules);
 		return {};
-	}));
-	r.client("PUT", "/pushrules/:scope/:kind/:ruleId", async (ctx) => withRulesLock(ctx.hs, (await ctx.auth()).userId, async () => {
+	}) }));
+	r.client("PUT", "/pushrules/:scope/:kind/:ruleId", procedure({ handler: async (ctx) => withRulesLock(ctx.hs, (await ctx.auth()).userId, async () => {
 		const { s, rules } = await ruleCtx(ctx);
 		const { kind, ruleId } = ctx.params;
 		if (!KINDS.includes(kind)) throw errors.invalidParam("Unknown rule kind");
@@ -70,7 +75,7 @@ function registerPushRoutes(r) {
 		const list = (rules[kind] ??= []).filter((x) => x.rule_id !== ruleId);
 		const before = ctx.query.get("before");
 		const after = ctx.query.get("after");
-		let index = list.findIndex((x) => x.default && x.rule_id !== ".m.rule.master");
+		let index = list.findIndex((x) => x.default && x.rule_id !== M.RULE.MASTER);
 		if (index === -1) index = list.length;
 		if (before) {
 			index = list.findIndex((x) => x.rule_id === before);
@@ -84,13 +89,13 @@ function registerPushRoutes(r) {
 		rules[kind] = list;
 		await saveRules(ctx.hs, s.userId, rules);
 		return {};
-	}));
+	}) }));
 	for (const attr of ["enabled", "actions"]) {
-		r.client("GET", `/pushrules/:scope/:kind/:ruleId/${attr}`, async (ctx) => {
+		r.client("GET", `/pushrules/:scope/:kind/:ruleId/${attr}`, procedure({ handler: async (ctx) => {
 			const { rules } = await ruleCtx(ctx);
 			return { [attr]: findRule(rules, ctx.params.kind, ctx.params.ruleId)[attr] };
-		});
-		r.client("PUT", `/pushrules/:scope/:kind/:ruleId/${attr}`, async (ctx) => withRulesLock(ctx.hs, (await ctx.auth()).userId, async () => {
+		} }));
+		r.client("PUT", `/pushrules/:scope/:kind/:ruleId/${attr}`, procedure({ handler: async (ctx) => withRulesLock(ctx.hs, (await ctx.auth()).userId, async () => {
 			const { s, rules } = await ruleCtx(ctx);
 			const rule = findRule(rules, ctx.params.kind, ctx.params.ruleId);
 			const body = await ctx.json();
@@ -99,89 +104,99 @@ function registerPushRoutes(r) {
 			rule[attr] = body[attr];
 			await saveRules(ctx.hs, s.userId, rules);
 			return {};
-		}));
+		}) }));
 	}
-	r.client("GET", "/pushers", async (ctx) => {
-		const s = await ctx.auth();
-		return { pushers: (await ctx.hs.db.findMany("pushers", { where: [{
-			field: "user_id",
-			value: s.userId
-		}] })).map((r) => r.pusher) };
-	});
-	r.client("POST", "/pushers/set", { input: pusherBody }, async (ctx) => {
-		const s = await ctx.auth();
-		const body = ctx.input;
-		if (body.kind === null) {
-			await ctx.hs.db.delete("pushers", [
-				{
-					field: "user_id",
-					value: s.userId
-				},
-				{
+	r.client("GET", "/pushers", procedure({
+		auth: "user",
+		handler: async (ctx) => {
+			const s = ctx.session;
+			return { pushers: (await ctx.hs.db.findMany("pushers", { where: [{
+				field: "user_id",
+				value: s.userId
+			}] })).map((r) => r.pusher) };
+		}
+	}));
+	r.client("POST", "/pushers/set", procedure({
+		auth: "user",
+		input: pusherBody,
+		handler: async (ctx) => {
+			const s = ctx.session;
+			const body = ctx.input;
+			if (body.kind === null) {
+				await ctx.hs.db.delete("pushers", [
+					{
+						field: "user_id",
+						value: s.userId
+					},
+					{
+						field: "app_id",
+						value: body.app_id
+					},
+					{
+						field: "pushkey",
+						value: body.pushkey
+					}
+				]);
+				return {};
+			}
+			for (const k of [
+				"kind",
+				"app_display_name",
+				"device_display_name",
+				"lang"
+			]) if (body[k] === void 0) throw errors.missingParam(`Missing ${k}`);
+			if (!body.data) throw errors.missingParam("Missing data");
+			if (body.kind === "http" && body.data.url === void 0) throw errors.invalidParam("data.url is required for http pushers");
+			if (!body.append) {
+				const others = await ctx.hs.db.findMany("pushers", { where: [{
 					field: "app_id",
 					value: body.app_id
-				},
-				{
+				}, {
 					field: "pushkey",
 					value: body.pushkey
-				}
-			]);
+				}] });
+				for (const o of others) await ctx.hs.db.delete("pushers", [
+					{
+						field: "user_id",
+						value: o.user_id
+					},
+					{
+						field: "app_id",
+						value: o.app_id
+					},
+					{
+						field: "pushkey",
+						value: o.pushkey
+					}
+				]);
+			}
+			const { append, ...pusher } = body;
+			await ctx.hs.db.upsert("pushers", {
+				user_id: s.userId,
+				app_id: body.app_id,
+				pushkey: body.pushkey,
+				device_id: s.deviceId,
+				pusher
+			});
 			return {};
 		}
-		for (const k of [
-			"kind",
-			"app_display_name",
-			"device_display_name",
-			"lang"
-		]) if (body[k] === void 0) throw errors.missingParam(`Missing ${k}`);
-		if (!body.data) throw errors.missingParam("Missing data");
-		if (body.kind === "http" && body.data.url === void 0) throw errors.invalidParam("data.url is required for http pushers");
-		if (!body.append) {
-			const others = await ctx.hs.db.findMany("pushers", { where: [{
-				field: "app_id",
-				value: body.app_id
-			}, {
-				field: "pushkey",
-				value: body.pushkey
-			}] });
-			for (const o of others) await ctx.hs.db.delete("pushers", [
-				{
-					field: "user_id",
-					value: o.user_id
-				},
-				{
-					field: "app_id",
-					value: o.app_id
-				},
-				{
-					field: "pushkey",
-					value: o.pushkey
-				}
-			]);
+	}));
+	r.client("GET", "/notifications", procedure({
+		auth: "user",
+		handler: async (ctx) => {
+			const s = ctx.session;
+			const from = ctx.query.get("from");
+			const limit = Math.min(Math.max(Number.parseInt(ctx.query.get("limit") ?? "20", 10) || 20, 1), 100);
+			const rows = await ctx.hs.push.list(s.userId, {
+				from: from ? Number.parseInt(from, 10) : null,
+				limit,
+				onlyHighlight: ctx.query.get("only") === "highlight"
+			});
+			const out = { notifications: rows.map(({ stream, ...n }) => n) };
+			if (rows.length === limit) out.next_token = String(rows[rows.length - 1].stream);
+			return out;
 		}
-		const { append, ...pusher } = body;
-		await ctx.hs.db.upsert("pushers", {
-			user_id: s.userId,
-			app_id: body.app_id,
-			pushkey: body.pushkey,
-			device_id: s.deviceId,
-			pusher
-		});
-		return {};
-	});
-	r.client("GET", "/notifications", async (ctx) => {
-		const s = await ctx.auth();
-		const from = ctx.query.get("from");
-		const limit = Math.min(Math.max(Number.parseInt(ctx.query.get("limit") ?? "20", 10) || 20, 1), 100);
-		const rows = await ctx.hs.push.list(s.userId, {
-			from: from ? Number.parseInt(from, 10) : null,
-			limit,
-			onlyHighlight: ctx.query.get("only") === "highlight"
-		});
-		const out = { notifications: rows.map(({ stream, ...n }) => n) };
-		if (rows.length === limit) out.next_token = String(rows[rows.length - 1].stream);
-		return out;
-	});
+	}));
 }
 //#endregion
 export { registerPushRoutes };