update: compatible decoder

ProxyDecoder/Brook.py

@@ -81,6 +81,6 @@ def decode(url: str) -> dict:
     if url.split('://')[0] != 'brook':
         raise Exception('Unexpected scheme')
     return {
-        **{'type': 'brook'},
+        'type': 'brook',
-        **__brookDecode(url)
+        'info': __brookDecode(url),
     }

ProxyDecoder/Shadowsocks.py

@@ -137,6 +137,6 @@ def decode(url: str, compatible: bool = False) -> dict or None:
     if compatible and 'remark' in ssInfo: # 向后兼容部分客户端
         ssInfo['remark'] = ssInfo['remark'].replace('+', ' ')
     return {
-        **{'type': 'ss'},
+        'type': 'ss',
-        **ssInfo
+        'info': ssInfo,
     }

ProxyDecoder/ShadowsocksR.py

@@ -44,7 +44,13 @@ def __ssrDecode(url: str) -> dict: # SSR分享链接解码
 def decode(url: str) -> dict:
     if url.split('://')[0] != 'ssr':
         raise Exception('Unexpected scheme')
+    ssrObject = __ssrDecode(url)
+    group = ''
+    if 'group' in ssrObject:
+        group = ssrObject['group']
+        ssrObject.pop('group')
     return {
-        **{'type': 'ssr'},
+        'type': 'ssr',
-        **__ssrDecode(url)
+        'group': group,
+        'info': ssrObject,
     }

ProxyDecoder/Trojan.py

@@ -129,6 +129,6 @@ def decode(url: str) -> dict:
     if url.split('://')[0] != 'trojan':
         raise Exception('Unexpected scheme')
     return {
-        **{'type': 'trojan'},
+        'type': 'trojan',
-        **__trojanDecode(url)
+        'info': __trojanDecode(url),
     }

ProxyDecoder/TrojanGo.py

@@ -77,6 +77,6 @@ def decode(url: str) -> dict:
     if url.split('://')[0] != 'trojan-go':
         raise Exception('Unexpected scheme')
     return {
-        **{'type': 'trojan-go'},
+        'type': 'trojan-go',
-        **__trojanGoDecode(url)
+        'info': __trojanGoDecode(url),
     }

ProxyDecoder/VLESS.py

@@ -127,6 +127,6 @@ def decode(url: str) -> dict:
     if url.split('://')[0] != 'vless':
         raise Exception('Unexpected scheme')
     return {
-        **{'type': 'vless'},
+        'type': 'vless',
-        **__vlessDecode(url)
+        'info': __vlessDecode(url),
     }

ProxyDecoder/VMess.py

@@ -222,6 +222,6 @@ def decode(url: str) -> dict:
         except:
             raise Exception('Url could not be parsed')
     return {
-        **{'type': 'vmess'},
+        'type': 'vmess',
-        **vmessInfo
+        'info': vmessInfo,
     }

ProxyDecoder/__init__.py

@@ -1,6 +1,8 @@
 #!/usr/bin/python
 # -*- coding:utf-8 -*-
 
+# TODO: this module will refactor in the future
+
 from ProxyDecoder.decoder import *
 
 __all__ = ['decode']

ProxyDecoder/decoder.py

@@ -20,7 +20,7 @@ def decode(url: str) -> dict or None:
         链接有效:
             return {
                 'type': ...,
-                ...
+                'info': {...},
             }
     """
     try: