Merge pull request #67 from oslabs-beta/user0824/feat/dashboard

feat: updated server file to look for the PORT

Author: amitharor

server/src/index.ts

@@ -17,22 +17,26 @@ import { initializeWebSocket } from './services/websocketService';
 
 const app = express();
 const secret = await getSecretKeys(); // Load secrets from Google Secret Manager
-const port = secret.PORT;
+// Use Cloud Run's PORT env var if available, otherwise fall back to secret or default
+const port = process.env.PORT || secret.PORT || 3000;
 const server = createServer(app);
 
 // Initialize WebSocket
 initializeWebSocket(server);
 
 // ------------------------------------------------------------------------------------------------
-// * K8s EVENT WATCHER & PROCESSOR
+// * K8s EVENT WATCHER & PROCESSOR (Started after server is running)
 // ------------------------------------------------------------------------------------------------
-startK8sEventWatcher().catch((err) =>
-  console.error(chalk.redBright('Failed to start K8s watcher:', err)),
-); // Start Kubernetes event watcher
-
-startK8sEventProcessor().catch((err) =>
-  console.error(chalk.redBright('Failed to start K8s processor:', err)),
-); // Start Kubernetes event processor
+// Start these services asynchronously after server starts to prevent blocking
+setTimeout(() => {
+  startK8sEventWatcher().catch((err) =>
+    console.error(chalk.redBright('Failed to start K8s watcher:', err)),
+  ); // Start Kubernetes event watcher
+  
+  startK8sEventProcessor().catch((err) =>
+    console.error(chalk.redBright('Failed to start K8s processor:', err)),
+  ); // Start Kubernetes event processor
+}, 2000); // Wait 2 seconds after server starts
 
 // ------------------------------------------------------------------------------------------------
 // * MIDDLEWARE
@@ -49,6 +53,15 @@ app.get('/status', (req, res) => {
   res.status(200).json({ status: 'online', message: 'Server is online!' });
 });
 
+// Health check endpoints for Cloud Run
+app.get('/health', (req, res) => {
+  res.status(200).json({ status: 'healthy', timestamp: new Date().toISOString() });
+});
+
+app.get('/ready', (req, res) => {
+  res.status(200).json({ status: 'ready', timestamp: new Date().toISOString() });
+});
+
 app.use(express.json()); // EXPRESS
 app.use('/api', routes); // ROUTES
 app.use('/api/gke', clusterRouter);

server/vite.config.js

@@ -31,7 +31,10 @@ export default defineConfig({
         'cors',
         'dotenv',
         'express',
-        'redis'
+        'google-auth-library',
+        'js-yaml', 
+        'redis',
+        'socket.io'
       ],
       output: {
         dir: 'dist',