diff --git a/docs/socket-events.md b/docs/socket-events.md
new file mode 100644
index 0000000..fe23d9a
--- /dev/null
+++ b/docs/socket-events.md
@@ -0,0 +1,371 @@
+# Socket Events Documentation
+
+This document describes the Socket.IO events implemented for the shared media streaming service.
+
+## Client → Server Events
+
+### Session Management
+
+#### `join_session`
+Join or create a media streaming session.
+
+**Data:**
+```javascript
+{
+  sessionId: "string",    // UUID of the session
+  userId: "string",       // Unique user identifier
+  username: "string",     // Display name for the user
+  avatar: "string"        // Optional avatar URL
+}
+```
+
+**Response Events:**
+- `session_joined` - Successful join
+- `error` - Failed to join
+
+#### `leave_session`
+Leave the current session.
+
+**Data:** None
+
+### Playback Control
+
+#### `sync_playback`
+Sync playback state across all users in session. **Leader only**.
+
+**Data:**
+```javascript
+{
+  position: 123.45,        // Current playback position in seconds
+  isPlaying: true,         // Whether media is currently playing
+  mediaUrl: "string",      // Optional: URL of the media file
+  mediaId: "string",       // Optional: Unique media identifier
+  playbackRate: 1.0        // Optional: Playback speed (default: 1.0)
+}
+```
+
+#### `load_media`
+Load new media into the session. **Leader only**.
+
+**Data:**
+```javascript
+{
+  mediaUrl: "string",      // URL of the media file
+  mediaId: "string",       // Unique media identifier
+  mediaTitle: "string",    // Display title for the media
+  mediaDuration: 3600      // Duration in seconds
+}
+```
+
+### Leadership
+
+#### `request_leadership`
+Request to become the session leader (if current leader is disconnected).
+
+**Data:** None
+
+### Sync & Recovery
+
+#### `report_desync`
+Report playback desynchronization for recovery.
+
+**Data:**
+```javascript
+{
+  reportedPosition: 123.45,  // Client's current position
+  reportedTime: 1640995200   // Timestamp of the report
+}
+```
+
+### Activity
+
+#### `heartbeat`
+Send activity heartbeat to maintain connection status.
+
+**Data:** None
+
+#### `request_session_state`
+Request current session state.
+
+**Data:** None
+
+## Server → Client Events
+
+### Session Events
+
+#### `session_joined`
+Confirmation of successful session join.
+
+**Data:**
+```javascript
+{
+  sessionId: "string",
+  userId: "string",
+  isLeader: true,
+  session: {
+    sessionId: "string",
+    creatorId: "string",
+    leaderId: "string",
+    users: [
+      {
+        id: "string",
+        username: "string",
+        avatar: "string",
+        joinedAt: "2023-01-01T00:00:00.000Z",
+        lastSeen: 1640995200,
+        isConnected: true,
+        isLeader: false
+      }
+    ],
+    playbackState: {
+      mediaUrl: "string",
+      mediaId: "string",
+      position: 123.45,
+      isPlaying: true,
+      lastUpdateTime: 1640995200,
+      playbackRate: 1.0
+    },
+    createdAt: "2023-01-01T00:00:00.000Z",
+    lastActivity: 1640995200,
+    userCount: 2
+  }
+}
+```
+
+#### `user_joined`
+Another user joined the session.
+
+**Data:**
+```javascript
+{
+  userId: "string",
+  username: "string",
+  avatar: "string",
+  timestamp: 1640995200
+}
+```
+
+#### `user_left`
+A user left the session.
+
+**Data:**
+```javascript
+{
+  userId: "string",
+  username: "string",
+  timestamp: 1640995200
+}
+```
+
+### Playback Events
+
+#### `playback_sync`
+Broadcast playback state update to all users.
+
+**Data:**
+```javascript
+{
+  mediaUrl: "string",
+  mediaId: "string",
+  position: 123.45,
+  isPlaying: true,
+  lastUpdateTime: 1640995200,
+  playbackRate: 1.0,
+  timestamp: 1640995200,
+  leaderId: "string"
+}
+```
+
+#### `media_loaded`
+New media has been loaded into the session.
+
+**Data:**
+```javascript
+{
+  mediaUrl: "string",
+  mediaId: "string",
+  mediaTitle: "string",
+  mediaDuration: 3600,
+  timestamp: 1640995200,
+  loadedBy: "string"
+}
+```
+
+### Leadership Events
+
+#### `leadership_changed`
+Session leadership has changed.
+
+**Data:**
+```javascript
+{
+  newLeaderId: "string",
+  newLeaderName: "string",
+  timestamp: 1640995200
+}
+```
+
+### Recovery Events
+
+#### `desync_recovery`
+Response to desync report with authoritative state.
+
+**Data:**
+```javascript
+{
+  authoritativeState: {
+    mediaUrl: "string",
+    mediaId: "string",
+    position: 123.45,
+    isPlaying: true,
+    lastUpdateTime: 1640995200,
+    playbackRate: 1.0,
+    timestamp: 1640995200
+  },
+  reportedPosition: 123.45,
+  reportedTime: 1640995200
+}
+```
+
+### Activity Events
+
+#### `heartbeat_ack`
+Acknowledgment of heartbeat.
+
+**Data:**
+```javascript
+{
+  timestamp: 1640995200
+}
+```
+
+#### `session_state`
+Current session state (response to `request_session_state`).
+
+**Data:** Same as `session` object in `session_joined`
+
+### Error Events
+
+#### `error`
+Error occurred during operation.
+
+**Data:**
+```javascript
+{
+  message: "string"  // Error description
+}
+```
+
+## REST API Endpoints
+
+### `POST /api/sessions`
+Create a new session.
+
+**Body:**
+```javascript
+{
+  creatorId: "string",
+  creatorName: "string"
+}
+```
+
+**Response:**
+```javascript
+{
+  success: true,
+  sessionId: "string",
+  creatorId: "string",
+  message: "Session created successfully"
+}
+```
+
+### `GET /api/sessions/:sessionId`
+Get session information.
+
+**Response:**
+```javascript
+{
+  success: true,
+  session: { /* session object */ }
+}
+```
+
+### `GET /api/sessions`
+List active sessions.
+
+**Response:**
+```javascript
+{
+  success: true,
+  sessions: [
+    {
+      sessionId: "string",
+      userCount: 2,
+      hasMedia: true,
+      createdAt: "2023-01-01T00:00:00.000Z",
+      lastActivity: 1640995200
+    }
+  ],
+  totalSessions: 1
+}
+```
+
+## Usage Example
+
+```javascript
+const socket = io('http://localhost:3000');
+
+// Join a session
+socket.emit('join_session', {
+  sessionId: 'my-session-id',
+  userId: 'user-123',
+  username: 'Alice',
+  avatar: 'https://example.com/avatar.jpg'
+});
+
+// Listen for session join confirmation
+socket.on('session_joined', (data) => {
+  console.log('Joined session:', data);
+  
+  // If you're the leader, you can control playback
+  if (data.isLeader) {
+    socket.emit('sync_playback', {
+      position: 0,
+      isPlaying: true,
+      mediaUrl: 'https://example.com/video.mp4'
+    });
+  }
+});
+
+// Listen for playback updates
+socket.on('playback_sync', (data) => {
+  // Update your media player with the new state
+  updateMediaPlayer(data);
+});
+
+// Send heartbeat every 30 seconds
+setInterval(() => {
+  socket.emit('heartbeat');
+}, 30000);
+```
+
+## Leader/Follower Model
+
+- **Leader**: The user who controls playback (play, pause, seek, load media)
+- **Followers**: Users who receive and follow playback commands
+- **Leadership Transfer**: Automatic when leader disconnects, or manual via `request_leadership`
+- **Session Creator**: Initially becomes the leader
+
+## Desync Recovery
+
+1. Client detects desync (position difference > threshold)
+2. Client sends `report_desync` with current position
+3. Server responds with `desync_recovery` containing authoritative state
+4. Client adjusts to match server state
+
+## Activity Tracking
+
+- Heartbeat mechanism maintains connection status
+- User `lastSeen` timestamps updated on heartbeat
+- Inactive sessions cleaned up after 24 hours
+- Disconnected users marked but not immediately removed
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 3fc606d..9db30f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,8 +10,12 @@
       "license": "ISC",
       "dependencies": {
         "aws-sdk": "^2.1692.0",
+        "dotenv": "^17.2.1",
         "express": "^5.1.0",
-        "mongodb": "^6.18.0"
+        "mongodb": "^6.18.0",
+        "socket.io": "^4.8.1",
+        "socket.io-client": "^4.8.1",
+        "uuid": "^11.0.3"
       },
       "devDependencies": {
         "prettier": "^3.6.2"
@@ -25,6 +29,30 @@
         "sparse-bitfield": "^3.0.3"
       }
     },
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/cors": {
+      "version": "2.8.19",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz",
+      "integrity": "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.0.tgz",
+      "integrity": "sha512-3xyG3pMCq3oYCNg7/ZP+E1ooTaGB4cG8JWRsqqOYQdbWNY4zbaV0Ennrd7stjiJEFZCaybcIgpTjJWHRfBSIDw==",
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~7.10.0"
+      }
+    },
     "node_modules/@types/webidl-conversions": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",
