chore(ci,c d): fix health-check, release packaging, PM2 symlink deploy; update Node/actions; clean comments; update server setup

Author: darestack

.github/workflows/ci.yml

@@ -13,12 +13,14 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: "20"
+          cache: npm
+          cache-dependency-path: package-lock.json
 
       - name: Install dependencies
         run: npm ci
@@ -34,14 +36,14 @@ jobs:
       contents: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: "0"
 
       - name: Bump version and push tag
         uses: anothrNick/github-tag-action@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DEFAULT_BUMP: patch
           TAG_PREFIX: v
           WITH_V: true # Ensures consistent v prefix

.github/workflows/health-check.yml

@@ -13,7 +13,7 @@ jobs:
         id: check_prod
         run: |
           set +e # Allow curl to fail without exiting the script
-          CURL_OUTPUT=$(curl -s -o /dev/null -w "%{{http_code}}" ${{ secrets.PROD_URL }}/health 2>&1)
+          CURL_OUTPUT=$(curl -s -o /dev/null -w "%{http_code}" ${{ secrets.PROD_URL }}/api/health 2>&1)
           HTTP_CODE=$(echo $CURL_OUTPUT | tail -n 1)
           CURL_ERROR=$(echo $CURL_OUTPUT | head -n -1)
 
@@ -29,7 +29,7 @@ jobs:
         id: check_dev
         run: |
           set +e # Allow curl to fail without exiting the script
-          CURL_OUTPUT=$(curl -s -o /dev/null -w "%{{http_code}}" ${{ secrets.DEV_URL }}/health 2>&1)
+          CURL_OUTPUT=$(curl -s -o /dev/null -w "%{http_code}" ${{ secrets.DEV_URL }}/api/health 2>&1)
           HTTP_CODE=$(echo $CURL_OUTPUT | tail -n 1)
           CURL_ERROR=$(echo $CURL_OUTPUT | head -n -1)
 

.github/workflows/release.yml

@@ -27,7 +27,7 @@ jobs:
         run: |
           mkdir deploy_package
           # include your deploy.sh and any other scripts here
-          cp -r src public scripts package.json package-lock.json .env.example deploy_package/
+          cp -r src public scripts package.json package-lock.json deploy_package/
           tar -czf deployment.tar.gz -C deploy_package .
 
       - name: Deploy to EC2

scripts/deploy.sh

@@ -15,8 +15,8 @@ echo "🚀 Starting deployment process..."
 # Create necessary directories
 sudo mkdir -p $RELEASES_DIR
 sudo mkdir -p $BACKUP_DIR
-sudo chown -R ubuntu:ubuntu $APP_DIR
-sudo chown -R ubuntu:ubuntu $BACKUP_DIR
+sudo chown -R ${USER}:${USER} $APP_DIR
+sudo chown -R ${USER}:${USER} $BACKUP_DIR
 
 # Create new release directory
 mkdir -p $NEW_RELEASE_DIR
@@ -31,23 +31,24 @@ tar -xzf /tmp/deployment.tar.gz -C $NEW_RELEASE_DIR
 echo "📋 Installing dependencies..."
 # Install only production dependencies
 cd $NEW_RELEASE_DIR
-npm ci --only=production
+npm ci --omit=dev
 
 echo "🔄 Managing application process..."
 
-# Check if the service is already running
+# Symlink the new release to current BEFORE managing PM2
+ln -nfs $NEW_RELEASE_DIR $CURRENT_RELEASE_DIR
+
+# Manage PM2 with stable path pointing at current symlink
 if pm2 list | grep -q $SERVICE_NAME; then
   echo "🔄 Reloading application with PM2 for zero-downtime deployment..."
-  pm2 reload $SERVICE_NAME
+  pm2 reload $SERVICE_NAME --update-env
 else
   echo "🚀 Starting application with PM2..."
-  # Set production environment
   export NODE_ENV=production
   export PORT=3000
   export HOST=0.0.0.0
   export DEPLOYMENT_TIME=$(date -u +"%Y-%m-%dT%H:%M:%S.000Z")
-  
-  pm2 start $NEW_RELEASE_DIR/src/server.js --name $SERVICE_NAME --env production
+  pm2 start $CURRENT_RELEASE_DIR/src/server.js --name $SERVICE_NAME --env production
 fi
 
 # Create a backup of the previous release
@@ -60,14 +61,13 @@ if [ -L "$CURRENT_RELEASE_DIR" ]; then
   fi
 fi
 
-# Symlink the new release to current
-ln -nfs $NEW_RELEASE_DIR $CURRENT_RELEASE_DIR
+# Symlink already updated above
 
 # Save PM2 configuration
 pm2 save
 
 # Setup PM2 to start on system boot
-pm2 startup ubuntu -u ubuntu --hp /home/ubuntu || echo "PM2 startup already configured"
+pm2 startup || echo "PM2 startup already configured"
 
 echo "🔍 Performing health check..."
 # Wait for application to start

server_config

@@ -4,8 +4,8 @@ ssh -i github-actions-key.pem ubuntu@YOUR-EC2-PUBLIC-IP
 # Update system packages
 sudo apt update && sudo apt upgrade -y
 
-# Install Node.js 18.x
-curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
+# Install Node.js 20.x (LTS)
+curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -
 sudo apt-get install -y nodejs
 
 # Verify installation
@@ -20,8 +20,8 @@ sudo apt install nginx -y
 
 # Create application directory
 sudo mkdir -p /var/www/app
-sudo chown -R ubuntu:ubuntu /var/www/app
+sudo chown -R $USER:$USER /var/www/app
 
 # Create backup directory
 sudo mkdir -p /var/www/backup
-sudo chown -R ubuntu:ubuntu /var/www/backup
+sudo chown -R $USER:$USER /var/www/backup

src/app.js

@@ -24,7 +24,6 @@ app.use(express.static(path.join(__dirname, '../public')));
 app.use('/api', apiRoutes);
 app.use('/api/health', healthRoutes);
 
-// 404 handler
 // 404 handler
 app.use((req, res) => {
   res.status(404).json({ error: 'Route not found' });