From b8b4ff9ee7fa78b3d2e4af2fcd67ea94091bde9b Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Sat, 11 Apr 2020 18:10:56 +0200
Subject: [PATCH] baseExtension -> extension

---
 lib/extension/deviceAvailability.js              | 4 ++--
 lib/extension/deviceBind.js                      | 4 ++--
 lib/extension/deviceConfigure.js                 | 4 ++--
 lib/extension/deviceEvent.js                     | 4 ++--
 lib/extension/deviceReceive.js                   | 4 ++--
 lib/extension/deviceReport.js                    | 4 ++--
 lib/extension/entityPublish.js                   | 4 ++--
 lib/extension/{baseExtension.js => extension.js} | 4 ++--
 lib/extension/groups.js                          | 4 ++--
 lib/extension/homeassistant.js                   | 4 ++--
 lib/extension/legacy/bridgeLegacy.js             | 4 ++--
 lib/extension/legacy/deviceGroupMembership.js    | 4 ++--
 lib/extension/legacy/softReset.js                | 4 ++--
 lib/extension/networkMap.js                      | 4 ++--
 lib/extension/otaUpdate.js                       | 4 ++--
 15 files changed, 30 insertions(+), 30 deletions(-)
 rename lib/extension/{baseExtension.js => extension.js} (96%)

diff --git a/lib/extension/deviceAvailability.js b/lib/extension/deviceAvailability.js
index e658a429..42fd4a31 100644
--- a/lib/extension/deviceAvailability.js
+++ b/lib/extension/deviceAvailability.js
@@ -2,7 +2,7 @@ const logger = require('../util/logger');
 const settings = require('../util/settings');
 const utils = require('../util/utils');
 const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
-const BaseExtension = require('./baseExtension');
+const Extension = require('./extension');
 
 // Pingable end devices, some end devices should be pinged
 // e.g. E11-G13 https://github.com/Koenkk/zigbee2mqtt/issues/775#issuecomment-453683846
@@ -16,7 +16,7 @@ const Hours25 = 1000 * 60 * 60 * 25;
 /**
  * This extensions pings devices to check if they are online.
  */
