Merge pull request #890 from live-codes/fixes

Fixes

Author: hatemhosny

.nvmrc

@@ -1 +1 @@
-v18.20.4
+v24.4.1

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:24.1.0-alpine3.21 AS builder
+FROM node:24.4.1-alpine3.22 AS builder
 
 RUN apk update --no-cache && apk add --no-cache git
 
@@ -21,13 +21,14 @@ ARG SANDBOX_HOST_NAME
 ARG SANDBOX_PORT
 ARG FIREBASE_CONFIG
 ARG DOCS_BASE_URL
+ARG NODE_OPTIONS
 
 RUN if [ "$DOCS_BASE_URL" == "null" ]; \
   then npm run build:app; \
   else npm run build; \
   fi
 
-FROM node:24.1.0-alpine3.21 AS server
+FROM node:24.4.1-alpine3.22 AS server
 
 RUN addgroup -S appgroup
 RUN adduser -S appuser -G appgroup

docker-compose.yml

@@ -12,6 +12,8 @@ services:
         - SANDBOX_PORT=${SANDBOX_PORT:-8090}
         - FIREBASE_CONFIG=${FIREBASE_CONFIG:-}
         - DOCS_BASE_URL=${DOCS_BASE_URL:-null}
+        - LOCAL_MODULES=${LOCAL_MODULES:-false}
+        - NODE_OPTIONS=--max-old-space-size=4096
     restart: unless-stopped
     environment:
       - SELF_HOSTED=true
@@ -26,6 +28,7 @@ services:
       - LOG_URL=${LOG_URL:-null}
       - VALKEY_HOST=valkey
       - VALKEY_PORT=6379
+      - NODE_OPTIONS=--max-old-space-size=4096
     volumes:
       - ./assets:/srv/build/assets
     depends_on:
@@ -38,21 +41,29 @@ services:
       - valkey-data:/data
     command:
       [
-        'sh',
-        '-c',
+        "sh",
+        "-c",
         'if [ "$SELF_HOSTED_SHARE" != "false" ]; then valkey-server --save 60 1 --loglevel warning; fi',
       ]
 
   server:
     image: caddy:2.10.0-alpine
-    entrypoint: ['/bin/sh', './entrypoint.sh']
-    command: ['caddy', 'run', '--config', '/etc/caddy/Caddyfile', '--adapter', 'caddyfile']
+    entrypoint: ["/bin/sh", "./entrypoint.sh"]
+    command:
+      [
+        "caddy",
+        "run",
+        "--config",
+        "/etc/caddy/Caddyfile",
+        "--adapter",
+        "caddyfile",
+      ]
     restart: unless-stopped
     ports:
-      - '80:80'
-      - '${PORT:-443}:${PORT:-443}'
-      - '${SANDBOX_PORT:-8090}:${SANDBOX_PORT:-8090}'
-      - '${BROADCAST_PORT:-3030}:${BROADCAST_PORT:-3030}'
+      - "80:80"
+      - "${PORT:-443}:${PORT:-443}"
+      - "${SANDBOX_PORT:-8090}:${SANDBOX_PORT:-8090}"
+      - "${BROADCAST_PORT:-3030}:${BROADCAST_PORT:-3030}"
     environment:
       - HOST_NAME=${HOST_NAME:-livecodes.localhost}
       - PORT=${PORT:-443}

server/src/broadcast/index.ts

@@ -106,17 +106,17 @@ export const broadcast = ({
     });
   });
 
