matrix-nodejs-homeserver 0.2.0 → 0.3.2

package/dist/core/push.js

@@ -1,4 +1,5 @@
 import { isObject } from "./json.js";
+import { M, UNSTABLE } from "./m.js";
 import { splitStateKey, toClientEvent } from "./events.js";
 import { getState, powerLevels, userLevel } from "./authrules.js";
 import { globMatch, globSearchWords } from "./glob.js";
@@ -47,7 +48,7 @@ function conditionMatches(cond, ctx) {
 			}
 			return false;
 		}
-		case "io.element.msc4306.thread_subscription": return ctx.threadSubscribed !== void 0 && ctx.threadSubscribed !== null && ctx.threadSubscribed === cond.subscribed;
+		case UNSTABLE.IO.ELEMENT.MSC4306.THREAD_SUBSCRIPTION: return ctx.threadSubscribed !== void 0 && ctx.threadSubscribed !== null && ctx.threadSubscribed === cond.subscribed;
 		case "sender_notification_permission": return typeof cond.key === "string" && ctx.senderLevel >= (ctx.notificationLevels[cond.key] ?? 50);
 		default: return false;
 	}
@@ -80,8 +81,8 @@ function tweaksOf(actions) {
 }
 /** Thread an event belongs to for notification purposes ("main" for the main timeline). */
 function threadIdOf(event) {
-	const rel = event.content?.["m.relates_to"];
-	return isObject(rel) && rel.rel_type === "m.thread" && typeof rel.event_id === "string" ? rel.event_id : "main";
+	const rel = event.content?.[M.RELATES_TO];
+	return isObject(rel) && rel.rel_type === M.THREAD && typeof rel.event_id === "string" ? rel.event_id : "main";
 }
 /**
 * Push rule evaluation and push gateway delivery. Every new event is evaluated for
@@ -97,20 +98,21 @@ var PushService = class {
 		const members = [];
 		for (const [key, member] of state) {
 			const [type, userId] = splitStateKey(key);
-			if (type !== "m.room.member") continue;
+			if (type !== M.ROOM.MEMBER) continue;
 			const m = member.content?.membership;
-			if (m === "join" || m === "invite" && event.type === "m.room.member" && event.state_key === userId) members.push(userId);
+			if (m === "join" || m === "invite" && event.type === M.ROOM.MEMBER && event.state_key === userId) members.push(userId);
 		}
-		const joined = members.filter((u) => getState(state, "m.room.member", u)?.content?.membership === "join");
+		const joined = members.filter((u) => getState(state, M.ROOM.MEMBER, u)?.content?.membership === "join");
 		const pl = powerLevels(state, version);
 		const senderLevel = userLevel(pl, event.sender);
 		const thread = threadIdOf(event);
+		const notified = [];
 		for (const userId of members) {
 			if (userId === event.sender || !this.hs.isLocalUser(userId)) continue;
 			const actions = evaluateRules(await loadRules(this.hs, userId), {
 				event,
 				userId,
-				displayName: getState(state, "m.room.member", userId)?.content?.displayname ?? null,
+				displayName: getState(state, M.ROOM.MEMBER, userId)?.content?.displayname ?? null,
 				memberCount: joined.length,
 				senderLevel: Number.isFinite(senderLevel) ? senderLevel : Number.MAX_SAFE_INTEGER,
 				notificationLevels: pl.notifications,
@@ -118,17 +120,33 @@ var PushService = class {
 			});
 			if (!actions || !actions.includes("notify")) continue;
 			const tweaks = tweaksOf(actions);
-			await this.hs.db.upsert("notifications", {
-				user_id: userId,
-				room_id: event.room_id,
-				event_id: event.event_id,
-				stream: ev.stream,
-				highlight: tweaks.highlight === true,
-				thread_id: threadIdOf(event),
-				actions,
-				ts: Date.now()
+			notified.push({
+				userId,
+				tweaks,
+				row: {
+					user_id: userId,
+					room_id: event.room_id,
+					event_id: event.event_id,
+					stream: ev.stream,
+					highlight: tweaks.highlight === true,
+					thread_id: thread,
+					actions,
+					ts: Date.now()
+				}
 			});
-			this.deliver(userId, ev, state, tweaks).catch((err) => this.hs.logger.warn("Push delivery failed", err));
+		}
+		if (notified.length === 0) return;
+		await this.hs.transaction(async (db) => {
+			for (const n of notified) await db.upsert("notifications", n.row);
+		});
+		const pushers = await this.hs.db.findMany("pushers", { where: [{
+			field: "user_id",
+			operator: "in",
+			value: notified.map((n) => n.userId)
+		}] });
+		for (const n of notified) {
+			const own = pushers.filter((p) => p.user_id === n.userId);
+			if (own.length) this.deliver(n.userId, ev, state, n.tweaks, own).catch((err) => this.hs.logger.warn("Push delivery failed", err));
 		}
 	}
 	/** Unread notification counts since the user's read receipts. */
