Improve backend editor compatibility

Signed-off-by: Loren Eteval <loren.eteval@proton.me>

Furious/Backends/Hysteria2/Editor.py

@@ -440,55 +440,9 @@ class GuiHy2ItemBasicCongestionComboBox(GuiEditorItemTextComboBox):
         newValue = self.text()
 
         if newValue == '':
-            congestion = config.get('congestion')
-
-            if isinstance(congestion, dict):
-                if len(congestion) > 0:
-                    if congestion.get(self.key) is not None:
-                        oldValue = congestion[self.key]
-
-                        congestion.pop(self.key, None)
-
-                        if not isinstance(oldValue, str) or oldValue != '':
-                            modified = True
-                        else:
-                            modified = False
-                    else:
-                        modified = False
-
-                    # TODO: Future extension
-                    anyValid = any(
-                        congestion.get(key, '') for key in self.CONGESTION_KEYS
-                    )
-
-                    if not anyValid:
-                        config.pop('congestion', None)
-
-                        return True
-                    else:
-                        return modified
-                else:
-                    config.pop('congestion', None)
-
-                    # Modified silently
-                    return False
-            else:
-                config.pop('congestion', None)
-
-                # Modified silently
-                return False
+            return _removeNestedValue(config, ('congestion', self.key))
         else:
-            if not isinstance(config.get('congestion'), dict):
-                config['congestion'] = {}
-
-            oldValue = config['congestion'].get(self.key, '')
-
-            if not isinstance(oldValue, str) or newValue != oldValue:
-                config['congestion'][self.key] = newValue
-
-                return True
-            else:
-                return False
+            return _setNestedValue(config, ('congestion', self.key), newValue)
 
     def factoryToInput(self, config: CoreConfiguration):
         """Load the configuration value into the editor."""
@@ -499,7 +453,7 @@ class GuiHy2ItemBasicCongestionComboBox(GuiEditorItemTextComboBox):
 
             value = ''
 
-        self.setText(value)
+        self.setText(value if isinstance(value, str) else '')
 
 
 class GuiHy2ItemObfsType(GuiEditorItemTextComboBox):
@@ -554,10 +508,7 @@ class GuiHy2ItemObfsType(GuiEditorItemTextComboBox):
 
             obfsType = ''
 
-        if isinstance(obfsType, str) and obfsType in HY2_OBFS_TYPES:
-            self.setText(obfsType)
-        else:
-            self.setText('')
+        self.setText(obfsType if isinstance(obfsType, str) else '')
 
 
 class GuiHy2ItemObfsPassword(GuiEditorItemTextInput):
@@ -583,31 +534,12 @@ class GuiHy2ItemObfsPassword(GuiEditorItemTextInput):
         if not isinstance(obfsType, str) or obfsType != self.obfsType:
             return False
 
-        modified = False
+        path = ('obfs', obfsType, 'password')
 
-        if not isinstance(config.get('obfs'), dict):
-            config['obfs'] = {}
-
-            modified = True
-
-        if not isinstance(config['obfs'].get(obfsType), dict):
-            config['obfs'][obfsType] = {}
-
-            modified = True
-
-        try:
-            oldObfsPassword = config['obfs'][obfsType]['password']
-        except Exception:
-            # Any non-exit exceptions
-
-            oldObfsPassword = ''
-
-        if not isinstance(oldObfsPassword, str) or newObfsPassword != oldObfsPassword:
-            config['obfs'][obfsType]['password'] = newObfsPassword
-
-            return True
+        if newObfsPassword == '':
+            return _removeNestedValue(config, path)
         else:
-            return modified
+            return _setNestedValue(config, path, newObfsPassword)
 
     def factoryToInput(self, config: CoreConfiguration):
         """Load the configuration value into the editor."""
@@ -661,21 +593,15 @@ class GuiHy2ItemObfsPacketSize(GuiEditorItemTextSpinBox):
         if not isinstance(obfsType, str) or obfsType != self.obfsType:
             return False
 
-        if not isinstance(config.get('obfs'), dict):
-            config['obfs'] = {}
+        path = ('obfs', obfsType, self.key)
 
-        if not isinstance(config['obfs'].get(obfsType), dict):
-            config['obfs'][obfsType] = {}
-
-        oldValue = config['obfs'][obfsType].get(self.key)
+        oldValue = _nestedValue(config, path, self.default)
         newValue = self.value()
 
-        if not isinstance(oldValue, int) or newValue != oldValue:
-            config['obfs'][obfsType][self.key] = newValue
-
-            return True
-
-        return False
+        if isinstance(oldValue, int) and newValue == oldValue:
+            return False
+        else:
+            return _setNestedValue(config, path, newValue)
 
     def factoryToInput(self, config: CoreConfiguration):
         """Load the configuration value into the editor."""
