bt-sensors-plugin-sk 1.2.5 → 1.2.6-beta-1

package/index.js

@@ -7,10 +7,10 @@ const {bluetooth, destroy} = createBluetooth()
 
 const BTSensor = require('./BTSensor.js')
 const BLACKLISTED = require('./sensor_classes/BlackListedDevice.js')
+const OutOfRangeDevice = require("./OutOfRangeDevice.js")
 const { createChannel, createSession } = require("better-sse");
 const { clearTimeout } = require('timers')
 const loadClassMap = require('./classLoader.js')
-
 class MissingSensor  {
 
 	constructor(config){
@@ -20,6 +20,7 @@ class MissingSensor  {
 		this.addDefaultPath=BTSensor.prototype.addDefaultPath.bind(this)
 		this.addDefaultParam=BTSensor.prototype.addDefaultParam.bind(this)
 		this.getPath=BTSensor.prototype.getPath.bind(this)
+		this.getImageSrc=BTSensor.prototype.getImageSrc.bind(this)
 
 		this.getJSONSchema = BTSensor.prototype.getJSONSchema.bind(this)
 		this.initSchema = BTSensor.prototype.initSchema.bind(this)
@@ -131,10 +132,11 @@ module.exports =   function (app) {
 	var adapter 
 	const channel = createChannel()
 
-	const classMap = loadClassMap(app)
 	const sensorMap=new Map()
 
 	plugin.start = async function (options, restartPlugin) {
+	const classMap = loadClassMap(app)
+
 		plugin.started=true
 		var adapterID=options.adapter
 		var foundConfiguredDevices=0
@@ -155,9 +157,37 @@ module.exports =   function (app) {
 		}
 
 		plugin.registerWithRouter = function(router) {
+			router.get('/getSensorInfo', async (req, res) => {
+				const _sensor = sensorMap.get(req.query?.mac_address)
+				const _class = classMap.get(req.query?.class)
+				let _tempSensor = null
+				if (_sensor &&_class && _sensor instanceof classMap.get("UNKNOWN")){
+					try {
+
+						_tempSensor = new _class ( _sensor.device )
+						_tempSensor.currentProperties=_sensor.currentProperties
+						_tempSensor.debug = app.debug
+						_tempSensor._adapter=adapter
+						await _tempSensor.init()
+						const _json = sensorToJSON(_tempSensor)
+						res.status(200).json(_json)
+					} catch (e){
+						res.status(400).send(`Invalid request: ${e.message}`)
+					}
+					finally{
+						if (_tempSensor)
+							_tempSensor.stopListening()						
+					}
+				} else{
+					res.status(404).json({message: `Invalid request`})
+	
+				}
+			})
 
 			router.post('/updateSensorData', async (req, res) => {
 				app.debug(req.body)
+				const sensor = sensorMap.get(req.body.mac_address)
+				sensor.prepareConfig(req.body)
 				const i = deviceConfigs.findIndex((p)=>p.mac_address==req.body.mac_address) 
 				if (i<0){
 					if (!options.peripherals){
@@ -175,7 +205,6 @@ module.exports =   function (app) {
 					options, async () => {
 						app.debug('Plugin options saved')
 						res.status(200).json({message: "Sensor updated"})
-						const sensor = sensorMap.get(req.body.mac_address)
 						if (sensor) {
 							removeSensorFromList(sensor)
 							if (sensor.isActive()) 
@@ -226,12 +255,6 @@ module.exports =   function (app) {
 					}
 				)
 			});
-			router.get('/getDomains', (req, res) => {
-				
-				res.status(200).json(
-					BTSensor.SensorDomains
-				);
-			})
 		
 			router.get('/getBaseData', (req, res) => {
 				
@@ -248,6 +271,8 @@ module.exports =   function (app) {
 					}
 				);
 			})
+
+
 			router.get('/getSensors', (req, res) => {
 				app.debug("Sending sensors")
 				const t = sensorsToJSON()
@@ -293,6 +318,7 @@ module.exports =   function (app) {
 
 			return { mac: sensor.getMacAddress(),
 				     name: sensor.getName(),
+					 class: sensor.constructor.name,
 					 domain: sensor.getDomain().name,
 					 RSSI: sensor.getRSSI(),
 					 signalStrength: sensor.getSignalStrength(),
@@ -304,10 +330,12 @@ module.exports =   function (app) {
 			const config = getDeviceConfig(sensor.getMacAddress())
 			const schema = sensor.getJSONSchema()
 			schema.htmlDescription = sensor.getDescription()
+			
 			return {
 					info: getSensorInfo(sensor),
 					schema: schema,
-					config: config?config:{}
+					config: config?config:{},
+					configCopy: JSON.parse(JSON.stringify(config?config:{}))
 				}
 		}
 
@@ -388,9 +416,25 @@ module.exports =   function (app) {
 					resolve(s)
 				}
 			})
-			.catch((e)=>{
+			.catch(async (e)=>{
 				if (s)
 					s.stopListening()
+				else{
+					const device = new OutOfRangeDevice(adapter, config)
+					const c = await getClassFor(device,config)
+					if (c.domain==BTSensor.SensorDomains.beacons || c.IsRoaming){
+						s = await instantiateSensor(device,config)
+						device.once("deviceFound",async (device)=>{
+								s.device=device
+								s.listen()
+								s.activate(config, plugin)
+								removeSensorFromList(s)
+								addSensorToList(s)
+						})
+						addSensorToList(s)
+						resolve(s)
+					}
+				}
 				if (startNumber == starts ) {
 					app.debug(`Unable to communicate with device ${deviceNameAndAddress(config)} Reason: ${e?.message??e}`)
 					app.debug(e)
@@ -428,9 +472,11 @@ module.exports =   function (app) {
 				c.debug=app.debug
 				
 				const sensor = new c(device, config?.params, config?.gattParams)
+				sensor._paths=config.paths //this might be a good candidate for refactoring
 				sensor.debug=app.debug
 				sensor.setPluginError=app.setPluginError
 				sensor.app=app
+				if (!adapter) debugger
 				sensor._adapter=adapter //HACK!
 				await sensor.init()				
 				return sensor
@@ -455,7 +501,7 @@ module.exports =   function (app) {
 				if (startNumber != starts ) {
 						return
 				}	
-				if (deviceConfig.active) {
+				if (deviceConfig.active && !(sensor.device instanceof OutOfRangeDevice) ) {
 					app.setPluginStatus(`Listening to ${++foundConfiguredDevices} sensors.`);
 					sensor.activate(deviceConfig, plugin)
 				}

package/package.json

@@ -1,19 +1,21 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.2.5",
+  "version": "1.2.6-beta-1",
   "description": "Bluetooth Sensors for Signalk - see https://www.npmjs.com/package/bt-sensors-plugin-sk#supported-sensors for a list of supported sensors",
   "main": "index.js",
-  "dependencies": { 
-    "@rjsf/bootstrap-4": "^5.24.11",
+  "dependencies": {
+    "@rjsf/bootstrap-4": "^5.24.12",
     "@rjsf/core": "^5.24.11",
     "@rjsf/utils": "^5.24.11",
     "@rjsf/validator-ajv8": "^5.24.11",
     "better-sse": "^0.14.1",
+    "buffer": "^6.0.3",
     "dbus-next": "^0.10.2",
     "int24": "^0.0.1",
-    "kaitai-struct": "^0.10.0", 
+    "kaitai-struct": "^0.10.0",
     "node-ble": "^1.13.0",
-    "semver": "^7.7.1"
+    "semver": "^7.7.1",
+    "lru-cache": "^11.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",
@@ -33,9 +35,9 @@
     "mocha": "^8.0.1",
     "prettier-standard": "^6.0.0",
     "react": "^16.13.1",
-    "react-html-parser":"^2.0.2",
     "react-bootstrap": "^1.6.5",
     "react-dom": "^16.13.1",
+    "react-html-parser": "^2.0.2",
     "react-markdown": "^4.3.1",
     "react-redux": "^5.1.2",
     "react-select": "^3.1.0",