bt-sensors-plugin-sk 1.2.0-beta.0.0.8 → 1.2.0-beta.0.1.0

package/sensor_classes/SwitchBotTH.js

@@ -1,6 +1,8 @@
 const BTSensor = require("../BTSensor");
 
 class SwitchBotTH extends  BTSensor {
+    static Domain = BTSensor.SensorDomains.environmental
+		
     static async test(){
 
         const p = {[this.ID.toString()]: [0xd8, 0x35, 0x34, 0x38, 0x4f, 0x70, 0x07, 0x02, 0x04, 0x96, 0x2c, 0x00]}

package/sensor_classes/UltrasonicWindMeter.js

@@ -1,5 +1,7 @@
 const BTSensor = require("../BTSensor");
 class UltrasonicWindMeter extends BTSensor{
+    static Domain = BTSensor.SensorDomains.environmental
+		
     static async identify(device){
         
         const uuids = await this.getDeviceProp(device,'UUIDs')
@@ -12,6 +14,9 @@ class UltrasonicWindMeter extends BTSensor{
     hasGATT(){
         return true
     }
+    usingGATT(){
+        return true
+    }
     emitGATT(){
         this.battCharacteristic.readValue()
         .then((buffer)=>
@@ -29,6 +34,7 @@ class UltrasonicWindMeter extends BTSensor{
     }
      initSchema(){
         super.initSchema()
+        this.getGATTParams()["useGATT"].default=true
         this.addDefaultPath("batt",'sensors.batteryStrength')
             .read=(buffer)=>{return (buffer.readUInt8())/100}
 

package/sensor_classes/Victron/VictronSensor.js

@@ -9,6 +9,7 @@ function sleep(x) {
     });
   }
   class VictronSensor extends BTSensor{
+    static Domain = BTSensor.SensorDomains.electrical
 
     constructor(device,config,gattConfig){
         super(device,config,gattConfig)

package/sensor_classes/VictronInverterRS.js

@@ -19,13 +19,13 @@ class VictronInverterRS extends VictronSensor{
 
         const md = this.addMetadatum('chargerError','', 'charger error',
             (buff)=>{return VC.ChargerError(buff.readIntU8(1))})
-            .default='electrical.inverters.{id}.error'
+            md.default='electrical.inverters.{id}.error'
             md.notify=true
 
         this.addMetadatum('batteryVoltage','V', 'battery voltage', 
             (buff)=>{return this.NaNif(buff.readInt16LE(2),0x7FFF)/100})
             .default='electrical.inverters.{id}.battery.voltage'
-        
+        .
         this.addMetadatum('pvPower','W', 'PV power', 
             (buff)=>{return this.NaNif(buff.readUInt16LE(4), 0xffff)})
             .default='electrical.inverters.{id}.power'

package/sensor_classes/XiaomiMiBeacon.js

@@ -71,7 +71,8 @@ const DEVICE_TYPES = new Map([
   ]);
 
 class XiaomiMiBeacon extends BTSensor{
-
+    static Domain = BTSensor.SensorDomains.environmental
+		
     constructor(device, config, gattConfig){
         super(device, config, gattConfig)
         this.encryptionKey = config?.encryptionKey

package/src/components/PluginConfigurationPanel.js

@@ -10,12 +10,14 @@ import { SignalCellular0Bar, SignalCellular1Bar, SignalCellular2Bar, SignalCellu
 const log = (type) => console.log.bind(console, type);
 
 import ListGroup from 'react-bootstrap/ListGroup';
+import Tabs from 'react-bootstrap/Tabs';
+import Tab from 'react-bootstrap/Tab';
 import { ListGroupItem } from 'react-bootstrap';
 
 import ProgressBar from 'react-bootstrap/ProgressBar';
 
 
-var _sensorMap
+var _sensorMap, _sensorDomains={}, _sensorList={}
 
 export default (props) => {
 
@@ -47,7 +49,6 @@ export default (props) => {
  
   const [pluginState, setPluginState ] = useState("unknown")
   const [error, setError ] = useState()
-  
 
   function sendJSONData(cmd, data){
 
@@ -65,16 +66,16 @@ export default (props) => {
 
   async function fetchJSONData(path){
     console.log(`fetching ${path}`)
-
+     
     return fetch(`/plugins/bt-sensors-plugin-sk/${path}`, {
       credentials: 'include'
     })
 
   }
 
-  async function getSensorData(){
-  
-    const response = await fetchJSONData("sensors")
+  async function getSensors(){
+    console.log("getSensors")
+    const response = await fetchJSONData("getSensors")
     if (response.status!=200){
       throw new Error(`Unable get sensor data: ${response.statusText} (${response.status}) `)
     }
@@ -83,10 +84,20 @@ export default (props) => {
     return json
 
   }
+  async function getDomains(){
+    console.log("getDomains")
+    const response = await fetchJSONData("getDomains")
+    if (response.status!=200){
+      throw new Error(`Unable get domain data: ${response.statusText} (${response.status}) `)
+    }
+    const json = await response.json()
+    console.log(json)
+    return json
 
+  }
   async function getBaseData(){
-    
-    const response = await fetchJSONData("base")
+    console.log("getBaseData")
+    const response = await fetchJSONData("getBaseData")
     if (response.status!=200){
       throw new Error(`Unable get base data: ${response.statusText} (${response.status}) `)
     }
@@ -95,8 +106,8 @@ export default (props) => {
     return json
   }
   async function getProgress(){
-    
-    const response = await fetchJSONData("progress")
+    console.log("getProgress")
+    const response = await fetchJSONData("getProgress")
     if (response.status!=200){
       throw new Error(`Unable get progres: ${response.statusText} (${response.status}) `)
     }
@@ -106,7 +117,8 @@ export default (props) => {
   }
 
   function updateSensorData(data){
-    sendJSONData("sendSensorData", data).then((response)=>{ 
+    console.log("updateSensorData")
+    sendJSONData("updateSensorData", data).then((response)=>{ 
       if (response.status != 200) {
         throw new Error(response.statusText)
       }
@@ -114,14 +126,17 @@ export default (props) => {
       sensorMap.get(data.mac_address).config = data
       
     })
-  }
+  } 
 
   function undoChanges(mac) {
+    console.log("undoChanges")
     sensorMap.get(mac)._changesMade = false
     setSensorData( sensorMap.get(mac).config )
   }
 
   function removeSensorData(mac){
+    console.log("removeSensorData")
+
     try{ 
     
       sendJSONData("removeSensorData", {mac_address:mac} ).then((response)=>{
@@ -142,7 +157,9 @@ export default (props) => {
 
 
   function updateBaseData(data){
-    sendJSONData("sendBaseData", data).then( (response )=>{
+    console.log("updateBaseData")
+
+    sendJSONData("updateBaseData", data).then( (response )=>{
       if (response.status != 200) {
         setError(new Error(`Unable to update base data: ${response.statusText} (${response.status})`))
       } else {
@@ -160,7 +177,7 @@ export default (props) => {
   function refreshSensors(){
     console.log('refreshing sensor map')
 
-    getSensorData().then((sensors)=>{
+    getSensors().then((sensors)=>{
       setSensorMap (new Map(sensors.map((sensor)=>[sensor.info.mac,sensor])));    
     })
     .catch((e)=>{
@@ -170,14 +187,23 @@ export default (props) => {
 
 
   useEffect(()=>{
-
-    fetchJSONData("sendPluginState").then( async (response)=> {
+    console.log("useEffect([])")
+    fetchJSONData("getPluginState").then( async (response)=> {
+      if (response.status==404) {
+        setPluginState("unknown")
+        throw new Error("unable to get plugin state")
+      }
       const json = await response.json()
       setPluginState(json.state)
+
+      
+      _sensorDomains = await getDomains()
+
       console.log("Setting up eventsource")
       const eventSource = new EventSource("/plugins/bt-sensors-plugin-sk/sse")
       
       eventSource.addEventListener("newsensor", (event) => {
+        console.log("newsensor")
         let json = JSON.parse(event.data)
         
         if (!_sensorMap.has(json.info.mac)) {
@@ -187,7 +213,9 @@ export default (props) => {
       });
 
       eventSource.addEventListener("sensorchanged", (event) => {
-        let json = JSON.parse(event.data)        
+        let json = JSON.parse(event.data)      
+        console.log("sensorchanged")
+        console.log(json)
         
         if (_sensorMap.has(json.mac)) {      
           let sensor = _sensorMap.get(json.mac)
@@ -196,12 +224,14 @@ export default (props) => {
         }
       });
       eventSource.addEventListener("progress", (event) => {
+        console.log("progress")
         const json = JSON.parse(event.data)  
         setProgress(json)
         console.log(json)
       });
 
       eventSource.addEventListener("pluginstate", (event) => {
+        console.log("pluginstate")
         const json = JSON.parse(event.data)  
         setPluginState(json.state)
       });
@@ -215,6 +245,7 @@ export default (props) => {
 },[])
 
 useEffect(()=>{
+  console.log("useEffect([pluginState])")
   if (pluginState=="started"){
     refreshSensors()
     
@@ -239,9 +270,7 @@ useEffect(()=>{
 
 },[pluginState])
 
-useEffect(()=>{
-  console.log(error)
-},[error])
+
 
 function confirmDelete(mac){
   const result = window.confirm(`Delete configuration for ${mac}?`)
@@ -268,27 +297,21 @@ function signalStrengthIcon(sensor){
   return <SignalCellular0Bar/>
 
 }
-useEffect(()=>{
-    _sensorMap = sensorMap
-    
-    setSensorList(
-      
-      Array.from(sensorMap.entries()).map((entry) =>  {
-        const sensor = sensorMap.get(entry[0]);
-        const config= sensor.config
-        const hasConfig = Object.keys(config).length>0;
-        
-       
-       return <ListGroupItem action 
+function hasConfig(sensor){
+  return Object.keys(sensor.config).length>0;
+}
+
+function createListGroupItem(sensor){
+
+  const config = hasConfig(sensor)
+  return <ListGroupItem action 
         onClick={()=>{ 
-          if (sensor){
-            config.mac_address=entry[0]
+            sensor.config.mac_address=sensor.info.mac
             setSchema(sensor.schema)
-            setSensorData(config)
-          }
+            setSensorData(sensor.config)
         }
         }> 
-        <div  class="d-flex justify-content-between align-items-center" style={hasConfig?{fontWeight:"normal"}:{fontStyle:"italic"}}>
+        <div  class="d-flex justify-content-between align-items-center" style={config?{fontWeight:"normal"}:{fontStyle:"italic"}}>
         {`${sensor._changesMade?"*":""}${sensor.info.name} MAC: ${sensor.info.mac} RSSI: ${ifNullNaN(sensor.info.RSSI)}`  }
         <div class="d-flex justify-content-between ">
           {
@@ -297,9 +320,37 @@ useEffect(()=>{
         </div>
         </div>
         </ListGroupItem>
-    }) 
-    )
-   
+}
+
+function configuredDevices(){
+  return Array.from(sensorMap.entries()).filter((entry)=>hasConfig(entry[1]))
+}
+
+function devicesInDomain(domain){
+  return Array.from(sensorMap.entries()).filter((entry)=>entry[1].info.domain===domain)
+}
+
+
+useEffect(()=>{
+  console.log("useEffect([sensorMap])")
+
+    _sensorMap = sensorMap
+    
+    const _sensorDomains = new Set(sensorMap.entries().map((entry)=>{ return entry[1].info.domain}))
+    const sl = {
+      _configured: configuredDevices().map((entry) =>  {
+         return createListGroupItem(sensorMap.get(entry[0]))
+      })
+      } 
+
+      _sensorDomains.forEach((d)=>{
+        sl[d]=devicesInDomain(d).map((entry) =>  {
+        return createListGroupItem(sensorMap.get(entry[0]))
+       })
+    })
+    _sensorList=sl 
+    
+    
   },[sensorMap]
   )
 
@@ -307,18 +358,71 @@ useEffect(()=>{
     return value==null? NaN : value
   }
 
-  
-  if (pluginState=="stopped")
-    return (<h1  >Enable plugin to see configuration</h1>)
+  function getSensorList(domain){
+    return _sensorList[domain]
+  }
+
+  function getTabs(){
+    
+    return Object.keys(_sensorList).map((domain)=> {return getTab(domain)})
+  }
+  function getTab(key){
+    var title = key.slice(key.charAt(0)==="_"?1:0)
+    
+    return <Tab eventKey={key} title={title.charAt(0).toUpperCase()+title.slice(1)    }>
+        
+    <div style={{paddingBottom: 20}} class="d-flex flex-wrap justify-content-start align-items-start">
+    <ListGroup style={{  maxHeight: '300px', overflowY: 'auto' }}>
+      {getSensorList(key)}
+    </ListGroup>
+
+    <div style= {{ paddingLeft: 10, paddingTop: 10, display: (Object.keys(schema).length==0)? "none" :""  }} >
+
+    <Form
+      schema={schema}
+      validator={validator}
+      uiSchema={uiSchema}
+      onChange={(e) => {
+          const s = sensorMap.get(e.formData.mac_address)
+          s._changesMade=true
+          setSensorData(e.formData)
+        }
+      }
+      onSubmit={({ formData }, e) => {
+        console.log(formData) 
+        updateSensorData(formData)
+        setSchema({})
+        alert("Changes saved")
+      }}
+      onError={log('errors')}
+      formData={sensorData}>
+      <div>
+      <Grid direction="row" style={{spacing:5}}>
+      <Button type='submit' color="primary" variant="contained">Save</Button>
+      <Button variant="contained" onClick={()=>{undoChanges(sensorData.mac_address)}}>Undo</Button>
+      <Button variant="contained" color="secondary" onClick={(e)=>confirmDelete(sensorData.mac_address)}>Delete</Button>
+
+      </Grid>
+      </div>
+    </Form>
+
+    </div>
+    </div>
+    </Tab>
+  }
+
+  if (pluginState=="stopped" || pluginState=="unknown")
+    return (<h1  >Enable plugin to see configuration (if plugin is Enabled and you're seeing this message, restart SignalK)</h1>)
   else
   return(
+
     <div>
-      {error?<h2 style="color: red;">{error.message}</h2>:""}
+      {error?<h2 style="color: red;">{error}</h2>:""}
       <Form 
         schema={baseSchema}
         validator={validator}
         onChange={(e) => setBaseData(e.formData)}
-        onSubmit={ ({ formData }, e) => {setSensorData(null); updateBaseData(formData) }}
+        onSubmit={ ({ formData }, e) => { updateBaseData(formData); setSchema({}) } }
         onError={log('errors')}
         formData={baseData}
       />
@@ -329,46 +433,16 @@ useEffect(()=>{
                      now={progress.progress} 
         />:""
       }
-      <h2>{`${sensorMap.size>0?"Bluetooth Devices click to configure" :""}`}</h2>
-      <h2>{`${sensorMap.size>0?"(* means sensor has unsaved changes)" :""}`}</h2>
+      <h2>{`${sensorMap.size>0?"Bluetooth Devices - Select to configure" :""}`}</h2>
+      <h2>{`${sensorMap.size>0?"(* = sensor has unsaved changes)" :""}`}</h2>
       <p></p>
-      <div style={{paddingBottom: 20}} class="d-flex flex-wrap justify-content-start align-items-start">
-      <ListGroup style={{  maxHeight: '300px', overflowY: 'auto' }}>
-        {sensorList}
-      </ListGroup>
-      <div style= {{ paddingLeft: 10, paddingTop: 10, display: (Object.keys(schema).length==0)? "none" :""  }} >
-      <Form
-        schema={schema}
-        validator={validator}
-        uiSchema={uiSchema}
-        onChange={(e) => {
-            const s = sensorMap.get(e.formData.mac_address)
-            s._changesMade=true
-            //s.config = e.formData; 
-
-            setSensorData(e.formData)
-          }
-        }
-        onSubmit={({ formData }, e) => {
-          console.log(formData) 
-          updateSensorData(formData)
-          setSchema({})
-          alert("Changes saved")
-        }}
-        onError={log('errors')}
-        formData={sensorData}>
-        <div>
-        <Grid direction="row" style={{spacing:5}}>
-        <Button type='submit' color="primary" variant="contained">Save</Button>
-        <Button variant="contained" onClick={()=>{undoChanges(sensorData.mac_address)}}>Undo</Button>
-        <Button variant="contained" color="secondary" onClick={(e)=>confirmDelete(sensorData.mac_address)}>Delete</Button>
-
-        </Grid>
-        </div>
-      </Form>
-
-      </div>
-      </div>
+      <Tabs
+      defaultActiveKey="_configured"
+      id="domain-tabs"
+      className="mb-3"
+      >
+      {getTabs()}
+      </Tabs>
     </div>
   )