erlang: implemented CONTROLLERS dictionary lookup (cf. uhppoted/uhppo…

…te-core#17)

TODO.md

@@ -6,10 +6,10 @@
       - [x] Python
       - [x] Zig
       - [x] PHP
-      - [ ] Erlang
+      - [x] Erlang
             - [x] udp-sendto
             - [x] tcp-sendto
-            - [ ] controllers dictionary
+            - [x] controllers dictionary
       - [ ] Lua
       - [ ] models: rename 'device id' to controller and set type to 'controller'
       - [ ] remove uhppote::resolve

bindings/.models/erlang.json

@@ -14,7 +14,7 @@
             "datetime": "datetime",
             "HHmm": "hhmm",
             "pin": "pin",
-            "controller": "uint32",
+            "controller": "Controller",
 
             "optional date": "date",
             "optional datetime": "datetime"

bindings/erlang/.templates/templates.erl

@@ -1,13 +1,9 @@
 {{define "args"}}{{ range $index, $arg := .}}{{if ne .type "magic"}}{{if $index}}, {{end}}{{CamelCase .name}}{{end}}{{end}}{{end}}
 
-{{define "params"}}{{ range $index, $param := .}}{{if ne .type "magic"}}{{if $index}}, {{end}}{{CamelCase .name}}{{end}}{{end}}{{end}}
+{{define "params"}}{{ range $index, $param := .}}{{if ne .type "magic"}}, {{CamelCase .name}}{{end}}{{end}}{{end}}
 
 {{define "values"}}{{ range $index, $param := .}}{{if $index}}, {{end}}{{template "var" .}}{{end}}{{end}}
 
 {{define "type"}}{{lookup "erlang.types" . "???"}}{{end}}
 
 {{define "var"}}to{{CamelCase .type}}("{{ .value }}"){{end}}
-
-
-
-

bindings/erlang/src/commands.erl

@@ -2,6 +2,8 @@
 
 -export([commands/0, find/1, exec/3]).
 
+-include("records.hrl").
+
 -define(CONTROLLER, 405419896).
 -define(DOOR, 3).
 -define(MODE, 2).
@@ -18,7 +20,19 @@
 
 -define(LOG_TAG, "commands").
 
--include("records.hrl").
+-define(CONTROLLERS, #{
+    405419896 => #controller{
+        controller = 405419896,
+        address = "192.168.1.100",
+        transport = "tcp"
+    },
+
+    303986753 => #controller{
+        controller = 303986753,
+        address = "192.168.1.100:60000",
+        transport = "udp"
+    }
+}).
 
 commands() ->
     [
@@ -79,7 +93,7 @@ execute(get_all_controllers, _Options, Config) ->
     uhppoted:get_all_controllers(Config);
 
 execute(get_controller, _Options, Config) ->
-    Controller = ?CONTROLLER,
+    Controller = resolve(?CONTROLLER),
     uhppoted:get_controller(Config, Controller);
 
 execute(set_ip, _Options, Config) ->
@@ -333,6 +347,17 @@ listen() ->
             log:infof(?LOG_TAG, closed)
     end.
 
+resolve(Controller) ->
+    case maps:find(Controller, ?CONTROLLERS) of
+        {ok, V} -> V;
+        _ ->  
+            #controller{
+                controller = Controller,
+                address = "",
+                transport = "udp"
+            }
+    end.
+
 parse_addr(S) ->
     [A, P] = string:tokens(S, ":"),
     {ok, Addr} = inet:parse_address(A),

bindings/erlang/src/records.hrl

@@ -1,3 +1,5 @@
+-record(controller, {controller, address, transport}).
+
 {{range .model.responses}}
 {{ template "response" . -}}
 {{end}}
@@ -17,4 +19,3 @@
     {{range (last .fields)}}{{snakeCase .name}}{{end}}
 }).
 {{end}}
-

bindings/erlang/src/uhppoted.erl

@@ -12,7 +12,7 @@
 
 -define(LOG_TAG, "uhppoted").
 
--record(controller, {controller, address, transport}).
+-include("records.hrl").
 
 get_all_controllers(Config) ->
     Request = encoder:get_controller_request(0),
@@ -63,7 +63,7 @@ listen(Handler) ->
 {{define "function"}}
 {{snakeCase .name}}(Config, {{template "args" .args}}) ->
     C = resolve(Controller),
-    Request = encoder:{{snakeCase .request.name}}({{template "params" .args}}),
+    Request = encoder:{{snakeCase .request.name}}(C#controller.controller{{template "params" slice .args 1}}),
 
     case ut0311:send(Config, C, Request) of
         {ok, none} ->
@@ -77,9 +77,16 @@ listen(Handler) ->
     end.
 {{end}}
 
-resolve(Controller) ->
+resolve(Controller) when is_integer(Controller) ->
     #controller{
         controller = Controller,
         address = "",
         transport = "udp"
+    };
+
+resolve({controller, Controller, Address, Transport}) ->
+    #controller{
+        controller = Controller,
+        address = Address,
+        transport = Transport
     }.

bindings/go/commands.go

@@ -30,6 +30,7 @@ var LISTENER = netip.MustParseAddrPort("192.168.1.100:60001")
 
 var controllers = map[uint32]uhppote.Controller{
     405419896: uhppote.Controller{405419896, "192.168.1.100:60000", "tcp"},
+    303986753: uhppote.Controller{303986753,"192.168.1.100:60000","udp"},
 }
 
 type command struct {