Merge branch 'main' of ssh://repo.prod.meissa.de:2222/meissa/c4k-jitsi

infrastructure/excalidraw-backend/image/resources/install.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
-set -Eeo pipefail
+set -eux
 
 apt-get update > /dev/null
 apt-get upgrade -y > /dev/null
 apt-get clean
 
-npm install -g npm
+npm install -g npm@latest
 npm ci
 npm run build

infrastructure/excalidraw-backend/image/resources/package.json

@@ -1,6 +1,6 @@
 {
     "name": "excalidraw-backend",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "main": "src/index.js",
     "description": "Excalidraw backend",
     "repository": {
@@ -9,22 +9,22 @@
     },
     "private": true,
     "engines": {
-        "node": ">=14.0.0",
+        "node": ">=18.0.0",
-        "npm": ">=7.0.0"
+        "npm": ">=10.0.0"
     },
     "dependencies": {
-        "@types/debug": "4.1.5",
+        "@types/debug": "4.1.10",
-        "@types/express": "4.17.11",
+        "@types/express": "4.17.20",
-        "@types/node": "14.14.31",
+        "@types/ms": "0.7.33",
-        "@types/socket.io": "2.1.4",
+        "@types/node": "20.8.7",
         "cross-env": "^7.0.3",
-        "debug": "4.3.1",
+        "debug": "4.3.4",
-        "dotenv": "^10.0.0",
+        "dotenv": "^16.0.0",
-        "express": "4.17.1",
+        "express": "^4.18.2",
-        "socket.io": "^2.5.0",
+        "socket.io": "^4.7.2",
-        "socket.io-prometheus-metrics": "^1.0.6",
+        "prom-client": "^15.0.0",
-        "ts-node-dev": "^1.1.8",
+        "ts-node-dev": "^2.0.0",
-        "typescript": "4.2.3"
+        "typescript": "5.2.2"
     },
     "license": "MIT",
     "scripts": {
@@ -37,16 +37,15 @@
     },
     "devDependencies": {
         "@jitsi/eslint-config": "^4.1.0",
-        "@types/dotenv": "^8.2.0",
+        "@typescript-eslint/eslint-plugin": "6.8.0",
-        "@typescript-eslint/eslint-plugin": "5.30.5",
+        "@typescript-eslint/parser": "6.8.0",
-        "@typescript-eslint/parser": "5.30.4",
+        "eslint": "^8.1.0",
-        "eslint": "8.1.0",
+        "eslint-plugin-import": "2.28.1",
-        "eslint-plugin-import": "2.25.2",
+        "eslint-plugin-jsdoc": "46.8.2",
-        "eslint-plugin-jsdoc": "37.0.3",
+        "eslint-plugin-typescript-sort-keys": "^3.1.0"
-        "eslint-plugin-typescript-sort-keys": "^2.1.0"
     },
     "optionalDependencies": {
         "bufferutil": "^4.0.6",
-        "utf-8-validate": "^5.0.9"
+        "utf-8-validate": "^6.0.3"
     }
 }

infrastructure/excalidraw-backend/image/resources/src/index.ts

@@ -3,11 +3,22 @@
 import debug from 'debug';
 import dotenv from 'dotenv';
 import express from 'express';
