From 3eb8f65872f59e7215ed84b22a7eba4bf9ea90fa Mon Sep 17 00:00:00 2001
From: Alexander Mahr <info@alexmahr.de>
Date: Sun, 29 Sep 2024 11:29:56 +0200
Subject: [PATCH] add nginx + wss/chat

---
 client-test-websocket/Dockerfile              |  5 +++
 .../entrypoint.py                             |  2 +-
 .../entrypoint.sh                             |  0
 client/Dockerfile                             |  5 ---
 compose.yml                                   | 20 ++++++---
 nginx/Dockerfile                              | 20 +++++++++
 .../00-handle-bind-mounts.sh                  |  5 +++
 nginx/etc/nginx/conf.d/default.conf           | 19 ++++++++
 nginx/srv/www/lovespeech/index.html           | 44 +++++++++++++++++++
 server/Dockerfile                             |  5 ---
 websocket-server/Dockerfile                   |  5 +++
 {server => websocket-server}/entrypoint.py    |  0
 {server => websocket-server}/entrypoint.sh    |  0
 13 files changed, 113 insertions(+), 17 deletions(-)
 create mode 100644 client-test-websocket/Dockerfile
 rename {client => client-test-websocket}/entrypoint.py (92%)
 rename {client => client-test-websocket}/entrypoint.sh (100%)
 delete mode 100644 client/Dockerfile
 create mode 100644 nginx/Dockerfile
 create mode 100644 nginx/docker-entrypoint.d/00-handle-bind-mounts.sh
 create mode 100644 nginx/etc/nginx/conf.d/default.conf
 create mode 100644 nginx/srv/www/lovespeech/index.html
 delete mode 100644 server/Dockerfile
 create mode 100644 websocket-server/Dockerfile
 rename {server => websocket-server}/entrypoint.py (100%)
 rename {server => websocket-server}/entrypoint.sh (100%)

diff --git a/client-test-websocket/Dockerfile b/client-test-websocket/Dockerfile
new file mode 100644
index 0000000..603b14c
--- /dev/null
+++ b/client-test-websocket/Dockerfile
@@ -0,0 +1,5 @@
+FROM alpine:edge
+RUN apk update && apk add py3-websockets
+COPY --chmod=0555 ./entrypoint.sh /entrypoint.sh
+COPY --chmod=0555 ./entrypoint.py /entrypoint.py
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/client/entrypoint.py b/client-test-websocket/entrypoint.py
similarity index 92%
rename from client/entrypoint.py
rename to client-test-websocket/entrypoint.py
index ab0f076..88016e1 100755
--- a/client/entrypoint.py
+++ b/client-test-websocket/entrypoint.py
@@ -6,7 +6,7 @@ import asyncio
 from websockets.asyncio.client import connect
 
 async def test():
-    uri = "ws://server:1080"
+    uri = "ws://websocket-server:1080"
     async with connect(uri) as websocket:
         print(f"Get username via:\n name = os.environ.get('USER')")
         msg = os.environ.get('USER')
diff --git a/client/entrypoint.sh b/client-test-websocket/entrypoint.sh
similarity index 100%
rename from client/entrypoint.sh
rename to client-test-websocket/entrypoint.sh
diff --git a/client/Dockerfile b/client/Dockerfile
deleted file mode 100644
index 2c7dbb9..0000000
--- a/client/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM alpine:edge
-RUN apk update && apk add py3-websockets
-COPY --chmod=0555 entrypoint.sh /entrypoint.sh
-COPY --chmod=0555 entrypoint.py /entrypoint.py
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/compose.yml b/compose.yml
index 41c95a4..10ad697 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,19 +1,27 @@
 services:
-  # the server
-  server:
+  # the websocket-server
+  nginx:
+    stop_grace_period: 1s
+    build: 'nginx'
+    ports:
+    - 443:443
+    volumes:
+    - ./nginx/ssl.d:/ssl.d
+  # the websocket-server
+  websocket-server:
     stop_grace_period: 1s
     environment:
       PYTHONUNBUFFERED: true
-    build: 'server'
+    build: 'websocket-server'
     expose:
     - 1080
   # the client
-  client:
+  client-test-websocket:
     stop_grace_period: 1s
     environment: 
       USER: ${USER}
-    build: 'client'
+    build: 'client-test-websocket'
     restart: on-failure
     depends_on:
-      server:
+      websocket-server:
         condition: service_started
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
new file mode 100644
index 0000000..7d8f267
--- /dev/null
+++ b/nginx/Dockerfile
@@ -0,0 +1,20 @@
+FROM nginx:latest
+RUN <<EOF
+set -x
+SSLDIR="/etc/nginx/ssl.d"
+mkdir -p "$SSLDIR"
+cd "$SSLDIR"
+openssl req -x509 \
+  -newkey rsa:4096 \
+  -keyout "$SSLDIR"/lovespeech.key.pem \
+  -out "$SSLDIR"/lovespeech.crt.pem \
+  -sha256 \
+  -days 3650 \
+  -nodes \
+  -subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=lovespeech"
+ls -ialh "$SSLDIR"
+EOF
+COPY --chmod=0444 --chown=root:root ./etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
+COPY --chmod=0555 --chown=root:root ./docker-entrypoint.d/ /docker-entrypoint.d/
+COPY --chmod=0555 --chown=root:root ./srv/www/lovespeech /srv/www/lovespeech/
+RUN ls /docker-entrypoint.d/
diff --git a/nginx/docker-entrypoint.d/00-handle-bind-mounts.sh b/nginx/docker-entrypoint.d/00-handle-bind-mounts.sh
new file mode 100644
index 0000000..4e80114
--- /dev/null
+++ b/nginx/docker-entrypoint.d/00-handle-bind-mounts.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -x 
+mountpoint /mnt/ssl.d && 
+  cp /mnt/ssl.d/*pem /etc/nginx/ssl.d/ || true
diff --git a/nginx/etc/nginx/conf.d/default.conf b/nginx/etc/nginx/conf.d/default.conf
new file mode 100644
index 0000000..938fbdc
--- /dev/null
+++ b/nginx/etc/nginx/conf.d/default.conf
@@ -0,0 +1,19 @@
+map $http_upgrade $connection_upgrade {
+  default upgrade;
+  ''      close;
+}
+server {
+  root                /srv/www/lovespeech;
+  listen              443 ssl;
+  server_name         lovespeech;
+  ssl_certificate     /etc/nginx/ssl.d/lovespeech.crt.pem;
+  ssl_certificate_key /etc/nginx/ssl.d/lovespeech.key.pem;
+  ssl_protocols       TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+  ssl_ciphers         HIGH:!aNULL:!MD5;
+  location /chat/ {
+    proxy_pass http://websocket-server:1080;
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection $connection_upgrade;
+  }
+}
diff --git a/nginx/srv/www/lovespeech/index.html b/nginx/srv/www/lovespeech/index.html
new file mode 100644
index 0000000..b158c12
--- /dev/null
+++ b/nginx/srv/www/lovespeech/index.html
@@ -0,0 +1,44 @@
+<!doctype html>
+<html>
+    <script>
+        window.addEventListener("load",()=>{
+          document.getElementById("ws").value="wss://"+location.host+"/chat/";
+          var result = document.getElementById("result");
+          function showresult(message){
+            var pre = document.createElement("pre");
+            pre.innerHTML=message;
+            result.insertBefore(pre,result.children[0]);
+          }
+          function do_websocket(destination = "wss://"+location.host+"/chat/")
+          {
+            var ws = new WebSocket(destination);
+
+            ws.onopen = function () {
+                ws.send("Hello World");
+                setTimeout(()=>{ ws.send("message part 2");},2000);
+                setTimeout(()=>{ ws.close()},30000);
+            };
+
+            ws.onmessage = function (evt) {
+                var received_msg = evt.data;
+                console.log("onmessage",received_msg,evt,ws);
+                showresult(received_msg);
+            };
+            ws.onclose = function () {
+                showresult("<span style='color:red;'>closing ws</span>");
+            };
+
+          }
+          document.getElementById("wsform").addEventListener("submit",(eventi)=>{
+              eventi.preventDefault();
+              do_websocket(document.getElementById("ws").value);
+          },false);
+        },false);
+    </script>
+    <h1> test websocket  </h1>
+    <form id="wsform">
+    <input name="ws" id="ws" type="text" value="wss://chat/"  style="width:90vw"/>
+    <input type="submit">
+    </form>
+    <div id="result"></div>
+</html>
diff --git a/server/Dockerfile b/server/Dockerfile
deleted file mode 100644
index 2c7dbb9..0000000
--- a/server/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM alpine:edge
-RUN apk update && apk add py3-websockets
-COPY --chmod=0555 entrypoint.sh /entrypoint.sh
-COPY --chmod=0555 entrypoint.py /entrypoint.py
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/websocket-server/Dockerfile b/websocket-server/Dockerfile
new file mode 100644
index 0000000..603b14c
--- /dev/null
+++ b/websocket-server/Dockerfile
@@ -0,0 +1,5 @@
+FROM alpine:edge
+RUN apk update && apk add py3-websockets
+COPY --chmod=0555 ./entrypoint.sh /entrypoint.sh
+COPY --chmod=0555 ./entrypoint.py /entrypoint.py
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/server/entrypoint.py b/websocket-server/entrypoint.py
similarity index 100%
rename from server/entrypoint.py
rename to websocket-server/entrypoint.py
diff --git a/server/entrypoint.sh b/websocket-server/entrypoint.sh
similarity index 100%
rename from server/entrypoint.sh
rename to websocket-server/entrypoint.sh