bt-sensors-plugin-sk 1.2.0-beta.0.0.9 → 1.2.0-beta.0.1.1

package/BTSensor.js

@@ -102,7 +102,14 @@ function preparePath(obj, str) {
 class BTSensor extends EventEmitter {
  
     static DEFAULTS = require('./plugin_defaults.json');
-    
+
+    static SensorDomains={
+        unknown: { name: "unknown", description: "Unknown sensor domain "},
+        environmental: { name: "environmental", description: "Sensors that measure environmental conditions - air temperature, humidity etc."},
+        electrical: { name: "electrical", description: "Electrical sensor - chargers, batteries, inverters etc."},
+        tanks: { name: "tanks", description: "Sensors that measure level in tanks (gas, propane, water etc.) "}
+    }
+    static Domain = this.SensorDomains.unknown   
     /**
      * 
      * @param {module:node-ble/Device} device 
@@ -404,7 +411,8 @@ class BTSensor extends EventEmitter {
             path.type="string"
 
         if (!path.pattern)
-            path.pattern="^(?:[^{}\\s]*\\{[a-zA-Z0-9]+\\}[^{}\\s]*|[^{}\\s]*)$"
+            path.pattern=//"^(?:[^{}\\s]*\\{[a-zA-Z0-9]+\\}[^{}\\s]*|[^{}\\s]*)$"
+                "^((\\{[a-zA-Z0-9]+\\}|[a-zA-Z0-9]+))(\\.(\\{[a-zA-Z0-9]+\\}|[a-zA-Z0-9]+))*$"
         this._schema.properties.paths.properties[tag]=path
         return this._schema.properties.paths.properties[tag]
     }
@@ -644,6 +652,10 @@ class BTSensor extends EventEmitter {
         return this._state
     }
 
+    getDomain(){
+        return this.constructor.Domain
+    }
+
     isActive(){
         return this._state=="ACTIVE"
     }

package/README.md

@@ -1,6 +1,19 @@
 # Bluetooth Sensors for [Signal K](http://www.signalk.org)
 
 ## What's New
+## 1.2.0-beta-0.1.1
+
+Gobius fix for inclination path, id parameter.
+
+## 1.2.0-beta-0.1.0
+
+Sensors on config page appear under tabs indicating their domain (Environmental, Electrical etc.)
+
+Gobius C tank meter support added.
+
+## 1.2.0-beta-0.0.10
+
+Better handling of plugin config screen when Disabled
 
 ## 1.2.0-beta-0.0.9
 

package/bt-sensors-plugin-sk.json.bak

@@ -0,0 +1,121 @@
+{
+  "configuration": {
+    "discoveryTimeout": 30,
+    "discoveryInterval": 0,
+    "peripherals": [
+      {
+        "active": true,
+        "mac_address": "D4:50:46:39:38:C5",
+        "discoveryTimeout": 30,
+        "params": {
+          "name": "Victron Smart Shunt",
+          "encryptionKey": "8cce8529307cf9dd0c85611c4fef42d9"
+        },
+        "paths": {
+          "RSSI": "sensors.smartshunt.rssi",
+          "current": "electrical.battery.house.current",
+          "power": "electrical.battery.house.power",
+          "voltage": "electrical.battery.house.voltage",
+          "alarm": "electrical.battery.house.alarm",
+          "consumed": "electrical.battery.house.consumedAh",
+          "soc": "electrical.battery.house.soc",
+          "ttg": "electrical.battery.house.ttg",
+          "starterVoltage": "electrical.battery.starter.voltage",
+          "__state__": "sensors.smartshunt.state"
+        },
+        "gattParams": {
+          "useGATT": false
+        }
+      },
+      {
+        "active": true,
+        "mac_address": "F9:B0:6E:63:BC:7E",
+        "discoveryTimeout": 30,
+        "params": {
+          "name": "Ruuvi sensor for cabin"
+        },
+        "paths": {
+          "RSSI": "sensors.ruuviBC7E.rssi",
+          "temp": "environment.cabin.temperature",
+          "humidity": "environment.cabin.humidity",
+          "pressure": "environment.cabin.pressure",
+          "battV": "sensors.ruuviBC7E.voltage",
+          "mc": "sensors.ruuviBC7E.movementCounter",
+          "battery": "sensors.temperature.reefer.batterystrength",
+          "__state__": "sensors.ruuviBC7E.state"
+        }
+      },
+      {
+        "active": true,
+        "mac_address": "49:22:05:17:2B:AE",
+        "discoveryTimeout": 120,
+        "params": {
+          "name": "Inkbird temperature sensor"
+        },
+        "paths": {
+          "RSSI": "sensors.inkbird-th2.rssi",
+          "temp": "environment.refrigerator.temperature",
+          "battery": "sensors.inkbird-th2.battery",
+          "__state__": "sensors.inkbird-th2.state"
+        }
+      },
+      {
+        "active": true,
+        "mac_address": "A4:C1:38:9F:F7:7E",
+        "discoveryTimeout": 300,
+        "params": {
+          "name": "ATC Temp/Humidity sensor for Deck",
+          "parser": "ATC-LE"
+        },
+        "paths": {
+          "RSSI": "sensors.ATC_9FF77E.rssi",
+          "temp": "environment.deck.temperature",
+          "humidity": "environment.deck.humidity",
+          "voltage": "sensors.ATC_9FF77E.voltage",
+          "batteryStrength": "sensors.ATC_9FF77E.batteryStrength",
+          "__state__": "sensors.ATC_9FF77E.state"
+        }
+      },
+      {
+        "active": true,
+        "mac_address": "D4:40:59:BE:2A:8C",
+        "discoveryTimeout": 30,
+        "params": {
+          "medium": "PROPANE",
+          "tankHeight": "304.8",
+          "name": "Galley propane level"
+        },
+        "paths": {
+          "RSSI": "sensors.mopeka-59be8c.rssi",
+          "battVolt": "sensors.mopeka-59be8c.battery.voltage",
+          "battStrength": "sensors.mopeka-59be8c.battery.strength",
+          "temp": "sensors.mopeka-59be8c.temperature",
+          "tankLevel": "sensors.mopeka-59be8c.tankLevel",
+          "readingQuality": "sensors.mopeka-59be8c.quality",
+          "__state__": "sensors.mopeka-59be8c.state"
+        }
+      },
+      {
+        "active": true,
+        "mac_address": "A4:C1:38:3E:7E:94",
+        "discoveryTimeout": 30,
+        "params": {
+          "encryptionKey": "3985f4ebc032f276cc316f1f6ecea085",
+          "__state__": "sensors.xiaomi.state"
+        },
+        "paths": {
+          "RSSI": "sensors.xiaomi.rssi",
+          "temp": "sensors.xiaomi.temp",
+          "humidity": "sensors.xiaomi.humidity",
+          "voltage": "sensors.xiaomi.voltage",
+          "__state__": "sensors.xiaomi.state"
+        },
+        "gattParams": {
+          "useGATT": false
+        }
+      }
+    ]
+  },
+  "enabled": true,
+  "enableDebug": true
+}

package/classLoader.js

@@ -0,0 +1,38 @@
+const fs = require('fs')
+const path = require('path')
+const semver = require('semver')
+
+    function loadClasses (dir, ext='.js')
+        {
+            const classMap = new Map()
+            const classFiles = fs.readdirSync(dir)
+            .filter(file => file.endsWith(ext));
+        
+            classFiles.forEach(file => {
+                const filePath = path.join(dir, file);
+                const cls = require(filePath);
+                classMap.set(cls.name, cls);
+            })
+            return classMap
+        }
+
+      function loadClassMap(app) {
+        const _classMap = loadClasses(path.join(__dirname, 'sensor_classes'))
+        const classMap = new Map([..._classMap].filter(([k, v]) => !k.startsWith("_") ))
+        const libPath = app.config.appPath +(
+            semver.gt(app.config.version,"2.13.5")?"dist":"lib"
+        )
+        import(libPath+"/modules.js").then( (modulesjs)=>{
+        const { default:defaultExport} = modulesjs
+            const modules = defaultExport.modulesWithKeyword(app.config, "signalk-bt-sensor-class")
+            modules.forEach((module)=>{
+                module.metadata.classFiles.forEach((classFile)=>{
+                    const cls = require(module.location+module.module+"/"+classFile);
+                    classMap.set(cls.name, cls);
+                })
+            })
+            classMap.get('UNKNOWN').classMap=new Map([...classMap].sort().filter(([k, v]) => !v.isSystem )) // share the classMap with Unknown for configuration purposes
+        })
+        return classMap
+    }
+    module.exports=loadClassMap

package/index.js

@@ -1,7 +1,3 @@
-const fs = require('fs')
-const util = require('util')
-const path = require('path')
-const semver = require('semver')
 const packageInfo = require("./package.json")
 
 const {createBluetooth} = require('node-ble')
@@ -12,10 +8,10 @@ const BTSensor = require('./BTSensor.js')
 const BLACKLISTED = require('./sensor_classes/BlackListedDevice.js')
 const { createChannel, createSession } = require("better-sse");
 const { clearTimeout } = require('timers')
+const loadClassMap = require('./classLoader.js')
 
 class MissingSensor  {
 
-
 	constructor(config){
 		this.config=config
 		this.addPath=BTSensor.prototype.addPath.bind(this)
@@ -27,6 +23,7 @@ class MissingSensor  {
 		this.getJSONSchema = BTSensor.prototype.getJSONSchema.bind(this)
 		this.initSchema = BTSensor.prototype.initSchema.bind(this)
 
+
 		this.initSchema()
 		var keys = Object.keys(config?.paths??{})
 
@@ -62,6 +59,9 @@ class MissingSensor  {
 	getMacAddress(){
 		return this.mac_address
 	}
+	getDomain(){
+		return BTSensor.SensorDomains.unknown
+	}
 	getDescription(){
 		return ""
 	}
@@ -88,66 +88,14 @@ class MissingSensor  {
 
 }
 module.exports =   function (app) {
-	var adapterID = 'hci0'
-	
-
 	var deviceConfigs
 	var starts=0
-	var classMap
-	
-	var utilities_sk
 	
 	var plugin = {};
 	plugin.id = 'bt-sensors-plugin-sk';
 	plugin.name = 'BT Sensors plugin';
 	plugin.description = 'Plugin to communicate with and update paths to BLE Sensors in Signalk';
 	
-	//Try and load utilities-sk NOTE: should be installed from App Store-- 
-	//But there's a fail safe because I'm a reasonable man.
-
-	utilities_sk = {
-		loadClasses: function(dir, ext='.js')
-		{
-			const classMap = new Map()
-			const classFiles = fs.readdirSync(dir)
-			.filter(file => file.endsWith(ext));
-		
-			classFiles.forEach(file => {
-				const filePath = path.join(dir, file);
-				const cls = require(filePath);
-				classMap.set(cls.name, cls);
-			})
-			return classMap
-		}
-	}
-
-	function sleep(x) {
-		return new Promise((resolve) => {
-		  setTimeout(() => {
-			resolve(x);
-		  }, x);
-		});
-	  }
-	
-	  function loadClassMap() {
-		const _classMap = utilities_sk.loadClasses(path.join(__dirname, 'sensor_classes'))
-		classMap = new Map([..._classMap].filter(([k, v]) => !k.startsWith("_") ))
-		const libPath = app.config.appPath +(
-			semver.gt(app.config.version,"2.13.5")?"dist":"lib"
-		)
-		import(libPath+"/modules.js").then( (modulesjs)=>{
-		const { default:defaultExport} = modulesjs
-			const modules = defaultExport.modulesWithKeyword(app.config, "signalk-bt-sensor-class")
-			modules.forEach((module)=>{
-				module.metadata.classFiles.forEach((classFile)=>{
-					const cls = require(module.location+module.module+"/"+classFile);
-					classMap.set(cls.name, cls);
-				})
-			})
-			classMap.get('UNKNOWN').classMap=new Map([...classMap].sort().filter(([k, v]) => !v.isSystem )) // share the classMap with Unknown for configuration purposes
-		})
-	}
-
 	app.debug(`Loading plugin ${packageInfo.version}`)
 	
 	plugin.schema = {			
@@ -171,17 +119,17 @@ module.exports =   function (app) {
 		}
 	}
 
-	const sensorMap=new Map()
 	
 	plugin.started=false
-
-	loadClassMap()
+	
 	var discoveryIntervalID, progressID, progressTimeoutID, deviceHealthID
 	var adapter 
-	var adapterPower
 	const channel = createChannel()
+	const classMap = loadClassMap(app)
+	const sensorMap=new Map()
 
-	plugin.registerWithRouter = function(router) {
+	
+/*	plugin.registerWithRouter = function(router) {
 		router.get('/sendPluginState', async (req, res) => {
 		
 			res.status(200).json({
@@ -193,15 +141,16 @@ module.exports =   function (app) {
 			channel.register(session)
 	   });
 	
-	}
+	}*/
 
 	plugin.start = async function (options, restartPlugin) {
 		plugin.started=true
 		var adapterID=options.adapter
 		var foundConfiguredDevices=0
+
 		plugin.registerWithRouter = function(router) {
 
-			router.post('/sendSensorData', async (req, res) => {
+			router.post('/updateSensorData', async (req, res) => {
 				app.debug(req.body)
 				const i = deviceConfigs.findIndex((p)=>p.mac_address==req.body.mac_address) 
 				if (i<0){
@@ -222,13 +171,9 @@ module.exports =   function (app) {
 						const sensor = sensorMap.get(req.body.mac_address)
 						if (sensor) {
 							removeSensorFromList(sensor)
-							if (sensor.isActive()) {
-								sensor.stopListening().then(()=> 
-									initConfiguredDevice(req.body)
-								)
-							} else {
-									initConfiguredDevice(req.body)
-							}	
+							if (sensor.isActive()) 
+								await sensor.stopListening()
+							initConfiguredDevice(req.body)
 						} 
 						
 					}
@@ -244,7 +189,7 @@ module.exports =   function (app) {
 				if (sensorMap.has(req.body.mac_address))
 					sensorMap.delete(req.body.mac_address)
 				app.savePluginOptions(
-					options, async () => {
+					options, () => {
 						app.debug('Plugin options saved')
 						res.status(200).json({message: "Sensor updated"})
 						channel.broadcast({},"resetSensors")
@@ -253,7 +198,7 @@ module.exports =   function (app) {
 				
 			});
 
-			router.post('/sendBaseData', async (req, res) => {
+			router.post('/updateBaseData', async (req, res) => {
 				
 				app.debug(req.body)
 				Object.assign(options,req.body)
@@ -266,9 +211,14 @@ module.exports =   function (app) {
 					}
 				)
 			});
+			router.get('/getDomains', (req, res) => {
+				
+				res.status(200).json(
+					BTSensor.SensorDomains
+				);
+			})
 		
-		
-			router.get('/base', (req, res) => {
+			router.get('/getBaseData', (req, res) => {
 				
 				res.status(200).json(
 					{
@@ -282,13 +232,13 @@ module.exports =   function (app) {
 					}
 				);
 			})
-			router.get('/sensors', (req, res) => {
+			router.get('/getSensors', (req, res) => {
 				app.debug("Sending sensors")
 				const t = sensorsToJSON()
 				res.status(200).json(t)
 			  });
 
-			router.get('/progress', (req, res) => {
+			router.get('/getProgress', (req, res) => {
 				app.debug("Sending progress")
 				const json = {"progress":foundConfiguredDevices/deviceConfigs.length, "maxTimeout": 1, 
 							  "deviceCount":foundConfiguredDevices, 
@@ -297,7 +247,7 @@ module.exports =   function (app) {
 				
 			  });
 			
-			router.get('/sendPluginState', async (req, res) => {
+			router.get('/getPluginState', async (req, res) => {
 		
 				res.status(200).json({
 					"state":(plugin.started?"started":"stopped")
@@ -320,12 +270,12 @@ module.exports =   function (app) {
 
 		function getSensorInfo(sensor){
 	
-			const etslc = sensor.elapsedTimeSinceLastContact()
 			return { mac: sensor.getMacAddress(),
 				     name: sensor.getName(),
+					 domain: sensor.getDomain().name,
 					 RSSI: sensor.getRSSI(),
 					 signalStrength: sensor.getSignalStrength(),
-					 lastContactDelta: etslc
+					 lastContactDelta: sensor.elapsedTimeSinceLastContact()
 			}
 		}
 
@@ -335,7 +285,6 @@ module.exports =   function (app) {
 					info: getSensorInfo(sensor),
 					schema: sensor.getJSONSchema(),
 					config: config?config:{}
-			
 				}
 		}
 		async function startScanner(transport) {
@@ -369,7 +318,7 @@ module.exports =   function (app) {
 			channel.broadcast({mac:sensor.getMacAddress()},"removesensor")
 		}
 		
-		async function addSensorToList(sensor){
+		function addSensorToList(sensor){
 			app.debug(`adding sensor to list ${sensor.getMacAddress()}`)
 			if (sensorMap.has(sensor.getMacAddress()) )
 				debugger 
@@ -380,7 +329,7 @@ module.exports =   function (app) {
 			return `${config?.name??""}${config.name?" at ":""}${config.mac_address}`
 		}
 		
-		async function createSensor(adapter, config) {
+		function createSensor(adapter, config) {
 			return new Promise( ( resolve, reject )=>{
 			var s
 			const startNumber=starts
@@ -390,19 +339,23 @@ module.exports =   function (app) {
 				if (startNumber != starts ) {
 					return
 				}
-				//app.debug(`Found ${config.mac_address}`)
 				s = await instantiateSensor(device,config) 
-	
+				//app.debug(`Instantiated ${config.mac_address}`)
+				
 				if (s instanceof BLACKLISTED)
 					reject ( `Device is blacklisted (${s.reasonForBlacklisting()}).`)
 				else{
+					//app.debug(`Adding sensor to list ${config.mac_address}`)
+				
 					addSensorToList(s)
 					s._lastRSSI=-1*Infinity
 					s.on("RSSI",(()=>{
-						if (Date.now()-s._lastRSSI > 20000) { //only update RSSI on client every five seconds
+						if (Date.now()-s._lastRSSI > 20000) { //only update RSSI on client every 20 seconds
 							//app.debug(`${s.getMacAddress()} ${Date.now()-s._lastRSSI}`) 
 							s._lastRSSI=Date.now()
+				
 							updateSensor(s)
+							//app.debug(`Updated Sensor ${config.mac_address}`)
 						}	
 
 					}))
@@ -531,14 +484,15 @@ module.exports =   function (app) {
 				setInterval( findDevices, discoveryInterval*1000, discoveryTimeout)
 		}
 
-	
+		channel.broadcast({state:"started"},"pluginstate")
+
+
 		if (!adapterID || adapterID=="")
 			adapterID = "hci0"
 		//Check if Adapter has changed since last start()
 		if (adapter) {
-			const n = await adapter.getName()
-			if (n!=adapterID) {
-				adapter.helper.removeAllListeners()
+			if (adapter.adapter!=adapterID) {
+				adapter.helper._propsProxy.removeAllListeners()
 				adapter=null
 			}
 		}
@@ -568,12 +522,10 @@ module.exports =   function (app) {
 			if (!await adapter.isPowered()) {
 				app.debug(`Bluetooth Adapter ${adapterID} not powered on.`)
 				app.setPluginError(`Bluetooth Adapter ${adapterID} not powered on.`)
-				adapterPower=false
 				await plugin.stop()
 				return
 			}
 		}
-		adapterPower=true
 	
 		sensorMap.clear()
 		if (channel)
@@ -581,9 +533,6 @@ module.exports =   function (app) {
 		deviceConfigs=options?.peripherals??[]
 
 		if (plugin.stopped) {
-			//await sleep(5000) //Make sure plugin.stop() completes first			
-						  //plugin.start is called asynchronously for some reason
-						  //and does not wait for plugin.stop to complete
 			plugin.stopped=false
 		}
 
@@ -646,7 +595,7 @@ module.exports =   function (app) {
 				const dt = config?.discoveryTimeout??options.discoveryTimeout
 				const lc=sensor.elapsedTimeSinceLastContact()
 				if (lc > dt) { 
-					app.debug(`${sensor.getMacAddress()} not heard from in ${lc} seconds`)
+					//app.debug(`${sensor.getMacAddress()} not heard from in ${lc} seconds`)
 					channel.broadcast(getSensorInfo(sensor), "sensorchanged")
 				}
 			})
@@ -689,17 +638,20 @@ module.exports =   function (app) {
 			}
 		}
 		sensorMap.clear()
-		if (adapter && await adapter.isDiscovering())
+
+		if (adapter) {
+			adapter.helper._propsProxy.removeAllListeners()
+			if( await adapter.isDiscovering())
 			try{
 				await adapter.stopDiscovery()
 				app.debug('Scan stopped')
 			} catch (e){
 				app.debug(`Error stopping scan: ${e.message}`)
 			}
-
+		}
 		app.debug('BT Sensors plugin stopped')
 
 	}
 
 	return plugin;
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.2.0-beta.0.0.9",
+  "version": "1.2.0-beta.0.1.1",
   "description": "Bluetooth Sensors for Signalk -- support for Victron devices, RuuviTag, Xiaomi, ATC and Inkbird, Ultrasonic wind meters, Mopeka tank readers, Renogy Battery and Solar Controllers, Aranet4 environment sensors, SwitchBot temp and humidity sensors, KilovaultHLXPlus smart batteries, and Govee GVH51xx temp sensors",
   "main": "index.js",
   "dependencies": {
@@ -10,7 +10,7 @@
     "better-sse": "^0.14.1",
     "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"
   },

package/public/159.js

@@ -1,2 +1 @@
-/*! For license information please see 159.js.LICENSE.txt */
-"use strict";(self.webpackChunkbt_sensors_plugin_sk=self.webpackChunkbt_sensors_plugin_sk||[]).push([[159,540],{5228:e=>{var r=Object.getOwnPropertySymbols,t=Object.prototype.hasOwnProperty,n=Object.prototype.propertyIsEnumerable;e.exports=function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var r={},t=0;t<10;t++)r["_"+String.fromCharCode(t)]=t;if("0123456789"!==Object.getOwnPropertyNames(r).map((function(e){return r[e]})).join(""))return!1;var n={};return"abcdefghijklmnopqrst".split("").forEach((function(e){n[e]=e})),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},n)).join("")}catch(e){return!1}}()?Object.assign:function(e,o){for(var u,c,f=function(e){if(null==e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}(e),l=1;l<arguments.length;l++){for(var i in u=Object(arguments[l]))t.call(u,i)&&(f[i]=u[i]);if(r){c=r(u);for(var a=0;a<c.length;a++)n.call(u,c[a])&&(f[c[a]]=u[c[a]])}}return f}},5287:(e,r,t)=>{var n=t(5228),o="function"==typeof Symbol&&Symbol.for,u=o?Symbol.for("react.element"):60103,c=o?Symbol.for("react.portal"):60106,f=o?Symbol.for("react.fragment"):60107,l=o?Symbol.for("react.strict_mode"):60108,i=o?Symbol.for("react.profiler"):60114,a=o?Symbol.for("react.provider"):60109,s=o?Symbol.for("react.context"):60110,p=o?Symbol.for("react.forward_ref"):60112,y=o?Symbol.for("react.suspense"):60113,d=o?Symbol.for("react.memo"):60115,h=o?Symbol.for("react.lazy"):60116,b="function"==typeof Symbol&&Symbol.iterator;function v(e){for(var r="https://reactjs.org/docs/error-decoder.html?invariant="+e,t=1;t<arguments.length;t++)r+="&args[]="+encodeURIComponent(arguments[t]);return"Minified React error #"+e+"; visit "+r+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}var m={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},_={};function g(e,r,t){this.props=e,this.context=r,this.refs=_,this.updater=t||m}function S(){}function k(e,r,t){this.props=e,this.context=r,this.refs=_,this.updater=t||m}g.prototype.isReactComponent={},g.prototype.setState=function(e,r){if("object"!=typeof e&&"function"!=typeof e&&null!=e)throw Error(v(85));this.updater.enqueueSetState(this,e,r,"setState")},g.prototype.forceUpdate=function(e){this.updater.enqueueForceUpdate(this,e,"forceUpdate")},S.prototype=g.prototype;var w=k.prototype=new S;w.constructor=k,n(w,g.prototype),w.isPureReactComponent=!0;var j={current:null},O=Object.prototype.hasOwnProperty,C={key:!0,ref:!0,__self:!0,__source:!0};function $(e,r,t){var n,o={},c=null,f=null;if(null!=r)for(n in void 0!==r.ref&&(f=r.ref),void 0!==r.key&&(c=""+r.key),r)O.call(r,n)&&!C.hasOwnProperty(n)&&(o[n]=r[n]);var l=arguments.length-2;if(1===l)o.children=t;else if(1<l){for(var i=Array(l),a=0;a<l;a++)i[a]=arguments[a+2];o.children=i}if(e&&e.defaultProps)for(n in l=e.defaultProps)void 0===o[n]&&(o[n]=l[n]);return{$$typeof:u,type:e,key:c,ref:f,props:o,_owner:j.current}}function E(e){return"object"==typeof e&&null!==e&&e.$$typeof===u}var P=/\/+/g,x=[];function R(e,r,t,n){if(x.length){var o=x.pop();return o.result=e,o.keyPrefix=r,o.func=t,o.context=n,o.count=0,o}return{result:e,keyPrefix:r,func:t,context:n,count:0}}function A(e){e.result=null,e.keyPrefix=null,e.func=null,e.context=null,e.count=0,10>x.length&&x.push(e)}function I(e,r,t,n){var o=typeof e;"undefined"!==o&&"boolean"!==o||(e=null);var f=!1;if(null===e)f=!0;else switch(o){case"string":case"number":f=!0;break;case"object":switch(e.$$typeof){case u:case c:f=!0}}if(f)return t(n,e,""===r?"."+U(e,0):r),1;if(f=0,r=""===r?".":r+":",Array.isArray(e))for(var l=0;l<e.length;l++){var i=r+U(o=e[l],l);f+=I(o,i,t,n)}else if("function"==typeof(i=null===e||"object"!=typeof e?null:"function"==typeof(i=b&&e[b]||e["@@iterator"])?i:null))for(e=i.call(e),l=0;!(o=e.next()).done;)f+=I(o=o.value,i=r+U(o,l++),t,n);else if("object"===o)throw t=""+e,Error(v(31,"[object Object]"===t?"object with keys {"+Object.keys(e).join(", ")+"}":t,""));return f}function q(e,r,t){return null==e?0:I(e,"",r,t)}function U(e,r){return"object"==typeof e&&null!==e&&null!=e.key?function(e){var r={"=":"=0",":":"=2"};return"$"+(""+e).replace(/[=:]/g,(function(e){return r[e]}))}(e.key):r.toString(36)}function F(e,r){e.func.call(e.context,r,e.count++)}function L(e,r,t){var n=e.result,o=e.keyPrefix;e=e.func.call(e.context,r,e.count++),Array.isArray(e)?M(e,n,t,(function(e){return e})):null!=e&&(E(e)&&(e=function(e,r){return{$$typeof:u,type:e.type,key:r,ref:e.ref,props:e.props,_owner:e._owner}}(e,o+(!e.key||r&&r.key===e.key?"":(""+e.key).replace(P,"$&/")+"/")+t)),n.push(e))}function M(e,r,t,n,o){var u="";null!=t&&(u=(""+t).replace(P,"$&/")+"/"),q(e,L,r=R(r,u,n,o)),A(r)}var N={current:null};function D(){var e=N.current;if(null===e)throw Error(v(321));return e}var T={ReactCurrentDispatcher:N,ReactCurrentBatchConfig:{suspense:null},ReactCurrentOwner:j,IsSomeRendererActing:{current:!1},assign:n};r.Children={map:function(e,r,t){if(null==e)return e;var n=[];return M(e,n,null,r,t),n},forEach:function(e,r,t){if(null==e)return e;q(e,F,r=R(null,null,r,t)),A(r)},count:function(e){return q(e,(function(){return null}),null)},toArray:function(e){var r=[];return M(e,r,null,(function(e){return e})),r},only:function(e){if(!E(e))throw Error(v(143));return e}},r.Component=g,r.Fragment=f,r.Profiler=i,r.PureComponent=k,r.StrictMode=l,r.Suspense=y,r.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED=T,r.cloneElement=function(e,r,t){if(null==e)throw Error(v(267,e));var o=n({},e.props),c=e.key,f=e.ref,l=e._owner;if(null!=r){if(void 0!==r.ref&&(f=r.ref,l=j.current),void 0!==r.key&&(c=""+r.key),e.type&&e.type.defaultProps)var i=e.type.defaultProps;for(a in r)O.call(r,a)&&!C.hasOwnProperty(a)&&(o[a]=void 0===r[a]&&void 0!==i?i[a]:r[a])}var a=arguments.length-2;if(1===a)o.children=t;else if(1<a){i=Array(a);for(var s=0;s<a;s++)i[s]=arguments[s+2];o.children=i}return{$$typeof:u,type:e.type,key:c,ref:f,props:o,_owner:l}},r.createContext=function(e,r){return void 0===r&&(r=null),(e={$$typeof:s,_calculateChangedBits:r,_currentValue:e,_currentValue2:e,_threadCount:0,Provider:null,Consumer:null}).Provider={$$typeof:a,_context:e},e.Consumer=e},r.createElement=$,r.createFactory=function(e){var r=$.bind(null,e);return r.type=e,r},r.createRef=function(){return{current:null}},r.forwardRef=function(e){return{$$typeof:p,render:e}},r.isValidElement=E,r.lazy=function(e){return{$$typeof:h,_ctor:e,_status:-1,_result:null}},r.memo=function(e,r){return{$$typeof:d,type:e,compare:void 0===r?null:r}},r.useCallback=function(e,r){return D().useCallback(e,r)},r.useContext=function(e,r){return D().useContext(e,r)},r.useDebugValue=function(){},r.useEffect=function(e,r){return D().useEffect(e,r)},r.useImperativeHandle=function(e,r,t){return D().useImperativeHandle(e,r,t)},r.useLayoutEffect=function(e,r){return D().useLayoutEffect(e,r)},r.useMemo=function(e,r){return D().useMemo(e,r)},r.useReducer=function(e,r,t){return D().useReducer(e,r,t)},r.useRef=function(e){return D().useRef(e)},r.useState=function(e){return D().useState(e)},r.version="16.14.0"},6540:(e,r,t)=>{e.exports=t(5287)}}]);
+"use strict";(self.webpackChunkbt_sensors_plugin_sk=self.webpackChunkbt_sensors_plugin_sk||[]).push([[159],{62995:(e,t,n)=>{n.r(t),n.d(t,{default:()=>A});var a=n(73490),s=n(74810),o=n(86528),r=n.n(o),l=n(27606),c=n(86452),i=n(3768),u=n(71431),g=n(39676),d=n(47041),m=n(86038),f=n(95027),p=n(43540),h=n(24712),E=n(75056),w=n(96890),S=n(23399);const v=e=>console.log.bind(console,e);var y,b={};const A=e=>{const[t,n]=(0,o.useState)({}),[A,D]=(0,o.useState)({}),[$,_]=(0,o.useState)({}),[k,x]=(0,o.useState)({"ui:submitButtonOptions":{props:{disabled:!1,className:"btn btn-info"},norender:!0,submitText:"Submit"}}),[C,T]=(0,o.useState)([]),[j,M]=(0,o.useState)(),[O,N]=(0,o.useState)(new Map),[B,U]=(0,o.useState)({progress:0,maxTimeout:100,deviceCount:0,totalDevices:0}),[J,L]=(0,o.useState)("unknown"),[P,K]=(0,o.useState)();function z(e,t){console.log(`sending ${e}`),console.log(t);const n=new Headers;return n.append("Content-Type","application/json"),fetch(`/plugins/bt-sensors-plugin-sk/${e}`,{credentials:"include",method:"POST",body:JSON.stringify(t),headers:n})}async function H(e){return console.log(`fetching ${e}`),fetch(`/plugins/bt-sensors-plugin-sk/${e}`,{credentials:"include"})}async function I(){console.log("getProgress");const e=await H("getProgress");if(200!=e.status)throw new Error(`Unable get progres: ${e.statusText} (${e.status}) `);const t=await e.json();return console.log(t),t}function R(){console.log("refreshing sensor map"),async function(){console.log("getSensors");const e=await H("getSensors");if(200!=e.status)throw new Error(`Unable get sensor data: ${e.statusText} (${e.status}) `);const t=await e.json();return console.log(t),t}().then((e=>{N(new Map(e.map((e=>[e.info.mac,e]))))})).catch((e=>{K(e)}))}function W(e){return Object.keys(e.config).length>0}function Y(e){const t=W(e);return r().createElement(w.A,{action:!0,onClick:()=>{e.config.mac_address=e.info.mac,_(e.schema),M(e.config)}},r().createElement("div",{class:"d-flex justify-content-between align-items-center",style:t?{fontWeight:"normal"}:{fontStyle:"italic"}},`${e._changesMade?"*":""}${e.info.name} MAC: ${e.info.mac} RSSI: ${n=e.info.RSSI,null==n?NaN:n}`,r().createElement("div",{class:"d-flex justify-content-between "},function(e){return null==e.info.lastContactDelta||e.info.lastContactDelta>e.config.discoveryTimeout?r().createElement(i.A,null):e.info.signalStrength>80?r().createElement(u.A,null):e.info.signalStrength>60?r().createElement(g.A,null):e.info.signalStrength>40?r().createElement(d.A,null):e.info.signalStrength>20?r().createElement(m.A,null):r().createElement(f.A,null)}(e))));var n}return(0,o.useEffect)((()=>{console.log("useEffect([])"),H("getPluginState").then((async e=>{if(404==e.status)throw L("unknown"),new Error("unable to get plugin state");const t=await e.json();L(t.state),await async function(){console.log("getDomains");const e=await H("getDomains");if(200!=e.status)throw new Error(`Unable get domain data: ${e.statusText} (${e.status}) `);const t=await e.json();return console.log(t),t}(),console.log("Setting up eventsource");const n=new EventSource("/plugins/bt-sensors-plugin-sk/sse");return n.addEventListener("newsensor",(e=>{console.log("newsensor");let t=JSON.parse(e.data);y.has(t.info.mac)||(console.log(`New sensor: ${t.info.mac}`),N(new Map(y.set(t.info.mac,t))))})),n.addEventListener("sensorchanged",(e=>{let t=JSON.parse(e.data);if(console.log("sensorchanged"),console.log(t),y.has(t.mac)){let e=y.get(t.mac);Object.assign(e.info,t),N(new Map(y))}})),n.addEventListener("progress",(e=>{console.log("progress");const t=JSON.parse(e.data);U(t),console.log(t)})),n.addEventListener("pluginstate",(e=>{console.log("pluginstate");const t=JSON.parse(e.data);L(t.state)})),()=>n.close()})).catch((e=>{K(e)}))}),[]),(0,o.useEffect)((()=>{console.log("useEffect([pluginState])"),"started"==J?(R(),async function(){console.log("getBaseData");const e=await H("getBaseData");if(200!=e.status)throw new Error(`Unable get base data: ${e.statusText} (${e.status}) `);const t=await e.json();return console.log(t),t}().then((e=>{n(e.schema),D(e.data)})).catch((e=>{K(e)})),I().then((e=>{U(e)})).catch((e=>{K(e)}))):(N(new Map),n({}),D({}))}),[J]),(0,o.useEffect)((()=>{console.log("useEffect([sensorMap])"),y=O;const e=new Set(O.entries().map((e=>e[1].info.domain))),t={_configured:Array.from(O.entries()).filter((e=>W(e[1]))).map((e=>Y(O.get(e[0]))))};e.forEach((e=>{var n;t[e]=(n=e,Array.from(O.entries()).filter((e=>e[1].info.domain===n))).map((e=>Y(O.get(e[0]))))})),b=t}),[O]),"stopped"==J||"unknown"==J?r().createElement("h1",null,"Enable plugin to see configuration (if plugin is Enabled and you're seeing this message, restart SignalK)"):r().createElement("div",null,P?r().createElement("h2",{style:"color: red;"},P):"",r().createElement(a.Ay,{schema:t,validator:s.Ay,onChange:e=>D(e.formData),onSubmit:({formData:e},t)=>{var n;n=e,console.log("updateBaseData"),z("updateBaseData",n).then((e=>{200!=e.status?K(new Error(`Unable to update base data: ${e.statusText} (${e.status})`)):(I().then((e=>{U(e)})).catch((e=>{K(e)})),R())})),_({})},onError:v("errors"),formData:A}),r().createElement("p",null),r().createElement("p",null),B.deviceCount<B.totalDevices?r().createElement(S.A,{max:B.maxTimeout,now:B.progress}):"",r().createElement("h2",null,O.size>0?"Bluetooth Devices - Select to configure":""),r().createElement("h2",null,O.size>0?"(* = sensor has unsaved changes)":""),r().createElement("p",null),r().createElement(h.A,{defaultActiveKey:"_configured",id:"domain-tabs",className:"mb-3"},Object.keys(b).map((e=>{return n=(t=e).slice("_"===t.charAt(0)?1:0),r().createElement(E.A,{eventKey:t,title:n.charAt(0).toUpperCase()+n.slice(1)},r().createElement("div",{style:{paddingBottom:20},class:"d-flex flex-wrap justify-content-start align-items-start"},r().createElement(p.A,{style:{maxHeight:"300px",overflowY:"auto"}},function(e){return b[e]}(t)),r().createElement("div",{style:{paddingLeft:10,paddingTop:10,display:0==Object.keys($).length?"none":""}},r().createElement(a.Ay,{schema:$,validator:s.Ay,uiSchema:k,onChange:e=>{O.get(e.formData.mac_address)._changesMade=!0,M(e.formData)},onSubmit:({formData:e},t)=>{var n;console.log(e),n=e,console.log("updateSensorData"),z("updateSensorData",n).then((e=>{if(200!=e.status)throw new Error(e.statusText);O.get(n.mac_address)._changesMade=!1,O.get(n.mac_address).config=n})),_({}),alert("Changes saved")},onError:v("errors"),formData:j},r().createElement("div",null,r().createElement(l.A,{direction:"row",style:{spacing:5}},r().createElement(c.A,{type:"submit",color:"primary",variant:"contained"},"Save"),r().createElement(c.A,{variant:"contained",onClick:()=>{var e;e=j.mac_address,console.log("undoChanges"),O.get(e)._changesMade=!1,M(O.get(e).config)}},"Undo"),r().createElement(c.A,{variant:"contained",color:"secondary",onClick:e=>{return t=j.mac_address,void(window.confirm(`Delete configuration for ${t}?`)&&function(e){console.log("removeSensorData");try{z("removeSensorData",{mac_address:e}).then((e=>{if(200!=e.status)throw new Error(e.statusText)})),y.delete(e),N(new Map(y)),_({})}catch{}}(t));var t}},"Delete")))))));var t,n}))))}}}]);