shuttlepro-shared 1.1.69 → 1.1.71

package/config/socket.js

@@ -3,34 +3,33 @@ const { client: redisClient, connectRedis } = require("./redis");
 const { createClient } = require("redis");
 require("dotenv").config();
 
-const REDIS_CHANNEL = "socket_events"; // Redis Pub/Sub Channel
 let io;
 
-/**
- * ✅ Initialize WebSocket Server with Redis Pub/Sub
- * @param {Object} server - HTTP Server instance
- * @param {string|null} namespace - Optional namespace (passed from `index.js`)
- */
-const initializeSocket = async (server, namespace = null) => {
+const initializeSocket = async (
+  server,
+  namespace = null,
+  redisChannel = "socket_events"
+) => {
   await connectRedis(); // Ensure Redis is connected
 
   io = new Server(server, {
     cors: { origin: "*" },
   });
 
+  io.listen(server); // Ensure server listens for WebSocket connections
+
   console.log(
     `✅ WebSocket Server Initialized ${
       namespace ? `with namespace: ${namespace}` : "globally"
-    }`
+    }, using Redis channel: ${redisChannel}`
   );
 
-  // Create Redis Pub/Sub Clients
-  const pubClient = redisClient;
   const subClient = createClient({ url: process.env.REDIS_URL });
   await subClient.connect();
+  await subClient.subscribe(redisChannel);
 
-  // ✅ Subscribe to Redis channel
-  await subClient.subscribe(REDIS_CHANNEL, (message) => {
+  subClient.on("message", (channel, message) => {
+    console.log(`🔔 Received event from Redis channel ${channel}:`, message);
     const { workspaceId, event, data } = JSON.parse(message);
 
     if (namespace) {
@@ -40,18 +39,12 @@ const initializeSocket = async (server, namespace = null) => {
     }
   });
 
-  // ✅ Handle WebSocket Connection (Global or Namespace)
   const socketServer = namespace ? io.of(namespace) : io;
   socketServer.on("connection", (socket) =>
     handleConnection(socket, namespace)
   );
 };
 
-/**
- * ✅ Handle WebSocket Connection
- * @param {Object} socket - WebSocket client socket
- * @param {string} [namespace] - Optional namespace
- */
 const handleConnection = async (socket, namespace = null) => {
   const { workspaceId } = socket.handshake.query;
 
@@ -78,7 +71,6 @@ const handleConnection = async (socket, namespace = null) => {
     })
   );
 
-  // ✅ Handle Disconnection
   socket.on("disconnect", async () => {
     console.log(
       `❌ Client disconnected: ${socket.id} (Workspace: ${workspaceId})`
@@ -87,15 +79,18 @@ const handleConnection = async (socket, namespace = null) => {
   });
 };
 
-/**
- * ✅ Publish WebSocket Events via Redis
- * @param {string} workspaceId - Target workspace ID
- * @param {string} event - Event name
- * @param {Object} data - Event payload
- */
-const sendEventToServer = async ({ workspaceId, event, data }) => {
+const sendEventToServer = async ({
+  workspaceId,
+  event,
+  data,
+  redisChannel = "socket_events",
+}) => {
+  if (!redisClient.isReady) {
+    await redisClient.connect();
+  }
+
   await redisClient.publish(
-    REDIS_CHANNEL,
+    redisChannel,
     JSON.stringify({ workspaceId, event, data })
   );
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shuttlepro-shared",
-  "version": "1.1.69",
+  "version": "1.1.71",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,6 +22,7 @@
     "mongoose": "^8.7.1",
     "cors": "^2.8.5",
     "helmet": "^8.0.0",
-    "bull": "^4.10.4"
+    "bull": "^4.10.4",
+    "socket.io": "^4.8.1"
   }
 }