lua: added udp-sendto and tcp-sendto (cf. uhppoted/uhppote-core#17)

Author: twystd

Makefile

@@ -304,9 +304,7 @@ lua-help: build regen
 	$(LUABIN) set-time -h 
 
 lua-debug: lua
-	# $(LUABIN) --debug --bind 192.168.1.100:0 --broadcast 192.168.1.255:60000 --events 0.0.0.0:60001 set-time-profile --controller 405419896 --profile 37 --start-date 2023-01-01 --end-date 2023-12-31 --weekdays Mon,Tue,Sun --segments "8:30-11:45, 13:15-17:30" --linked 33
-	# $(LUABIN) --debug --bind 192.168.1.100:0 --broadcast 192.168.1.255:60000 --events 0.0.0.0:60001 add-task --controller 405419896 --door 3 --task "door-normally-closed" --at "08:30" --start-date 2023-01-01 --end-date 2023-12-31 --weekdays Mon,Tue,Sun --more-cards 5
-	$(LUABIN) --debug --bind 192.168.1.100:0 --broadcast 192.168.1.255:60000 --events 0.0.0.0:60001 put-card --controller 405419896 --card 10058400 --start-date 2023-01-02 --end-date 2023-12-30 --doors 1:37,2,4 --PIN 6310
+	$(LUABIN) --debug --bind 192.168.1.100:0 --broadcast 192.168.1.255:60000 --events 0.0.0.0:60001 get-controller
 
 lua-cmd: lua
 	$(LUABIN) --debug --bind 192.168.1.100:0 --broadcast 192.168.1.255:60000 --events 0.0.0.0:60001 $(COMMAND)

TODO.md

@@ -7,12 +7,15 @@
       - [x] Zig
       - [x] PHP
       - [x] Erlang
+      - [ ] Lua
             - [x] udp-sendto
             - [x] tcp-sendto
-            - [x] controllers dictionary
-      - [ ] Lua
+            - [ ] controllers dictionary
       - [ ] models: rename 'device id' to controller and set type to 'controller'
       - [ ] remove uhppote::resolve
+      - [ ] documentation
+      - [ ] CHANGELOG
+      - [ ] README
 
 - [x] .ignore file (cf. https://github.com/uhppoted/uhppoted-codegen/issues/5)
       - [ ] root globs e.g. **/.DS_Store

bindings/lua/src/uhppote.lua

@@ -1,27 +1,27 @@
 local uhppote = {}
 local encode = require("src/encode")
 local decode = require("src/decode")
-local udp = require("src/udp")
+local ut0311 = require("src/ut0311")
 
 function uhppote.set_bind_address(address)
-    udp.set_bind_address(address)
+    ut0311.set_bind_address(address)
 end
 
 function uhppote.set_broadcast_address(address)
-    udp.set_broadcast_address(address)
+    ut0311.set_broadcast_address(address)
 end
 
 function uhppote.set_listen_address(address)
-    udp.set_listen_address(address)
+    ut0311.set_listen_address(address)
 end
 
 function uhppote.set_debug(debug)
-    udp.set_debug(debug)
+    ut0311.set_debug(debug)
 end
 
 function uhppote.get_all_controllers()
     local request = encode.get_controller_request(0)
-    local replies = udp.broadcast(request)
+    local replies = ut0311.broadcast(request)
 
     if not replies then
         error("no response")
@@ -47,7 +47,7 @@ function uhppote.listen(handler, onerror)
         end
     end
 
-    udp.listen(f)
+    ut0311.listen(f)
 end
 
 {{range .model.functions}}
@@ -56,8 +56,9 @@ end
 
 {{define "function"}}
 function uhppote.{{snakeCase .name}}({{template "args" .args}})
+    local c = resolve(controller)
     local request = encode.{{snakeCase .request.name}}({{template "params" .args}})
-    local reply = udp.send(request)
+    local reply = ut0311.send(c, request)
     {{if .response}}
     if not reply then
         error("no response")
@@ -70,4 +71,22 @@ function uhppote.{{snakeCase .name}}({{template "args" .args}})
 end
 {{end}}
 
+function resolve(controller)
+    local c = {
+        controller = controller,
+        address = "",
+        transport = "udp",
+
+        fields = function(self)
+            return {
+                "controller",
+                "address",
+                "transport"
+            }
+        end,
+    }
+
+    return c
+end
+
 return uhppote

bindings/lua/src/udp.lua renamed to bindings/lua/src/ut0311.lua

@@ -1,4 +1,4 @@
-local udp = {}
+local ut0311 = {}
 local socket = require("socket")
 local READ <const> = 5 -- seconds
 local READALL <const> = 2.5 -- seconds
@@ -11,7 +11,7 @@ local broadcast_port = 60000
 local listen_address = "*"
 local listen_port = 60001
 
-function udp.set_bind_address(addr)
+function ut0311.set_bind_address(addr)
     if not addr or addr == "" then
         bind_address = "*"
         bind_port = 0
@@ -31,7 +31,7 @@ function udp.set_bind_address(addr)
     end
 end
 
-function udp.set_broadcast_address(addr)
+function ut0311.set_broadcast_address(addr)
     if not addr or addr == "" then
         broadcast_address = "255.255.255.255"
         broadcast_port = 60000
@@ -51,7 +51,7 @@ function udp.set_broadcast_address(addr)
     end
 end
 
-function udp.set_listen_address(addr)
+function ut0311.set_listen_address(addr)
     if not addr or addr == "" then
         listen_address = "*"
         listen_port = 60001
@@ -71,11 +71,11 @@ function udp.set_listen_address(addr)
     end
 end
 
-function udp.set_debug(enabled)
+function ut0311.set_debug(enabled)
     debug = enabled
 end
 
-function udp.broadcast(request)
+function ut0311.broadcast(request)
     local sock = socket.udp4()
     local ok, result = pcall(function()
         return broadcast(sock, request)
@@ -90,22 +90,19 @@ function udp.broadcast(request)
     end
 end
 
-function udp.send(request)
-    local sock = socket.udp4()
-    local ok, result = pcall(function()
-        return send(sock, request)
-    end)
-
-    sock:close()
-
-    if not ok then
-        error(result)
-    else
-        return result
+function ut0311.send(controller, request)
+    if controller['address'] ~= "" and controller['transport'] == "tcp" then
+        return tcp_sendto(controller['address'], request)
+    end
+    
+    if controller['address'] ~= "" then
+        return udp_sendto(controller['address'], request)
     end
+       
+    return udp_broadcast_to(request)
 end
 
-function udp.listen(handler)
+function ut0311.listen(handler)
     local f = function(packet)
         dump(packet)
         handler(packet)
@@ -144,6 +141,92 @@ function broadcast(sock, request)
     return read_all(sock)
 end
 
+function udp_broadcast_to(request)
+    local sock = socket.udp4()
+    local ok, result = pcall(function()
+        return send(sock, request)
+    end)
+
+    sock:close()
+
+    if not ok then
+        error(result)
+    else
+        return result
+    end
+end
+
+function udp_sendto(address, request)
+    dump(request)
+
+    addr,port = addrport(address)
+
+    local sock = socket.udp4()
+    local ok, result = pcall(function()
+        if sock:setsockname(bind_address, 0) ~= 1 then
+            error("error binding to address")
+        end
+
+        sock:settimeout(READ, "b")
+        sock:settimeout(READALL, "t")
+        sock:sendto(request, addr, port)
+
+        -- set-ip doesn't return a reply
+        if string.byte(request, 2) == 0x96 then
+            return {}, nil
+        end
+
+        return read(sock)
+    end)
+
+    sock:close()
+
+    if not ok then
+        error(result)
+    else
+        return result
+    end
+end
+
+function tcp_sendto(address, request)
+    dump(request)
+
+    addr,port = addrport(address)
+
+    local sock = socket.tcp4()
+    local ok, result = pcall(function()
+        if sock:connect(addr, port) ~= 1 then
+            error("error connecting to ", addr, port)
+        end
+
+        sock:settimeout(READ, "b")
+        sock:settimeout(READALL, "t")
+        sock:send(request)
+
+        -- set-ip doesn't return a reply
+        if string.byte(request, 2) == 0x96 then
+            return {}, nil
+        end
+
+        local packet = sock:receive('*a')
+        if packet and #packet == 64 then
+            dump(packet)
+            return packet
+        end
+
+
+        return nil
+    end)
+
+    sock:close()
+
+    if not ok then
+        error(result)
+    else
+        return result
+    end
+end
+
 function send(sock, request)
     dump(request)
 
@@ -235,6 +318,20 @@ function listen_to(sock, f)
     end
 end
 
+function addrport(address)
+    if address and address ~= "" then
+        local addr, port = address:match("^(.-):(%d*)$")
+
+        if addr and port and addr ~= "" and port ~= "" then
+            return addr, tonumber(port)
+        elseif addr and addr ~= "" then
+            return addr, 60000
+        end
+    end
+
+    return "255.255.255.255", 60000
+end
+
 function dump(packet)
     if debug then
         local ix = 1
@@ -255,4 +352,4 @@ function dump(packet)
     end
 end
 
-return udp
+return ut0311