From 89d377c85d158d696ca997e661c21ce5092b135e Mon Sep 17 00:00:00 2001
From: lokonli <sander.lokerse@gmail.com>
Date: Tue, 6 Jun 2023 20:35:55 +0200
Subject: [PATCH] Domoticz API fix changes

---
 docs/releasenotes/releasenotes.rst |  8 ++++++++
 js/components/graph.js             | 14 ++++++++------
 js/domoticz-api.js                 | 16 +++++++++-------
 js/loader.js                       |  2 +-
 js/version.js                      |  4 ++--
 version.txt                        |  5 +++--
 6 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/docs/releasenotes/releasenotes.rst b/docs/releasenotes/releasenotes.rst
index 70fa0086..b3f42c94 100644
--- a/docs/releasenotes/releasenotes.rst
+++ b/docs/releasenotes/releasenotes.rst
@@ -8,6 +8,14 @@ For Dashticz's **master** version Release Notes go to: https://dashticz.readthed
 Recent changes
 ---------------
 
+v3.10.5 Beta (6-6-2023)
+-------------------------
+
+Fixes
+~~~~~
+
+* Fix for additional changes in Domoticz API (2023.1, build 15327 and up)
+
 v3.10.4 Beta (4-6-2023)
 -------------------------
 
diff --git a/js/components/graph.js b/js/components/graph.js
index 3c54b0bf..01b1f24d 100644
--- a/js/components/graph.js
+++ b/js/components/graph.js
@@ -169,7 +169,7 @@ function getDeviceDefaults(me, device) {
     case 'Wind':
       sensor = 'wind';
       var windspeed = device.Data.split(';')[2] / 10;
-      if (config['use_beaufort']) {
+      if (settings['use_beaufort']) {
         currentValue = Beaufort(windspeed);
         decimals = 0;
         txtUnit = 'Bft';
@@ -491,7 +491,7 @@ function getAllGraphData(me) {
 
 function getRegularGraphData(me, i) {
   var device = me.graphDevices[i];
-  var cmd = domoVersion.newGraphApi ? 'type=command&param=graph' : 'type=graph';
+  var cmd = domoVersion.api15330 ? 'type=command&param=graph' : 'type=graph';
   var params = cmd +
     '&sensor=' +
     device.sensor +
@@ -509,7 +509,7 @@ function getSwitchGraphData(me, i) {
   var device = me.graphDevices[i];
   //http://:8080/json.htm?idx=19&type=lightlog
   //todo: check type=command&param=graph for new Domoticz version>=15330
-  var cmd = domoVersion.newGraphApi ? 'param=getlightlog&type=command' : 'type=lightlog';
+  var cmd = domoVersion.api15330 ? 'param=getlightlog&type=command' : 'type=lightlog';
   var params = cmd + '&idx=' + device.idx;
   me.params[i] = params;
   return Domoticz.request(params).then(function (data) {
@@ -1501,7 +1501,7 @@ function showData(graph) {
     html += ' <div class="modal-dialog" role="document">';
     html +=
       '   <div class="modal-content" style="background-image:url(' +
-      config['background_image'] +
+      settings['background_image'] +
       '); background-size: cover;">';
     html += '     <div class="modal-header">';
     html += '       <div class="flex-row title">';
@@ -1515,7 +1515,7 @@ function showData(graph) {
       '           <a type="button" id="logbutton" class="btn debug" href="#" ><i class="fas fa-code"></i></a>';
     html +=
       '           <a type="button" class="btn debug" href="data:application/octet-stream;charset=utf-16le;base64,' +
-      btoa(JSON.stringify(graph, null, 2)) +
+      btoa(encodeURIComponent(JSON.stringify(graph, null, 2))) +
       '" download="' +
       graphIdx +
       '.json"><i class="fas fa-save"></i></a>';
@@ -1571,7 +1571,9 @@ function showData(graph) {
     $.each(graph.graphDevices, function (i, graphDevice) {
       // var g = dtGraphs[graph.primaryIdx]; //todo: I would expect g is just graph
       var url =
-        config['domoticz_ip'] + '/json.htm?type=devices&rid=' + graphDevice.idx;
+        config['domoticz_ip'] + '/json.htm?' +
+        (domoVersion.api15330?'type=command&param=getdevices':'type=devices') + 
+        '&rid=' + graphDevice.idx;
 
       $.getJSON(url, function (data) {
         var device = data.result[0]; //This device should already contain the same info as graphDevice.
diff --git a/js/domoticz-api.js b/js/domoticz-api.js
index 0ac6025a..058dac5f 100644
--- a/js/domoticz-api.js
+++ b/js/domoticz-api.js
@@ -24,7 +24,9 @@ var Domoticz = (function () {
   var MSG = {
     info: 'type=command&param=getversion',
     secpanel: 'type=command&param=getsecstatus',
-    getSettings: 'type=settings',
+    getSettings: domoVersion.api15330?'type=command&param=getsettings':'type=settings',
+    getDevices: domoVersion.api15330?'type=command&param=getdevices':'type=devices',
+    getScenes: domoVersion.api15330?'type=command&param=getscenes':'type=scenes',  
   };
 
   function domoticzQuery(query) {
@@ -331,8 +333,8 @@ var Domoticz = (function () {
     var timeFilter = cfg.refresh_method ? '':('&lastUpdate=' + lastUpdate.devices);
     var hiddenFilter = cfg.use_hidden? '&displayhidden=1' : '';
     var favoriteFilter = cfg.use_favorites? '&favorite=1' : '';
-    return domoticzRequest(
-      'type=devices&filter=all&used=true&order=Name' +
+    return domoticzRequest(MSG.getDevices + 
+      '&filter=all&used=true&order=Name' +
         favoriteFilter +
         timeFilter +
         hiddenFilter,
@@ -344,7 +346,7 @@ var Domoticz = (function () {
 
   function requestDevice(idx, forcehttp) {
     //not tested
-    return domoticzRequest('type=devices&rid=' + idx, forcehttp).then(function (
+    return domoticzRequest(MSG.getDevices+'&rid=' + idx, forcehttp).then(function (
       res
     ) {
       return _setDevice(res);
@@ -453,8 +455,7 @@ var Domoticz = (function () {
       console.log(' no result');
       return;
     }
-    var r = data.result[0];
-    var device = data.result[r];
+    var device = data.result[0];
     var idx = device['idx'];
 
     if (device['Type'] === 'Group' || device['Type'] === 'Scene') {
@@ -465,7 +466,7 @@ var Domoticz = (function () {
   }
 
   function requestAllScenes() {
-    return domoticzRequest('type=scenes').then(function (res) {
+    return domoticzRequest(MSG.getScenes).then(function (res) {
       if (!res) return;
       return _setAllDevices(res);
     });
@@ -567,6 +568,7 @@ var Domoticz = (function () {
     hold: hold,
     release: release,
     syncRequest: syncRequest,
+    requestDevice: requestDevice,
   };
 })();
 
diff --git a/js/loader.js b/js/loader.js
index 41895f6a..f2002701 100644
--- a/js/loader.js
+++ b/js/loader.js
@@ -1,6 +1,6 @@
 /*global loadFiles dashtype */
 
-var _DASHTICZ_VERSION=78;
+var _DASHTICZ_VERSION=79;
 var head = document.getElementsByTagName('head')[0],
  script = document.createElement('script');
  
diff --git a/js/version.js b/js/version.js
index b1694dc8..554181c9 100644
--- a/js/version.js
+++ b/js/version.js
@@ -139,9 +139,9 @@ function setDomoBehavior() {
       version: 2022.2,
       build: 14078
     },
-    newGraphApi: {
+    api15330: {
       version: 2023.1,
-      build: 15330
+      build: 15327
     }
   }
   
diff --git a/version.txt b/version.txt
index 7303078f..6b0faf68 100644
--- a/version.txt
+++ b/version.txt
@@ -1,8 +1,9 @@
 {
-"version": "3.10.4",
+"version": "3.10.5",
 "branch": "beta",
-"last_changes": "Fix graphs for Domoticz version>=15330",
+"last_changes": "Fix for additional Domoticz API changes version>=15327",
 "changelog" : {
+            "3.10.4": "Fix graphs for Domoticz version>=15330",
             "3.10.3": "OpenWeaterMap 3.0 API and generic garbage company afvalinfo",
             "3.10.2": "P1 and energy dials: subtype 'power' to show actual power usage.",
             "3.10.1": "Support for authentication Domoticz>14708",