bt-sensors-plugin-sk 1.2.0-beta.0.0.1.test → 1.2.0-beta.0.0.10

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,6 +8,7 @@ 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  {
 
@@ -20,12 +17,14 @@ class MissingSensor  {
 		this.config=config
 		this.addPath=BTSensor.prototype.addPath.bind(this)
 		this.addParameter=BTSensor.prototype.addParameter.bind(this)
+		this.addDefaultPath=BTSensor.prototype.addDefaultPath.bind(this)
+		this.addDefaultParam=BTSensor.prototype.addDefaultParam.bind(this)
+		this.getPath=BTSensor.prototype.getPath.bind(this)
 
 		this.getJSONSchema = BTSensor.prototype.getJSONSchema.bind(this)
 		this.initSchema = BTSensor.prototype.initSchema.bind(this)
 
 		this.initSchema()
-
 		var keys = Object.keys(config?.paths??{})
 
 		keys.forEach((key)=>{
@@ -47,6 +46,13 @@ class MissingSensor  {
 	hasGATT(){
 		return this.config.gattParams
 	}
+	initGATTConnection(){
+		
+	}
+
+	getGATTDescription(){
+		return ""
+	}
 	getMetadata(){
 		return this.metadata
 	}
@@ -79,66 +85,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 = {			
@@ -162,17 +116,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({
@@ -184,18 +138,25 @@ 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){
+					if (!options.peripherals){
+						if (!options.hasOwnProperty("peripherals"))
+							options.peripherals=[]
+			
+						options.peripherals=[]
+					}
 					options.peripherals.push(req.body)
 				} else {
 					options.peripherals[i] = req.body
@@ -207,13 +168,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)
 						} 
 						
 					}
@@ -229,7 +186,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")
@@ -238,7 +195,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)
@@ -253,7 +210,7 @@ module.exports =   function (app) {
 			});
 		
 		
-			router.get('/base', (req, res) => {
+			router.get('/getBaseData', (req, res) => {
 				
 				res.status(200).json(
 					{
@@ -267,13 +224,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, 
@@ -282,7 +239,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")
@@ -304,13 +261,13 @@ module.exports =   function (app) {
 		}
 
 		function getSensorInfo(sensor){
-			if (sensor.getName()=="vent") 
-				debugger
+	
+			const etslc = sensor.elapsedTimeSinceLastContact()
 			return { mac: sensor.getMacAddress(),
 				     name: sensor.getName(),
 					 RSSI: sensor.getRSSI(),
 					 signalStrength: sensor.getSignalStrength(),
-					 lastContactDelta: sensor. elapsedTimeSinceLastContact()
+					 lastContactDelta: etslc
 			}
 		}
 
@@ -354,7 +311,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 
@@ -365,15 +322,14 @@ 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
 			//app.debug(`Waiting on ${deviceNameAndAddress(config)}`)
-			adapter.waitDevice(config.mac_address,config.discoveryTimeout*1000)
+			adapter.waitDevice(config.mac_address,(config?.discoveryTimeout??30)*1000)
 			.then(async (device)=> { 
 				if (startNumber != starts ) {
-					debugger
 					return
 				}
 				//app.debug(`Found ${config.mac_address}`)
@@ -382,10 +338,15 @@ module.exports =   function (app) {
 				if (s instanceof BLACKLISTED)
 					reject ( `Device is blacklisted (${s.reasonForBlacklisting()}).`)
 				else{
-				
 					addSensorToList(s)
+					s._lastRSSI=-1*Infinity
 					s.on("RSSI",(()=>{
-						updateSensor(s)
+						if (Date.now()-s._lastRSSI > 20000) { //only update RSSI on client every five seconds
+							//app.debug(`${s.getMacAddress()} ${Date.now()-s._lastRSSI}`) 
+							s._lastRSSI=Date.now()
+							updateSensor(s)
+						}	
+
 					}))
 					resolve(s)
 				}
@@ -413,6 +374,8 @@ module.exports =   function (app) {
 					const sensor = new c(device,config?.params, config?.gattParams)
 					sensor.debug=app.debug
 					sensor.app=app
+					sensor._adapter=adapter //HACK!
+
 					await sensor.init()
 					//app.debug(`instantiated ${await BTSensor.getDeviceProp(device,"Address")}`)
 					
@@ -425,17 +388,17 @@ module.exports =   function (app) {
 				app.setPluginError(msg)
 			}
 			//if we're here ain't got no class for the device
-			var sensor
+			var sensor 
 			if (config.params?.sensorClass){
-				const c = classMap.get(config.params.sensorClass)
-				c.debug=app.debug
-				sensor = new c(device,config?.params, config?.gattParams)
-				sensor.debug=app.debug
-				sensor.app=app
+				var c = classMap.get(config.params.sensorClass)
 			} else{
-				sensor = new (classMap.get('UNKNOWN'))(device)
-				sensor.app=app
+				c = classMap.get('UNKNOWN')
 			}
+			c.debug=app.debug
+			sensor = new c(device,config?.params, config?.gattParams)
+			sensor.debug=app.debug
+			sensor.app=app
+
 			await sensor.init()
 			return sensor
 		}	
@@ -510,7 +473,9 @@ 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()
@@ -547,12 +512,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)
@@ -560,9 +523,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
 		}
 
@@ -618,19 +578,25 @@ module.exports =   function (app) {
 			}
 		}
 		const minTimeout=Math.min(...deviceConfigs.map((dc)=>dc?.discoveryTimeout??options.discoveryTimeout))
-
+		const intervalTimeout = ((minTimeout==Infinity)?(options?.discoveryTimeout??plugin.schema.properties.discoveryTimeout.default):minTimeout)*1000
 		deviceHealthID = setInterval( ()=> {
 			sensorMap.forEach((sensor)=>{
 				const config = getDeviceConfig(sensor.getMacAddress())
 				const dt = config?.discoveryTimeout??options.discoveryTimeout
-				if (sensor.elapsedTimeSinceLastContact()> dt)
+				const lc=sensor.elapsedTimeSinceLastContact()
+				if (lc > dt) { 
+					app.debug(`${sensor.getMacAddress()} not heard from in ${lc} seconds`)
 					channel.broadcast(getSensorInfo(sensor), "sensorchanged")
+				}
 			})
-		}, minTimeout*1000)
+		}, intervalTimeout)
 		
+		if (!options.hasOwnProperty("discoveryInterval" )) //no config -- first run
+			options.discoveryInterval = plugin.schema.properties.discoveryInterval.default
+
 		if (options.discoveryInterval && !discoveryIntervalID) 
-			findDeviceLoop(options.discoveryTimeout, options.discoveryInterval)
-	
+			findDeviceLoop(options?.discoveryTimeout??plugin.schema.properties.discoveryTimeout.default, 
+						   options.discoveryInterval)
 	} 
 	plugin.stop =  async function () {
 		app.debug("Stopping plugin")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.2.0-beta.0.0.1.test",
+  "version": "1.2.0-beta.0.0.10",
   "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": {
@@ -65,6 +65,7 @@
     "signalk-category-hardware",
     "signalk-plugin-configurator"
   ],
+  "signalk-plugin-enabled-by-default": true,
   "author": "Andrew Gerngross",
   "license": "ISC",
   "bugs": {

package/plugin_defaults.json

@@ -6,29 +6,118 @@
         "location":{
             "description": "Sensor location",
             "examples": ["inside", "outside", "galley", "freezer", "refrigerator", "head", "cabin", "engine", "deck", "cockpit"]
+        },
+        "zone":{
+            "description": "Zone where sensor operates on boat AKA location ",
+            "examples": ["inside", "outside", "galley", "freezer", "refrigerator", "head", "cabin", "engine", "deck", "cockpit"]
+        },
+        "batteryID":{
+            "description": "Battery ID",
+            "examples": ["starter", "house"]
+        },
+        "id":{
+            "description": "Sensor ID"
         }
     },
     "environment":{
-        "temperature":
+        "temperature": 
             {
+                "title":"Current zone's temperature",
                 "unit":"K",
-                "default": "environment.{location}.temperature"
+                "default": "environment.{zone}.temperature"
             },
         "humidity":
             {
                 "unit":"ratio",
-                "default":"environment.{location}.humidity"
+                "default":"environment.{zone}.humidity"
+            },
+        "relativeHumidity":
+            {
+                "title":"Current zone's relative humidity",
+                "unit":"ratio",
+                "default":"environment.{zone}.relativeHumidity"
+            },
+        "pressure":
+            {
+                "title": "Current zone's ambient air pressure",
+                "unit":"Pa",
+                "default":"environment.{zone}.pressure"
             }
     },
     "electrical":{
-        "current":{
-            "unit": "A",
-            "default":"electrical.batteries.0.current"
+        "inverters":{
+            "ac":{
+                "current":{
+                    "unit": "A",
+                    "default":"electrical.inverters.{id}.ac.current"
+                },
+                "voltage":
+                { 
+                    "unit": "V",
+                    "default":"electrical.inverters.{id}.ac.voltage"
+                },
+                "power":
+                { 
+                    "unit": "W",
+                    "default":"electrical.inverters.{id}.ac.power"
+                }
+         
+         
+            },
+            "dc":{
+                "current":{
+                    "unit": "A",
+                    "default":"electrical.inverters.{id}.dc.current"
+                },
+                "voltage":
+                { 
+                    "unit": "V",
+                    "default":"electrical.inverters.{id}.dc.voltage"
+                }
+
+            }
         },
-        "voltage":
-        { 
-            "unit": "V",
-            "default": "electrical.batteries.0.voltage"
+        "batteries":{
+
+            "current":{
+                "unit": "A",
+                "default":"electrical.batteries.{batteryID}.current"
+            },
+            "voltage":
+            { 
+                "unit": "V",
+                "default": "electrical.batteries.{batteryID}.voltage"
+            },
+            
+            "temperature":{
+                "unit": "K",
+                "default": "electrical.batteries.{batteryID}.temperature"
+            },
+            "cycles":{
+                "unit": "",
+                "default": "electrical.batteries.{batteryID}.cycles"
+            },
+
+            "capacity":{
+                "remaining":{
+                    "unit":"Ah",
+                    "default": "electrical.batteries.{batteryID}.capacity.remaining"
+                },
+                "actual":{
+                    "unit":"Ah",
+                    "default": "electrical.batteries.{batteryID}.capacity.actual"
+                },
+                "stateOfCharge":{
+                    "unit":"ratio",
+                    "default": "electrical.batteries.{batteryID}.capacity.stateOfCharge" 
+                },
+                "timeRemaining":{
+                    "unit":"s",
+                    "default": "electrical.batteries.{batteryID}.capacity.timeRemaining" 
+     
+                }
+            }
+            
         }
     },
     "sensors":{

package/public/893.js

@@ -1 +1 @@
-"use strict";(self.webpackChunkbt_sensors_plugin_sk=self.webpackChunkbt_sensors_plugin_sk||[]).push([[893],{2995:(e,t,n)=>{n.r(t),n.d(t,{default:()=>v});var a=n(3490),s=n(4810),o=n(4147),r=n.n(o),l=n(7606),c=n(4952),i=n(3768),u=n(1431),d=n(9676),m=n(7041),f=n(3657),g=n(5027),p=n(7265),h=n(6890),E=n(8207);const w=e=>console.log.bind(console,e);var S;const v=e=>{const[t,n]=(0,o.useState)({}),[v,b]=(0,o.useState)({}),[y,A]=(0,o.useState)({}),[$,k]=(0,o.useState)({"ui:submitButtonOptions":{props:{disabled:!1,className:"btn btn-info"},norender:!0,submitText:"Submit"}}),[x,D]=(0,o.useState)([]),[C,T]=(0,o.useState)(),[j,_]=(0,o.useState)(new Map),[O,N]=(0,o.useState)({progress:0,maxTimeout:100,deviceCount:0,totalDevices:0}),[M,J]=(0,o.useState)("unknown"),[L,U]=(0,o.useState)();function B(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(){const e=await H("progress");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 P(){console.log("refreshing sensor map"),async function(){const e=await H("sensors");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=>{_(new Map(e.map((e=>[e.info.mac,e]))))})).catch((e=>{U(e)}))}return(0,o.useEffect)((()=>{H("sendPluginState").then((async e=>{const t=await e.json();J(t.state),console.log("Setting up eventsource");const n=new EventSource("/plugins/bt-sensors-plugin-sk/sse");return n.addEventListener("newsensor",(e=>{let t=JSON.parse(e.data);S.has(t.info.mac)||(console.log(`New sensor: ${t.info.mac}`),_(new Map(S.set(t.info.mac,t))))})),n.addEventListener("sensorchanged",(e=>{let t=JSON.parse(e.data);if(S.has(t.mac)){let e=S.get(t.mac);Object.assign(e.info,t),_(new Map(S))}})),n.addEventListener("progress",(e=>{const t=JSON.parse(e.data);N(t),console.log(t)})),n.addEventListener("pluginstate",(e=>{const t=JSON.parse(e.data);J(t.state)})),()=>n.close()})).catch((e=>{U(e)}))}),[]),(0,o.useEffect)((()=>{"started"==M?(P(),async function(){const e=await H("base");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),b(e.data)})).catch((e=>{U(e)})),I().then((e=>{N(e)})).catch((e=>{U(e)}))):(_(new Map),n({}),b({}))}),[M]),(0,o.useEffect)((()=>{console.log(L)}),[L]),(0,o.useEffect)((()=>{S=j,D(Array.from(j.entries()).map((e=>{const t=j.get(e[0]),n=t.config,a=Object.keys(n).length>0;return r().createElement(h.A,{action:!0,onClick:()=>{t&&(n.mac_address=e[0],A(t.schema),T(n))}},r().createElement("div",{class:"d-flex justify-content-between align-items-center",style:a?{fontWeight:"normal"}:{fontStyle:"italic"}},`${t.info.name} MAC: ${t.info.mac} RSSI: ${s=t.info.RSSI,null==s?NaN:s}`,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(d.A,null):e.info.signalStrength>40?r().createElement(m.A,null):e.info.signalStrength>20?r().createElement(f.A,null):r().createElement(g.A,null)}(t))));var s})))}),[j]),"stopped"==M?r().createElement("h1",null,"Enable plugin to see configuration"):r().createElement("div",null,L?r().createElement("h2",{style:"color: red;"},L.message):"",r().createElement(a.Ay,{schema:t,validator:s.Ay,onChange:e=>b(e.formData),onSubmit:({formData:e},t)=>{T(null),B("sendBaseData",e).then((e=>{200!=e.status?U(new Error(`Unable to update base data: ${e.statusText} (${e.status})`)):(I().then((e=>{N(e)})).catch((e=>{U(e)})),P())}))},onError:w("errors"),formData:v}),r().createElement("p",null),r().createElement("p",null),O.deviceCount<O.totalDevices?r().createElement(E.A,{max:O.maxTimeout,now:O.progress}):"",r().createElement("h2",null,j.size>0?" Bluetooth Devices click to configure":""),r().createElement("p",null),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"}},x),r().createElement("div",{style:{paddingLeft:10,paddingTop:10,display:0==Object.keys(y).length?"none":""}},r().createElement(a.Ay,{schema:y,validator:s.Ay,uiSchema:$,onChange:e=>T(e.formData),onSubmit:({formData:e},t)=>{var n;console.log(e),B("sendSensorData",n=e).then((e=>{if(200!=e.status)throw new Error(e.statusText);j.get(n.mac_address).config=n})),A({}),alert("Changes saved")},onError:w("errors"),formData:C},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=C.mac_address,T(j.get(e).config)}},"Undo"),r().createElement(c.A,{variant:"contained",color:"secondary",onClick:e=>{return t=C.mac_address,void(window.confirm(`Delete configuration for ${t}?`)&&function(e){try{B("removeSensorData",{mac_address:e}).then((e=>{if(200!=e.status)throw new Error(e.statusText)})),S.delete(e),_(new Map(S)),A({})}catch{}}(t));var t}},"Delete")))))))}}}]);
+"use strict";(self.webpackChunkbt_sensors_plugin_sk=self.webpackChunkbt_sensors_plugin_sk||[]).push([[893],{2995:(e,t,n)=>{n.r(t),n.d(t,{default:()=>v});var a=n(3490),s=n(4810),o=n(4147),r=n.n(o),l=n(7606),c=n(4952),i=n(3768),u=n(1431),g=n(9676),d=n(7041),m=n(3657),f=n(5027),p=n(7265),h=n(6890),E=n(8207);const w=e=>console.log.bind(console,e);var S;const v=e=>{const[t,n]=(0,o.useState)({}),[v,b]=(0,o.useState)({}),[y,D]=(0,o.useState)({}),[A,$]=(0,o.useState)({"ui:submitButtonOptions":{props:{disabled:!1,className:"btn btn-info"},norender:!0,submitText:"Submit"}}),[k,_]=(0,o.useState)([]),[x,C]=(0,o.useState)(),[T,M]=(0,o.useState)(new Map),[j,O]=(0,o.useState)({progress:0,maxTimeout:100,deviceCount:0,totalDevices:0}),[N,B]=(0,o.useState)("unknown"),[J,L]=(0,o.useState)();function U(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 P(e){return console.log(`fetching ${e}`),fetch(`/plugins/bt-sensors-plugin-sk/${e}`,{credentials:"include"})}async function z(){console.log("getProgress");const e=await P("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 H(){console.log("refreshing sensor map"),async function(){console.log("getSensors");const e=await P("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=>{M(new Map(e.map((e=>[e.info.mac,e]))))})).catch((e=>{L(e)}))}return(0,o.useEffect)((()=>{console.log("useEffect([])"),P("getPluginState").then((async e=>{if(404==e.status)throw B("unknown"),new Error("unable to get plugin state");const t=await e.json();B(t.state),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);S.has(t.info.mac)||(console.log(`New sensor: ${t.info.mac}`),M(new Map(S.set(t.info.mac,t))))})),n.addEventListener("sensorchanged",(e=>{let t=JSON.parse(e.data);if(console.log("sensorchanged"),console.log(t),S.has(t.mac)){let e=S.get(t.mac);Object.assign(e.info,t),M(new Map(S))}})),n.addEventListener("progress",(e=>{console.log("progress");const t=JSON.parse(e.data);O(t),console.log(t)})),n.addEventListener("pluginstate",(e=>{console.log("pluginstate");const t=JSON.parse(e.data);B(t.state)})),()=>n.close()})).catch((e=>{L(e)}))}),[]),(0,o.useEffect)((()=>{console.log("useEffect([pluginState])"),"started"==N?(H(),async function(){console.log("getBaseData");const e=await P("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),b(e.data)})).catch((e=>{L(e)})),z().then((e=>{O(e)})).catch((e=>{L(e)}))):(M(new Map),n({}),b({}))}),[N]),(0,o.useEffect)((()=>{console.log("useEffect([sensorMap])"),S=T,_(Array.from(T.entries()).map((e=>{const t=T.get(e[0]),n=t.config,a=Object.keys(n).length>0;return r().createElement(h.A,{action:!0,onClick:()=>{t&&(n.mac_address=e[0],D(t.schema),C(n))}},r().createElement("div",{class:"d-flex justify-content-between align-items-center",style:a?{fontWeight:"normal"}:{fontStyle:"italic"}},`${t._changesMade?"*":""}${t.info.name} MAC: ${t.info.mac} RSSI: ${s=t.info.RSSI,null==s?NaN:s}`,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)}(t))));var s})))}),[T]),"stopped"==N||"unknown"==N?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,J?r().createElement("h2",{style:"color: red;"},J):"",r().createElement(a.Ay,{schema:t,validator:s.Ay,onChange:e=>b(e.formData),onSubmit:({formData:e},t)=>{var n;C(null),n=e,console.log("updateBaseData"),U("updateBaseData",n).then((e=>{200!=e.status?L(new Error(`Unable to update base data: ${e.statusText} (${e.status})`)):(z().then((e=>{O(e)})).catch((e=>{L(e)})),H())}))},onError:w("errors"),formData:v}),r().createElement("p",null),r().createElement("p",null),j.deviceCount<j.totalDevices?r().createElement(E.A,{max:j.maxTimeout,now:j.progress}):"",r().createElement("h2",null,T.size>0?"Bluetooth Devices - Select to configure":""),r().createElement("h2",null,T.size>0?"(* = sensor has unsaved changes)":""),r().createElement("p",null),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"}},k),r().createElement("div",{style:{paddingLeft:10,paddingTop:10,display:0==Object.keys(y).length?"none":""}},r().createElement(a.Ay,{schema:y,validator:s.Ay,uiSchema:A,onChange:e=>{T.get(e.formData.mac_address)._changesMade=!0,C(e.formData)},onSubmit:({formData:e},t)=>{var n;console.log(e),n=e,console.log("updateSensorData"),U("updateSensorData",n).then((e=>{if(200!=e.status)throw new Error(e.statusText);T.get(n.mac_address)._changesMade=!1,T.get(n.mac_address).config=n})),D({}),alert("Changes saved")},onError:w("errors"),formData:x},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=x.mac_address,console.log("undoChanges"),T.get(e)._changesMade=!1,C(T.get(e).config)}},"Undo"),r().createElement(c.A,{variant:"contained",color:"secondary",onClick:e=>{return t=x.mac_address,void(window.confirm(`Delete configuration for ${t}?`)&&function(e){console.log("removeSensorData");try{U("removeSensorData",{mac_address:e}).then((e=>{if(200!=e.status)throw new Error(e.statusText)})),S.delete(e),M(new Map(S)),D({})}catch{}}(t));var t}},"Delete")))))))}}}]);

package/sensor_classes/ATC.js

@@ -23,15 +23,17 @@ class ATC extends BTSensor{
             {
                 title:'data parsing strategy',
                 type: 'string',
-                enum:["ATC-LE","ATC-BE"]
+                enum:["ATC-LE","ATC-BE"],
+                default: ["ATC-LE"]
             }
         )
         if (!this.parser){
             this.parser="ATC-LE"
         }
-        this.initMetadata()
     }
-    initMetadata(){
+    initSchema(){
+        super.initSchema()
+        this.addDefaultParam("zone")
 
         this.addDefaultPath('batteryStrength','sensors.batteryStrength')
         .read=(buff)=>{return ((buff.readUInt8(12))/100)}

package/sensor_classes/Aranet/AranetSensor.js

@@ -19,6 +19,10 @@ class AranetSensor extends BTSensor{
         
         return null
     }
+    initSchema(){
+        super.initSchema()
+        this.addDefaultParam("zone")
+    }
   
 }
 module.exports=AranetSensor

package/sensor_classes/Aranet2.js

@@ -13,25 +13,26 @@ class Aranet2 extends AranetSensor{
             return null //not supported for now
         }
     }
-    async init() {
-        await super.init()
-        this.initMetadata()
-    }
 
-    initMetadata(){
-            this.addMetadatum('c02', '',  'c02 concentration',
+    initSchema(){
+            super.initSchema()
+            
+            this.addMetadatum('co2', 'ppm',  'co2 concentration in zone',
                 (buff)=>{return ((buff.readUInt16LE(8)))})
-            this.addMetadatum('temp','K', 'temperature',
-                (buff)=>{return parseFloat((273.15+(buff.readInt16LBE(15))/1000).toFixed(2))})
+                .default="environment.{zone}.co2"
+            
+            this.addDefaultPath('temp', 'environment.temperature')
+            .read=(buff)=>{return parseFloat((273.15+(buff.readInt16LBE(15))/1000).toFixed(2))}
 
-            this.addMetadatum("pressure","","atmospheric pressure", 
-                (buff)=>{return ((buff.readUInt16LE(13)))/10})
-            this.addMetadatum('batteryStrength', 'ratio',  'sensor battery strength',
-                (buff)=>{return ((buff.readUInt8(12))/100)})
+            this.addDefaultPath('pressure', 'environment.pressure')
+            .read=  (buff)=>{return ((buff.readUInt16LE(13)))/10}
+            
+            this.addDefaultPath('relativeHumidity','environment.relativeHumidity')
+            .read=(buff)=>{return ((buff.readUInt16LE(8))/10000)}
+                
+            this.addDefaultPath("battery","sensors.batteryStrength")   
+                .read=(buff)=>{return ((buff.readUInt8(12))/100)}
 
-            this.addMetadatum('humidity','ratio', 'humidity',
-                (buff)=>{return ((buff.readUInt16LE(8))/10000)})
-        
     }
     propertiesChanged(props){
         super.propertiesChanged(props)