Skip to content

feat: create room with state design #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
debdutdeb merged 2 commits into from
Jul 24, 2025
Merged

feat: create room with state design #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c796cd
create room with state design
debdutdeb Jul 23, 2025
1bff113
fix: missing awaits
Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/core/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ export * from './events/utils/createSignedEvent';
export * from './models/event.model';

// Procedures
export { createRoom, type IdAndEvent } from './procedures/createRoom';
export { makeJoinEventBuilder } from './procedures/makeJoin';
export { makeGetMissingEventsProcedure } from './procedures/getMissingEvents';
export {
Expand Down
124 changes: 0 additions & 124 deletions packages/core/src/procedures/createRoom.spec.ts
View file
Open in desktop

This file was deleted.

121 changes: 0 additions & 121 deletions packages/core/src/procedures/createRoom.ts
View file
Open in desktop

This file was deleted.

14 changes: 9 additions & 5 deletions packages/federation-sdk/src/services/room.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ import { inject, singleton } from 'tsyringe';

import { ForbiddenError, HttpException, HttpStatus } from '@hs/core';
import { type SigningKey } from '@hs/core';
import type {
EventStore,
EventBaseWithOptionalId as ModelEventBase,
} from '@hs/core';

import { logger } from '@hs/core';
import { ConfigService } from './config.service';
import { EventService } from './event.service';
Expand Down Expand Up @@ -214,13 +219,12 @@ export class RoomService {
sender: string,
name: string,
joinRule: PduJoinRuleEventContent['join_rule'],
roomVersion: RoomVersion,
) {
logger.debug(`Creating room for ${sender} with ${username}`);

const roomCreateEvent = PersistentEventFactory.newCreateEvent(
username,
roomVersion,
PersistentEventFactory.defaultRoomVersion,
);

const stateService = this.stateService;
Expand All @@ -245,7 +249,7 @@ export class RoomService {
roomCreateEvent.roomId,
username,
name,
roomVersion,
PersistentEventFactory.defaultRoomVersion,
);

await stateService.addAuthEvents(roomNameEvent);
Expand All @@ -270,7 +274,7 @@ export class RoomService {
redact: 50,
invite: 50,
},
roomVersion,
PersistentEventFactory.defaultRoomVersion,
);

await stateService.addAuthEvents(powerLevelEvent);
Expand All @@ -283,7 +287,7 @@ export class RoomService {
roomCreateEvent.roomId,
username,
joinRule,
roomVersion,
PersistentEventFactory.defaultRoomVersion,
);

await stateService.addAuthEvents(joinRuleEvent);
Expand Down
6 changes: 3 additions & 3 deletions packages/federation-sdk/src/services/state.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ export class StateService {

const signedEvent = await this.signEvent(event);

this.eventRepository.create(
await this.eventRepository.create(
signedEvent.event as any,
event.eventId,
stateMappingId.toString(),
Expand All @@ -369,7 +369,7 @@ export class StateService {
// state did not change
// just persist the event
// TODO: mark rejected, although no code yet uses it so let it go
this.eventRepository.create(
await this.eventRepository.create(
resolvedEvent.event as any /* TODO: fix this with type unifi */,
resolvedEvent.eventId,
'',
Expand Down Expand Up @@ -492,7 +492,7 @@ export class StateService {
// TODO: mark rejected, although no code yet uses it so let it go
const signedEvent = await this.signEvent(resolvedEvent);

this.eventRepository.create(
await this.eventRepository.create(
signedEvent.event as any,
resolvedEvent.eventId,
'',
Expand Down
16 changes: 7 additions & 9 deletions packages/homeserver/src/controllers/internal/room.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,15 @@ export const internalRoomPlugin = (app: Elysia) => {
.post(
'/internal/rooms/rooms',
async ({ body }): Promise<InternalCreateRoomResponse | ErrorResponse> => {
const { username, sender, name } = body;
return roomService.createRoom(
username,
sender,
name,
body.join_rule as any,
'11',
);
const { creator, join_rule, name } = body;
return roomService.createRoom(creator, creator, name, join_rule);
},
{
body: InternalCreateRoomBodyDto,
body: t.Object({
creator: t.String(),
name: t.String(),
join_rule: t.Union([t.Literal('public'), t.Literal('invite')]),
}),
response: {
200: InternalCreateRoomResponseDto,
400: ErrorResponseDto,
Expand Down
2 changes: 2 additions & 0 deletions packages/room/src/manager/factory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ export class PersistentEventFactory {
'11',
] as RoomVersion[];

static defaultRoomVersion = '10' as const; // same as synapse

static isSupportedRoomVersion(roomVersion: RoomVersion) {
return PersistentEventFactory.supportedRoomVersions.includes(roomVersion);
}
Expand Down