Добавлена обработка JSON на входе для возможности работы с mainline-версией rtl433...

[weathermon.git] / weathermon.lua

diff --git a/weathermon.lua b/weathermon.lua
index c97983058796ddaf275bcc6c9417d8d69b6da35a..7a366b04f320e6a709b23ad2d8f7b26e1a5a1bf2 100755 (executable)
--- a/weathermon.lua
+++ b/weathermon.lua
@@ -1,10 +1,44 @@
 #!/usr/bin/lua
 
 #!/usr/bin/lua
 

-function getConfig()
+require("json")
+require("socket")
+
+function startswith(String,Start)
+   if String then
+     return string.sub(String,1,string.len(Start))==Start
+   else
+     return False
+   end    
+end
+
+function url_encode(str)
+  if (str) then
+    str = string.gsub (str, "\n", "\r\n")
+    str = string.gsub (str, "([^%w %-%_%.%~])",
+        function (c) return string.format ("%%%02X", string.byte(c)) end)
+    str = string.gsub (str, " ", "+")
+  end
+  return str   
+end
+
+function mqtt_encode(str)
+  if (str) then
+    str = string.gsub (str, "\n", "")
+    str = string.gsub (str, "/", "-")
+  end
+  return str   
+end
+
+function getConfig(configname)

 
   local uci=require("uci")
   local cur=uci.cursor()
 
   local uci=require("uci")
   local cur=uci.cursor()

-  local config="weathermon"
+  local config
+  if configname then
+    config=configname
+  else
+    config="weathermon"
+  end

 
   web_url  = cur.get(config,"web","url")
   web_user = cur.get(config,"web","user")
 
   web_url  = cur.get(config,"web","url")
   web_user = cur.get(config,"web","user")


@@ -49,7 +83,7 @@ function getConfig()
   if serial_port then
 
     command = "stty -F  "..serial_port.." "..serial_baud
   if serial_port then
 
     command = "stty -F  "..serial_port.." "..serial_baud

-    os.execute(command)
+    os.capture(command)

 
   end
 
 
   end
 


@@ -59,6 +93,9 @@ function getConfig()
   mqtt_topic = cur.get(config,"mqtt","topic")
   mqtt_alarm_topic = cur.get(config,"mqtt","alarm_topic")
 
   mqtt_topic = cur.get(config,"mqtt","topic")
   mqtt_alarm_topic = cur.get(config,"mqtt","alarm_topic")
 

+  mqtt_user = cur.get(config,"mqtt","user")
+  mqtt_passwd = cur.get(config,"mqtt","password")
+

   if mqtt_host and not mqtt_id then
     mqtt_id="weather-"..web_devid
   end
   if mqtt_host and not mqtt_id then
     mqtt_id="weather-"..web_devid
   end


@@ -68,17 +105,15 @@ function getConfig()
   end
 
   if mqtt_host and not mqtt_topic then
   end
 
   if mqtt_host and not mqtt_topic then

-    mqtt_topic = 'weathermon/'..web_devid
+    mqtt_topic = 'weathermon/{dev}/{type}/{id}/{param}'

   end
 
   if mqtt_host and not mqtt_alarm_topic then
   end
 
   if mqtt_host and not mqtt_alarm_topic then

-    mqtt_alarm_topic = 'alarm/'..web_devid
+    mqtt_alarm_topic = 'alarm/{dev}/{type}/{id}'

   end
 
 end
 
   end
 
 end
 

-require "socket"
-

 function sleep(sec)
   socket.select(nil, nil, sec)
 end
 function sleep(sec)
   socket.select(nil, nil, sec)
 end


@@ -88,7 +123,6 @@ function splitStr(str,char)
   local res = {}
   local idx = 1
 
   local res = {}
   local idx = 1
 

-

   while str:len()>0 do
     pos = str:find(char); 
     if pos == nil then
   while str:len()>0 do
     pos = str:find(char); 
     if pos == nil then


@@ -106,15 +140,16 @@ function splitStr(str,char)
 end
 
 function printLog(str)
 end
 
 function printLog(str)

