Merge branch 'master' into patch-1

Author: mpfeil

.github/workflows/registry.yaml

@@ -24,15 +24,15 @@ jobs:
         uses: actions/checkout@v4
 
       - name: 🔑 Log in to the Container registry
-        uses: docker/#-action@v3.0.0
+        uses: docker/#-action@v3.3.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GHCR_TOKEN }}
 
       - name: 📋 Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v5.0.0
+        uses: docker/metadata-action@v5.5.1
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |
@@ -41,7 +41,7 @@ jobs:
             suffix=
 
       - name: 🐳 Build and push Docker image
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           push: true

.github/workflows/test.yaml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: ⬣ Install Node.js
-        uses: actions/setup-node@v4.0.0
+        uses: actions/setup-node@v4.0.3
         with:
           node-version: 18
 
@@ -26,7 +26,7 @@ jobs:
           echo "##[set-output name=dir;]$(yarn cache dir)"
 
       - name: 🔧 Restore yarn cache
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.2
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

.scripts/run-tests.sh

@@ -22,7 +22,7 @@ only_models_tests=${only_models_tests:-}
 git_branch=$(git rev-parse --abbrev-ref HEAD)
 
 function runComposeCommand() {
-  docker-compose -p osemapitest -f ./tests/docker-compose.yml "$@"
+  docker compose -p osemapitest -f ./tests/docker-compose.yml "$@"
 }
 
 function cleanup() {

packages/models/src/box/sensorLayouts/sensorDefinitions/dnms_la_eq.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = {
+  title: 'Schalldruckpegel',
+  unit: 'db (A)',
+  sensorType: 'DNMS',
+  icon: 'osem-volume-up',
+};

packages/models/src/box/sensorLayouts/sensorDefinitions/dnms_la_max.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = {
+  title: 'Schalldruckpegel (Max)',
+  unit: 'db (A)',
+  sensorType: 'DNMS',
+  icon: 'osem-volume-up',
+};

packages/models/src/box/sensorLayouts/sensorDefinitions/dnms_la_min.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = {
+  title: 'Schalldruckpegel (Min)',
+  unit: 'db (A)',
+  sensorType: 'DNMS',
+  icon: 'osem-volume-up',
+};

packages/models/src/box/sensorLayouts/sensorDefinitions/index.js

@@ -1,6 +1,5 @@
 'use strict';
 
-
 const veml6070_uvintensity = require('./veml6070_uvintensity'),
   tsl45315_lightintensity = require('./tsl45315_lightintensity'),
   bmp280_pressure = require('./bmp280_pressure'),
@@ -49,7 +48,10 @@ const veml6070_uvintensity = require('./veml6070_uvintensity'),
   sps30_pm4 = require('./sps30_pm4'),
   sps30_pm10 = require('./sps30_pm10'),
   sht3x_temperature = require('./sht3x_temperature'),
-  sht3x_humidity = require('./sht3x_humidity');
+  sht3x_humidity = require('./sht3x_humidity'),
+  dnms_la_eq = require('./dnms_la_eq'),
+  dnms_la_min = require('./dnms_la_min'),
+  dnms_la_max = require('./dnms_la_max');
 module.exports = {
   hdc1008_temperature,
   hdc1080_temperature,
@@ -99,5 +101,8 @@ module.exports = {
   sps30_pm4,
   sps30_pm10,
   sht3x_temperature,
-  sht3x_humidity
+  sht3x_humidity,
+  dnms_la_eq,
+  dnms_la_min,
+  dnms_la_max,
 };

packages/models/src/measurement/decoding/luftdatenHandler.js

@@ -82,16 +82,24 @@ const matchings = {
   humidity: ['rel. luftfeuchte', 'luftfeuchtigkeit', 'luftfeuchte'],
   pressure: ['luftdruck', 'druck'],
   signal: ['stärke', 'signal'],
+  noise_laeq: ['schallpegel', 'geräuschpegel'],
 };
 
 const findSensorId = function findSensorId (sensors, value_type) {
   // temperature, humidity and pressure values
   // are named either directly or with a prefix
   // separated by underscores. The last element
   // should be the the desired phenomenon
-  let [vt_sensortype, vt_phenomenon] = value_type
-    .toLowerCase()
-    .split('_');
+  let [vt_sensortype, vt_phenomenon] = [];
+  const splitAtIndex = value_type.toLowerCase().indexOf('_');
+  if (splitAtIndex > 0) {
+    [vt_sensortype, vt_phenomenon] = [
+      value_type.toLowerCase().slice(0, splitAtIndex),
+      value_type.toLowerCase().slice(splitAtIndex + 1),
+    ];
+  } else {
+    [vt_sensortype, vt_phenomenon] = value_type.toLowerCase().split('_');
+  }
 
   // DHT11 and DHT22 sensors have no underscore prefix
   if (!vt_phenomenon && ['temperature', 'humidity'].includes(vt_sensortype)) {
@@ -110,9 +118,10 @@ const findSensorId = function findSensorId (sensors, value_type) {
         const title = sensor.title.toLowerCase();
         const type = sensor.sensorType.toLowerCase();
         if (
-          (title === vt_phenomenon || matchings[vt_phenomenon].includes(title) || matchings[vt_phenomenon].some(alias => title.includes(alias)))
-          &&
-          (type.startsWith(vt_sensortype))
+          (title === vt_phenomenon ||
+            matchings[vt_phenomenon].includes(title) ||
+            matchings[vt_phenomenon].some((alias) => title.includes(alias))) &&
+          type.startsWith(vt_sensortype)
         ) {
           sensorId = sensor._id.toString();
           break;
@@ -137,7 +146,6 @@ const transformLuftdatenJson = function transformLuftdatenJson (json, sensors) {
   return outArray;
 };
 
-
 module.exports = {
   decodeMessage: function (message, { sensors } = {}) {
     if (!sensors) {
@@ -159,7 +167,9 @@ module.exports = {
       }
 
       if (!json.sensordatavalues) {
-        return Promise.reject(new Error('Invalid luftdaten json. Missing `sensordatavalues`'));
+        return Promise.reject(
+          new Error('Invalid luftdaten json. Missing `sensordatavalues`')
+        );
       }
 
       const transformedMeasurements = transformLuftdatenJson(json, sensors);
@@ -170,6 +180,8 @@ module.exports = {
       return transformAndValidateMeasurements(transformedMeasurements);
     }
 
-    return Promise.reject(new Error('Cannot decode empty message (luftdaten decoder)'));
-  }
+    return Promise.reject(
+      new Error('Cannot decode empty message (luftdaten decoder)')
+    );
+  },
 };