-class DeviceAvailability extends BaseExtension {
+class DeviceAvailability extends Extension {
     constructor(zigbee, mqtt, state, publishEntityState, eventBus) {
         super(zigbee, mqtt, state, publishEntityState, eventBus);
 
diff --git a/lib/extension/deviceBind.js b/lib/extension/deviceBind.js
index 206351fd..a3beb5ce 100644
--- a/lib/extension/deviceBind.js
+++ b/lib/extension/deviceBind.js
@@ -2,14 +2,14 @@ const settings = require('../util/settings');
 const logger = require('../util/logger');
 const assert = require('assert');
 const topicRegex = new RegExp(`^${settings.get().mqtt.base_topic}/bridge/(bind|unbind)/.+$`);
-const BaseExtension = require('./baseExtension');
+const Extension = require('./extension');
 
 const clusters = ['genScenes', 'genOnOff', 'genLevelCtrl', 'lightingColorCtrl', 'closuresWindowCovering'];
 
 // See zigbee-herdsman-converters devices.js
 const defaultBindGroup = {type: 'group_number', ID: 901};
 
-class DeviceBind extends BaseExtension {
+class DeviceBind extends Extension {
     onMQTTConnected() {
         this.mqtt.subscribe(`${settings.get().mqtt.base_topic}/bridge/bind/#`);
         this.mqtt.subscribe(`${settings.get().mqtt.base_topic}/bridge/unbind/#`);
diff --git a/lib/extension/deviceConfigure.js b/lib/extension/deviceConfigure.js
index e22e1cb8..68d956d8 100644
--- a/lib/extension/deviceConfigure.js
+++ b/lib/extension/deviceConfigure.js
@@ -1,8 +1,8 @@
 const settings = require('../util/settings');
 const logger = require('../util/logger');
-const BaseExtension = require('./baseExtension');
+const Extension = require('./extension');
 
-class DeviceConfigure extends BaseExtension {
+class DeviceConfigure extends Extension {
     constructor(zigbee, mqtt, state, publishEntityState, eventBus) {
         super(zigbee, mqtt, state, publishEntityState, eventBus);
 
diff --git a/lib/extension/deviceEvent.js b/lib/extension/deviceEvent.js
index ea56a4f5..9f591ef1 100644
--- a/lib/extension/deviceEvent.js
+++ b/lib/extension/deviceEvent.js
@@ -1,7 +1,7 @@
-const BaseExtension = require('./baseExtension');
+const Extension = require('./extension');
 const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
 
-class DeviceEvent extends BaseExtension {
+class DeviceEvent extends Extension {
     async onZigbeeStarted() {
         for (const device of this.zigbee.getClients()) {
             this.callOnEvent(device, 'start', {});
diff --git a/lib/extension/deviceReceive.js b/lib/extension/deviceReceive.js
index fb879417..85d224ce 100755
--- a/lib/extension/deviceReceive.js
+++ b/lib/extension/deviceReceive.js
@@ -2,9 +2,9 @@ const settings = require('../util/settings');
 const logger = require('../util/logger');
 const utils = require('../util/utils');
 const debounce = require('debounce');
-const BaseExtension = require('./baseExtension');
+const Extension = require('./extension');
 
-class DeviceReceive extends BaseExtension {
+class DeviceReceive extends Extension {
     constructor(zigbee, mqtt, state, publishEntityState, eventBus) {
         super(zigbee, mqtt, state, publishEntityState, eventBus);
         this.coordinator = null;
diff --git a/lib/extension/deviceReport.js b/lib/extension/deviceReport.js
index 66dc7644..fb04ef59 100644
--- a/lib/extension/deviceReport.js
+++ b/lib/extension/deviceReport.js
@@ -2,7 +2,7 @@ const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
 const logger = require('../util/logger');
 const ZNLDP12LM = zigbeeHerdsmanConverters.devices.find((d) => d.model === 'ZNLDP12LM');
 const utils = require('../util/utils');
-const BaseExtension = require('./baseExtension');
+const Extension = require('./extension');
 const debounce = require('debounce');
 const ZigbeeHerdsman = require('zigbee-herdsman');
 
@@ -100,7 +100,7 @@ const pollOnMessage = [
     },
 ];
 
-class DeviceReport extends BaseExtension {
+class DeviceReport extends Extension {
     constructor(zigbee, mqtt, state, publishEntityState, eventBus) {
         super(zigbee, mqtt, state, publishEntityState, eventBus);
         this.configuring = new Set();
diff --git a/lib/extension/entityPublish.js b/lib/extension/entityPublish.js
index 3e2968a5..76160e3b 100644
--- a/lib/extension/entityPublish.js
+++ b/lib/extension/entityPublish.js
@@ -4,7 +4,7 @@ const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
 const logger = require('../util/logger');
 const utils = require('../util/utils');
 const assert = require('assert');
-const BaseExtension = require('./baseExtension');
+const Extension = require('./extension');
 
 const postfixes = utils.getEndpointNames();
 const topicRegex = new RegExp(`^(.+?)(?:/(${postfixes.join('|')}))?/(get|set)(?:/(.+))?`);
@@ -21,7 +21,7 @@ const groupConverters = [
     zigbeeHerdsmanConverters.toZigbeeConverters.light_brightness_move,
 ];
 
-class EntityPublish extends BaseExtension {
+class EntityPublish extends Extension {
     onMQTTConnected() {
         // Subscribe to topics.
         const baseTopic = settings.get().mqtt.base_topic;
diff --git a/lib/extension/baseExtension.js b/lib/extension/extension.js
similarity index 96%
rename from lib/extension/baseExtension.js
rename to lib/extension/extension.js
index ff7e8428..3aa9e344 100644
--- a/lib/extension/baseExtension.js
+++ b/lib/extension/extension.js
@@ -1,4 +1,4 @@
-class BaseExtension {
+class Extension {
     /**
      * Besides intializing variables, the constructor should do nothing!
      *
@@ -49,4 +49,4 @@ class BaseExtension {
     // stop() {}
 }
 
-module.exports = BaseExtension;
+module.exports = Extension;
diff --git a/lib/extension/groups.js b/lib/extension/groups.js
index 7f46856a..4c241a43 100644
--- a/lib/extension/groups.js
+++ b/lib/extension/groups.js
@@ -1,13 +1,13 @@
 const settings = require('../util/settings');
 const logger = require('../util/logger');
-const BaseExtension = require('./baseExtension');
+const Extension = require('./extension');
 const utils = require('../util/utils');
 const postfixes = utils.getEndpointNames();
 
 const topicRegex = new RegExp(`^${settings.get().mqtt.base_topic}/bridge/group/(.+)/(remove|add|remove_all)$`);
 const topicRegexRemoveAll = new RegExp(`^${settings.get().mqtt.base_topic}/bridge/group/remove_all$`);
 
-class Groups extends BaseExtension {
+class Groups extends Extension {
     constructor(zigbee, mqtt, state, publishEntityState, eventBus) {
         super(zigbee, mqtt, state, publishEntityState, eventBus);
         this.onStateChange = this.onStateChange.bind(this);
diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 2658db4e..86d82e2c 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -2,7 +2,7 @@ const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
 const settings = require('../util/settings');
 const logger = require('../util/logger');
 const zigbee2mqttVersion = require('../../package.json').version;
-const BaseExtension = require('./baseExtension');
+const Extension = require('./extension');
 const objectAssignDeep = require(`object-assign-deep`);
 
 const cfg = {
@@ -1528,7 +1528,7 @@ Object.keys(mapping).forEach((key) => {
 /**
  * This extensions handles integration with HomeAssistant
  */
-class HomeAssistant extends BaseExtension {
+class HomeAssistant extends Extension {
     constructor(zigbee, mqtt, state, publishEntityState, eventBus) {
         super(zigbee, mqtt, state, publishEntityState, eventBus);
 
diff --git a/lib/extension/legacy/bridgeLegacy.js b/lib/extension/legacy/bridgeLegacy.js
index 04c7819b..fbcf6273 100644
--- a/lib/extension/legacy/bridgeLegacy.js
+++ b/lib/extension/legacy/bridgeLegacy.js
@@ -3,13 +3,13 @@ const logger = require('../../util/logger');
 const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
 const utils = require('../../util/utils');
 const assert = require('assert');
-const BaseExtension = require('../baseExtension');
+const Extension = require('../Extension');
 
 const configRegex =
     new RegExp(`${settings.get().mqtt.base_topic}/bridge/config/((?:\\w+/get)|(?:\\w+/factory_reset)|(?:\\w+))`);
 const allowedLogLevels = ['error', 'warn', 'info', 'debug'];
 
-class BridgeLegacy extends BaseExtension {
+class BridgeLegacy extends Extension {
     constructor(zigbee, mqtt, state, publishEntityState, eventBus) {
         super(zigbee, mqtt, state, publishEntityState, eventBus);
 
diff --git a/lib/extension/legacy/deviceGroupMembership.js b/lib/extension/legacy/deviceGroupMembership.js
index 7280fd69..0fe7d534 100644
--- a/lib/extension/legacy/deviceGroupMembership.js
+++ b/lib/extension/legacy/deviceGroupMembership.js
@@ -1,11 +1,11 @@
 /* istanbul ignore file */
 const settings = require('../../util/settings');
 const logger = require('../../util/logger');
-const BaseExtension = require('../baseExtension');
+const Extension = require('../Extension');
 
 const topicRegex = new RegExp(`^${settings.get().mqtt.base_topic}/bridge/device/(.+)/get_group_membership$`);
 
-class DeviceGroupMembership extends BaseExtension {
+class DeviceGroupMembership extends Extension {
     onMQTTConnected() {
         for (let step = 1; step < 20; step++) {
             const topic = `${settings.get().mqtt.base_topic}/bridge/device/${'+/'.repeat(step)}get_group_membership`;
diff --git a/lib/extension/legacy/softReset.js b/lib/extension/legacy/softReset.js
index 5701bdce..8cc6d7a3 100644
--- a/lib/extension/legacy/softReset.js
+++ b/lib/extension/legacy/softReset.js
@@ -3,12 +3,12 @@
 const settings = require('../../util/settings');
 const logger = require('../../util/logger');
 const utils = require('../../util/utils');
-const BaseExtension = require('../baseExtension');
+const Extension = require('../Extension');
 
 /**
  * This extensions soft resets the ZNP after a certain timeout.
  */
-class SoftReset extends BaseExtension {
+class SoftReset extends Extension {
     constructor(zigbee, mqtt, state, publishEntityState, eventBus) {
         super(zigbee, mqtt, state, publishEntityState, eventBus);
         this.timer = null;
diff --git a/lib/extension/networkMap.js b/lib/extension/networkMap.js
index 18c15593..8718e8b9 100644
--- a/lib/extension/networkMap.js
+++ b/lib/extension/networkMap.js
@@ -2,9 +2,9 @@ const settings = require('../util/settings');
 const utils = require('../util/utils');
 const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
 const logger = require('../util/logger');
-const BaseExtension = require('./baseExtension');
+const Extension = require('./extension');
 
-class NetworkMap extends BaseExtension {
+class NetworkMap extends Extension {
     constructor(zigbee, mqtt, state, publishEntityState, eventBus) {
         super(zigbee, mqtt, state, publishEntityState, eventBus);
 
diff --git a/lib/extension/otaUpdate.js b/lib/extension/otaUpdate.js
index e285337d..722fc967 100644
--- a/lib/extension/otaUpdate.js
+++ b/lib/extension/otaUpdate.js
@@ -2,10 +2,10 @@ const settings = require('../util/settings');
 const logger = require('../util/logger');
 const assert = require('assert');
 const topicRegex = new RegExp(`^${settings.get().mqtt.base_topic}/bridge/ota_update/.+$`);
-const BaseExtension = require('./baseExtension');
+const Extension = require('./extension');
 const MINUTES_10 = 1000 * 60 * 10;
 
-class OTAUpdate extends BaseExtension {
+class OTAUpdate extends Extension {
     constructor(zigbee, mqtt, state, publishEntityState, eventBus) {
         super(zigbee, mqtt, state, publishEntityState, eventBus);
         this.inProgress = new Set();