@@ -85,6 +113,15 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/aws-sdk/node_modules/uuid": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
+      "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==",
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -104,6 +141,15 @@
         }
       ]
     },
+    "node_modules/base64id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
+      "license": "MIT",
+      "engines": {
+        "node": "^4.5.0 || >= 5.9"
+      }
+    },
     "node_modules/body-parser": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz",
@@ -228,6 +274,19 @@
         "node": ">=6.6.0"
       }
     },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "license": "MIT",
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/debug": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
@@ -268,6 +327,18 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/dotenv": {
+      "version": "17.2.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.1.tgz",
+      "integrity": "sha512-kQhDYKZecqnM0fCnzI5eIv5L4cAe/iRI+HqMbO/hbRdTAeXDG+M9FjipUxNfbARuEg4iHIbhnhs78BCHNbSxEQ==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -294,6 +365,125 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/engine.io": {
+      "version": "6.6.4",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.4.tgz",
+      "integrity": "sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
+        "accepts": "~1.3.4",
+        "base64id": "2.0.0",
+        "cookie": "~0.7.2",
+        "cors": "~2.8.5",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1"
+      },
+      "engines": {
+        "node": ">=10.2.0"
+      }
+    },
+    "node_modules/engine.io-client": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.3.tgz",
+      "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==",
+      "license": "MIT",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1",
+        "xmlhttprequest-ssl": "~2.1.1"
+      }
+    },
+    "node_modules/engine.io-client/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/engine.io-parser": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/engine.io/node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/engine.io/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/engine.io/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/engine.io/node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/engine.io/node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/es-define-property": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
@@ -792,6 +982,15 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/object-inspect": {
       "version": "1.13.4",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
@@ -1110,6 +1309,173 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/socket.io": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.1.tgz",
+      "integrity": "sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==",
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "cors": "~2.8.5",
+        "debug": "~4.3.2",
+        "engine.io": "~6.6.0",
+        "socket.io-adapter": "~2.5.2",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.2.0"
+      }
+    },
+    "node_modules/socket.io-adapter": {
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz",
+      "integrity": "sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "~4.3.4",
+        "ws": "~8.17.1"
+      }
+    },
+    "node_modules/socket.io-adapter/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io-client": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz",
+      "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.2",
+        "engine.io-client": "~6.6.1",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-client/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
+      "license": "MIT",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-parser/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io/node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/socket.io/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/socket.io/node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/socket.io/node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/sparse-bitfield": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
@@ -1158,6 +1524,12 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/undici-types": {
+      "version": "7.10.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
+      "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==",
+      "license": "MIT"
+    },
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -1193,11 +1565,16 @@
       }
     },
     "node_modules/uuid": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
-      "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+      "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
       "bin": {
-        "uuid": "dist/bin/uuid"
+        "uuid": "dist/esm/bin/uuid"
       }
     },
     "node_modules/vary": {
@@ -1253,6 +1630,27 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
+    "node_modules/ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/xml2js": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
@@ -1272,6 +1670,14 @@
       "engines": {
         "node": ">=4.0"
       }
+    },
+    "node_modules/xmlhttprequest-ssl": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz",
+      "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
     }
   },
   "dependencies": {
@@ -1283,6 +1689,27 @@
         "sparse-bitfield": "^3.0.3"
       }
     },
