small j for float 2

deployment/instances/udi-influx/default/config.json

@@ -183,23 +183,37 @@
       "config": {
         "databaseConnStr": "",
         "attributes": {
-          "application": "Temperature Shellies",
+          "application": "Shellies Sensor Temperature",
-          "deviceSelector": "T:1",
+          "deviceSelector": "T:2",
-          "valueSelector": "J:$.tC",
+          "valueSelector": "j:$.tC",
           "unitSelector": "C:°C"
         }
       }
     },
     {
-      "topics": [ "shellies/sensor+/status/humidity:0" ],
+      "topics": [ "shellies/sensor/+/status/humidity:0" ],
       "handler": "SVEJ",
       "id": "SVEJ5",
       "config": {
         "databaseConnStr": "",
         "attributes": {
-          "application": "Humidity Shellies",
+          "application": "Shellies Sensor Humidity",
-          "deviceSelector": "T:1",
+          "deviceSelector": "T:2",
-          "valueSelector": "J:$.rh",
+          "valueSelector": "j:$.rh",
+          "unitSelector": "C:%"
+        }
+      }
+    },
+    {
+      "topics": [ "shellies/sensor/+/status/devicepower:0" ],
+      "handler": "SVEJ",
+      "id": "SVEJ6",
+      "config": {
+        "databaseConnStr": "",
+        "attributes": {
+          "application": "Shellies Sensor Power",
+          "deviceSelector": "T:2",
+          "valueSelector": "j:$.battery.percent",
           "unitSelector": "C:%"
         }
       }

src/udi/handlers/svej/svej.go

@@ -1,29 +1,30 @@
 package svej
 
 import (
-  "log"
+	"encoding/json"
-  "time"
+	"fmt"
-  "strconv"
+	"log"
-  "strings"
+	"strconv"
-  "fmt"
+	"strings"
-  "github.com/oliveagle/jsonpath"
+	"time"
-  "encoding/json"
+	"udi/config"
-  "udi/config"
+	"udi/database"
-  "udi/handlers/handler"
+	"udi/handlers/handler"
-  "udi/database"
+
+	"github.com/oliveagle/jsonpath"
 )
 
 type SingleValueExtractorJsonpathHandler struct {
-  handler.CommonHandler
+	handler.CommonHandler
-  ready bool
+	ready          bool
-  application string
+	application    string
-  deviceSelector string
+	deviceSelector string
-  valueSelector string
+	valueSelector  string
-  unitSelector string
+	unitSelector   string
-  deviceJsonpath *jsonpath.Compiled
+	deviceJsonpath *jsonpath.Compiled
-  valueJsonpath *jsonpath.Compiled
+	valueJsonpath  *jsonpath.Compiled
-  unitJsonpath *jsonpath.Compiled
+	unitJsonpath   *jsonpath.Compiled
-  dbh *database.DatabaseHandle
+	dbh            *database.DatabaseHandle
 }
 
 /*
@@ -33,134 +34,135 @@ T:TopicPartIndex
 C:ConstantValue
 */
 
-
 func New(id string, config config.HandlerConfigT) handler.Handler {
-  t := &SingleValueExtractorJsonpathHandler {
+	t := &SingleValueExtractorJsonpathHandler{
-    ready: false,
+		ready: false,
-  }
+	}
 
-  if config.Attributes["application"] == "" {
+	if config.Attributes["application"] == "" {
-    log.Println("Error: application not configured")
+		log.Println("Error: application not configured")
-    return t
+		return t
-  }
+	}
-  t.application = config.Attributes["application"]
+	t.application = config.Attributes["application"]
 
-  t.deviceSelector = config.Attributes["deviceSelector"]
+	t.deviceSelector = config.Attributes["deviceSelector"]
-  if t.deviceSelector[:2] == "J:" {
+	if t.deviceSelector[:2] == "J:" || t.deviceSelector[:2] == "j:" {
-    jp, err := jsonpath.Compile(t.deviceSelector[2:])
+		jp, err := jsonpath.Compile(t.deviceSelector[2:])
-    if err != nil {
+		if err != nil {
-      log.Printf("Unable to compile deviceJsonpath: %s, %s", t.deviceSelector[2:], err)
+			log.Printf("Unable to compile deviceJsonpath: %s, %s", t.deviceSelector[2:], err)
-      return t
+			return t
-    }
+		}
-    t.deviceJsonpath = jp
+		t.deviceJsonpath = jp
-  }
+	}
-  t.valueSelector = config.Attributes["valueSelector"]
+	t.valueSelector = config.Attributes["valueSelector"]
-  if t.valueSelector[:2] == "J:" {
+	if t.valueSelector[:2] == "J:" || t.valueSelector[:2] == "j:" {
-    jp, err := jsonpath.Compile(t.valueSelector[2:])
+		jp, err := jsonpath.Compile(t.valueSelector[2:])
-    if err != nil {
+		if err != nil {
-      log.Printf("Unable to compile valueJsonpath: %s, %s", t.valueSelector[2:], err)
+			log.Printf("Unable to compile valueJsonpath: %s, %s", t.valueSelector[2:], err)
-      return t
+			return t
-    }
+		}
-    t.valueJsonpath = jp
+		t.valueJsonpath = jp
-  }
+	}
-  t.unitSelector = config.Attributes["unitSelector"]
+	t.unitSelector = config.Attributes["unitSelector"]
-  if t.unitSelector[:2] == "J:" {
+	if t.unitSelector[:2] == "J:" || t.unitSelector[:2] == "j:" {
-    jp, err := jsonpath.Compile(t.unitSelector[2:])
+		jp, err := jsonpath.Compile(t.unitSelector[2:])
-    if err != nil {
+		if err != nil {
-      log.Printf("Unable to compile unitJsonpath: %s, %s", t.unitSelector[2:], err)
+			log.Printf("Unable to compile unitJsonpath: %s, %s", t.unitSelector[2:], err)
-      return t
+			return t
-    }
+		}
-    t.unitJsonpath = jp
+		t.unitJsonpath = jp
-  }
+	}
 
-  t.Id = id
+	t.Id = id
-  t.ready = true
+	t.ready = true
-  t.dbh = database.NewDatabaseHandle()
+	t.dbh = database.NewDatabaseHandle()
-  log.Printf("Handler SVEJ %d initialized", id)
+	log.Printf("Handler SVEJ %s initialized", id)
-  return t
+	return t
 }
 
-func (self *SingleValueExtractorJsonpathHandler) ExtractionHelper(subTopics []string, jPayload interface{}, selector string, jp *jsonpath.Compiled) (string, error) {
+func (self *SingleValueExtractorJsonpathHandler) ExtractionHelper(subTopics []string, jPayload interface{}, selector string, jp *jsonpath.Compiled) (interface{}, error) {
-  var res string
+	var res interface{}
-  switch selector[:2] {
+	switch selector[:2] {
-  case "J:":
+	case "J:", "j:":
-    // extract using jsonpath from payload
+		// extract using jsonpath from payload
-    r, e := jp.Lookup(jPayload)
+		r, e := jp.Lookup(jPayload)
-    if e != nil {
+		if e != nil {
-      return "", fmt.Errorf("jp.Lookup failed with %s", e)
+			return "", fmt.Errorf("jp.Lookup failed with %s", e)
-    }
+		}
-    res = fmt.Sprint(r)
+		if selector[:2] == "j:" {
-  case "T:":
+			res = r.(float64)
-    // T: extract from topic
+		} else {
-    i, e := strconv.Atoi(selector[2:])
+			res = fmt.Sprint(r)
-    if e != nil {
+		}
-      return "", fmt.Errorf("Atoi failed with %s", e)
+	case "T:":
-    }
+		// T: extract from topic
-    if i >= len(subTopics) {
+		i, e := strconv.Atoi(selector[2:])
-      return "", fmt.Errorf("not enough subtopics")
+		if e != nil {
-    }
+			return "", fmt.Errorf("Atoi failed with %s", e)
-    res = subTopics[i]
+		}
-  case "C:":
+		if i >= len(subTopics) {
-    // use constant value
+			return "", fmt.Errorf("not enough subtopics")
-    res = selector[2:]
+		}
-  default:
+		res = subTopics[i]
-    return "", fmt.Errorf("Invalid selector: %s", selector[:2])
+	case "C:":
-  }
+		// use constant value
-  return res, nil
+		res = selector[2:]
+	default:
+		return "", fmt.Errorf("Invalid selector: %s", selector[:2])
+	}
+	return res, nil
 }
 
-
 func (self *SingleValueExtractorJsonpathHandler) Handle(message handler.MessageT) {
-  if ! self.ready {
+	if !self.ready {
-    self.Lost("Handler is not marked as ready", nil, message)
+		self.Lost("Handler is not marked as ready", nil, message)
-    return
+		return
-  }
+	}
-  log.Printf("Handler SingleValueExtractorJsonpath %d processing %s -> %s", self.Id, message.Topic, message.Payload)
+	log.Printf("Handler SingleValueExtractorJsonpath %d processing %s -> %s", self.Id, message.Topic, message.Payload)
 
-  var measurement database.Measurement
+	var measurement database.Measurement
-  measurement.Time = time.Now()
+	measurement.Time = time.Now()
-  measurement.Application = self.application
+	measurement.Application = self.application
 
-  subTopics := strings.Split(message.Topic, "/")
+	subTopics := strings.Split(message.Topic, "/")
-  log.Printf("Subtopics: %s", strings.Join(subTopics, ", "))
+	log.Printf("Subtopics: %s", strings.Join(subTopics, ", "))
-  var jPayload interface{}
+	var jPayload interface{}
-  err := json.Unmarshal([]byte(message.Payload), &jPayload)
+	err := json.Unmarshal([]byte(message.Payload), &jPayload)
-  if err != nil {
+	if err != nil {
-    self.Lost("Unable to unmarshal payload", err, message)
+		self.Lost("Unable to unmarshal payload", err, message)
-    return
+		return
-  }
+	}
 
-  device, err1 := self.ExtractionHelper(subTopics, jPayload, self.deviceSelector, self.deviceJsonpath)
+	device, err1 := self.ExtractionHelper(subTopics, jPayload, self.deviceSelector, self.deviceJsonpath)
-  if err1 != nil {
+	if err1 != nil {
-    self.Lost("Device extraction failed", err1, message)
+		self.Lost("Device extraction failed", err1, message)
-    return
+		return
-  }
+	}
-  log.Printf("device: %s", device) 
+	log.Printf("device: %s", device)
 
-  value, err2 := self.ExtractionHelper(subTopics, jPayload, self.valueSelector, self.valueJsonpath)
+	value, err2 := self.ExtractionHelper(subTopics, jPayload, self.valueSelector, self.valueJsonpath)
-  if err2 != nil {
+	if err2 != nil {
-    self.Lost("Value extraction failed", err2, message)
+		self.Lost("Value extraction failed", err2, message)
-    return
+		return
-  }
+	}
 
-  unit, err3 := self.ExtractionHelper(subTopics, jPayload, self.unitSelector, self.unitJsonpath)
+	unit, err3 := self.ExtractionHelper(subTopics, jPayload, self.unitSelector, self.unitJsonpath)
-  if err3 != nil {
+	if err3 != nil {
-    self.Lost("Unit extraction failed", err3, message)
+		self.Lost("Unit extraction failed", err3, message)
-    return
+		return
-  }
+	}
 
-  measurement.Device = device
+	measurement.Device = device.(string)
 
-  var variable database.VariableType
+	var variable database.VariableType
-  variable.Label = ""
+	variable.Label = ""
-  variable.Variable = ""
+	variable.Variable = ""
-  variable.Unit = unit
+	variable.Unit = unit.(string)
-  variable.Value = value
+	variable.Value = value
-  measurement.Values = make(map[string]database.VariableType)
+	measurement.Values = make(map[string]database.VariableType)
-  measurement.Values["Value"] = variable
+	measurement.Values["Value"] = variable
 
-  log.Printf("Prepared measurement item: %s", measurement)
+	log.Printf("Prepared measurement item: %s", measurement)
-  self.dbh.StoreMeasurement(&measurement)
+	self.dbh.StoreMeasurement(&measurement)
-  self.S()
+	self.S()
 }
-