@iobroker/db-objects-redis 4.0.0-alpha.9-20211115-5dac659e → 4.0.3

package/README.md

@@ -3,4 +3,4 @@ The Library contains the Database classes for Redis based objects database clien
 
 ## License
 Apache 2.0
-Copyright 2018-2020 bluefox <dogafox@gmail.com>  
+Copyright 2018-2022 bluefox <dogafox@gmail.com>  

package/index.js

@@ -3,6 +3,6 @@ module.exports = {
     Server: null,
     objectsUtils: require('./lib/objects/objectsUtils.js'),
     getDefaultPort: host => {
-        return (host.includes(',')) ? 26379 : 6379;
+        return host.includes(',') ? 26379 : 6379;
     }
 };

package/lib/objects/{lua → lua-v3}/custom.lua

@@ -1,5 +1,5 @@
--- design: custom
--- search: state
+-- design: system
+-- search: custom
 local rep = {}
 -- local keys=redis.call("keys", KEYS[1].."*")
 local cursor = KEYS[4];
@@ -8,6 +8,7 @@ cursor = result[1]
 local keys = result[2]
 local argStart = KEYS[1] .. KEYS[2]
 local argEnd = KEYS[1] .. KEYS[3]
+local checkStr = string.format("%q:{", "custom")
 --  function(doc) {
 --      if (doc.type==="state" && (doc.common.custom || doc.common.history))
 --          emit(doc._id, doc.common.custom || doc.common.history)
@@ -15,9 +16,11 @@ local argEnd = KEYS[1] .. KEYS[3]
 for _, key in ipairs(keys) do
     if (key >= argStart and key < argEnd) then
         local obj = redis.call("get", key)
-        local success, decoded = pcall(cjson.decode, obj)
-        if (success and decoded.type == "state" and decoded.common ~= nil and decoded.common.custom ~= nil) then
-            rep[#rep + 1] = obj
+        if (obj:find(checkStr) ~= nil) then
+            local success, decoded = pcall(cjson.decode, obj)
+            if (success and decoded.type == "state" and decoded.common ~= nil and decoded.common.custom ~= nil) then
+                rep[#rep + 1] = obj
+            end
         end
     end
 end

package/lib/objects/{lua → lua-v3}/filter.lua

@@ -8,13 +8,17 @@ local keys = result[2]
 local argStart = KEYS[1] .. KEYS[2]
 local argEnd = KEYS[1] .. KEYS[3]
 local type = KEYS[4]
+local checkStr = string.format("%q:%q", "type", type)
+local skipCheck = not (type == "channel" or type == "device" or type == "folder")
 -- function(doc) { if (doc.type === "chart") emit(doc._id, doc); }
 for _, key in ipairs(keys) do
     if (key >= argStart and key < argEnd) then
         local obj = redis.call("get", key)
-        local success, decoded = pcall(cjson.decode, obj)
-        if (success and decoded.type == type) then
-            rep[#rep + 1] = obj
+        if (skipCheck or obj:find(checkStr) ~= nil) then
+            local success, decoded = pcall(cjson.decode, obj)
+            if (success and decoded.type == type) then
+                rep[#rep + 1] = obj
+            end
         end
     end
 end

package/lib/objects/{lua → lua-v3}/programs.lua

@@ -7,6 +7,7 @@ cursor = result[1]
 local keys = result[2]
 local argStart = KEYS[1] .. KEYS[2]
 local argEnd = KEYS[1] .. KEYS[3]
+local checkStr = string.format("%q:%q", "TypeName", "PROGRAM")
 --  function(doc) {
 --      if (doc._id.match(/^hm-rega\\.[0-9]+\\.[0-9,A-Z,a-z]+/) && (doc.native.TypeName === "PROGRAM")) {
 --          emit(doc._id, doc);
@@ -15,9 +16,11 @@ local argEnd = KEYS[1] .. KEYS[3]
 for _, key in ipairs(keys) do
     if (key >= argStart and key < argEnd and key:sub(7, 13) == "hm-rega") then
         local obj = redis.call("get", key)
-        local success, decoded = pcall(cjson.decode, obj)
-        if (success and decoded.native ~= nil and decoded.native.TypeName == "PROGRAM") then
-            rep[#rep + 1] = obj
+        if (obj:find(checkStr) ~= nil) then
+            local success, decoded = pcall(cjson.decode, obj)
+            if (success and decoded.native ~= nil and decoded.native.TypeName == "PROGRAM") then
+                rep[#rep + 1] = obj
+            end
         end
     end
 end

package/lib/objects/{lua → lua-v3}/script.lua

@@ -7,14 +7,17 @@ cursor = result[1]
 local keys = result[2]
 local argStart = KEYS[1] .. KEYS[2]
 local argEnd = KEYS[1] .. KEYS[3]
+local checkStr = string.format("%q:%q", "type", "script")
 --  function(doc) {
 --      if (doc.type === "script" && doc.common.engineType.match(/^[jJ]ava[sS]cript|^[cC]offee[sS]cript|^[tT]ype[sS]cript|^Blockly/)) emit(doc.common.name, doc); }
 for _, key in ipairs(keys) do
     if (key >= argStart and key < argEnd) then
         local obj = redis.call("get", key)
-        local success, decoded = pcall(cjson.decode, obj)
-        if (success and decoded.type == "script") then
-            rep[#rep + 1] = obj
+        if (obj:find(checkStr) ~= nil) then
+            local success, decoded = pcall(cjson.decode, obj)
+            if (success and decoded.type == "script") then
+                rep[#rep + 1] = obj
+            end
         end
     end
 end

package/lib/objects/{lua → lua-v3}/variables.lua

@@ -8,6 +8,7 @@ cursor = result[1]
 local keys = result[2]
 local argStart = KEYS[1] .. KEYS[2]
 local argEnd = KEYS[1] .. KEYS[3]
+local checkStr = string.format("%q:", "TypeName");
 --  function(doc) {
 --      if (doc._id.match(/^hm-rega\\.[0-9]+\\.[0-9,A-Z,a-z]+/) && (doc.native.TypeName === "ALARMDP" || doc.native.TypeName === "VARDP")) {
 --          emit(doc._id, doc);
@@ -16,9 +17,11 @@ local argEnd = KEYS[1] .. KEYS[3]
 for _, key in ipairs(keys) do
     if (key >= argStart and key < argEnd and key:sub(7, 13) == "hm-rega") then
         local obj = redis.call("get", key)
-        local success, decoded = pcall(cjson.decode, obj)
-        if (success and decoded.native ~= nil and (decoded.native.TypeName == "ALARMDP" or decoded.native.TypeName == "VARDP")) then
-            rep[#rep + 1] = obj
+        if (obj:find(checkStr) ~= nil) then
+            local success, decoded = pcall(cjson.decode, obj)
+            if (success and decoded.native ~= nil and (decoded.native.TypeName == "ALARMDP" or decoded.native.TypeName == "VARDP")) then
+                rep[#rep + 1] = obj
+            end
         end
     end
 end

package/lib/objects/lua-v4/custom.lua

@@ -0,0 +1,20 @@
+-- design: system
+-- search: custom
+local rep = {}
+-- local keys=redis.call("keys", KEYS[1].."*")
+local cursor = KEYS[4];
+local result = redis.call("SSCAN", KEYS[5], cursor, "MATCH", KEYS[1] .. "*", "COUNT", 500)
+cursor = result[1]
+local keys = result[2]
+local argStart = KEYS[1] .. KEYS[2]
+local argEnd = KEYS[1] .. KEYS[3]
+--  function(doc) {
+--      if (doc.type==="state" && (doc.common.custom || doc.common.history))
+--          emit(doc._id, doc.common.custom || doc.common.history)
+--   }
+for _, key in ipairs(keys) do
+    if (key >= argStart and key < argEnd) then
+        rep[#rep + 1] = redis.call("get", key)
+    end
+end
+return { rep, cursor }

package/lib/objects/lua-v4/filter.lua

@@ -0,0 +1,16 @@
+-- func: function(doc) { if (doc.type === "%1") emit(doc._id, doc); }
+local rep = {}
+-- local keys=redis.call("keys", KEYS[1].."*")
+local cursor = KEYS[5];
+local result = redis.call("SSCAN", KEYS[6], cursor, "MATCH", KEYS[1] .. "*", "COUNT", 500)
+cursor = result[1]
+local keys = result[2]
+local argStart = KEYS[1] .. KEYS[2]
+local argEnd = KEYS[1] .. KEYS[3]
+-- function(doc) { if (doc.type === "chart") emit(doc._id, doc); }
+for _, key in ipairs(keys) do
+    if (key >= argStart and key < argEnd) then
+        rep[#rep + 1] = redis.call("get", key)
+    end
+end
+return { rep, cursor }

package/lib/objects/lua-v4/programs.lua

@@ -0,0 +1,27 @@
+-- design: hm-rega
+-- search: programs
+local rep = {}
+local cursor = KEYS[4];
+local result = redis.call("SSCAN", KEYS[5], cursor, "MATCH", KEYS[1] .. "*", "COUNT", 500)
+cursor = result[1]
+local keys = result[2]
+local argStart = KEYS[1] .. KEYS[2]
+local argEnd = KEYS[1] .. KEYS[3]
+local checkStr = string.format("%q:%q", "TypeName", "PROGRAM")
+--  function(doc) {
+--      if (doc._id.match(/^hm-rega\\.[0-9]+\\.[0-9,A-Z,a-z]+/) && (doc.native.TypeName === "PROGRAM")) {
+--          emit(doc._id, doc);
+--      }
+--  }
+for _, key in ipairs(keys) do
+    if (key >= argStart and key < argEnd) then
+        local obj = redis.call("get", key)
+        if (obj:find(checkStr) ~= nil) then
+            local success, decoded = pcall(cjson.decode, obj)
+            if (success and decoded.native ~= nil and decoded.native.TypeName == "PROGRAM") then
+                rep[#rep + 1] = obj
+            end
+        end
+    end
+end
+return { rep, cursor }

package/lib/objects/lua-v4/redlock_acquire.lua

@@ -0,0 +1,12 @@
+-- REDLOCK SCRIPT
+-- call with key, value, ms (for set px)
+local key = KEYS[1]
+
+if redis.call("exists", key) == 1 then
+  -- lock already acquired by someone could be us too (we can only extend)
+  return 0
+end
+
+redis.call("set", key, KEYS[2], "PX", KEYS[3])
+-- return 1 if lock acquired
+return 1

package/lib/objects/lua-v4/redlock_extend.lua

@@ -0,0 +1,12 @@
+-- REDLOCK SCRIPT
+-- call with key, value, ms (for set px)
+local key = KEYS[1]
+
+if redis.call("get", key) ~= KEYS[2] then
+  -- we return 0 if lock is already taken by someone else
+  return 0
+end
+
+redis.call("set", key, KEYS[2], "PX", KEYS[3])
+-- return 1 if we extended the lock successfully
+return 1

package/lib/objects/lua-v4/redlock_release.lua

@@ -0,0 +1,10 @@
+-- REDLOCK SCRIPT
+-- release a lock by deleting the key
+-- call with key, value
+local key = KEYS[1]
+
+if redis.call("get", key) == KEYS[2] then
+  redis.pcall("del", key)
+  -- we need to publish a expire, because redis won't do it
+  redis.call("publish", "__keyevent@" .. KEYS[3] .. "__:expired", KEYS[4])
+end

package/lib/objects/lua-v4/script.lua

@@ -0,0 +1,17 @@
+-- design: script
+-- search: javascript
+local rep = {}
+local cursor = KEYS[4];
+local result = redis.call("SSCAN", KEYS[5], cursor, "MATCH", KEYS[1] .. "*", "COUNT", 500)
+cursor = result[1]
+local keys = result[2]
+local argStart = KEYS[1] .. KEYS[2]
+local argEnd = KEYS[1] .. KEYS[3]
+--  function(doc) {
+--      if (doc.type === "script" && doc.common.engineType.match(/^[jJ]ava[sS]cript|^[cC]offee[sS]cript|^[tT]ype[sS]cript|^Blockly/)) emit(doc.common.name, doc); }
+for _, key in ipairs(keys) do
+    if (key >= argStart and key < argEnd) then
+        rep[#rep + 1] = redis.call("get", key)
+    end
+end
+return { rep, cursor }

package/lib/objects/lua-v4/variables.lua

@@ -0,0 +1,28 @@
+-- design: hm-rega
+-- search: variables
+local rep = {}
+-- local keys=redis.call("keys", KEYS[1].."*")
+local cursor = KEYS[4];
+local result = redis.call("SSCAN", KEYS[5], cursor, "MATCH", KEYS[1] .. "*", "COUNT", 500)
+cursor = result[1]
+local keys = result[2]
+local argStart = KEYS[1] .. KEYS[2]
+local argEnd = KEYS[1] .. KEYS[3]
+local checkStr = string.format("%q:", "TypeName");
+--  function(doc) {
+--      if (doc._id.match(/^hm-rega\\.[0-9]+\\.[0-9,A-Z,a-z]+/) && (doc.native.TypeName === "ALARMDP" || doc.native.TypeName === "VARDP")) {
+--          emit(doc._id, doc);
+--      }
+--  }
+for _, key in ipairs(keys) do
+    if (key >= argStart and key < argEnd) then
+        local obj = redis.call("get", key)
+        if (obj:find(checkStr) ~= nil) then
+            local success, decoded = pcall(cjson.decode, obj)
+            if (success and decoded.native ~= nil and (decoded.native.TypeName == "ALARMDP" or decoded.native.TypeName == "VARDP")) then
+                rep[#rep + 1] = obj
+            end
+        end
+    end
+end
+return { rep, cursor }

package/lib/objects/lua-v4-no-sets/custom.lua

@@ -0,0 +1,27 @@
+-- design: system
+-- search: custom
+local rep = {}
+-- local keys=redis.call("keys", KEYS[1].."*")
+local cursor = KEYS[4];
+local result = redis.call("SCAN", cursor, "MATCH", KEYS[1] .. "*", "COUNT", 500)
+cursor = result[1]
+local keys = result[2]
+local argStart = KEYS[1] .. KEYS[2]
+local argEnd = KEYS[1] .. KEYS[3]
+local checkStr = string.format("%q:{", "custom")
+--  function(doc) {
+--      if (doc.type==="state" && (doc.common.custom || doc.common.history))
+--          emit(doc._id, doc.common.custom || doc.common.history)
+--   }
+for _, key in ipairs(keys) do
+    if (key >= argStart and key < argEnd) then
+        local obj = redis.call("get", key)
+        if (obj:find(checkStr) ~= nil) then
+            local success, decoded = pcall(cjson.decode, obj)
+            if (success and decoded.type == "state" and decoded.common ~= nil and decoded.common.custom ~= nil) then
+                rep[#rep + 1] = obj
+            end
+        end
+    end
+end
+return { rep, cursor }

package/lib/objects/lua-v4-no-sets/filter.lua

@@ -0,0 +1,25 @@
+-- func: function(doc) { if (doc.type === "%1") emit(doc._id, doc); }
+local rep = {}
+-- local keys=redis.call("keys", KEYS[1].."*")
+local cursor = KEYS[5];
+local result = redis.call("SCAN", cursor, "MATCH", KEYS[1] .. "*", "COUNT", 500)
+cursor = result[1]
+local keys = result[2]
+local argStart = KEYS[1] .. KEYS[2]
+local argEnd = KEYS[1] .. KEYS[3]
+local type = KEYS[4]
+local checkStr = string.format("%q:%q", "type", type)
+local skipCheck = not (type == "channel" or type == "device" or type == "folder")
+-- function(doc) { if (doc.type === "chart") emit(doc._id, doc); }
+for _, key in ipairs(keys) do
+    if (key >= argStart and key < argEnd) then
+        local obj = redis.call("get", key)
+        if (skipCheck or obj:find(checkStr) ~= nil) then
+            local success, decoded = pcall(cjson.decode, obj)
+            if (success and decoded.type == type) then
+                rep[#rep + 1] = obj
+            end
+        end
+    end
+end
+return { rep, cursor }

package/lib/objects/lua-v4-no-sets/programs.lua

@@ -0,0 +1,27 @@
+-- design: hm-rega
+-- search: programs
+local rep = {}
+local cursor = KEYS[4];
+local result = redis.call("SCAN", cursor, "MATCH", KEYS[1] .. "*", "COUNT", 500)
+cursor = result[1]
+local keys = result[2]
+local argStart = KEYS[1] .. KEYS[2]
+local argEnd = KEYS[1] .. KEYS[3]
+local checkStr = string.format("%q:%q", "TypeName", "PROGRAM")
+--  function(doc) {
+--      if (doc._id.match(/^hm-rega\\.[0-9]+\\.[0-9,A-Z,a-z]+/) && (doc.native.TypeName === "PROGRAM")) {
+--          emit(doc._id, doc);
+--      }
+--  }
+for _, key in ipairs(keys) do
+    if (key >= argStart and key < argEnd and key:sub(7, 13) == "hm-rega") then
+        local obj = redis.call("get", key)
+        if (obj:find(checkStr) ~= nil) then
+            local success, decoded = pcall(cjson.decode, obj)
+            if (success and decoded.native ~= nil and decoded.native.TypeName == "PROGRAM") then
+                rep[#rep + 1] = obj
+            end
+        end
+    end
+end
+return { rep, cursor }

package/lib/objects/lua-v4-no-sets/redlock_acquire.lua

@@ -0,0 +1,12 @@
+-- REDLOCK SCRIPT
+-- call with key, value, ms (for set px)
+local key = KEYS[1]
+
+if redis.call("exists", key) == 1 then
+  -- lock already acquired by someone could be us too (we can only extend)
+  return 0
+end
+
+redis.call("set", key, KEYS[2], "PX", KEYS[3])
+-- return 1 if lock acquired
+return 1

package/lib/objects/lua-v4-no-sets/redlock_extend.lua

@@ -0,0 +1,12 @@
+-- REDLOCK SCRIPT
+-- call with key, value, ms (for set px)
+local key = KEYS[1]
+
+if redis.call("get", key) ~= KEYS[2] then
+  -- we return 0 if lock is already taken by someone else
+  return 0
+end
+
+redis.call("set", key, KEYS[2], "PX", KEYS[3])
+-- return 1 if we extended the lock successfully
+return 1

package/lib/objects/lua-v4-no-sets/redlock_release.lua

@@ -0,0 +1,10 @@
+-- REDLOCK SCRIPT
+-- release a lock by deleting the key
+-- call with key, value
+local key = KEYS[1]
+
+if redis.call("get", key) == KEYS[2] then
+  redis.pcall("del", key)
+  -- we need to publish a expire, because redis won't do it
+  redis.call("publish", "__keyevent@" .. KEYS[3] .. "__:expired", KEYS[4])
+end

package/lib/objects/lua-v4-no-sets/script.lua

@@ -0,0 +1,24 @@
+-- design: script
+-- search: javascript
+local rep = {}
+local cursor = KEYS[4];
+local result = redis.call("SCAN", cursor, "MATCH", KEYS[1] .. "*", "COUNT", 500)
+cursor = result[1]
+local keys = result[2]
+local argStart = KEYS[1] .. KEYS[2]
+local argEnd = KEYS[1] .. KEYS[3]
+local checkStr = string.format("%q:%q", "type", "script")
+--  function(doc) {
+--      if (doc.type === "script" && doc.common.engineType.match(/^[jJ]ava[sS]cript|^[cC]offee[sS]cript|^[tT]ype[sS]cript|^Blockly/)) emit(doc.common.name, doc); }
+for _, key in ipairs(keys) do
+    if (key >= argStart and key < argEnd) then
+        local obj = redis.call("get", key)
+        if (obj:find(checkStr) ~= nil) then
+            local success, decoded = pcall(cjson.decode, obj)
+            if (success and decoded.type == "script") then
+                rep[#rep + 1] = obj
+            end
+        end
+    end
+end
+return { rep, cursor }

package/lib/objects/lua-v4-no-sets/variables.lua

@@ -0,0 +1,28 @@
+-- design: hm-rega
+-- search: variables
+local rep = {}
+-- local keys=redis.call("keys", KEYS[1].."*")
+local cursor = KEYS[4];
+local result = redis.call("SCAN", cursor, "MATCH", KEYS[1] .. "*", "COUNT", 500)
+cursor = result[1]
+local keys = result[2]
+local argStart = KEYS[1] .. KEYS[2]
+local argEnd = KEYS[1] .. KEYS[3]
+local checkStr = string.format("%q:", "TypeName");
+--  function(doc) {
+--      if (doc._id.match(/^hm-rega\\.[0-9]+\\.[0-9,A-Z,a-z]+/) && (doc.native.TypeName === "ALARMDP" || doc.native.TypeName === "VARDP")) {
+--          emit(doc._id, doc);
+--      }
+--  }
+for _, key in ipairs(keys) do
+    if (key >= argStart and key < argEnd and key:sub(7, 13) == "hm-rega") then
+        local obj = redis.call("get", key)
+        if (obj:find(checkStr) ~= nil) then
+            local success, decoded = pcall(cjson.decode, obj)
+            if (success and decoded.native ~= nil and (decoded.native.TypeName == "ALARMDP" or decoded.native.TypeName == "VARDP")) then
+                rep[#rep + 1] = obj
+            end
+        end
+    end
+end
+return { rep, cursor }