From 07229c7925bdcc13c373ed0b76a8be59bc749d8c Mon Sep 17 00:00:00 2001 From: mmcwilliams Date: Tue, 26 Nov 2019 22:10:59 -0500 Subject: [PATCH] Refactored wifi and ble into typescript and converted logic to async/await for most methods. Compiles without errors ATM. --- lib/ble/index.js | 9 ++++----- lib/ble/index.js.map | 2 +- lib/wifi/index.js | 6 +++--- lib/wifi/index.js.map | 2 +- src/ble/index.ts | 21 ++++++++++++--------- src/wifi/index.ts | 4 ++-- 6 files changed, 23 insertions(+), 21 deletions(-) diff --git a/lib/ble/index.js b/lib/ble/index.js index bf23506..fc5b665 100644 --- a/lib/ble/index.js +++ b/lib/ble/index.js @@ -161,6 +161,7 @@ class BLE { * @constructor */ constructor(bleGetState) { + this.listeners = {}; log.info('Starting bluetooth service'); getState = bleGetState; bleno_1.default.on('stateChange', state => { @@ -209,7 +210,6 @@ class BLE { let result = {}; let utf8; let obj; - let fn; if (offset) { log.warn(`Offset scenario`); result = bleno_1.default.Characteristic.RESULT_ATTR_NOT_LONG; @@ -218,9 +218,8 @@ class BLE { utf8 = data.toString('utf8'); obj = JSON.parse(utf8); result = bleno_1.default.Characteristic.RESULT_SUCCESS; - fn = `_on${capitalize(obj.type)}`; - if (obj.type && this[fn]) { - return this[fn](obj, () => { + if (obj.type && this.listeners[obj.type]) { + return this.listeners[obj.type](obj, () => { callback(result); }); } @@ -241,7 +240,7 @@ class BLE { * @param {function} callback Invoked when the event is triggered */ on(eventName, callback) { - this[`_on${capitalize(eventName)}`] = callback; + this.listeners[eventName] = callback; } } module.exports = BLE; diff --git a/lib/ble/index.js.map b/lib/ble/index.js.map index a9bd41f..21ca73c 100644 --- a/lib/ble/index.js.map +++ b/lib/ble/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ble/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ble/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/wifi/index.js b/lib/wifi/index.js index fb029c7..d4a3e68 100644 --- a/lib/wifi/index.js +++ b/lib/wifi/index.js @@ -9,7 +9,7 @@ const iwlist = '/sbin/iwlist wlan0 scanning | grep "ESSID:"'; const iwgetid = '/sbin/iwgetid'; const log = require('../log')('wifi'); const child_process_1 = require("child_process"); -const fs_1 = require("fs"); +const fs_extra_1 = require("fs-extra"); /** Class representing the wifi features */ class Wifi { constructor() { @@ -59,7 +59,7 @@ class Wifi { let parsed; let current; try { - data = await fs_1.readFile(filePath, 'utf8'); + data = await fs_extra_1.readFile(filePath, 'utf8'); } catch (err) { log.error('_readConfig', err); @@ -85,7 +85,7 @@ class Wifi { */ async _writeConfig(data) { try { - await fs_1.writeFile(filePath, data, { encoding: 'utf-8' }); + await fs_extra_1.writeFile(filePath, data, 'utf8'); } catch (err) { log.error('_readConfigCb', err); diff --git a/lib/wifi/index.js.map b/lib/wifi/index.js.map index 60c1c64..0d18d4f 100644 --- a/lib/wifi/index.js.map +++ b/lib/wifi/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/wifi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/wifi/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/ble/index.ts b/src/ble/index.ts index 257fcca..d5685ca 100644 --- a/src/ble/index.ts +++ b/src/ble/index.ts @@ -183,8 +183,11 @@ function capitalize (str : string) { return str[0].toUpperCase() + str.slice(1) } +type functionKeys = "_onRead" | "_onWrite"; + /** Class representing the bluetooth interface */ class BLE { + listeners : any = {} /** * Establishes Bluetooth Low Energy services, accessible to process through this class * @@ -228,6 +231,7 @@ class BLE { this._refreshWifi() } + private async _refreshWifi () { let ssid : string @@ -241,11 +245,11 @@ class BLE { currentAddr = getIp() log.info('wifi.getNetwork', {ssid : ssid, ip : currentAddr }) } + private _onWrite (data : any, offset : number, withoutResponse : Function, callback : Function) { - let result = {} - let utf8 - let obj - let fn + let result : any = {} + let utf8 : string + let obj : any if (offset) { log.warn(`Offset scenario`) @@ -256,17 +260,16 @@ class BLE { utf8 = data.toString('utf8') obj = JSON.parse(utf8) result = bleno.Characteristic.RESULT_SUCCESS - fn = `_on${capitalize(obj.type)}` - if (obj.type && this[fn]) { - return this[fn](obj, () => { + if (obj.type && this.listeners[obj.type]) { + return this.listeners[obj.type](obj, () => { callback(result) }) } else { return callback(result) } - } + private _onRead (offset : number, callback : Function) { const result = bleno.Characteristic.RESULT_SUCCESS const state = getState() @@ -280,7 +283,7 @@ class BLE { * @param {function} callback Invoked when the event is triggered */ on (eventName : string, callback : Function) { - this[`_on${capitalize(eventName)}`] = callback + this.listeners[eventName] = callback } } diff --git a/src/wifi/index.ts b/src/wifi/index.ts index e5d2d38..3181f9c 100644 --- a/src/wifi/index.ts +++ b/src/wifi/index.ts @@ -11,7 +11,7 @@ const iwgetid : string = '/sbin/iwgetid' const log : any = require('../log')('wifi') import { exec } from 'child_process' -import { readFile, writeFile } from 'fs' +import { readFile, writeFile } from 'fs-extra' import { reject } from 'q' interface Network { @@ -97,7 +97,7 @@ export class Wifi { */ private async _writeConfig (data : string) { try { - await writeFile(filePath, data, { encoding : 'utf-8' }) + await writeFile(filePath, data, 'utf8') } catch (err) { log.error('_readConfigCb', err) throw err