Merge pull request #1 from HARRIFIED/moderator-role

Moderator role

Author: HARRIFIED

.gitignore

@@ -57,3 +57,5 @@ pids
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+summary.txt

package.json

@@ -36,7 +36,7 @@
     "@nestjs/websockets": "^10.4.20",
     "bcryptjs": "^3.0.3",
     "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.2",
+    "class-validator": "^0.14.3",
     "ioredis": "^5.8.2",
     "pg": "^8.16.3",
     "reflect-metadata": "^0.2.0",

src/app.module.ts

@@ -24,7 +24,7 @@ import { HealthModule } from './health/health.module';
         port: Number(process.env.DATABASE_PORT || 5432),
         username: process.env.DATABASE_USER || 'postgres',
         password: process.env.DATABASE_PASS || 'postgres',
-        database: process.env.DATABASE_NAME || 'anonymous_chat',
+        database: process.env.DATABASE_NAME || 'anonchat',
         synchronize: false,
         entities: [__dirname + '/**/*.entity.{js,ts}'],
         migrations: [__dirname + '/migrations/*.{js,ts}'],

src/auth/role.enum.ts

@@ -0,0 +1,4 @@
+export enum Role {
+  PARTICIPANT = 'PARTICIPANT',
+  MODERATOR = 'MODERATOR'
+}

src/auth/session.service.ts

@@ -2,6 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';
 import { v4 as uuidv4 } from 'uuid';
 import * as crypto from 'crypto';
 import { RedisService } from '../redis/redis.service';
