Merge pull request #137 from CS3219-AY2425S1/c-fix

add annotation to k8 session service  to accept http

k8s/session-service.yml

@@ -38,6 +38,8 @@ apiVersion: v1
 kind: Service
 metadata:
   name: session-svc
+  annotations:
+    cloud.google.com/app-protocols: '{"websocket":"HTTP", "audio":"HTTP"}'
 spec:
   type: LoadBalancer
   ports:

session-service/src/audio-service.ts

@@ -10,19 +10,21 @@ interface AudioData {
 }
 
 const app = express();
-app.use(cors({
-  origin: '*',
-  methods: ['GET', 'POST'],
-  credentials: true,
-}));
+app.use(
+  cors({
+    origin: "*",
+    methods: ["GET", "POST"],
+    credentials: true,
+  })
+);
 
 const httpServer = createServer(app);
 const io = new Server(httpServer, {
   cors: {
     origin: "*",
     methods: ["GET", "POST"],
     credentials: true,
-    allowedHeaders: ["*"]
+    allowedHeaders: ["*"],
   },
   path: "/socket.io/",
   transports: ["websocket"],
@@ -33,7 +35,7 @@ const io = new Server(httpServer, {
 
 // Add connection error handling
 io.engine.on("connection_error", (err) => {
-  console.log('Connection error:', err);
+  console.log("Connection error:", err);
 });
 
 io.on("connection", (socket: Socket) => {
@@ -45,7 +47,7 @@ io.on("connection", (socket: Socket) => {
 
   // Handle signaling data for WebRTC connections
   socket.on("signal", (signalData) => {
-    console.log('Received signal data, broadcasting to others');
+    console.log("Received signal data, broadcasting to others");
     socket.broadcast.emit("signal", signalData);
   });
 
@@ -54,11 +56,11 @@ io.on("connection", (socket: Socket) => {
   });
 });
 
-app.get('/health', (req, res) => {
-  res.send('Server is running');
+app.get("/health", (req, res) => {
+  res.send("Server is running");
 });
 
 const PORT = process.env.AUDIO_PORT || 5555;
 httpServer.listen(PORT, () => {
   console.log(`Audio service is running on port ${PORT}`);
-});
+});

session-service/src/server.ts

@@ -11,7 +11,7 @@ const setupWSConnection = require("y-websocket/bin/utils").setupWSConnection;
 export const allowedOrigins = ["*"];
 
 /**
- * Server INITIALIZATION and CONFIGURATION
+ * Server INITIALIZATION and CONFIGURATION.
  * CORS configuration
  * Request body parsing
  */