@@ -718,6 +644,15 @@ class GuiHy2PageObfsXXX(GuiEditorWidgetQWidget):
         if isinstance(obfsType, GuiEditorItemTextComboBox):
             obfsType.setText(text)
 
+    def obfsTypeText(self) -> str:
+        """Return the semantic obfuscation value displayed by this page."""
+        obfsType = self._containers[0]
+
+        if isinstance(obfsType, GuiEditorItemTextComboBox):
+            return obfsType.text()
+
+        return ''
+
     def connectActivated(self, func):
         """Connect activated."""
         obfsType = self._containers[0]
@@ -993,7 +928,10 @@ class GuiHy2ItemObfs(EditorBinding):
         if isinstance(oldObfs, dict):
             oldObfsType = oldObfs.get('type', '')
 
-        newObfsType = HY2_OBFS_TYPES[self.currentIndex()]
+        newObfsType = self.page(self.currentIndex()).obfsTypeText()
+
+        if newObfsType == oldObfsType and newObfsType not in HY2_OBFS_TYPES:
+            return False
 
         if newObfsType == '':
             if isinstance(oldObfs, dict):
@@ -1010,9 +948,15 @@ class GuiHy2ItemObfs(EditorBinding):
             config['obfs'] = {}
 
         modified = oldObfsType != newObfsType
+
         config['obfs']['type'] = newObfsType
 
-        for obfsType in HY2_OBFS_TYPES:
+        obsoleteTypes = set(HY2_OBFS_TYPES)
+
+        if isinstance(oldObfsType, str):
+            obsoleteTypes.add(oldObfsType)
+
+        for obfsType in obsoleteTypes:
             if obfsType and obfsType != newObfsType:
                 config['obfs'].pop(obfsType, None)
 
@@ -1031,10 +975,10 @@ class GuiHy2ItemObfs(EditorBinding):
 
             obfsType = ''
 
-        if not isinstance(obfsType, str) or obfsType not in HY2_OBFS_TYPES:
+        if not isinstance(obfsType, str):
             obfsType = ''
 
-        index = HY2_OBFS_TYPES.index(obfsType)
+        index = HY2_OBFS_TYPES.index(obfsType) if obfsType in HY2_OBFS_TYPES else 0
 
         self.page(index).factoryToInput(config)
         self.page(index).setObfsTypeText(obfsType)

Furious/Backends/Xray/TlsEditor.py

@@ -796,8 +796,11 @@ class GuiVTLSQGroupBox(EditorBinding, AppQGroupBox):
             index = STREAM_SECURITY.index(security)
         except Exception:
             # Any non-exit exceptions
+            index = 0
 
-            pass
+            self.page(index).factoryToInput(config)
+            self.page(index).setSecurityText(security)
+            self.setCurrentIndex(index)
         else:
             self.page(index).factoryToInput(config)
             self.setCurrentIndex(index)

Furious/Backends/Xray/TransportEditor.py

@@ -1607,6 +1607,15 @@ class GuiVTransportPageXXX(GuiEditorWidgetQWidget):
         if isinstance(network, GuiEditorItemTextComboBox):
             network.setText(text)
 
+    def networkText(self) -> str:
+        """Return the semantic transport value displayed by this page."""
+        network = self._containers[0]
+
+        if isinstance(network, GuiEditorItemTextComboBox):
+            return network.text()
+
+        return ''
+
     def connectActivated(self, func: Callable):
         """Connect activated."""
         network = self._containers[0]
@@ -1898,6 +1907,18 @@ class GuiVTransportQGroupBox(EditorBinding, AppQGroupBox):
 
     def inputToFactory(self, config: CoreConfiguration) -> bool:
         """Apply the current editor value to the configuration."""
+        streamSettings = ConfigXray.getProxyOutboundStream(config)
+        oldNetwork = streamSettings.get('network', '')
+        newNetwork = self.page(self.currentIndex()).networkText()
+
+        if (
+            isinstance(oldNetwork, str)
+            and oldNetwork == newNetwork
+            and oldNetwork not in STREAM_NETWORK
+            and oldNetwork not in ('http', 'gun', 'mkcp')
+        ):
+            return False
+
         return self.page(self.currentIndex()).inputToFactory(config)
 
     def factoryToInput(self, config: CoreConfiguration):
@@ -1930,8 +1951,12 @@ class GuiVTransportQGroupBox(EditorBinding, AppQGroupBox):
             index = STREAM_NETWORK.index(network)
         except Exception:
             # Any non-exit exceptions
+            index = 0
 
-            pass
+            self.page(index).factoryToInput(config)
+            self.page(index).setNetworkText(network)
+            self.setCurrentIndex(index)
         else:
             self.page(index).factoryToInput(config)
+            self.page(index).setNetworkText(network)
             self.setCurrentIndex(index)