Allow MQTTS and WSS for MQTT Integration

.github/workflows/registry.yaml

@@ -0,0 +1,45 @@
+name: "Docker: Github Registry"
+
+on:
+  push:
+    branches: [ feat-mqtts ]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-images:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: |
+            latest=true
+            prefix=
+            suffix=
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

packages/models/package.json

@@ -5,13 +5,14 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
+    "@grpc/grpc-js": "^1.3.7",
+    "@grpc/proto-loader": "^0.6.4",
     "@sensebox/osem-protos": "^1.1.0",
     "@sensebox/sketch-templater": "^1.10.5",
     "bcrypt": "^5.0.1",
     "bunyan": "^1.8.15",
     "config": "^3.3.6",
     "got": "^11.8.2",
-    "grpc": "^1.24.7",
     "isemail": "^3.0.0",
     "jsonpath": "^1.1.1",
     "lodash.isequal": "^4.5.0",

packages/models/src/box/integrations.js

@@ -7,7 +7,12 @@ const { mongoose } = require('../db'),
 
 const mqttSchema = new mongoose.Schema({
   enabled: { type: Boolean, default: false, required: true },
-  url: { type: String, trim: true, validate: [function validMqttUri (url) { return url === '' || url.startsWith('mqtt://') || url.startsWith('ws://'); }, '{PATH} must be either empty or start with mqtt:// or ws://'] },
+  url: { type: String, trim: true, validate: [function validMqttUri (url) { return (
+    url === '' ||
+    url.startsWith('mqtt://') ||
+    url.startsWith('mqtts://') ||
+    url.startsWith('ws://')
+  ); }, '{PATH} must be either empty or start with mqtt(s):// or ws://'] },
   topic: { type: String, trim: true },
   messageFormat: { type: String, trim: true, enum: ['json', 'csv', 'application/json', 'text/csv', 'debug_plain', ''] },
   decodeOptions: { type: String, trim: true, validate: isJSONParseableValidation },

packages/models/src/box/mqttClient.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const grpc = require('grpc'),
+const protoLoader = require('@grpc/proto-loader'),
+  grpcLibrary = require('@grpc/grpc-js'),
   { mqttProto } = require('@sensebox/osem-protos'),
   log = require('../log'),
   config = require('config').get('openSenseMap-API-models');
@@ -22,9 +23,14 @@ module.exports = {
       return;
     }
 
-    const { MqttService } = grpc.load(mqttProto);
+    const packageDefinition = protoLoader.loadSync(mqttProto);
+    const MqttService = grpcLibrary.loadPackageDefinition(packageDefinition).MqttService;
 
-    const credentials = grpc.credentials.createSsl(Buffer.from(ca_cert), Buffer.from(key), Buffer.from(cert));
+    const credentials = grpcLibrary.credentials.createSsl(
+      Buffer.from(ca_cert),
+      Buffer.from(key),
+      Buffer.from(cert)
+    );
 
     const client = new MqttService(url, credentials);
     log.info({ mqttClient: 'connected GRPC client' });