matrix-nodejs-homeserver 0.2.0 → 0.3.2

package/dist/api/admin.js

@@ -1,16 +1,17 @@
 import { errors } from "../core/errors.js";
+import { boolean, looseObject, number, string } 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/admin.ts
 const required = fail("M_BAD_JSON", "user_id and content are required");
 const noticeBody = body({
-	user_id: z.string(required),
-	content: z.looseObject({}, required),
-	type: lenient(z.string())
+	user_id: string(required),
+	content: looseObject({}, required),
+	type: lenient(string())
 });
-const optionalInt = (name) => z.number(fail("M_INVALID_PARAM", `${name} must be an integer`)).int(`M_INVALID_PARAM: ${name} must be an integer`);
+const optionalInt = (name) => number(fail("M_INVALID_PARAM", `${name} must be an integer`)).int(`M_INVALID_PARAM: ${name} must be an integer`);
 const registrationTokenBody = body({
-	token: z.string(fail("M_INVALID_PARAM", "Invalid token")).optional(),
+	token: string(fail("M_INVALID_PARAM", "Invalid token")).optional(),
 	uses_allowed: optionalInt("uses_allowed").nullable().optional(),
 	expiry_time: optionalInt("expiry_time").nullable().optional(),
 	length: optionalInt("length").optional()
@@ -29,10 +30,13 @@ async function requireAdmin(ctx) {
 	});
 	return s;
 }
