test

Author: Peterr181

.github/workflows/ci.yml

@@ -7,10 +7,10 @@ on:
   pull_request:
     branches:
       - main
-  workflow_dispatch: # Enable manual trigger
+  workflow_dispatch:
 
 jobs:
-  build:
+  build-and-deploy:
     runs-on: ubuntu-latest
 
     services:
@@ -22,7 +22,7 @@ jobs:
           MYSQL_PASSWORD: ${{ secrets.PASSWORD }}
           MYSQL_ROOT_PASSWORD: ${{ secrets.PASSWORD }}
         ports:
-          - 33306:3306 # Expose the internal MySQL port 3306 as 33306
+          - 33306:3306
         options: >-
           --health-cmd "mysqladmin ping --silent"
           --health-interval 20s
@@ -33,14 +33,30 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
         with:
-          fetch-depth: 0 # Fetch all history for all branches and tags
+          fetch-depth: 0
 
-      # Set up Node.js environment
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
           node-version: "16"
 
+      # Add caching for dependencies
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            **/node_modules
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
+
+      # Add caching for build outputs
+      - name: Cache build outputs
+        uses: actions/cache@v2
+        with:
+          path: |
+            client/dist
+            server/public
+          key: ${{ runner.os }}-build-${{ github.sha }}
+
       # Install server dependencies
       - name: Install server dependencies
         working-directory: ./server
@@ -49,13 +65,13 @@ jobs:
       # Start the Express backend
       - name: Start Express backend
         working-directory: ./server
-        run: npm start & # Use '&' to run it in the background
+        run: npm start &
 
-      # Wait for Express server to be ready
-      - name: Wait for Express server to be ready
+      # Wait for Express server
+      - name: Wait for Express server
         run: |
           echo "Waiting for Express server to be ready..."
-          for i in {1..10}; do # Try for up to 10 attempts
+          for i in {1..10}; do
             if curl -s http://localhost:${{ secrets.PORT }}; then
               echo "Express server is ready!"
               break
@@ -64,20 +80,20 @@ jobs:
             sleep 5
           done
 
-      # Install and test backend (server)
-      - name: Install and test server
+      # Run server tests
+      - name: Test server
         working-directory: ./server
         env:
           PORT: ${{ secrets.PORT }}
           USER: ${{ secrets.USER }}
           HOST: 127.0.0.1
           DATABASE: ${{ secrets.DATABASE }}
           PASSWORD: ${{ secrets.PASSWORD }}
-          DBPORT: 33306 # Match the changed port
+          DBPORT: 33306
           JWT_SECRET: ${{ secrets.JWT_SECRET }}
         run: npm test
 
-      # Install and build frontend (client)
+      # Install and build frontend
       - name: Install and build client
         working-directory: ./client
         env:
@@ -88,24 +104,74 @@ jobs:
         run: |
           npm install
           npm run build
-          mv ./dist ../server/public # Move built React files to the server's public directory
 
-      # Debug step: MySQL logs
-      - name: MySQL Logs
-        run: docker logs $(docker ps -q --filter "ancestor=mysql:8.0")
+      # Prepare deployment
+      - name: Prepare for deployment
+        run: |
+          mkdir -p server/public
+          cp -r client/dist/* server/public/
+
+      # Debug: List contents of directories
+      - name: Debug - List directories
+        run: |
+          echo "Contents of server/public:"
+          ls -la server/public
+          echo "Contents of client/dist:"
+          ls -la client/dist
 
-      # Deploy to Heroku (only if on the main branch and build was successful)
+      # Deploy to Heroku
       - name: Deploy to Heroku
         if: github.ref == 'refs/heads/main' && success()
         env:
-          HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }} # Ensure you have this secret set in GitHub
+          HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+        run: |
+          # Enable error logging
+          set -x
+
+          # Ensure the public directory exists and copy files
+          mkdir -p server/public
+          cp -r client/dist/* server/public/
+
+          # Configure Git
+          git config --global user.email "[email protected]"
+          git config --global user.name "CI/CD Pipeline"
+
+          # Stage and commit the built files
+          git add server/public -f
+          git commit -m "Update frontend build [skip ci]" || echo "No changes to commit"
+
+          # Install Heroku CLI if not already installed
+          if ! command -v heroku &> /dev/null; then
+            curl https://cli-assets.heroku.com/install.sh | sh
+          fi
+
+          # Add Heroku remote
+          heroku git:remote -a gymero
+
+          # Push to Heroku
+          git push https://heroku:${{ secrets.HEROKU_API_KEY }}@git.heroku.com/gymero.git HEAD:main --force
+
+          # If deployment fails, show Heroku logs
+          if [ $? -ne 0 ]; then
+            heroku logs --tail --app gymero
+            exit 1
+
+      # Post-deployment verification
+      - name: Verify deployment
+        if: github.ref == 'refs/heads/main' && success()
+        run: |
+          echo "Waiting for deployment to stabilize..."
+          sleep 30
+          curl --fail https://gymero.live || exit 1
+
+      # Debug MySQL logs if needed
+      - name: MySQL Logs
+        if: failure()
+        run: docker logs $(docker ps -q --filter "ancestor=mysql:8.0")
+
+      # Cleanup
+      - name: Cleanup
+        if: always()
         run: |
-          echo "Adding Heroku remote..."
-          git remote add heroku https://apikey:${{ secrets.HEROKU_API_KEY }}@git.heroku.com/gymero.git
-          echo "Committing built frontend..."
-          git config user.name "CI/CD Pipeline"
-          git config user.email "[email protected]"
-          git add server/public
-          git commit -m "Include frontend build artifacts [skip ci]" || echo "No changes to commit"
-          echo "Pushing to Heroku..."
-          git push heroku main --force # Ensure you are pushing the right branch
+          rm -rf server/public/*
+          git reset --hard HEAD

.gitignore

@@ -0,0 +1,5 @@
+# .gitignore
+**/node_modules
+**/.env
+**/dist
+!server/public/

