Fixed bluetooth permission issues and relayed the icon to home-assistant

lordthorzonus · May 6, 2022 · 1c20a63 · 1c20a63
1 parent 849800d
commit 1c20a63
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -31,8 +31,6 @@ FROM base as production
 ENV NODE_ENV=production
 RUN rm -rf /opt/yarn*
 
-USER node
-
 RUN mkdir -p /home/node/app && chown node:node /home/node/app
 WORKDIR /home/node/app
 
@@ -41,4 +39,4 @@ COPY --from=development --chown=node:node /home/node/app/ ./
 RUN npm run build
 RUN npm prune
 
-CMD [ "npm", "run", "start" ]
+CMD [ "node", "dist/index.js" ]
diff --git a/src/mqtt/home-assistant/__snapshots__/home-assistant-mqtt-message-producer.test.ts.snap b/src/mqtt/home-assistant/__snapshots__/home-assistant-mqtt-message-producer.test.ts.snap
@@ -13,12 +13,12 @@ Array [
     "topic": "homeassistant/sensor/fridge_temperature/config",
   },
   Object {
-    "payload": "{\\"name\\":\\"fridge Battery Voltage\\",\\"unit_of_measurement\\":\\"mV\\",\\"object_id\\":\\"fridge_battery_voltage\\",\\"unique_id\\":\\"fridge_battery_voltage\\",\\"availability_topic\\":\\"a_base_topic/ruuvitag/aa:bb/availability\\",\\"availability_template\\":\\"{{ value_json.state }}\\",\\"expire_after\\":10,\\"device\\":{\\"manufacturer\\":\\"Ruuvi Innovations Oy\\",\\"model\\":\\"RuuviTag\\",\\"name\\":\\"ruuvitag fridge\\",\\"connections\\":[[\\"mac\\",\\"aa:bb\\"]]},\\"value_template\\":\\"{{ value_json.batteryVoltage }}\\",\\"state_topic\\":\\"a_base_topic/ruuvitag/aa:bb/state\\"}",
+    "payload": "{\\"name\\":\\"fridge Battery Voltage\\",\\"unit_of_measurement\\":\\"mV\\",\\"object_id\\":\\"fridge_battery_voltage\\",\\"unique_id\\":\\"fridge_battery_voltage\\",\\"availability_topic\\":\\"a_base_topic/ruuvitag/aa:bb/availability\\",\\"availability_template\\":\\"{{ value_json.state }}\\",\\"expire_after\\":10,\\"icon\\":\\"mdi:battery\\",\\"device\\":{\\"manufacturer\\":\\"Ruuvi Innovations Oy\\",\\"model\\":\\"RuuviTag\\",\\"name\\":\\"ruuvitag fridge\\",\\"connections\\":[[\\"mac\\",\\"aa:bb\\"]]},\\"value_template\\":\\"{{ value_json.batteryVoltage }}\\",\\"state_topic\\":\\"a_base_topic/ruuvitag/aa:bb/state\\"}",
     "retain": true,
     "topic": "homeassistant/sensor/fridge_battery_voltage/config",
   },
   Object {
-    "payload": "{\\"name\\":\\"fridge Humidity\\",\\"device_class\\":\\"humidity\\",\\"unit_of_measurement\\":\\"%\\",\\"object_id\\":\\"fridge_humidity\\",\\"unique_id\\":\\"fridge_humidity\\",\\"availability_topic\\":\\"a_base_topic/ruuvitag/aa:bb/availability\\",\\"availability_template\\":\\"{{ value_json.state }}\\",\\"expire_after\\":10,\\"device\\":{\\"manufacturer\\":\\"Ruuvi Innovations Oy\\",\\"model\\":\\"RuuviTag\\",\\"name\\":\\"ruuvitag fridge\\",\\"connections\\":[[\\"mac\\",\\"aa:bb\\"]]},\\"value_template\\":\\"{{ value_json.relativeHumidityPercentage | float(2) }}\\",\\"state_topic\\":\\"a_base_topic/ruuvitag/aa:bb/state\\"}",
+    "payload": "{\\"name\\":\\"fridge Humidity\\",\\"device_class\\":\\"humidity\\",\\"unit_of_measurement\\":\\"%\\",\\"object_id\\":\\"fridge_humidity\\",\\"unique_id\\":\\"fridge_humidity\\",\\"availability_topic\\":\\"a_base_topic/ruuvitag/aa:bb/availability\\",\\"availability_template\\":\\"{{ value_json.state }}\\",\\"expire_after\\":10,\\"icon\\":\\"mdi:gauge\\",\\"device\\":{\\"manufacturer\\":\\"Ruuvi Innovations Oy\\",\\"model\\":\\"RuuviTag\\",\\"name\\":\\"ruuvitag fridge\\",\\"connections\\":[[\\"mac\\",\\"aa:bb\\"]]},\\"value_template\\":\\"{{ value_json.relativeHumidityPercentage | float(2) }}\\",\\"state_topic\\":\\"a_base_topic/ruuvitag/aa:bb/state\\"}",
     "retain": true,
     "topic": "homeassistant/sensor/fridge_humidity/config",
   },
@@ -33,7 +33,7 @@ Array [
     "topic": "homeassistant/sensor/fridge_pressure/config",
   },
   Object {
-    "payload": "{\\"name\\":\\"fridge TX Power\\",\\"unit_of_measurement\\":\\"dBm\\",\\"object_id\\":\\"fridge_txPower\\",\\"unique_id\\":\\"fridge_txPower\\",\\"availability_topic\\":\\"a_base_topic/ruuvitag/aa:bb/availability\\",\\"availability_template\\":\\"{{ value_json.state }}\\",\\"expire_after\\":10,\\"device\\":{\\"manufacturer\\":\\"Ruuvi Innovations Oy\\",\\"model\\":\\"RuuviTag\\",\\"name\\":\\"ruuvitag fridge\\",\\"connections\\":[[\\"mac\\",\\"aa:bb\\"]]},\\"value_template\\":\\"{{ value_json.txPower }}\\",\\"state_topic\\":\\"a_base_topic/ruuvitag/aa:bb/state\\"}",
+    "payload": "{\\"name\\":\\"fridge TX Power\\",\\"unit_of_measurement\\":\\"dBm\\",\\"object_id\\":\\"fridge_txPower\\",\\"unique_id\\":\\"fridge_txPower\\",\\"availability_topic\\":\\"a_base_topic/ruuvitag/aa:bb/availability\\",\\"availability_template\\":\\"{{ value_json.state }}\\",\\"expire_after\\":10,\\"icon\\":\\"mdi:signal\\",\\"device\\":{\\"manufacturer\\":\\"Ruuvi Innovations Oy\\",\\"model\\":\\"RuuviTag\\",\\"name\\":\\"ruuvitag fridge\\",\\"connections\\":[[\\"mac\\",\\"aa:bb\\"]]},\\"value_template\\":\\"{{ value_json.txPower }}\\",\\"state_topic\\":\\"a_base_topic/ruuvitag/aa:bb/state\\"}",
     "retain": true,
     "topic": "homeassistant/sensor/fridge_txPower/config",
   },

diff --git a/src/mqtt/home-assistant/home-assistant-mqtt-message-producer.ts b/src/mqtt/home-assistant/home-assistant-mqtt-message-producer.ts
@@ -65,6 +65,7 @@ interface HADiscoveryPayload {
     availability_template: string;
     value_template: string;
     state_topic: string;
+    icon?: string;
     device: {
         name: string;
         manufacturer: string;
@@ -89,6 +90,7 @@ const getHaDiscoveryPayload = (
               availability_topic: getDeviceAvailabilityTopic(deviceMessage.device),
               availability_template: "{{ value_json.state }}",
               expire_after: deviceMessage.device.timeout / 1000,
+              icon: configEntry.icon,
               device: {
                   ...configEntry.device,
                   name: getDeviceName(deviceMessage),