bt-sensors-plugin-sk 1.2.5 → 1.2.6-beta

package/src/components/PluginConfigurationPanel.js

@@ -1,8 +1,7 @@
 import Form from '@rjsf/core' ;
 import validator from '@rjsf/validator-ajv8';
-import React from "react";
 import ReactHtmlParser from 'react-html-parser';
-
+import React from 'react'
 import {useEffect, useState} from 'react'
 
 import {Button, Grid } from '@material-ui/core';
@@ -20,13 +19,14 @@ import { ListGroupItem } from 'react-bootstrap';
 
 import ProgressBar from 'react-bootstrap/ProgressBar';
 
-var _sensorMap, _sensorDomains={}, _sensorList={}
-
-export default function BTConfig (props)  {
+export function BTConfig (props)  {
 
    const _uiSchema= {
     "ui:options": {label: false},
-    'title': { 'ui:widget': 'hidden' }
+    "paths":{
+      enableMarkdownInDescription:true
+    },
+    'title': { 'ui:widget': 'hidden' },
   }
 
   const baseUISchema = 
@@ -71,10 +71,9 @@ const useStyles = makeStyles((theme) => ({
 
   const [schema, setSchema] = useState({}) 
   const [ uiSchema, setUISchema] = useState(_uiSchema )
-  const [sensorList, setSensorList] = useState([])
 
   const [sensorData, setSensorData] = useState()
-  const [sensorMap, setSensorMap ] = useState(new Map() )
+  const [sensorMap, setSensorMap ] = useState(new Map())
  
   const [progress, setProgress ] = useState({
     "progress":0, "maxTimeout": 100, 
@@ -89,8 +88,6 @@ const useStyles = makeStyles((theme) => ({
  
   function sendJSONData(cmd, data){
 
-    console.log(`sending ${cmd}`) 
-    console.log(data)
     const headers = new Headers();
     headers.append("Content-Type", "application/json");
     return fetch(`/plugins/bt-sensors-plugin-sk/${cmd}`, {
@@ -100,91 +97,83 @@ const useStyles = makeStyles((theme) => ({
       headers:headers
     })
   }
-
-  async function fetchJSONData(path){
-    console.log(`fetching ${path}`)
-    var result
-    try {
-      result = fetch(`/plugins/bt-sensors-plugin-sk/${path}`, {
-        credentials: 'include'
-      })
-    } catch (e) {
-      result=
-        {
-          status: 500,
-          statusText: e.toString()
-        }
-    }
-    return result
+async function fetchJSONData(path, data = {}) {
+  let result;
+  try {
+    // Convert data object to query string
+    const query = Object.keys(data).length
+      ? '?' + new URLSearchParams(data).toString()
+      : '';
+    result = await fetch(`/plugins/bt-sensors-plugin-sk/${path}${query}`, {
+      credentials: 'include',
+      method: 'GET'
+    });
+  } catch (e) {
+    result = {
+      status: 500,
+      statusText: e.toString()
+    };
   }
-
+  return result;
+}
   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}) `)
     }
     const json = await response.json()
-    console.log(json)
-    //for (let i=0;i<json.length;i++){
-    //  json[i].schema.htmlDescription=<div>{ReactHtmlParser(json[i].schema.htmlDescription)}<p></p></div>
-    //}
+
     return json
 
   }
-  async function getDomains(){
-    console.log("getDomains")
-    const response = await fetchJSONData("getDomains")
+
+
+  async function getSensorInfo(mac, sensorClass){
+    const response = await fetchJSONData("getSensorInfo",{mac_address: mac, class: sensorClass})
     if (response.status!=200){
-      throw new Error(`Unable get domain data: ${response.statusText} (${response.status}) `)
+      throw new Error(`Unable get sensor info: ${response.statusText} (${response.status}) `)
     }
     const json = await response.json()
-    console.log(json)
     return json
-
   }
+
   async function getBaseData(){
-    console.log("getBaseData")
     const response = await fetchJSONData("getBaseData")
     if (response.status!=200){
       throw new Error(`Unable to get base data: ${response.statusText} (${response.status}) `)
     }
     const json = await response.json()
-    console.log(json)
     json.schema.htmlDescription=<div>{ReactHtmlParser(json.schema.htmlDescription)}<p></p></div>
     return json
   }
+
   async function getProgress(){
-    console.log("getProgress")
     const response = await fetchJSONData("getProgress")
     if (response.status!=200){
       throw new Error(`Unable to get progress: ${response.statusText} (${response.status}) `)
     }
     const json = await response.json()
-    console.log(json)
     return json
   }
 
   function updateSensorData(data){
-    console.log("updateSensorData")
     sendJSONData("updateSensorData", data).then((response)=>{ 
       if (response.status != 200) {
         throw new Error(response.statusText)
       }
-      sensorMap.get(data.mac_address)._changesMade=false
-      sensorMap.get(data.mac_address).config = data
-      
+      setSensorMap((sm)=>{sm.delete(data.mac_address); return new Map(sm) })
+      setSchema( {} )
+
     })
   } 
 
   function undoChanges(mac) {
-    console.log("undoChanges")
     sensorMap.get(mac)._changesMade = false
+    sensorMap.get(mac).config = JSON.parse(JSON.stringify(sensorMap.get(mac).configCopy))
     setSensorData( sensorMap.get(mac).config )
   }
 
   function removeSensorData(mac){
-    console.log("removeSensorData")
 
     try{ 
     
@@ -193,10 +182,7 @@ const useStyles = makeStyles((theme) => ({
             throw new Error(response.statusText)
         }
         })
-
-        _sensorMap.delete(mac)
-        
-        setSensorMap(new Map(_sensorMap))
+        setSensorMap((sm)=>{sm.delete(mac); return new Map(sm) })
         setSchema( {} )
     } catch {(e)=>
       setError( new Error(`Couldn't remove ${mac}: ${e}`))
@@ -206,88 +192,80 @@ const useStyles = makeStyles((theme) => ({
 
 
   function updateBaseData(data){
-    console.log("updateBaseData")
-
+    setSensorMap(new Map())
+    //setSensorList({})
     sendJSONData("updateBaseData", data).then( (response )=>{
       if (response.status != 200) {
         setError(new Error(`Unable to update base data: ${response.statusText} (${response.status})`))
-      } /*else {
-        getProgress().then((json)=>{
-          setProgress(json)
-        }).catch((e)=>{
-          setError(e)
-        })
-      }*/
+      } 
       })
-  }
-    
 
-  function refreshSensors(){
-    console.log('refreshing sensor map')
-
-    getSensors().then((sensors)=>{
-      setSensorMap (new Map(sensors.map((sensor)=>[sensor.info.mac,sensor])));    
-    })
-    .catch((e)=>{
-      setError(e)
-    })
   }
+  
+  
 
 
   useEffect(()=>{
-    console.log("useEffect([])")
     let eventSource=null
-
     fetchJSONData("getPluginState").then( async (response)=> {
+    
+      function newSensorEvent(event){
+        let json = JSON.parse(event.data)
+        console.log(`New sensor: ${json.info.mac}`)
+        setSensorMap( (_sm)=> {
+          //if (!_sm.has(json.info.mac))
+          _sm.set(json.info.mac, json)
+        
+          return new Map(_sm)
+        }
+        )
+      }
+      function sensorChangedEvent(event){
+        console.log("sensorchanged")
+        const json = JSON.parse(event.data)      
+        
+        setSensorMap( (_sm) => {
+          const sensor = _sm.get(json.mac)
+          if (sensor) 
+            Object.assign(sensor.info, json )
+          return new Map(_sm)
+        })
+      }
+      
+
       if (response.status==404) {
         setPluginState("unknown")
         throw new Error("unable to get plugin state")
       }
       const json = await response.json()
-      console.log("Setting up eventsource")
       eventSource = new EventSource("/plugins/bt-sensors-plugin-sk/sse", { withCredentials: true })
 
-      setPluginState(json.state)
-      
-      _sensorDomains = await getDomains()
-
       eventSource.addEventListener("newsensor", (event) => {
-        console.log("newsensor")
-        let json = JSON.parse(event.data)
-        
-        if (!_sensorMap.has(json.info.mac)) {
-          console.log(`New sensor: ${json.info.mac}`)
-          setSensorMap(new Map(_sensorMap.set(json.info.mac, json)))
-        }
+        newSensorEvent(event)
       });
 
       eventSource.addEventListener("sensorchanged", (event) => {
-        let json = JSON.parse(event.data)      
-        console.log("sensorchanged")
-        console.log(json)
-        
-        if (_sensorMap.has(json.mac)) {      
-          let sensor = _sensorMap.get(json.mac)
-
-          Object.assign(sensor.info, json )
-          setSensorMap(new Map ( _sensorMap ))
-        }
+        sensorChangedEvent(event)
       });
+
       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)
       });
-     
-    })
+      
+    setPluginState(json.state);
 
+    (async ()=>{
+      const sensors = await getSensors()
+      setSensorMap ( new Map(sensors.map((sensor)=>[sensor.info.mac,sensor])) )
+    })()
+
+    })
     .catch( (e) => { 
         setError(e)
       }
@@ -296,13 +274,32 @@ const useStyles = makeStyles((theme) => ({
       console.log("Closing connection to SSE")
       eventSource.close()
     };
+    
  },[])
 
-useEffect(()=>{
-  console.log("useEffect([pluginState])")
-  if (pluginState=="started"){
-    refreshSensors()
+
+ useEffect(()=>{
+  
+  if (!(sensorData && sensorMap) )  return
+  
+  const _sensor = sensorMap.get(sensorData.mac_address)
+  if (_sensor && schema && sensorData  &&
+    Object.hasOwn(sensorData,"params" )){
     
+      if (_sensor.info.class == "UNKNOWN" && sensorData.params.sensorClass && sensorData.params.sensorClass != "UNKNOWN") {
+      getSensorInfo(sensorData.mac_address, sensorData.params.sensorClass).then((json)=>{
+        debugger
+        setSchema(json.schema)
+      })
+    }
+  
+  }
+  
+ },[sensorData])
+
+
+useEffect(()=>{
+  if (pluginState=="started") {
     getBaseData().then((json) => {
       setBaseSchema(json.schema);    
       setBaseData(json.data);
@@ -317,7 +314,6 @@ useEffect(()=>{
     })
 
   } else{
-    setSensorMap(new Map())
     setBaseSchema({})
     setBaseData({})
   }
@@ -325,9 +321,10 @@ useEffect(()=>{
 },[pluginState])
 
 
-
 function confirmDelete(mac){
-  const result = window.confirm(`Delete configuration for ${mac}?`)
+  
+  const sensor = sensorMap.get(mac)
+  const result = !hasConfig(sensor) || window.confirm(`Delete configuration for ${sensor.info.name}?`)
   if (result)
     removeSensorData(mac)
 }
@@ -352,7 +349,7 @@ function signalStrengthIcon(sensor){
 
 }
 function hasConfig(sensor){
-  return Object.keys(sensor.config).length>0;
+  return Object.keys(sensor.configCopy).length>0;
 }
 
 function createListGroupItem(sensor){
@@ -376,66 +373,43 @@ function createListGroupItem(sensor){
         </ListGroupItem>
 }
 
-function configuredDevices(){
-  return Array.from(sensorMap.entries()).filter((entry)=>hasConfig(entry[1]))
-}
 
 function devicesInDomain(domain){
-  if (domain==="_configured")
-    return configuredDevices()
-  else
+
   return Array.from(sensorMap.entries()).filter((entry)=>entry[1].info.domain===domain)
 }
 
+  function ifNullNaN(value){
+    return value==null? NaN : value
+  }
 
-useEffect(()=>{
-  console.log("useEffect([sensorMap])")
-
-    _sensorMap = sensorMap
-    
-    const _sensorDomains = [... (new Set(sensorMap.entries().map((entry)=>{ return entry[1].info.domain})))].sort()
-    const sl = {
-      _configured: configuredDevices().length==0?
+  function getTabs(){
+    const sensorDomains = [... (new Set(sensorMap.entries().map((entry)=>{ return entry[1].info.domain})))].sort()
+    const cd = Array.from(sensorMap.entries()).filter((entry)=>hasConfig(entry[1]))
+    let sensorList={}
+    sensorList["_configured"]=
+      cd.length==0?
         "Select a device from its domain tab (Electrical etc.) and configure it.":
-        configuredDevices().map((entry) =>  {
+        cd.map((entry) =>  {
          return createListGroupItem(sensorMap.get(entry[0]))
       })
-      } 
-
-      _sensorDomains.forEach((d)=>{
-        sl[d]=devicesInDomain(d).map((entry) =>  {
+      
+      sensorDomains.forEach((d)=>{
+        sensorList[d]=devicesInDomain(d).map((entry) =>  {
         return createListGroupItem(sensorMap.get(entry[0]))
        })
-    })
-    _sensorList=sl 
-    
-    
-  },[sensorMap]
-  )
-
-  function ifNullNaN(value){
-    return value==null? NaN : value
-  }
-
-  function getSensorList(domain){
-    return _sensorList[domain]
-  }
-
-  function getTabs(){
+      })
     
-    return Object.keys(_sensorList).map((domain)=> {return getTab(domain)})
+    return Object.keys(sensorList).map((domain)=> {return getTab(domain, sensorList[domain])})
   }
-    // <div style={{paddingBottom: 20}} class="d-flex flex-wrap justify-content-start align-items-start">
-    //    <div class="d-flex flex-column" >
 
-  function getTab(key){
-    var title = key.slice(key.charAt(0)==="_"?1:0)
-    let sl = getSensorList(key)
+  function getTab(key, sensorList){
+    let  title = key.slice(key.charAt(0)==="_"?1:0)
     
-    return <Tab eventKey={key} title={`${title.charAt(0).toUpperCase()}${title.slice(1)}${devicesInDomain(key).length==0?'':' ('+devicesInDomain(key).length+')'}` }  >
+    return <Tab eventKey={key} title={`${title.charAt(0).toUpperCase()}${title.slice(1)}${typeof sensorList=='string'?'':' ('+sensorList.length+')'}` }  >
         
     <ListGroup style={{  maxHeight: '300px', overflowY: 'auto' }}>
-      {sl}
+      {sensorList}
     </ListGroup>
     
 
@@ -447,22 +421,6 @@ useEffect(()=>{
     window.open(url, "_blank", "noreferrer");
   }
 
-  function CustomFieldTemplate(props) {
-  const { id, classNames, style, label, help, required, description, errors, children } = props;
-  return (
-    <div className={classNames} style={style}>
-      <Grid container xs={12} direction="row" spacing="1">
-        <Grid item xs={1} sm container direction="column">
-        <Grid item ><label htmlFor={id}>{label}{required ? '*' : null}</label></Grid>
-        <Grid item> {description}</Grid>
-        </Grid>
-        <Grid item>{children}</Grid>
-      </Grid>
-      {errors}
-      {help}
-    </div>
-  );
-}
 
   if (pluginState=="stopped" || pluginState=="unknown")
     return (<h3>Enable plugin to see configuration</h3>)
@@ -504,7 +462,7 @@ useEffect(()=>{
       defaultActiveKey="_configured"
       id="domain-tabs"
       className="mb-3"
-      onClick={()=>{setSchema({})}}
+  
       >
       {getTabs()}
       </Tabs>
@@ -520,13 +478,15 @@ useEffect(()=>{
       uiSchema={uiSchema}
       onChange={(e) => {
           const s = sensorMap.get(e.formData.mac_address)
-          s._changesMade=true
-          setSensorData(e.formData)
+          if(s) {
+            s._changesMade=true
+            s.config = e.formData
+            setSensorData(e.formData)
+          }
         }
       }
       onSubmit={({ formData }, e) => {
         updateSensorData(formData)
-        setSchema({})
         alert("Changes saved")
       }}
       onError={log('errors')}
@@ -544,4 +504,5 @@ useEffect(()=>{
   )
     
 
-  }
+  }
+  export default BTConfig

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

@@ -1,170 +0,0 @@
-{
-  "configuration": {
-    "discoveryInterval": 10,
-    "peripherals": [
-      {
-        "active": true,
-        "discoveryTimeout": 30,
-        "params": {
-          "name": "ATC_9FF77E",
-          "zone": "inside.cabin",
-          "parser": "ATC-LE",
-          "sensorClass": "ATC"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "batteryStrength": "sensors.{macAndName}.battery.strength",
-          "voltage": "sensors.{macAndName}.battery.voltage",
-          "temp": "environment.{zone}.temperature",
-          "humidity": "environment.{zone}.humidity"
-        },
-        "mac_address": "A4:C1:38:9F:F7:7E"
-      },
-      {
-        "active": true,
-        "discoveryTimeout": 30,
-        "params": {
-          "name": "tps",
-          "zone": "inside.refrigerator",
-          "sensorClass": "Inkbird"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "temp": "environment.{zone}.temperature",
-          "battery": "sensors.{macAndName}.battery.strength"
-        },
-        "mac_address": "49:22:05:17:2B:AE"
-      },
-      {
-        "active": true,
-        "discoveryTimeout": 30,
-        "params": {
-          "name": "Ruuvi BC7E",
-          "zone": "inside.navdesk",
-          "sensorClass": "RuuviTag"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "temp": "environment.{zone}.temperature",
-          "humidity": "environment.{zone}.humidity",
-          "pressure": "environment.{zone}.pressure",
-          "accX": "sensors.{macAndName}.accX",
-          "accY": "sensors.{macAndName}.accY",
-          "accZ": "sensors.{macAndName}.accZ",
-          "battV": "sensors.{macAndName}.battery.voltage",
-          "mc": "sensors.{macAndName}.movementCounter",
-          "msc": "sensors.{macAndName}.measurementSequenceCounter"
-        },
-        "mac_address": "F9:B0:6E:63:BC:7E"
-      },
-      {
-        "active": true,
-        "discoveryTimeout": 30,
-        "params": {
-          "name": "SBMO-003Z-db1b",
-          "zone": "inside",
-          "sensorClass": "ShellySBMO003Z"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "motion": "environment.{zone}.motion",
-          "illuminance": "environment.{zone}.illuminance",
-          "battery": "sensors.{macAndName}.battery.strength",
-          "button": "sensors.{macAndName}.button"
-        },
-        "mac_address": "E8:E0:7E:97:DB:1B"
-      },
-      {
-        "active": true,
-        "discoveryTimeout": 30,
-        "params": {
-          "name": "LYWSD03MMC",
-          "zone": "inside.vberth",
-          "encryptionKey": "3985f4ebc032f276cc316f1f6ecea085",
-          "sensorClass": "XiaomiMiBeacon"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "temp": "environment.{zone}.temperature",
-          "humidity": "environment.{zone}.humidity",
-          "batteryStrength": "sensors.{macAndName}.battery.strength",
-          "voltage": "sensors.{macAndName}.battery.voltage"
-        },
-        "gattParams": {
-          "useGATT": false
-        },
-        "mac_address": "A4:C1:38:3E:7E:94"
-      },
-      {
-        "active": true,
-        "discoveryTimeout": 30,
-        "params": {
-          "name": "SmartShunt HQ2204C2GHD",
-          "batteryID": "house",
-          "encryptionKey": "8cce8529307cf9dd0c85611c4fef42d9",
-          "sensorClass": "VictronBatteryMonitor"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "current": "electrical.batteries.{batteryID}.current",
-          "power": "electrical.batteries.{batteryID}.power",
-          "voltage": "electrical.batteries.{batteryID}.voltage",
-          "alarm": "electrical.batteries.{batteryID}.alarm",
-          "consumed": "electrical.batteries.{batteryID}.capacity.ampHoursConsumed",
-          "soc": "electrical.batteries.{batteryID}.capacity.stateOfCharge",
-          "ttg": "electrical.batteries.{batteryID}.capacity.timeRemaining",
-          "starterVoltage": "electrical.batteries.secondary.voltage"
-        },
-        "gattParams": {
-          "useGATT": false
-        },
-        "mac_address": "D4:50:46:39:38:C5"
-      },
-      {
-        "active": true,
-        "discoveryTimeout": 90,
-        "params": {
-          "name": "aft propane tank",
-          "medium": "PROPANE",
-          "tankHeight": "325",
-          "id": "propane",
-          "sensorClass": "MopekaTankSensor"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "battVolt": "sensors.{macAndName}.battery.voltage",
-          "battStrength": "sensors.{macAndName}.battery.strength",
-          "temp": "tanks.{id}.temperature",
-          "tankLevel": "tanks.{id}.currentLevel",
-          "readingQuality": "sensors.{macAndName}.readingQuality",
-          "accX": "sensors.{macAndName}.accelerationXAxis",
-          "accY": "sensors.{macAndName}.accelerationYAxis"
-        },
-        "mac_address": "D4:40:59:BE:2A:8C"
-      },
-      {
-        "active": true,
-        "discoveryTimeout": 30,
-        "params": {
-          "name": "SBHT-003C",
-          "zone": "outside.deck",
-          "sensorClass": "ShellySBHT003C"
-        },
-        "paths": {
-          "RSSI": "sensors.{macAndName}.RSSI",
-          "battery": "sensors.{macAndName}.battery.strength",
-          "temp": "environment.{zone}.temperature",
-          "humidity": "environment.{zone}.humidity",
-          "button": "sensors.{macAndName}.button"
-        },
-        "mac_address": "7C:C6:B6:AF:49:5F"
-      }
-    ],
-    "adapter": "hci0",
-    "transport": "le",
-    "duplicateData": false,
-    "discoveryTimeout": 30
-  },
-  "enabled": true,
-  "enableDebug": false
-}