-  print(str)

   if logging=="on" then
     os.execute("logger -t weathermon "..str)
   if logging=="on" then
     os.execute("logger -t weathermon "..str)

+  else 
+    print(str)  

   end 
 end
 
 function submitValue(type,id,param,val)
 
   end 
 end
 
 function submitValue(type,id,param,val)
 

-  url = web_url.."?stype="..type.."&sid="..id.."&param="..param.."&value="..val
+  url = web_url.."?stype="..url_encode(type).."&sid="..url_encode(id).."&param="..url_encode(param).."&value="..url_encode(val)

 
   command = "curl"
 
 
   command = "curl"
 


@@ -132,11 +167,59 @@ function submitValue(type,id,param,val)
 
 end
 
 
 end
 

+function processJson(str)
+
+  msg=json.decode(str)
+
+  sensor={}
+
+  for key,value in pairs(msg) do
+    if value then
+      if key=="model" then
+        sensor_type=value
+      elseif key=="id" then
+        sensor_id=value
+      elseif key=='time' then
+        sensor_time=value
+      else
+        sensor[key]=value
+      end
+    end
+  end
+
+  if not (sensor_type==nil or sensor_id==nil or sensor_type=='' or sensor_id=='') then
+    for k,v in pairs(sensor) do
+      printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v)
+      submitValue(sensor_type,sensor_id,k,v)
+      if mqtt_client then
+        mqtt_path=string.gsub(mqtt_topic,"{(.-)}", 
+          function (name) 
+            if name=="dev" then
+              return mqtt_encode(web_devid)
+            elseif name=="type" then
+              return mqtt_encode(sensor_type)
+            elseif name=="id" then
+              return mqtt_encode(sensor_id)
+            elseif name=="param" then
+              return k
+            else
+              return '{'..name..'}'
+            end      
+          end)
+        mqtt_client:publish(mqtt_path,v)
+      end  
+    end
+  else
+    printLog("Cannot parse sensor input: "..msg_body)
+  end
+
+end
+

 function processLine(str)
 
   msg=splitStr(line,':')
 function processLine(str)
 
   msg=splitStr(line,':')

-  msg_type=msg[1] or nil
-  msg_body=msg[2] or nil
+  msg_type=msg[1] or ''
+  msg_body=msg[2] or ''

   if msg_type=="STATUS" then
     printLog("Status: "..msg_body)
   elseif msg_type=="ERROR" then
   if msg_type=="STATUS" then
     printLog("Status: "..msg_body)
   elseif msg_type=="ERROR" then


@@ -150,8 +233,8 @@ function processLine(str)
     sensor_id = web_devid
     for i,rec in ipairs(sens) do
       recrd=splitStr(rec,'=')
     sensor_id = web_devid
     for i,rec in ipairs(sens) do
       recrd=splitStr(rec,'=')

-      key=recrd[1] or nil
-      value=recrd[2] or nil
+      key=recrd[1] or ''
+      value=recrd[2] or ''

       if value then
         if key=="TYPE" then
           sensor_type=value
       if value then
         if key=="TYPE" then
           sensor_type=value


@@ -162,16 +245,30 @@ function processLine(str)
         end
       end
     end
         end
       end
     end

-    mqtt_param = {}
-    for k,v in pairs(sensor) do
-      printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v)
-      submitValue(sensor_type,sensor_id,k,v)
-      mqtt_param[k]=v
-    end
-    mqtt_msg = { type=sensor_type, id=sensor_id, data=mqtt_param }
-    if mqtt_client then
-      serializedString = json.encode(mqtt_msg)
-      mqtt_client:publish(mqtt_topic,serializedString)
+    if not (sensor_type==nil or sensor_id==nil or sensor_type=='' or sensor_id=='') then
+      for k,v in pairs(sensor) do
+        printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v)
+        submitValue(sensor_type,sensor_id,k,v)
+        if mqtt_client then
+          mqtt_path=string.gsub(mqtt_topic,"{(.-)}", 
+            function (name) 
+              if name=="dev" then
+                return web_devid
+              elseif name=="type" then
+                return sensor_type
+              elseif name=="id" then
+                return sensor_id
+              elseif name=="param" then
+                return k
+              else
+                return '{'..name..'}'
+              end      
+            end)
+          mqtt_client:publish(mqtt_path,v)
+        end  
+      end
+    else
+      printLog("Cannot parse sensor input: "..msg_body)

     end
   elseif msg_type=="ALARM" then
     printLog("ALARM: "..msg_body)  
     end
   elseif msg_type=="ALARM" then
     printLog("ALARM: "..msg_body)  


