From 87b0df3bb8a112947e00bf8409ccaa50dc016e6c Mon Sep 17 00:00:00 2001
From: Luca <luca@perugia.ovh>
Date: Mon, 23 Sep 2024 23:00:06 +0200
Subject: [PATCH 1/2] Skip negotiation

---
 docker-compose.yml | 48 ----------------------------------------------
 src/js/UserHub.js  |  5 ++++-
 2 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index bc048b3..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-version: '3.9'
-
-services:
-
-  # Database. Only Postgres is currently supported.
-  db:
-    image: postgres:16
-    ports:
-      - "5432:5432/tcp"
-    environment:
-      - POSTGRES_PASSWORD=postgres
-  
-  # Redis with Redisearch.
-  redis:
-    image: redis/redis-stack-server:latest
-    volumes:
-      - /opt/docker/openshock/redis/redis-stack.conf:/redis-stack.conf
-  
-  # The API.
-  # Check https://github.com/OpenShock/API for the latest configuration settings.
-  api:
-    image: ghcr.io/openshock/api:latest
-    container_name: api
-    depends_on:
-      - db
-      - redis
-    ports:
-      - "5001:80/tcp"
-    environment:
-      - SHOCKLINK__DB=Host=db;Port=5432;Database=postgres;Username=postgres;Password=postgres;Search Path=ShockLink
-      - SHOCKLINK__REDIS__HOST=redis
-      - SHOCKLINK__FRONTENDBASEURL=http://local:5002
-  
-  # The Web UI (this repository).
-  webui:
-    # Make sure to fresh build if you make changes:
-    #     docker-compose up --build
-    build: .
-    container_name: webui
-    depends_on:
-      - api
-    ports:
-      - "5002:80/tcp"
-    environment:
-      - OPENSHOCK_NAME=LocalShock
-      - OPENSHOCK_URL=http://webui.localhost:5002
-      - OPENSHOCK_API_URL=http://api.localhost:5001
-      - OPENSHOCK_SHARE_URL=http://webui.localhost:5002/#/public/proxy/shares/links/
diff --git a/src/js/UserHub.js b/src/js/UserHub.js
index b710b05..8bcbd51 100644
--- a/src/js/UserHub.js
+++ b/src/js/UserHub.js
@@ -31,7 +31,10 @@ export default class ws {
     constructor() {
 
         this.connection = new signalR.HubConnectionBuilder()
-        .withUrl(config.apiUrl + "1/hubs/user")
+        .withUrl(config.apiUrl + "1/hubs/user", options => {
+            options.transport = signalR.HttpTransportType.WebSockets;
+            options.skipNegotiation = true;
+        })
         .configureLogging(signalR.LogLevel.Information)
         .withAutomaticReconnect([0, 1000, 2000, 5000, 10000, 10000, 15000, 30000, 60000])
         .build();

From fd578d543fd06e85ec475c563564a815ab5701db Mon Sep 17 00:00:00 2001
From: Luca <luca@perugia.ovh>
Date: Mon, 23 Sep 2024 23:39:26 +0200
Subject: [PATCH 2/2] Fix

---
 src/js/UserHub.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/js/UserHub.js b/src/js/UserHub.js
index 8bcbd51..d61eb9a 100644
--- a/src/js/UserHub.js
+++ b/src/js/UserHub.js
@@ -31,9 +31,9 @@ export default class ws {
     constructor() {
 
         this.connection = new signalR.HubConnectionBuilder()
-        .withUrl(config.apiUrl + "1/hubs/user", options => {
-            options.transport = signalR.HttpTransportType.WebSockets;
-            options.skipNegotiation = true;
+        .withUrl(config.apiUrl + "1/hubs/user",  {
+            transport: signalR.HttpTransportType.WebSockets,
+            skipNegotiation: true
         })
         .configureLogging(signalR.LogLevel.Information)
         .withAutomaticReconnect([0, 1000, 2000, 5000, 10000, 10000, 15000, 30000, 60000])