Aedescli (#19)

pelikhan · web-flow · commit aa70e2aa226f · 2023-05-01T21:46:17.000-07:00
* add aedes cli

* more logging
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,11 @@
 {
-    "debug.internalConsoleOptions": "neverOpen"
-}
+    "debug.internalConsoleOptions": "neverOpen",
+    "vsmqtt.brokerProfiles": [
+        {
+            "name": "devicescript gateway",
+            "host": "0.0.0.0",
+            "port": 1883,
+            "clientId": "vsmqtt_client"
+        }
+    ]
+}
diff --git a/dev.mjs b/dev.mjs
@@ -1,5 +1,5 @@
 #!/usr/bin/env zx
-import 'zx/globals'
+import "zx/globals"
 import dotenv from "dotenv"
 import { expand } from "dotenv-expand"
 import { networkInterfaces } from "os"
@@ -49,6 +49,15 @@ else if (!azure) {
     process.env.WEBSITE_HOSTNAME = `${address}:${port}`
 }
 
+if (process.env.DEVS_MQTT_SERVER_DEV) {
+    process.env.DEVS_MQTT_SERVER = `mqtt://${process.env.WEBSITE_HOSTNAME}:1883`
+    $`yarn mqtt`
+    console.log(`started development MQTT server`)
+    console.warn(
+        `- make sure to change the visibility of port '1883', '3000' to 'Public'`
+    )
+}
+
 expand(out)
 
 if (!azure) {
diff --git a/local.env b/local.env
@@ -6,4 +6,4 @@ DEVS_STORAGE_CONNECTION_STRING="DefaultEndpointsProtocol=http;AccountName=devsto
 DEVS_PASSWORDS_SECRET="DEVS_LOCAL_USER_PASSWORD"
 DEVS_LOCAL_USER_PASSWORD="devstoreaccount1:Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="
 DEVS_CONNECTION_STRING="AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;ApiRoot=$WEBSITE_PROTOCOL://$WEBSITE_HOSTNAME"
-DEVS_MQTT_SERVER="mqtt://public.mqtthq.com:1883"
+DEVS_MQTT_SERVER_DEV="1"
diff --git a/package.json b/package.json
@@ -22,7 +22,8 @@
     "dev": "yarn build && zx dev.mjs --local",
     "dev:azure": "yarn build && zx dev.mjs --azure",
     "logs": "node infra/logs.mjs",
-    "deploy": "node infra/zipdeploy.mjs"
+    "deploy": "node infra/zipdeploy.mjs",
+    "mqtt": "yarn aedes start --protos tcp ws --host 0.0.0.0 --broker-id devicescript-gateway --verbose"
   },
   "dependencies": {
     "@azure/data-tables": "^13.2.0",
@@ -36,6 +37,7 @@
     "@fastify/static": "^6.5.0",
     "@fastify/websocket": "^7.1.0",
     "aedes": "^0.48.0",
+    "aedes-cli": "^0.6.1",
     "applicationinsights": "^2.5.0",
     "dotenv-expand": "^10.0.0",
     "fastify": "^4.9.2",
diff --git a/src/index.ts b/src/index.ts
@@ -150,8 +150,13 @@ async function main() {
         <body>
         <h1>Development DeviceScript Gateway</h1>
         <ul>
-            <li>Open <a href='./swagger/'>OpenAPI dashboard (swagger)</a>.</li>
+            <li><a href='./swagger/'>OpenAPI dashboard (swagger)</a>.</li>
             <li><a href='https://microsoft.github.io/devicescript/developer/cloud/gateway'>Documentation</a></li>
+            ${
+                process.env.DEVS_MQTT_SERVER
+                    ? `<li>MQTT server: ${process.env.DEVS_MQTT_SERVER}</li>`
+                    : ""
+            }
         </ul>
         </body>
         </html>`
diff --git a/yarn.lock b/yarn.lock