server/Procfile

@@ -0,0 +1 @@
+web: node server.js

server/package.json

@@ -7,7 +7,9 @@
   "scripts": {
     "start": "node server.js",
     "dev": "nodemon server.js",
-    "test": "echo \"No tests specified\""
+    "test": "echo \"No tests specified\"",
+    "build": "cd ../client && npm install && npm run build && cp -r dist/* ../server/public/",
+    "heroku-postbuild": "cd ../client && npm install && npm run build && cp -r dist/* ../server/public/"
   },
   "keywords": [],
   "author": "",

server/server.js

@@ -6,6 +6,7 @@ import { config } from "dotenv";
 import { Server } from "socket.io";
 import path from "path";
 import { fileURLToPath } from "url";
+import fs from "fs";
 
 import mealsRoutes from "./routes/mealsRoutes.js";
 import workoutRoutes from "./routes/workoutRoutes.js";
@@ -30,23 +31,13 @@ const PORT = process.env.PORT || 8081;
 
 const isProduction = process.env.NODE_ENV === "production";
 const clientOrigin = isProduction
-  ? "https://gymero.live" // Production URL
-  : "http://localhost:5173"; // Local development URL
+  ? "https://gymero.live"
+  : "http://localhost:5173";
 
 if (isProduction) {
   app.use(expressSslify.HTTPS({ trustProtoHeader: true }));
 }
 
-// Create a rate limiter
-// const apiLimiter = rateLimit({
-//   windowMs: 15 * 60 * 1000, // 15 minutes
-//   max: 50, // Limit each IP to 100 requests per windowMs
-//   message: "Too many requests from this IP, please try again later.",
-// });
-
-// // Apply the rate limiter to all API routes
-// app.use("/api/", apiLimiter);
-
 const server = http.createServer(app);
 const io = new Server(server, {
   cors: {
@@ -56,6 +47,7 @@ const io = new Server(server, {
   },
 });
 
+// Middleware
 app.use(
   cors({
     origin: [clientOrigin],
@@ -66,6 +58,16 @@ app.use(
 app.use(express.json());
 app.use(cookieParser());
 
+// Ensure public directory exists
+const publicDir = path.join(__dirname, "public");
+if (!fs.existsSync(publicDir)) {
+  fs.mkdirSync(publicDir, { recursive: true });
+}
+
+// Serve static files from the public directory
+app.use(express.static(publicDir));
+
+// API Routes
 app.use("/auth", authRoutes);
 app.use("/api/users", userRoutes);
 app.use("/api/workouts", workoutRoutes);
@@ -77,26 +79,42 @@ app.use("/api/streak", streakRoutes);
 app.use("/api/routines", gymRoutineRoutes);
 app.use("/api/daily-settings", dailySettingsRoutes);
 
-// Serve static files only in production
+// Serve static files in production
 if (isProduction) {
-  const clientPath = path.resolve(__dirname, "../client/dist");
+  // Serve from both public and client/dist directories
+  const clientPath = path.resolve(__dirname, "public");
   app.use(express.static(clientPath));
 
-  // Define the root route to serve the index.html file
+  // Health check endpoint
+  app.get("/health", (req, res) => {
+    res.status(200).send("OK");
+  });
+
+  // Define routes for serving the SPA
   app.get("/", (req, res) => {
     res.sendFile(path.join(clientPath, "index.html"));
   });
 
-  // Catch-all route for SPA
+  // Catch-all route for client-side routing
   app.get("*", (req, res) => {
-    res.sendFile(path.join(clientPath, "index.html"));
+    // First try to serve from public directory
+    const publicPath = path.join(__dirname, "public", req.path);
+    if (fs.existsSync(publicPath)) {
+      res.sendFile(publicPath);
+    } else {
+      // If not found in public, serve the SPA's index.html
+      res.sendFile(path.join(__dirname, "public", "index.html"));
+    }
   });
 }
 
 // Socket.IO event listeners
 io.on("connection", (socket) => {
+  console.log("New client connected");
+
   socket.on("joinRoom", (roomId) => {
     socket.join(roomId);
+    console.log(`Client joined room: ${roomId}`);
   });
 
   socket.on(
@@ -122,11 +140,47 @@ io.on("connection", (socket) => {
   );
 
   socket.on("disconnect", () => {
-    console.log("User disconnected");
+    console.log("Client disconnected");
+  });
+
+  // Error handling for socket
+  socket.on("error", (error) => {
+    console.error("Socket error:", error);
   });
 });
 
+// Global error handler
+app.use((err, req, res, next) => {
+  console.error(err.stack);
+  res.status(500).send("Something broke!");
+});
+
 // Start the server
 server.listen(PORT, () => {
   console.log(`Server running on port ${PORT}`);
+  console.log(`Environment: ${process.env.NODE_ENV}`);
+  console.log(
+    `Static files being served from: ${path.join(__dirname, "public")}`
+  );
+});
+
+// Handle server shutdown gracefully
+process.on("SIGTERM", () => {
+  console.log("SIGTERM signal received: closing HTTP server");
+  server.close(() => {
+    console.log("HTTP server closed");
+    process.exit(0);
+  });
 });
+
+process.on("uncaughtException", (err) => {
+  console.error("Uncaught Exception:", err);
+  process.exit(1);
+});
+
+process.on("unhandledRejection", (reason, promise) => {
+  console.error("Unhandled Rejection at:", promise, "reason:", reason);
+  // Handle the error appropriately
+});
+
+export default server;