From a72e99265d2b97b4a00bf6aab92ea2966f079427 Mon Sep 17 00:00:00 2001 From: Ian Calvert Date: Tue, 23 Dec 2025 20:53:26 +0000 Subject: [PATCH 01/14] Don't link to staging --- .../506ef767-d8be-4c19-afc8-f03318602cb5.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/packages/catalog-realm/SystemCard/506ef767-d8be-4c19-afc8-f03318602cb5.json b/packages/catalog-realm/SystemCard/506ef767-d8be-4c19-afc8-f03318602cb5.json index c7ffa956d1c..a6730819317 100644 --- a/packages/catalog-realm/SystemCard/506ef767-d8be-4c19-afc8-f03318602cb5.json +++ b/packages/catalog-realm/SystemCard/506ef767-d8be-4c19-afc8-f03318602cb5.json @@ -26,16 +26,6 @@ "self": "../RecommendedModel/37533a45-5b7a-4cfd-a169-a46976e155be" } }, - "modelConfigurations.1": { - "links": { - "self": "https://realms-staging.stack.cards/catalog/ModelConfiguration/anthropic-claude-haiku-45" - } - }, - "modelConfigurations.2": { - "links": { - "self": "https://realms-staging.stack.cards/ctse/personal/ModelConfiguration/08dfc745-4e5c-4be7-b1ba-a7ba56ebd4e3" - } - }, "defaultModelConfiguration": { "links": { "self": null @@ -43,4 +33,4 @@ } } } -} \ No newline at end of file +} From fd6228f5ecb7d9c0339bc2f1ba14096625a611b9 Mon Sep 17 00:00:00 2001 From: Ian Calvert Date: Tue, 23 Dec 2025 20:54:00 +0000 Subject: [PATCH 02/14] Simplify setup to require a single session room for all comms --- packages/host/app/services/matrix-service.ts | 13 +++--- packages/matrix/helpers/index.ts | 30 ------------- ...1000_add-realm-user-id-to-session-rooms.js | 9 ++++ .../handlers/handle-create-session.ts | 14 +++++-- .../handlers/handle-realm-auth.ts | 6 +++ packages/realm-server/main.ts | 8 ++-- packages/realm-server/node-realm.ts | 21 ++++++++-- packages/realm-server/server.ts | 33 ++------------- .../db-queries/session-room-queries.ts | 37 ++++++++++++---- packages/runtime-common/realm.ts | 42 +++++++++---------- 10 files changed, 109 insertions(+), 104 deletions(-) create mode 100644 packages/postgres/migrations/1766509131000_add-realm-user-id-to-session-rooms.js diff --git a/packages/host/app/services/matrix-service.ts b/packages/host/app/services/matrix-service.ts index d1cbaeb1122..d05ade6ddb7 100644 --- a/packages/host/app/services/matrix-service.ts +++ b/packages/host/app/services/matrix-service.ts @@ -1810,6 +1810,7 @@ export default class MatrixService extends Service { event.type === 'm.room.message' && event.content?.msgtype === APP_BOXEL_REALM_SERVER_EVENT_MSGTYPE ) { + console.log('Received realm server event', event); await this.realmServer.handleEvent(event); } else if ( event.type === APP_BOXEL_REALM_EVENT_TYPE && @@ -1831,14 +1832,16 @@ export default class MatrixService extends Service { let realmResourceForEvent = this.realm.realmForSessionRoomId( event.room_id!, ); + console.log('Trying to figure out realm for event', { + event, + realmResourceForEvent, + }); if (!realmResourceForEvent) { - realmEventsLogger.debug( - 'Ignoring realm event because no realm found', - event, - ); + console.log('Ignoring realm event because no realm found', event); } else { + // TODO: CHECK THAT THE SENDER IS THE REALM SERVER? if (realmResourceForEvent.info?.realmUserId !== event.sender) { - realmEventsLogger.warn( + console.log( `Realm event sender ${event.sender} is not the realm user ${realmResourceForEvent.info?.realmUserId}`, event, ); diff --git a/packages/matrix/helpers/index.ts b/packages/matrix/helpers/index.ts index 39a1eb22d7b..4e6edfa4e7c 100644 --- a/packages/matrix/helpers/index.ts +++ b/packages/matrix/helpers/index.ts @@ -120,36 +120,6 @@ export async function setRealmRedirects(page: Page) { } export async function registerRealmUsers(synapse: SynapseInstance) { - await registerUser( - synapse, - 'base_realm', - await realmPassword('base_realm', realmSecretSeed), - ); - await registerUser( - synapse, - 'experiments_realm', - await realmPassword('experiments_realm', realmSecretSeed), - ); - await registerUser( - synapse, - 'catalog_realm', - await realmPassword('catalog_realm', realmSecretSeed), - ); - await registerUser( - synapse, - 'skills_realm', - await realmPassword('skills_realm', realmSecretSeed), - ); - await registerUser( - synapse, - 'test_realm', - await realmPassword('test_realm', realmSecretSeed), - ); - await registerUser( - synapse, - 'node-test_realm', - await realmPassword('node-test_realm', realmSecretSeed), - ); await registerUser( synapse, 'realm_server', diff --git a/packages/postgres/migrations/1766509131000_add-realm-user-id-to-session-rooms.js b/packages/postgres/migrations/1766509131000_add-realm-user-id-to-session-rooms.js new file mode 100644 index 00000000000..f28057745f5 --- /dev/null +++ b/packages/postgres/migrations/1766509131000_add-realm-user-id-to-session-rooms.js @@ -0,0 +1,9 @@ +exports.up = (pgm) => { + pgm.addColumns('session_rooms', { + realm_user_id: { type: 'varchar' }, + }); +}; + +exports.down = (pgm) => { + pgm.dropColumns('session_rooms', ['realm_user_id']); +}; diff --git a/packages/realm-server/handlers/handle-create-session.ts b/packages/realm-server/handlers/handle-create-session.ts index 8bd1c49d879..b95efe051bd 100644 --- a/packages/realm-server/handlers/handle-create-session.ts +++ b/packages/realm-server/handlers/handle-create-session.ts @@ -1,7 +1,6 @@ import { fetchSessionRoom, logger, - REALM_SERVER_REALM, SupportedMimeType, upsertSessionRoom, } from '@cardstack/runtime-common'; @@ -42,17 +41,26 @@ export default function handleCreateSessionRequest({ createJWT: async (user: string, sessionRoom: string) => createJWT({ user, sessionRoom }, realmSecretSeed), ensureSessionRoom: async (userId: string) => { + const realmServerUserId = matrixClient.getUserId(); + if (!realmServerUserId) { + throw new Error( + 'Realm server Matrix user ID is not available, unable to create session room', + ); + } + console.log('Realm server user ID:', realmServerUserId); let sessionRoom = await fetchSessionRoom( dbAdapter, - REALM_SERVER_REALM, + realmServerUserId, userId, ); + console.log('Fetched session room from DB:', sessionRoom); if (!sessionRoom) { + console.log('No session room???', userId); sessionRoom = await matrixClient.createDM(userId); await upsertSessionRoom( dbAdapter, - REALM_SERVER_REALM, + realmServerUserId, userId, sessionRoom, ); diff --git a/packages/realm-server/handlers/handle-realm-auth.ts b/packages/realm-server/handlers/handle-realm-auth.ts index 1e70c1c3b18..0708d531202 100644 --- a/packages/realm-server/handlers/handle-realm-auth.ts +++ b/packages/realm-server/handlers/handle-realm-auth.ts @@ -50,6 +50,12 @@ export default function handleRealmAuth({ } try { + console.log( + 'Realm auth creating session for realm:', + realmUrl, + 'and user:', + matrixUserId, + ); let sessionRoom = await realm.ensureSessionRoom(matrixUserId); sessions[realmUrl] = createJWT( { diff --git a/packages/realm-server/main.ts b/packages/realm-server/main.ts index 843ce85d027..a299cdeaae8 100644 --- a/packages/realm-server/main.ts +++ b/packages/realm-server/main.ts @@ -228,11 +228,12 @@ const getIndexHTML = async () => { await waitForWorkerManager(workerManagerPort); } - let realmServerMatrixClient = new MatrixClient({ + let matrixClient = new MatrixClient({ matrixURL: new URL(MATRIX_URL), username: REALM_SERVER_MATRIX_USERNAME, seed: REALM_SECRET_SEED, }); + await matrixClient.login(); let prerenderer = createRemotePrerenderer(prerendererUrl); let createPrerenderAuth = buildCreatePrerenderAuth(REALM_SECRET_SEED); @@ -261,12 +262,11 @@ const getIndexHTML = async () => { { url, adapter: realmAdapter, - matrix: { url: new URL(matrixURL), username }, secretSeed: REALM_SECRET_SEED, virtualNetwork, dbAdapter, queue, - realmServerMatrixClient, + matrixClient, definitionLookup, }, { @@ -304,7 +304,7 @@ const getIndexHTML = async () => { let server = new RealmServer({ realms, virtualNetwork, - matrixClient: realmServerMatrixClient, + matrixClient, realmsRootPath, realmServerSecretSeed: REALM_SERVER_SECRET_SEED, realmSecretSeed: REALM_SECRET_SEED, diff --git a/packages/realm-server/node-realm.ts b/packages/realm-server/node-realm.ts index 329b35e268b..3e9ea5d712b 100644 --- a/packages/realm-server/node-realm.ts +++ b/packages/realm-server/node-realm.ts @@ -234,7 +234,7 @@ export class NodeAdapter implements RealmAdapter { dbAdapter: DBAdapter, ): Promise { realmEventsLog.debug('Broadcasting realm event', event); - + let realmUserId; if (dbAdapter.isClosed) { realmEventsLog.warn( `Database adapter is closed, skipping sending realm event`, @@ -243,12 +243,25 @@ export class NodeAdapter implements RealmAdapter { } try { await matrixClient.login(); + realmUserId = matrixClient.getUserId(); + if (!realmUserId) { + realmEventsLog.error( + 'Matrix client has no user ID after login, unable to broadcast realm event', + event, + ); + return; + } } catch (e) { realmEventsLog.error('Error logging into matrix. Skipping broadcast', e); return; } - let dmRooms = await this.waitForSessionRooms(dbAdapter, realmUrl); + let dmRooms = await this.waitForSessionRooms( + dbAdapter, + realmUrl, + realmUserId, + ); + console.log('Dm rooms for realm: ', realmUrl, dmRooms); realmEventsLog.debug('Sending to dm rooms', Object.values(dmRooms)); @@ -269,6 +282,7 @@ export class NodeAdapter implements RealmAdapter { private async waitForSessionRooms( dbAdapter: DBAdapter, realmUrl: string, + realmUserId: string, attempts = 3, delayMs = 50, ): Promise> { @@ -278,7 +292,7 @@ export class NodeAdapter implements RealmAdapter { let dmRooms: Record = {}; try { - dmRooms = await fetchAllSessionRooms(dbAdapter, realmUrl); + dmRooms = await fetchAllSessionRooms(dbAdapter, realmUrl, realmUserId); } catch (e) { realmEventsLog.error('Error getting account data', e); return {}; // bail immediately on errors instead of retrying @@ -296,6 +310,7 @@ export class NodeAdapter implements RealmAdapter { return await this.waitForSessionRooms( dbAdapter, realmUrl, + realmUserId, attempts - 1, delayMs, ); diff --git a/packages/realm-server/server.ts b/packages/realm-server/server.ts index b1ca890654c..bc409dab8df 100644 --- a/packages/realm-server/server.ts +++ b/packages/realm-server/server.ts @@ -33,7 +33,6 @@ import { fetchRequestFromContext, methodOverrideSupport, } from './middleware'; -import { registerUser } from './synapse'; import convertAcceptHeaderQueryParam from './middleware/convert-accept-header-qp'; import convertAuthHeaderQueryParam from './middleware/convert-auth-header-qp'; import { NodeAdapter } from './node-realm'; @@ -44,10 +43,7 @@ import { extractSupportedMimeType } from '@cardstack/runtime-common/router'; import { any, type Expression } from '@cardstack/runtime-common/expression'; import * as Sentry from '@sentry/node'; import type { MatrixClient } from '@cardstack/runtime-common/matrix-client'; -import { - passwordFromSeed, - getMatrixUsername, -} from '@cardstack/runtime-common/matrix-client'; +import { getMatrixUsername } from '@cardstack/runtime-common/matrix-client'; import { createRoutes } from './routes'; import { APP_BOXEL_REALM_SERVER_EVENT_MSGTYPE } from '@cardstack/runtime-common/matrix-constants'; import type { Prerenderer } from '@cardstack/runtime-common'; @@ -536,18 +532,7 @@ export class RealmServer { let realmPath = resolve(join(this.realmsRootPath, ownerUsername, endpoint)); ensureDirSync(realmPath); - let username = `realm/${ownerUsername}_${endpoint}`; - let { userId } = await registerUser({ - matrixURL: this.matrixClient.matrixURL, - displayname: username, - username, - password: await passwordFromSeed(username, this.realmSecretSeed), - registrationSecret: await this.getMatrixRegistrationSecret(), - }); - this.log.debug(`created realm bot user '${userId}' for new realm ${url}`); - await insertPermissions(this.dbAdapter, new URL(url), { - [userId]: DEFAULT_PERMISSIONS, [ownerUserId]: DEFAULT_PERMISSIONS, }); @@ -573,12 +558,10 @@ export class RealmServer { let realm = this.createAndMountRealm( realmPath, url, - username, undefined, undefined, userInitiatedPriority, ); - await realm.ensureSessionRoom(ownerUserId); return { realm, @@ -589,7 +572,6 @@ export class RealmServer { private createAndMountRealm = ( path: string, url: string, - username: string, copiedFromRealm?: URL, enableFileWatcher?: boolean, fromScratchIndexPriority?: number, @@ -616,11 +598,7 @@ export class RealmServer { virtualNetwork: this.virtualNetwork, dbAdapter: this.dbAdapter, queue: this.queue, - matrix: { - url: new URL(this.matrixClient.matrixURL), - username, - }, - realmServerMatrixClient: this.matrixClient, + matrixClient: this.matrixClient, definitionLookup: this.definitionLookup, }, Object.keys(realmOptions).length ? realmOptions : undefined, @@ -676,7 +654,6 @@ export class RealmServer { continue; } let adapter = new NodeAdapter(realmPath, this.enableFileWatcher); - let username = `realm/${owner}_${realmName}`; let realm = new Realm({ url, adapter, @@ -684,11 +661,7 @@ export class RealmServer { virtualNetwork: this.virtualNetwork, dbAdapter: this.dbAdapter, queue: this.queue, - matrix: { - url: this.matrixClient.matrixURL, - username, - }, - realmServerMatrixClient: this.matrixClient, + matrixClient: this.matrixClient, definitionLookup: this.definitionLookup, }); this.virtualNetwork.mount(realm.handle); diff --git a/packages/runtime-common/db-queries/session-room-queries.ts b/packages/runtime-common/db-queries/session-room-queries.ts index 17d9d23efe4..c92fd6211ab 100644 --- a/packages/runtime-common/db-queries/session-room-queries.ts +++ b/packages/runtime-common/db-queries/session-room-queries.ts @@ -8,12 +8,12 @@ export const REALM_SERVER_REALM = '__realm-server__'; */ export async function fetchSessionRoom( dbAdapter: DBAdapter, - realmURL: string, + realmUserId: string, matrixUserId: string, ) { let rows = await query(dbAdapter, [ - 'SELECT room_id FROM session_rooms WHERE realm_url =', - param(realmURL), + 'SELECT room_id FROM session_rooms WHERE realm_user_id =', + param(realmUserId), 'AND matrix_user_id =', param(matrixUserId), ]); @@ -31,14 +31,16 @@ export async function fetchSessionRoom( */ export async function upsertSessionRoom( dbAdapter: DBAdapter, - realmURL: string, + realmUserId: string, matrixUserId: string, roomId: string, ) { await query(dbAdapter, [ - 'INSERT INTO session_rooms (realm_url, matrix_user_id, room_id, created_at, updated_at)', + 'INSERT INTO session_rooms (realm_url, realm_user_id, matrix_user_id, room_id, created_at, updated_at)', 'VALUES (', - param(realmURL), + param(REALM_SERVER_REALM), + ',', + param(realmUserId), ',', param(matrixUserId), ',', @@ -52,6 +54,9 @@ export async function upsertSessionRoom( 'room_id =', param(roomId), ',', + 'realm_user_id =', + param(realmUserId), + ',', 'updated_at =', dbExpression({ pg: 'NOW()', sqlite: 'CURRENT_TIMESTAMP' }), ]); @@ -63,12 +68,30 @@ export async function upsertSessionRoom( export async function fetchAllSessionRooms( dbAdapter: DBAdapter, realmURL: string, + realmUserId: string, ) { + console.log( + 'Fetching all session rooms for realmURL:', + realmURL, + 'and realmUserId:', + realmUserId, + ); let rows = await query(dbAdapter, [ - 'SELECT matrix_user_id, room_id FROM session_rooms WHERE realm_url =', + 'SELECT sr.matrix_user_id, sr.room_id', + 'FROM session_rooms sr', + 'JOIN realm_user_permissions rup', + 'ON rup.username = sr.matrix_user_id', + 'WHERE rup.realm_url =', param(realmURL), + 'AND (rup.read = true OR rup.write = true)', + 'AND sr.realm_user_id =', + param(realmUserId), + 'AND sr.realm_url =', + param(REALM_SERVER_REALM), ]); + console.log('Fetched session rooms:', rows); + let result: Record = {}; for (let row of rows) { if (row.matrix_user_id && row.room_id) { diff --git a/packages/runtime-common/realm.ts b/packages/runtime-common/realm.ts index 9aadc58f49d..d9375b415d9 100644 --- a/packages/runtime-common/realm.ts +++ b/packages/runtime-common/realm.ts @@ -318,7 +318,6 @@ export type RequestContext = { realm: Realm; permissions: RealmPermissions }; export class Realm { #startedUp = new Deferred(); #matrixClient: MatrixClient; - #realmServerMatrixClient: MatrixClient; #realmIndexUpdater: RealmIndexUpdater; #realmIndexQueryEngine: RealmIndexQueryEngine; #adapter: RealmAdapter; @@ -332,7 +331,6 @@ export class Realm { #disableModuleCaching = false; #fullIndexOnStartup = false; #fromScratchIndexPriority = systemInitiatedPriority; - #realmServerMatrixUserId: string; #definitionLookup: DefinitionLookup; #copiedFromRealm: URL | undefined; #sourceCache = new AliasCache(); @@ -366,28 +364,25 @@ export class Realm { { url, adapter, - matrix, secretSeed, dbAdapter, queue, virtualNetwork, - realmServerMatrixClient, + matrixClient, definitionLookup, }: { url: string; adapter: RealmAdapter; - matrix: MatrixConfig; secretSeed: string; dbAdapter: DBAdapter; queue: QueuePublisher; virtualNetwork: VirtualNetwork; - realmServerMatrixClient: MatrixClient; + matrixClient: MatrixClient; definitionLookup: DefinitionLookup; }, opts?: Options, ) { this.paths = new RealmPaths(new URL(url)); - let { username, url: matrixURL } = matrix; this.#realmSecretSeed = secretSeed; this.#dbAdapter = dbAdapter; this.#adapter = adapter; @@ -395,16 +390,7 @@ export class Realm { this.#fullIndexOnStartup = opts?.fullIndexOnStartup ?? false; this.#fromScratchIndexPriority = opts?.fromScratchIndexPriority ?? systemInitiatedPriority; - this.#realmServerMatrixClient = realmServerMatrixClient; - this.#realmServerMatrixUserId = userIdFromUsername( - realmServerMatrixClient.username, - realmServerMatrixClient.matrixURL.href, - ); - this.#matrixClient = new MatrixClient({ - matrixURL, - username, - seed: secretSeed, - }); + this.#matrixClient = matrixClient; this.#disableModuleCaching = Boolean(opts?.disableModuleCaching); this.#copiedFromRealm = opts?.copiedFromRealm; let owner: string | undefined; @@ -434,7 +420,7 @@ export class Realm { // server so that we can assume user that owns this realm. refactor this // back to using the realm's own matrix client after running cards in // headless chrome lands. - new RealmAuthDataSource(this.#realmServerMatrixClient, () => _fetch), + new RealmAuthDataSource(this.#matrixClient, () => _fetch), ), ]); @@ -578,18 +564,25 @@ export class Realm { } async ensureSessionRoom(matrixUserId: string): Promise { + console.log('realm.ts - Ensuring session room for user:', matrixUserId); let sessionRoom = await fetchSessionRoom( this.#dbAdapter, - this.url, + this.#matrixClient.getUserId(), matrixUserId, ); + console.log('Fetched session room from DB:', sessionRoom); if (!sessionRoom) { + console.log('No session room, creating one for user:', matrixUserId); await this.#matrixClient.login(); + console.log( + 'Logged into matrix as realm server user', + this.#matrixClient.getUserId(), + ); sessionRoom = await this.#matrixClient.createDM(matrixUserId); await upsertSessionRoom( this.#dbAdapter, - this.url, + this.#matrixClient.getUserId(), matrixUserId, sessionRoom, ); @@ -1306,7 +1299,12 @@ export class Realm { ensureSessionRoom: async (userId: string) => this.ensureSessionRoom(userId), setSessionRoom: (userId: string, roomId: string) => - upsertSessionRoom(this.#dbAdapter, this.url, userId, roomId), + upsertSessionRoom( + this.#dbAdapter, + this.#matrixClient.getUserId(), + userId, + roomId, + ), } as Utils, ); @@ -3751,7 +3749,7 @@ export class Realm { private async createRequestContext(): Promise { let permissions = { - [this.#realmServerMatrixUserId]: ['assume-user'] as RealmAction[], + [this.#matrixClient.getUserId()]: ['assume-user'] as RealmAction[], ...(await fetchRealmPermissions(this.#dbAdapter, new URL(this.url))), }; return { From d920670c2cb2e4b10147333ef9613161eb6da879 Mon Sep 17 00:00:00 2001 From: Ian Calvert Date: Wed, 24 Dec 2025 00:46:40 +0000 Subject: [PATCH 03/14] Add realm url to indexing events --- packages/base/matrix-event.gts | 7 +++-- packages/host/app/services/matrix-service.ts | 31 ++++++------------- packages/host/app/services/message-service.ts | 6 +++- packages/host/tests/helpers/adapter.ts | 7 ++++- .../message-service-subscription-test.gts | 1 + packages/realm-server/node-realm.ts | 10 +++++- .../tests/card-source-endpoints-test.ts | 6 ++++ .../realm-server/tests/helpers/indexing.ts | 2 ++ .../tests/realm-endpoints-test.ts | 4 +++ 9 files changed, 47 insertions(+), 27 deletions(-) diff --git a/packages/base/matrix-event.gts b/packages/base/matrix-event.gts index 9f2b6cca49c..8961f0619ef 100644 --- a/packages/base/matrix-event.gts +++ b/packages/base/matrix-event.gts @@ -372,9 +372,12 @@ export interface RealmEvent extends BaseMatrixEvent { content: RealmEventContent; } -export type RealmEventContent = +export type RealmEventContent = ( | IndexRealmEventContent - | UpdateRealmEventContent; + | UpdateRealmEventContent +) & { + realmURL?: string; +}; export type IndexRealmEventContent = | IncrementalIndexEventContent diff --git a/packages/host/app/services/matrix-service.ts b/packages/host/app/services/matrix-service.ts index d05ade6ddb7..edbe9a1b260 100644 --- a/packages/host/app/services/matrix-service.ts +++ b/packages/host/app/services/matrix-service.ts @@ -1829,30 +1829,17 @@ export default class MatrixService extends Service { return; } - let realmResourceForEvent = this.realm.realmForSessionRoomId( - event.room_id!, - ); - console.log('Trying to figure out realm for event', { - event, - realmResourceForEvent, - }); - if (!realmResourceForEvent) { - console.log('Ignoring realm event because no realm found', event); - } else { - // TODO: CHECK THAT THE SENDER IS THE REALM SERVER? - if (realmResourceForEvent.info?.realmUserId !== event.sender) { - console.log( - `Realm event sender ${event.sender} is not the realm user ${realmResourceForEvent.info?.realmUserId}`, - event, - ); - } - - (event.content as any).origin_server_ts = event.origin_server_ts; - this.messageService.relayRealmEvent( - realmResourceForEvent.url, - event.content as RealmEventContent, + const content = event.content as RealmEventContent; + if (!content.realmURL) { + realmEventsLogger.debug( + 'Ignoring realm event because no realm URL was provided', + event, ); + return; } + + (content as any).origin_server_ts = event.origin_server_ts; + this.messageService.relayRealmEvent(content); } } diff --git a/packages/host/app/services/message-service.ts b/packages/host/app/services/message-service.ts index 52e41ae8e21..85c2df81683 100644 --- a/packages/host/app/services/message-service.ts +++ b/packages/host/app/services/message-service.ts @@ -44,7 +44,11 @@ export default class MessageService extends Service { } } - relayRealmEvent(realmURL: string, event: RealmEventContent) { + relayRealmEvent(event: RealmEventContent) { + const realmURL = event.realmURL; + if (!realmURL) { + return; + } this.listenerCallbacks.get(realmURL)?.forEach((cb) => { cb(event); }); diff --git a/packages/host/tests/helpers/adapter.ts b/packages/host/tests/helpers/adapter.ts index 43be7607f88..71cdaa91a18 100644 --- a/packages/host/tests/helpers/adapter.ts +++ b/packages/host/tests/helpers/adapter.ts @@ -127,8 +127,13 @@ export class TestRealmAdapter implements RealmAdapter { rid.replace('test-session-room-realm-', '').startsWith(realmUrl), ); + const eventWithRealmURL: RealmEventContent = { + ...event, + realmURL: realmUrl, + }; + for (let roomId of targetRoomIds) { - simulateRemoteMessage(roomId, realmMatrixUsername, event, { + simulateRemoteMessage(roomId, realmMatrixUsername, eventWithRealmURL, { type: APP_BOXEL_REALM_EVENT_TYPE, }); } diff --git a/packages/host/tests/integration/message-service-subscription-test.gts b/packages/host/tests/integration/message-service-subscription-test.gts index c5879533ff8..7d60c7783cf 100644 --- a/packages/host/tests/integration/message-service-subscription-test.gts +++ b/packages/host/tests/integration/message-service-subscription-test.gts @@ -107,6 +107,7 @@ module('Integration | message service subscription', function (hooks) { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: 'index.json', + realmURL: testRealmURL, }, }); diff --git a/packages/realm-server/node-realm.ts b/packages/realm-server/node-realm.ts index 3e9ea5d712b..868ad28429a 100644 --- a/packages/realm-server/node-realm.ts +++ b/packages/realm-server/node-realm.ts @@ -234,6 +234,10 @@ export class NodeAdapter implements RealmAdapter { dbAdapter: DBAdapter, ): Promise { realmEventsLog.debug('Broadcasting realm event', event); + const eventWithRealmURL: RealmEventContent = { + ...event, + realmURL: realmUrl, + }; let realmUserId; if (dbAdapter.isClosed) { realmEventsLog.warn( @@ -268,7 +272,11 @@ export class NodeAdapter implements RealmAdapter { for (let userId of Object.keys(dmRooms)) { let roomId = dmRooms[userId]; try { - await matrixClient.sendEvent(roomId, APP_BOXEL_REALM_EVENT_TYPE, event); + await matrixClient.sendEvent( + roomId, + APP_BOXEL_REALM_EVENT_TYPE, + eventWithRealmURL, + ); } catch (e) { realmEventsLog.error( `Unable to send event in room ${roomId} for user ${userId}`, diff --git a/packages/realm-server/tests/card-source-endpoints-test.ts b/packages/realm-server/tests/card-source-endpoints-test.ts index 7a8b62b4fcc..d8b67962a77 100644 --- a/packages/realm-server/tests/card-source-endpoints-test.ts +++ b/packages/realm-server/tests/card-source-endpoints-test.ts @@ -882,6 +882,7 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${testRealmURL}test-card.gts`, + realmURL: testRealmURL, }, }, { @@ -891,6 +892,7 @@ module(basename(__filename), function () { indexType: 'incremental', invalidations: [`${testRealmURL}test-card.gts`], clientRequestId: null, + realmURL: testRealmURL, }, }, { @@ -899,6 +901,7 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${testRealmURL}test-card.gts`, + realmURL: testRealmURL, }, }, { @@ -908,6 +911,7 @@ module(basename(__filename), function () { indexType: 'incremental', invalidations: [`${testRealmURL}test-card.gts`, id], clientRequestId: null, + realmURL: testRealmURL, }, }, { @@ -916,6 +920,7 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${id}.json`, + realmURL: testRealmURL, }, }, { @@ -925,6 +930,7 @@ module(basename(__filename), function () { indexType: 'incremental', invalidations: [id], clientRequestId: null, + realmURL: testRealmURL, }, }, ]; diff --git a/packages/realm-server/tests/helpers/indexing.ts b/packages/realm-server/tests/helpers/indexing.ts index 5c8d5f36a3c..0445a452507 100644 --- a/packages/realm-server/tests/helpers/indexing.ts +++ b/packages/realm-server/tests/helpers/indexing.ts @@ -84,12 +84,14 @@ export async function expectIncrementalIndexEvent( eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: targetUrl, + realmURL: realm, }); let expectedIncrementalContent: any = { eventName: 'index', indexType: 'incremental', invalidations: [invalidation], + realmURL: realm, }; let actualContent = { ...incrementalEventContent }; diff --git a/packages/realm-server/tests/realm-endpoints-test.ts b/packages/realm-server/tests/realm-endpoints-test.ts index 30c2a52bc6c..bb2da70171d 100644 --- a/packages/realm-server/tests/realm-endpoints-test.ts +++ b/packages/realm-server/tests/realm-endpoints-test.ts @@ -937,6 +937,7 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${newCardId}.json`, + realmURL: testRealmHref, }); assert.deepEqual(incrementalEvent?.content, { @@ -944,6 +945,7 @@ module(basename(__filename), function () { indexType: 'incremental', invalidations: [newCardId], clientRequestId: null, + realmURL: testRealmHref, }); { @@ -1101,12 +1103,14 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${testRealmHref}person-1.json`, + realmURL: testRealmHref, }); assert.deepEqual(incrementalEvent?.content, { eventName: 'index', indexType: 'incremental', invalidations: [`${testRealmHref}person-1`], + realmURL: testRealmHref, }); { From 7bc0935d60d16673fd06f14881f308975b4befad Mon Sep 17 00:00:00 2001 From: Ian Calvert Date: Tue, 27 Jan 2026 13:24:41 +0000 Subject: [PATCH 04/14] Remove username from publishing realm --- .../handlers/handle-publish-realm.ts | 21 +------------------ packages/realm-server/routes.ts | 1 - packages/realm-server/server.ts | 7 +------ 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/packages/realm-server/handlers/handle-publish-realm.ts b/packages/realm-server/handlers/handle-publish-realm.ts index 7e452568edd..c1dfe377f25 100644 --- a/packages/realm-server/handlers/handle-publish-realm.ts +++ b/packages/realm-server/handlers/handle-publish-realm.ts @@ -28,8 +28,6 @@ import { import { createJWT } from '../jwt'; import type { CreateRoutesArgs } from '../routes'; import type { RealmServerTokenClaim } from '../utils/jwt'; -import { registerUser } from '../synapse'; -import { passwordFromSeed } from '@cardstack/runtime-common/matrix-client'; const log = logger('handle-publish'); @@ -99,13 +97,11 @@ function rewriteHostHomeForPublishedRealm( export default function handlePublishRealm({ dbAdapter, - matrixClient, realmSecretSeed, serverURL, virtualNetwork, realms, realmsRootPath, - getMatrixRegistrationSecret, createAndMountRealm, domainsForPublishedRealms, }: CreateRoutesArgs): (ctxt: Koa.Context, next: Koa.Next) => Promise { @@ -246,7 +242,6 @@ export default function handlePublishRealm({ ); let userId; - let realmUsername; let publishedRealmData: PublishedRealmTable | undefined; if (existingPublishedRealm) { let results = (await query(dbAdapter, [ @@ -261,7 +256,6 @@ export default function handlePublishRealm({ | 'last_published_at' >[]; publishedRealmData = results[0]; - realmUsername = `realm/${PUBLISHED_DIRECTORY_NAME}_${publishedRealmData.id}`; let lastPublishedAt = Date.now().toString(); await query(dbAdapter, [ @@ -273,10 +267,9 @@ export default function handlePublishRealm({ publishedRealmData.last_published_at = lastPublishedAt; } else { let publishedRealmId = uuidv4(); - realmUsername = `realm/${PUBLISHED_DIRECTORY_NAME}_${publishedRealmId}`; let { valueExpressions, nameExpressions } = asExpressions({ id: publishedRealmId, - owner_username: realmUsername, + owner_username: 'NONE', source_realm_url: sourceRealmURL, published_realm_url: publishedRealmURL, last_published_at: Date.now().toString(), @@ -294,18 +287,7 @@ export default function handlePublishRealm({ | 'last_published_at' >[]; publishedRealmData = results[0]; - - let { userId: newUserId } = await registerUser({ - matrixURL: matrixClient.matrixURL, - displayname: realmUsername, - username: realmUsername, - password: await passwordFromSeed(realmUsername, realmSecretSeed), - registrationSecret: await getMatrixRegistrationSecret(), - }); - userId = newUserId; - await insertPermissions(dbAdapter, new URL(publishedRealmURL), { - [userId]: ['read', 'realm-owner'], [ownerUserId]: ['read', 'realm-owner'], '*': ['read'], }); @@ -350,7 +332,6 @@ export default function handlePublishRealm({ let realm = createAndMountRealm( publishedRealmPath, publishedRealmURL, - realmUsername, new URL(sourceRealmURL), false, ); diff --git a/packages/realm-server/routes.ts b/packages/realm-server/routes.ts index 4fc5962172f..6e4bdd449b6 100644 --- a/packages/realm-server/routes.ts +++ b/packages/realm-server/routes.ts @@ -59,7 +59,6 @@ export type CreateRoutesArgs = { createAndMountRealm: ( path: string, url: string, - username: string, copiedFromRealm?: URL, enableFileWatcher?: boolean, fromScratchIndexPriority?: number, diff --git a/packages/realm-server/server.ts b/packages/realm-server/server.ts index 9a7ae4bba74..cb004d2feb2 100644 --- a/packages/realm-server/server.ts +++ b/packages/realm-server/server.ts @@ -936,7 +936,6 @@ export class RealmServer { } let adapter = new NodeAdapter(realmPath, this.enableFileWatcher); - let username = publishedRealmRow.owner_username; let realm = new Realm({ url: publishedRealmUrl, @@ -945,11 +944,7 @@ export class RealmServer { virtualNetwork: this.virtualNetwork, dbAdapter: this.dbAdapter, queue: this.queue, - matrix: { - url: this.matrixClient.matrixURL, - username, - }, - realmServerMatrixClient: this.matrixClient, + matrixClient: this.matrixClient, realmServerURL: this.serverURL.href, definitionLookup: this.definitionLookup, cardSizeLimitBytes: this.cardSizeLimitBytes, From 7cd147b2c3d8bcfd66dfcf088b7ade694522c2bf Mon Sep 17 00:00:00 2001 From: Ian Calvert Date: Tue, 27 Jan 2026 14:52:32 +0000 Subject: [PATCH 05/14] Remove console logging --- packages/host/app/services/matrix-service.ts | 1 - packages/realm-server/handlers/handle-create-session.ts | 3 --- packages/realm-server/handlers/handle-realm-auth.ts | 6 ------ packages/realm-server/node-realm.ts | 1 - .../runtime-common/db-queries/session-room-queries.ts | 8 -------- packages/runtime-common/realm.ts | 7 ------- 6 files changed, 26 deletions(-) diff --git a/packages/host/app/services/matrix-service.ts b/packages/host/app/services/matrix-service.ts index 8fab7d5a2d4..93eaf840ae0 100644 --- a/packages/host/app/services/matrix-service.ts +++ b/packages/host/app/services/matrix-service.ts @@ -1828,7 +1828,6 @@ export default class MatrixService extends Service { event.type === 'm.room.message' && event.content?.msgtype === APP_BOXEL_REALM_SERVER_EVENT_MSGTYPE ) { - console.log('Received realm server event', event); await this.realmServer.handleEvent(event); } else if ( event.type === APP_BOXEL_REALM_EVENT_TYPE && diff --git a/packages/realm-server/handlers/handle-create-session.ts b/packages/realm-server/handlers/handle-create-session.ts index b95efe051bd..1fb6b147060 100644 --- a/packages/realm-server/handlers/handle-create-session.ts +++ b/packages/realm-server/handlers/handle-create-session.ts @@ -47,16 +47,13 @@ export default function handleCreateSessionRequest({ 'Realm server Matrix user ID is not available, unable to create session room', ); } - console.log('Realm server user ID:', realmServerUserId); let sessionRoom = await fetchSessionRoom( dbAdapter, realmServerUserId, userId, ); - console.log('Fetched session room from DB:', sessionRoom); if (!sessionRoom) { - console.log('No session room???', userId); sessionRoom = await matrixClient.createDM(userId); await upsertSessionRoom( dbAdapter, diff --git a/packages/realm-server/handlers/handle-realm-auth.ts b/packages/realm-server/handlers/handle-realm-auth.ts index 369199e9423..5b67734bbb0 100644 --- a/packages/realm-server/handlers/handle-realm-auth.ts +++ b/packages/realm-server/handlers/handle-realm-auth.ts @@ -51,12 +51,6 @@ export default function handleRealmAuth({ } try { - console.log( - 'Realm auth creating session for realm:', - realmUrl, - 'and user:', - matrixUserId, - ); let sessionRoom = await realm.ensureSessionRoom(matrixUserId); sessions[realmUrl] = createJWT( { diff --git a/packages/realm-server/node-realm.ts b/packages/realm-server/node-realm.ts index 6de2f6b2ec3..3196b893b3d 100644 --- a/packages/realm-server/node-realm.ts +++ b/packages/realm-server/node-realm.ts @@ -269,7 +269,6 @@ export class NodeAdapter implements RealmAdapter { realmUrl, realmUserId, ); - console.log('Dm rooms for realm: ', realmUrl, dmRooms); realmEventsLog.debug('Sending to dm rooms', Object.values(dmRooms)); diff --git a/packages/runtime-common/db-queries/session-room-queries.ts b/packages/runtime-common/db-queries/session-room-queries.ts index c92fd6211ab..b49fc644a9b 100644 --- a/packages/runtime-common/db-queries/session-room-queries.ts +++ b/packages/runtime-common/db-queries/session-room-queries.ts @@ -70,12 +70,6 @@ export async function fetchAllSessionRooms( realmURL: string, realmUserId: string, ) { - console.log( - 'Fetching all session rooms for realmURL:', - realmURL, - 'and realmUserId:', - realmUserId, - ); let rows = await query(dbAdapter, [ 'SELECT sr.matrix_user_id, sr.room_id', 'FROM session_rooms sr', @@ -90,8 +84,6 @@ export async function fetchAllSessionRooms( param(REALM_SERVER_REALM), ]); - console.log('Fetched session rooms:', rows); - let result: Record = {}; for (let row of rows) { if (row.matrix_user_id && row.room_id) { diff --git a/packages/runtime-common/realm.ts b/packages/runtime-common/realm.ts index 5c9792a29eb..664ee9223b1 100644 --- a/packages/runtime-common/realm.ts +++ b/packages/runtime-common/realm.ts @@ -671,21 +671,14 @@ export class Realm { } async ensureSessionRoom(matrixUserId: string): Promise { - console.log('realm.ts - Ensuring session room for user:', matrixUserId); let sessionRoom = await fetchSessionRoom( this.#dbAdapter, this.#matrixClient.getUserId(), matrixUserId, ); - console.log('Fetched session room from DB:', sessionRoom); if (!sessionRoom) { - console.log('No session room, creating one for user:', matrixUserId); await this.#matrixClient.login(); - console.log( - 'Logged into matrix as realm server user', - this.#matrixClient.getUserId(), - ); sessionRoom = await this.#matrixClient.createDM(matrixUserId); await upsertSessionRoom( this.#dbAdapter, From 02f9b25a31c6a0895208ec751cfc68a72633b331 Mon Sep 17 00:00:00 2001 From: Ian Calvert Date: Wed, 4 Feb 2026 13:43:28 +0000 Subject: [PATCH 06/14] Pass through matrix client in tests setup too --- packages/host/tests/helpers/index.gts | 6 +----- packages/realm-server/tests/helpers/index.ts | 5 ++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/host/tests/helpers/index.gts b/packages/host/tests/helpers/index.gts index a5a56aec045..7d5d3dce742 100644 --- a/packages/host/tests/helpers/index.gts +++ b/packages/host/tests/helpers/index.gts @@ -787,15 +787,11 @@ async function setupTestRealm({ realm = new Realm({ url: realmURL, adapter, - matrix: { - ...baseTestMatrix, - username: testRealmURLToUsername(realmURL), - }, secretSeed: testRealmSecretSeed, virtualNetwork, dbAdapter, queue, - realmServerMatrixClient: new MatrixClient({ + matrixClient: new MatrixClient({ matrixURL: baseTestMatrix.url, username: testRealmServerMatrixUsername, seed: testRealmSecretSeed, diff --git a/packages/realm-server/tests/helpers/index.ts b/packages/realm-server/tests/helpers/index.ts index a5efc5dba8a..b50703e8cfd 100644 --- a/packages/realm-server/tests/helpers/index.ts +++ b/packages/realm-server/tests/helpers/index.ts @@ -501,7 +501,7 @@ export async function createRealm({ createPrerenderAuth: testCreatePrerenderAuth, }); } - let realmServerMatrixClient = new MatrixClient({ + let matrixClient = new MatrixClient({ matrixURL: realmServerTestMatrix.url, username: realmServerTestMatrix.username, seed: realmSecretSeed, @@ -509,12 +509,11 @@ export async function createRealm({ let realm = new Realm({ url: realmURL, adapter, - matrix: matrixConfig, secretSeed: realmSecretSeed, virtualNetwork, dbAdapter, queue: publisher, - realmServerMatrixClient, + matrixClient, realmServerURL: new URL(new URL(realmURL).origin).href, definitionLookup, cardSizeLimitBytes: From 0d138a1e2384b9d0ec8d7cae4b81b9901097c843 Mon Sep 17 00:00:00 2001 From: Ian Calvert Date: Mon, 9 Feb 2026 15:07:32 +0000 Subject: [PATCH 07/14] Update scheme and move migration to be the last --- .../{1769504850011_schema.sql => 1770648743000_schema.sql} | 7 +++++++ ...=> 1770648743000_add-realm-user-id-to-session-rooms.js} | 0 2 files changed, 7 insertions(+) rename packages/host/config/schema/{1769504850011_schema.sql => 1770648743000_schema.sql} (94%) rename packages/postgres/migrations/{1766509131000_add-realm-user-id-to-session-rooms.js => 1770648743000_add-realm-user-id-to-session-rooms.js} (100%) diff --git a/packages/host/config/schema/1769504850011_schema.sql b/packages/host/config/schema/1770648743000_schema.sql similarity index 94% rename from packages/host/config/schema/1769504850011_schema.sql rename to packages/host/config/schema/1770648743000_schema.sql index 56d3fa5dc79..7fd8ff7367f 100644 --- a/packages/host/config/schema/1769504850011_schema.sql +++ b/packages/host/config/schema/1770648743000_schema.sql @@ -1,6 +1,13 @@ -- This is auto-generated by packages/realm-server/scripts/convert-to-sqlite.ts -- Please don't directly modify this file + CREATE TABLE IF NOT EXISTS bot_registrations ( + id NOT NULL, + username TEXT NOT NULL, + created_at NOT NULL, + PRIMARY KEY ( id ) +); + CREATE TABLE IF NOT EXISTS boxel_index ( url TEXT NOT NULL, file_alias TEXT NOT NULL, diff --git a/packages/postgres/migrations/1766509131000_add-realm-user-id-to-session-rooms.js b/packages/postgres/migrations/1770648743000_add-realm-user-id-to-session-rooms.js similarity index 100% rename from packages/postgres/migrations/1766509131000_add-realm-user-id-to-session-rooms.js rename to packages/postgres/migrations/1770648743000_add-realm-user-id-to-session-rooms.js From 2854b71aa5dbaffa7146c3f7e5a869c5188300be Mon Sep 17 00:00:00 2001 From: Ian Calvert Date: Mon, 9 Feb 2026 15:55:48 +0000 Subject: [PATCH 08/14] Explicitly expect two files to be attached --- packages/matrix/tests/messages.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/matrix/tests/messages.spec.ts b/packages/matrix/tests/messages.spec.ts index 84ca57e62fa..87a69cc655d 100644 --- a/packages/matrix/tests/messages.spec.ts +++ b/packages/matrix/tests/messages.spec.ts @@ -359,7 +359,7 @@ test.describe('Room messages', () => { await expect( page.locator(`[data-test-attached-card="${appURL}/hassan"]`), ).toHaveCount(1); - await expect(page.locator(`[data-test-attached-file]`)).toHaveCount(1); + await expect(page.locator(`[data-test-attached-file]`)).toHaveCount(2); await expect( page.locator(`[data-test-attached-file="${appURL}/person.gts"]`), ).toHaveCount(1); From cfbbae535a22765299d2068f007bbb04429c286c Mon Sep 17 00:00:00 2001 From: Ian Calvert Date: Mon, 9 Feb 2026 16:55:25 +0000 Subject: [PATCH 09/14] Don't auto-login to realm --- packages/realm-server/main.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/realm-server/main.ts b/packages/realm-server/main.ts index 3657b981a9f..2e0b2744f77 100644 --- a/packages/realm-server/main.ts +++ b/packages/realm-server/main.ts @@ -241,7 +241,6 @@ const getIndexHTML = async () => { username: REALM_SERVER_MATRIX_USERNAME, seed: REALM_SECRET_SEED, }); - await matrixClient.login(); let prerenderer = createRemotePrerenderer(prerendererUrl); let createPrerenderAuth = buildCreatePrerenderAuth( REALM_SECRET_SEED, From 10aaba682ce14c198dfde0186c125ee2846fca07 Mon Sep 17 00:00:00 2001 From: Ian Calvert Date: Tue, 10 Feb 2026 11:48:23 +0000 Subject: [PATCH 10/14] Add the hard coded realm user to have read permissions --- packages/matrix/helpers/index.ts | 5 +++++ .../tests/card-dependencies-endpoint-test.ts | 1 + .../realm-server/tests/card-source-endpoints-test.ts | 4 ++++ packages/realm-server/tests/helpers/index.ts | 10 ++-------- .../tests/realm-endpoints/directory-test.ts | 1 + .../realm-server/tests/realm-endpoints/info-test.ts | 3 +++ .../realm-server/tests/realm-endpoints/lint-test.ts | 1 + .../realm-server/tests/realm-endpoints/mtimes-test.ts | 1 + .../tests/realm-endpoints/permissions-test.ts | 1 + .../realm-server/tests/realm-endpoints/search-test.ts | 2 ++ .../realm-server/tests/realm-endpoints/user-test.ts | 2 ++ packages/realm-server/tests/search-prerendered-test.ts | 1 + .../realm-server/tests/server-endpoints/helpers.ts | 1 + 13 files changed, 25 insertions(+), 8 deletions(-) diff --git a/packages/matrix/helpers/index.ts b/packages/matrix/helpers/index.ts index e4ab50f641b..cc9a5e0ddce 100644 --- a/packages/matrix/helpers/index.ts +++ b/packages/matrix/helpers/index.ts @@ -120,6 +120,11 @@ export async function setRealmRedirects(page: Page) { } export async function registerRealmUsers(synapse: SynapseInstance) { + await registerUser( + synapse, + 'node-test_realm', + await realmPassword('node-test_realm', realmSecretSeed), + ); await registerUser( synapse, 'realm_server', diff --git a/packages/realm-server/tests/card-dependencies-endpoint-test.ts b/packages/realm-server/tests/card-dependencies-endpoint-test.ts index 8650a5fcc58..67472566f3f 100644 --- a/packages/realm-server/tests/card-dependencies-endpoint-test.ts +++ b/packages/realm-server/tests/card-dependencies-endpoint-test.ts @@ -90,6 +90,7 @@ module(basename(__filename), function () { setupPermissionedRealm(hooks, { permissions: { john: ['read'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/card-source-endpoints-test.ts b/packages/realm-server/tests/card-source-endpoints-test.ts index 74250befae4..f7d18f29295 100644 --- a/packages/realm-server/tests/card-source-endpoints-test.ts +++ b/packages/realm-server/tests/card-source-endpoints-test.ts @@ -353,6 +353,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { john: ['read'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); @@ -547,6 +548,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { john: ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); @@ -1022,6 +1024,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { john: ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); @@ -1214,6 +1217,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { john: ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/helpers/index.ts b/packages/realm-server/tests/helpers/index.ts index 7e73225f59b..34ddf564e19 100644 --- a/packages/realm-server/tests/helpers/index.ts +++ b/packages/realm-server/tests/helpers/index.ts @@ -449,7 +449,6 @@ export async function createRealm({ runner, publisher, dbAdapter, - matrixConfig = testMatrix, withWorker, enableFileWatcher = false, cardSizeLimitBytes, @@ -494,7 +493,7 @@ export async function createRealm({ dbAdapter, queuePublisher: publisher, virtualNetwork, - matrixURL: matrixConfig.url, + matrixURL: realmServerTestMatrix.url, secretSeed: realmSecretSeed, realmServerMatrixUsername: testRealmServerMatrixUsername, prerenderer, @@ -792,7 +791,6 @@ export function setupPermissionedRealms( // We want 2 different realm users to test authorization between them - these // names are selected because they are already available in the test // environment (via register-realm-users.ts) - let matrixUsers = ['test_realm', 'node-test_realm']; let realms: { realm: Realm; realmPath: string; @@ -807,7 +805,7 @@ export function setupPermissionedRealms( runner: QueueRunner, ) => { _dbAdapter = dbAdapter; - for (let [i, realmArg] of realmsArg.entries()) { + for (let realmArg of realmsArg.values()) { let { testRealmDir: realmPath, testRealm: realm, @@ -821,10 +819,6 @@ export function setupPermissionedRealms( fileSystem: realmArg.fileSystem, permissions: realmArg.permissions, matrixURL, - matrixConfig: { - url: matrixURL, - username: matrixUsers[i] ?? matrixUsers[0], - }, dbAdapter, publisher, runner, diff --git a/packages/realm-server/tests/realm-endpoints/directory-test.ts b/packages/realm-server/tests/realm-endpoints/directory-test.ts index 5c146758bc7..6782d6a3411 100644 --- a/packages/realm-server/tests/realm-endpoints/directory-test.ts +++ b/packages/realm-server/tests/realm-endpoints/directory-test.ts @@ -100,6 +100,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { john: ['read'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/realm-endpoints/info-test.ts b/packages/realm-server/tests/realm-endpoints/info-test.ts index 94fffd24a75..d1d59c5171b 100644 --- a/packages/realm-server/tests/realm-endpoints/info-test.ts +++ b/packages/realm-server/tests/realm-endpoints/info-test.ts @@ -93,6 +93,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { john: ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, realmURL, onRealmSetup, @@ -166,6 +167,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { users: ['read'], + '@node-test_realm:localhost': ['read'], }, realmURL, onRealmSetup, @@ -209,6 +211,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { bob: ['read'], jane: ['read'], john: ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, realmURL, onRealmSetup, diff --git a/packages/realm-server/tests/realm-endpoints/lint-test.ts b/packages/realm-server/tests/realm-endpoints/lint-test.ts index f7e42bbefda..b5700c13f5e 100644 --- a/packages/realm-server/tests/realm-endpoints/lint-test.ts +++ b/packages/realm-server/tests/realm-endpoints/lint-test.ts @@ -28,6 +28,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { john: ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/realm-endpoints/mtimes-test.ts b/packages/realm-server/tests/realm-endpoints/mtimes-test.ts index 0ef403c5a07..ba09a520d4d 100644 --- a/packages/realm-server/tests/realm-endpoints/mtimes-test.ts +++ b/packages/realm-server/tests/realm-endpoints/mtimes-test.ts @@ -30,6 +30,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { mary: ['read'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/realm-endpoints/permissions-test.ts b/packages/realm-server/tests/realm-endpoints/permissions-test.ts index eac68d6d56c..f194821479c 100644 --- a/packages/realm-server/tests/realm-endpoints/permissions-test.ts +++ b/packages/realm-server/tests/realm-endpoints/permissions-test.ts @@ -43,6 +43,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { permissions: { mary: ['read', 'write', 'realm-owner'], bob: ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/realm-endpoints/search-test.ts b/packages/realm-server/tests/realm-endpoints/search-test.ts index 3f58562f66b..9b27a3610c5 100644 --- a/packages/realm-server/tests/realm-endpoints/search-test.ts +++ b/packages/realm-server/tests/realm-endpoints/search-test.ts @@ -351,6 +351,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { john: ['read'], + '@node-test_realm:localhost': ['read'], }, realmURL: new URL('http://127.0.0.1:4444/test/'), onRealmSetup, @@ -407,6 +408,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { '*': ['read'], + '@node-test_realm:localhost': ['read'], }, realmURL: new URL('http://127.0.0.1:4444/test/'), onRealmSetup, diff --git a/packages/realm-server/tests/realm-endpoints/user-test.ts b/packages/realm-server/tests/realm-endpoints/user-test.ts index 066d7a2d768..35de5d41a05 100644 --- a/packages/realm-server/tests/realm-endpoints/user-test.ts +++ b/packages/realm-server/tests/realm-endpoints/user-test.ts @@ -66,6 +66,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { john: ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); @@ -475,6 +476,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { john: ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/search-prerendered-test.ts b/packages/realm-server/tests/search-prerendered-test.ts index b0881e80994..9777aa58082 100644 --- a/packages/realm-server/tests/search-prerendered-test.ts +++ b/packages/realm-server/tests/search-prerendered-test.ts @@ -978,6 +978,7 @@ module(basename(__filename), function () { realmURL, permissions: { john: ['read'], + '@node-test_realm:localhost': ['read'], }, fileSystem: { 'person.gts': ` diff --git a/packages/realm-server/tests/server-endpoints/helpers.ts b/packages/realm-server/tests/server-endpoints/helpers.ts index 832ddfbd02c..060d5b63c0a 100644 --- a/packages/realm-server/tests/server-endpoints/helpers.ts +++ b/packages/realm-server/tests/server-endpoints/helpers.ts @@ -73,6 +73,7 @@ export function setupServerEndpointsTest( setupPermissionedRealm(hooks, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); From 07404308050d2838c0d14cc1b4ac0db964b380b8 Mon Sep 17 00:00:00 2001 From: Ian Calvert Date: Tue, 10 Feb 2026 15:36:30 +0000 Subject: [PATCH 11/14] Session rooms are created automatically, do not create them in tests --- packages/realm-server/tests/helpers/index.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/realm-server/tests/helpers/index.ts b/packages/realm-server/tests/helpers/index.ts index 34ddf564e19..95767dab5e4 100644 --- a/packages/realm-server/tests/helpers/index.ts +++ b/packages/realm-server/tests/helpers/index.ts @@ -1040,13 +1040,6 @@ export function setupMatrixRoom( } testAuthRoomId = payload.sessionRoom; - - await upsertSessionRoom( - realmSetup.dbAdapter, - realmSetup.testRealm.url, - userId, - payload.sessionRoom, - ); }); return { From 01b7c9f0f32ffe1a70169c44ed070e2e2c34f107 Mon Sep 17 00:00:00 2001 From: Ian Calvert Date: Tue, 10 Feb 2026 16:25:50 +0000 Subject: [PATCH 12/14] Update permissions in tests --- packages/realm-server/tests/card-source-endpoints-test.ts | 1 + packages/realm-server/tests/file-watcher-events-test.ts | 4 ++++ packages/realm-server/tests/helpers/index.ts | 1 - .../tests/server-endpoints/realm-lifecycle-test.ts | 5 ----- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/realm-server/tests/card-source-endpoints-test.ts b/packages/realm-server/tests/card-source-endpoints-test.ts index f7d18f29295..dc76947eb47 100644 --- a/packages/realm-server/tests/card-source-endpoints-test.ts +++ b/packages/realm-server/tests/card-source-endpoints-test.ts @@ -1078,6 +1078,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/file-watcher-events-test.ts b/packages/realm-server/tests/file-watcher-events-test.ts index 5057b1b6aeb..7ea7583510c 100644 --- a/packages/realm-server/tests/file-watcher-events-test.ts +++ b/packages/realm-server/tests/file-watcher-events-test.ts @@ -59,6 +59,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read'], + '@node-test_realm:localhost': ['read'], }, subscribeToRealmEvents: true, onRealmSetup, @@ -186,6 +187,7 @@ module(basename(__filename), function () { assert.deepEqual(updateEvent.content, { eventName: 'update', added: basename(newFilePath), + realmURL: realmURL.href, }); }); @@ -221,6 +223,7 @@ module(basename(__filename), function () { assert.deepEqual(updateEvent.content, { eventName: 'update', updated: basename(updatedFilePath), + realmURL: realmURL.href, }); }); @@ -244,6 +247,7 @@ module(basename(__filename), function () { assert.deepEqual(updateEvent.content, { eventName: 'update', removed: basename(deletedFilePath), + realmURL: realmURL.href, }); }); diff --git a/packages/realm-server/tests/helpers/index.ts b/packages/realm-server/tests/helpers/index.ts index 95767dab5e4..e709d67c4c5 100644 --- a/packages/realm-server/tests/helpers/index.ts +++ b/packages/realm-server/tests/helpers/index.ts @@ -34,7 +34,6 @@ import { PUBLISHED_DIRECTORY_NAME, DEFAULT_CARD_SIZE_LIMIT_BYTES, clearSessionRooms, - upsertSessionRoom, type MatrixConfig, type QueuePublisher, type QueueRunner, diff --git a/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts b/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts index 1a964718e1e..cfc49cc1e58 100644 --- a/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts +++ b/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts @@ -116,11 +116,6 @@ module(`server-endpoints/${basename(__filename)}`, function () { new URL(json.data.id), ); assert.deepEqual(permissions, { - [`@realm/mango_${endpoint}:localhost`]: [ - 'read', - 'write', - 'realm-owner', - ], [ownerUserId]: ['read', 'write', 'realm-owner'], }); From 6a2a5bd566f52dcb0d513eff3f31011a88ab6100 Mon Sep 17 00:00:00 2001 From: Ian Calvert Date: Tue, 10 Feb 2026 16:37:51 +0000 Subject: [PATCH 13/14] Use the realm user id to get the session rooms for sending events --- packages/realm-server/server.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/realm-server/server.ts b/packages/realm-server/server.ts index 11daea212b1..2b37d53bc24 100644 --- a/packages/realm-server/server.ts +++ b/packages/realm-server/server.ts @@ -1006,11 +1006,11 @@ export class RealmServer { eventType: string, data?: Record, ) => { - let roomId = await fetchSessionRoom( - this.dbAdapter, - REALM_SERVER_REALM, - user, - ); + if (!this.matrixClient.isLoggedIn()) { + await this.matrixClient.login(); + } + let realmUserId = this.matrixClient.getUserId()!; + let roomId = await fetchSessionRoom(this.dbAdapter, realmUserId, user); if (!roomId) { console.error( `Failed to send event: ${eventType}, cannot find session room for user: ${user}`, From e811ac5e4da0223d65e4b3a7438294f832ebbdd9 Mon Sep 17 00:00:00 2001 From: Ian Calvert Date: Tue, 10 Feb 2026 20:33:09 +0000 Subject: [PATCH 14/14] Info overwriting removed, correct realm url --- .../realm-server/tests/card-endpoints-test.ts | 76 ++++++------------- .../tests/card-source-endpoints-test.ts | 18 +++-- packages/realm-server/tests/helpers/index.ts | 2 +- packages/realm-server/tests/indexing-test.ts | 1 + .../realm-server/tests/realm-auth-test.ts | 6 +- .../tests/realm-endpoints-test.ts | 9 +-- .../tests/realm-endpoints/info-test.ts | 4 - .../server-endpoints/realm-lifecycle-test.ts | 3 +- .../server-endpoints/user-and-catalog-test.ts | 1 - .../db-queries/session-room-queries.ts | 2 + 10 files changed, 48 insertions(+), 74 deletions(-) diff --git a/packages/realm-server/tests/card-endpoints-test.ts b/packages/realm-server/tests/card-endpoints-test.ts index 169320be2d7..2a3e7c26fe2 100644 --- a/packages/realm-server/tests/card-endpoints-test.ts +++ b/packages/realm-server/tests/card-endpoints-test.ts @@ -87,6 +87,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); @@ -138,11 +139,7 @@ module(basename(__filename), function () { module: `./person`, name: 'Person', }, - // FIXME see elsewhere… global fix? - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -538,6 +535,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, published: true, @@ -587,10 +585,7 @@ module(basename(__filename), function () { module: `./person`, name: 'Person', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, relationships: { @@ -613,6 +608,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); @@ -793,6 +789,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); @@ -1160,10 +1157,7 @@ module(basename(__filename), function () { name: 'Friend', module: 'http://localhost:4202/node-test/friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -1350,10 +1344,7 @@ module(basename(__filename), function () { name: 'Friend', module: 'http://localhost:4202/node-test/friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -1476,10 +1467,7 @@ module(basename(__filename), function () { name: 'Friend', module: 'http://localhost:4202/node-test/friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo realmURL: testRealmHref, }, links: { @@ -1531,10 +1519,7 @@ module(basename(__filename), function () { name: 'Friend', module: 'http://localhost:4202/node-test/friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo realmURL: testRealmHref, }, links: { @@ -1748,10 +1733,7 @@ module(basename(__filename), function () { name: 'Friend', module: 'http://localhost:4202/node-test/friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -1844,6 +1826,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); @@ -2432,10 +2415,7 @@ module(basename(__filename), function () { name: 'Friend', module: './friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -2622,10 +2602,7 @@ module(basename(__filename), function () { name: 'Friend', module: '../friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -2748,10 +2725,7 @@ module(basename(__filename), function () { name: 'Friend', module: '../friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo realmURL: testRealmHref, }, links: { @@ -2803,10 +2777,7 @@ module(basename(__filename), function () { name: 'Friend', module: '../friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo realmURL: testRealmHref, }, links: { @@ -3008,10 +2979,7 @@ module(basename(__filename), function () { module: 'http://localhost:4202/node-test/friend-with-used-link', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -3106,10 +3074,7 @@ module(basename(__filename), function () { module: 'http://localhost:4202/node-test/friend-with-used-link', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -3264,6 +3229,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, cardSizeLimitBytes: 512, onRealmSetup, @@ -3382,6 +3348,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); @@ -3534,6 +3501,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, fileSystem: { 'greeting.txt': 'hello', @@ -3600,6 +3568,7 @@ module(basename(__filename), function () { realmURL: providerRealmURL, permissions: { '*': ['read', 'write', 'realm-owner'], + '@node-test_realm:localhost': ['read'], }, fileSystem: { 'person.gts': ` @@ -3629,6 +3598,7 @@ module(basename(__filename), function () { realmURL: consumerRealmURL, permissions: { '*': ['read', 'write', 'realm-owner'], + '@node-test_realm:localhost': ['read'], }, fileSystem: { 'favorite-finder.gts': ` diff --git a/packages/realm-server/tests/card-source-endpoints-test.ts b/packages/realm-server/tests/card-source-endpoints-test.ts index dc76947eb47..2b8b3519797 100644 --- a/packages/realm-server/tests/card-source-endpoints-test.ts +++ b/packages/realm-server/tests/card-source-endpoints-test.ts @@ -73,6 +73,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); @@ -403,6 +404,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); @@ -476,6 +478,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); @@ -590,6 +593,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup, }); @@ -920,7 +924,7 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${testRealmURL}test-card.gts`, - realmURL: testRealmURL, + realmURL: testRealmURL.href, }, }, { @@ -930,7 +934,7 @@ module(basename(__filename), function () { indexType: 'incremental', invalidations: [`${testRealmURL}test-card.gts`], clientRequestId: null, - realmURL: testRealmURL, + realmURL: testRealmURL.href, }, }, { @@ -939,7 +943,7 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${testRealmURL}test-card.gts`, - realmURL: testRealmURL, + realmURL: testRealmURL.href, }, }, { @@ -949,7 +953,7 @@ module(basename(__filename), function () { indexType: 'incremental', invalidations: [`${testRealmURL}test-card.gts`, id], clientRequestId: null, - realmURL: testRealmURL, + realmURL: testRealmURL.href, }, }, { @@ -958,7 +962,7 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${id}.json`, - realmURL: testRealmURL, + realmURL: testRealmURL.href, }, }, { @@ -968,7 +972,7 @@ module(basename(__filename), function () { indexType: 'incremental', invalidations: [id], clientRequestId: null, - realmURL: testRealmURL, + realmURL: testRealmURL.href, }, }, ]; @@ -990,6 +994,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, cardSizeLimitBytes: 512, onRealmSetup, @@ -1192,6 +1197,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, cardSizeLimitBytes: 512, onRealmSetup, diff --git a/packages/realm-server/tests/helpers/index.ts b/packages/realm-server/tests/helpers/index.ts index e709d67c4c5..afb80a174f6 100644 --- a/packages/realm-server/tests/helpers/index.ts +++ b/packages/realm-server/tests/helpers/index.ts @@ -160,7 +160,7 @@ export const testRealmInfo = { interactHome: null, hostHome: null, visibility: 'public', - realmUserId: testMatrix.username, + realmUserId: testRealmServerMatrixUserId, publishable: null, lastPublishedAt: null, }; diff --git a/packages/realm-server/tests/indexing-test.ts b/packages/realm-server/tests/indexing-test.ts index 5a8a485620c..6c6b7ff5ee9 100644 --- a/packages/realm-server/tests/indexing-test.ts +++ b/packages/realm-server/tests/indexing-test.ts @@ -2051,6 +2051,7 @@ module(basename(__filename), function () { }, consumer: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, }); diff --git a/packages/realm-server/tests/realm-auth-test.ts b/packages/realm-server/tests/realm-auth-test.ts index 94a6629558d..e3cea761222 100644 --- a/packages/realm-server/tests/realm-auth-test.ts +++ b/packages/realm-server/tests/realm-auth-test.ts @@ -12,6 +12,7 @@ import { insertUser, realmSecretSeed, testRealmHref, + testRealmServerMatrixUserId, } from './helpers'; import { createJWT as createRealmServerJWT } from '../utils/jwt'; @@ -25,6 +26,7 @@ module(basename(__filename), function () { permissions: { '*': ['read'], [matrixUserId]: ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, onRealmSetup: ({ dbAdapter: adapter, request: req }) => { dbAdapter = adapter; @@ -53,7 +55,7 @@ module(basename(__filename), function () { let existingRoom = await fetchSessionRoom( dbAdapter, - testRealmHref, + testRealmServerMatrixUserId, matrixUserId, ); assert.strictEqual( @@ -88,7 +90,7 @@ module(basename(__filename), function () { let sessionRoom = await fetchSessionRoom( dbAdapter, - testRealmHref, + testRealmServerMatrixUserId, matrixUserId, ); assert.strictEqual( diff --git a/packages/realm-server/tests/realm-endpoints-test.ts b/packages/realm-server/tests/realm-endpoints-test.ts index bbe372964fc..1aaf3f0f13e 100644 --- a/packages/realm-server/tests/realm-endpoints-test.ts +++ b/packages/realm-server/tests/realm-endpoints-test.ts @@ -113,6 +113,7 @@ module(basename(__filename), function () { '*': ['read', 'write'], user: ['read', 'write', 'realm-owner'], carol: ['read', 'write'], + '@node-test_realm:localhost': ['read'], }, realmURL, onRealmSetup, @@ -337,7 +338,6 @@ module(basename(__filename), function () { type: 'realm-config', attributes: { ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', backgroundURL: 'new-bg', }, }, @@ -934,7 +934,7 @@ module(basename(__filename), function () { assert.strictEqual(response.status, 200, 'HTTP 200 status'); }); - test('can index a newly added file', async function (assert) { + test.only('can index a newly added file', async function (assert) { let realmEventTimestampStart = Date.now(); let postResponse = await request @@ -1034,10 +1034,7 @@ module(basename(__filename), function () { module: '../person', name: 'Person', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { diff --git a/packages/realm-server/tests/realm-endpoints/info-test.ts b/packages/realm-server/tests/realm-endpoints/info-test.ts index d1d59c5171b..d77aed49d33 100644 --- a/packages/realm-server/tests/realm-endpoints/info-test.ts +++ b/packages/realm-server/tests/realm-endpoints/info-test.ts @@ -80,7 +80,6 @@ module(`realm-endpoints/${basename(__filename)}`, function () { type: 'realm-info', attributes: { ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', }, }, }, @@ -152,7 +151,6 @@ module(`realm-endpoints/${basename(__filename)}`, function () { attributes: { ...testRealmInfo, visibility: 'private', - realmUserId: '@node-test_realm:localhost', }, }, }, @@ -195,7 +193,6 @@ module(`realm-endpoints/${basename(__filename)}`, function () { attributes: { ...testRealmInfo, visibility: 'shared', - realmUserId: '@node-test_realm:localhost', }, }, }, @@ -239,7 +236,6 @@ module(`realm-endpoints/${basename(__filename)}`, function () { attributes: { ...testRealmInfo, visibility: 'shared', - realmUserId: '@node-test_realm:localhost', }, }, }, diff --git a/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts b/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts index cfc49cc1e58..00359115136 100644 --- a/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts +++ b/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts @@ -17,6 +17,7 @@ import { createJWT, realmSecretSeed, testRealmInfo, + testRealmServerMatrixUserId, } from '../helpers'; import { createJWT as createRealmServerJWT } from '../../utils/jwt'; import { setupServerEndpointsTest, testRealm2URL } from './helpers'; @@ -121,7 +122,7 @@ module(`server-endpoints/${basename(__filename)}`, function () { let sessionRoom = await fetchSessionRoom( context.dbAdapter, - json.data.id, + testRealmServerMatrixUserId, ownerUserId, ); assert.ok( diff --git a/packages/realm-server/tests/server-endpoints/user-and-catalog-test.ts b/packages/realm-server/tests/server-endpoints/user-and-catalog-test.ts index 1aebb19061a..ab0062d4265 100644 --- a/packages/realm-server/tests/server-endpoints/user-and-catalog-test.ts +++ b/packages/realm-server/tests/server-endpoints/user-and-catalog-test.ts @@ -85,7 +85,6 @@ module(`server-endpoints/${basename(__filename)}`, function () { id: `${testRealm2URL}`, attributes: { ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', }, }, ], diff --git a/packages/runtime-common/db-queries/session-room-queries.ts b/packages/runtime-common/db-queries/session-room-queries.ts index b49fc644a9b..091cac47776 100644 --- a/packages/runtime-common/db-queries/session-room-queries.ts +++ b/packages/runtime-common/db-queries/session-room-queries.ts @@ -14,6 +14,8 @@ export async function fetchSessionRoom( let rows = await query(dbAdapter, [ 'SELECT room_id FROM session_rooms WHERE realm_user_id =', param(realmUserId), + 'AND realm_url = ', + param(REALM_SERVER_REALM), 'AND matrix_user_id =', param(matrixUserId), ]);