shuttlepro-shared 1.1.72 → 1.1.73

package/config/socket.js

@@ -1,5 +1,5 @@
 const { Server } = require("socket.io");
-const { createClient } = require("redis");
+const { client: redisClient } = require("./redis"); // Import shared Redis client
 require("dotenv").config();
 
 let io;
@@ -16,40 +16,35 @@ const initializeSocket = async (
     });
   }
 
-  // If namespace is already initialized, return it
+  // Return existing namespace if already initialized
   if (namespaceSockets[namespaceParam]) {
-    console.log(`⚡ Namespace ${namespaceParam} already initialized`);
     return namespaceSockets[namespaceParam];
   }
 
-  // Create new namespace
+  // Create and store namespace
   const namespace = io.of(`/${namespaceParam}`);
   namespaceSockets[namespaceParam] = namespace;
-  console.log(`✅ WebSocket Namespace Initialized: /${namespaceParam}`);
 
-  // Create Redis subscriber for this namespace
-  const subClient = createClient({ url: process.env.REDIS_URL });
-  await subClient.connect();
-  await subClient.subscribe(redisChannel);
-
-  subClient.on("message", (channel, message) => {
-    console.log(
-      `🔔 Redis Event on ${channel} for /${namespaceParam}:`,
-      message
-    );
-    const { workspaceId, event, data } = JSON.parse(message);
+  // Ensure Redis client is connected
+  if (!redisClient.isOpen) {
+    await redisClient.connect();
+  }
 
-    namespace.to(workspaceId).emit(event, data);
+  // Subscribe to Redis events for this namespace
+  await redisClient.subscribe(redisChannel, (message) => {
+    try {
+      const { workspaceId, event, data } = JSON.parse(message);
+      namespace.to(workspaceId).emit(event, data);
+    } catch (err) {
+      console.error("Error parsing Redis message:", err);
+    }
   });
 
-  // Handle socket connections per namespace
+  // Handle new socket connections
   namespace.on("connection", (socket) => {
     const { workspaceId } = socket.handshake.query;
 
     if (!workspaceId) {
-      console.warn(
-        `❌ Client ${socket.id} rejected due to missing workspaceId`
-      );
       socket.disconnect(true);
       return;
     }
@@ -61,9 +56,7 @@ const initializeSocket = async (
     socket.join(workspaceId); // Join workspace room
 
     socket.on("disconnect", () => {
-      console.log(
-        `❌ Client disconnected: ${socket.id} (Workspace: ${workspaceId}) in /${namespaceParam}`
-      );
+      socket.leave(workspaceId);
     });
   });
 
@@ -71,24 +64,19 @@ const initializeSocket = async (
 };
 
 const sendEventToServer = async ({
-  namespace = "conversation",
   workspaceId,
   event,
   data,
   redisChannel = "socket_events",
 }) => {
-  const redisClient = createClient({ url: process.env.REDIS_URL });
-  await redisClient.connect();
-
-  console.log(
-    `📤 Sending event '${event}' to namespace '/${namespace}' for workspace '${workspaceId}'`
-  );
-  await redisClient.publish(
-    redisChannel,
-    JSON.stringify({ workspaceId, event, data })
-  );
-
-  await redisClient.disconnect();
+  try {
+    await redisClient.publish(
+      redisChannel,
+      JSON.stringify({ workspaceId, event, data })
+    );
+  } catch (err) {
+    console.error("Error publishing to Redis:", err);
+  }
 };
 
 module.exports = { initializeSocket, sendEventToServer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shuttlepro-shared",
-  "version": "1.1.72",
+  "version": "1.1.73",
   "description": "",
   "main": "index.js",
   "scripts": {