Merge branch 'dev' into question-service-enhancement

Author: ho-thanh-und

backend/collaboration-service/src/http/codeExecutionRoutes.js

@@ -7,7 +7,7 @@ const router = express.Router();
 const RABBITMQ_URL = 'amqp://user:password@rabbitmq';
 const QUEUE_NAME = 'execution_jobs';
 
-const EXECUTION_TIMEOUT_MS = 30000 // 30s
+const EXECUTION_TIMEOUT_MS = 60000 // 60s
 const activeTimers = new Map()
 
 let mqChannel = null
@@ -59,6 +59,9 @@ router.post("/submit-code", async (req, res) => {
         }
 
         console.log(">>> Got code ", job)
+        roomManager.broadcastToRoom(room_id, {
+            type: "code-execution-started"
+        })
 
         // delete old timers
         if (activeTimers.has(room_id)) {

backend/collaboration-service/src/models/roomModel.js

@@ -18,7 +18,21 @@ const roomSchema = new mongoose.Schema(
     },
     programmingLanguage: {
       type: String,
-      enum: ["cpp", "java", "javascript", "python"],
+      enum: [
+        "c",
+        "cpp",
+        "csharp", 
+        "go",
+        "java", 
+        "javascript", 
+        "kotlin",
+        "php",
+        "python",
+        "ruby",
+        "rust",
+        "swift",
+        "typescript",
+      ],
       default: "python",
       required: true,
     },

backend/execution-service/src/worker.js

@@ -8,11 +8,12 @@ const PISTON_URL = process.env.PISTON_URL
 
 const MAX_RETRIES = 3
 const RETRY_DELAY_MS = 2000
-const PISTON_CALL_DELAY_MS = 10000
+const AXIOS_CONNECTION_TIMEOUT_MS = 2000
+const PISTON_EXECUTION_TIMEOUT_MS = 40000 // 40s
 
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
-async function callPistonAPI(language, source_code) {
+async function callPistonAPI(language, source_code, timeout_ms) {
     try {
         const payload = {
             language: language,
@@ -21,10 +22,12 @@ async function callPistonAPI(language, source_code) {
                 {
                     content: source_code
                 }
-            ]
+            ],
+            run_timeout: 10000,
+            compile_timeout: 30000
         }
         const response = await axios.post(PISTON_URL, payload, {
-            timeout: PISTON_CALL_DELAY_MS
+            timeout: timeout_ms
         })
         return response.data
     } catch (error) {
@@ -55,29 +58,13 @@ async function resultCallback(result) {
  * @returns result: {room_id, isError, output}
  */
 async function processSubmission(submit) {
-    // If fail to connect Piston API for 3 times, then the submit is failed
     let result = {}
     result.room_id = submit.room_id
-    for (let i = 1; i <= MAX_RETRIES; i++) {
-        try {
-            const response = await callPistonAPI(submit.language, submit.source_code)
-                   
-            // set isError
-            if (response.run.status) { // runtime error
-                result.isError = true
-                // get readable message or output
-                result.output = response.run.message || response.run.output 
-            } else if (response.run.code !== 0) { // runcode != 0 error
-                result.isError = true
-                result.output = response.run.output
-            } else { // successfully run the code
-                result.isError = false
-                result.output = response.run.output
-            }
-            
 
-            console.log(">>> Finish job", result)
-            return result
+    // first 2 time: check for connection
+    for (let i = 1; i <= MAX_RETRIES - 1; i++) {
+        try {
+            const response = await callPistonAPI(submit.language, submit.source_code, AXIOS_CONNECTION_TIMEOUT_MS)
         } catch (error) {
             if (error.response) {
                 const statusCode = error.response.status
@@ -88,26 +75,62 @@ async function processSubmission(submit) {
                     console.log(">>> Finish job (error)", result)
                     return result
                 } else {
-                    // rerun
+                    // piston temp error
                     console.log(">>> Piston api temporary error: ", statusCode)
                 }
-            } else {
-                // rerun
+            } else if (axios.isAxiosError(error) && error.code !== 'ECONNREFUSED') {
+                // timeout / no connection
                 console.log(">>> Piston api doesn't respond\n", error.message)
+            } else {
+                // ECONNREFUSED
+                console.log(">>> Piston api is dead (ECONNREFUSED)\n", error.message)
             }
-            if (i === MAX_RETRIES) {
-                break
+
+            // next try
+            const delay = RETRY_DELAY_MS * i;
+            console.log(`>>> Wait ${delay}ms before reconnect to Piston api`)
+            await sleep(delay)
+            continue
+        }
+        // if no error, quit try loop
+        break
+    }
+
+    // final try: timeout 40s
+    try {
+        const response = await callPistonAPI(submit.language, submit.source_code, PISTON_EXECUTION_TIMEOUT_MS)
+                   
+        // set isError
+        if (response.run.status) { // runtime error
+            result.isError = true
+            // get readable message or output
+            result.output = response.run.message || response.run.output 
+        } else if (response.run.code !== 0) { // runcode != 0 error
+            result.isError = true
+            result.output = response.run.output
+        } else { // successfully run the code
+            result.isError = false
+            result.output = response.run.output
+        }
+        
+
+        console.log(">>> Finish job", result)
+        return result
+    } catch (error) {
+        if (error.response) {
+            const statusCode = error.response.status
+            if (statusCode >= 400 && statusCode < 500) {
+                result.isError = true
+                result.output = error.response.data.message
+                return result
             }
         }
-        const delay = RETRY_DELAY_MS * i;
-        console.log(`>>> Wait ${delay}ms before reconnect to Piston api`)
-        await sleep(delay)
+        // failed (after 3 tries)
+        result.isError = true
+        result.output = "Code execution service is unavailable. Please try again later."
+        console.log('>>> Failed job ', result)
+        return result
     }
-    // failed (after 3 tries)
-    result.isError = true
-    result.output = "Code execution service is unavailable. Please try again later."
-    console.log('>>> Failed job ', result)
-    return result
 }
 
 async function startWorker() {

docker-compose.yml

@@ -202,6 +202,9 @@ services:
     ports:
       - '2000:2000'
     privileged: true
+    environment:
+      - PISTON_COMPILE_TIMEOUT=30000
+      - PISTON_RUN_TIMEOUT=10000
     volumes:
       - piston_packages:/piston/packages 
     networks:

frontend/Dockerfile.frontend

@@ -1,60 +1,66 @@
+# ---------- deps ----------
 FROM node:20-alpine AS deps
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
 
-# Install pnpm
-RUN npm install -g pnpm
+RUN corepack enable && corepack prepare [email protected] --activate
 
-# Copy package files
-COPY package.json ./
+RUN echo "node-linker=hoisted" > .npmrc
 
-# Install dependencies
-RUN pnpm install --no-frozen-lockfile
+COPY package.json pnpm-lock.yaml ./
 
+# Pre-fetch store
+RUN --mount=type=cache,id=pnpm-store,target=/root/.local/share/pnpm/store \
+    pnpm fetch
+
+# ---------- builder ----------
 FROM node:20-alpine AS builder
+RUN apk add --no-cache libc6-compat
 WORKDIR /app
 
-# Install pnpm
-RUN npm install -g pnpm
+RUN corepack enable && corepack prepare pnpm@9.12.1 --activate
+RUN echo "node-linker=hoisted" > .npmrc
 
-# Copy dependencies from deps stage
-COPY --from=deps /app/node_modules ./node_modules
-COPY --from=deps /app/package.json ./package.json
+ARG USER_SERVICE_URL
+ARG MATCHING_SERVICE_URL
+ARG QUESTION_SERVICE_URL
+ARG COLLABORATION_SERVICE_URL
 
-# Copy source code
-COPY . .
+ENV NEXT_PUBLIC_USER_SERVICE_URL=$USER_SERVICE_URL \
+    NEXT_PUBLIC_MATCHING_SERVICE_URL=$MATCHING_SERVICE_URL \
+    NEXT_PUBLIC_QUESTION_SERVICE_URL=$QUESTION_SERVICE_URL \
+    NEXT_PUBLIC_COLLABORATION_SERVICE_URL=$COLLABORATION_SERVICE_URL \
+    NEXT_TELEMETRY_DISABLED=1 \
+    NEXT_DISABLE_SOURCEMAPS=1
 
-# Set environment to production for build
-ENV NODE_ENV=production
-ENV NEXT_TELEMETRY_DISABLED=1
+COPY package.json pnpm-lock.yaml ./
+RUN --mount=type=cache,id=pnpm-store,target=/root/.local/share/pnpm/store \
+    pnpm install --frozen-lockfile --prod=false
 
-# Build Next.js application
-RUN pnpm build
+# Copy the rest of the source
+COPY . .
+
+# Build with caches
+RUN --mount=type=cache,target=/app/.next/cache \
+    --mount=type=cache,target=/root/.cache \
+    pnpm build
 
+# ---------- runner ----------
 FROM node:20-alpine AS runner
 WORKDIR /app
+ENV NODE_ENV=production \
+    NEXT_TELEMETRY_DISABLED=1 \
+    PORT=3000 \
+    HOSTNAME=0.0.0.0
 
-ENV NODE_ENV=production
-ENV NEXT_TELEMETRY_DISABLED=1
-
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
+RUN addgroup --system --gid 1001 nodejs && adduser --system --uid 1001 nextjs
 
-# Install pnpm
-RUN npm install -g pnpm
-
-# Copy necessary files from builder
-COPY --from=builder /app/package.json ./package.json
-COPY --from=builder --chown=nextjs:nodejs /app/.next ./.next
-COPY --from=builder --chown=nextjs:nodejs /app/public ./public
-COPY --from=builder --chown=nextjs:nodejs /app/node_modules ./node_modules
+# Copy standalone output from Next
+COPY --from=builder /app/.next/standalone ./
+COPY --from=builder /app/.next/static ./.next/static
+COPY --from=builder /app/public ./public
 
 USER nextjs
-
 EXPOSE 3000
-
-ENV PORT=3000
-ENV HOSTNAME="0.0.0.0"
-
-CMD ["pnpm", "start"]
-
+# In standalone output, the entrypoint is `server.js` at repo root
+CMD ["node", "server.js"]

frontend/next.config.ts

@@ -1,7 +1,43 @@
 import type { NextConfig } from "next";
+import path from "node:path";
 
 const nextConfig: NextConfig = {
-  /* config options here */
+  output: "standalone",
+
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
+  typescript: {
+    ignoreBuildErrors: false,
+  },
+
+  productionBrowserSourceMaps: false,
+  swcMinify: true,
+
+  optimizeFonts: false,
+
+  experimental: {
+    optimizePackageImports: ["lodash", "date-fns", "rxjs"],
+  },
+
+  webpack: (config, { isServer }) => {
+    config.cache = {
+      type: "filesystem",
+      cacheDirectory: path.join(process.cwd(), ".next", "cache", isServer ? "server" : "client"),
+      buildDependencies: {
+        config: [__filename],
+      },
+    };
+
+    config.resolve.fallback = {
+      ...config.resolve.fallback,
+      fs: false,
+      path: false,
+      os: false,
+    };
+
+    return config;
+  },
 };
 
 export default nextConfig;