+    "@socket.io/component-emitter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA=="
+    },
+    "@types/cors": {
+      "version": "2.8.19",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz",
+      "integrity": "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/node": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.0.tgz",
+      "integrity": "sha512-3xyG3pMCq3oYCNg7/ZP+E1ooTaGB4cG8JWRsqqOYQdbWNY4zbaV0Ennrd7stjiJEFZCaybcIgpTjJWHRfBSIDw==",
+      "requires": {
+        "undici-types": "~7.10.0"
+      }
+    },
     "@types/webidl-conversions": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",
@@ -1328,6 +1755,13 @@
         "util": "^0.12.4",
         "uuid": "8.0.0",
         "xml2js": "0.6.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
+          "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw=="
+        }
       }
     },
     "base64-js": {
@@ -1335,6 +1769,11 @@
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
+    "base64id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog=="
+    },
     "body-parser": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz",
@@ -1423,6 +1862,15 @@
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
       "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="
     },
+    "cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "requires": {
+        "object-assign": "^4",
+        "vary": "^1"
+      }
+    },
     "debug": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
@@ -1446,6 +1894,11 @@
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
     },
+    "dotenv": {
+      "version": "17.2.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.1.tgz",
+      "integrity": "sha512-kQhDYKZecqnM0fCnzI5eIv5L4cAe/iRI+HqMbO/hbRdTAeXDG+M9FjipUxNfbARuEg4iHIbhnhs78BCHNbSxEQ=="
+    },
     "dunder-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -1466,6 +1919,86 @@
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
       "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="
     },
+    "engine.io": {
+      "version": "6.6.4",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.4.tgz",
+      "integrity": "sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==",
+      "requires": {
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
+        "accepts": "~1.3.4",
+        "base64id": "2.0.0",
+        "cookie": "~0.7.2",
+        "cors": "~2.8.5",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1"
+      },
+      "dependencies": {
+        "accepts": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+          "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+          "requires": {
+            "mime-types": "~2.1.34",
+            "negotiator": "0.6.3"
+          }
+        },
+        "debug": {
+          "version": "4.3.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+          "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+          "requires": {
+            "ms": "^2.1.3"
+          }
+        },
+        "mime-db": {
+          "version": "1.52.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+          "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+        },
+        "mime-types": {
+          "version": "2.1.35",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+          "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+          "requires": {
+            "mime-db": "1.52.0"
+          }
+        },
+        "negotiator": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+          "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
+        }
+      }
+    },
+    "engine.io-client": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.3.tgz",
+      "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==",
+      "requires": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1",
+        "xmlhttprequest-ssl": "~2.1.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+          "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+          "requires": {
+            "ms": "^2.1.3"
+          }
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q=="
+    },
     "es-define-property": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
@@ -1792,6 +2325,11 @@
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
       "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="
     },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+    },
     "object-inspect": {
       "version": "1.13.4",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
@@ -2005,6 +2543,116 @@
         "side-channel-map": "^1.0.1"
       }
     },
+    "socket.io": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.1.tgz",
+      "integrity": "sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==",
+      "requires": {
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "cors": "~2.8.5",
+        "debug": "~4.3.2",
+        "engine.io": "~6.6.0",
+        "socket.io-adapter": "~2.5.2",
+        "socket.io-parser": "~4.2.4"
+      },
+      "dependencies": {
+        "accepts": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+          "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+          "requires": {
+            "mime-types": "~2.1.34",
+            "negotiator": "0.6.3"
+          }
+        },
+        "debug": {
+          "version": "4.3.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+          "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+          "requires": {
+            "ms": "^2.1.3"
+          }
+        },
+        "mime-db": {
+          "version": "1.52.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+          "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+        },
+        "mime-types": {
+          "version": "2.1.35",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+          "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+          "requires": {
+            "mime-db": "1.52.0"
+          }
+        },
+        "negotiator": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+          "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
+        }
+      }
+    },
+    "socket.io-adapter": {
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz",
+      "integrity": "sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==",
+      "requires": {
+        "debug": "~4.3.4",
+        "ws": "~8.17.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+          "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+          "requires": {
+            "ms": "^2.1.3"
+          }
+        }
+      }
+    },
+    "socket.io-client": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz",
+      "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==",
+      "requires": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.2",
+        "engine.io-client": "~6.6.1",
+        "socket.io-parser": "~4.2.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+          "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+          "requires": {
+            "ms": "^2.1.3"
+          }
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
+      "requires": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+          "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+          "requires": {
+            "ms": "^2.1.3"
+          }
+        }
+      }
+    },
     "sparse-bitfield": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
@@ -2041,6 +2689,11 @@
         "mime-types": "^3.0.0"
       }
     },
+    "undici-types": {
+      "version": "7.10.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
+      "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag=="
+    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -2075,9 +2728,9 @@
       }
     },
     "uuid": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
-      "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw=="
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+      "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A=="
     },
     "vary": {
       "version": "1.1.2",
@@ -2117,6 +2770,12 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
+    "ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "requires": {}
+    },
     "xml2js": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
@@ -2130,6 +2789,11 @@
       "version": "11.0.1",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
       "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+    },
+    "xmlhttprequest-ssl": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz",
+      "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ=="
     }
   }
 }
