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

Merge pull request #137 from JohnPhoto/lifecycle-fixes

Browse source 
multiple fixes for improved lifecycle and errors
This commit is contained in:
Marcus Westin 2021-01-13 21:39:36 +01:00 • committed by GitHub
commit fe8d2b84f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

38
plejd/ble.bluez.js
View file

@ -60,6 +60,7 @@ class PlejdService extends EventEmitter {
this.writeQueueWaitTime = writeQueueWaitTime; this.writeQueueWaitTime = writeQueueWaitTime;
this.writeQueue = []; this.writeQueue = [];
this.writeQueueRef = null; this.writeQueueRef = null;
this.delayedInit = null;
this.maxQueueLengthTarget = MAX_WRITEQUEUE_LENGTH_TARGET || this.devices.length || 5; this.maxQueueLengthTarget = MAX_WRITEQUEUE_LENGTH_TARGET || this.devices.length || 5;
logger('Max global transition queue length target', this.maxQueueLengthTarget) logger('Max global transition queue length target', this.maxQueueLengthTarget)
@ -85,6 +86,7 @@ class PlejdService extends EventEmitter {
this.objectManager.removeAllListeners(); this.objectManager.removeAllListeners();
} }
this.bleDevices = [];
this.connectedDevice = null; this.connectedDevice = null;
this.characteristics = { this.characteristics = {
@ -96,7 +98,7 @@ class PlejdService extends EventEmitter {
}; };
clearInterval(this.pingRef); clearInterval(this.pingRef);
clearInterval(this.writeQueueRef); clearTimeout(this.writeQueueRef);
console.log('init()'); console.log('init()');
const bluez = await this.bus.getProxyObject(BLUEZ_SERVICE_NAME, '/'); const bluez = await this.bus.getProxyObject(BLUEZ_SERVICE_NAME, '/');
@ -146,10 +148,7 @@ class PlejdService extends EventEmitter {
console.log('plejd-ble: error: failed to start discovery. Make sure no other add-on is currently scanning.'); console.log('plejd-ble: error: failed to start discovery. Make sure no other add-on is currently scanning.');
return; return;
} }
return new Promise(resolve => setTimeout(() => resolve(this._internalInit()), this.connectionTimeout * 1000));
setTimeout(async () => {
await this._internalInit();
}, this.connectionTimeout * 1000);
} }
async _internalInit() { async _internalInit() {
@ -370,8 +369,8 @@ class PlejdService extends EventEmitter {
} }
// auth done, start ping // auth done, start ping
await this.startPing(); this.startPing();
await this.startWriteQueue(); this.startWriteQueue();
// After we've authenticated, we need to hook up the event listener // After we've authenticated, we need to hook up the event listener
// for changes to lastData. // for changes to lastData.
@ -379,8 +378,20 @@ class PlejdService extends EventEmitter {
this.characteristics.lastData.StartNotify(); this.characteristics.lastData.StartNotify();
} }
async throttledInit(delay) {
if(this.delayedInit){
return this.delayedInit;
}
this.delayedInit = new Promise((resolve) => setTimeout(async () => {
const result = await this.init();
this.delayedInit = null;
resolve(result)
}, delay))
return this.delayedInit;
}
async write(data, retry = true) { async write(data, retry = true) {
if (!this.plejdService || !this.characteristics.data) { if (!data || !this.plejdService || !this.characteristics.data) {
return; return;
} }
@ -393,20 +404,17 @@ class PlejdService extends EventEmitter {
setTimeout(() => this.write(data, retry), 1000); setTimeout(() => this.write(data, retry), 1000);
return; return;
} }
console.log('plejd-ble: write failed ' + err); console.log('plejd-ble: write failed ' + err);
setTimeout(async () => { await this.throttledInit(this.connectionTimeout * 1000);
await this.init();
if(retry){ if(retry){
logger('reconnected and retrying to write'); logger('reconnected and retrying to write');
await this.write(data, false); await this.write(data, false);
} }
}, this.connectionTimeout * 1000);
} }
} }
async startPing() { startPing() {
console.log('startPing()'); console.log('startPing()');
clearInterval(this.pingRef); clearInterval(this.pingRef);
@ -452,9 +460,9 @@ class PlejdService extends EventEmitter {
this.emit('pingSuccess', pong[0]); this.emit('pingSuccess', pong[0]);
} }
async startWriteQueue() { startWriteQueue() {
console.log('startWriteQueue()'); console.log('startWriteQueue()');
clearInterval(this.writeQueueRef); clearTimeout(this.writeQueueRef);
this.writeQueueRef = setTimeout(() => this.runWriteQueue(), this.writeQueueWaitTime); this.writeQueueRef = setTimeout(() => this.runWriteQueue(), this.writeQueueWaitTime);
} }