+import { Role } from './role.enum';
 
 @Injectable()
 export class SessionService {
@@ -24,7 +25,8 @@ export class SessionService {
     username: string, 
     avatar?: string,
     ip?: string,
-    userAgent?: string
+    userAgent?: string,
+    role: Role = Role.PARTICIPANT
   ) {
     const sessionId = uuidv4();
     const sessionToken = crypto.randomBytes(32).toString('hex');
@@ -40,19 +42,20 @@ export class SessionService {
       createdAt: new Date().toISOString(),
       ip: ip || null,
       userAgent: userAgent || null,
+      role,
     };
 
     const client = this.redisService.getClient();
     const ttl = Number(process.env.SESSION_TTL_SECONDS || 604800);
 
-    // CRITICAL FIX: Before creating new session, check for and destroy old sessions with same username
+    // Before creating new session, check for and destroy old sessions with same username
     await this.destroyOldSessionsForUsername(roomId, username);
 
     // Store session data
     await client.set(`${this.tokenPrefix}${sessionToken}`, sessionId, 'EX', ttl);
     await client.set(key, JSON.stringify(payload), 'EX', ttl);
 
-    // CRITICAL FIX: Map username to sessionId for quick lookup
+    // Map username to sessionId for quick lookup
     const usernameSessionKey = `${this.usernameSessionPrefix}${roomId}:${username}`;
     await client.set(usernameSessionKey, sessionId, 'EX', ttl);
 
@@ -129,6 +132,76 @@ export class SessionService {
     await client.del(`${this.tokenPrefix}${sessionToken}`);
   }
 
+  /**
+   * Destroy a session by its sessionId (not token).
+   * Removes session payload, any associated token keys, username mapping and presence entry.
+   */
+  async destroySessionById(sessionId: string) {
+    const client = this.redisService.getClient();
+    const raw = await client.get(this.getSessionKey(sessionId));
+    if (!raw) return;
+    const sessionData = JSON.parse(raw);
+
+    // Remove session key
+    await client.del(this.getSessionKey(sessionId));
+
+    // Remove any token that maps to this sessionId
+    const tokenKeys = await client.keys(`${this.tokenPrefix}*`);
+    for (const tokenKey of tokenKeys) {
+      const sid = await client.get(tokenKey);
+      if (sid === sessionId) {
+        await client.del(tokenKey);
+      }
+    }
+
+    // Remove username -> session mapping
+    if (sessionData && sessionData.roomId && sessionData.username) {
+      const usernameSessionKey = `${this.usernameSessionPrefix}${sessionData.roomId}:${sessionData.username}`;
+      await client.del(usernameSessionKey);
+
+      // Remove presence entry
+      await client.hdel(`presence:${sessionData.roomId}`, sessionId);
+    }
+  }
+
+  /**
+   * Destroy all sessions for a given room.
+   * This will remove session records, tokens, username mappings and presence entries.
+   */
+  async destroyAllSessionsForRoom(roomId: string) {
+    const client = this.redisService.getClient();
+
+    const sessionIds = new Set<string>();
+
+    // 1) Collect sessionIds from presence hash (active connections)
+    try {
+      const pres = await client.hkeys(`presence:${roomId}`);
+      pres.forEach((s) => sessionIds.add(s));
+    } catch (e) {
+      // ignore
+    }
+
+    // 2) Also scan session keys for any sessions belonging to the room (covers disconnected but valid sessions)
+    const sessKeys = await client.keys(`${this.sessionPrefix}*`);
+    for (const k of sessKeys) {
+      try {
+        const raw = await client.get(k);
+        if (!raw) continue;
+        const parsed = JSON.parse(raw);
+        if (parsed.roomId === roomId && parsed.sessionId) {
+          sessionIds.add(parsed.sessionId);
+        }
+      } catch (e) {
+        // ignore parse errors
+      }
+    }
+
+    for (const sid of sessionIds) {
+      await this.destroySessionById(sid);
+      this.logger.log(`Destroyed session ${sid} for room ${roomId}`);
+    }
+  }
+
   /**
    * NEW: Get session by username and room
    */

src/messages/entities/message.entity.ts

@@ -21,6 +21,9 @@ export class Message {
   @Column({ type: 'text', nullable: true })
   authorSessionId?: string;
 
+  @Column({ type: 'text', nullable: true })
+  authorRole: string;
+
   @Column({ type: 'text', nullable: true })
   clientMsgId?: string;
 

src/messages/messages.service.ts

@@ -18,6 +18,7 @@ export class MessagesService {
       content: payload.content,
       ip: payload.ip,
       userAgent: payload.userAgent,
+      authorRole: payload.authorRole,
     });
     return this.msgRepo.save(m);
   }

src/migrations/1765708320692-AutoGenerated.ts

@@ -0,0 +1,30 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AutoGenerated1765708320692 implements MigrationInterface {
+    name = 'AutoGenerated1765708320692'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "rooms" ADD "creatorIP" text`);
+        await queryRunner.query(`ALTER TABLE "rooms" ADD "creatorAgent" text`);
+        await queryRunner.query(`ALTER TABLE "rooms" ADD "moderatorTokenHash" text`);
+        await queryRunner.query(`ALTER TABLE "rooms" ADD "chatDurationSeconds" integer NOT NULL DEFAULT '3600'`);
+        await queryRunner.query(`ALTER TABLE "rooms" ADD "actualParticipants" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "rooms" ADD "closedAt" TIMESTAMP WITH TIME ZONE`);
+        await queryRunner.query(`ALTER TABLE "participants" ADD "anonymousId" text NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "messages" ADD "authorRole" text`);
+        await queryRunner.query(`ALTER TABLE "rooms" ALTER COLUMN "title" SET NOT NULL`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "rooms" ALTER COLUMN "title" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "messages" DROP COLUMN "authorRole"`);
+        await queryRunner.query(`ALTER TABLE "participants" DROP COLUMN "anonymousId"`);
+        await queryRunner.query(`ALTER TABLE "rooms" DROP COLUMN "closedAt"`);
+        await queryRunner.query(`ALTER TABLE "rooms" DROP COLUMN "actualParticipants"`);
+        await queryRunner.query(`ALTER TABLE "rooms" DROP COLUMN "chatDurationSeconds"`);
+        await queryRunner.query(`ALTER TABLE "rooms" DROP COLUMN "moderatorTokenHash"`);
+        await queryRunner.query(`ALTER TABLE "rooms" DROP COLUMN "creatorAgent"`);
+        await queryRunner.query(`ALTER TABLE "rooms" DROP COLUMN "creatorIP"`);
+    }
+
+}

src/migrations/1765719666318-AutoGenerated.ts

@@ -0,0 +1,16 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AutoGenerated1765719666318 implements MigrationInterface {
+    name = 'AutoGenerated1765719666318'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "participants" RENAME COLUMN "isCreator" TO "isModerator"`);
+        await queryRunner.query(`CREATE TABLE "room_bans" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "roomId" uuid NOT NULL, "username" text NOT NULL, "anonymousId" text NOT NULL, "ip" text NOT NULL, "userAgent" text NOT NULL, "bannedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), CONSTRAINT "PK_f9d925f0f4d6ce338e967a299e0" PRIMARY KEY ("id"))`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP TABLE "room_bans"`);
+        await queryRunner.query(`ALTER TABLE "participants" RENAME COLUMN "isModerator" TO "isCreator"`);
+    }
+
+}

src/participants/entities/participant.entity.ts

@@ -11,6 +11,9 @@ export class Participant {
   @Column({ type: 'text' })
   username: string;
 
+  @Column({ type: 'text' })
+  anonymousId: string;
+
   @Column({ type: 'text', nullable: true })
   avatar?: string;
 
@@ -21,5 +24,5 @@ export class Participant {
   leftAt?: Date;
 
   @Column({ default: false })
-  isCreator: boolean;
+  isModerator: boolean;
 }