@mulingai-npm/redis 3.4.2 → 3.5.0

package/dist/managers/mulingstream-speaker-manager.d.ts

@@ -14,6 +14,13 @@ export type MulingstreamSpeakerData = {
 export declare class MulingstreamSpeakerManager {
     private redisClient;
     constructor(redisClient: RedisClient);
+    private buildLockKey;
+    /** Try to claim the speaker slot for this room.
+     *  @returns true when the lock was acquired, false if someone else holds it.
+     */
+    acquireRoomLock(roomId: string, socketId: string, ttl?: number): Promise<boolean>;
+    /** Release the lock if we still own it. */
+    releaseRoomLock(roomId: string, socketId: string): Promise<void>;
     private parseHash;
     private serialize;
     private buildId;

package/dist/managers/mulingstream-speaker-manager.js

@@ -2,10 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MulingstreamSpeakerManager = void 0;
 const EXPIRATION = 24 * 60 * 60; // 24h
+const LOCK_TTL = 30; // seconds
 class MulingstreamSpeakerManager {
     constructor(redisClient) {
         this.redisClient = redisClient;
     }
+    /* ------------------------------------------------------------------ */
+    /* One-speaker-per-room locking helpers                                */
+    /* ------------------------------------------------------------------ */
+    buildLockKey(roomId) {
+        return `room:${roomId}:speaker_lock`;
+    }
+    /** Try to claim the speaker slot for this room.
+     *  @returns true when the lock was acquired, false if someone else holds it.
+     */
+    async acquireRoomLock(roomId, socketId, ttl = LOCK_TTL) {
+        return this.redisClient.setNxEx(this.buildLockKey(roomId), socketId, ttl);
+    }
+    /** Release the lock if we still own it. */
+    async releaseRoomLock(roomId, socketId) {
+        const lockKey = this.buildLockKey(roomId);
+        const current = await this.redisClient.get(lockKey);
+        if (current === socketId) {
+            await this.redisClient.del(lockKey);
+        }
+    }
+    /* ------------------------------------------------------------------ */
+    /* Speaker CRUD + queries                                             */
+    /* ------------------------------------------------------------------ */
     parseHash(hash) {
         return {
             speakerId: hash.speakerId,
@@ -50,7 +74,6 @@ class MulingstreamSpeakerManager {
         };
         await this.redisClient.hset(key, this.serialize(speakerData));
         await this.redisClient.expire(key, EXPIRATION);
-        // index sets / mapping
         await this.redisClient.sadd(`room:${payload.roomId}:speakers`, speakerId);
         await this.redisClient.sadd(`user:${payload.userId}:speakers`, speakerId);
         await this.redisClient.set(`socket:${payload.socketId}:speaker`, speakerId);
@@ -59,43 +82,30 @@ class MulingstreamSpeakerManager {
     }
     async removeSpeakerBySocketId(socketId) {
         const speakerId = await this.redisClient.get(`socket:${socketId}:speaker`);
-        if (speakerId === null) {
+        if (speakerId === null)
             return false;
-        }
-        const removed = await this.removeSpeakerById(speakerId);
-        return removed;
+        return this.removeSpeakerById(speakerId);
     }
     async removeSpeakersByUserId(userId) {
         const ids = await this.redisClient.smembers(`user:${userId}:speakers`);
-        if (ids.length === 0) {
-            return 0;
-        }
-        let deletedCount = 0;
-        for (const id of ids) {
-            if (await this.removeSpeakerById(id)) {
-                deletedCount += 1;
-            }
-        }
-        return deletedCount;
+        let deleted = 0;
+        for (const id of ids)
+            if (await this.removeSpeakerById(id))
+                deleted += 1;
+        return deleted;
     }
     async removeSpeakersByRoomId(roomId) {
         const ids = await this.redisClient.smembers(`room:${roomId}:speakers`);
-        if (ids.length === 0) {
-            return 0;
-        }
-        let deletedCount = 0;
-        for (const id of ids) {
-            if (await this.removeSpeakerById(id)) {
-                deletedCount += 1;
-            }
-        }
-        return deletedCount;
+        let deleted = 0;
+        for (const id of ids)
+            if (await this.removeSpeakerById(id))
+                deleted += 1;
+        return deleted;
     }
     async removeSpeakerById(speakerId) {
         const key = this.buildKey(speakerId);
         const data = await this.redisClient.hgetall(key);
         if (data === null || Object.keys(data).length === 0) {
-            // already gone; clean indexes anyway
             await this.cleanIndexes(speakerId);
             return false;
         }
@@ -107,7 +117,6 @@ class MulingstreamSpeakerManager {
         const key = this.buildKey(speakerId);
         const hash = await this.redisClient.hgetall(key);
         if (hash === null || Object.keys(hash).length === 0) {
-            // the hash has expired or was never there – remove any stray index refs
             await this.cleanIndexes(speakerId);
             return null;
         }
@@ -115,14 +124,11 @@ class MulingstreamSpeakerManager {
     }
     async getSpeakerBySocketId(socketId) {
         const speakerId = await this.redisClient.get(`socket:${socketId}:speaker`);
-        if (speakerId === null) {
+        if (speakerId === null)
             return null;
-        }
         const hash = await this.redisClient.hgetall(this.buildKey(speakerId));
-        if (hash !== null && Object.keys(hash).length > 0) {
+        if (hash !== null && Object.keys(hash).length > 0)
             return this.parseHash(hash);
-        }
-        // hash expired: tidy indexes
         await this.cleanIndexes(speakerId);
         return null;
     }
@@ -159,9 +165,8 @@ class MulingstreamSpeakerManager {
         for (const id of ids) {
             if (id.includes(`]-[${userId}]-[`)) {
                 const hash = await this.redisClient.hgetall(this.buildKey(id));
-                if (hash !== null && Object.keys(hash).length > 0) {
+                if (hash !== null && Object.keys(hash).length > 0)
                     return this.parseHash(hash);
-                }
                 await this.cleanIndexes(id);
                 return null;
             }
@@ -169,57 +174,44 @@ class MulingstreamSpeakerManager {
         return null;
     }
     async getSpeakersLength(roomId) {
-        const speakers = await this.getSpeakersByRoomId(roomId);
-        return speakers.length;
+        return (await this.getSpeakersByRoomId(roomId)).length;
     }
     async isRoomEmpty(roomId) {
-        const totalSpeakers = await this.getSpeakersLength(roomId);
-        return totalSpeakers === 0;
+        return (await this.getSpeakersLength(roomId)) === 0;
     }
     async updateSourceLanguage(socketId, newLang) {
         const speaker = await this.getSpeakerBySocketId(socketId);
-        if (speaker === null) {
+        if (speaker === null)
             return false;
-        }
-        await this.redisClient.hset(this.buildKey(speaker.speakerId), {
-            sourceLanguage: newLang
-        });
+        await this.redisClient.hset(this.buildKey(speaker.speakerId), { sourceLanguage: newLang });
         return true;
     }
     async updateTargetLanguages(socketId, languages) {
         const speaker = await this.getSpeakerBySocketId(socketId);
-        if (speaker === null) {
+        if (speaker === null)
             return false;
-        }
-        await this.redisClient.hset(this.buildKey(speaker.speakerId), {
-            targetLanguages: JSON.stringify(languages)
-        });
+        await this.redisClient.hset(this.buildKey(speaker.speakerId), { targetLanguages: JSON.stringify(languages) });
         return true;
     }
     async increaseRecordingDuration(socketId, delta) {
         const speaker = await this.getSpeakerBySocketId(socketId);
-        if (speaker === null) {
+        if (speaker === null)
             return -1;
-        }
         speaker.recordingsDuration += delta;
-        await this.redisClient.hset(this.buildKey(speaker.speakerId), {
-            recordingsDuration: speaker.recordingsDuration.toString()
-        });
+        await this.redisClient.hset(this.buildKey(speaker.speakerId), { recordingsDuration: speaker.recordingsDuration.toString() });
         return speaker.recordingsDuration;
     }
     async cleanIndexes(speakerId) {
-        const parts = speakerId
-            .substring(1, speakerId.length - 1) // remove outer [...]
-            .split(']-['); // ['roomId','userId','socketId']
-        if (parts.length !== 3) {
+        const parts = speakerId.substring(1, speakerId.length - 1).split(']-['); // ['roomId','userId','socketId']
+        if (parts.length !== 3)
             return;
-        }
-        const roomId = parts[0];
-        const userId = parts[1];
-        const socketId = parts[2];
-        await this.redisClient.srem(`room:${roomId}:speakers`, speakerId);
-        await this.redisClient.srem(`user:${userId}:speakers`, speakerId);
-        await this.redisClient.del(`socket:${socketId}:speaker`);
+        const [roomId, userId, socketId] = parts;
+        await Promise.all([
+            this.redisClient.srem(`room:${roomId}:speakers`, speakerId),
+            this.redisClient.srem(`user:${userId}:speakers`, speakerId),
+            this.redisClient.del(`socket:${socketId}:speaker`),
+            this.redisClient.del(this.buildLockKey(roomId)) // ensure lock clears
+        ]);
     }
 }
 exports.MulingstreamSpeakerManager = MulingstreamSpeakerManager;

package/dist/redis-client.d.ts

@@ -7,7 +7,7 @@ export interface RedisConfig {
 }
 /**
  * Thin wrapper around ioredis that exposes exactly the helpers used by the two
- * managers. All helpers are 1‑to‑1 pass‑through so there is no behavioural
+ * managers. All helpers are 1-to-1 pass-through so there is no behavioural
  * change – this merely centralises typing and keeps the rest of the codebase
  * clean.
  */
@@ -15,6 +15,9 @@ export declare class RedisClient {
     private client;
     constructor(config: RedisConfig);
     set(key: string, value: string): Promise<void>;
+    /** Atomic SET with NX + EX.
+     *  @returns true if the key was set, false when it already existed            */
+    setNxEx(key: string, value: string, expireSeconds: number): Promise<boolean>;
     get(key: string): Promise<string | null>;
     del(key: string): Promise<number>;
     exists(key: string): Promise<number>;

package/dist/redis-client.js

@@ -7,7 +7,7 @@ exports.RedisClient = void 0;
 const ioredis_1 = __importDefault(require("ioredis"));
 /**
  * Thin wrapper around ioredis that exposes exactly the helpers used by the two
- * managers. All helpers are 1‑to‑1 pass‑through so there is no behavioural
+ * managers. All helpers are 1-to-1 pass-through so there is no behavioural
  * change – this merely centralises typing and keeps the rest of the codebase
  * clean.
  */
@@ -29,6 +29,13 @@ class RedisClient {
     async set(key, value) {
         await this.client.set(key, value);
     }
+    /** Atomic SET with NX + EX.
+     *  @returns true if the key was set, false when it already existed            */
+    async setNxEx(key, value, expireSeconds) {
+        // correct order: 'EX', ttl, 'NX'
+        const res = (await this.client.set(key, value, 'EX', expireSeconds, 'NX'));
+        return res === 'OK';
+    }
     async get(key) {
         return this.client.get(key);
     }
@@ -63,7 +70,7 @@ class RedisClient {
         return this.client.hgetall(key);
     }
     /* ----------------------------------------------------------------------- */
-    /* Sorted‑set helpers                                                      */
+    /* Sorted-set helpers                                                      */
     /* ----------------------------------------------------------------------- */
     async zadd(key, score, member) {
         return this.client.zadd(key, score, member);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mulingai-npm/redis",
-    "version": "3.4.2",
+    "version": "3.5.0",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "repository": {