@mulingai-npm/redis 3.35.6 → 3.35.8

package/dist/managers/demo-room-pool-manager.d.ts

@@ -19,12 +19,19 @@ export declare class DemoRoomPoolManager {
      * Called once at service startup. Idempotent — safe to call on restart.
      */
     initPool(roomIds: number[]): Promise<void>;
+    /**
+     * Scan all rooms and reclaim any with expired sessions.
+     * Rooms whose session has expired (or session key is missing) are returned to the available pool.
+     * Returns number of rooms reclaimed.
+     */
+    reclaimExpiredRooms(): Promise<number>;
     /**
      * Assign an available room to a demo user.
      * Returns null if no rooms available.
      * Atomic: SPOP removes from available set in one operation.
+     * If no rooms available, attempts to reclaim rooms with expired sessions first.
      */
-    assignRoom(emailHash: string, demoSessionId: string, durationMs: number): Promise<{
+    assignRoom(emailHash: string, demoSessionId: string, durationMs: number, email?: string): Promise<{
         roomId: number;
         expiresAt: number;
     } | null>;

package/dist/managers/demo-room-pool-manager.js

@@ -40,22 +40,55 @@ class DemoRoomPoolManager {
             }
         }
     }
+    /**
+     * Scan all rooms and reclaim any with expired sessions.
+     * Rooms whose session has expired (or session key is missing) are returned to the available pool.
+     * Returns number of rooms reclaimed.
+     */
+    async reclaimExpiredRooms() {
+        const allRoomIds = await this.redisClient.smembers('demo:pool:all');
+        const availableRoomIds = await this.redisClient.smembers('demo:pool:available');
+        const availableSet = new Set(availableRoomIds);
+        let reclaimed = 0;
+        for (const rid of allRoomIds) {
+            if (availableSet.has(rid))
+                continue; // Already available
+            const expiresAtStr = await this.redisClient.hget(`demo:pool:room:${rid}:session`, 'expiresAt');
+            if (!expiresAtStr || Date.now() >= parseInt(expiresAtStr)) {
+                // Session expired or key missing — reclaim
+                await this.redisClient.del(`demo:pool:room:${rid}:session`);
+                await this.redisClient.del(`demo:pool:room:${rid}:credits`);
+                await this.redisClient.sadd('demo:pool:available', rid);
+                reclaimed++;
+            }
+        }
+        return reclaimed;
+    }
     /**
      * Assign an available room to a demo user.
      * Returns null if no rooms available.
      * Atomic: SPOP removes from available set in one operation.
+     * If no rooms available, attempts to reclaim rooms with expired sessions first.
      */
-    async assignRoom(emailHash, demoSessionId, durationMs) {
+    async assignRoom(emailHash, demoSessionId, durationMs, email) {
         // Atomic pop from available set
-        const roomIdStr = await this.redisClient.spop('demo:pool:available');
+        let roomIdStr = await this.redisClient.spop('demo:pool:available');
+        // If no rooms available, try reclaiming expired sessions
+        if (!roomIdStr) {
+            const reclaimed = await this.reclaimExpiredRooms();
+            if (reclaimed > 0) {
+                roomIdStr = await this.redisClient.spop('demo:pool:available');
+            }
+        }
         if (!roomIdStr)
-            return null; // All rooms busy
+            return null; // Truly all rooms busy
         const roomId = parseInt(roomIdStr);
         const now = Date.now();
         const expiresAt = now + durationMs;
         // Store session info
         await this.redisClient.hset(`demo:pool:room:${roomId}:session`, {
             emailHash,
+            email: email || '',
             demoSessionId,
             startedAt: now.toString(),
             expiresAt: expiresAt.toString(),

package/package.json

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