Pass an intval.state object into ble lib

index.js

@@ -4,7 +4,7 @@ const restify = require('restify')
 const log = require('./lib/log')('main')
 const fs = require('fs')
 
-const ble = require('./lib/ble')
+const BLE = require('./lib/ble')
 const intval = require('./lib/intval')
 const sequence = require('./lib/sequence')
 
@@ -18,6 +18,8 @@ let app = restify.createServer({
 	version: '0.0.1'
 })
 
+let ble
+
 function createServer () {
 	app.use(restify.plugins.queryParser())
 	app.use(restify.plugins.bodyParser({ mapParams: false }))
@@ -287,6 +289,10 @@ function index (req, res, next) {
 	})
 }
 
+function bleGetState () {
+	return intval.state
+}
+
 function init () {
 	createServer()
 
@@ -294,6 +300,7 @@ function init () {
 		console.log(str)
 	})
 	intval.init()
+	ble = new BLE(bleGetState)
 }
 
 init()

lib/ble/index.js

@@ -19,6 +19,7 @@ const NETWORK = os.networkInterfaces()
 const MAC = getMac() || spoofMac()
 
 let currentWifi = 'disconnected'
+let getState
 
 const chars = []
 
@@ -123,9 +124,11 @@ class BLE {
 	*
 	* @constructor
 	*/
-	constructor () {
+	constructor (bleGetState) {
 		log.info('Starting bluetooth service')
 
+		getState = bleGetState
+
 		bleno.on('stateChange', state  => {
 			const BLE_ID = `${DEVICE_ID}_${MAC}`
 			log.info('stateChange', { state : state })
@@ -159,7 +162,7 @@ class BLE {
 		})
 	}
 	_onWrite (data, offset, withoutResponse, callback) {
-		let result
+		let result = {}
 		let utf8
 		let obj
 		if (offset) {
@@ -168,6 +171,7 @@ class BLE {
 	    	return callback(result)
 	 	}
 	 	utf8 = data.toString('utf8')
+
  		obj = JSON.parse(utf8)
  		console.dir(obj)
 	 	result = bleno.Characteristic.RESULT_SUCCESS
@@ -175,6 +179,7 @@ class BLE {
 	}
 	_onRead (offset, callback) {
 		const result = bleno.Characteristic.RESULT_SUCCESS
+		const state = getState()
 		const data = new Buffer(JSON.stringify( { success : true } ))
 		callback(result, data.slice(offset, data.length))
 	}
@@ -187,6 +192,7 @@ class BLE {
 	on (eventName, callback) {
 		this[`_on${capitalize(eventName)}`] = callback
 	}
+
 }
 
-module.exports = new BLE()
+module.exports = BLE