bt-sensors-plugin-sk 1.2.6-beta-3 → 1.2.6-beta-5

package/index.js

@@ -11,6 +11,7 @@ const OutOfRangeDevice = require("./OutOfRangeDevice.js")
 const { createChannel, createSession } = require("better-sse");
 const { clearTimeout } = require('timers')
 const loadClassMap = require('./classLoader.js')
+const { debug } = require("node:console")
 class MissingSensor  {
 
 	constructor(config){
@@ -76,11 +77,17 @@ class MissingSensor  {
 	getRSSI(){
 		return NaN
 	}
+	getState(){
+		return "ERROR"
+	}
 	stopListening(){}
 	listen(){}
 	isActive(){
 		return false
 	}
+	isConnected(){return false}
+
+	
 	elapsedTimeSinceLastContact(){
 		return NaN
 	}
@@ -90,18 +97,58 @@ class MissingSensor  {
 	prepareConfig(){
 		
 	}
+	getErrorLog(){
+		return []
+	}
+	getDebugLog(){
+		return []
+	}
 
 }
 module.exports =   function (app) {
 	var deviceConfigs=[]
 	var starts=0
 	
-	var plugin = {};
+	var plugin = {
+		debug (message)  {
+			app.debug(message)
+			const logEntry = {
+				timestamp: Date.now(), 
+				message: message
+			}
+			this.log.push(logEntry)
+			if (channel)
+				channel.broadcast(logEntry,"pluginDebug")
+		},
+		setError( error ){
+			app.setPluginError(error)
+			app.debug(error)
+			const logEntry = {
+				timestamp: Date.now(), 
+				message: error
+			}
+			this.errorLog.push(logEntry)
+			if (channel)
+				channel.broadcast( logEntry, "pluginError" )
+		},
+		setStatusText( status ){
+			app.setPluginStatus(status)
+			const logEntry = {timestamp: Date.now(), message: status}
+			this.log.push(logEntry)
+			if (channel)
+				channel.broadcast( logEntry, "pluginStatusText" )
+		},
+		setFatalError( error ){
+			this.setError(`FATAL ERROR: ${error}`)
+			this.stop()
+
+		}
+	}
 	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';
-	
-	app.debug(`Loading plugin ${packageInfo.version}`)
+	plugin.log = []
+	plugin.errorLog = []
 	
 	plugin.schema = {			
 		type: "object",
@@ -134,6 +181,8 @@ module.exports =   function (app) {
 	var discoveryIntervalID, progressID, progressTimeoutID, deviceHealthID
 	var adapter 
 	const channel = createChannel()
+	
+	plugin.debug(`Loading plugin ${packageInfo.version}`)
 
 	const sensorMap=new Map()
 
@@ -169,7 +218,7 @@ module.exports =   function (app) {
 
 						_tempSensor = new _class ( _sensor.device )
 						_tempSensor.currentProperties=_sensor.currentProperties
-						_tempSensor.debug = app.debug
+						_tempSensor._app = app
 						_tempSensor._adapter=adapter
 						await _tempSensor.init()
 						const _json = sensorToJSON(_tempSensor)
@@ -188,7 +237,6 @@ module.exports =   function (app) {
 			})
 
 			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) 
@@ -206,7 +254,6 @@ module.exports =   function (app) {
 				deviceConfigs=options.peripherals
 				app.savePluginOptions(
 					options, async () => {
-						app.debug('Plugin options saved')
 						res.status(200).json({message: "Sensor updated"})
 						if (sensor) {
 							removeSensorFromList(sensor)
@@ -219,7 +266,6 @@ module.exports =   function (app) {
 				
 			});
 			router.post('/removeSensorData', async (req, res) => {
-				app.debug(req.body)
 				const sensor = sensorMap.get(req.body.mac_address)
 				if (!sensor) {
 					res.status(404).json({message: "Sensor not found"})
@@ -237,7 +283,6 @@ module.exports =   function (app) {
 					sensorMap.delete(req.body.mac_address)
 				app.savePluginOptions(
 					options, () => {
-						app.debug('Plugin options saved')
 						res.status(200).json({message: "Sensor updated"})
 						channel.broadcast({},"resetSensors")
 					}
@@ -247,11 +292,9 @@ module.exports =   function (app) {
 
 			router.post('/updateBaseData', async (req, res) => {
 				
-				app.debug(req.body)
 				Object.assign(options,req.body)
 				app.savePluginOptions(
 					options, () => {
-						app.debug('Plugin options saved')
 						res.status(200).json({message: "Plugin updated"})
 						channel.broadcast({},"pluginRestarted")
 						restartPlugin(options)
@@ -277,13 +320,11 @@ module.exports =   function (app) {
 
 
 			router.get('/getSensors', (req, res) => {
-				app.debug("Sending sensors")
 				const t = sensorsToJSON()
 				res.status(200).json(t)
 			  });
 
 			router.get('/getProgress', (req, res) => {
-				app.debug("Sending progress")
 				let deviceCount = deviceConfigs.filter((dc)=>dc.active).length
 				const json = {"progress":foundConfiguredDevices/deviceCount, "maxTimeout": 1, 
 							  "deviceCount":foundConfiguredDevices, 
@@ -302,7 +343,6 @@ module.exports =   function (app) {
 				const session = await createSession(req,res)
 				channel.register(session)
 				req.on("close", ()=>{
-					app.debug("deregistering session")
 					channel.deregister(session)	
 				})
 			});
@@ -318,14 +358,18 @@ module.exports =   function (app) {
 
 		function getSensorInfo(sensor){
 	
-
+			const s = sensor.getState()
 			return { mac: sensor.getMacAddress(),
 				     name: sensor.getName(),
 					 class: sensor.constructor.name,
 					 domain: sensor.getDomain().name,
+					 state: sensor.getState(),
+					 errorLog: sensor.getErrorLog(),
+					 debugLog: sensor.getDebugLog(),
 					 RSSI: sensor.getRSSI(),
 					 signalStrength: sensor.getSignalStrength(),
-					 lastContactDelta: sensor.elapsedTimeSinceLastContact()
+            		 connected: sensor.isConnected(),
+            		 lastContactDelta: sensor.elapsedTimeSinceLastContact()
 			}
 		}
 
@@ -346,14 +390,14 @@ module.exports =   function (app) {
 		
 			const transport = options?.transport??"le"
 			const duplicateData = options?.duplicateData??false
-			app.debug("Starting scan...");
+			plugin.debug("Starting scan...");
 			//Use adapter.helper directly to get around Adapter::startDiscovery()
 			//filter options which can cause issues with Device::Connect() 
 			//turning off Discovery
 			//try {await adapter.startDiscovery()}
 			try{ 
 				if (transport) {
-					app.debug(`Setting Bluetooth transport option to ${transport}. DuplicateData to ${duplicateData}`)
+					plugin.debug(`Setting Bluetooth transport option to ${transport}. DuplicateData to ${duplicateData}`)
 					await adapter.helper.callMethod('SetDiscoveryFilter', {
 						Transport: new Variant('s', transport),
 						DuplicateData: new Variant('b', duplicateData)
@@ -362,7 +406,7 @@ module.exports =   function (app) {
 				await adapter.helper.callMethod('StartDiscovery') 
 			} 
 			catch (error){	
-				app.debug(error)
+				plugin.debug(error)
 			}
 			
 		}		
@@ -376,8 +420,6 @@ module.exports =   function (app) {
 		}
 		
 		function addSensorToList(sensor){
-			app.debug(`adding sensor to list ${sensor.getMacAddress()}`)
-
 			sensorMap.set(sensor.getMacAddress(),sensor)
 			channel.broadcast(sensorToJSON(sensor),"newsensor");
 		}
@@ -389,7 +431,6 @@ module.exports =   function (app) {
 			return new Promise( ( resolve, reject )=>{
 			var s
 			const startNumber=starts
-			//app.debug(`Waiting on ${deviceNameAndAddress(config)}`)
 			adapter.waitDevice(config.mac_address,(config?.discoveryTimeout??30)*1000)
 			.then(async (device)=> { 
 				if (startNumber != starts ) {
@@ -402,13 +443,11 @@ module.exports =   function (app) {
 				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 > 30000) { //only update RSSI on client every 30 seconds
-							//app.debug(`Updating ${s.getMacAddress()} RSSI after ${Date.now()-s._lastRSSI} ms`) 
 
 							s._lastRSSI=Date.now()
 				
@@ -434,13 +473,29 @@ module.exports =   function (app) {
 								removeSensorFromList(s)
 								addSensorToList(s)
 						})
+						s.on("state", (state)=>{
+							channel.broadcast(getSensorInfo(s), "sensorchanged")
+						})
+						s.on("error",(error)=>{
+							channel.broadcast(getSensorInfo(s), "sensorchanged")
+						})
+						s.on("debug", ()=>{
+							channel.broadcast(getSensorInfo(s), "sensorchanged")
+						})
 						addSensorToList(s)
 						resolve(s)
 					}
 				}
 				if (startNumber == starts ) {
-					app.debug(`Unable to communicate with device ${deviceNameAndAddress(config)} Reason: ${e?.message??e}`)
-					app.debug(e)
+					const errorTxt = `Unable to communicate with device ${deviceNameAndAddress(config)} Reason: ${e?.message??e}`
+					if(s)
+					{
+						s.setError(errorTxt)
+					} else {
+						plugin.setError(errorTxt)
+					}
+					plugin.debug(e)
+
 					reject( e?.message??e )
 				}	
 			})})
@@ -476,20 +531,17 @@ module.exports =   function (app) {
 				
 				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._app=app
 				sensor._adapter=adapter //HACK!
 				await sensor.init()				
 				return sensor
 			}
 			catch(error){
 				const msg = `Unable to instantiate ${await BTSensor.getDeviceProp(device,"Address")}: ${error.message} `
-				app.debug(msg)
-				app.debug(error)
+				plugin.debug(msg)
+				plugin.debug(error)
 				if (config.active) 
-					app.setPluginError(msg)
+					plugin.setError(msg)
 				return null
 			}
 
@@ -497,7 +549,7 @@ module.exports =   function (app) {
 		
 		function initConfiguredDevice(deviceConfig){
 			const startNumber=starts
-			app.setPluginStatus(`Initializing ${deviceNameAndAddress(deviceConfig)}`);
+			plugin.setStatusText(`Initializing ${deviceNameAndAddress(deviceConfig)}`);
 			if (!deviceConfig.discoveryTimeout)
 				deviceConfig.discoveryTimeout = options.discoveryTimeout
 			createSensor(adapter, deviceConfig).then((sensor)=>{
@@ -505,7 +557,7 @@ module.exports =   function (app) {
 						return
 				}	
 				if (deviceConfig.active && !(sensor.device instanceof OutOfRangeDevice) ) {
-					app.setPluginStatus(`Listening to ${++foundConfiguredDevices} sensors.`);
+					plugin.setStatusText(`Listening to ${++foundConfiguredDevices} sensors.`);
 					sensor.activate(deviceConfig, plugin)
 				}
 				
@@ -517,10 +569,10 @@ module.exports =   function (app) {
 						return
 					}	
 					const msg =`Sensor at ${deviceConfig.mac_address} unavailable. Reason: ${error}`
-					app.debug(msg)
-					app.debug(error)
+					plugin.debug(msg)
+
 					if (deviceConfig.active) 
-						app.setPluginError(msg)
+						plugin.setError(msg)
 					const sensor=new MissingSensor(deviceConfig)
 					++foundConfiguredDevices
 					
@@ -530,7 +582,7 @@ module.exports =   function (app) {
 		}
 		function findDevices (discoveryTimeout) {
 			const startNumber = starts
-			app.setPluginStatus("Scanning for new Bluetooth devices...");
+			plugin.setStatusText("Scanning for new Bluetooth devices...");
 
 			adapter.devices().then( (macs)=>{
 				if (startNumber != starts ) {
@@ -580,7 +632,7 @@ module.exports =   function (app) {
 		//Connect to adapter
 
 		if (!adapter){
-			app.debug(`Connecting to bluetooth adapter ${adapterID}`);
+			plugin.debug(`Connecting to bluetooth adapter ${adapterID}`);
 
 			adapter = await bluetooth.getAdapter(adapterID)
 
@@ -588,11 +640,10 @@ module.exports =   function (app) {
 
 			await adapter.helper._prepare()
 			adapter.helper._propsProxy.on('PropertiesChanged', async (iface,changedProps,invalidated) => {
-				app.debug(changedProps)
 				if (Object.hasOwn(changedProps,"Powered")){
 					if (changedProps.Powered.value==false) {
 						if (plugin.started){ //only call stop() if plugin is started
-							app.setPluginStatus(`Bluetooth Adapter ${adapterID} turned off. Plugin disabled.`)
+							plugin.setStatusText(`Bluetooth Adapter ${adapterID} turned off. Plugin disabled.`)
 							await plugin.stop()
 						}
 					} else { 				
@@ -601,8 +652,8 @@ module.exports =   function (app) {
 				}
 			})
 			if (!await adapter.isPowered()) {
-				app.debug(`Bluetooth Adapter ${adapterID} not powered on.`)
-				app.setPluginError(`Bluetooth Adapter ${adapterID} not powered on.`)
+				plugin.debug(`Bluetooth Adapter ${adapterID} not powered on.`)
+				plugin.setError(`Bluetooth Adapter ${adapterID} not powered on.`)
 				await plugin.stop()
 				return
 			}
@@ -618,19 +669,26 @@ module.exports =   function (app) {
 			plugin.stopped=false
 		}
 
-		const activeAdapters = await bluetooth.activeAdapters()
-		plugin.schema.properties.adapter.enum=[]
-		plugin.schema.properties.adapter.enumNames=[]
-		for (a of activeAdapters){
-			plugin.schema.properties.adapter.enum.push(a.adapter)
-			plugin.schema.properties.adapter.enumNames.push(`${a.adapter} @ ${ await a.getAddress()} (${await a.getName()})`)
+		try{
+			const activeAdapters = await bluetooth.activeAdapters()
+			if (activeAdapters.length==0){
+				plugin.setError("No active Bluetooth adapters found.")
+			}
+			plugin.schema.properties.adapter.enum=[]
+			plugin.schema.properties.adapter.enumNames=[]
+			for (a of activeAdapters){
+				plugin.schema.properties.adapter.enum.push(a.adapter)
+				plugin.schema.properties.adapter.enumNames.push(`${a.adapter} @ ${ await a.getAddress()} (${await a.getName()})`)
+			}}
+		catch(e){
+			plugin.setError(`Unable to get adapters: ${e.message}`)
 		}
 		
 		await startScanner(options)
 		if (starts>0){
-			app.debug(`Plugin ${packageInfo.version} restarting...`);
+			plugin.debug(`Plugin ${packageInfo.version} restarting...`);
 		} else {
-			app.debug(`Plugin ${packageInfo.version} started` )
+			plugin.debug(`Plugin ${packageInfo.version} started` )
 			
 		}
 		starts++
@@ -638,7 +696,7 @@ module.exports =   function (app) {
 			try{
 				await startScanner(options)
 			} catch (e){
-				app.debug(`Error starting scan: ${e.message}`)
+				plugin.setError(`Error starting scan: ${e.message}`)
 		}
 		if (!(deviceConfigs===undefined)){
 			const maxTimeout=Math.max(...deviceConfigs.map((dc)=>dc?.discoveryTimeout??options.discoveryTimeout))
@@ -677,7 +735,6 @@ 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`)
 					channel.broadcast(getSensorInfo(sensor), "sensorchanged")
 				}
 			})
@@ -691,7 +748,7 @@ module.exports =   function (app) {
 						   options.discoveryInterval)
 	} 
 	plugin.stop =  async function () {
-		app.debug("Stopping plugin")
+		plugin.debug("Stopping plugin")
 		plugin.stopped=true
 		plugin.started=false
 		channel.broadcast({state:"stopped"},"pluginstate")
@@ -712,10 +769,10 @@ module.exports =   function (app) {
 				for await (const sensorEntry of sensorMap.entries()) {
 				try{
 					await sensorEntry[1].stopListening()
-					app.debug(`No longer listening to ${sensorEntry[0]}`)
+					plugin.debug(`No longer listening to ${sensorEntry[0]}`)
 				}
 				catch (e){
-					app.debug(`Error stopping listening to ${sensorEntry[0]}: ${e.message}`)
+					plugin.setError(`Error stopping listening to ${sensorEntry[0]}: ${e.message}`)
 				}
 			}
 		}
@@ -726,12 +783,12 @@ module.exports =   function (app) {
 			if( await adapter.isDiscovering())
 			try{
 				await adapter.stopDiscovery()
-				app.debug('Scan stopped')
+				plugin.debug('Scan stopped')
 			} catch (e){
-				app.debug(`Error stopping scan: ${e.message}`)
+				plugin.setError(`Error stopping scan: ${e.message}`)
 			}
 		}
-		app.debug('BT Sensors plugin stopped')
+		plugin.debug('BT Sensors plugin stopped')
 
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.2.6-beta-3",
+  "version": "1.2.6-beta-5",
   "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": {

package/plugin_defaults.json

@@ -134,10 +134,19 @@
                     "default": "electrical.batteries.{batteryID}.capacity.totalCharge"
                 },
                 "stateOfCharge":{
+                    "description": "Battery's state of charge as ratio",
                     "unit":"ratio",
                     "default": "electrical.batteries.{batteryID}.capacity.stateOfCharge" 
                 },
+                "stateOfHealth":{
+                    "description": "Battery's state of health as ratio",
+                    "unit":"ratio",
+                    "default": "electrical.batteries.{batteryID}.capacity.stateOfHealth" 
+                },
+                
                 "timeRemaining":{
+                    "description": "Time in seconds until battery reaches its discharge floor at current usage",
+
                     "unit":"s",
                     "default": "electrical.batteries.{batteryID}.capacity.timeRemaining" 
      

package/public/847.js

@@ -1 +1 @@
-(self.webpackChunkbt_sensors_plugin_sk=self.webpackChunkbt_sensors_plugin_sk||[]).push([[847],{9337:()=>{},62995:(e,t,n)=>{"use strict";n.r(t),n.d(t,{BTConfig:()=>k,default:()=>C});var a=n(73490),s=n(74810),r=n(40334),o=n(86528),c=n.n(o),i=n(11363),l=n(97493),u=n(27606),m=n(82096),d=n(3768),g=n(71431),f=n(39676),h=n(47041),p=n(86038),E=n(95027),w=n(43540),y=n(38250),S=n(31008),b=n(20455),v=n(23399);const A=e=>console.log.bind(console,e);function k(e){const t=(0,m.A)((e=>({root:{"& > *":{margin:e.spacing(1)}}}))),[n,k]=(0,o.useState)({}),[C,D]=(0,o.useState)({}),[_,$]=(0,o.useState)({}),[N,x]=(0,o.useState)({"ui:options":{label:!1},paths:{enableMarkdownInDescription:!0},title:{"ui:widget":"hidden"}}),[O,T]=(0,o.useState)(),[j,M]=(0,o.useState)(!1),[U,J]=(0,o.useState)(!0),[L,I]=(0,o.useState)(new Map),[P,K]=(0,o.useState)({progress:0,maxTimeout:100,deviceCount:0,totalDevices:0}),[R,B]=(0,o.useState)("unknown"),[G,W]=(0,o.useState)(),[F,H]=(0,o.useState)(!1),[z,Y]=(0,o.useState)(""),q=t();function Q(e,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 V(e,t={}){let n;try{const a=Object.keys(t).length?"?"+new URLSearchParams(t).toString():"";n=await fetch(`/plugins/bt-sensors-plugin-sk/${e}${a}`,{credentials:"include",method:"GET"})}catch(e){n={status:500,statusText:e.toString()}}return n}function X(e){return Object.keys(e.configCopy).length>0}function Z(e){const t=X(e);return c().createElement(b.A,{action:!0,onClick:()=>{e.config.mac_address=e.info.mac,$(e.schema),T(e.config)}},c().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}`,c().createElement("div",{class:"d-flex justify-content-between "},function(e){return null==e.info.lastContactDelta||e.info.lastContactDelta>e.config.discoveryTimeout?c().createElement(d.A,null):e.info.signalStrength>80?c().createElement(g.A,null):e.info.signalStrength>60?c().createElement(f.A,null):e.info.signalStrength>40?c().createElement(h.A,null):e.info.signalStrength>20?c().createElement(p.A,null):c().createElement(E.A,null)}(e))));var n}function ee(e){window.open(e,"_blank","noreferrer")}return(0,o.useEffect)((()=>{let e=null;return V("getPluginState").then((async t=>{if(404==t.status)throw B("unknown"),new Error("unable to get plugin state");const n=await t.json();e=new EventSource("/plugins/bt-sensors-plugin-sk/sse",{withCredentials:!0}),e.addEventListener("newsensor",(e=>{!function(e){let t=JSON.parse(e.data);console.log(`New sensor: ${t.info.mac}`),I((e=>(e.set(t.info.mac,t),new Map(e))))}(e)})),e.addEventListener("sensorchanged",(e=>{!function(e){console.log("sensorchanged");const t=JSON.parse(e.data);I((e=>{const n=e.get(t.mac);return n&&Object.assign(n.info,t),new Map(e)}))}(e)})),e.addEventListener("progress",(e=>{const t=JSON.parse(e.data);K(t)})),e.addEventListener("pluginstate",(e=>{const t=JSON.parse(e.data);B(t.state)})),B(n.state),(async()=>{const e=await async function(){const e=await V("getSensors");if(200!=e.status)throw new Error(`Unable get sensor data: ${e.statusText} (${e.status}) `);return await e.json()}();I(new Map(e.map((e=>[e.info.mac,e]))))})()})).catch((e=>{W(e.message)})),()=>{console.log("Closing connection to SSE"),e.close()}}),[]),(0,o.useEffect)((()=>{if(!j)return;if(!O||!L)return;const e=L.get(O.mac_address);e&&_&&O&&Object.hasOwn(O,"params")&&"UNKNOWN"==e.info.class&&O.params.sensorClass&&"UNKNOWN"!=O.params.sensorClass&&(J(!1),Y(`Please wait. Fetching schema for ${O.params.sensorClass}...`),async function(e,t){const n=await V("getSensorInfo",{mac_address:e,class:t});if(200!=n.status)throw new Error(`Unable get sensor info: ${n.statusText} (${n.status}) `);return await n.json()}(O.mac_address,O.params.sensorClass).then((e=>{$(e.schema)})).catch((e=>{alert(e.message)})).finally((()=>{Y(""),J(!0),M(!1)})))}),[j]),(0,o.useEffect)((()=>{H(""!=z)}),[z]),(0,o.useEffect)((()=>{"started"==R?(async function(){const e=await V("getBaseData");if(200!=e.status)throw new Error(`Unable to get base data: ${e.statusText} (${e.status}) `);const t=await e.json();return t.schema.htmlDescription=c().createElement("div",null,(0,r.Ay)(t.schema.htmlDescription),c().createElement("p",null)),t}().then((e=>{k(e.schema),D(e.data)})).catch((e=>{W(e.message)})),async function(){const e=await V("getProgress");if(200!=e.status)throw new Error(`Unable to get progress: ${e.statusText} (${e.status}) `);return await e.json()}().then((e=>{K(e)})).catch((e=>{W(e.message)}))):(k({}),D({}))}),[R]),"stopped"==R||"unknown"==R?c().createElement("h3",null,"Enable plugin to see configuration"):c().createElement("div",null,c().createElement(i.A,{anchorOrigin:{horizontal:"center",vertical:"bottom"},onClose:()=>H(!1),open:F,message:z,key:"snackbar"}),c().createElement("div",{className:q.root},c().createElement(l.A,{variant:"contained",onClick:()=>{ee("https://github.com/naugehyde/bt-sensors-plugin-sk/tree/1.2.0-beta#configuration")}},"Documentation"),c().createElement(l.A,{variant:"contained",onClick:()=>{ee("https://github.com/naugehyde/bt-sensors-plugin-sk/issues/new/choose")}},"Report Issue"),c().createElement(l.A,{variant:"contained",onClick:()=>{ee("https://discord.com/channels/1170433917761892493/1295425963466952725")}},"Discord Thread"),c().createElement("p",null),c().createElement("p",null)),c().createElement("hr",{style:{width:"100%",height:"1px",color:"gray","background-color":"gray","text-align":"left","margin-left":0}}),G?c().createElement("h2",{style:{color:"red"}},G):"",c().createElement(a.Ay,{schema:n,validator:s.Ay,uiSchema:{"ui:field":"LayoutGridField","ui:layoutGrid":{"ui:row":[{"ui:row":{className:"row",children:[{"ui:columns":{className:"col-xs-4",children:["adapter","transport","duplicateData","discoveryTimeout","discoveryInterval"]}}]}}]}},onChange:e=>D(e.formData),onSubmit:({formData:e},t)=>{var n;n=e,I(new Map),Q("updateBaseData",n).then((e=>{200!=e.status&&W(`Unable to update base data: ${e.statusText} (${e.status})`)})),$({})},onError:A("errors"),formData:C}),c().createElement("hr",{style:{width:"100%",height:"1px",color:"gray","background-color":"gray","text-align":"left","margin-left":0}}),c().createElement("p",null),c().createElement("p",null),P.deviceCount<P.totalDevices?c().createElement(v.A,{max:P.maxTimeout,now:P.progress}):"",c().createElement("p",null),c().createElement(y.A,{defaultActiveKey:"_configured",id:"domain-tabs",className:"mb-3"},function(){const e=[...new Set(L.entries().map((e=>e[1].info.domain)))].sort(),t=Array.from(L.entries()).filter((e=>X(e[1])));let n={};return n._configured=0==t.length?"Select a device from its domain tab (Electrical etc.) and configure it.":t.map((e=>Z(L.get(e[0])))),e.forEach((e=>{var t;n[e]=(t=e,Array.from(L.entries()).filter((e=>e[1].info.domain===t))).map((e=>Z(L.get(e[0]))))})),Object.keys(n).map((e=>function(e,t){let n=e.slice("_"===e.charAt(0)?1:0);return c().createElement(S.A,{eventKey:e,title:`${n.charAt(0).toUpperCase()}${n.slice(1)}${"string"==typeof t?"":" ("+t.length+")"}`},c().createElement(w.A,{style:{maxHeight:"300px",overflowY:"auto"}},t))}(e,n[e])))}()),c().createElement("div",{style:{paddingLeft:10,paddingTop:10,display:0==Object.keys(_).length?"none":""}},c().createElement(u.A,{container:!0,direction:"column",style:{spacing:5}},c().createElement(u.A,{item:!0},c().createElement("h2",null,_?.title),c().createElement("p",null)),c().createElement(u.A,{item:!0},(0,r.Ay)(_?.htmlDescription))),c().createElement("fieldset",{disabled:!U},c().createElement(a.Ay,{schema:_,validator:s.Ay,uiSchema:N,onChange:(e,t)=>{const n=L.get(e.formData.mac_address);n&&(n._changesMade=!0,n.config=e.formData,T(e.formData)),"root_params_sensorClass"==t&&M(!0)},onSubmit:({formData:e},t)=>{var n;Q("updateSensorData",n=e).then((e=>{if(200!=e.status)throw new Error(e.statusText);I((e=>(e.delete(n.mac_address),new Map(e)))),$({})})),alert("Changes saved")},onError:A("errors"),formData:O},c().createElement("div",{className:q.root},c().createElement(l.A,{type:"submit",color:"primary",variant:"contained"},"Save"),c().createElement(l.A,{variant:"contained",onClick:()=>{var e;e=O.mac_address,L.get(e)._changesMade=!1,L.get(e).config=JSON.parse(JSON.stringify(L.get(e).configCopy)),T(L.get(e).config)}},"Undo"),c().createElement(l.A,{variant:"contained",color:"secondary",onClick:e=>function(e){const t=L.get(e);(!X(t)||window.confirm(`Delete configuration for ${t.info.name}?`))&&function(e){try{Q("removeSensorData",{mac_address:e}).then((e=>{if(200!=e.status)throw new Error(e.statusText)})),I((t=>(t.delete(e),new Map(t)))),$({})}catch{}}(e)}(O.mac_address)},"Delete"))))))}const C=k}}]);
+(self.webpackChunkbt_sensors_plugin_sk=self.webpackChunkbt_sensors_plugin_sk||[]).push([[847],{9337:()=>{},62995:(e,t,n)=>{"use strict";n.r(t),n.d(t,{BTConfig:()=>k,default:()=>C});var a=n(73490),s=n(74810),r=n(40334),o=n(86528),c=n.n(o),i=n(11363),l=n(97493),u=n(27606),m=n(82096),d=n(3768),g=n(71431),f=n(39676),h=n(47041),p=n(86038),E=n(95027),w=n(43540),y=n(38250),S=n(31008),b=n(20455),v=n(23399);const A=e=>console.log.bind(console,e);function k(e){const t=(0,m.A)((e=>({root:{"& > *":{margin:e.spacing(1)}}}))),[n,k]=(0,o.useState)({}),[C,D]=(0,o.useState)({}),[_,$]=(0,o.useState)({}),[x,N]=(0,o.useState)({"ui:options":{label:!1},paths:{enableMarkdownInDescription:!0},title:{"ui:widget":"hidden"}}),[O,T]=(0,o.useState)(),[j,M]=(0,o.useState)(!1),[U,J]=(0,o.useState)(!0),[L,I]=(0,o.useState)(new Map),[P,K]=(0,o.useState)({progress:0,maxTimeout:100,deviceCount:0,totalDevices:0}),[R,B]=(0,o.useState)("unknown"),[G,W]=(0,o.useState)(),[F,H]=(0,o.useState)(!1),[z,Y]=(0,o.useState)(""),q=t();function Q(e,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 V(e,t={}){let n;try{const a=Object.keys(t).length?"?"+new URLSearchParams(t).toString():"";n=await fetch(`/plugins/bt-sensors-plugin-sk/${e}${a}`,{credentials:"include",method:"GET"})}catch(e){n={status:500,statusText:e.toString()}}return n}function X(e){return Object.keys(e.configCopy).length>0}function Z(e){const t=X(e);return c().createElement(b.A,{action:!0,onClick:()=>{e.config.mac_address=e.info.mac,$(e.schema),T(e.config)}},c().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}`,c().createElement("div",{class:"d-flex justify-content-between "},e.info.state,c().createElement("div",{class:"d-flex justify-content-between "},function(e){return null==e.info.lastContactDelta||e.info.lastContactDelta>e.config.discoveryTimeout?c().createElement(d.A,null):e.info.signalStrength>80?c().createElement(g.A,null):e.info.signalStrength>60?c().createElement(f.A,null):e.info.signalStrength>40?c().createElement(h.A,null):e.info.signalStrength>20?c().createElement(p.A,null):c().createElement(E.A,null)}(e)))));var n}function ee(e){window.open(e,"_blank","noreferrer")}return(0,o.useEffect)((()=>{let e=null;return V("getPluginState").then((async t=>{if(404==t.status)throw B("unknown"),new Error("unable to get plugin state");const n=await t.json();e=new EventSource("/plugins/bt-sensors-plugin-sk/sse",{withCredentials:!0}),e.addEventListener("newsensor",(e=>{!function(e){let t=JSON.parse(e.data);console.log(`New sensor: ${t.info.mac}`),I((e=>(e.set(t.info.mac,t),new Map(e))))}(e)})),e.addEventListener("sensorchanged",(e=>{!function(e){console.log("sensorchanged");const t=JSON.parse(e.data);console.log(t),I((e=>{const n=e.get(t.mac);return n&&Object.assign(n.info,t),new Map(e)}))}(e)})),e.addEventListener("progress",(e=>{const t=JSON.parse(e.data);K(t)})),e.addEventListener("pluginstate",(e=>{const t=JSON.parse(e.data);B(t.state)})),B(n.state),(async()=>{const e=await async function(){const e=await V("getSensors");if(200!=e.status)throw new Error(`Unable get sensor data: ${e.statusText} (${e.status}) `);return await e.json()}();I(new Map(e.map((e=>[e.info.mac,e]))))})()})).catch((e=>{W(e.message)})),()=>{console.log("Closing connection to SSE"),e.close()}}),[]),(0,o.useEffect)((()=>{if(!j)return;if(!O||!L)return;const e=L.get(O.mac_address);e&&_&&O&&Object.hasOwn(O,"params")&&"UNKNOWN"==e.info.class&&O.params.sensorClass&&"UNKNOWN"!=O.params.sensorClass&&(J(!1),Y(`Please wait. Fetching schema for ${O.params.sensorClass}...`),async function(e,t){const n=await V("getSensorInfo",{mac_address:e,class:t});if(200!=n.status)throw new Error(`Unable get sensor info: ${n.statusText} (${n.status}) `);return await n.json()}(O.mac_address,O.params.sensorClass).then((e=>{$(e.schema)})).catch((e=>{alert(e.message)})).finally((()=>{Y(""),J(!0),M(!1)})))}),[j]),(0,o.useEffect)((()=>{H(""!=z)}),[z]),(0,o.useEffect)((()=>{"started"==R?(async function(){const e=await V("getBaseData");if(200!=e.status)throw new Error(`Unable to get base data: ${e.statusText} (${e.status}) `);const t=await e.json();return t.schema.htmlDescription=c().createElement("div",null,(0,r.Ay)(t.schema.htmlDescription),c().createElement("p",null)),t}().then((e=>{k(e.schema),D(e.data)})).catch((e=>{W(e.message)})),async function(){const e=await V("getProgress");if(200!=e.status)throw new Error(`Unable to get progress: ${e.statusText} (${e.status}) `);return await e.json()}().then((e=>{K(e)})).catch((e=>{W(e.message)}))):(k({}),D({}))}),[R]),"stopped"==R||"unknown"==R?c().createElement("h3",null,"Enable plugin to see configuration"):c().createElement("div",null,c().createElement(i.A,{anchorOrigin:{horizontal:"center",vertical:"bottom"},onClose:()=>H(!1),open:F,message:z,key:"snackbar"}),c().createElement("div",{className:q.root},c().createElement(l.A,{variant:"contained",onClick:()=>{ee("https://github.com/naugehyde/bt-sensors-plugin-sk/tree/1.2.0-beta#configuration")}},"Documentation"),c().createElement(l.A,{variant:"contained",onClick:()=>{ee("https://github.com/naugehyde/bt-sensors-plugin-sk/issues/new/choose")}},"Report Issue"),c().createElement(l.A,{variant:"contained",onClick:()=>{ee("https://discord.com/channels/1170433917761892493/1295425963466952725")}},"Discord Thread"),c().createElement("p",null),c().createElement("p",null)),c().createElement("hr",{style:{width:"100%",height:"1px",color:"gray","background-color":"gray","text-align":"left","margin-left":0}}),G?c().createElement("h2",{style:{color:"red"}},G):"",c().createElement(a.Ay,{schema:n,validator:s.Ay,uiSchema:{"ui:field":"LayoutGridField","ui:layoutGrid":{"ui:row":[{"ui:row":{className:"row",children:[{"ui:columns":{className:"col-xs-4",children:["adapter","transport","duplicateData","discoveryTimeout","discoveryInterval"]}}]}}]}},onChange:e=>D(e.formData),onSubmit:({formData:e},t)=>{var n;n=e,I(new Map),Q("updateBaseData",n).then((e=>{200!=e.status&&W(`Unable to update base data: ${e.statusText} (${e.status})`)})),$({})},onError:A("errors"),formData:C}),c().createElement("hr",{style:{width:"100%",height:"1px",color:"gray","background-color":"gray","text-align":"left","margin-left":0}}),c().createElement("p",null),c().createElement("p",null),P.deviceCount<P.totalDevices?c().createElement(v.A,{max:P.maxTimeout,now:P.progress}):"",c().createElement("p",null),c().createElement(y.A,{defaultActiveKey:"_configured",id:"domain-tabs",className:"mb-3"},function(){const e=[...new Set(L.entries().map((e=>e[1].info.domain)))].sort(),t=Array.from(L.entries()).filter((e=>X(e[1])));let n={};return n._configured=0==t.length?"Select a device from its domain tab (Electrical etc.) and configure it.":t.map((e=>Z(L.get(e[0])))),e.forEach((e=>{var t;n[e]=(t=e,Array.from(L.entries()).filter((e=>e[1].info.domain===t))).map((e=>Z(L.get(e[0]))))})),Object.keys(n).map((e=>function(e,t){let n=e.slice("_"===e.charAt(0)?1:0);return c().createElement(S.A,{eventKey:e,title:`${n.charAt(0).toUpperCase()}${n.slice(1)}${"string"==typeof t?"":" ("+t.length+")"}`},c().createElement(w.A,{style:{maxHeight:"300px",overflowY:"auto"}},t))}(e,n[e])))}()),c().createElement("div",{style:{paddingLeft:10,paddingTop:10,display:0==Object.keys(_).length?"none":""}},c().createElement(u.A,{container:!0,direction:"column",style:{spacing:5}},c().createElement(u.A,{item:!0},c().createElement("h2",null,_?.title),c().createElement("p",null)),c().createElement(u.A,{item:!0},(0,r.Ay)(_?.htmlDescription))),c().createElement("fieldset",{disabled:!U},c().createElement(a.Ay,{schema:_,validator:s.Ay,uiSchema:x,onChange:(e,t)=>{const n=L.get(e.formData.mac_address);n&&(n._changesMade=!0,n.config=e.formData,T(e.formData)),"root_params_sensorClass"==t&&M(!0)},onSubmit:({formData:e},t)=>{var n;Q("updateSensorData",n=e).then((e=>{if(200!=e.status)throw new Error(e.statusText);I((e=>(e.delete(n.mac_address),new Map(e)))),$({})})),alert("Changes saved")},onError:A("errors"),formData:O},c().createElement("div",{className:q.root},c().createElement(l.A,{type:"submit",color:"primary",variant:"contained"},"Save"),c().createElement(l.A,{variant:"contained",onClick:()=>{var e;e=O.mac_address,L.get(e)._changesMade=!1,L.get(e).config=JSON.parse(JSON.stringify(L.get(e).configCopy)),T(L.get(e).config)}},"Undo"),c().createElement(l.A,{variant:"contained",color:"secondary",onClick:e=>function(e){const t=L.get(e);(!X(t)||window.confirm(`Delete configuration for ${t.info.name}?`))&&function(e){try{Q("removeSensorData",{mac_address:e}).then((e=>{if(200!=e.status)throw new Error(e.statusText)})),I((t=>(t.delete(e),new Map(t)))),$({})}catch{}}(e)}(O.mac_address)},"Delete"))))))}const C=k}}]);

package/sensor_classes/{EcoWorthy.js → EcoWorthyBW02.js}

@@ -1,5 +1,18 @@
-const BTSensor = require("../BTSensor");
-({FakeDevice,FakeGATTService,FakeGATTCharacteristic }=require( "../development/FakeBTDevice.js"))
+const BTSensor = require("../BTSensor.js");
+let FakeDevice,FakeGATTService,FakeGATTCharacteristic;
+
+// Dynamically import FakeBTDevice.js for node<= 20 
+import('../development/FakeBTDevice.js')    
+  .then(module => {
+        FakeDevice = module.FakeDevice; 
+        FakeGATTService= module.FakeGATTService
+        FakeGATTCharacteristic=module.FakeGATTCharacteristic
+
+    })
+    .catch(error => {
+        console.error('Error loading FakeBTDevice:', error);
+    });
+//({FakeDevice,FakeGATTService,FakeGATTCharacteristic }=require( "../development/FakeBTDevice.js"))
 //a1000000650000000000180103440018004800640531ff8000002710000100010000000000000000000100020000ffff00000000000000000000000000000000000000000000000000000000000000000000418b
 //a20000006500000000001801035600040cfb0cfd0cfb0cfaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000300cd00c000befc18fc18fc18fc18fc18fc18976a
 
@@ -29,7 +42,7 @@ function waitForVariable(obj, variableName, interval = 100) {
   });
 }
 
-class EcoWorthy extends BTSensor {
+class EcoWorthyBW02 extends BTSensor {
       static Domain = BTSensor.SensorDomains.electrical
 
   static TX_RX_SERVICE = "0000fff0-0000-1000-8000-00805f9b34fb"  
@@ -45,7 +58,7 @@ class EcoWorthy extends BTSensor {
         )]
       )]
      )
-     const obj = new EcoWorthy(device)
+     const obj = new EcoWorthyBW02(device)
      obj.currentProperties={Name:"Fake EcoWorthy", Address:"<mac>"}
      obj.debug=(m)=>{console.log(m)}
      obj.deviceConnect=()=>{}
@@ -59,9 +72,8 @@ class EcoWorthy extends BTSensor {
   static identify(device){
     return null
   }
-  static ImageFile = "EcoWorthy.webp"
-
-
+  static ImageFile = "EcoWorthyBW02.webp"
+  
   async initSchema(){
       super.initSchema()
       this.addDefaultParam("batteryID")
@@ -157,4 +169,4 @@ async stopListening(){
 }
   
 }
-module.exports = EcoWorthy;
+module.exports = EcoWorthyBW02;

package/sensor_classes/Inkbird.js

@@ -12,7 +12,7 @@ class Inkbird extends BTSensor{
             return null
         
     }
-    static ImageFile = "InkbirdTH3.jpg"
+    static ImageFile = "InkbirdTH3.webp"
 
     initSchema() {
         super.initSchema()

package/sensor_classes/JBDBMS.js

@@ -104,6 +104,9 @@ class JBDBMS extends BTSensor {
   hasGATT(){
     return true
   }
+  usingGATT(){
+    return true
+  }
   initGATTNotifications(){
     this.intervalID = setInterval( async ()=>{
         await this.emitGATT()