-import http from 'http';
+import { createServer } from 'node:http';
-import socketIO from 'socket.io';
+import { Server } from 'socket.io';
+/* 
 import * as prometheus from 'socket.io-prometheus-metrics';
 
-const serverDebug = debug('server');
+do not use anymore, since 3 years no further progression, depends on debug 4.1.1, 
+wich is moderate vulnerable to regular expression denial of service when untrusted user 
+input is passed into the o formatter. 
+
+alternatively could be used prom-client
+*/
+
+const serverDebug = debug('httpServer');
+const app = express();
+const port = process.env.PORT || 80; // default port to listen
+const httpServer = createServer(app);
 
 dotenv.config(
   process.env.NODE_ENV === 'development'
@@ -15,53 +26,59 @@ dotenv.config(
       : { path: '.env.production' }
 );
 
-const app = express();
-const port = process.env.PORT || 80; // default port to listen
-
 app.get('/', (req, res) => {
     res.send('Excalidraw backend is up :)');
 });
 
-const server = http.createServer(app);
+httpServer.listen(port, () => {
-
-server.listen(port, () => {
     serverDebug(`listening on port: ${port}`);
 });
 
-const io = socketIO(server, {
+const corsOptions = { 
-    handlePreflightRequest: (req, res) => {
+                    origin: 'https://meet.jit.si',
-        const headers = {
+                    methods: ["GET", "POST"],
-            'Access-Control-Allow-Headers': 'Content-Type, Authorization',
+                    credentials: true
-            'Access-Control-Allow-Origin': req.header?.origin ?? 'https://meet.jit.si',
+};
-            'Access-Control-Allow-Credentials': true
-        };
 
-        res.writeHead(200, headers);
+const io = new Server(httpServer, {
-        res.end();
+    allowEIO3: true,
-    },
+    cors: corsOptions,
-    maxHttpBufferSize: 10e6,
+    maxHttpBufferSize: 1e6,
     pingTimeout: 10000
 });
 
 // listens on host:9090/metrics
+/* do not use
 prometheus.metrics(io, {
     collectDefaultMetrics: true
 });
+*/
 
-io.on('connection', socket => {
+/* alternatively could be used:
+
+const client = require('prom-client');
+const collectDefaultMetrics = client.collectDefaultMetrics;
+const Registry = client.Registry;
+const register = new Registry();
+collectDefaultMetrics({ register });
+
+or more:
+https://codersociety.com/blog/articles/nodejs-application-monitoring-with-prometheus-and-grafana
+*/
+
+io.on('connection', (socket) => {
     serverDebug(`connection established! ${socket.conn.request.url}`);
     io.to(`${socket.id}`).emit('init-room');
     socket.on('join-room', roomID => {
         serverDebug(`${socket.id} has joined ${roomID} for url ${socket.conn.request.url}`);
         socket.join(roomID);
-        if (io.sockets.adapter.rooms[roomID].length <= 1) {
+        if (io.sockets.adapter.rooms.get(roomID)?.size ?? 0 <= 1) {
             io.to(`${socket.id}`).emit('first-in-room');
         } else {
             socket.broadcast.to(roomID).emit('new-user', socket.id);
         }
         io.in(roomID).emit(
-            'room-user-change',
+            'room-user-change', Array.from(io.sockets.adapter.rooms.get(roomID) ?? [])
-            Object.keys(io.sockets.adapter.rooms[roomID].sockets)
         );
     });
 
@@ -69,8 +86,7 @@ io.on('connection', socket => {
     'server-broadcast',
         (roomID: string, encryptedData: ArrayBuffer, iv: Uint8Array) => {
             socket.broadcast.to(roomID).emit('client-broadcast', encryptedData, iv);
-        }
+    });
-    );
 
     socket.on(
     'server-volatile-broadcast',
@@ -78,15 +94,14 @@ io.on('connection', socket => {
         socket.volatile.broadcast
         .to(roomID)
         .emit('client-broadcast', encryptedData, iv);
-    }
+    });
-    );
 
     socket.on('disconnecting', () => {
         const rooms = io.sockets.adapter.rooms;
 
         for (const roomID of Object.keys(socket.rooms)) {
-            const clients = Object.keys(rooms[roomID].sockets).filter(id => id !== socket.id);
+            const clients = Array.from(rooms.get(roomID) ?? []).filter(id => id !== socket.id);
-
+                        
             if (roomID !== socket.id) {
                 socket.to(roomID).emit('user has left', socket.id);
             }

infrastructure/excalidraw-backend/image/resources/tsconfig.json

@@ -11,7 +11,8 @@
         "forceConsistentCasingInFileNames": true,
         "resolveJsonModule": true,
         "isolatedModules": true,
-        "outDir": "dist"
+        "outDir": "dist",
+        //"noImplicitAny": false
     }
   }
   

infrastructure/web/image/Dockerfile

@@ -1,4 +1,4 @@
-FROM jitsi/web:stable-8922-1
+FROM jitsi/web:stable-8960-1
 
 # Prepare Configuration
 ADD resources /tmp

src/main/cljc/dda/c4k_jitsi/jitsi.cljc

@@ -1,4 +1,17 @@
 (ns dda.c4k-jitsi.jitsi
+<<<<<<< HEAD
+ (:require
+  [clojure.spec.alpha :as s]
+  #?(:cljs [shadow.resource :as rc])
+  #?(:clj [orchestra.core :refer [defn-spec]]
+     :cljs [orchestra.core :refer-macros [defn-spec]])
+  [dda.c4k-common.yaml :as yaml]
+  [dda.c4k-common.common :as cm]
+  [dda.c4k-common.ingress :as ing]
+  [dda.c4k-common.base64 :as b64]
+  [dda.c4k-common.predicate :as cp]
+  #?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]])))
+=======
   (:require
    [clojure.spec.alpha :as s]
    #?(:clj [orchestra.core :refer [defn-spec]]
@@ -9,6 +22,7 @@
    [dda.c4k-common.base64 :as b64]
    [dda.c4k-common.predicate :as cp]
    #?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]])))
+>>>>>>> 89de4ed0a5b1247d387b28aebbbd357599264480
 
 (s/def ::fqdn cp/fqdn-string?)
 (s/def ::issuer cp/letsencrypt-issuer?)

src/main/resources/jitsi/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: jicofo
-          image: jitsi/jicofo:stable-8922-1
+          image: jitsi/jicofo:stable-8960-1
           imagePullPolicy: IfNotPresent
           env:
             - name: XMPP_SERVER
@@ -37,7 +37,7 @@ spec:
             - name: TZ
               value: Europe/Berlin
         - name: prosody
-          image: jitsi/prosody:stable-8922-1
+          image: jitsi/prosody:stable-8960-1
           imagePullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL
@@ -68,7 +68,7 @@ spec:
             - name: JVB_TCP_HARVESTER_DISABLED
               value: "true"
         - name: web
-          image: domaindrivenarchitecture/c4k-jitsi-web
+          image: domaindrivenarchitecture/c4k-jitsi-webtest
           imagePullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL
@@ -102,7 +102,7 @@ spec:
             - name: WHITEBOARD_COLLAB_SERVER_PUBLIC_URL
               value: REPLACE_EXCALIDRAW_BACKEND_URL
         - name: jvb
-          image: jitsi/jvb:stable-8922-1
+          image: jitsi/jvb:stable-8960-1
           imagePullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL
@@ -132,7 +132,7 @@ spec:
             - name: TZ
               value: Europe/Berlin
         - name: etherpad
-          image: etherpad/etherpad:1.9.2
+          image: etherpad/etherpad:1.9.3
           env:
             - name: XMPP_SERVER
               value: localhost

src/main/resources/jitsi/excalidraw-deployment.yaml

@@ -17,4 +17,4 @@ spec:
     spec:
       containers:
         - name: excalidraw-backend
-          image: domaindrivenarchitecture/c4k-jitsi-excalidraw-backend
+          image: domaindrivenarchitecture/c4k-jitsi-excalidraw-testbackend

src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc

@@ -19,7 +19,7 @@
             :spec
             {:containers
              [{:name "jicofo",
-               :image "jitsi/jicofo:stable-8922-1",
+               :image "jitsi/jicofo:stable-8960-1",
                :imagePullPolicy "IfNotPresent",
                :env
                [{:name "XMPP_SERVER", :value "localhost"}
@@ -29,7 +29,7 @@
                 {:name "JICOFO_AUTH_PASSWORD", :valueFrom {:secretKeyRef {:name "jitsi-config", :key "JICOFO_AUTH_PASSWORD"}}}
                 {:name "TZ", :value "Europe/Berlin"}]}
               {:name "prosody",
-               :image "jitsi/prosody:stable-8922-1",
+               :image "jitsi/prosody:stable-8960-1",
                :imagePullPolicy "IfNotPresent",
                :env
                [{:name "PUBLIC_URL", :value "xy.xy.xy"}
@@ -62,7 +62,7 @@
                 {:name "WHITEBOARD_ENABLED", :value "true"}
                 {:name "WHITEBOARD_COLLAB_SERVER_PUBLIC_URL", :value "https://excalidraw-backend.xy.xy.xy"}]}
               {:name "jvb",
-               :image "jitsi/jvb:stable-8922-1",
+               :image "jitsi/jvb:stable-8960-1",
                :imagePullPolicy "IfNotPresent",
                :env
                [{:name "PUBLIC_URL", :value "xy.xy.xy"}
@@ -76,7 +76,7 @@
                 {:name "JICOFO_AUTH_PASSWORD", :valueFrom {:secretKeyRef {:name "jitsi-config", :key "JICOFO_AUTH_PASSWORD"}}}
                 {:name "TZ", :value "Europe/Berlin"}]}
               {:name "etherpad",
-               :image "etherpad/etherpad:1.9.2",
+               :image "etherpad/etherpad:1.9.3",
                :env
                [{:name "XMPP_SERVER", :value "localhost"}
                 {:name "JICOFO_COMPONENT_SECRET",