Merge pull request #111 from thingsboard/mqtt-over-ws-setup

[1.2.2] Mqtt over WS setup for WS client
thingsboard · Mar 20, 2024 · b6fae72 · b6fae72
2 parents 49812fc + 527a14c
commit b6fae72
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 0 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -46,6 +46,7 @@ services:
     ports:
       - "1883"
       - "8083"
+      - "8084"
     logging:
       driver: "json-file"
       options:
@@ -69,6 +70,7 @@ services:
     ports:
       - "1883"
       - "8083"
+      - "8084"
     logging:
       driver: "json-file"
       options:
@@ -97,12 +99,14 @@ services:
       - "8083:8083"
       - "443:443"
       - "1883:1883"
+      - "8084:8084"
     cap_add:
       - NET_ADMIN
     environment:
       HTTP_PORT: 8083
       HTTPS_PORT: 443
       MQTT_PORT: 1883
+      MQTT_WS_PORT: 8084
       FORCE_HTTPS_REDIRECT: "false"
     links:
       - tbmq1

diff --git a/docker/haproxy/config/haproxy.cfg b/docker/haproxy/config/haproxy.cfg
@@ -49,6 +49,16 @@ listen mqtt-in
  server tbMqtt1 tbmq1:1883 check inter 5s resolvers docker_resolver resolve-prefer ipv4
  server tbMqtt2 tbmq2:1883 check inter 5s resolvers docker_resolver resolve-prefer ipv4
 
+listen mqtt-ws-in
+ bind *:${MQTT_WS_PORT}
+ mode tcp
+ option clitcpka # For TCP keep-alive
+ timeout client 3h
+ timeout server 3h
+ option tcplog
+ balance leastconn
+ server tbMqttWs1 tbmq1:8084 check inter 5s resolvers docker_resolver resolve-prefer ipv4
+ server tbMqttWs2 tbmq2:8084 check inter 5s resolvers docker_resolver resolve-prefer ipv4
 
 frontend http-in
  bind *:${HTTP_PORT} alpn h2,http/1.1

diff --git a/k8s/aws/receipts/mqtt-load-balancer.yml b/k8s/aws/receipts/mqtt-load-balancer.yml
@@ -35,6 +35,9 @@ spec:
     - port: 1883
       targetPort: 1883
       name: mqtt
+    - port: 8084
+      targetPort: 8084
+      name: mqtt-ws
     # This way NLB acts as transparent load balancer and forwards all traffic to port 8883 without decryption.
     - port: 8883
       targetPort: 8883

diff --git a/k8s/aws/receipts/mqtts-load-balancer.yml b/k8s/aws/receipts/mqtts-load-balancer.yml
@@ -39,6 +39,9 @@ spec:
     - port: 1883
       targetPort: 1883
       name: mqtt
+    - port: 8084
+      targetPort: 8084
+      name: mqtt-ws
     # This way NLB acts as an TLS termination point and forwards decrypted traffic to 1883 port of the TBMQ.
     - port: 8883
       targetPort: 1883

diff --git a/k8s/aws/tb-broker.yml b/k8s/aws/tb-broker.yml
@@ -154,3 +154,5 @@ spec:
       name: mqtt
     - port: 8883
       name: mqtts
+    - port: 8084
+      name: mqtt-ws
diff --git a/k8s/azure/receipts/mqtt-load-balancer.yml b/k8s/azure/receipts/mqtt-load-balancer.yml
@@ -30,6 +30,9 @@ spec:
     - port: 1883
       targetPort: 1883
       name: mqtt
+    - port: 8084
+      targetPort: 8084
+      name: mqtt-ws
     - port: 8883
       targetPort: 8883
       name: mqtts
diff --git a/k8s/azure/tb-broker.yml b/k8s/azure/tb-broker.yml
@@ -142,3 +142,5 @@ spec:
       name: mqtt
     - port: 8883
       name: mqtts
+    - port: 8084
+      name: mqtt-ws
diff --git a/k8s/minikube/tb-broker.yml b/k8s/minikube/tb-broker.yml
@@ -50,6 +50,8 @@ spec:
               name: mqtt-tcp
             - containerPort: 8883
               name: mqtt-ssl
+            - containerPort: 8084
+              name: mqtt-ws
           env:
             - name: TB_SERVICE_ID
               valueFrom:
@@ -125,3 +127,7 @@ spec:
       targetPort: 8883
       nodePort: 30003
       name: mqtt-ssl
+    - port: 8084
+      targetPort: 8084
+      nodePort: 30004
+      name: mqtt-ws
diff --git a/msa/tbmq/configs/docker-compose.yml b/msa/tbmq/configs/docker-compose.yml
@@ -51,6 +51,7 @@ services:
     ports:
       - "8083:8083"
       - "1883:1883"
+      - "8084:8084"
     environment:
       TB_SERVICE_ID: tbmq
       SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/thingsboard_mqtt_broker