fix(miio): Allow setting new wifi credentials when provisioned

fixes #657
Hypfer · Jun 19, 2021 · 32a12cf · 32a12cf
1 parent de45f72
commit 32a12cf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 34 deletions.
diff --git a/backend/lib/robots/MiioValetudoRobot.js b/backend/lib/robots/MiioValetudoRobot.js
@@ -279,6 +279,22 @@ class MiioValetudoRobot extends ValetudoRobot {
         }
     }
 
+    /**
+     * Sends a {'method': method, 'params': args} message to the robot.
+     * Only uses the local socket
+     *
+     * @public
+     * @param {string} method
+     * @param {object|Array} args
+     * @param {object} options
+     * @param {number=} options.retries
+     * @param {number=} options.timeout custom timeout in milliseconds
+     * @returns {Promise<object>}
+     */
+    sendLocal(method, args = [], options = {}) {
+        return this.localSocket.sendMessage(method, args, options);
+    }
+
     /**
      * Sends a json object to cloud socket.
      *

diff --git a/backend/lib/robots/common/miioCapabilities/MiioWifiConfigurationCapability.js b/backend/lib/robots/common/miioCapabilities/MiioWifiConfigurationCapability.js
@@ -46,7 +46,8 @@ class MiioWifiConfigurationCapability extends LinuxWifiConfigurationCapability {
             wifiConfig.credentials.type === ValetudoWifiConfiguration.CREDENTIALS_TYPE.WPA2_PSK &&
             wifiConfig.credentials.typeSpecificSettings && wifiConfig.credentials.typeSpecificSettings.password
         ) {
-            await this.robot.sendCommand("miIO.config_router", {
+            //This command will only work when received on the local interface!
+            await this.robot.sendLocal("miIO.config_router", {
                 "ssid": wifiConfig.ssid,
                 "passwd": wifiConfig.credentials.typeSpecificSettings.password,
                 "uid": 0,

diff --git a/backend/lib/robots/roborock/capabilities/RoborockWifiConfigurationCapability.js b/backend/lib/robots/roborock/capabilities/RoborockWifiConfigurationCapability.js
@@ -1,15 +1,7 @@
-const LinuxWifiConfigurationCapability = require("../../common/linuxCapabilities/LinuxWifiConfigurationCapability");
+const MiioWifiConfigurationCapability = require("../../common/miioCapabilities/MiioWifiConfigurationCapability");
 const ValetudoWifiConfiguration = require("../../../entities/core/ValetudoWifiConfiguration");
 
-/**
- * @extends LinuxWifiConfigurationCapability<import("../RoborockValetudoRobot")>
- */
-class RoborockWifiConfigurationCapability extends LinuxWifiConfigurationCapability {
-
-    getWifiInterface() {
-        return "wlan0";
-    }
-
+class RoborockWifiConfigurationCapability extends MiioWifiConfigurationCapability {
     /**
      * @returns {Promise<ValetudoWifiConfiguration>}
      */
@@ -42,29 +34,6 @@ class RoborockWifiConfigurationCapability extends LinuxWifiConfigurationCapabili
 
         return new ValetudoWifiConfiguration(output);
     }
-
-    /**
-     * @param {import("../../../entities/core/ValetudoWifiConfiguration")} wifiConfig
-     * @returns {Promise<void>}
-     */
-    async setWifiConfiguration(wifiConfig) {
-        if (
-            wifiConfig && wifiConfig.ssid && wifiConfig.credentials &&
-            wifiConfig.credentials.type === ValetudoWifiConfiguration.CREDENTIALS_TYPE.WPA2_PSK &&
-            wifiConfig.credentials.typeSpecificSettings && wifiConfig.credentials.typeSpecificSettings.password
-        ) {
-            await this.robot.sendCommand("miIO.config_router", {
-                "ssid": wifiConfig.ssid,
-                "passwd": wifiConfig.credentials.typeSpecificSettings.password,
-                "uid": 0,
-                "cc": "de",
-                "country_domain": "de",
-                "config_type": "app"
-            }, {});
-        } else {
-            throw new Error("Invalid wifiConfig");
-        }
-    }
 }
 
 module.exports = RoborockWifiConfigurationCapability;