rasperrypi-home/hassio-plejd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up events and subscriptions

Browse source
This commit is contained in:
Victor Hagelbäck 2021-02-20 15:33:06 +01:00
parent 0dbe0bb95f
commit 50d664c933
6 changed files with 117 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

27
plejd/PlejdBLEHandler.js
View file

@ -62,6 +62,8 @@ class PlejBLEHandler extends EventEmitter {
connected: 'connected',
reconnecting: 'reconnecting',
commandReceived: 'commandReceived',
writeFailed: 'writeFailed',
writeSuccess: 'writeSuccess',
};
constructor(deviceRegistry) {
@ -80,14 +82,30 @@ class PlejBLEHandler extends EventEmitter {
auth: null,
ping: null,
};
}
this.on('writeFailed', (error) => this._onWriteFailed(error));
this.on('writeSuccess', () => this._onWriteSuccess());
cleanup() {
this.removeAllListeners(PlejBLEHandler.EVENTS.writeFailed);
this.removeAllListeners(PlejBLEHandler.EVENTS.writeSuccess);
if (this.bus) {
this.bus.removeAllListeners('error');
this.bus.removeAllListeners('connect');
}
if (this.characteristics.lastDataProperties) {
this.characteristics.lastDataProperties.removeAllListeners('PropertiesChanged');
}
if (this.objectManager) {
this.objectManager.removeAllListeners('InterfacesAdded');
}
}
async init() {
logger.info('init()');
this.on(PlejBLEHandler.EVENTS.writeFailed, (error) => this._onWriteFailed(error));
this.on(PlejBLEHandler.EVENTS.writeSuccess, () => this._onWriteSuccess());
this.bus = dbus.systemBus();
this.bus.on('error', (err) => {
// Uncaught error events will show UnhandledPromiseRejection logs
@ -276,6 +294,7 @@ class PlejBLEHandler extends EventEmitter {
async _getInterface() {
const bluez = await this.bus.getProxyObject(BLUEZ_SERVICE_NAME, '/');
this.objectManager = await bluez.getInterface(DBUS_OM_INTERFACE);
// We need to find the ble interface which implements the Adapter1 interface
@ -404,13 +423,12 @@ class PlejBLEHandler extends EventEmitter {
async _onInterfacesAdded(path, interfaces) {
logger.silly(`Interface added ${path}, inspecting...`);
// const [adapter, dev, service, characteristic] = path.split('/').slice(3);
const interfaceKeys = Object.keys(interfaces);
if (interfaceKeys.indexOf(BLUEZ_DEVICE_ID) > -1) {
if (interfaces[BLUEZ_DEVICE_ID].UUIDs.value.indexOf(PLEJD_SERVICE) > -1) {
logger.debug(`Found Plejd service on ${path}`);
this.objectManager.removeAllListeners('InterfacesAdded');
await this._initDiscoveredPlejdDevice(path);
} else {
logger.error('Uh oh, no Plejd device!');
@ -452,6 +470,7 @@ class PlejBLEHandler extends EventEmitter {
// eslint-disable-next-line no-constant-condition
while (true) {
try {
this.cleanup();
await delay(5000);
this.emit(PlejBLEHandler.EVENTS.reconnecting);
logger.info('Reconnecting BLE...');