Upgrade to ghcr.io/hassio-addons/base:18.1.1, CHIRPSTACK_VERSION: 4.14.1

Author: modrisb

chirp2mqtt/CHANGELOG.md

@@ -1,5 +1,9 @@
 <!-- https://developers.home-assistant.io/docs/add-ons/presentation#keeping-a-changelog -->
 
+## 1.1.148
+
+- Upgrade to ghcr.io/hassio-addons/base:18.1.1, CHIRPSTACK_VERSION: 4.14.1
+
 ## 1.1.147
 
 - Fixed issue with event/frame appearance in ingress

chirp2mqtt/build.yaml

@@ -1,13 +1,14 @@
 build_from:
-  aarch64: ghcr.io/hassio-addons/base:18.0.3
-  amd64: ghcr.io/hassio-addons/base:18.0.3
-  armv7: ghcr.io/hassio-addons/base:18.0.3
+  aarch64: ghcr.io/hassio-addons/base:18.1.1
+  amd64: ghcr.io/hassio-addons/base:18.1.1
+  armv7: ghcr.io/hassio-addons/base:18.1.1
 args:
-  CHIRPSTACK_VERSION: 4.13.0
+  CHIRPSTACK_VERSION: 4.14.1
   CHIRPSTACK_GATEWAY_BRIDGE_VERSION: 4.0.11
 
 #cosign:
 #  identity: https://github.com/home-assistant/docker-base/.*
 #labels:
 #  io.hass.base.name: alpine
 #  org.opencontainers.image.source: https://github.com/home-assistant/docker-base
+# https://github.com/hassio-addons/addon-base

chirp2mqtt/config.yaml

@@ -1,6 +1,6 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config
 name: Chirp2MQTT
-version: "1.1.147"
+version: "1.1.148"
 slug: chirp2mqtt
 description: HA add-on to incorporate ChirpStack LoRaWAN devices into MQTT integration
 arch:

chirp2mqtt/getHaDeviceInfo/HAG-TG563A.js

@@ -1,160 +1,169 @@
-function getHaDeviceInfo() {
-  return {
-    device: {
-      manufacturer: "Hager Group",
-      model: "TG563A Smoke Detector",
-    },
-    entities: {
-      temperature:{
-        entity_conf: {
-          value_template: "{{ value_json.object.temperature | float }}",
-          device_class: "temperature",
-          unit_of_measurement: "°C"
-        }
-      },
-      minimumTemperature:{
-        entity_conf: {
-          value_template: "{{ value_json.object.minimumTemperature | float }}",
-          device_class: "temperature",
-          unit_of_measurement: "°C"
-        }
-      },
-      maximumTemperature:{
-        entity_conf: {
-          value_template: "{{ value_json.object.maximumTemperature | float }}",
-          device_class: "temperature",
-          unit_of_measurement: "°C"
-        }
-      },
-      batteryLevel:{
-        entity_conf: {
-          value_template: "{{ value_json.object.batteryLevel | float }}",
-          device_class: "voltage",
-          entity_category: "diagnostic",
-          unit_of_measurement: "V"
-        }
-      },
-      energyUsage:{
-        integration: "sensor",
-        entity_conf: {
-          value_template: "{{ value_json.object.energyUsage | int }}",
-          entity_category: "diagnostic",
-          //device_class: "energy",
-          unit_of_measurement: "%"
-        }
-      },
-      distanceThreshold:{
-        entity_conf: {
-          entity_category: "diagnostic",
-          value_template: "{{ value_json.object.distanceThreshold | int }}",
-          device_class: "distance",
-          unit_of_measurement: "cm"
-        }
-      },
-      smoke:{
-        integration: "binary_sensor",
-        entity_conf: {
-          value_template: "{{ value_json.object.status.smokeAlarm | int }}",
-          device_class: "smoke",
-          payload_on: 1,
-          payload_off: 0
-        }
-      },
-      smokeAlarmTimeCounter:{
-        entity_conf: {
-          value_template: "{{ value_json.object.smokeAlarmTimeCounter | int }}",
-          device_class: "duration",
-          unit_of_measurement: "min",
-        }
-      },
-      smokeAlarmCounter:{
-        entity_conf: {
-          value_template: "{{ value_json.object.smokeAlarmCounter | int }}",
-          device_class: "volume",
-        }
-      },
-      battery:{
-        integration: "binary_sensor",
-        entity_conf: {
-          value_template: "{{ value_json.object.status.batteryLow | int }}",
-          entity_category: "diagnostic",
-          device_class: "battery",
-          payload_on: 1,
-          payload_off: 0
-        }
-      },
+  function getHaDeviceInfo() {
+    return {
+      device: {
+        manufacturer: "Hager Group",
+        model: "TG563A Smoke Detector",
+      },
+      entities: {
+        temperature:{
+          entity_conf: {
+            value_template: "{{ value_json.object.temperature | float }}",
+            device_class: "temperature",
+            unit_of_measurement: "°C"
+          }
+        },
+        minimumTemperature:{
+          entity_conf: {
+            value_template: "{{ value_json.object.minimumTemperature | float }}",
+            device_class: "temperature",
+            unit_of_measurement: "°C"
+          }
+        },
+        maximumTemperature:{
+          entity_conf: {
+            value_template: "{{ value_json.object.maximumTemperature | float }}",
+            device_class: "temperature",
+            unit_of_measurement: "°C"
+          }
+        },
+        batteryLevel:{
+          entity_conf: {
+            value_template: "{{ value_json.object.batteryLevel | float }}",
+            device_class: "voltage",
+            entity_category: "diagnostic",
+            unit_of_measurement: "V"
+          }
+        },
+        energyUsage:{
+          integration: "sensor",
+          entity_conf: {
+            value_template: "{{ value_json.object.energyUsage | int }}",
+            entity_category: "diagnostic",
+            //device_class: "energy",
+            unit_of_measurement: "%"
+          }
+        },
+        distanceThreshold:{
+          entity_conf: {
+            entity_category: "diagnostic",
+            value_template: "{{ value_json.object.distanceThreshold | int }}",
+            device_class: "distance",
+            unit_of_measurement: "cm"
+          }
+        },
+        smoke:{
+          integration: "binary_sensor",
+          entity_conf: {
+            value_template: "{{ value_json.object.status.smokeAlarm | int }}",
+            device_class: "smoke",
+            payload_on: 1,
+            payload_off: 0
+          }
+        },
+        smokeAlarmTimeCounter:{
+          entity_conf: {
+            value_template: "{{ value_json.object.smokeAlarmTimeCounter | int }}",
+            device_class: "duration",
+            unit_of_measurement: "min",
+          }
+        },
+        smokeAlarmCounter:{
+          entity_conf: {
+            value_template: "{{ value_json.object.smokeAlarmCounter | int }}",
+            device_class: "volume",
+          }
+        },
+        battery:{
+          integration: "binary_sensor",
+          entity_conf: {
+            value_template: "{{ value_json.object.status.batteryLow | int }}",
+            entity_category: "diagnostic",
+            device_class: "battery",
+            payload_on: 1,
+            payload_off: 0
+          }
+        },
+        battery:{
+          data_event: "status",
+          entity_conf: {
+            value_template: "{{ value_json.batteryLevel | int }}",
+            entity_category: "diagnostic",
+            device_class: "battery",
+            unit_of_measurement: "%",
+          }
+        },
       transmissionPeriod:{
-        integration: "select",
-        entity_conf: {
-            value_template: "{{ (value_json.object.configuration.transmissionPeriod | int | string )+  ' h' }}",
+          integration: "select",
+          entity_conf: {
+              value_template: "{{ (value_json.object.configuration.transmissionPeriod | int | string )+  ' h' }}",
+              command_topic: "{command_topic}",
+              command_template: '{"devEui":"{dev_eui}","fPort":1,"object":{ "command": "SET_TX_PERIOD", "parameter": {{ this.attributes.options.index(value) }} } }',
+              options:[ "1 h", "2 h", "4 h", "6 h", "8 h", "12 h", "24 h",  "48 h" ] ,
+            }
+        },
+        additionalDataEnabled:{
+          integration: "switch",
+          entity_conf: {
+            value_template: "{{ value_json.object.configuration.additionalDataEnabled | int }}",
             command_topic: "{command_topic}",
-            command_template: '{"devEui":"{dev_eui}","fPort":1,"object":{ "command": "SET_TX_PERIOD", "parameter": {{ this.attributes.options.index(value) }} } }',
-            options:[ "1 h", "2 h", "4 h", "6 h", "8 h", "12 h", "24 h",  "48 h" ] ,
-          }
-       },
-       additionalDataEnabled:{
-        integration: "switch",
-        entity_conf: {
-          value_template: "{{ value_json.object.configuration.additionalDataEnabled | int }}",
-          command_topic: "{command_topic}",
-          state_on: 1,
-          state_off: 0,
-          //payload_off: '{"devEui":"{dev_eui}","fPort":1,"data":"EA=="}',
-          payload_on: '{"devEui":"{dev_eui}","fPort":1,"data":"EQ=="}'
-        }
-      },
-      obstructionEventEnabled:{
-        integration: "switch",
-        entity_conf: {
-          value_template: "{{ value_json.object.configuration.obstructionEventEnabled | int }}",
-          command_topic: "{command_topic}",
-          state_on: 1,
-          state_off: 0,
-          //payload_off: '{"devEui":"{dev_eui}","fPort":1,"data":"QA=="}',
-          payload_on: '{"devEui":"{dev_eui}","fPort":1,"data":"QQ=="}'
-        }
-      },
-      smokeEventEnabled:{
-        integration: "switch",
-        entity_conf: {
-          value_template: "{{ value_json.object.configuration.smokeEventEnabled | int }}",
-          command_topic: "{command_topic}",
-          state_on: 1,
-          state_off: 0,
-          //payload_off: '{"devEui":"{dev_eui}","fPort":1,"data":"UA=="}',
-          payload_on: '{"devEui":"{dev_eui}","fPort":1,"data":"UQ=="}'
-        }
-      },
-      SEND_ADDITIONAL_DATA_IN_NEXT_UPLINK:{
-        integration: "button",
-        entity_conf: {
-          command_topic: "{command_topic}",
-          payload_press: '{"devEui":"{dev_eui}","fPort":1,"data":"gA=="}'
-        }
-      },
-      resetSmokeEvent:{
-        integration: "button",
-        entity_conf: {
-          command_topic: "{command_topic}",
-          payload_press: '{"devEui":"{dev_eui}","fPort":1,"data":"UA=="}'
-        }
-      },
-      rssi:{
-        entity_conf: {
-          value_template: "{{ value_json.rxInfo[-1].rssi | int }}",
-          entity_category: "diagnostic",
-          device_class: "signal_strength",
-          unit_of_measurement: "dBm",
-        }
-      },
-      snr:{
-        integration: "sensor",
-        entity_conf: {
-          value_template: "{{ value_json.rxInfo[-1].snr | int }}",
-          entity_category: "diagnostic",
-          unit_of_measurement: "dB",
+            state_on: 1,
+            state_off: 0,
+            //payload_off: '{"devEui":"{dev_eui}","fPort":1,"data":"EA=="}',
+            payload_on: '{"devEui":"{dev_eui}","fPort":1,"data":"EQ=="}'
+          }
+        },
+        obstructionEventEnabled:{
+          integration: "switch",
+          entity_conf: {
+            value_template: "{{ value_json.object.configuration.obstructionEventEnabled | int }}",
+            command_topic: "{command_topic}",
+            state_on: 1,
+            state_off: 0,
+            //payload_off: '{"devEui":"{dev_eui}","fPort":1,"data":"QA=="}',
+            payload_on: '{"devEui":"{dev_eui}","fPort":1,"data":"QQ=="}'
+          }
+        },
+        smokeEventEnabled:{
+          integration: "switch",
+          entity_conf: {
+            value_template: "{{ value_json.object.configuration.smokeEventEnabled | int }}",
+            command_topic: "{command_topic}",
+            state_on: 1,
+            state_off: 0,
+            //payload_off: '{"devEui":"{dev_eui}","fPort":1,"data":"UA=="}',
+            payload_on: '{"devEui":"{dev_eui}","fPort":1,"data":"UQ=="}'
+          }
+        },
+        SEND_ADDITIONAL_DATA_IN_NEXT_UPLINK:{
+          integration: "button",
+          entity_conf: {
+            command_topic: "{command_topic}",
+            payload_press: '{"devEui":"{dev_eui}","fPort":1,"data":"gA=="}'
+          }
+        },
+        resetSmokeEvent:{
+          integration: "button",
+          entity_conf: {
+            command_topic: "{command_topic}",
+            payload_press: '{"devEui":"{dev_eui}","fPort":1,"data":"UA=="}'
+          }
+        },
+        rssi:{
+          entity_conf: {
+            value_template: "{{ value_json.rxInfo[-1].rssi | int }}",
+            entity_category: "diagnostic",
+            device_class: "signal_strength",
+            unit_of_measurement: "dBm",
+          }
+        },
+        snr:{
+          integration: "sensor",
+          entity_conf: {
+            value_template: "{{ value_json.rxInfo[-1].snr | int }}",
+            entity_category: "diagnostic",
+            unit_of_measurement: "dB",
+          }
         }
       }
-    }
-  };
-}
+    };
+  }

chirp2mqtt/rootfs/usr/local/bin/ha-proxy.js

@@ -63,7 +63,7 @@ const nonGrpcProxy = createProxyMiddleware({
               body = body.replaceAll('this.hostname_+"/api.',
                 'this.hostname_+"'+req.headers['x-ingress-path']+'/api.');
             }
-          
+
             if(proxyRes.headers['transfer-encoding'] == 'chunked') {
               res.end(new Buffer.from(body));
             } else {
@@ -79,7 +79,7 @@ const nonGrpcProxy = createProxyMiddleware({
 });
 
 function nonGrpcProxyHandler(req, res, next) {
-  if(req.headers['content-type'] && (req.headers['content-type'].includes('application/grpc-web-text') || req.headers['content-type'].includes('application/grpc-web-text+proto'))) {
+  if(req.headers['content-type'] && req.headers['content-type'].toLowerCase().startsWith('application/grpc-web')) {
     next();
   } else {
     return nonGrpcProxy(req, res, next);
@@ -103,6 +103,7 @@ function grpcProxyHandler(req, res, next) {
 }
 
 const app = express();
+
 app.use((req, res, next) => {
   //Get whitelisted range
   let whitelisted_range = ipaddr.parseCIDR(HM_HAPROXY_SRC);
@@ -117,4 +118,5 @@ app.use((req, res, next) => {
     res.status(403).end();
   }
 }, nonGrpcProxyHandler, grpcProxyHandler);
+
 app.listen(8099);