diff --git a/package.json b/package.json
index 822c6ad..8644b0f 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,12 @@
   "homepage": "https://github.com/buildiverse/shared-media-streaming#readme",
   "dependencies": {
     "aws-sdk": "^2.1692.0",
+    "dotenv": "^17.2.1",
     "express": "^5.1.0",
-    "mongodb": "^6.18.0"
+    "mongodb": "^6.18.0",
+    "socket.io": "^4.8.1",
+    "socket.io-client": "^4.8.1",
+    "uuid": "^11.0.3"
   },
   "devDependencies": {
     "prettier": "^3.6.2"
diff --git a/run-docker.bat b/run-docker.bat
new file mode 100644
index 0000000..0519ecb
--- /dev/null
+++ b/run-docker.bat
@@ -0,0 +1 @@
+ 
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index 248d819..74a6b60 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,19 +1,117 @@
 const express = require("express");
-const { MongoClient } = require("mongodb");
 const AWS = require("aws-sdk");
+const { createServer } = require("http");
+const { v4: uuidv4 } = require("uuid");
+const { initializeSocket, activeSessions } = require("./socket");
+const { getMongoClient, mongoUri } = require("./db");
+const { MediaSession } = require("./models/MediaSession");
+require("dotenv").config();
+
 
 const app = express();
+const server = createServer(app);
+const io = initializeSocket(server);
 const port = 3000;
 
-const mongoUri =
-  process.env.MONGO_PRIVATE_URL ||
-  process.env.MONGO_URL ||
-  `mongodb://${process.env.MONGOUSER || process.env.MONGO_INITDB_ROOT_USERNAME}:${process.env.MONGO_INITDB_ROOT_PASSWORD}@${process.env.MONGOHOST}:${process.env.MONGOPORT}`;
+
+
+// Enable JSON parsing
+app.use(express.json());
 
 app.get("/", (req, res) => {
   res.send("<h1>Welcome to the Shared Media Streaming Service</h1>");
 });
 
+// Create a new session
+app.post("/api/sessions", async (req, res) => {
+  try {
+    const { creatorId, creatorName } = req.body;
+    
+    if (!creatorId || !creatorName) {
+      return res.status(400).json({
+        success: false,
+        message: "creatorId and creatorName are required"
+      });
+    }
+
+    const sessionId = uuidv4();
+    const session = new MediaSession(sessionId, creatorId);
+    activeSessions.set(sessionId, session);
+    await saveSessionToDb(session);
+
+    res.json({
+      success: true,
+      sessionId,
+      creatorId,
+      message: "Session created successfully"
+    });
+  } catch (error) {
+    console.error("Failed to create session:", error);
+    res.status(500).json({
+      success: false,
+      message: "Failed to create session",
+      error: error.message
+    });
+  }
+});
+
+// Get session info
+app.get("/api/sessions/:sessionId", async (req, res) => {
+  try {
+    const { sessionId } = req.params;
+    
+    let session = activeSessions.get(sessionId);
+    if (!session) {
+      session = await loadSessionFromDb(sessionId);
+    }
+
+    if (!session) {
+      return res.status(404).json({
+        success: false,
+        message: "Session not found"
+      });
+    }
+
+    res.json({
+      success: true,
+      session: session.serialize()
+    });
+  } catch (error) {
+    console.error("Failed to get session:", error);
+    res.status(500).json({
+      success: false,
+      message: "Failed to get session",
+      error: error.message
+    });
+  }
+});
+
+// List active sessions
+app.get("/api/sessions", (req, res) => {
+  try {
+    const sessions = Array.from(activeSessions.values()).map(session => ({
+      sessionId: session.sessionId,
+      userCount: session.users.size,
+      hasMedia: !!session.playbackState.mediaUrl,
+      createdAt: session.createdAt,
+      lastActivity: session.lastActivity
+    }));
+
+    res.json({
+      success: true,
+      sessions,
+      totalSessions: sessions.length
+    });
+  } catch (error) {
+    console.error("Failed to list sessions:", error);
+    res.status(500).json({
+      success: false,
+      message: "Failed to list sessions",
+      error: error.message
+    });
+  }
+});
+
 app.get("/check-mongo", async (req, res) => {
   let client;
 
@@ -95,6 +193,395 @@ app.post("/upload-test-file", async (req, res) => {
   }
 });
 
-app.listen(port, () => {
-  console.log(`Example app listening on port ${port}`);
+// Socket.IO event handlers
+io.on('connection', (socket) => {
+  console.log("socket.io connection");
+  console.log(`User connected: ${socket.id}`);
+
+  // Debug logging for all incoming events
+  socket.onAny((event, ...args) => {
+    console.log(`[DEBUG] Received event: ${event}`, args);
+  });
+
+  // Debug logging for all outgoing events
+  const originalEmit = socket.emit;
+  socket.emit = function(event, ...args) {
+    console.log(`[DEBUG] Emitting event: ${event}`, args);
+    originalEmit.apply(socket, [event, ...args]);
+  };
+  
+  let currentUserId = null;
+  let currentSessionId = null;
+
+  // Helper function to emit to all users in a session except sender
+  const broadcastToSession = (sessionId, event, data, excludeSocketId = null) => {
+    const session = activeSessions.get(sessionId);
+    if (session) {
+      session.users.forEach((userInfo, userId) => {
+        if (userInfo.socketId && userInfo.socketId !== excludeSocketId) {
+          socket.to(userInfo.socketId).emit(event, data);
+        }
+      });
+    }
+  };
+
+  // Helper function to emit to all users in a session including sender
+  const emitToSession = (sessionId, event, data) => {
+    io.to(`session:${sessionId}`).emit(event, data);
+  };
+
+  // Join or create a session
+  socket.on('join_session', async (data) => {
+    console.log("join_session", data);
+    try {
+      const { sessionId, userId, username, avatar } = data;
+      
+      if (!sessionId || !userId || !username) {
+        socket.emit('error', { message: 'Missing required fields: sessionId, userId, username' });
+        return;
+      }
+
+      // Leave current session if any
+      if (currentSessionId) {
+        socket.emit('error', { message: 'Already in a session. Leave current session first.' });
+        return;
+      }
+
+      let session = activeSessions.get(sessionId);
+      
+      // Try to load session from database if not in memory
+      if (!session) {
+        session = await loadSessionFromDb(sessionId);
+        if (session) {
+          activeSessions.set(sessionId, session);
+        }
+      }
+
+      // Create new session if it doesn't exist
+      if (!session) {
+        session = new MediaSession(sessionId, userId);
+        activeSessions.set(sessionId, session);
+        await saveSessionToDb(session);
+      }
+
+      // Add user to session
+      session.addUser(userId, {
+        username,
+        avatar: avatar || null,
+        socketId: socket.id,
+        isLeader: session.leaderId === userId
+      });
+
+      // Update user mappings
+      currentUserId = userId;
+      currentSessionId = sessionId;
+      userSessions.set(userId, sessionId);
+
+      // Join socket room
+      socket.join(`session:${sessionId}`);
+
+      // Send session state to the joining user
+      socket.emit('session_joined', {
+        sessionId,
+        userId,
+        isLeader: session.leaderId === userId,
+        session: session.serialize()
+      });
+
+      // Notify other users about the new user
+      broadcastToSession(sessionId, 'user_joined', {
+        userId,
+        username,
+        avatar,
+        timestamp: Date.now()
+      }, socket.id);
+
+      // Save session state
+      await saveSessionToDb(session);
+
+      console.log(`User ${username} (${userId}) joined session ${sessionId}`);
+    } catch (error) {
+      console.error('Error in join_session:', error);
+      socket.emit('error', { message: 'Failed to join session' });
+    }
+  });
+
+  // Leave current session
+  socket.on('leave_session', async () => {
+    if (currentSessionId && currentUserId) {
+      await handleUserLeave();
+    }
+  });
+
+  // Sync playback state (leader only)
+  socket.on('sync_playback', async (data) => {
+    try {
+      if (!currentSessionId || !currentUserId) {
+        socket.emit('error', { message: 'Not in a session' });
+        return;
+      }
+
+      const session = activeSessions.get(currentSessionId);
+      if (!session) {
+        socket.emit('error', { message: 'Session not found' });
+        return;
+      }
+
+      if (session.leaderId !== currentUserId) {
+        socket.emit('error', { message: 'Only the leader can control playback' });
+        return;
+      }
+
+      const { position, isPlaying, mediaUrl, mediaId, playbackRate = 1.0 } = data;
+      
+      // Update session playback state
+      session.updatePlaybackState({
+        position: parseFloat(position) || 0,
+        isPlaying: Boolean(isPlaying),
+        mediaUrl: mediaUrl || session.playbackState.mediaUrl,
+        mediaId: mediaId || session.playbackState.mediaId,
+        playbackRate: parseFloat(playbackRate) || 1.0
+      });
+
+      // Broadcast to all users in session
+      emitToSession(currentSessionId, 'playback_sync', {
+        ...session.playbackState,
+        position: session.getCurrentPlaybackPosition(),
+        timestamp: Date.now(),
+        leaderId: session.leaderId
+      });
+
+      // Save session state
+      await saveSessionToDb(session);
+
+    } catch (error) {
+      console.error('Error in sync_playback:', error);
+      socket.emit('error', { message: 'Failed to sync playback' });
+    }
+  });
+
+  // Request to become leader
+  socket.on('request_leadership', async () => {
+    try {
+      if (!currentSessionId || !currentUserId) {
+        socket.emit('error', { message: 'Not in a session' });
+        return;
+      }
+
+      const session = activeSessions.get(currentSessionId);
+      if (!session) {
+        socket.emit('error', { message: 'Session not found' });
+        return;
+      }
+
+      // Check if current leader is still connected
+      const currentLeader = session.users.get(session.leaderId);
+      if (!currentLeader || !currentLeader.isConnected) {
+        // Assign leadership
+        session.leaderId = currentUserId;
+        const user = session.users.get(currentUserId);
+        if (user) {
+          user.isLeader = true;
+        }
+
+        // Update other users
+        session.users.forEach((userInfo, userId) => {
+          if (userId !== currentUserId && userInfo.isLeader) {
+            userInfo.isLeader = false;
+          }
+        });
+
+        // Notify all users about leadership change
+        emitToSession(currentSessionId, 'leadership_changed', {
+          newLeaderId: currentUserId,
+          newLeaderName: user?.username,
+          timestamp: Date.now()
+        });
+
+        await saveSessionToDb(session);
+      } else {
+        socket.emit('error', { message: 'Current leader is still active' });
+      }
+    } catch (error) {
+      console.error('Error in request_leadership:', error);
+      socket.emit('error', { message: 'Failed to request leadership' });
+    }
+  });
+
+  // Handle desync recovery
+  socket.on('report_desync', async (data) => {
+    try {
+      if (!currentSessionId || !currentUserId) {
+        socket.emit('error', { message: 'Not in a session' });
+        return;
+      }
+
+      const session = activeSessions.get(currentSessionId);
+      if (!session) {
+        socket.emit('error', { message: 'Session not found' });
+        return;
+      }
+
+      const { reportedPosition, reportedTime } = data;
+      
+      // Send current authoritative state back to the reporting user
+      socket.emit('desync_recovery', {
+        authoritativeState: {
+          ...session.playbackState,
+          position: session.getCurrentPlaybackPosition(),
+          timestamp: Date.now()
+        },
+        reportedPosition,
+        reportedTime
+      });
+
+      console.log(`Desync reported by user ${currentUserId} in session ${currentSessionId}`);
+    } catch (error) {
+      console.error('Error in report_desync:', error);
+      socket.emit('error', { message: 'Failed to handle desync report' });
+    }
+  });
+
+  // Request current session state
+  socket.on('request_session_state', () => {
+    if (!currentSessionId) {
+      socket.emit('error', { message: 'Not in a session' });
+      return;
+    }
+
+    const session = activeSessions.get(currentSessionId);
+    if (!session) {
+      socket.emit('error', { message: 'Session not found' });
+      return;
+    }
+
+    socket.emit('session_state', session.serialize());
+  });
+
+  // Activity heartbeat
+  socket.on('heartbeat', async () => {
+    if (currentSessionId && currentUserId) {
+      const session = activeSessions.get(currentSessionId);
+      if (session) {
+        const user = session.users.get(currentUserId);
+        if (user) {
+          user.lastSeen = Date.now();
+          session.lastActivity = Date.now();
+        }
+      }
+    }
+    socket.emit('heartbeat_ack', { timestamp: Date.now() });
+  });
+
+  // Load media
+  socket.on('load_media', async (data) => {
+    try {
+      if (!currentSessionId || !currentUserId) {
+        socket.emit('error', { message: 'Not in a session' });
+        return;
+      }
+
+      const session = activeSessions.get(currentSessionId);
+      if (!session) {
+        socket.emit('error', { message: 'Session not found' });
+        return;
+      }
+
+      if (session.leaderId !== currentUserId) {
+        socket.emit('error', { message: 'Only the leader can load media' });
+        return;
+      }
+
+      const { mediaUrl, mediaId, mediaTitle, mediaDuration } = data;
+      
+      // Update session with new media
+      session.updatePlaybackState({
+        mediaUrl,
+        mediaId,
+        position: 0,
+        isPlaying: false
+      });
+
+      // Notify all users to load the new media
+      emitToSession(currentSessionId, 'media_loaded', {
+        mediaUrl,
+        mediaId,
+        mediaTitle,
+        mediaDuration,
+        timestamp: Date.now(),
+        loadedBy: currentUserId
+      });
+
+      await saveSessionToDb(session);
+    } catch (error) {
+      console.error('Error in load_media:', error);
+      socket.emit('error', { message: 'Failed to load media' });
+    }
+  });
+
+  // Handle user disconnect
+  const handleUserLeave = async () => {
+    try {
+      if (currentSessionId && currentUserId) {
+        const session = activeSessions.get(currentSessionId);
+        if (session) {
+          // Mark user as disconnected
+          const user = session.users.get(currentUserId);
+          if (user) {
+            user.isConnected = false;
+            user.lastSeen = Date.now();
+          }
+
+          // Notify other users
+          broadcastToSession(currentSessionId, 'user_left', {
+            userId: currentUserId,
+            username: user?.username,
+            timestamp: Date.now()
+          });
+
+          // If no users are connected, optionally clean up session after a delay
+          const connectedUsers = Array.from(session.users.values()).filter(u => u.isConnected);
+          if (connectedUsers.length === 0) {
+            console.log(`Session ${currentSessionId} has no connected users`);
+            // Could implement cleanup logic here
+          }
+
+          await saveSessionToDb(session);
+        }
+
+        // Clean up mappings
+        userSessions.delete(currentUserId);
+        socket.leave(`session:${currentSessionId}`);
+      }
+    } catch (error) {
+      console.error('Error in handleUserLeave:', error);
+    }
+  };
+
+  socket.on('disconnect', async (reason) => {
+    console.log(`User disconnected: ${socket.id}, reason: ${reason}`);
+    await handleUserLeave();
+  });
+});
+
+// Cleanup inactive sessions periodically
+setInterval(async () => {
+  const now = Date.now();
+  const CLEANUP_THRESHOLD = 24 * 60 * 60 * 1000; // 24 hours
+
+  for (const [sessionId, session] of activeSessions.entries()) {
+    // Remove sessions with no connected users that have been inactive for too long
+    const connectedUsers = Array.from(session.users.values()).filter(u => u.isConnected);
+    const isInactive = (now - session.lastActivity) > CLEANUP_THRESHOLD;
+    
+    if (connectedUsers.length === 0 && isInactive) {
+      console.log(`Cleaning up inactive session: ${sessionId}`);
+      activeSessions.delete(sessionId);
+    }
+  }
+}, 60 * 60 * 1000); // Run every hour
+
+server.listen(port, () => {
+  console.log(`Shared Media Streaming server listening on port ${port}`);
+  console.log(`Socket.IO server is ready for connections`);
 });
diff --git a/src/models/MediaSession.js b/src/models/MediaSession.js
new file mode 100644
index 0000000..c367685
--- /dev/null
+++ b/src/models/MediaSession.js
@@ -0,0 +1,75 @@
+class MediaSession {
+  constructor(sessionId, creatorId) {
+    this.sessionId = sessionId;
+    this.creatorId = creatorId;
+    this.leaderId = creatorId;
+    this.users = new Map(); // userId -> userInfo
+    this.playbackState = {
+      mediaUrl: null,
+      mediaId: null,
+      position: 0,
+      isPlaying: false,
+      lastUpdateTime: Date.now(),
+      playbackRate: 1.0
+    };
+    this.createdAt = new Date();
+    this.lastActivity = Date.now();
+  }
+
+  addUser(userId, userInfo) {
+    this.users.set(userId, {
+      ...userInfo,
+      joinedAt: new Date(),
+      lastSeen: Date.now(),
+      isConnected: true
+    });
+    this.lastActivity = Date.now();
+  }
+
+  removeUser(userId) {
+    this.users.delete(userId);
+    this.lastActivity = Date.now();
+    
+    // If leader leaves, assign new leader
+    if (this.leaderId === userId && this.users.size > 0) {
+      this.leaderId = this.users.keys().next().value;
+    }
+  }
+
+  updatePlaybackState(newState, timestamp = Date.now()) {
+    this.playbackState = {
+      ...this.playbackState,
+      ...newState,
+      lastUpdateTime: timestamp
+    };
+    this.lastActivity = timestamp;
+  }
+
+  getCurrentPlaybackPosition() {
+    const now = Date.now();
+    const timeDiff = (now - this.playbackState.lastUpdateTime) / 1000;
+    
+    if (this.playbackState.isPlaying) {
+      return this.playbackState.position + (timeDiff * this.playbackState.playbackRate);
+    }
+    return this.playbackState.position;
+  }
+
+  serialize() {
+    return {
+      sessionId: this.sessionId,
+      creatorId: this.creatorId,
+      leaderId: this.leaderId,
+      users: Array.from(this.users.entries()).map(([id, info]) => ({ id, ...info })),
+      playbackState: {
+        ...this.playbackState,
+        position: this.getCurrentPlaybackPosition()
+      },
+      createdAt: this.createdAt,
+      lastActivity: this.lastActivity,
+      userCount: this.users.size
+    };
+  }
+}
+
+module.exports = { MediaSession };
\ No newline at end of file
diff --git a/src/socket.js b/src/socket.js
new file mode 100644
index 0000000..e8ade04
--- /dev/null
+++ b/src/socket.js
@@ -0,0 +1,464 @@
+const { Server } = require("socket.io");
+const { saveSessionToDb, loadSessionFromDb } = require("./db");
+const { MediaSession } = require("./models/MediaSession");
+
+const activeSessions = new Map();
+const userSessions = new Map();
+
+function initializeSocket(server) {
+	const io = new Server(server, {
+		cors: {
+			origin: "*",
+			methods: ["GET", "POST"],
+		},
+		pingInterval: 10000,
+		pingTimeout: 5000,
+		transports: ["websocket"],
+		allowEIO3: true,
+		connectTimeout: 45000,
+	});
+
+	// Socket.IO event handlers
+	io.on("connection", (socket) => {
+		console.log("socket.io connection");
+		console.log(`User connected: ${socket.id}`);
+
+		// Debug logging for all incoming events
+		socket.onAny((event, ...args) => {
+			console.log(`[DEBUG] Received event: ${event}`, args);
+		});
+
+		// Debug logging for all outgoing events
+		const originalEmit = socket.emit;
+		socket.emit = function (event, ...args) {
+			console.log(`[DEBUG] Emitting event: ${event}`, args);
+			originalEmit.apply(socket, [event, ...args]);
+		};
+
+		let currentUserId = null;
+		let currentSessionId = null;
+
+		// Helper function to emit to all users in a session except sender
+		const broadcastToSession = (
+			sessionId,
+			event,
+			data,
+			excludeSocketId = null
+		) => {
+			const session = activeSessions.get(sessionId);
+			if (session) {
+				session.users.forEach((userInfo, userId) => {
+					if (
+						userInfo.socketId &&
+						userInfo.socketId !== excludeSocketId
+					) {
+						socket.to(userInfo.socketId).emit(event, data);
+					}
+				});
+			}
+		};
+
+		// Helper function to emit to all users in a session including sender
+		const emitToSession = (sessionId, event, data) => {
+			io.to(`session:${sessionId}`).emit(event, data);
+		};
+
+		// Join or create a session
+		socket.on("join_session", async (data) => {
+			console.log("join_session", data);
+			try {
+				const { sessionId, userId, username, avatar } = data;
+
+				if (!sessionId || !userId || !username) {
+					socket.emit("error", {
+						message:
+							"Missing required fields: sessionId, userId, username",
+					});
+					return;
+				}
+
+				// Leave current session if any
+				if (currentSessionId) {
+					socket.emit("error", {
+						message:
+							"Already in a session. Leave current session first.",
+					});
+					return;
+				}
+
+				let session = activeSessions.get(sessionId);
+
+				// Try to load session from database if not in memory
+				if (!session) {
+					session = await loadSessionFromDb(sessionId);
+					if (session) {
+						activeSessions.set(sessionId, session);
+					}
+				}
+
+				// Create new session if it doesn't exist
+				if (!session) {
+					session = new MediaSession(sessionId, userId);
+					activeSessions.set(sessionId, session);
+					await saveSessionToDb(session);
+				}
+
+				// Add user to session
+				session.addUser(userId, {
+					username,
+					avatar: avatar || null,
+					socketId: socket.id,
+					isLeader: session.leaderId === userId,
+				});
+
+				// Update user mappings
+				currentUserId = userId;
+				currentSessionId = sessionId;
+				userSessions.set(userId, sessionId);
+
+				// Join socket room
+				socket.join(`session:${sessionId}`);
+
+				// Send session state to the joining user
+				socket.emit("session_joined", {
+					sessionId,
+					userId,
+					isLeader: session.leaderId === userId,
+					session: session.serialize(),
+				});
+
+				// Notify other users about the new user
+				broadcastToSession(
+					sessionId,
+					"user_joined",
+					{
+						userId,
+						username,
+						avatar,
+						timestamp: Date.now(),
+					},
+					socket.id
+				);
+
+				// Save session state
+				await saveSessionToDb(session);
+
+				console.log(
+					`User ${username} (${userId}) joined session ${sessionId}`
+				);
+			} catch (error) {
+				console.error("Error in join_session:", error);
+				socket.emit("error", { message: "Failed to join session" });
+			}
+		});
+
+		// Leave current session
+		socket.on("leave_session", async () => {
+			if (currentSessionId && currentUserId) {
+				await handleUserLeave();
+			}
+		});
+
+		// Sync playback state (leader only)
+		socket.on("sync_playback", async (data) => {
+			try {
+				if (!currentSessionId || !currentUserId) {
+					socket.emit("error", { message: "Not in a session" });
+					return;
+				}
+
+				const session = activeSessions.get(currentSessionId);
+				if (!session) {
+					socket.emit("error", { message: "Session not found" });
+					return;
+				}
+
+				if (session.leaderId !== currentUserId) {
+					socket.emit("error", {
+						message: "Only the leader can control playback",
+					});
+					return;
+				}
+
+				const {
+					position,
+					isPlaying,
+					mediaUrl,
+					mediaId,
+					playbackRate = 1.0,
+				} = data;
+
+				// Update session playback state
+				session.updatePlaybackState({
+					position: parseFloat(position) || 0,
+					isPlaying: Boolean(isPlaying),
+					mediaUrl: mediaUrl || session.playbackState.mediaUrl,
+					mediaId: mediaId || session.playbackState.mediaId,
+					playbackRate: parseFloat(playbackRate) || 1.0,
+				});
+
+				// Broadcast to all users in session
+				emitToSession(currentSessionId, "playback_sync", {
+					...session.playbackState,
+					position: session.getCurrentPlaybackPosition(),
+					timestamp: Date.now(),
+					leaderId: session.leaderId,
+				});
+
+				// Save session state
+				await saveSessionToDb(session);
+			} catch (error) {
+				console.error("Error in sync_playback:", error);
+				socket.emit("error", { message: "Failed to sync playback" });
+			}
+		});
+
+		// Request to become leader
+		socket.on("request_leadership", async () => {
+			try {
+				if (!currentSessionId || !currentUserId) {
+					socket.emit("error", { message: "Not in a session" });
+					return;
+				}
+
+				const session = activeSessions.get(currentSessionId);
+				if (!session) {
+					socket.emit("error", { message: "Session not found" });
+					return;
+				}
+
+				// Check if current leader is still connected
+				const currentLeader = session.users.get(session.leaderId);
+				if (!currentLeader || !currentLeader.isConnected) {
+					// Assign leadership
+					session.leaderId = currentUserId;
+					const user = session.users.get(currentUserId);
+					if (user) {
+						user.isLeader = true;
+					}
+
+					// Update other users
+					session.users.forEach((userInfo, userId) => {
+						if (userId !== currentUserId && userInfo.isLeader) {
+							userInfo.isLeader = false;
+						}
+					});
+
+					// Notify all users about leadership change
+					emitToSession(currentSessionId, "leadership_changed", {
+						newLeaderId: currentUserId,
+						newLeaderName: user?.username,
+						timestamp: Date.now(),
+					});
+
+					await saveSessionToDb(session);
+				} else {
+					socket.emit("error", {
+						message: "Current leader is still active",
+					});
+				}
+			} catch (error) {
+				console.error("Error in request_leadership:", error);
+				socket.emit("error", {
+					message: "Failed to request leadership",
+				});
+			}
+		});
+
+		// Handle desync recovery
+		socket.on("report_desync", async (data) => {
+			try {
+				if (!currentSessionId || !currentUserId) {
+					socket.emit("error", { message: "Not in a session" });
+					return;
+				}
+
+				const session = activeSessions.get(currentSessionId);
+				if (!session) {
+					socket.emit("error", { message: "Session not found" });
+					return;
+				}
+
+				const { reportedPosition, reportedTime } = data;
+
+				// Send current authoritative state back to the reporting user
+				socket.emit("desync_recovery", {
+					authoritativeState: {
+						...session.playbackState,
+						position: session.getCurrentPlaybackPosition(),
+						timestamp: Date.now(),
+					},
+					reportedPosition,
+					reportedTime,
+				});
+
+				console.log(
+					`Desync reported by user ${currentUserId} in session ${currentSessionId}`
+				);
+			} catch (error) {
+				console.error("Error in report_desync:", error);
+				socket.emit("error", {
+					message: "Failed to handle desync report",
+				});
+			}
+		});
+
+		// Request current session state
+		socket.on("request_session_state", () => {
+			if (!currentSessionId) {
+				socket.emit("error", { message: "Not in a session" });
+				return;
+			}
+
+			const session = activeSessions.get(currentSessionId);
+			if (!session) {
+				socket.emit("error", { message: "Session not found" });
+				return;
+			}
+
+			socket.emit("session_state", session.serialize());
+		});
+
+		// Activity heartbeat
+		socket.on("heartbeat", async () => {
+			if (currentSessionId && currentUserId) {
+				const session = activeSessions.get(currentSessionId);
+				if (session) {
+					const user = session.users.get(currentUserId);
+					if (user) {
+						user.lastSeen = Date.now();
+						session.lastActivity = Date.now();
+					}
+				}
+			}
+			socket.emit("heartbeat_ack", { timestamp: Date.now() });
+		});
+
+		// Load media
+		socket.on("load_media", async (data) => {
+			try {
+				if (!currentSessionId || !currentUserId) {
+					socket.emit("error", { message: "Not in a session" });
+					return;
+				}
+
+				const session = activeSessions.get(currentSessionId);
+				if (!session) {
+					socket.emit("error", { message: "Session not found" });
+					return;
+				}
+
+				if (session.leaderId !== currentUserId) {
+					socket.emit("error", {
+						message: "Only the leader can load media",
+					});
+					return;
+				}
+
+				const { mediaUrl, mediaId, mediaTitle, mediaDuration } = data;
+
+				// Update session with new media
+				session.updatePlaybackState({
+					mediaUrl,
+					mediaId,
+					position: 0,
+					isPlaying: false,
+				});
+
+				// Notify all users to load the new media
+				emitToSession(currentSessionId, "media_loaded", {
+					mediaUrl,
+					mediaId,
+					mediaTitle,
+					mediaDuration,
+					timestamp: Date.now(),
+					loadedBy: currentUserId,
+				});
+
+				await saveSessionToDb(session);
+			} catch (error) {
+				console.error("Error in load_media:", error);
+				socket.emit("error", { message: "Failed to load media" });
+			}
+		});
+
+		// Handle user disconnect
+		const handleUserLeave = async () => {
+			try {
+				if (currentSessionId && currentUserId) {
+					const session = activeSessions.get(currentSessionId);
+					if (session) {
+						// Mark user as disconnected
+						const user = session.users.get(currentUserId);
+						if (user) {
+							user.isConnected = false;
+							user.lastSeen = Date.now();
+						}
+
+						// Notify other users
+						broadcastToSession(currentSessionId, "user_left", {
+							userId: currentUserId,
+							username: user?.username,
+							timestamp: Date.now(),
+						});
+
+						// If no users are connected, optionally clean up session after a delay
+						const connectedUsers = Array.from(
+							session.users.values()
+						).filter((u) => u.isConnected);
+						if (connectedUsers.length === 0) {
+							console.log(
+								`Session ${currentSessionId} has no connected users`
+							);
+							// Could implement cleanup logic here
+						}
+
+						await saveSessionToDb(session);
+					}
+
+					// Clean up mappings
+					userSessions.delete(currentUserId);
+					socket.leave(`session:${currentSessionId}`);
+				}
+			} catch (error) {
+				console.error("Error in handleUserLeave:", error);
+			}
+		};
+
+		socket.on("disconnect", async (reason) => {
+			console.log(`User disconnected: ${socket.id}, reason: ${reason}`);
+			await handleUserLeave();
+		});
+	});
+
+	// Cleanup inactive sessions periodically
+	setInterval(
+		async () => {
+			const now = Date.now();
+			const CLEANUP_THRESHOLD = 24 * 60 * 60 * 1000; // 24 hours
+
+			for (const [sessionId, session] of activeSessions.entries()) {
+				// Remove sessions with no connected users that have been inactive for too long
+				const connectedUsers = Array.from(
+					session.users.values()
+				).filter((u) => u.isConnected);
+				const isInactive =
+					now - session.lastActivity > CLEANUP_THRESHOLD;
+
+				if (connectedUsers.length === 0 && isInactive) {
+					console.log(`Cleaning up inactive session: ${sessionId}`);
+					activeSessions.delete(sessionId);
+				}
+			}
+		},
+		60 * 60 * 1000
+	); // Run every hour
+
+	return io;
+}
+
+module.exports = {
+	initializeSocket,
+	activeSessions,
+	userSessions,
+};
diff --git a/src/test-socket.js b/src/test-socket.js
new file mode 100644
index 0000000..3bb8f87
--- /dev/null
+++ b/src/test-socket.js
@@ -0,0 +1,43 @@
+const { io } = require("socket.io-client");
+
+const socket = io("http://localhost:3000", {
+	transports: ["websocket"],
+});
+
+socket.on("connect", () => {
+	console.log("Connected to server with socket id:", socket.id);
+
+	// Emit join_session
+	socket.emit("join_session", {
+		sessionId: "CvOjlLWktIVrE4hhAAAF", // <-- Replace with valid sessionId
+		userId: "user123",
+		username: "Sridhar",
+		avatar: null,
+	});
+});
+
+socket.on("session_joined", (data) => {
+	console.log("Session Joined:", data);
+
+	// Send heartbeats after session join
+	setInterval(() => {
+		console.log("Sending heartbeat...");
+		socket.emit("heartbeat");
+	}, 5000);
+});
+
+socket.on("heartbeat_ack", (data) => {
+	console.log("Heartbeat Ack:", data);
+});
+
+socket.onAny((event, ...args) => {
+	console.log("Received Event:", event, args);
+});
+
+socket.on("disconnect", (reason) => {
+	console.log("Disconnected:", reason);
+});
+
+socket.on("error", (error) => {
+	console.error("Socket Error:", error);
+});