#233 search datapoints case-insensitive, fix case problems in API

ka-vaNu · Dec 26, 2024 · e926739 · e926739
1 parent 9952e19
commit e926739
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 9 deletions.
diff --git a/lib/gatebox.js b/lib/gatebox.js
@@ -51,7 +51,7 @@ const datapoints = {
         type: 'state',
         common: { name: 'IP-Adress', type: 'string', role: 'text', read: true, write: false },
     },
-    'gatebox#upTimeS': {
+    'gatebox#uptimeS': {
         path: 'uptimeS',
         type: 'state',
         common: { name: 'Uptime in seconds', type: 'number', role: 'value', read: true, write: false },

diff --git a/lib/multisensor.js b/lib/multisensor.js
@@ -39,8 +39,8 @@ const datapoints = {
         type: 'state',
         common: { name: 'IP-Adress', type: 'string', role: 'text', read: true, write: false },
     },
-    'multisensor#upTimeS': {
-        path: 'upTimeS',
+    'multisensor#uptimeS': {
+        path: 'uptimeS',
         type: 'state',
         common: { name: 'Uptime in seconds', type: 'number', role: 'value', read: true, write: false },
     },

diff --git a/lib/shutterbox.js b/lib/shutterbox.js
@@ -66,11 +66,6 @@ const datapoints = {
         type: 'state',
         common: { name: 'IP-Adress', type: 'string', role: 'text', read: true, write: false },
     },
-    'shutterbox#upTimeS': {
-        path: 'uptimeS',
-        type: 'state',
-        common: { name: 'Uptime in seconds', type: 'number', role: 'value', read: true, write: false },
-    },
     'shutterbox#uptimeS': {
         path: 'uptimeS',
         type: 'state',

diff --git a/lib/tools.js b/lib/tools.js
@@ -41,6 +41,22 @@ function isArray(it) {
     return Object.prototype.toString.call(it) === '[object Array]';
 }
 
+/**
+ * Finds a value in an object by a property name, case-insensitive.
+ *
+ * @param obj - The object to search in.
+ * @param prop - The property name to search for.
+ * @returns The value of the found property, or undefined if not found.
+ */
+function findVal(obj, prop) {
+    prop = `${prop}`.toLowerCase();
+    for (let p in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, p) && prop == `${p}`.toLowerCase()) {
+            return obj[p];
+        }
+    }
+}
+
 /**
  *
  * @param device    object of the device to request data
@@ -120,7 +136,8 @@ async function setIobStates(device, values) {
         }
         if (Object.prototype.hasOwnProperty.call(iob.datapoints[device.dev_name], search)) {
             const deviceDatapoints = iob.datapoints[device.dev_name];
-            const path = deviceDatapoints[search].path;
+            const datapoint = findVal(deviceDatapoints, search);
+            const path = datapoint.path;
             if (iob.extLog) {
                 iob.log.info(`setIobStates path: ${path}`);
             }
@@ -179,6 +196,7 @@ async function initCommon(name, apiType) {
 module.exports = {
     isArray,
     isObject,
+    findVal,
     setIob,
     initCommon,
     getBleboxData,

diff --git a/lib/tools.test.js b/lib/tools.test.js
@@ -19,6 +19,12 @@ const datapoints = {
     },
 };
 
+const objCaseInsensitive = {
+    testlower: 'lower',
+    TESTUPPER: 'upper',
+    TestMixed: 'mixed',
+};
+
 const responseData = {
     status: 'value1',
     details: {
@@ -85,6 +91,32 @@ describe('Test tools.isArray', function () {
     });
 });
 
+describe('Test tools.findVal', function () {
+    it('search lower same case', function () {
+        expect(tools.findVal(objCaseInsensitive, 'testlower')).to.equal('lower');
+    });
+
+    it('search lower different case', function () {
+        expect(tools.findVal(objCaseInsensitive, 'TESTLOWER')).to.equal('lower');
+    });
+
+    it('search UPPER same case', function () {
+        expect(tools.findVal(objCaseInsensitive, 'TESTUPPER')).to.equal('upper');
+    });
+
+    it('search UPPER different case', function () {
+        expect(tools.findVal(objCaseInsensitive, 'testupper')).to.equal('upper');
+    });
+
+    it('search Mixed', function () {
+        expect(tools.findVal(objCaseInsensitive, 'testmixed')).to.equal('mixed');
+    });
+
+    it('search not found', function () {
+        expect(tools.findVal(objCaseInsensitive, 'test')).to.be.undefined;
+    });
+});
+
 describe('Test tools.simpleObjectUrlGetter', () => {
     let axiosGetStub;