@lifefinder/vsm-mqtt-client-open-source 0.0.57 → 0.0.59

package/integrations/chirpstack3.js

@@ -1,6 +1,27 @@
 const mqtt = require('mqtt')
 const { isDate } = require('util/types');
 
+const extractLoraInfo = (obj) => {
+    const info = {};
+    if (obj.rxInfo && obj.rxInfo.length > 0) {
+        const best = obj.rxInfo.reduce((a, b) => ((b.rssi || -999) > (a.rssi || -999) ? b : a), obj.rxInfo[0]);
+        if (typeof best.rssi === 'number') info.rssi = best.rssi;
+        if (typeof best.loRaSNR === 'number') info.snr = best.loRaSNR;
+        info.gatewayCount = obj.rxInfo.length;
+    }
+    if (obj.txInfo) {
+        if (obj.txInfo.frequency) info.frequency = obj.txInfo.frequency;
+        if (Number.isInteger(obj.txInfo.dr)) info.dataRate = obj.txInfo.dr;
+        if (obj.txInfo.loRaModulationInfo) {
+            const mi = obj.txInfo.loRaModulationInfo;
+            if (mi.spreadingFactor) info.spreadingFactor = mi.spreadingFactor;
+            if (mi.bandwidth) info.bandwidth = mi.bandwidth;
+        }
+    }
+    info.timestamp = new Date().toISOString();
+    return info;
+};
+
 const printUsageAndExit = (info) => {
     console.log(info);
     process.exit(1);
@@ -109,7 +130,7 @@ module.exports.api = {
                 if (! (date && isDate(date)))
                     date = new Date()
 
-                await onUplinkDevicePortBufferDateLatLng(client, id, port, data, date, lat, lng, maxSize);
+                await onUplinkDevicePortBufferDateLatLng(client, id, port, data, date, lat, lng, maxSize, extractLoraInfo(obj));
             });
             return client;
         } catch (e) {

package/integrations/chirpstack4.js

@@ -1,6 +1,27 @@
 const mqtt = require('mqtt')
 const { isDate } = require('util/types');
 
+const extractLoraInfo = (obj) => {
+    const info = {};
+    if (obj.rxInfo && obj.rxInfo.length > 0) {
+        const best = obj.rxInfo.reduce((a, b) => ((b.rssi || -999) > (a.rssi || -999) ? b : a), obj.rxInfo[0]);
+        if (typeof best.rssi === 'number') info.rssi = best.rssi;
+        if (typeof best.snr === 'number') info.snr = best.snr;
+        info.gatewayCount = obj.rxInfo.length;
+    }
+    if (obj.txInfo) {
+        if (obj.txInfo.frequency) info.frequency = obj.txInfo.frequency;
+        if (obj.txInfo.modulation && obj.txInfo.modulation.lora) {
+            const lora = obj.txInfo.modulation.lora;
+            if (lora.spreadingFactor) info.spreadingFactor = lora.spreadingFactor;
+            if (lora.bandwidth) info.bandwidth = lora.bandwidth;
+        }
+    }
+    if (Number.isInteger(obj.dr)) info.dataRate = obj.dr;
+    info.timestamp = new Date().toISOString();
+    return info;
+};
+
 const printUsageAndExit = (info) => {
     console.log(info);
     process.exit(1);
@@ -94,7 +115,7 @@ module.exports.api = {
                 if (! (date && isDate(date)))
                     date = new Date()
 
-                await onUplinkDevicePortBufferDateLatLng(client, id, port, data, date, lat, lng, maxSize);
+                await onUplinkDevicePortBufferDateLatLng(client, id, port, data, date, lat, lng, maxSize, extractLoraInfo(obj));
             });
             return client;
         } catch (e) {

package/merge-and-publish.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 set -e
 
+merged_main=false
+dep_updated=false
+
 # Merge main if there are changes, but keep our package.json
 git fetch origin main
 if ! git diff --quiet HEAD...origin/main; then
@@ -8,27 +11,41 @@ if ! git diff --quiet HEAD...origin/main; then
     git checkout --ours package.json
     git add package.json
     git diff --cached --quiet || git commit -m "Merge origin/main, keeping local package.json"
+    merged_main=true
+    echo "Merged changes from main"
 fi
 
-# Bump patch version in package.json
-current_version=$(node -p "require('./package.json').version")
-new_version=$(echo "$current_version" | awk -F. '{print $1"."$2"."$3+1}')
-sed -i "s/\"version\": \"$current_version\"/\"version\": \"$new_version\"/" package.json
-
-# Bump dependency version
+# Check dependency version against npm
 current_dep=$(node -p "require('./package.json').dependencies['@lifefinder/vsm-translator-open-source']")
-new_dep=$(echo "$current_dep" | awk -F. '{print $1"."$2"."$3+1}')
-sed -i "s|\"@lifefinder/vsm-translator-open-source\": \"$current_dep\"|\"@lifefinder/vsm-translator-open-source\": \"$new_dep\"|" package.json
-
-echo "Bumped version: $current_version -> $new_version"
-echo "Bumped dependency: $current_dep -> $new_dep"
+current_dep_stripped=$(echo "$current_dep" | sed 's/^[\^~]//')
+new_dep=$(npm view @lifefinder/vsm-translator-open-source version 2>/dev/null)
+if [ -z "$new_dep" ]; then
+    echo "Error: Could not fetch latest version of @lifefinder/vsm-translator-open-source from npm"
+    exit 1
+fi
+if [ "$current_dep_stripped" != "$new_dep" ]; then
+    sed -i "s|\"@lifefinder/vsm-translator-open-source\": \"$current_dep\"|\"@lifefinder/vsm-translator-open-source\": \"$new_dep\"|" package.json
+    dep_updated=true
+    echo "Bumped dependency: $current_dep -> $new_dep"
+else
+    echo "Dependency already at latest: $current_dep"
+fi
 
-# Commit version bump
-git add package.json
-git commit -m "Bump version to $new_version"
+# Only bump version if there were changes
+if [ "$merged_main" = true ] || [ "$dep_updated" = true ]; then
+    current_version=$(node -p "require('./package.json').version")
+    new_version=$(echo "$current_version" | awk -F. '{print $1"."$2"."$3+1}')
+    sed -i "s/\"version\": \"$current_version\"/\"version\": \"$new_version\"/" package.json
+    echo "Bumped version: $current_version -> $new_version"
 
-# Push to remote
-git push
+    # Commit and push
+    git add package.json
+    git commit -m "Bump version to $new_version"
+    git push
 
-echo ""
-echo "Done! Now run: npm publish"
+    echo ""
+    echo "Done! Now run: npm publish"
+else
+    echo ""
+    echo "No changes to publish (no merge from main, dependency already current)"
+fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lifefinder/vsm-mqtt-client-open-source",
-  "version": "0.0.57",
+  "version": "0.0.59",
   "description": "MQTT client for vsm sensors",
   "main": "vsm-mqtt-client.js",
   "author": "Lars Mats",
@@ -14,6 +14,6 @@
     "mongodb": "6.3.0",
     "mqtt": "4.3.7",
     "node-fetch": "3.3.1",
-    "@lifefinder/vsm-translator-open-source": "^0.2.169"
+    "@lifefinder/vsm-translator-open-source": "0.2.169"
   }
 }