@@ -183,41 +280,55 @@ function processLine(str)
     mqtt_param = {}
     for i,rec in ipairs(sens) do
       recrd=splitStr(rec,'=')
     mqtt_param = {}
     for i,rec in ipairs(sens) do
       recrd=splitStr(rec,'=')

-      key=recrd[1] or nil
-      value=recrd[2] or nil
+      key=recrd[1] or ''
+      value=recrd[2] or ''

       if value then
         if key=="TYPE" then
           alarm_type=value
         elseif key=="ID" then
           alarm_id=value
       if value then
         if key=="TYPE" then
           alarm_type=value
         elseif key=="ID" then
           alarm_id=value

-        else
-          mqtt_param[key]=value

         end
       end
     end
         end
       end
     end

-    if mqtt_client then
-      mqtt_msg = { type = alarm_type, id = alarm_id, data = mqtt_param }
-      serializedString = json.encode(mqtt_msg)
-      mqtt_client:publish(mqtt_alarm_topic,serializedString)
-    end
-    if alarm_exec then
-      command=alarm_exec..
-        " \""..string.gsub(alarm_type,"\"","\\\"")..
-        "\" \""..string.gsub(alarm_id,"\"","\\\"")..
-        "\" \""..string.gsub(msg_body,"\"","\\\"").."\""
-      os.execute(command)
+    if not (alarm_type==nil or alarm_id==nil or alarm_type=='' or alarm_id=='') then
+      if mqtt_client then
+        mqtt_path=string.gsub(mqtt_alarm_topic,"{(.-)}", 
+          function (name) 
+            if name=="dev" then
+              return web_devid
+            elseif name=="type" then
+              return sensor_type
+            elseif name=="id" then
+              return sensor_id
+            else
+              return '{'..name..'}'
+            end      
+          end)
+        mqtt_client:publish(mqtt_path,msg_body)
+      end
+      if alarm_exec then
+        command=alarm_exec..
+          " \""..string.gsub(alarm_type,"\"","\\\"")..
+          "\" \""..string.gsub(alarm_id,"\"","\\\"")..
+          "\" \""..string.gsub(msg_body,"\"","\\\"").."\""
+        os.execute(command)
+      end
+    else
+      printLog("Cannot parse alarm input: "..msg_body)

     end
   end
 
 end
 
     end
   end
 
 end
 

-getConfig()
+getConfig(arg[1])

 
 if mqtt_host then
   MQTT = require "paho.mqtt"
   mqtt_client = MQTT.client.create(mqtt_host, mqtt_port)
 
 if mqtt_host then
   MQTT = require "paho.mqtt"
   mqtt_client = MQTT.client.create(mqtt_host, mqtt_port)

+  if mqtt_user then
+    mqtt_client:auth(mqtt_user, mqtt_passwd)
+  end

   mqtt_client:connect(mqtt_id)
   mqtt_client:connect(mqtt_id)

-  json = require( "json" )

 end
 
 if serial_port then
 end
 
 if serial_port then


@@ -234,6 +345,13 @@ else
 end  
 while 1 do
   line=serialin:read()
 end  
 while 1 do
   line=serialin:read()

-  print(line)
-  processLine(line)
+  if line == nil then
+    break
+  end
+  printLog("Received: "..line);
+  if startswith(line,'{') then
+    processJson(line)
+  else
+    processLine(line)
+  end

 end
 end