Use PoC from upstream of gree-hvac-client to handle new encryption (#175

)
aivus · Nov 22, 2024 · 731b45c · 731b45c
1 parent 435f3c0
commit 731b45c
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 86 deletions.
diff --git a/app.json b/app.json
@@ -1479,37 +1479,6 @@
           "hint": {
             "en": "Enable debug in case the application is crashing. It allows developer to investigate the issue"
           }
-        },
-        {
-          "id": "encryption_mode",
-          "type": "dropdown",
-          "value": "auto",
-          "label": {
-            "en": "Encryption mode"
-          },
-          "hint": {
-            "en": "Encryption mode used by the HVAC. Most recent firmwares use V2"
-          },
-          "values": [
-            {
-              "id": "auto",
-              "label": {
-                "en": "Autodetect (not implemented yet, V1 used instead)"
-              }
-            },
-            {
-              "id": "v1",
-              "label": {
-                "en": "V1 (HVAC Firmware versions <1.21)"
-              }
-            },
-            {
-              "id": "v2",
-              "label": {
-                "en": "V2 (HVAC Firmware versions >=1.21)"
-              }
-            }
-          ]
         }
       ],
       "images": {

diff --git a/drivers/gree_cooper_hunter_hvac/device.js b/drivers/gree_cooper_hunter_hvac/device.js
@@ -82,7 +82,6 @@ class GreeHVACDevice extends Homey.Device {
 
         const deviceData = this.getData();
         const settings = this.getSettings();
-        const encryptionVersion = this.mapEncryptionModeSetting(settings.encryption_mode);
 
         this.log('[find devices]', 'Finding device with mac:', deviceData.mac);
 
@@ -104,7 +103,6 @@ class GreeHVACDevice extends Homey.Device {
                 pollingInterval: POLLING_INTERVAL,
                 pollingTimeout: POLLING_TIMEOUT,
                 connectTimeout: CONNECT_TIMEOUT,
-                encryptionVersion,
             });
 
             this._registerClientListeners();
@@ -676,28 +674,9 @@ class GreeHVACDevice extends Homey.Device {
             }
         }
 
-        if (changedKeys.indexOf('encryption_mode') > -1) {
-            this.log('Changing the encryption mode setting from', oldSettings.encryption_mode, 'to', newSettings.encryption_mode);
-            this.homey.setTimeout(this.reconnect.bind(this), 1000);
-        }
-
         return Promise.resolve();
     }
 
-    mapEncryptionModeSetting(encryptionMode) {
-        switch (encryptionMode) {
-            // not implemented yet
-            case 'auto':
-            case 'v1':
-            default:
-                // AES-ECB
-                return 1;
-            case 'v2':
-                // AES-GCM
-                return 2;
-        }
-    }
-
     reconnect() {
         this.log('Reconnecting to the HVAC');
         this._markOffline();

diff --git a/drivers/gree_cooper_hunter_hvac/driver.compose.json b/drivers/gree_cooper_hunter_hvac/driver.compose.json
@@ -106,37 +106,6 @@
       "hint": {
         "en": "Enable debug in case the application is crashing. It allows developer to investigate the issue"
       }
-    },
-    {
-      "id": "encryption_mode",
-      "type": "dropdown",
-      "value": "auto",
-      "label": {
-        "en": "Encryption mode"
-      },
-      "hint": {
-        "en": "Encryption mode used by the HVAC. Most recent firmwares use V2"
-      },
-      "values": [
-        {
-          "id": "auto",
-          "label": {
-            "en": "Autodetect (not implemented yet, V1 used instead)"
-          }
-        },
-        {
-          "id": "v1",
-          "label": {
-            "en": "V1 (HVAC Firmware versions <1.21)"
-          }
-        },
-        {
-          "id": "v2",
-          "label": {
-            "en": "V2 (HVAC Firmware versions >=1.21)"
-          }
-        }
-      ]
     }
   ],
   "images": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/aivus/com.gree#readme",
   "dependencies": {
-    "gree-hvac-client": "github:aivus/gree-hvac-client#com.gree/encryption",
+    "gree-hvac-client": "github:aivus/gree-hvac-client#com.gree/public-aes-gcm-poc",
     "homey-log": "^2.1.0"
   },
   "devDependencies": {