WIP socket.io service

.dockerignore

@@ -2,6 +2,7 @@
 .idea
 venv
 api/client/node_modules
+socketio/node_modules
 docs
 testing
 __pycache__

.gitignore

@@ -30,6 +30,7 @@ api/api/client_api.yaml
 api/client/node_modules/
 api/client/build/
 api/client/coverage/
+socketio/node_modules/
 !apps/*.py
 !interfaces/*.py
 !interfaces/*.pytests/tmp/*

bootloader/walkoff-compose.yml

@@ -55,6 +55,31 @@ services:
       - ./apps:/app/apps
       - ./api/client/dist:/app/api/client/dist
 
+  core_socketio:
+    image: "127.0.0.1:5000/walkoff_core_socketio:latest"
+    build:
+      context: ./
+      dockerfile: ./socketio/Dockerfile
+    ports:
+      - '3000:3000'
+#    ports:
+#      - '8080:8080'
+    networks:
+      - walkoff_network
+#    stop_signal: SIGINT
+#    stop_grace_period: 30s
+    secrets:
+      # - walkoff_encryption_key
+      - walkoff_internal_key
+      # - walkoff_mongo_key
+      # - walkoff_redis_key
+    configs:
+      - common_env.yml
+    depends_on:
+      - core_api
+    # volumes:
+    #   - ./api/client/dist:/app/api/client/dist
+
   resource_nginx:
     image: 'bitnami/nginx:latest'
     networks:
@@ -68,6 +93,7 @@ services:
       - ./nginx/key.pem:/opt/bitnami/nginx/conf/key.pem:ro
     depends_on:
       - core_api
+      - core_socketio
 
   core_worker:
 #    command: python -m worker.worker --log-level=debug

nginx/walkoff.conf

@@ -1,41 +1,50 @@
-server {
-  listen 8081;
-  listen 8080 ssl;
-  ssl_certificate /opt/bitnami/nginx/conf/cert.pem;
-  ssl_certificate_key /opt/bitnami/nginx/conf/key.pem;
-  error_page 497 https://$host:$server_port$request_uri;
-
-  location / {
-     add_header X-Frame-Options "ALLOWALL";
-     proxy_pass http://core_api:8080;
-     proxy_read_timeout 24h;
-  }
-
-  location /walkoff/api/streams/ {
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection "upgrade";
-      proxy_http_version 1.1;
-      proxy_pass http://core_api:8080/walkoff/api/streams/;
-  }
-
-  location /mongo/ {
-      proxy_pass http://debug_mongo_express:8081/mongo/;
-  }
-
-  location /minio/ {
-      proxy_pass http://resource_minio:9000/minio/;
-  }
-
-  location /portainer/ {
-      proxy_http_version 1.1;
-      proxy_set_header Connection "";
-      proxy_pass http://resource_portainer:9000/;
-  }
-
-  location /portainer/api/websocket/ {
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection "upgrade";
-      proxy_http_version 1.1;
-      proxy_pass http://resource_portainer:9000/api/websocket/;
-  }
-}
+server {
+  listen 8081;
+  listen 8080 ssl;
+  ssl_certificate /opt/bitnami/nginx/conf/cert.pem;
+  ssl_certificate_key /opt/bitnami/nginx/conf/key.pem;
+  error_page 497 https://$host:$server_port$request_uri;
+
+  location / {
+     add_header X-Frame-Options "ALLOWALL";
+     proxy_pass http://core_api:8080;
+     proxy_read_timeout 24h;
+  }
+
+  location /walkoff/api/streams/ {
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "upgrade";
+      proxy_pass http://core_api:8080/walkoff/api/streams/;
+  }
+
+  location /walkoff/sockets/ {
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection 'upgrade';
+      proxy_set_header Host $host;
+      proxy_cache_bypass $http_upgrade;
+      proxy_pass http://core_socketio:3000;
+  }
+
+  location /mongo/ {
+      proxy_pass http://debug_mongo_express:8081/mongo/;
+  }
+
+  location /minio/ {
+      proxy_pass http://resource_minio:9000/minio/;
+  }
+
+  location /portainer/ {
+      proxy_http_version 1.1;
+      proxy_set_header Connection "";
+      proxy_pass http://resource_portainer:9000/;
+  }
+
+  location /portainer/api/websocket/ {
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "upgrade";
+      proxy_http_version 1.1;
+      proxy_pass http://resource_portainer:9000/api/websocket/;
+  }
+}

socketio/Dockerfile

@@ -0,0 +1,22 @@
+FROM node:12.13.0-buster-slim as base
+
+# Stage - Install/build Python dependencies
+FROM base as builder
+
+RUN mkdir /install
+WORKDIR /install
+
+COPY ./socketio /install
+RUN npm install
+RUN npm run build
+
+# Stage - Copy pip packages and source files
+FROM base
+
+COPY --from=builder /install /
+# COPY ./common /app/common
+# COPY ./api /app/api
+# WORKDIR /dist
+
+EXPOSE 3000
+CMD [ "npm", "start" ]