+const adminGuard = async (ctx) => {
+	await requireAdmin(ctx);
+	return {};
+};
 /** Admin HTTP API using Synapse-compatible paths, so existing tooling keeps working. */
 function registerAdminRoutes(r) {
 	const notice = async (ctx) => {
-		await requireAdmin(ctx);
 		const body = ctx.input;
 		return { event_id: await ctx.hs.admin.sendServerNotice(body.user_id, body.content, {
 			type: body.type,
@@ -65,13 +69,21 @@ function registerAdminRoutes(r) {
 		};
 	};
 	const lock = moderation("locked"), suspend = moderation("suspended");
-	r.get("/_matrix/client/v1/admin/lock/:userId", lock.get);
-	r.put("/_matrix/client/v1/admin/lock/:userId", lock.put);
-	r.get("/_matrix/client/v1/admin/suspend/:userId", suspend.get);
-	r.put("/_matrix/client/v1/admin/suspend/:userId", suspend.put);
-	r.post("/_synapse/admin/v1/send_server_notice", { input: noticeBody }, notice);
-	r.put("/_synapse/admin/v1/send_server_notice/:txnId", { input: noticeBody }, notice);
-	r.get("/_synapse/admin/v2/users", async (ctx) => {
+	r.get("/_matrix/client/v1/admin/lock/:userId", procedure({ handler: lock.get }));
+	r.put("/_matrix/client/v1/admin/lock/:userId", procedure({ handler: lock.put }));
+	r.get("/_matrix/client/v1/admin/suspend/:userId", procedure({ handler: suspend.get }));
+	r.put("/_matrix/client/v1/admin/suspend/:userId", procedure({ handler: suspend.put }));
+	r.post("/_synapse/admin/v1/send_server_notice", procedure({
+		guard: adminGuard,
+		input: noticeBody,
+		handler: notice
+	}));
+	r.put("/_synapse/admin/v1/send_server_notice/:txnId", procedure({
+		guard: adminGuard,
+		input: noticeBody,
+		handler: notice
+	}));
+	r.get("/_synapse/admin/v2/users", procedure({ handler: async (ctx) => {
 		await requireAdmin(ctx);
 		const from = Number(ctx.query.get("from") ?? 0) || 0;
 		const res = await ctx.hs.admin.listUsers({
@@ -85,14 +97,14 @@ function registerAdminRoutes(r) {
 			total: res.total,
 			...res.next !== null ? { next_token: String(res.next) } : {}
 		};
-	});
-	r.get("/_synapse/admin/v2/users/:userId", async (ctx) => {
+	} }));
+	r.get("/_synapse/admin/v2/users/:userId", procedure({ handler: async (ctx) => {
 		await requireAdmin(ctx);
 		const user = await ctx.hs.admin.getUser(ctx.params.userId);
 		if (!user) throw errors.notFound("Unknown user");
 		return user;
-	});
-	r.put("/_synapse/admin/v2/users/:userId", async (ctx) => {
+	} }));
+	r.put("/_synapse/admin/v2/users/:userId", procedure({ handler: async (ctx) => {
 		await requireAdmin(ctx);
 		const body = await ctx.json();
 		const userId = ctx.params.userId;
@@ -119,43 +131,52 @@ function registerAdminRoutes(r) {
 		}
 		if (body.deactivated === true) await ctx.hs.admin.deactivateUser(userId);
 		return ctx.hs.admin.getUser(userId);
-	});
-	r.post("/_synapse/admin/v1/deactivate/:userId", { input: body({ erase: lenient(z.boolean()) }) }, async (ctx) => {
-		await requireAdmin(ctx);
-		const body = ctx.input;
-		await ctx.hs.admin.deactivateUser(ctx.params.userId, { erase: body.erase === true });
-		return { id_server_unbind_result: "no-support" };
-	});
+	} }));
+	r.post("/_synapse/admin/v1/deactivate/:userId", procedure({
+		guard: adminGuard,
+		input: body({ erase: lenient(boolean()) }),
+		handler: async (ctx) => {
+			const body = ctx.input;
+			await ctx.hs.admin.deactivateUser(ctx.params.userId, { erase: body.erase === true });
+			return { id_server_unbind_result: "no-support" };
+		}
+	}));
 	const resetPasswordBody = body({
-		new_password: z.string(fail("M_MISSING_PARAM", "Missing new_password")),
-		logout_devices: lenient(z.boolean())
+		new_password: string(fail("M_MISSING_PARAM", "Missing new_password")),
+		logout_devices: lenient(boolean())
 	});
-	r.post("/_synapse/admin/v1/reset_password/:userId", { input: resetPasswordBody }, async (ctx) => {
-		await requireAdmin(ctx);
-		const body = ctx.input;
-		await ctx.hs.admin.resetPassword(ctx.params.userId, body.new_password, body.logout_devices !== false);
-		return {};
-	});
-	r.get("/_synapse/admin/v1/registration_tokens", async (ctx) => {
+	r.post("/_synapse/admin/v1/reset_password/:userId", procedure({
+		guard: adminGuard,
+		input: resetPasswordBody,
+		handler: async (ctx) => {
+			const body = ctx.input;
+			await ctx.hs.admin.resetPassword(ctx.params.userId, body.new_password, body.logout_devices !== false);
+			return {};
+		}
+	}));
+	r.get("/_synapse/admin/v1/registration_tokens", procedure({ handler: async (ctx) => {
 		await requireAdmin(ctx);
 		return { registration_tokens: await ctx.hs.admin.listRegistrationTokens() };
-	});
-	r.post("/_synapse/admin/v1/registration_tokens/new", { input: registrationTokenBody }, async (ctx) => {
-		await requireAdmin(ctx);
-		const body = ctx.input;
-		return ctx.hs.admin.createRegistrationToken({
-			token: body.token,
-			usesAllowed: body.uses_allowed,
-			expiryTime: body.expiry_time,
-			length: body.length
-		});
-	});
-	r.delete("/_synapse/admin/v1/registration_tokens/:token", async (ctx) => {
+	} }));
+	r.post("/_synapse/admin/v1/registration_tokens/new", procedure({
+		guard: adminGuard,
+		input: registrationTokenBody,
+		handler: async (ctx) => {
+			const body = ctx.input;
+			return ctx.hs.admin.createRegistrationToken({
+				token: body.token,
+				usesAllowed: body.uses_allowed,
+				expiryTime: body.expiry_time,
+				length: body.length
+			});
+		}
+	}));
+	r.delete("/_synapse/admin/v1/registration_tokens/:token", procedure({ handler: async (ctx) => {
 		await requireAdmin(ctx);
 		await ctx.hs.admin.deleteRegistrationToken(ctx.params.token);
 		return {};
-	});
-	r.get("/_synapse/admin/v1/audit_log", async (ctx) => {
+	} }));
+	r.get("/_synapse/admin/v1/audit_log", procedure({ handler: async (ctx) => {
 		await requireAdmin(ctx);
 		if (!ctx.hs.audit.enabled) throw errors.unrecognized("The audit log is disabled");
 		const rows = await ctx.hs.audit.query({
@@ -169,8 +190,8 @@ function registerAdminRoutes(r) {
 		const out = { entries: rows };
 		if (rows.length) out.next_token = String(rows[rows.length - 1].id);
 		return out;
-	});
-	r.get("/_synapse/admin/v1/event_reports", async (ctx) => {
+	} }));
+	r.get("/_synapse/admin/v1/event_reports", procedure({ handler: async (ctx) => {
 		await requireAdmin(ctx);
 		const rows = await ctx.hs.db.findMany("event_reports", {
 			sortBy: {
@@ -192,16 +213,16 @@ function registerAdminRoutes(r) {
 			})),
 			total: rows.length
 		};
-	});
-	r.post("/_synapse/admin/v1/event_reports/:id/resolve", async (ctx) => {
+	} }));
+	r.post("/_synapse/admin/v1/event_reports/:id/resolve", procedure({ handler: async (ctx) => {
 		await requireAdmin(ctx);
 		if (!await ctx.hs.db.update("event_reports", [{
 			field: "id",
 			value: Number(ctx.params.id)
 		}], { resolved: true })) throw errors.notFound("Unknown report");
 		return {};
-	});
-	r.get("/_synapse/admin/v1/rooms", async (ctx) => {
+	} }));
+	r.get("/_synapse/admin/v1/rooms", procedure({ handler: async (ctx) => {
 		await requireAdmin(ctx);
 		const res = await ctx.hs.admin.listRooms({
 			from: Number(ctx.query.get("from") ?? 0) || 0,
@@ -211,8 +232,8 @@ function registerAdminRoutes(r) {
 			rooms: res.rooms,
 			total_rooms: res.total
 		};
-	});
-	r.delete("/_synapse/admin/v1/rooms/:roomId", async (ctx) => {
+	} }));
+	r.delete("/_synapse/admin/v1/rooms/:roomId", procedure({ handler: async (ctx) => {
 		const s = await requireAdmin(ctx);
 		const body = await ctx.json();
 		const { kicked } = await ctx.hs.admin.deleteRoom(ctx.params.roomId, {
@@ -226,8 +247,8 @@ function registerAdminRoutes(r) {
 			local_aliases: [],
 			new_room_id: null
 		};
-	});
-	r.delete("/_synapse/admin/v1/media/:serverName/:mediaId", async (ctx) => {
+	} }));
+	r.delete("/_synapse/admin/v1/media/:serverName/:mediaId", procedure({ handler: async (ctx) => {
 		await requireAdmin(ctx);
 		if (ctx.params.serverName !== ctx.hs.serverName) throw errors.notFound("Remote media");
 		await ctx.hs.admin.deleteMedia(ctx.params.mediaId);
@@ -235,8 +256,8 @@ function registerAdminRoutes(r) {
 			deleted_media: [ctx.params.mediaId],
 			total: 1
 		};
-	});
-	r.post("/_synapse/admin/v1/media/delete", async (ctx) => {
+	} }));
+	r.post("/_synapse/admin/v1/media/delete", procedure({ handler: async (ctx) => {
 		await requireAdmin(ctx);
 		const before = Number(ctx.query.get("before_ts"));
 		if (!Number.isFinite(before)) throw errors.missingParam("Missing before_ts");
@@ -245,7 +266,7 @@ function registerAdminRoutes(r) {
 			deleted_media: deleted,
 			total: deleted.length
 		};
-	});
+	} }));
 }
 //#endregion
 export { registerAdminRoutes };

package/dist/api/appservice.js

@@ -1,32 +1,44 @@
 import { errors } from "../core/errors.js";
+import { procedure } from "../http/procedure.js";
 //#region src/api/appservice.ts
 function registerAppServiceRoutes(r) {
-	r.client("POST", "/appservice/:appserviceId/ping", async (ctx) => {
-		const s = await ctx.auth();
-		if (!s.appservice) throw errors.forbidden("An application service token is required");
-		if (s.appservice.id !== ctx.params.appserviceId) throw errors.forbidden("Token does not belong to this application service");
-		const body = await ctx.json();
-		return { duration_ms: await ctx.hs.appservices.ping(s.appservice, typeof body.transaction_id === "string" ? body.transaction_id : void 0) };
-	}, ["v1"]);
-	r.client("GET", "/thirdparty/protocols", async (ctx) => {
-		await ctx.auth();
-		return ctx.hs.appservices.protocols();
-	});
-	r.client("GET", "/thirdparty/protocol/:protocol", async (ctx) => {
-		await ctx.auth();
-		const p = (await ctx.hs.appservices.protocols())[ctx.params.protocol];
-		if (!p) throw errors.notFound("Unknown protocol");
-		return p;
-	});
+	r.client("POST", "/appservice/:appserviceId/ping", procedure({
+		auth: "user",
+		handler: async (ctx) => {
+			const s = ctx.session;
+			if (!s.appservice) throw errors.forbidden("An application service token is required");
+			if (s.appservice.id !== ctx.params.appserviceId) throw errors.forbidden("Token does not belong to this application service");
+			const body = await ctx.json();
+			return { duration_ms: await ctx.hs.appservices.ping(s.appservice, typeof body.transaction_id === "string" ? body.transaction_id : void 0) };
+		}
+	}), ["v1"]);
+	r.client("GET", "/thirdparty/protocols", procedure({
+		auth: "user",
+		handler: async (ctx) => {
+			return ctx.hs.appservices.protocols();
+		}
+	}));
+	r.client("GET", "/thirdparty/protocol/:protocol", procedure({
+		auth: "user",
+		handler: async (ctx) => {
+			const p = (await ctx.hs.appservices.protocols())[ctx.params.protocol];
+			if (!p) throw errors.notFound("Unknown protocol");
+			return p;
+		}
+	}));
 	for (const kind of ["location", "user"]) {
-		r.client("GET", `/thirdparty/${kind}/:protocol`, async (ctx) => {
-			await ctx.auth();
-			return ctx.hs.appservices.thirdParty(`${kind}/${encodeURIComponent(ctx.params.protocol)}`, ctx.query);
-		});
-		r.client("GET", `/thirdparty/${kind}`, async (ctx) => {
-			await ctx.auth();
-			return ctx.hs.appservices.thirdParty(kind, ctx.query);
-		});
+		r.client("GET", `/thirdparty/${kind}/:protocol`, procedure({
+			auth: "user",
+			handler: async (ctx) => {
+				return ctx.hs.appservices.thirdParty(`${kind}/${encodeURIComponent(ctx.params.protocol)}`, ctx.query);
+			}
+		}));
+		r.client("GET", `/thirdparty/${kind}`, procedure({
+			auth: "user",
+			handler: async (ctx) => {
+				return ctx.hs.appservices.thirdParty(kind, ctx.query);
+			}
+		}));
 	}
 }
 //#endregion

package/dist/api/backup.js

@@ -1,12 +1,13 @@
 import { isObject } from "../core/json.js";
 import { MatrixError, errors } from "../core/errors.js";
+import { looseObject, string } from "../vendor/zod/v4/classic/schemas.js";
 import { body, fail } from "../http/input.js";
-import { z } from "zod";
+import { procedure } from "../http/procedure.js";
 //#region src/api/backup.ts
 const required = fail("M_BAD_JSON", "algorithm and auth_data are required");
 const createVersionBody = body({
-	algorithm: z.string(required),
-	auth_data: z.looseObject({}, required)
+	algorithm: string(required),
+	auth_data: looseObject({}, required)
 });
 /** Server-side room key backups (`/room_keys`). */
 async function latestVersion(hs, userId) {
@@ -74,68 +75,78 @@ async function requireCurrentVersion(ctx, userId) {
 	};
 }
 function registerBackupRoutes(r) {
-	r.client("POST", "/room_keys/version", { input: createVersionBody }, async (ctx) => {
-		const s = await ctx.auth();
-		const body = ctx.input;
-		const max = (await ctx.hs.db.findMany("backup_versions", { where: [{
-			field: "user_id",
-			value: s.userId
-		}] })).reduce((m, v) => Math.max(m, v.version), 0);
-		await ctx.hs.db.create("backup_versions", {
-			user_id: s.userId,
-			version: max + 1,
-			algorithm: body.algorithm,
-			auth_data: body.auth_data,
-			etag: 0,
-			deleted: false
-		});
-		return { version: String(max + 1) };
-	});
+	r.client("POST", "/room_keys/version", procedure({
+		auth: "user",
+		input: createVersionBody,
+		handler: async (ctx) => {
+			const s = ctx.session;
+			const body = ctx.input;
+			const max = (await ctx.hs.db.findMany("backup_versions", { where: [{
+				field: "user_id",
+				value: s.userId
+			}] })).reduce((m, v) => Math.max(m, v.version), 0);
+			await ctx.hs.db.create("backup_versions", {
+				user_id: s.userId,
+				version: max + 1,
+				algorithm: body.algorithm,
+				auth_data: body.auth_data,
+				etag: 0,
+				deleted: false
+			});
+			return { version: String(max + 1) };
+		}
+	}));
 	const getVersionHandler = async (ctx) => {
 		const s = await ctx.auth();
 		const row = await getVersion(ctx.hs, s.userId, ctx.params.version ?? null);
 		if (!row) throw errors.notFound("No backup found");
 		return describe(ctx.hs, row);
 	};
-	r.client("GET", "/room_keys/version", getVersionHandler);
-	r.client("GET", "/room_keys/version/:version", getVersionHandler);
-	r.client("PUT", "/room_keys/version/:version", async (ctx) => {
-		const s = await ctx.auth();
-		const body = await ctx.json();
-		const row = await getVersion(ctx.hs, s.userId, ctx.params.version);
-		if (!row) throw errors.notFound("Unknown backup version");
-		if (body.version !== void 0 && String(body.version) !== ctx.params.version) throw errors.invalidParam("Version mismatch");
-		if (body.algorithm !== row.algorithm) throw errors.invalidParam("Algorithm cannot be changed");
-		if (!isObject(body.auth_data)) throw errors.badJson("auth_data is required");
-		await ctx.hs.db.update("backup_versions", [{
-			field: "user_id",
-			value: s.userId
-		}, {
-			field: "version",
-			value: row.version
-		}], { auth_data: body.auth_data });
-		return {};
-	});
-	r.client("DELETE", "/room_keys/version/:version", async (ctx) => {
-		const s = await ctx.auth();
-		const row = await getVersion(ctx.hs, s.userId, ctx.params.version);
-		if (!row) throw errors.notFound("Unknown backup version");
-		await ctx.hs.db.update("backup_versions", [{
-			field: "user_id",
-			value: s.userId
-		}, {
-			field: "version",
-			value: row.version
-		}], { deleted: true });
-		await ctx.hs.db.delete("backup_keys", [{
-			field: "user_id",
-			value: s.userId
-		}, {
-			field: "version",
-			value: row.version
-		}]);
-		return {};
-	});
+	r.client("GET", "/room_keys/version", procedure({ handler: getVersionHandler }));
+	r.client("GET", "/room_keys/version/:version", procedure({ handler: getVersionHandler }));
+	r.client("PUT", "/room_keys/version/:version", procedure({
+		auth: "user",
+		handler: async (ctx) => {
+			const s = ctx.session;
+			const body = await ctx.json();
+			const row = await getVersion(ctx.hs, s.userId, ctx.params.version);
+			if (!row) throw errors.notFound("Unknown backup version");
+			if (body.version !== void 0 && String(body.version) !== ctx.params.version) throw errors.invalidParam("Version mismatch");
+			if (body.algorithm !== row.algorithm) throw errors.invalidParam("Algorithm cannot be changed");
+			if (!isObject(body.auth_data)) throw errors.badJson("auth_data is required");
+			await ctx.hs.db.update("backup_versions", [{
+				field: "user_id",
+				value: s.userId
+			}, {
+				field: "version",
+				value: row.version
+			}], { auth_data: body.auth_data });
+			return {};
+		}
+	}));
+	r.client("DELETE", "/room_keys/version/:version", procedure({
+		auth: "user",
+		handler: async (ctx) => {
+			const s = ctx.session;
+			const row = await getVersion(ctx.hs, s.userId, ctx.params.version);
+			if (!row) throw errors.notFound("Unknown backup version");
+			await ctx.hs.db.update("backup_versions", [{
+				field: "user_id",
+				value: s.userId
+			}, {
+				field: "version",
+				value: row.version
+			}], { deleted: true });
+			await ctx.hs.db.delete("backup_keys", [{
+				field: "user_id",
+				value: s.userId
+			}, {
+				field: "version",
+				value: row.version
+			}]);
+			return {};
+		}
+	}));
 	const putKeys = async (ctx) => {
 		const s = await ctx.auth();
 		const hs = ctx.hs;
@@ -260,9 +271,9 @@ function registerBackupRoutes(r) {
 		"/room_keys/keys/:roomId",
 		"/room_keys/keys/:roomId/:sessionId"
 	]) {
-		r.client("PUT", path, putKeys);
-		r.client("GET", path, getKeys);
-		r.client("DELETE", path, deleteKeys);
+		r.client("PUT", path, procedure({ handler: putKeys }));
+		r.client("GET", path, procedure({ handler: getKeys }));
+		r.client("DELETE", path, procedure({ handler: deleteKeys }));
 	}
 }
 //#endregion