@@ -144,7 +162,7 @@ var PushService = class {
 		let unthreaded = 0;
 		const threadRead = /* @__PURE__ */ new Map();
 		for (const r of receipts) {
-			if (r.receipt_type !== "m.read" && r.receipt_type !== "m.read.private") continue;
+			if (r.receipt_type !== M.READ._ && r.receipt_type !== M.READ.PRIVATE) continue;
 			const target = await this.hs.rooms.getEvent(r.event_id);
 			if (!target) continue;
 			if (r.thread_id === "") unthreaded = Math.max(unthreaded, target.stream);
@@ -195,12 +213,7 @@ var PushService = class {
 			threads
 		};
 	}
-	async deliver(userId, ev, state, tweaks) {
-		const pushers = await this.hs.db.findMany("pushers", { where: [{
-			field: "user_id",
-			value: userId
-		}] });
-		if (pushers.length === 0) return;
+	async deliver(userId, ev, state, tweaks, pushers) {
 		const event = ev.pdu;
 		const unread = (await this.unreadCounts(userId, event.room_id)).room.notification_count;
 		for (const row of pushers) {
@@ -224,16 +237,16 @@ var PushService = class {
 				notification.type = event.type;
 				notification.sender = event.sender;
 				notification.content = event.content;
-				const name = getState(state, "m.room.name")?.content?.name;
+				const name = getState(state, M.ROOM.NAME)?.content?.name;
 				if (typeof name === "string") notification.room_name = name;
-				const senderName = getState(state, "m.room.member", event.sender)?.content?.displayname;
+				const senderName = getState(state, M.ROOM.MEMBER, event.sender)?.content?.displayname;
 				if (typeof senderName === "string") notification.sender_display_name = senderName;
-				if (event.type === "m.room.member") {
+				if (event.type === M.ROOM.MEMBER) {
 					notification.membership = event.content?.membership;
 					notification.user_is_target = event.state_key === userId;
 				}
 			}
-			const res = await this.hs.fetch(url, {
+			const res = await this.hs.publicFetch(url, {
 				method: "POST",
 				headers: { "content-type": "application/json" },
 				body: JSON.stringify({ notification }),

package/dist/core/pushrules.js

@@ -1,4 +1,5 @@
 import { isObject } from "./json.js";
+import { M, UNSTABLE } from "./m.js";
 //#region src/core/pushrules.ts
 const KINDS = [
 	"override",
@@ -36,15 +37,15 @@ function defaultRules(userId) {
 	});
 	return {
 		override: [
-			r(".m.rule.master", [], [], { enabled: false }),
-			r(".m.rule.suppress_notices", [em("content.msgtype", "m.notice")], []),
-			r(".m.rule.invite_for_me", [
-				em("type", "m.room.member"),
+			r(M.RULE.MASTER, [], [], { enabled: false }),
+			r(M.RULE.SUPPRESS_NOTICES, [em("content.msgtype", M.NOTICE)], []),
+			r(M.RULE.INVITE_FOR_ME, [
+				em("type", M.ROOM.MEMBER),
 				em("content.membership", "invite"),
 				em("state_key", userId)
 			], [...notify, sound("default")]),
-			r(".m.rule.member_event", [em("type", "m.room.member")], []),
-			r(".m.rule.is_user_mention", [{
+			r(M.RULE.MEMBER_EVENT, [em("type", M.ROOM.MEMBER)], []),
+			r(M.RULE.IS_USER_MENTION, [{
 				kind: "event_property_contains",
 				key: "content.m\\.mentions.user_ids",
 				value: userId
@@ -53,61 +54,61 @@ function defaultRules(userId) {
 				sound("default"),
 				highlight
 			]),
-			r(".m.rule.contains_display_name", [{ kind: "contains_display_name" }], [
+			r(M.RULE.CONTAINS_DISPLAY_NAME, [{ kind: "contains_display_name" }], [
 				...notify,
 				sound("default"),
 				highlight
 			]),
-			r(".m.rule.is_room_mention", [ep("content.m\\.mentions.room", true), {
+			r(M.RULE.IS_ROOM_MENTION, [ep("content.m\\.mentions.room", true), {
 				kind: "sender_notification_permission",
 				key: "room"
 			}], [...notify, highlight]),
-			r(".m.rule.roomnotif", [em("content.body", "@room"), {
+			r(M.RULE.ROOMNOTIF, [em("content.body", "@room"), {
 				kind: "sender_notification_permission",
 				key: "room"
 			}], [...notify, highlight]),
-			r(".m.rule.tombstone", [em("type", "m.room.tombstone"), em("state_key", "")], [...notify, highlight]),
-			r(".m.rule.reaction", [em("type", "m.reaction")], []),
-			r(".m.rule.room.server_acl", [em("type", "m.room.server_acl"), em("state_key", "")], []),
-			r(".m.rule.suppress_edits", [ep("content.m\\.relates_to.rel_type", "m.replace")], []),
-			r(".org.matrix.msc3930.rule.poll_response", [em("type", "org.matrix.msc3381.poll.response")], [])
+			r(M.RULE.TOMBSTONE, [em("type", M.ROOM.TOMBSTONE), em("state_key", "")], [...notify, highlight]),
+			r(M.RULE.REACTION, [em("type", M.REACTION)], []),
+			r(M.RULE.ROOM.SERVER_ACL, [em("type", M.ROOM.SERVER_ACL), em("state_key", "")], []),
+			r(M.RULE.SUPPRESS_EDITS, [ep("content.m\\.relates_to.rel_type", M.REPLACE)], []),
+			r(UNSTABLE.ORG.MATRIX.MSC3930.RULE.POLL_RESPONSE, [em("type", UNSTABLE.ORG.MATRIX.MSC3381.POLL.RESPONSE)], [])
 		],
-		content: [r(".m.rule.contains_user_name", void 0, [
+		content: [r(M.RULE.CONTAINS_USER_NAME, void 0, [
 			...notify,
 			sound("default"),
 			highlight
 		], { pattern: localpart })],
-		postcontent: [r(".io.element.msc4306.rule.unsubscribed_thread", [{
-			kind: "io.element.msc4306.thread_subscription",
+		postcontent: [r(UNSTABLE.IO.ELEMENT.MSC4306.RULE.UNSUBSCRIBED_THREAD, [{
+			kind: UNSTABLE.IO.ELEMENT.MSC4306.THREAD_SUBSCRIPTION,
 			subscribed: false
-		}], []), r(".io.element.msc4306.rule.subscribed_thread", [{
-			kind: "io.element.msc4306.thread_subscription",
+		}], []), r(UNSTABLE.IO.ELEMENT.MSC4306.RULE.SUBSCRIBED_THREAD, [{
+			kind: UNSTABLE.IO.ELEMENT.MSC4306.THREAD_SUBSCRIPTION,
 			subscribed: true
 		}], [...notify, sound("default")])],
 		room: [],
 		sender: [],
 		underride: [
-			r(".m.rule.call", [em("type", "m.call.invite")], [...notify, sound("ring")]),
-			r(".m.rule.encrypted_room_one_to_one", [{
+			r(M.RULE.CALL, [em("type", M.CALL.INVITE)], [...notify, sound("ring")]),
+			r(M.RULE.ENCRYPTED_ROOM_ONE_TO_ONE, [{
 				kind: "room_member_count",
 				is: "2"
-			}, em("type", "m.room.encrypted")], [...notify, sound("default")]),
-			r(".m.rule.room_one_to_one", [{
+			}, em("type", M.ROOM.ENCRYPTED)], [...notify, sound("default")]),
+			r(M.RULE.ROOM_ONE_TO_ONE, [{
 				kind: "room_member_count",
 				is: "2"
-			}, em("type", "m.room.message")], [...notify, sound("default")]),
-			r(".m.rule.message", [em("type", "m.room.message")], notify),
-			r(".org.matrix.msc3930.rule.poll_start_one_to_one", [{
+			}, em("type", M.ROOM.MESSAGE)], [...notify, sound("default")]),
+			r(M.RULE.MESSAGE, [em("type", M.ROOM.MESSAGE)], notify),
+			r(UNSTABLE.ORG.MATRIX.MSC3930.RULE.POLL_START_ONE_TO_ONE, [{
 				kind: "room_member_count",
 				is: "2"
-			}, em("type", "org.matrix.msc3381.poll.start")], [...notify, sound("default")]),
-			r(".org.matrix.msc3930.rule.poll_end_one_to_one", [{
+			}, em("type", UNSTABLE.ORG.MATRIX.MSC3381.POLL.START)], [...notify, sound("default")]),
+			r(UNSTABLE.ORG.MATRIX.MSC3930.RULE.POLL_END_ONE_TO_ONE, [{
 				kind: "room_member_count",
 				is: "2"
-			}, em("type", "org.matrix.msc3381.poll.end")], [...notify, sound("default")]),
-			r(".org.matrix.msc3930.rule.poll_start", [em("type", "org.matrix.msc3381.poll.start")], notify),
-			r(".org.matrix.msc3930.rule.poll_end", [em("type", "org.matrix.msc3381.poll.end")], notify),
-			r(".m.rule.encrypted", [em("type", "m.room.encrypted")], notify)
+			}, em("type", UNSTABLE.ORG.MATRIX.MSC3381.POLL.END)], [...notify, sound("default")]),
+			r(UNSTABLE.ORG.MATRIX.MSC3930.RULE.POLL_START, [em("type", UNSTABLE.ORG.MATRIX.MSC3381.POLL.START)], notify),
+			r(UNSTABLE.ORG.MATRIX.MSC3930.RULE.POLL_END, [em("type", UNSTABLE.ORG.MATRIX.MSC3381.POLL.END)], notify),
+			r(M.RULE.ENCRYPTED, [em("type", M.ROOM.ENCRYPTED)], notify)
 		]
 	};
 }
@@ -151,7 +152,7 @@ async function readRules(hs, userId) {
 		},
 		{
 			field: "type",
-			value: "m.push_rules"
+			value: M.PUSH_RULES
 		}
 	]);
 	if (!isObject(row?.content?.global)) return defaultRules(userId);
@@ -169,7 +170,7 @@ async function saveRules(hs, userId, rules) {
 	await hs.streams.write((stream) => hs.db.upsert("account_data", {
 		user_id: userId,
 		room_id: "",
-		type: "m.push_rules",
+		type: M.PUSH_RULES,
 		content: { global: rules },
 		stream
 	}));
@@ -191,7 +192,7 @@ async function copyRules(hs, userId, oldRoomId, newRoomId) {
 		},
 		{
 			field: "type",
-			value: "m.push_rules"
+			value: M.PUSH_RULES
 		}
 	]);
 	if (!isObject(row?.content?.global)) return;

package/dist/core/ratelimit.d.ts

@@ -1,5 +1,5 @@
 //#region src/core/ratelimit.d.ts
-/** A rate limiter keyed by an arbitrary string. Implement this to share limits across instances (e.g. Redis). */
+/** A rate limiter keyed by an arbitrary string. Implement this to share limits across instances. */
 export interface RateLimiter {
   /** Consume one unit for `key` under `rule`; resolve with the delay to wait (0 when allowed). */
   consume(key: string, rule: RateLimitRule): Promise<number>;

package/dist/core/rooms.d.ts

@@ -1,7 +1,7 @@
 import { ClientEvent, PDU } from "./events.js";
 import { StateMap } from "./authrules.js";
-import { StateIds } from "./stateres.js";
 import { Row } from "../storage/types.js";
+import { StateIds } from "./stateres.js";
 import { Homeserver } from "../homeserver.js";
 //#region src/core/rooms.d.ts
 export interface StoredEvent {
@@ -140,6 +140,15 @@ export declare class RoomService {
   /** Users that should be woken up for events in this room. */
   private interestedUsers;
   roomsForUser(userId: string, membership?: string): Promise<string[]>;
+  /**
+   * 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.
+   */
+  membershipChangesSince(userId: string, since: number, mine?: Row[]): Promise<Row[]>;
   /** All users sharing at least one joined room with `userId` (including themselves). */
   usersSharingRooms(userId: string): Promise<Set<string>>;
   private prepareRedaction;