bt-sensors-plugin-sk 1.2.4-3 → 1.2.5-1

package/index.js

@@ -1,5 +1,6 @@
 const packageInfo = require("./package.json")
 
+
 const {createBluetooth} = require('node-ble')
 const {Variant} = require('dbus-next')
 const {bluetooth, destroy} = createBluetooth()
@@ -138,10 +139,27 @@ module.exports =   function (app) {
 		var adapterID=options.adapter
 		var foundConfiguredDevices=0
 
+		if (Object.keys(options).length==0){ //empty config means initial startup. save defaults and enabled=true. 
+			let json = {configuration:{adapter:"hci0", transport:"le", discoveryTimeout:30, discoveryInterval:10}, enabled:true, enableDebug:false}
+			let appDataDirPath = app.getDataDirPath()
+			let jsonFile = appDataDirPath+'.json'
+			const fs = require("node:fs")
+			try {
+				fs.writeFileSync(jsonFile, JSON.stringify(json, null,2))
+				options=json
+			} catch(err){
+				console.log(`Error writing initial config: ${err.message} `)
+				console.log(err)
+			}
+		
+		}
+
 		plugin.registerWithRouter = function(router) {
 
 			router.post('/updateSensorData', async (req, res) => {
 				app.debug(req.body)
+				const sensor = sensorMap.get(req.body.mac_address)
+				sensor.prepareConfig(req.body)
 				const i = deviceConfigs.findIndex((p)=>p.mac_address==req.body.mac_address) 
 				if (i<0){
 					if (!options.peripherals){
@@ -154,18 +172,17 @@ module.exports =   function (app) {
 				} else {
 					options.peripherals[i] = req.body
 				}
+				deviceConfigs=options.peripherals
 				app.savePluginOptions(
 					options, async () => {
 						app.debug('Plugin options saved')
 						res.status(200).json({message: "Sensor updated"})
-						const sensor = sensorMap.get(req.body.mac_address)
 						if (sensor) {
 							removeSensorFromList(sensor)
 							if (sensor.isActive()) 
 								await sensor.stopListening()
-							initConfiguredDevice(req.body)
 						} 
-						
+						initConfiguredDevice(req.body)
 					}
 				)
 				
@@ -210,12 +227,6 @@ module.exports =   function (app) {
 					}
 				)
 			});
-			router.get('/getDomains', (req, res) => {
-				
-				res.status(200).json(
-					BTSensor.SensorDomains
-				);
-			})
 		
 			router.get('/getBaseData', (req, res) => {
 				
@@ -240,9 +251,10 @@ module.exports =   function (app) {
 
 			router.get('/getProgress', (req, res) => {
 				app.debug("Sending progress")
-				const json = {"progress":foundConfiguredDevices/deviceConfigs.length, "maxTimeout": 1, 
+				let deviceCount = deviceConfigs.filter((dc)=>dc.active).length
+				const json = {"progress":foundConfiguredDevices/deviceCount, "maxTimeout": 1, 
 							  "deviceCount":foundConfiguredDevices, 
-							  "totalDevices": deviceConfigs.length}
+							  "totalDevices": deviceCount}
 				res.status(200).json(json)
 				
 			  });
@@ -287,10 +299,12 @@ module.exports =   function (app) {
 			const config = getDeviceConfig(sensor.getMacAddress())
 			const schema = sensor.getJSONSchema()
 			schema.htmlDescription = sensor.getDescription()
+			
 			return {
 					info: getSensorInfo(sensor),
 					schema: schema,
-					config: config?config:{}
+					config: config?config:{},
+					configCopy: JSON.parse(JSON.stringify(config?config:{}))
 				}
 		}
 
@@ -576,11 +590,13 @@ module.exports =   function (app) {
 		}
 		if (!(deviceConfigs===undefined)){
 			const maxTimeout=Math.max(...deviceConfigs.map((dc)=>dc?.discoveryTimeout??options.discoveryTimeout))
+			const totalDevices = deviceConfigs.filter((dc)=>dc.active).length
+
 			var progress = 0
 			if (progressID==null) 
 			progressID  = setInterval(()=>{
-				channel.broadcast({"progress":++progress, "maxTimeout": maxTimeout, "deviceCount":foundConfiguredDevices, "totalDevices": deviceConfigs.length},"progress")
-				if ( foundConfiguredDevices==deviceConfigs.length){
+				channel.broadcast({"progress":++progress, "maxTimeout": maxTimeout, "deviceCount":foundConfiguredDevices, "totalDevices": totalDevices},"progress")
+				if ( foundConfiguredDevices==totalDevices){
 					progressID,progressTimeoutID = null
 					clearTimeout(progressTimeoutID)
 					clearInterval(progressID)
@@ -593,7 +609,7 @@ module.exports =   function (app) {
 
 					clearInterval(progressID);
 					progressID=null
-					channel.broadcast({"progress":maxTimeout, "maxTimeout": maxTimeout, "deviceCount":foundConfiguredDevices, "totalDevices": deviceConfigs.length},"progress")
+					channel.broadcast({"progress":maxTimeout, "maxTimeout": maxTimeout, "deviceCount":foundConfiguredDevices, "totalDevices": totalDevices},"progress")
 				} 
 			}, (maxTimeout+1)*1000);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.2.4-3",
+  "version": "1.2.5-1",
   "description": "Bluetooth Sensors for Signalk - see https://www.npmjs.com/package/bt-sensors-plugin-sk#supported-sensors for a list of supported sensors",
   "main": "index.js",
   "dependencies": { 

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,{default:()=>k});var a=n(73490),o=n(74810),s=n(86528),r=n.n(s),l=n(40334),c=n(27606),i=n(86452),u=n(82096),g=n(3768),d=n(71431),m=n(39676),f=n(47041),h=n(86038),p=n(95027),E=n(43540),w=n(38250),y=n(31008),v=n(20455),S=n(23399);const b=e=>console.log.bind(console,e);var A,D={};function k(e){const t=(0,u.A)((e=>({root:{"& > *":{margin:e.spacing(1)}}}))),[n,k]=(0,s.useState)({}),[C,_]=(0,s.useState)({}),[x,$]=(0,s.useState)({}),[T,N]=(0,s.useState)({"ui:options":{label:!1},title:{"ui:widget":"hidden"}}),[j,M]=(0,s.useState)([]),[O,U]=(0,s.useState)(),[L,J]=(0,s.useState)(new Map),[B,I]=(0,s.useState)({progress:0,maxTimeout:100,deviceCount:0,totalDevices:0}),[P,R]=(0,s.useState)("unknown"),[G,H]=(0,s.useState)(),K=t();function F(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 W(e){var t;console.log(`fetching ${e}`);try{t=fetch(`/plugins/bt-sensors-plugin-sk/${e}`,{credentials:"include"})}catch(e){t={status:500,statusText:e.toString()}}return t}function Y(e){return Object.keys(e.config).length>0}function q(e){const t=Y(e);return r().createElement(v.A,{action:!0,onClick:()=>{e.config.mac_address=e.info.mac,$(e.schema),U(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(g.A,null):e.info.signalStrength>80?r().createElement(d.A,null):e.info.signalStrength>60?r().createElement(m.A,null):e.info.signalStrength>40?r().createElement(f.A,null):e.info.signalStrength>20?r().createElement(h.A,null):r().createElement(p.A,null)}(e))));var n}function z(e){window.open(e,"_blank","noreferrer")}return(0,s.useEffect)((()=>{console.log("useEffect([])");let e=null;return W("getPluginState").then((async t=>{if(404==t.status)throw R("unknown"),new Error("unable to get plugin state");const n=await t.json();console.log("Setting up eventsource"),e=new EventSource("/plugins/bt-sensors-plugin-sk/sse",{withCredentials:!0}),R(n.state),await async function(){console.log("getDomains");const e=await W("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}(),e.addEventListener("newsensor",(e=>{console.log("newsensor");let t=JSON.parse(e.data);A.has(t.info.mac)||(console.log(`New sensor: ${t.info.mac}`),J(new Map(A.set(t.info.mac,t))))})),e.addEventListener("sensorchanged",(e=>{let t=JSON.parse(e.data);if(console.log("sensorchanged"),console.log(t),A.has(t.mac)){let e=A.get(t.mac);Object.assign(e.info,t),J(new Map(A))}})),e.addEventListener("progress",(e=>{console.log("progress");const t=JSON.parse(e.data);I(t),console.log(t)})),e.addEventListener("pluginstate",(e=>{console.log("pluginstate");const t=JSON.parse(e.data);R(t.state)}))})).catch((e=>{H(e)})),()=>{console.log("Closing connection to SSE"),e.close()}}),[]),(0,s.useEffect)((()=>{console.log("useEffect([pluginState])"),"started"==P?(console.log("refreshing sensor map"),async function(){console.log("getSensors");const e=await W("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=>{J(new Map(e.map((e=>[e.info.mac,e]))))})).catch((e=>{H(e)})),async function(){console.log("getBaseData");const e=await W("getBaseData");if(200!=e.status)throw new Error(`Unable to get base data: ${e.statusText} (${e.status}) `);const t=await e.json();return console.log(t),t.schema.htmlDescription=r().createElement("div",null,(0,l.Ay)(t.schema.htmlDescription),r().createElement("p",null)),t}().then((e=>{k(e.schema),_(e.data)})).catch((e=>{H(e)})),async function(){console.log("getProgress");const e=await W("getProgress");if(200!=e.status)throw new Error(`Unable to get progress: ${e.statusText} (${e.status}) `);const t=await e.json();return console.log(t),t}().then((e=>{I(e)})).catch((e=>{H(e)}))):(J(new Map),k({}),_({}))}),[P]),(0,s.useEffect)((()=>{console.log("useEffect([sensorMap])"),A=L;const e=new Set(L.entries().map((e=>e[1].info.domain))),t={_configured:Array.from(L.entries()).filter((e=>Y(e[1]))).map((e=>q(L.get(e[0]))))};e.forEach((e=>{var n;t[e]=(n=e,Array.from(L.entries()).filter((e=>e[1].info.domain===n))).map((e=>q(L.get(e[0]))))})),D=t}),[L]),"stopped"==P||"unknown"==P?r().createElement("h3",null,"Enable plugin to see configuration"):r().createElement("div",null,r().createElement("div",{className:K.root},r().createElement(i.A,{variant:"contained",onClick:()=>{z("https://github.com/naugehyde/bt-sensors-plugin-sk/tree/1.2.0-beta#configuration")}},"Documentation"),r().createElement(i.A,{variant:"contained",onClick:()=>{z("https://github.com/naugehyde/bt-sensors-plugin-sk/issues/new/choose")}},"Report Issue"),r().createElement(i.A,{variant:"contained",onClick:()=>{z("https://discord.com/channels/1170433917761892493/1295425963466952725")}},"Discord Thread"),r().createElement("p",null),r().createElement("p",null)),r().createElement("hr",{style:{width:"100%",height:"1px",color:"gray","background-color":"gray","text-align":"left","margin-left":0}}),G?r().createElement("h2",{style:"color: red;"},G):"",r().createElement(a.Ay,{schema:n,validator:o.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=>_(e.formData),onSubmit:({formData:e},t)=>{var n;n=e,console.log("updateBaseData"),F("updateBaseData",n).then((e=>{200!=e.status&&H(new Error(`Unable to update base data: ${e.statusText} (${e.status})`))})),$({})},onError:b("errors"),formData:C}),r().createElement("hr",{style:{width:"100%",height:"1px",color:"gray","background-color":"gray","text-align":"left","margin-left":0}}),r().createElement("p",null),r().createElement("p",null),B.deviceCount<B.totalDevices?r().createElement(S.A,{max:B.maxTimeout,now:B.progress}):"",r().createElement("p",null),r().createElement(w.A,{defaultActiveKey:"_configured",id:"domain-tabs",className:"mb-3",onClick:()=>{$({})}},Object.keys(D).map((e=>{return n=(t=e).slice("_"===t.charAt(0)?1:0),r().createElement(y.A,{eventKey:t,title:n.charAt(0).toUpperCase()+n.slice(1)},r().createElement(E.A,{style:{maxHeight:"300px",overflowY:"auto"}},function(e){return D[e]}(t)));var t,n}))),r().createElement("div",{style:{paddingLeft:10,paddingTop:10,display:0==Object.keys(x).length?"none":""}},r().createElement(c.A,{container:!0,direction:"column",style:{spacing:5}},r().createElement(c.A,{item:!0},r().createElement("h2",null,x?.title),r().createElement("p",null)),r().createElement(c.A,{item:!0},(0,l.Ay)(x?.htmlDescription))),r().createElement(a.Ay,{schema:x,validator:o.Ay,uiSchema:T,onChange:e=>{L.get(e.formData.mac_address)._changesMade=!0,U(e.formData)},onSubmit:({formData:e},t)=>{var n;n=e,console.log("updateSensorData"),F("updateSensorData",n).then((e=>{if(200!=e.status)throw new Error(e.statusText);L.get(n.mac_address)._changesMade=!1,L.get(n.mac_address).config=n})),$({}),alert("Changes saved")},onError:b("errors"),formData:O},r().createElement("div",{className:K.root},r().createElement(i.A,{type:"submit",color:"primary",variant:"contained"},"Save"),r().createElement(i.A,{variant:"contained",onClick:()=>{var e;e=O.mac_address,console.log("undoChanges"),L.get(e)._changesMade=!1,U(L.get(e).config)}},"Undo"),r().createElement(i.A,{variant:"contained",color:"secondary",onClick:e=>{return t=O.mac_address,void(window.confirm(`Delete configuration for ${t}?`)&&function(e){console.log("removeSensorData");try{F("removeSensorData",{mac_address:e}).then((e=>{if(200!=e.status)throw new Error(e.statusText)})),A.delete(e),J(new Map(A)),$({})}catch{}}(t));var t}},"Delete")))))}}}]);
+(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:()=>A,default:()=>k});var a=n(73490),s=n(74810),r=n(40334),o=n(86528),c=n.n(o),i=n(86452),l=n(27606),u=n(82096),m=n(3768),d=n(71431),g=n(39676),f=n(47041),p=n(86038),h=n(95027),E=n(43540),w=n(38250),y=n(31008),v=n(20455),S=n(23399);const b=e=>console.log.bind(console,e);function A(e){const t=(0,u.A)((e=>({root:{"& > *":{margin:e.spacing(1)}}}))),[n,A]=(0,o.useState)({}),[k,D]=(0,o.useState)({}),[C,x]=(0,o.useState)({}),[$,_]=(0,o.useState)({"ui:options":{label:!1},title:{"ui:widget":"hidden"}}),[T,N]=(0,o.useState)(),[O,j]=(0,o.useState)(new Map),[M,J]=(0,o.useState)({progress:0,maxTimeout:100,deviceCount:0,totalDevices:0}),[L,U]=(0,o.useState)("unknown"),[I,B]=(0,o.useState)(),P=t();function R(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 G(e){var t;try{t=fetch(`/plugins/bt-sensors-plugin-sk/${e}`,{credentials:"include"})}catch(e){t={status:500,statusText:e.toString()}}return t}function H(e){return Object.keys(e.configCopy).length>0}function K(e){const t=H(e);return c().createElement(v.A,{action:!0,onClick:()=>{e.config.mac_address=e.info.mac,x(e.schema),N(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(m.A,null):e.info.signalStrength>80?c().createElement(d.A,null):e.info.signalStrength>60?c().createElement(g.A,null):e.info.signalStrength>40?c().createElement(f.A,null):e.info.signalStrength>20?c().createElement(p.A,null):c().createElement(h.A,null)}(e))));var n}function F(e){window.open(e,"_blank","noreferrer")}return(0,o.useEffect)((()=>{let e=null;return G("getPluginState").then((async t=>{if(404==t.status)throw U("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}`),j((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);j((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);J(t)})),e.addEventListener("pluginstate",(e=>{const t=JSON.parse(e.data);U(t.state)})),U(n.state),(async()=>{const e=await async function(){const e=await G("getSensors");if(200!=e.status)throw new Error(`Unable get sensor data: ${e.statusText} (${e.status}) `);return await e.json()}();j(new Map(e.map((e=>[e.info.mac,e]))))})()})).catch((e=>{B(e)})),()=>{console.log("Closing connection to SSE"),e.close()}}),[]),(0,o.useEffect)((()=>{"started"==L?(async function(){const e=await G("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=>{A(e.schema),D(e.data)})).catch((e=>{B(e)})),async function(){const e=await G("getProgress");if(200!=e.status)throw new Error(`Unable to get progress: ${e.statusText} (${e.status}) `);return await e.json()}().then((e=>{J(e)})).catch((e=>{B(e)}))):(A({}),D({}))}),[L]),"stopped"==L||"unknown"==L?c().createElement("h3",null,"Enable plugin to see configuration"):c().createElement("div",null,c().createElement("div",{className:P.root},c().createElement(i.A,{variant:"contained",onClick:()=>{F("https://github.com/naugehyde/bt-sensors-plugin-sk/tree/1.2.0-beta#configuration")}},"Documentation"),c().createElement(i.A,{variant:"contained",onClick:()=>{F("https://github.com/naugehyde/bt-sensors-plugin-sk/issues/new/choose")}},"Report Issue"),c().createElement(i.A,{variant:"contained",onClick:()=>{F("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}}),I?c().createElement("h2",{style:"color: red;"},I):"",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,j(new Map),R("updateBaseData",n).then((e=>{200!=e.status&&B(new Error(`Unable to update base data: ${e.statusText} (${e.status})`))})),x({})},onError:b("errors"),formData:k}),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),M.deviceCount<M.totalDevices?c().createElement(S.A,{max:M.maxTimeout,now:M.progress}):"",c().createElement("p",null),c().createElement(w.A,{defaultActiveKey:"_configured",id:"domain-tabs",className:"mb-3"},function(){const e=[...new Set(O.entries().map((e=>e[1].info.domain)))].sort(),t=Array.from(O.entries()).filter((e=>H(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=>K(O.get(e[0])))),e.forEach((e=>{var t;n[e]=(t=e,Array.from(O.entries()).filter((e=>e[1].info.domain===t))).map((e=>K(O.get(e[0]))))})),Object.keys(n).map((e=>function(e,t){let n=e.slice("_"===e.charAt(0)?1:0);return c().createElement(y.A,{eventKey:e,title:`${n.charAt(0).toUpperCase()}${n.slice(1)}${"string"==typeof t?"":" ("+t.length+")"}`},c().createElement(E.A,{style:{maxHeight:"300px",overflowY:"auto"}},t))}(e,n[e])))}()),c().createElement("div",{style:{paddingLeft:10,paddingTop:10,display:0==Object.keys(C).length?"none":""}},c().createElement(l.A,{container:!0,direction:"column",style:{spacing:5}},c().createElement(l.A,{item:!0},c().createElement("h2",null,C?.title),c().createElement("p",null)),c().createElement(l.A,{item:!0},(0,r.Ay)(C?.htmlDescription))),c().createElement(a.Ay,{schema:C,validator:s.Ay,uiSchema:$,onChange:e=>{const t=O.get(e.formData.mac_address);t&&(t._changesMade=!0,t.config=e.formData,N(e.formData))},onSubmit:({formData:e},t)=>{var n;R("updateSensorData",n=e).then((e=>{if(200!=e.status)throw new Error(e.statusText);j((e=>(e.delete(n.mac_address),new Map(e)))),x({})})),alert("Changes saved")},onError:b("errors"),formData:T},c().createElement("div",{className:P.root},c().createElement(i.A,{type:"submit",color:"primary",variant:"contained"},"Save"),c().createElement(i.A,{variant:"contained",onClick:()=>{var e;e=T.mac_address,O.get(e)._changesMade=!1,O.get(e).config=JSON.parse(JSON.stringify(O.get(e).configCopy)),N(O.get(e).config)}},"Undo"),c().createElement(i.A,{variant:"contained",color:"secondary",onClick:e=>function(e){const t=O.get(e);(!H(t)||window.confirm(`Delete configuration for ${t.info.name}?`))&&function(e){try{R("removeSensorData",{mac_address:e}).then((e=>{if(200!=e.status)throw new Error(e.statusText)})),j((t=>(t.delete(e),new Map(t)))),x({})}catch{}}(e)}(T.mac_address)},"Delete")))))}const k=A}}]);

package/public/index.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<style>
+  .line {
+    fill: none;
+    stroke: steelblue;
+    stroke-width: 20px;
+  }
+</style>
+
+<body>
+  <h1>Bluetooth Sensors for SignalK</h1>
+
+  <script>
+
+    var margin = { top: 20, right: 20, bottom: 30, left: 50 },
+      width = 960 - margin.left - margin.right,
+      height = 300 - margin.top - margin.bottom;
+  
+
+
+  </script>
+<script src="main.js"></script><script src="remoteEntry.js"></script></body>

package/sensor_classes/BTHome/AbstractBTHomeSensor.js

@@ -235,7 +235,7 @@ class AbstractBTHomeSensor extends BTSensor {
 	 * Extracts motion detection from the given BTHome data.
 	 *
 	 * @param btHomeData {BTHomeServiceData.BthomeServiceData} The BTHome data provided by the device.
-	 * @returns {Boolean|null} The device's button press state.
+   * @returns {Boolean|null} Wether the device has detected motion.
 	 */
 	parseMotion(btHomeData) {
 		const motion = this.getSensorDataByObjectId(
@@ -304,6 +304,31 @@ class AbstractBTHomeSensor extends BTSensor {
 		return null;
 	}
 
+  /**
+   * Parses the opening (window/door) state from BTHome service data.
+   * @param {BTHomeServiceData.BthomeServiceData} btHomeData - The parsed BTHome data object.
+   * @returns {string|null} "open", "closed", or null if not present.
+   */
+  parseWindowState(btHomeData) {
+    const state = this.getSensorDataByObjectId(btHomeData, BTHomeServiceData.BthomeObjectId.BINARY_WINDOW)?.window;
+    if (state.intValue === 1) return "open";
+    if (state.intValue === 0) return "closed";
+    return null;
+  }
+
+  /**
+   * Parses the rotation from BTHome service data.
+   * @param {BTHomeServiceData.BthomeServiceData} btHomeData - The parsed BTHome data object.
+   * @returns {number|null} rotation in degrees from the closed position, or null if not present.
+   */
+  parseRotation(btHomeData) {
+    // Use the correct object ID for window event (0x2D, which is 45 in decimal, which is already specified in BthomeObjectId).
+    const sensorRotation = this.getSensorDataByObjectId(btHomeData, BTHomeServiceData.BthomeObjectId.SENSOR_ROTATION_0_1)?.rotation;
+    if (sensorRotation) {
+      return Number.parseFloat(sensorRotation.toFixed(2));
+    }
+    return null;
+  }
 
 	propertiesChanged(props) {
 		super.propertiesChanged(props);

package/sensor_classes/Junctek.js

@@ -5,7 +5,7 @@ const BTSensor = require("../BTSensor");
 function bytesToBase10String(bytes){
         let s = ""
         for (let byte of bytes){
-            s+=byte.toString(16)
+            s+=byte.toString(16).padStart(2,'0')
         }
         return s
     }
@@ -22,6 +22,8 @@ class JunctekBMS extends BTSensor{
         return null
     }
 
+    chargeDirection = 1 
+
     hasGATT(){
         return true
     }
@@ -47,12 +49,14 @@ class JunctekBMS extends BTSensor{
         this.addDefaultPath("charge",'electrical.batteries.capacity.charge')
         this.addDefaultPath("temperature",'electrical.batteries.temperature')
         this.addDefaultPath("actualCapacity",'electrical.batteries.capacity.actual')
+        this.addMetadatum('timeToCharged','s', 'time in seconds to battery is fully charged')
+            .default='electrical.batteries.{batteryID}.timeToCharged'
         this.addMetadatum('impedance','mOhm', 'measured resistance')
             .default='electrical.batteries.{batteryID}.impedance'
     }
 
     emitFrom(buffer){
-        var value=[], chargeDirection = 1
+        let value=[], emitObject={}
         this.debug(buffer)
         for (let byte of buffer){
             if (byte==0xBB) {
@@ -65,45 +69,62 @@ class JunctekBMS extends BTSensor{
             
             if (isNaN(parseInt(byte.toString(16)))){ //not a base-10 number. seriously. that's how Junctek does this.
                 const v = parseInt(bytesToBase10String(value))
+                //if (byte!==0xd5)
+                //    this.debug(`0x${(byte).toString(16)}: ${(value).map((v)=>'0x'+v.toString(16))} (${v})`)
                 value=[]
                 switch (byte){
                 case 0xC0:
-                    this.emit("voltage",v/100)
+                    emitObject["voltage"]=v/100
                     break
                 
                 case 0xC1:
-                    this.emit("current",(v/100)*chargeDirection)
+                    emitObject["current"]=()=>{return (v/100)*this.chargeDirection}
                     break
 
                 case 0xD1:
-                    if (byte==0)
-                        chargeDirection=-1
+                    this.debug(v)
+                    if (v==0)
+                        this.chargeDirection=-1
+                    else 
+                        this.chargeDirection= 1
+                    this.debug(this.chargeDirection)
                     break
 
                 case 0xD2:
-                    this.emit("remaining",v*3.6)
+
+                    emitObject["remaining"]=v*3.6
                     break
 
                 case 0xD3:
-                    this.emit("discharge",v/100000)
+                    emitObject["discharge"]= v/100000
                     break
                 case 0xD4:
-                    this.emit("charge",v/100000)
+                    emitObject["charge"]=v/100000
                     break
                 case 0xD6:
-                    this.emit("timeRemaining",v*60)
+                    if (chargeDirection==-1){
+                        emitObject["timeToCharged"] = NaN
+                        emitObject["timeRemaining"] = v*60
+                    }
+                    else {
+                        emitObject["timeRemaining"] = NaN
+                        emitObject["timeToCharged"] = v*60
+                    }
                     break
                 case 0xD7:
-                    this.emit("impedance",v/100)
+                    emitObject["impedance"]=v/100
                     break
                 case 0xD8:
-                    this.emit("power",(v/100)*chargeDirection)
+                    emitObject["power"]=()=>{
+                        this.debug(this.chargeDirection)
+                        return (v/100)*this.chargeDirection
+                    }
                     break
                 case 0xD9:
-                    this.emit("temperature",v + 273.15) //assume C not F
+                    emitObject["temperature"]=v + 173.15 //assume C not F -- raw value is c - 100
                     break
                 case 0xB1:
-                    this.emit("capacityActual",v /10 )
+                    emitObject["capacityActual"]=v /10
                     break
             }
             }
@@ -111,12 +132,16 @@ class JunctekBMS extends BTSensor{
                 value.push(byte)
             }
         }
+        for (const [key, value] of Object.entries(emitObject)) {
+                this.emit(key,value instanceof Function?value():value)
+        }
+        emitObject = {}
     }
     emitGATT(){
-        this.battCharacteristic.readValue()
+        /*this.battCharacteristic.readValue()
         .then((buffer)=>{
             this.emitFrom(buffer)
-        })
+        })*/
     }
     initGATTConnection(){ 
         return new Promise((resolve,reject )=>{ this.deviceConnect().then(async ()=>{ 

package/sensor_classes/MercurySmartcraft.js

@@ -45,10 +45,10 @@ class MercurySmartcraft extends BTSensor{
             "id",
             {
                 "title": "Engine ID",
-                "examples": ["port","starboard","p0","p1"]
+                "examples": ["port","starboard","p0","p1"],
+                "isRequired": true
             }
         )
-        this._schema.properties.params.required=["id"]
 
         this.addMetadatum("rpm","Hz","engine revolutions per sec", 
             (buffer)=>{return buffer.readUInt16LE(bo)/60}

package/sensor_classes/MopekaTankSensor.js

@@ -259,8 +259,8 @@ class MopekaTankSensor extends BTSensor{
         
     async init(){
         await super.init()
-        const md = this.valueIfVariant(this.getManufacturerData(this.constructor.manufacturerID))
-        this.modelID = md[0]
+        const md = this.getManufacturerData(this.constructor.manufacturerID)
+        this.modelID = md?md[0]:0
     } 
 
     getMedium(){
@@ -280,17 +280,19 @@ class MopekaTankSensor extends BTSensor{
         this.addParameter("medium",
             {
                 title:"type of liquid in tank",
-                enum: Object.keys(Media)
+                enum: Object.keys(Media),
+                isRequired: true
             }
         )
         this.addParameter("tankHeight",
             {
                 title:"height of tank (in mm)",
-                type:"number",
-                unit:"mm"
+                type:"integer",
+                unit:"mm",
+                isRequired: true
             }
         )
-        this.addDefaultParam("id")
+        this.addDefaultParam("id", true)
 
         this.addDefaultPath("battVolt","sensors.batteryVoltage") 
             .read=((buffer)=>{ 
@@ -321,12 +323,12 @@ class MopekaTankSensor extends BTSensor{
         this.addMetadatum("accX","Mg","acceleration on X-axis", 
             (buffer)=>{ return buffer.readUInt8(8)}
         )
-        .default="sensors.{macAndName}.accelerationXAxis"
+        .examples=["sensors.{macAndName}.accelerationXAxis"]
 
         this.addMetadatum("accY","Mg","acceleration on Y-axis", 
             (buffer)=>{ return buffer.readUInt8(9)}
         )        
-        .default="sensors.{macAndName}.accelerationYAxis"
+        .examples=["sensors.{macAndName}.accelerationYAxis"]
     }
 
     propertiesChanged(props){

package/sensor_classes/RuuviTag.js

@@ -50,15 +50,15 @@ class RuuviTag extends BTSensor{
         
         this.addMetadatum("accX","Mg","acceleration on X-axis", 
             (buffer)=>{ return buffer.readInt16BE(7)}
-        ).default="sensors.{macAndName}.accX"
+        ).examples=["sensors.{macAndName}.accX"]
         
         this.addMetadatum("accY","Mg","acceleration on Y-axis", 
             (buffer)=>{ return buffer.readInt16BE(9)}
-        )        .default="sensors.{macAndName}.accY"
+        )        .examples=["sensors.{macAndName}.accY"]
         
         this.addMetadatum("accZ","Mg","acceleration on Z-axis", 
             (buffer)=>{ return buffer.readInt16BE(11)}
-        ) .default="sensors.{macAndName}.accZ"
+        ) .examples=["sensors.{macAndName}.accZ"]
         
         this.addDefaultPath("battV","sensors.batteryVoltage")
         .read=(buffer)=>{ return parseFloat((1.6+(buffer.readUInt16BE(13)>>5)/1000).toFixed(2))}
@@ -66,12 +66,12 @@ class RuuviTag extends BTSensor{
         this.addMetadatum("mc","","movement counter", 
             (buffer)=>{ return buffer.readUInt16BE(13) && 0x1F}
         )
-        .default="sensors.{macAndName}.movementCounter"
+        .examples=["sensors.{macAndName}.movementCounter"]
 
         this.addMetadatum("msc","","measurement sequence counter", 
             (buffer)=>{ return buffer.readUInt16BE(15)}
         )
-        .default="sensors.{macAndName}.measurementSequenceCounter"
+        .examples=["sensors.{macAndName}.measurementSequenceCounter"]
         
     }
 

package/sensor_classes/ShellySBDW002C.js

@@ -0,0 +1,51 @@
+const BTHomeServiceData = require("./BTHome/BTHomeServiceData");
+const AbstractBTHomeSensor = require("./BTHome/AbstractBTHomeSensor");
+
+/**
+ * Sensor class representing the Shelly BLU Door/Window.
+ * Specification on @see https://shelly-api-docs.shelly.cloud/docs-ble/Devices/dw
+ * This sensor is publishing data utilising the BTHome format and inherits from {@link AbstractBTHomeSensor}.
+ */
+class ShellySBDW002C extends AbstractBTHomeSensor {
+  static Domain = this.SensorDomains.environmental;
+
+  /**
+   * The shortened local name as advertised by the Shelly BLU H&T.
+   * @type {string}
+   */
+  static SHORTENED_LOCAL_NAME = "SBDW-002C";
+  static LOCAL_NAME = "Shelly BLU Door/Window";
+
+  getDescription() {
+    return `For more information about the sensor go here: <a href=https://us.shelly.com/products/shelly-blu-door-window-white target="_blank">Shelly Blu Door/Window</a>.`;
+  }
+
+  initSchema() {
+    super.initSchema();
+    this.addDefaultParam("zone", true).default = "cabin";
+
+    this.addParameter("opening", {
+      title: "Name of opening",
+      examples: ["companionWay", "porthole", "hatch"],
+      isRequired: true,
+      default: "companionWay",
+    });
+
+    this.addMetadatum("opening", "", "state of opening (door/window) as 'open' or 'closed'; null if not present. ", this.parseWindowState.bind(this)).default =
+      "environment.{zone}.{opening}.state";
+
+    // The second parameter is not the signalk path, but a JSON object in plugin_defaults.json; that provides the default signalk path
+    this.addDefaultPath("battery", "sensors.batteryStrength").read = this.parseBatteryLevel.bind(this);
+
+    this.addMetadatum("illuminance", "lx", "illuminance measured in lux, scaled 0.01", this.parseIlluminance.bind(this)).default =
+      "sensors.{macAndName}.illuminance";
+
+    this.addMetadatum("rotation", "deg", "rotation in degrees from the closed position; null if not present", this.parseRotation.bind(this)).default =
+      "sensors.{macAndName}.rotation";
+
+    this.addMetadatum("button", "", "button 'press' or 'hold_press'; null if not present", this.parseShellyButton.bind(this)).default =
+      "sensors.{macAndName}.button";
+  }
+}
+
+module.exports = ShellySBDW002C;

package/sensor_classes/ShellySBMO003Z.js

@@ -27,8 +27,7 @@ class ShellySBMO003Z extends AbstractBTHomeSensor {
 
 	initSchema() {
 		super.initSchema()
-		this.addDefaultParam("zone")
-
+		this.addDefaultParam("zone", true)
 
 		this.addMetadatum(
 			"motion",

package/sensor_classes/ShenzhenLiOnBMS.js

@@ -60,6 +60,7 @@ class ShenzhenLiONBMS extends BTSensor{
             {
                 title:"Number of cells",
                 type: "integer",
+                isRequired: true,
                 default: 4,
                 minimum: 1,
                 maximum: 16

package/sensor_classes/Victron/VictronSensor.js

@@ -15,9 +15,15 @@ function sleep(x) {
 
     constructor(device,config,gattConfig){
         super(device,config,gattConfig)
-        this.encryptionKey = config?.encryptionKey
+        
+        if(device.modelID)
+            this.modelID=device.modelID
+        
     }
     
+    static getModelID(md) {
+        return md[0x2e1]?.value.readUInt16LE(2)??-1
+    }
     static async identifyMode(device, mode){
             
         var md = await this.getDeviceProp(device,'ManufacturerData')
@@ -26,8 +32,10 @@ function sleep(x) {
         else {
             
             if (md[0x2e1].value[0]==0x10) {
-                if (md[0x2e1].value[4]==mode)
+                if (md[0x2e1].value[4]==mode) {
+                    device.modelID=this.getModelID(md)
                     return this
+                }
                 else 
                     return null
             }
@@ -45,8 +53,10 @@ function sleep(x) {
                 await sleep(500)
             }
             device.helper.removeListeners()
-            if (md[0x2e1].value[4]==mode)
+            if (md[0x2e1].value[4]==mode) {
+                device.modelID=this.getModelID(md)
                 return this
+            }
             else
                 return null
         } 
@@ -60,14 +70,13 @@ function sleep(x) {
                 title:"Encryption Key"
             }
         )
-        this.model_id=this.getManufacturerData(0x2e1)?.readUInt16LE(2)??"Unknown"
-        this._schema.title = this.getName()
     }
     alarmReason(alarmValue){
         return this.constructor.AlarmReason[alarmValue]
     }
     getModelName(){
-        const m = VC.MODEL_ID_MAP[this.model_id]
+        const mID = this.getModelID()
+        const m = VC.MODEL_ID_MAP[mID]
         if(m) {
             if(typeof m == 'string' || m instanceof String ) {
                 return m
@@ -75,7 +84,7 @@ function sleep(x) {
                 return m.name
             }
         }
-        return this.constructor.name+" (Model ID:"+this.model_id+")"
+        return this.constructor.name+` (Model ID: ${mID==-1?"Unknown":mID})`
     }
 
     decrypt(data){
@@ -98,6 +107,13 @@ function sleep(x) {
         return Buffer.from(decData)
         
     }
+    getModelID(){
+        if (!this.modelID ||this.modelID==-1)
+            this.modelID=this.getManufacturerData(0x2e1)?.readUInt16LE(2)??-1
+
+        return this.modelID
+    }
+
     getName(){
         return `Victron ${this.getModelName()}`
     }
@@ -122,7 +138,7 @@ function sleep(x) {
     }
 
    getImage(){
-        const m = VC.MODEL_ID_MAP[this.model_id]
+        const m = VC.MODEL_ID_MAP[this.getModelID()]
         if (m && m.image)
             return m.image
         else
@@ -138,5 +154,10 @@ function sleep(x) {
     To get the encryption key for your device, follow the instructions <a href=https://communityarchive.victronenergy.com/questions/187303/victron-bluetooth-advertising-protocol.html target="_victron_encrypt">here</a>`
    }
 
+   prepareConfig(config){
+        super.prepareConfig(config)
+        config.params.modelID=this.getModelID()
+    }
+
 }
 module.exports=VictronSensor

package/sensor_classes/XiaomiMiBeacon.js

@@ -218,7 +218,8 @@ class XiaomiMiBeacon extends BTSensor{
         this.addParameter(
             "encryptionKey",
             {
-                title: "encryptionKey (AKA bindKey) for decryption"
+                title: "encryptionKey (AKA bindKey) for decryption",
+
             }
         )
         this.addDefaultPath('temp','environment.temperature')