🐛 [HDK-8201] Retainer: fixing emqx plugin.

- Fixing retainer functionality with redis.

Author: jdavidagudelo

rebar.config

@@ -8,6 +8,8 @@
     , {emqx_durable_storage, {git_subdir, "https://github.com/emqx/emqx.git", {tag, "v5.1.4"}, "apps/emqx_durable_storage"}}
       %% this is my plugin's dependency
     , {map_sets, "1.1.0"}
+    , {eredis_cluster, {git, "https://github.com/emqx/eredis_cluster", {tag, "0.8.3"}}}
+    , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "v0.4.2"}}}
     ]}.
 
 {plugins, [
@@ -30,9 +32,9 @@
     , {builder,
         [ {name, "ubidots"}
         , {contact, "[email protected]"}
-        , {website, "http://example.com"}
+        , {website, "http://ubidots.com"}
         ]}
-    , {repo, "https://github.com/emqx/emqx-plugin-template"}
+    , {repo, "https://github.com/jdavidagudelo/emqx-plugin-template-test.git"}
     , {functionality, ["Demo"]}
     , {compatibility,
         [ {emqx, "~> 5.0"}

src/ubidots_emqx_core_redis_cli.erl

@@ -62,6 +62,8 @@ get_value_by_key(Pool, VariableKey, Type) ->
 
 get_values_loop_redis(_Pool, _Type, []) ->
     [];
+get_values_loop_redis(Pool, Type, [_ValueKind, _Topic, undefined | RestData]) ->
+    get_values_loop_redis(Pool, Type, RestData);
 get_values_loop_redis(Pool, Type, [ValueKind, Topic, VariableId | RestData]) ->
     VariableKey = string:concat(get_variable_key(ValueKind), binary_to_list(VariableId)),
     {ok, Value} = get_value_by_key(Pool, VariableKey, Type),

src/ubidots_emqx_plugin.app.src

@@ -1,11 +1,11 @@
-{application, ubidots_emqx_plugin, [
-    {description, "Another amazing EMQX plugin."},
-    {vsn, "0.1.0"},
-    {modules, []},
-    {registered, [ubidots_emqx_plugin_sup]},
-    {applications, [kernel, stdlib, map_sets]},
-    {mod, {ubidots_emqx_plugin_app, []}},
-    {env, []},
-    {licenses, ["Apache-2.0"]},
-    {maintainers, ["ubidots <devel@ubidots.com>"]}
-]}.
+{application, ubidots_emqx_plugin,
+ [{description, "Another amazing EMQX plugin."},
+  {vsn, "0.1.0"},
+  {modules, []},
+  {registered, [ubidots_emqx_plugin_sup]},
+  {applications, [kernel, stdlib, map_sets]},
+  {mod, {ubidots_emqx_plugin_app, []}},
+  {env, []},
+  {licenses, ["Apache-2.0"]},
+  {maintainers, ["ubidots <ubidots@email.com>"]}
+ ]}.

src/ubidots_emqx_reactor_redis_cli.erl

@@ -94,16 +94,20 @@ binary_to_list_validated(undefined) ->
 binary_to_list_validated(Value) ->
     binary_to_list(Value).
 
+can_view_value_device(_Pool, _Type, _PermissionType, _OwnerId, "*", _Token) ->
+    "1";
 can_view_value_device(_Pool, _Type, "all", _OwnerId, _DeviceLabel, _Token) ->
-    true;
-can_view_value_device(Pool, Type, _, OwnerId, DeviceLabel, Token) ->
+    "1";
+can_view_value_device(Pool, Type, _PermissionType, OwnerId, DeviceLabel, Token) ->
     DeviceHashSetKey = "reactor_variables/" ++ OwnerId,
     DeviceLabelKey = "/" ++ DeviceLabel,
     TokenKey = "reactor_devices_with_permissions/view_value/" ++ Token,
     DeviceId = execute_redis_command(Pool, Type, ["HGET", DeviceHashSetKey, DeviceLabelKey]),
     CanViewValueDevice = execute_redis_command(Pool, Type, ["SISMEMBER", TokenKey, DeviceId]),
     binary_to_list_validated(CanViewValueDevice).
 
+get_topics_mqtt_by_topic(none, _Topic, _VariableId) ->
+    [];
 get_topics_mqtt_by_topic(last_value, Topic, VariableId) ->
     [atom_to_list(last_value), Topic ++ "/lv", VariableId];
 get_topics_mqtt_by_topic(value, Topic, VariableId) ->
@@ -151,11 +155,20 @@ get_device_labels(Pool, Type, Token) ->
     DeviceIds = execute_redis_command(Pool, Type, ["SMEMBERS", DeviceIdsKey]),
     get_device_labels_by_device_ids(Pool, Type, DeviceIds).
 
+get_mqtt_topics_device_labels_and_variable_label(_Pool, _Type, _CanViewDevice, [], _VariableLabel, _OwnerId, _Token, _TopicKind, _Version) ->
+    [];
+get_mqtt_topics_device_labels_and_variable_label(Pool, Type, CanViewDevice, [DeviceLabel | Rest], VariableLabel, OwnerId, Token, TopicKind, Version) ->
+    get_mqtt_topics_by_label(Pool, Type, CanViewDevice, DeviceLabel, VariableLabel, OwnerId, Token, TopicKind, Version) ++ 
+    get_mqtt_topics_device_labels_and_variable_label(Pool, Type, CanViewDevice, Rest, VariableLabel, OwnerId, Token, TopicKind, Version).
+
 get_mqtt_topics_by_label(Pool, Type, "1", "*", "*", OwnerId, Token, TopicKind, Version) ->
     DeviceLabels = get_device_labels(Pool, Type, Token),
     get_mqtt_topics_by_device_labels(Pool, Type, DeviceLabels, OwnerId, TopicKind, Version);
 get_mqtt_topics_by_label(Pool, Type, "1", DeviceLabel, "*", OwnerId, _, TopicKind, Version) ->
     get_mqtt_topics_by_device_labels(Pool, Type, [DeviceLabel], OwnerId, TopicKind, Version);
+get_mqtt_topics_by_label(Pool, Type, "1", "*", VariableLabel, OwnerId, Token, TopicKind, Version) ->
+    DeviceLabels = get_device_labels(Pool, Type, Token),
+    get_mqtt_topics_device_labels_and_variable_label(Pool, Type, "1", DeviceLabels, VariableLabel, OwnerId, Token, TopicKind, Version);
 get_mqtt_topics_by_label(
     Pool, Type, "1", DeviceLabel, VariableLabel, OwnerId, _, TopicKind, Version
 ) ->