Revert "Add availability_mode all for Home Assistant discovery. #6281"

This reverts commit d07f1dab31.

lib/extension/availabilityNew.ts

@@ -9,6 +9,7 @@ const seconds = (seconds: number): number => 1000 * seconds;
 
 // TODO
 // - State retrieval
+// - Home Assistant add availability mode
 // - Honour legacy availability_timeout, availability_blocklist and availability_passlist options.
 class AvailabilityNew extends ExtensionTS {
     private timers: {[s: string]: NodeJS.Timeout} = {};

lib/extension/homeassistant.js

@@ -855,7 +855,6 @@ class HomeAssistant extends Extension {
 
             // Availability payload
             payload.availability = [{topic: `${settings.get().mqtt.base_topic}/bridge/state`}];
-            payload.availability_mode = 'all';
             if (settings.get().advanced.availability_timeout || settings.get().availability) {
                 payload.availability.push({topic: `${settings.get().mqtt.base_topic}/${friendlyName}/availability`});
             }

test/homeassistant.test.js

@@ -62,7 +62,6 @@ describe('HomeAssistant extension', () => {
 
         payload = {
             "availability":[{"topic":"zigbee2mqtt/bridge/state"}],
-            "availability_mode": "all",
             "brightness":true,
             "brightness_scale":254,
             "color_mode":true,
@@ -94,7 +93,6 @@ describe('HomeAssistant extension', () => {
 
         payload = {
             "availability":[{"topic":"zigbee2mqtt/bridge/state"}],
-            "availability_mode": "all",
             "command_topic":"zigbee2mqtt/ha_discovery_group/set",
             "device":{
                "identifiers":["zigbee2mqtt_1221051039810110150109113116116_9"],
@@ -134,7 +132,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -161,7 +158,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -188,7 +184,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -215,7 +210,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -243,7 +237,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -254,8 +247,11 @@ describe('HomeAssistant extension', () => {
         );
 
         payload = {
-            "availability":[{"topic":"zigbee2mqtt/bridge/state"}],
-            "availability_mode": "all",
+            "availability":[
+                {
+                    "topic":"zigbee2mqtt/bridge/state"
+                }
+            ],
             "command_topic":"zigbee2mqtt/wall_switch_double/left/set",
             "device":{
                 "identifiers":[
@@ -283,8 +279,11 @@ describe('HomeAssistant extension', () => {
         );
 
         payload = {
-            "availability":[{"topic":"zigbee2mqtt/bridge/state"}],
-            "availability_mode": "all",
+            "availability":[
+                {
+                    "topic":"zigbee2mqtt/bridge/state"
+                }
+            ],
             "command_topic":"zigbee2mqtt/wall_switch_double/right/set",
             "device":{
                 "identifiers":[
@@ -312,8 +311,11 @@ describe('HomeAssistant extension', () => {
         );
 
         payload = {
-            "availability":[{"topic":"zigbee2mqtt/bridge/state"}],
-            "availability_mode": "all",
+            "availability":[
+                {
+                    "topic":"zigbee2mqtt/bridge/state"
+                }
+            ],
             "brightness":true,
             "brightness_scale":254,
             "color_mode": true,
@@ -386,7 +388,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -413,7 +414,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -440,7 +440,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -498,7 +497,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'From Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
             'expire_after': 90,
             'icon': 'mdi:test',
         };
@@ -526,7 +524,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Not from Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
             'expire_after': 30,
             'icon': 'mdi:test',
         };
@@ -563,7 +560,6 @@ describe('HomeAssistant extension', () => {
 
         payload = {
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
             "command_topic": "zigbee2mqtt/my_switch/set",
             "device": {
               "identifiers": [
@@ -663,7 +659,6 @@ describe('HomeAssistant extension', () => {
                "manufacturer":"Hampton Bay"
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
          };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -683,7 +678,6 @@ describe('HomeAssistant extension', () => {
 
         payload = {
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
             "away_mode_command_topic":"zigbee2mqtt/TS0601_thermostat/set/away_mode",
             "away_mode_state_template":"{{ value_json.away_mode }}",
             "away_mode_state_topic":"zigbee2mqtt/TS0601_thermostat",
@@ -760,7 +754,6 @@ describe('HomeAssistant extension', () => {
                 manufacturer: 'Keen Home'
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -796,7 +789,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -940,7 +932,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -1064,7 +1055,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}, {topic: 'zigbee2mqtt/weather_sensor/availability'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -1152,7 +1142,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -1224,7 +1213,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -1258,7 +1246,6 @@ describe('HomeAssistant extension', () => {
                 "manufacturer":"IKEA"
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -1707,7 +1694,6 @@ describe('HomeAssistant extension', () => {
                 'manufacturer': 'Xiaomi',
             },
             'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
-            'availability_mode': 'all',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -1728,7 +1714,6 @@ describe('HomeAssistant extension', () => {
 
         const payload = {
             "availability":[{"topic":"zigbee2mqtt/bridge/state"}],
-            "availability_mode": "all",
             "brightness":true,
             "brightness_scale":254,
             "color_mode":true,