-  app.get('/channels/:id', (req, res) => {
+  app.get('/channels/:id', async (req, res) => {
     const channel = req.params.id;
     if (channels[channel]) {
       channels[channel].lastAccessed = Date.now();
       const hasData = Object.keys(channels[channel].data || {}).length > 0;
       const views = ['index', 'code', 'result'] as const;
       const view = req.query.view;
       const file = views.find((v) => v === view) || (hasData ? 'index' : 'result');
-      const fileContent = fs
-        .readFileSync(path.join(broadcastDir, `/${file}.html`), 'utf-8')
-        .replaceAll('{{AppUrl}}', appUrl);
+      const fileContent = (
+        await fs.promises.readFile(path.join(broadcastDir, `/${file}.html`), 'utf-8')
+      ).replaceAll('{{AppUrl}}', appUrl);
       res.status(200).send(fileContent);
     } else {
       res.status(404).send('Channel not found!');

server/src/sandbox.ts

@@ -3,41 +3,47 @@ import cors from 'cors';
 import express from 'express';
 import fs from 'node:fs';
 import path from 'node:path';
-import { sandboxVersion } from '../../src/livecodes/html/sandbox/index.ts';
 import { dirname } from './utils.ts';
 
-export const sandbox = ({ hostname, port }: { hostname: string; port: number }) => {
+export const sandbox = async ({ hostname, port }: { hostname: string; port: number }) => {
   const app = express();
 
   app.use(cors());
   app.disable('x-powered-by');
 
   const sandboxDir = path.resolve(dirname, 'sandbox');
-  let sandboxVersionDir = path.resolve(sandboxDir, sandboxVersion);
-  fs.readdirSync(sandboxDir).forEach((v) => {
-    if (fs.statSync(path.resolve(sandboxDir, v)).isDirectory()) {
-      sandboxVersionDir = path.resolve(sandboxDir, v);
-    }
-  });
+  const dirs = await fs.promises.readdir(sandboxDir);
+  const version =
+    dirs
+      .filter((v) => v.startsWith('v'))
+      .map((v) => Number(v.slice(1)))
+      .filter((v) => !Number.isNaN(v))
+      .sort((a, b) => b - a)
+      .map((v) => 'v' + v)
+      .pop() || '';
+  const sandboxVersionDir = path.resolve(sandboxDir, version);
 
   app.use('/', (req, res) => {
     if (req.path === '/') {
       res.set('Content-Type', 'text/html');
       res.status(200).sendFile(path.resolve(sandboxVersionDir, 'index.html'));
       return;
     }
-    const reqPath = req.path.endsWith('/')
+    let reqPath = req.path.endsWith('/')
       ? req.path + 'index.html'
       : !req.path.split('/').pop()?.includes('.')
         ? req.path + '.html'
         : req.path;
-    res.set('Content-Type', 'text/html');
-    const filePath = path.resolve(dirname, 'sandbox' + reqPath);
-    if (fs.existsSync(filePath)) {
-      res.status(200).sendFile(filePath);
-      return;
+    if (reqPath.startsWith('/')) {
+      reqPath = reqPath.slice(1);
     }
-    res.status(404).sendFile(path.resolve(sandboxVersionDir, 'index.html'));
+    const filePath = path.resolve(sandboxDir, reqPath);
+    const onError = (_err: unknown) => {
+      if (res.headersSent) return;
+      res.status(404).sendFile(path.resolve(sandboxVersionDir, 'index.html'));
+    };
+    res.set('Content-Type', 'text/html');
+    res.status(200).sendFile(filePath, onError);
   });
 
   app.listen(port, () => {

server/src/utils.ts

@@ -10,7 +10,7 @@ const getDirname = (metaUrl: string) => path.dirname(fileURLToPath(metaUrl));
 export const dirname = getDirname(import.meta.url);
 export const appDir = path.resolve(dirname, '../../build/');
 
-const getFileContent = async (fullUrl: string) => {
+const getFileContent = (fullUrl: string): Promise<string> => {
   let pathname: string;
   try {
     const url = new URL(fullUrl);
@@ -21,11 +21,10 @@ const getFileContent = async (fullUrl: string) => {
   if (!pathname.trim()) {
     pathname = 'index.html';
   }
-  let filePath = path.resolve(appDir, pathname);
-  if (!fs.existsSync(filePath)) {
-    filePath = path.resolve(appDir, '404.html');
-  }
-  return fs.promises.readFile(filePath, 'utf8');
+  const filePath = path.resolve(appDir, pathname);
+  return fs.promises
+    .readFile(filePath, 'utf8')
+    .catch(() => fs.promises.readFile(path.resolve(appDir, '404.html'), 'utf8'));
 };
 
 const convertToWebRequest = (req: express.Request) => {

src/livecodes/styles/inc-menu.scss

@@ -570,7 +570,7 @@ i.arrow {
       width: var(--s16);
 
       &[for='theme-color-custom'] {
-        background: conic-gradient(in hsl longer hue, red 0 0);
+        background: conic-gradient(in hsl longer hue, red 0 100%);
         filter: contrast(0.5);
       }