package/vsm-mqtt-client.js

@@ -211,7 +211,7 @@ const run = async () => {
     console.log('Series Processor: ', seriesProcessor.getName());
 
   // Function to handle uplinks for a device id on a port with binary data in buffer
-  const onUplinkDevicePortBufferDateLatLng = async (client, deviceid, port, buffer, date, lat, lng, maxSize) => {
+  const onUplinkDevicePortBufferDateLatLng = async (client, deviceid, port, buffer, date, lat, lng, maxSize, loraInfo) => {
     if (!(typeof(deviceid) == "string" && isFinite(port) && Buffer.isBuffer(buffer))) {
       console.log(`Integration error: Bad parameter to onUplinkDevicePortBufferDateLatLng:
                   typeof(deviceid):${typeof(deviceid)} (expect string), typeof(port)=${typeof(port)} (expect number), Buffer.isBuffer(buffer)=${Buffer.isBuffer(buffer)}`);
@@ -240,13 +240,14 @@ const run = async () => {
     }
 
     // Run translation
-    let iotnode = { ...previous, 
+    let iotnode = { ...previous,
       encodedData : {
           port : port,
           hexEncoded : buffer.toString('hex'),
           timestamp: date,  // TBD if this should be given by the integration instead?
           maxSize: maxSize,
-      }
+      },
+      ...(loraInfo && { lora: loraInfo }),
     }
     let result = {}
     try {