From: Roman Bazalevskiy Date: Sun, 16 Sep 2018 16:08:55 +0000 (+0300) Subject: Merge branch 'master' of rvb.name:openhab-process X-Git-Url: https://git.rvb.name/openhab-process.git/commitdiff_plain/33e4de673cfc18d5dbb46d56f5b7453329cf7e89?hp=-c Merge branch 'master' of rvb.name:openhab-process --- 33e4de673cfc18d5dbb46d56f5b7453329cf7e89 diff --combined mqtt-bt/scan-beacons index b73d674,a574f66..17e5533 --- a/mqtt-bt/scan-beacons +++ b/mqtt-bt/scan-beacons @@@ -1,5 -1,7 +1,7 @@@ #!/usr/bin/lua + json = require("json") + function getConfig(configname) local uci=require("uci") @@@ -22,7 -24,11 +24,11 @@@ mqtt_passwd = cur.get(config,"mqtt","password") if mqtt_host and not mqtt_id then - mqtt_id="beaconmon" + socket = require("socket") + posix = require("posix") + hostname = socket.dns.gethostname() + pid = posix.getpid() + mqtt_id="beaconmon-"..hostname.."-"..pid end if mqtt_host and not mqtt_port then @@@ -49,15 -55,13 +55,15 @@@ en function mqtt_encode(str) if (str) then str = string.gsub (str, "\n", "") + str = string.gsub (str, ":", "-") str = string.gsub (str, "/", "-") + str = string.gsub (str, " ", "_") end return str end function printLog(str) - if logging=="on" then + if logging=="yes" then capture("logger -t beaconmon "..str) else print(str) @@@ -74,29 -78,19 +80,19 @@@ en function open_dump() - run_command("/bin/kill `/usr/bin/pgrep hcidump`") + run_command("/bin/kill `/usr/bin/pgrep btmon`") run_command("/bin/kill `/usr/bin/pgrep hcitool`") - f = assert(io.popen ("/usr/bin/hcidump --raw")) + f = assert(io.popen ("/usr/bin/stdbuf -o0 /usr/bin/btmon")) run_command("/usr/bin/hciconfig hci0 down") run_command("/usr/bin/hciconfig hci0 up") - f_null = assert(io.popen ("/usr/bin/hcitool lescan --duplicates")) + f_null = assert(io.popen ("/usr/bin/hcitool lescan --duplicates --passive")) return f end function dump(o) - if type(o) == 'table' then - local s = '{ ' - for k,v in pairs(o) do - if type(k) ~= 'number' then k = '"'..k..'"' end - s = s .. '['..k..'] = ' .. dump(v) .. ',' - -- s = s .. dump(v) .. ',' - end - return s .. '} ' - else - return tostring(o) - end + return json.encode(o) end function trim(s) @@@ -104,131 -98,132 +100,132 @@@ end function mqtt_pub(path,value) - printLog("Pub "..path.." "..value) - return mqtt_client:publish(path,value) + res=mqtt_client:publish(path,value) + printLog("Pub "..path.." "..value.." returned "..res); + return res end function process_packet(packet) - local bytes={} - local idx=1 - local len local mac - local flags - local power - local tx - local type - local paysublen local uuid - local major - local minor local details + local type + local name + + mac = packet['Address'] + uuid = packet['uuid'] + type = packet['Type'] + name = packet['Name (complete)'] + + if type=='iBeacon' then + details=uuid + elseif name then + if not(type) then + type="name" + end + details=name + else + if not type then + type='unknown' + end + details=mac + end - if packet:len()>1 then - - while packet:len()>2 do - bytes[idx]=trim(packet:sub(1,3)) - idx=idx+1 - packet=packet:sub(4) - end - len = idx-1 - - if bytes[1]=='04' and bytes[2]=='3E' then - -- BLE Beacon? - type="" - mac=bytes[13]..':'..bytes[12]..':'..bytes[11]..':'..bytes[10]..':'..bytes[9]..':'..bytes[8] - flags=bytes[14] - power=tonumber("0x"..bytes[len-1])-256 - tx=tonumber("0x"..bytes[len])-256 - local j = 15 - while j" then - line = trim(line:sub(2)) - end + function starts(String,Start) + return string.sub(String,1,string.len(Start))==Start + end - if not (lchr == " ") then - process_packet(packet) - packet = "" - end + function split(inputstr, sep) + if sep == nil then + sep = "%s" + end + local t={} ; i=1 + for str in string.gmatch(inputstr, "([^"..sep.."]+)") do + t[i] = str + i = i + 1 + end + return t + end - llen=line:len() + function read_loop() - if llen<59 then - packet = packet .. " " .. line - process_packet(packet) - packet="" - else - packet = packet .. " " .. line - end + packet={} + inbound=false + + while true do + + str=inp:read("*l") + + if str then + + str=trim(str) + + if inbound then + t = split(str,':') + if #t>=2 then + name=t[1] + value=trim(table.concat(t,':',2)) + if name=="Address" then + value=split(value)[1] + end + packet[name]=value + elseif #t==1 and name then + if not(packet[name..'.list']) then + packet[name..'.list']={} + end + table.insert(packet[name..'.list'],(trim(t[1]))) + end + end + + if starts(str,'> HCI Event: LE Meta Event (0x3e)') then + inbound=true + name=nil + elseif starts(str,'RSSI:') then + inbound=false + process_packet(packet) + packet={} + end + + end end end + io.stdout:setvbuf('no') + io.stdin:setvbuf('no') + getConfig(arg[1]) if mqtt_host then - MQTT = require "paho.mqtt" - mqtt_client = MQTT.client.create(mqtt_host, mqtt_port) + MQTT = require "mosquitto" + mqtt_client = MQTT.new(mqtt_id) if mqtt_user then - mqtt_client:auth(mqtt_user, mqtt_passwd) + mqtt_client:login_set(mqtt_user, mqtt_passwd) end - mqtt_client:connect(mqtt_id) + mqtt_client:connect(mqtt_host,mqtt_port) end inp = open_dump()