default to mqtthq

Author: pelikhan

local.env

@@ -7,4 +7,4 @@ DEVS_LOCAL_USER_PASSWORD="Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVE
 DEVS_STORAGE_CONNECTION_STRING="DefaultEndpointsProtocol=http;AccountName=$DEVS_LOCAL_USER_NAME;AccountKey=$DEVS_LOCAL_USER_PASSWORD;BlobEndpoint=http://127.0.0.1:10000/$DEVS_LOCAL_USER_NAME;QueueEndpoint=http://127.0.0.1:10001/$DEVS_LOCAL_USER_NAME;TableEndpoint=http://127.0.0.1:10002/$DEVS_LOCAL_USER_NAME;"
 DEVS_PASSWORDS="$DEVS_LOCAL_USER_NAME:$DEVS_LOCAL_USER_PASSWORD"
 DEVS_CONNECTION_STRING="AccountName=$DEVS_LOCAL_USER_NAME;AccountKey=$DEVS_LOCAL_USER_PASSWORD;ApiRoot=$WEBSITE_PROTOCOL://$WEBSITE_HOSTNAME"
-DEVS_MQTT_SERVER_DEV="1"
+DEVS_MQTT_SERVER="mqtt://public.mqtthq.com:1883"

src/apigateway.ts

@@ -11,7 +11,7 @@ export async function initGatewayRoutes(server: FastifyInstance) {
             res.mqtt = {
                 hostname: mqttUrl.hostname,
                 path: mqttUrl.pathname,
-                port: mqttUrl.port,
+                port: Number(mqttUrl.port) || 1883,
                 username: process.env.DEVS_MQTT_USER_NAME,
                 password: process.env.DEVS_MQTT_USER_PASSWORD,
             }

src/mqtt.ts

@@ -43,8 +43,9 @@ export async function setup() {
         topicName: "*",
         ingest: async (topic, message, device) => {
             if (!client.connected) return
-
-            const mqTopic = `${mqttTopicPrefix(device.dev)}/from/${topic}`
+        
+            // don't rewrite global topics
+            const mqTopic = /~\//.test(topic) ? topic.slice(1) : `${mqttTopicPrefix(device.dev)}/from/${topic}`
             client.publish(
                 mqTopic,
                 Buffer.from(JSON.stringify(message), "utf-8"),

src/swagger/openapi.ts

@@ -64,7 +64,7 @@ export function generateOpenApiSpec() {
                     "URL of the MQTT server"
                 ),
                 path: sString("URL path if any", "Path to the MQTT server"),
-                port: sString("mqtt port", "Port to listen to"),
+                port: sNumber("mqtt port", "Port to listen to"),
                 username: sString(
                     "MQTT user",
                     "username to connect to MQTT server"