Compare commits
6 Commits
8de5736a59
...
feat/push-
| Author | SHA1 | Date | |
|---|---|---|---|
| 30069377e7 | |||
| b1f7467161 | |||
| 7e944a08f6 | |||
| e45ad91340 | |||
| 3e96de730a | |||
| f54ed6abb5 |
@@ -32,6 +32,12 @@ introspects the user/guild tokens Center issues.
|
|||||||
- **Channel canvas** — one pinned document per channel (`md`/`html`/`text`),
|
- **Channel canvas** — one pinned document per channel (`md`/`html`/`text`),
|
||||||
re-share replaces, only the original sharer may update/remove; emits
|
re-share replaces, only the original sharer may update/remove; emits
|
||||||
`canvas.updated` / `canvas.removed`.
|
`canvas.updated` / `canvas.removed`.
|
||||||
|
- **Slash-command registry** — guild-global catalog: `PUT /api/commands`
|
||||||
|
(the OpenClaw plugin syncs OpenClaw's native-command specs here),
|
||||||
|
`GET /api/commands` (frontend `/` autocomplete). Stored verbatim;
|
||||||
|
execution is unchanged (a `/<cmd>` message flows normally to the plugin →
|
||||||
|
OpenClaw command system; only `/no-reply`,`/force-proceed` are
|
||||||
|
server-intercepted).
|
||||||
- **Realtime** — socket.io `/realtime`; `join_channel`/`leave_channel`,
|
- **Realtime** — socket.io `/realtime`; `join_channel`/`leave_channel`,
|
||||||
`message.created/updated/deleted`, `canvas.*`, presence, typing.
|
`message.created/updated/deleted`, `canvas.*`, presence, typing.
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "tsc -p tsconfig.build.json",
|
"build": "tsc -p tsconfig.build.json",
|
||||||
"start": "node dist/main.js",
|
"start": "node dist/main.js",
|
||||||
|
"print:commands-key": "node dist/cli/print-commands-sync-key.js",
|
||||||
"start:dev": "ts-node src/main.ts",
|
"start:dev": "ts-node src/main.ts",
|
||||||
"lint": "eslint 'src/**/*.ts'",
|
"lint": "eslint 'src/**/*.ts'",
|
||||||
"lint:fix": "eslint 'src/**/*.ts' --fix",
|
"lint:fix": "eslint 'src/**/*.ts' --fix",
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import { RealtimeModule } from './realtime/realtime.module.js';
|
|||||||
import { MembersModule } from './members/members.module.js';
|
import { MembersModule } from './members/members.module.js';
|
||||||
import { FilesModule } from './files/files.module.js';
|
import { FilesModule } from './files/files.module.js';
|
||||||
import { CanvasModule } from './canvas/canvas.module.js';
|
import { CanvasModule } from './canvas/canvas.module.js';
|
||||||
|
import { CommandsModule } from './commands/commands.module.js';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -28,6 +29,7 @@ import { CanvasModule } from './canvas/canvas.module.js';
|
|||||||
MessagingModule,
|
MessagingModule,
|
||||||
FilesModule,
|
FilesModule,
|
||||||
CanvasModule,
|
CanvasModule,
|
||||||
|
CommandsModule,
|
||||||
],
|
],
|
||||||
controllers: [HealthController, MetricsController],
|
controllers: [HealthController, MetricsController],
|
||||||
providers: [
|
providers: [
|
||||||
|
|||||||
@@ -5,8 +5,9 @@ import { Channel } from '../entities/channel.entity.js';
|
|||||||
import { ChannelMember } from '../entities/channel-member.entity.js';
|
import { ChannelMember } from '../entities/channel-member.entity.js';
|
||||||
import { WakeMapping } from '../entities/wake-mapping.entity.js';
|
import { WakeMapping } from '../entities/wake-mapping.entity.js';
|
||||||
import { TurnService } from './turn.service.js';
|
import { TurnService } from './turn.service.js';
|
||||||
|
import { RealtimeGateway } from '../realtime/realtime.gateway.js';
|
||||||
|
|
||||||
const X_TYPES = ['general', 'work', 'report', 'discuss', 'triage', 'custom'] as const;
|
const X_TYPES = ['general', 'work', 'report', 'discuss', 'triage', 'custom', 'dm'] as const;
|
||||||
type XType = (typeof X_TYPES)[number];
|
type XType = (typeof X_TYPES)[number];
|
||||||
|
|
||||||
type CreateChannelInput = {
|
type CreateChannelInput = {
|
||||||
@@ -35,8 +36,34 @@ export class ChannelsService {
|
|||||||
@InjectRepository(WakeMapping)
|
@InjectRepository(WakeMapping)
|
||||||
private readonly wakeRepo: Repository<WakeMapping>,
|
private readonly wakeRepo: Repository<WakeMapping>,
|
||||||
private readonly turnService: TurnService,
|
private readonly turnService: TurnService,
|
||||||
|
// RealtimeGateway is provided by the global RealtimeModule. Used to
|
||||||
|
// push channel.joined / channel.left so connected clients (e.g. the
|
||||||
|
// OpenClaw fabric plugin) can sub/unsub socket.io rooms immediately
|
||||||
|
// instead of waiting for the polling fallback.
|
||||||
|
private readonly realtime: RealtimeGateway,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
// Push a channel membership change to each affected user's socket-room.
|
||||||
|
// Best-effort: offline users see the new state on their next connect
|
||||||
|
// (the inbound runs an initial channel-list fetch on connect).
|
||||||
|
private notifyMembership(
|
||||||
|
kind: 'joined' | 'left',
|
||||||
|
channelId: string,
|
||||||
|
userIds: string[] | Set<string>,
|
||||||
|
extra: Record<string, unknown> = {},
|
||||||
|
): void {
|
||||||
|
const ids = userIds instanceof Set ? [...userIds] : userIds;
|
||||||
|
const payload = {
|
||||||
|
channelId,
|
||||||
|
...extra,
|
||||||
|
occurredAt: new Date().toISOString(),
|
||||||
|
};
|
||||||
|
for (const u of ids) {
|
||||||
|
if (!u) continue;
|
||||||
|
this.realtime.emitToUser(u, `channel.${kind}`, { ...payload, userId: u });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Channels visible to a user within a guild:
|
// Channels visible to a user within a guild:
|
||||||
// - every public channel of the guild (incl. ones created before the user
|
// - every public channel of the guild (incl. ones created before the user
|
||||||
// joined the guild), OR
|
// joined the guild), OR
|
||||||
@@ -93,6 +120,7 @@ export class ChannelsService {
|
|||||||
if (channel.xType === 'discuss' || channel.xType === 'work') {
|
if (channel.xType === 'discuss' || channel.xType === 'work') {
|
||||||
await this.turnService.onMemberAdded(channelId, userId);
|
await this.turnService.onMemberAdded(channelId, userId);
|
||||||
}
|
}
|
||||||
|
this.notifyMembership('joined', channelId, [userId], { xType: channel.xType });
|
||||||
}
|
}
|
||||||
return { status: 'ok', channelId, userId, member: true };
|
return { status: 'ok', channelId, userId, member: true };
|
||||||
}
|
}
|
||||||
@@ -102,11 +130,14 @@ export class ChannelsService {
|
|||||||
if (!channel) throw new NotFoundException('channel not found');
|
if (!channel) throw new NotFoundException('channel not found');
|
||||||
|
|
||||||
// remove every channel-scoped row that references this user
|
// remove every channel-scoped row that references this user
|
||||||
await this.memberRepo.delete({ channelId, userId });
|
const deleted = await this.memberRepo.delete({ channelId, userId });
|
||||||
await this.wakeRepo.delete({ channelId, userId });
|
await this.wakeRepo.delete({ channelId, userId });
|
||||||
if (channel.xType === 'discuss' || channel.xType === 'work') {
|
if (channel.xType === 'discuss' || channel.xType === 'work') {
|
||||||
await this.turnService.onMemberRemoved(channelId, userId);
|
await this.turnService.onMemberRemoved(channelId, userId);
|
||||||
}
|
}
|
||||||
|
if ((deleted.affected ?? 0) > 0) {
|
||||||
|
this.notifyMembership('left', channelId, [userId], { xType: channel.xType });
|
||||||
|
}
|
||||||
return { status: 'ok', channelId, userId, member: false };
|
return { status: 'ok', channelId, userId, member: false };
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -130,14 +161,19 @@ export class ChannelsService {
|
|||||||
.map((x) => String(x ?? '').trim())
|
.map((x) => String(x ?? '').trim())
|
||||||
.filter(Boolean);
|
.filter(Boolean);
|
||||||
|
|
||||||
|
// dm channels are always private (a 1:1 conversation); never public.
|
||||||
|
// dm is not unique — multiple dm channels between the same users are
|
||||||
|
// allowed (create() always makes a fresh one, no dedup).
|
||||||
|
const isPublic = xType === 'dm' ? false : Boolean(input.isPublic);
|
||||||
|
|
||||||
const channel = await this.channelRepo.save(
|
const channel = await this.channelRepo.save(
|
||||||
this.channelRepo.create({
|
this.channelRepo.create({
|
||||||
guildId,
|
guildId,
|
||||||
name,
|
name,
|
||||||
xType,
|
xType,
|
||||||
kind: input.kind === 'announcement' ? 'announcement' : 'text',
|
kind: input.kind === 'announcement' ? 'announcement' : 'text',
|
||||||
isPrivate: !input.isPublic,
|
isPrivate: !isPublic,
|
||||||
isPublic: Boolean(input.isPublic),
|
isPublic,
|
||||||
lastSeq: 0,
|
lastSeq: 0,
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
@@ -155,6 +191,12 @@ export class ChannelsService {
|
|||||||
[...memberIds].map((userId) => this.memberRepo.create({ channelId: channel.id, userId })),
|
[...memberIds].map((userId) => this.memberRepo.create({ channelId: channel.id, userId })),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Push channel.joined to every seeded member (creator + invitees +
|
||||||
|
// triage on-duty) so their connected sockets sub the new room
|
||||||
|
// immediately. Skips offline users — next connect's channel-list
|
||||||
|
// fetch covers them.
|
||||||
|
this.notifyMembership('joined', channel.id, memberIds, { xType });
|
||||||
|
|
||||||
// wake_mapping: triage -> the on-duty user; custom -> each listener
|
// wake_mapping: triage -> the on-duty user; custom -> each listener
|
||||||
const wakeUserIds = new Set<string>();
|
const wakeUserIds = new Set<string>();
|
||||||
if (xType === 'triage') wakeUserIds.add(onDuty);
|
if (xType === 'triage') wakeUserIds.add(onDuty);
|
||||||
|
|||||||
37
src/cli/print-commands-sync-key.ts
Normal file
37
src/cli/print-commands-sync-key.ts
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
// Operator convenience (Guild C-2): print the commands-sync key that this
|
||||||
|
// guild process actually has in its environment, so it can be copied into
|
||||||
|
// the OpenClaw plugin's FABRIC_COMMANDS_SYNC_KEY.
|
||||||
|
//
|
||||||
|
// Usage (inside the deployed container — authoritative, reflects compose):
|
||||||
|
// docker exec fabric-backend-guild node dist/cli/print-commands-sync-key.js
|
||||||
|
// docker exec fabric-backend-guild node dist/cli/print-commands-sync-key.js --export
|
||||||
|
//
|
||||||
|
// Default: prints the raw value only (so KEY=$(... ) works).
|
||||||
|
// --export: prints `FABRIC_COMMANDS_SYNC_KEY=<value>` for pasting.
|
||||||
|
// Exit 1 (no stdout) when unset — guild is then in the weaker
|
||||||
|
// "any authenticated user" fallback for PUT /commands.
|
||||||
|
|
||||||
|
const args = new Set(process.argv.slice(2));
|
||||||
|
|
||||||
|
if (args.has('--help') || args.has('-h')) {
|
||||||
|
process.stderr.write(
|
||||||
|
'print-commands-sync-key: outputs FABRIC_BACKEND_GUILD_COMMANDS_SYNC_KEY\n' +
|
||||||
|
' (no flag) print the raw key value\n' +
|
||||||
|
' --export print FABRIC_COMMANDS_SYNC_KEY=<value>\n',
|
||||||
|
);
|
||||||
|
process.exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
const key = (process.env.FABRIC_BACKEND_GUILD_COMMANDS_SYNC_KEY ?? '').trim();
|
||||||
|
|
||||||
|
if (!key) {
|
||||||
|
process.stderr.write(
|
||||||
|
'FABRIC_BACKEND_GUILD_COMMANDS_SYNC_KEY is not set — PUT /commands is in ' +
|
||||||
|
'the fallback mode (any authenticated user). Set it to harden (Guild C-2).\n',
|
||||||
|
);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
process.stdout.write(
|
||||||
|
(args.has('--export') ? `FABRIC_COMMANDS_SYNC_KEY=${key}` : key) + '\n',
|
||||||
|
);
|
||||||
57
src/commands/commands.controller.ts
Normal file
57
src/commands/commands.controller.ts
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
import {
|
||||||
|
Body,
|
||||||
|
Controller,
|
||||||
|
ForbiddenException,
|
||||||
|
Get,
|
||||||
|
Headers,
|
||||||
|
Put,
|
||||||
|
Req,
|
||||||
|
UnauthorizedException,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { timingSafeEqual } from 'node:crypto';
|
||||||
|
import { CommandsService } from './commands.service.js';
|
||||||
|
import { SyncCommandsDto } from './dto.sync-commands.dto.js';
|
||||||
|
|
||||||
|
type AuthedRequest = { userId?: string };
|
||||||
|
|
||||||
|
function safeEqual(a: string, b: string): boolean {
|
||||||
|
const ab = Buffer.from(a);
|
||||||
|
const bb = Buffer.from(b);
|
||||||
|
if (ab.length !== bb.length) return false;
|
||||||
|
return timingSafeEqual(ab, bb);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Controller('commands')
|
||||||
|
export class CommandsController {
|
||||||
|
constructor(private readonly commands: CommandsService) {}
|
||||||
|
|
||||||
|
// Guild C-2: catalog write is privileged. When
|
||||||
|
// FABRIC_BACKEND_GUILD_COMMANDS_SYNC_KEY is configured (recommended in
|
||||||
|
// production), the caller must present a matching x-commands-sync-key
|
||||||
|
// header — this restricts writes to the OpenClaw plugin. When unset, we
|
||||||
|
// fall back to "any authenticated agent/user" (never weaker than before).
|
||||||
|
// The body is always strictly validated + size-capped via SyncCommandsDto.
|
||||||
|
@Put()
|
||||||
|
sync(
|
||||||
|
@Req() req: AuthedRequest,
|
||||||
|
@Body() body: SyncCommandsDto,
|
||||||
|
@Headers('x-commands-sync-key') syncKey?: string,
|
||||||
|
) {
|
||||||
|
const configured = process.env.FABRIC_BACKEND_GUILD_COMMANDS_SYNC_KEY ?? '';
|
||||||
|
if (configured) {
|
||||||
|
if (!syncKey || !safeEqual(syncKey, configured)) {
|
||||||
|
throw new ForbiddenException('invalid commands sync key');
|
||||||
|
}
|
||||||
|
} else if (!req.userId) {
|
||||||
|
throw new UnauthorizedException('missing user');
|
||||||
|
}
|
||||||
|
return this.commands.sync(body.commands as unknown[]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Frontend reads the catalog to drive `/` autocomplete.
|
||||||
|
@Get()
|
||||||
|
list(@Req() req: AuthedRequest) {
|
||||||
|
if (!req.userId) throw new UnauthorizedException('missing user');
|
||||||
|
return this.commands.list();
|
||||||
|
}
|
||||||
|
}
|
||||||
12
src/commands/commands.module.ts
Normal file
12
src/commands/commands.module.ts
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
|
import { GuildCommand } from '../entities/guild-command.entity.js';
|
||||||
|
import { CommandsController } from './commands.controller.js';
|
||||||
|
import { CommandsService } from './commands.service.js';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [TypeOrmModule.forFeature([GuildCommand])],
|
||||||
|
controllers: [CommandsController],
|
||||||
|
providers: [CommandsService],
|
||||||
|
})
|
||||||
|
export class CommandsModule {}
|
||||||
39
src/commands/commands.service.ts
Normal file
39
src/commands/commands.service.ts
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
|
import { Repository } from 'typeorm';
|
||||||
|
import { GuildCommand } from '../entities/guild-command.entity.js';
|
||||||
|
|
||||||
|
// This node's guild id (one guild per node).
|
||||||
|
function guildId(): string {
|
||||||
|
return process.env.FABRIC_BACKEND_GUILD_NODE_ID ?? 'guild';
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class CommandsService {
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(GuildCommand)
|
||||||
|
private readonly repo: Repository<GuildCommand>,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
// Replace the whole guild-global slash-command catalog (idempotent;
|
||||||
|
// the plugin re-PUTs the full set on every gateway start).
|
||||||
|
async sync(commands: unknown[]): Promise<{ status: string; count: number }> {
|
||||||
|
const gid = guildId();
|
||||||
|
let row = await this.repo.findOne({ where: { guildId: gid } });
|
||||||
|
if (row) {
|
||||||
|
row.commands = commands;
|
||||||
|
} else {
|
||||||
|
row = this.repo.create({ guildId: gid, commands });
|
||||||
|
}
|
||||||
|
await this.repo.save(row);
|
||||||
|
return { status: 'ok', count: commands.length };
|
||||||
|
}
|
||||||
|
|
||||||
|
async list(): Promise<{ commands: unknown[]; updatedAt: string | null }> {
|
||||||
|
const row = await this.repo.findOne({ where: { guildId: guildId() } });
|
||||||
|
return {
|
||||||
|
commands: row?.commands ?? [],
|
||||||
|
updatedAt: row?.updatedAt ? row.updatedAt.toISOString() : null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
102
src/commands/dto.sync-commands.dto.ts
Normal file
102
src/commands/dto.sync-commands.dto.ts
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
import {
|
||||||
|
ArrayMaxSize,
|
||||||
|
IsArray,
|
||||||
|
IsBoolean,
|
||||||
|
IsOptional,
|
||||||
|
IsString,
|
||||||
|
MaxLength,
|
||||||
|
ValidateNested,
|
||||||
|
} from 'class-validator';
|
||||||
|
import { Type } from 'class-transformer';
|
||||||
|
|
||||||
|
// Guild C-2: the slash-command catalog is guild-global and rendered by the
|
||||||
|
// frontend `/` autocomplete. Without a strict schema + caps a single
|
||||||
|
// authenticated caller could poison it or blow up the DB / clients.
|
||||||
|
// The global ValidationPipe runs with { whitelist, forbidNonWhitelisted },
|
||||||
|
// so any unknown field is rejected.
|
||||||
|
|
||||||
|
class CommandChoiceDto {
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(200)
|
||||||
|
value!: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(200)
|
||||||
|
label!: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
class CommandArgDto {
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(100)
|
||||||
|
name!: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(500)
|
||||||
|
description?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(40)
|
||||||
|
type?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
required?: boolean;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
captureRemaining?: boolean;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
preferAutocomplete?: boolean;
|
||||||
|
|
||||||
|
// null when there are no choices (plugin sends explicit null).
|
||||||
|
@IsOptional()
|
||||||
|
@IsArray()
|
||||||
|
@ArrayMaxSize(100)
|
||||||
|
@ValidateNested({ each: true })
|
||||||
|
@Type(() => CommandChoiceDto)
|
||||||
|
choices?: CommandChoiceDto[] | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
class CommandSpecDto {
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(100)
|
||||||
|
name!: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(100)
|
||||||
|
nativeName?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(500)
|
||||||
|
description?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
acceptsArgs?: boolean;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsArray()
|
||||||
|
@ArrayMaxSize(50)
|
||||||
|
@ValidateNested({ each: true })
|
||||||
|
@Type(() => CommandArgDto)
|
||||||
|
args?: CommandArgDto[];
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(20)
|
||||||
|
argsParsing?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class SyncCommandsDto {
|
||||||
|
@IsArray()
|
||||||
|
@ArrayMaxSize(200)
|
||||||
|
@ValidateNested({ each: true })
|
||||||
|
@Type(() => CommandSpecDto)
|
||||||
|
commands!: CommandSpecDto[];
|
||||||
|
}
|
||||||
@@ -13,6 +13,7 @@ import { GuildMemberRole } from './entities/guild-member-role.entity.js';
|
|||||||
import { IdempotencyRecord } from './entities/idempotency-record.entity.js';
|
import { IdempotencyRecord } from './entities/idempotency-record.entity.js';
|
||||||
import { StoredFile } from './entities/stored-file.entity.js';
|
import { StoredFile } from './entities/stored-file.entity.js';
|
||||||
import { ChannelCanvas } from './entities/channel-canvas.entity.js';
|
import { ChannelCanvas } from './entities/channel-canvas.entity.js';
|
||||||
|
import { GuildCommand } from './entities/guild-command.entity.js';
|
||||||
|
|
||||||
export const buildTypeOrmConfig = (): TypeOrmModuleOptions => ({
|
export const buildTypeOrmConfig = (): TypeOrmModuleOptions => ({
|
||||||
type: 'mysql',
|
type: 'mysql',
|
||||||
@@ -36,6 +37,7 @@ export const buildTypeOrmConfig = (): TypeOrmModuleOptions => ({
|
|||||||
IdempotencyRecord,
|
IdempotencyRecord,
|
||||||
StoredFile,
|
StoredFile,
|
||||||
ChannelCanvas,
|
ChannelCanvas,
|
||||||
|
GuildCommand,
|
||||||
],
|
],
|
||||||
synchronize: (process.env.FABRIC_BACKEND_GUILD_DB_SYNC ?? 'true') === 'true',
|
synchronize: (process.env.FABRIC_BACKEND_GUILD_DB_SYNC ?? 'true') === 'true',
|
||||||
logging: (process.env.FABRIC_BACKEND_GUILD_DB_LOGGING ?? 'false') === 'true',
|
logging: (process.env.FABRIC_BACKEND_GUILD_DB_LOGGING ?? 'false') === 'true',
|
||||||
|
|||||||
@@ -16,9 +16,9 @@ export class Channel {
|
|||||||
@Column({
|
@Column({
|
||||||
name: 'x_type',
|
name: 'x_type',
|
||||||
type: 'enum',
|
type: 'enum',
|
||||||
enum: ['general', 'work', 'report', 'discuss', 'triage', 'custom'],
|
enum: ['general', 'work', 'report', 'discuss', 'triage', 'custom', 'dm'],
|
||||||
})
|
})
|
||||||
xType!: 'general' | 'work' | 'report' | 'discuss' | 'triage' | 'custom';
|
xType!: 'general' | 'work' | 'report' | 'discuss' | 'triage' | 'custom' | 'dm';
|
||||||
|
|
||||||
@Column({ type: 'varchar', length: 16, default: 'text' })
|
@Column({ type: 'varchar', length: 16, default: 'text' })
|
||||||
kind!: 'text' | 'announcement';
|
kind!: 'text' | 'announcement';
|
||||||
|
|||||||
25
src/entities/guild-command.entity.ts
Normal file
25
src/entities/guild-command.entity.ts
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
import { Column, Entity, Index, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm';
|
||||||
|
|
||||||
|
// Guild-global slash-command catalog. One row per guild (this node's
|
||||||
|
// FABRIC_BACKEND_GUILD_NODE_ID). The OpenClaw plugin PUTs the OpenClaw
|
||||||
|
// native-command specs here (the same data Discord registers as slash
|
||||||
|
// commands); the frontend GETs it to drive `/` autocomplete. The guild
|
||||||
|
// node stores the catalog opaquely — it does not interpret command bodies.
|
||||||
|
@Entity('guild_commands')
|
||||||
|
export class GuildCommand {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id!: string;
|
||||||
|
|
||||||
|
@Index({ unique: true })
|
||||||
|
@Column({ name: 'guild_id', type: 'varchar', length: 80 })
|
||||||
|
guildId!: string;
|
||||||
|
|
||||||
|
// NativeCommandSpec[]-shaped (name, nativeName, description, acceptsArgs,
|
||||||
|
// args[{name,description,type,required,choices:[{value,label}],
|
||||||
|
// captureRemaining,preferAutocomplete}], argsParsing). Stored verbatim.
|
||||||
|
@Column({ type: 'json' })
|
||||||
|
commands!: unknown[];
|
||||||
|
|
||||||
|
@UpdateDateColumn()
|
||||||
|
updatedAt!: Date;
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ import {
|
|||||||
ConflictException,
|
ConflictException,
|
||||||
Controller,
|
Controller,
|
||||||
Delete,
|
Delete,
|
||||||
|
ForbiddenException,
|
||||||
Get,
|
Get,
|
||||||
Headers,
|
Headers,
|
||||||
NotFoundException,
|
NotFoundException,
|
||||||
@@ -10,11 +11,13 @@ import {
|
|||||||
Patch,
|
Patch,
|
||||||
Post,
|
Post,
|
||||||
Query,
|
Query,
|
||||||
|
Req,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { InjectRepository } from '@nestjs/typeorm';
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
import { DataSource, Repository } from 'typeorm';
|
import { DataSource, Repository } from 'typeorm';
|
||||||
import { CreateMessageDto } from './dto.create-message.dto.js';
|
import { CreateMessageDto } from './dto.create-message.dto.js';
|
||||||
import { Channel } from '../entities/channel.entity.js';
|
import { Channel } from '../entities/channel.entity.js';
|
||||||
|
import { ChannelMember } from '../entities/channel-member.entity.js';
|
||||||
import { Message } from '../entities/message.entity.js';
|
import { Message } from '../entities/message.entity.js';
|
||||||
import { IdempotencyRecord } from '../entities/idempotency-record.entity.js';
|
import { IdempotencyRecord } from '../entities/idempotency-record.entity.js';
|
||||||
import { WakeMapping } from '../entities/wake-mapping.entity.js';
|
import { WakeMapping } from '../entities/wake-mapping.entity.js';
|
||||||
@@ -36,6 +39,8 @@ export class MessagingController {
|
|||||||
private readonly dataSource: DataSource,
|
private readonly dataSource: DataSource,
|
||||||
@InjectRepository(Channel)
|
@InjectRepository(Channel)
|
||||||
private readonly channelRepo: Repository<Channel>,
|
private readonly channelRepo: Repository<Channel>,
|
||||||
|
@InjectRepository(ChannelMember)
|
||||||
|
private readonly memberRepo: Repository<ChannelMember>,
|
||||||
@InjectRepository(Message)
|
@InjectRepository(Message)
|
||||||
private readonly messageRepo: Repository<Message>,
|
private readonly messageRepo: Repository<Message>,
|
||||||
@InjectRepository(IdempotencyRecord)
|
@InjectRepository(IdempotencyRecord)
|
||||||
@@ -86,6 +91,19 @@ export class MessagingController {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Channel-participant gate (Guild C-1): public channels are readable/
|
||||||
|
// writable by any authenticated user; private channels require explicit
|
||||||
|
// channel_members membership. Returns the channel so callers can reuse it.
|
||||||
|
private async assertParticipant(channelId: string, userId: string): Promise<Channel> {
|
||||||
|
const channel = await this.channelRepo.findOne({ where: { id: channelId } });
|
||||||
|
if (!channel) throw new NotFoundException('channel not found');
|
||||||
|
if (channel.isPublic) return channel;
|
||||||
|
if (!userId) throw new ForbiddenException('not a channel member');
|
||||||
|
const member = await this.memberRepo.findOne({ where: { channelId, userId } });
|
||||||
|
if (!member) throw new ForbiddenException('not a channel member');
|
||||||
|
return channel;
|
||||||
|
}
|
||||||
|
|
||||||
// Persists one message (allocates a seq under a channel row lock) and
|
// Persists one message (allocates a seq under a channel row lock) and
|
||||||
// returns its view. Used for normal messages and for guild /ack messages.
|
// returns its view. Used for normal messages and for guild /ack messages.
|
||||||
private async persistMessage(
|
private async persistMessage(
|
||||||
@@ -136,20 +154,25 @@ export class MessagingController {
|
|||||||
async create(
|
async create(
|
||||||
@Param('id') channelId: string,
|
@Param('id') channelId: string,
|
||||||
@Body() body: CreateMessageDto,
|
@Body() body: CreateMessageDto,
|
||||||
|
@Req() req: { userId?: string },
|
||||||
@Headers('idempotency-key') idempotencyKey?: string,
|
@Headers('idempotency-key') idempotencyKey?: string,
|
||||||
) {
|
) {
|
||||||
const scope = `POST:/channels/${channelId}/messages`;
|
const scope = `POST:/channels/${channelId}/messages`;
|
||||||
const existed = await this.getIdempotentResponse(scope, idempotencyKey);
|
const existed = await this.getIdempotentResponse(scope, idempotencyKey);
|
||||||
if (existed) return existed;
|
if (existed) return existed;
|
||||||
|
|
||||||
const channel = await this.channelRepo.findOne({ where: { id: channelId } });
|
// Guild C-1: caller must be a participant of the channel, and the
|
||||||
if (!channel) throw new NotFoundException('channel not found');
|
// author is always the authenticated user — body.authorUserId is
|
||||||
|
// ignored so a caller can never post as someone else.
|
||||||
|
const userId = String(req.userId ?? '');
|
||||||
|
if (!userId) throw new ForbiddenException('missing user');
|
||||||
|
const channel = await this.assertParticipant(channelId, userId);
|
||||||
if (channel.closed) {
|
if (channel.closed) {
|
||||||
throw new ConflictException({ error: 'channel_closed', message: 'channel is closed' });
|
throw new ConflictException({ error: 'channel_closed', message: 'channel is closed' });
|
||||||
}
|
}
|
||||||
const xType = channel.xType ?? 'general';
|
const xType = channel.xType ?? 'general';
|
||||||
const isRotating = xType === 'discuss' || xType === 'work';
|
const isRotating = xType === 'discuss' || xType === 'work';
|
||||||
const authorUserId = String(body.authorUserId ?? 'anonymous');
|
const authorUserId = userId;
|
||||||
|
|
||||||
// ---- translate <@user.name:NAME> -> <@userId> (outside backticks) via
|
// ---- translate <@user.name:NAME> -> <@userId> (outside backticks) via
|
||||||
// Center before anything else persists/parses the content
|
// Center before anything else persists/parses the content
|
||||||
@@ -223,14 +246,23 @@ export class MessagingController {
|
|||||||
@Param('id') channelId: string,
|
@Param('id') channelId: string,
|
||||||
@Param('messageId') messageId: string,
|
@Param('messageId') messageId: string,
|
||||||
@Body() body: { content?: string },
|
@Body() body: { content?: string },
|
||||||
|
@Req() req: { userId?: string },
|
||||||
@Headers('idempotency-key') idempotencyKey?: string,
|
@Headers('idempotency-key') idempotencyKey?: string,
|
||||||
) {
|
) {
|
||||||
const scope = `PATCH:/channels/${channelId}/messages/${messageId}`;
|
const scope = `PATCH:/channels/${channelId}/messages/${messageId}`;
|
||||||
const existed = await this.getIdempotentResponse(scope, idempotencyKey);
|
const existed = await this.getIdempotentResponse(scope, idempotencyKey);
|
||||||
if (existed) return existed;
|
if (existed) return existed;
|
||||||
|
|
||||||
|
// Guild C-1: participant + author-ownership.
|
||||||
|
const userId = String(req.userId ?? '');
|
||||||
|
if (!userId) throw new ForbiddenException('missing user');
|
||||||
|
await this.assertParticipant(channelId, userId);
|
||||||
|
|
||||||
const item = await this.messageRepo.findOne({ where: { channelId, messageId } });
|
const item = await this.messageRepo.findOne({ where: { channelId, messageId } });
|
||||||
if (!item) return { status: 'not_found' };
|
if (!item) return { status: 'not_found' };
|
||||||
|
if (item.authorUserId !== userId) {
|
||||||
|
throw new ForbiddenException('not the message author');
|
||||||
|
}
|
||||||
|
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
const createdAt = new Date(item.createdAt).getTime();
|
const createdAt = new Date(item.createdAt).getTime();
|
||||||
@@ -259,14 +291,23 @@ export class MessagingController {
|
|||||||
async remove(
|
async remove(
|
||||||
@Param('id') channelId: string,
|
@Param('id') channelId: string,
|
||||||
@Param('messageId') messageId: string,
|
@Param('messageId') messageId: string,
|
||||||
|
@Req() req: { userId?: string },
|
||||||
@Headers('idempotency-key') idempotencyKey?: string,
|
@Headers('idempotency-key') idempotencyKey?: string,
|
||||||
) {
|
) {
|
||||||
const scope = `DELETE:/channels/${channelId}/messages/${messageId}`;
|
const scope = `DELETE:/channels/${channelId}/messages/${messageId}`;
|
||||||
const existed = await this.getIdempotentResponse(scope, idempotencyKey);
|
const existed = await this.getIdempotentResponse(scope, idempotencyKey);
|
||||||
if (existed) return existed;
|
if (existed) return existed;
|
||||||
|
|
||||||
|
// Guild C-1: participant + author-ownership.
|
||||||
|
const userId = String(req.userId ?? '');
|
||||||
|
if (!userId) throw new ForbiddenException('missing user');
|
||||||
|
await this.assertParticipant(channelId, userId);
|
||||||
|
|
||||||
const item = await this.messageRepo.findOne({ where: { channelId, messageId } });
|
const item = await this.messageRepo.findOne({ where: { channelId, messageId } });
|
||||||
if (!item) return { status: 'not_found' };
|
if (!item) return { status: 'not_found' };
|
||||||
|
if (item.authorUserId !== userId) {
|
||||||
|
throw new ForbiddenException('not the message author');
|
||||||
|
}
|
||||||
|
|
||||||
item.isDeleted = true;
|
item.isDeleted = true;
|
||||||
item.deletedAt = new Date();
|
item.deletedAt = new Date();
|
||||||
@@ -304,10 +345,14 @@ export class MessagingController {
|
|||||||
@Get()
|
@Get()
|
||||||
async listBySeq(
|
async listBySeq(
|
||||||
@Param('id') channelId: string,
|
@Param('id') channelId: string,
|
||||||
|
@Req() req: { userId?: string },
|
||||||
@Query('seq_from') seqFrom?: string,
|
@Query('seq_from') seqFrom?: string,
|
||||||
@Query('seq_to') seqTo?: string,
|
@Query('seq_to') seqTo?: string,
|
||||||
@Query('limit') limit?: string,
|
@Query('limit') limit?: string,
|
||||||
) {
|
) {
|
||||||
|
// Guild C-1: only participants may read channel history.
|
||||||
|
const userId = String(req.userId ?? '');
|
||||||
|
if (!userId) throw new ForbiddenException('missing user');
|
||||||
const from = seqFrom ? Number(seqFrom) : 1;
|
const from = seqFrom ? Number(seqFrom) : 1;
|
||||||
const to = seqTo ? Number(seqTo) : Number.MAX_SAFE_INTEGER;
|
const to = seqTo ? Number(seqTo) : Number.MAX_SAFE_INTEGER;
|
||||||
const safeLimit = clampLimit(limit, DEFAULT_PAGE_LIMIT, MAX_PAGE_LIMIT);
|
const safeLimit = clampLimit(limit, DEFAULT_PAGE_LIMIT, MAX_PAGE_LIMIT);
|
||||||
@@ -327,10 +372,7 @@ export class MessagingController {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const channel = await this.channelRepo.findOne({ where: { id: channelId } });
|
const channel = await this.assertParticipant(channelId, userId);
|
||||||
if (!channel) {
|
|
||||||
throw new NotFoundException('channel not found');
|
|
||||||
}
|
|
||||||
|
|
||||||
const qb = this.messageRepo
|
const qb = this.messageRepo
|
||||||
.createQueryBuilder('m')
|
.createQueryBuilder('m')
|
||||||
|
|||||||
@@ -2,12 +2,13 @@ import { Module } from '@nestjs/common';
|
|||||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
import { MessagingController } from './messaging.controller.js';
|
import { MessagingController } from './messaging.controller.js';
|
||||||
import { Channel } from '../entities/channel.entity.js';
|
import { Channel } from '../entities/channel.entity.js';
|
||||||
|
import { ChannelMember } from '../entities/channel-member.entity.js';
|
||||||
import { Message } from '../entities/message.entity.js';
|
import { Message } from '../entities/message.entity.js';
|
||||||
import { IdempotencyRecord } from '../entities/idempotency-record.entity.js';
|
import { IdempotencyRecord } from '../entities/idempotency-record.entity.js';
|
||||||
import { WakeMapping } from '../entities/wake-mapping.entity.js';
|
import { WakeMapping } from '../entities/wake-mapping.entity.js';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [TypeOrmModule.forFeature([Channel, Message, IdempotencyRecord, WakeMapping])],
|
imports: [TypeOrmModule.forFeature([Channel, ChannelMember, Message, IdempotencyRecord, WakeMapping])],
|
||||||
controllers: [MessagingController],
|
controllers: [MessagingController],
|
||||||
})
|
})
|
||||||
export class MessagingModule {}
|
export class MessagingModule {}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import { Logger } from '@nestjs/common';
|
|||||||
import { Server, Socket } from 'socket.io';
|
import { Server, Socket } from 'socket.io';
|
||||||
import { introspectGuildToken } from '../common/center-auth.js';
|
import { introspectGuildToken } from '../common/center-auth.js';
|
||||||
|
|
||||||
type XType = 'general' | 'work' | 'report' | 'discuss' | 'triage' | 'custom';
|
type XType = 'general' | 'work' | 'report' | 'discuss' | 'triage' | 'custom' | 'dm';
|
||||||
|
|
||||||
// Wakeup for non-rotating channels only (general/report/triage/custom).
|
// Wakeup for non-rotating channels only (general/report/triage/custom).
|
||||||
// discuss/work go through TurnService + emitMessageTargeted, never here.
|
// discuss/work go through TurnService + emitMessageTargeted, never here.
|
||||||
@@ -40,6 +40,9 @@ export function computeWakeup(args: {
|
|||||||
case 'triage':
|
case 'triage':
|
||||||
case 'custom':
|
case 'custom':
|
||||||
return wakeUserIds.has(recipientUserId);
|
return wakeUserIds.has(recipientUserId);
|
||||||
|
case 'dm':
|
||||||
|
// 1:1 conversation: every non-author participant is always woken.
|
||||||
|
return true;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -93,6 +96,10 @@ export class RealtimeGateway implements OnGatewayConnection, OnGatewayDisconnect
|
|||||||
const userId = result.user.id || this.userIdFromClient(client);
|
const userId = result.user.id || this.userIdFromClient(client);
|
||||||
client.data.userId = userId;
|
client.data.userId = userId;
|
||||||
this.onlineUsers.add(userId);
|
this.onlineUsers.add(userId);
|
||||||
|
// Per-user room: lets server code emit user-scoped events (e.g.
|
||||||
|
// channel.joined when membership changes) without bookkeeping a
|
||||||
|
// userId→sockets map. All of this user's sockets receive the event.
|
||||||
|
client.join(`user:${userId}`);
|
||||||
this.server.emit('presence.online', {
|
this.server.emit('presence.online', {
|
||||||
userId,
|
userId,
|
||||||
onlineCount: this.onlineUsers.size,
|
onlineCount: this.onlineUsers.size,
|
||||||
@@ -168,6 +175,14 @@ export class RealtimeGateway implements OnGatewayConnection, OnGatewayDisconnect
|
|||||||
this.server.to(`channel:${channelId}`).emit(event, data);
|
this.server.to(`channel:${channelId}`).emit(event, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Emit a user-scoped event to all sockets currently connected for `userId`
|
||||||
|
// (via the `user:<userId>` room joined in handleConnection). No-op for
|
||||||
|
// offline users — the next connect's initial channel-list fetch covers it.
|
||||||
|
emitToUser(userId: string, event: string, data: Record<string, unknown>): void {
|
||||||
|
if (!userId) return;
|
||||||
|
this.server.to(`user:${userId}`).emit(event, data);
|
||||||
|
}
|
||||||
|
|
||||||
// Emits message.created per-recipient so each carries its own `wakeup` flag.
|
// Emits message.created per-recipient so each carries its own `wakeup` flag.
|
||||||
async emitMessageCreated(
|
async emitMessageCreated(
|
||||||
channelId: string,
|
channelId: string,
|
||||||
@@ -189,7 +204,7 @@ export class RealtimeGateway implements OnGatewayConnection, OnGatewayDisconnect
|
|||||||
wakeUserIds: ctx.wakeUserIds,
|
wakeUserIds: ctx.wakeUserIds,
|
||||||
mentionUserIds: ctx.mentionUserIds,
|
mentionUserIds: ctx.mentionUserIds,
|
||||||
});
|
});
|
||||||
s.emit('message.created', { ...data, channelId, wakeup });
|
s.emit('message.created', { ...data, channelId, wakeup, xType: ctx.xType });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user