精简json template

Jrohy · Nov 27, 2018 · f6a6715 · f6a6715
1 parent 672c0d8
commit f6a6715
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 154 deletions.
diff --git a/json_template/client.json b/json_template/client.json
@@ -39,11 +39,12 @@
       "streamSettings": {
         "security": "",
         "tlsSettings": {},
-        "wsSettings": null,
-        "httpSettings": null, 
+        "wsSettings": {},
+        "httpSettings": {}, 
         "network": "tcp", 
-        "kcpSettings": null, 
-        "tcpSettings": null
+        "kcpSettings": {}, 
+        "tcpSettings": {},
+        "quicSettings": {}
       },
       "mux": {
         "enabled": true

diff --git a/json_template/client_socks.json b/json_template/client_socks.json
@@ -39,11 +39,12 @@
         "streamSettings": {
           "security": "",
           "tlsSettings": {},
-          "wsSettings": null,
-          "httpSettings": null, 
+          "wsSettings": {},
+          "httpSettings": {}, 
           "network": "tcp", 
-          "kcpSettings": null, 
-          "tcpSettings": null
+          "kcpSettings": {}, 
+          "tcpSettings": {},
+          "quicSettings": {}
         },
         "mux": {
           "enabled": true

diff --git a/json_template/http.json b/json_template/http.json
@@ -2,7 +2,7 @@
   "network": "tcp",
   "security": "none",
   "tlsSettings": {},
-  "httpSettings": null,
+  "httpSettings": {},
   "tcpSettings": {
     "connectionReuse": true,
     "header": {
@@ -50,6 +50,7 @@
       }
     }
   },
-  "kcpSettings": null,
-  "wsSettings": null
+  "kcpSettings": {},
+  "wsSettings": {},
+  "quicSettings": {}
 }
diff --git a/json_template/http2.json b/json_template/http2.json
@@ -2,10 +2,11 @@
   "network": "h2",
   "security": "tls",
   "tlsSettings": {},
-  "tcpSettings": null,
+  "tcpSettings": {},
   "httpSettings": { 
     "path": "/ray/"
   },
-  "kcpSettings": null,
-  "wsSettings": null
+  "kcpSettings": {},
+  "wsSettings": {},
+  "quicSettings": {}
 }
diff --git a/json_template/kcp.json b/json_template/kcp.json
@@ -2,8 +2,8 @@
   "network": "kcp",
   "security": "none",
   "tlsSettings": {},
-  "tcpSettings": null,
-  "httpSettings": null,
+  "tcpSettings": {},
+  "httpSettings": {},
   "kcpSettings": {
     "mtu": 1350,
     "tti": 50,
@@ -13,10 +13,9 @@
     "readBufferSize": 2,
     "writeBufferSize": 2,
     "header": {
-      "type": "none",
-      "request": null,
-      "response": null
+      "type": "none"
     }
   },
-  "wsSettings": null
+  "wsSettings": {},
+  "quicSettings": {}
 }
diff --git a/json_template/kcp_dtls.json b/json_template/kcp_dtls.json
diff --git a/json_template/kcp_srtp.json b/json_template/kcp_srtp.json
diff --git a/json_template/kcp_utp.json b/json_template/kcp_utp.json
diff --git a/json_template/kcp_wechat.json b/json_template/kcp_wechat.json
diff --git a/json_template/kcp_wireguard.json b/json_template/kcp_wireguard.json
diff --git a/json_template/server.json b/json_template/server.json
@@ -19,11 +19,12 @@
     "streamSettings": {
       "security": "none",
       "tlsSettings": {},
-      "wsSettings": null,
-      "httpSettings": null,
+      "wsSettings": {},
+      "httpSettings": {},
       "network": "",
-      "kcpSettings": null,
-      "tcpSettings": null
+      "kcpSettings": {},
+      "tcpSettings": {},
+      "quicSettings": {}
     }
   }
   ],

diff --git a/json_template/socks.json b/json_template/socks.json
@@ -6,8 +6,5 @@
       "pass": "socks"
     }
   ],
-  "udp": true,
-  "ip": "127.0.0.1",
-  "timeout": 0,
-  "userLevel": 0
+  "udp": true
 }
diff --git a/json_template/ss.json b/json_template/ss.json
@@ -4,6 +4,6 @@
   "settings": {
     "method": "aes-128-gcm",
     "password": "password",
-    "network":"tcp, udp"
+    "network":"tcp,udp"
   }
 }
diff --git a/json_template/tcp.json b/json_template/tcp.json
@@ -2,8 +2,9 @@
   "network": "tcp",
   "security": "none",
   "tlsSettings": {},
-  "tcpSettings": null,
-  "kcpSettings": null,
-  "wsSettings": null,
-  "httpSettings": null
+  "tcpSettings": {},
+  "kcpSettings": {},
+  "wsSettings": {},
+  "httpSettings": {},
+  "quicSettings": {}
 }
diff --git a/json_template/ws.json b/json_template/ws.json
@@ -2,14 +2,15 @@
   "network": "ws",
   "security": "none",
   "tlsSettings": {},
-  "tcpSettings": null,
-  "kcpSettings": null,
-  "httpSettings": null,
+  "tcpSettings": {},
+  "kcpSettings": {},
+  "httpSettings": {},
   "wsSettings": {
     "connectionReuse": true,
     "path": "",
     "headers": {
       "Host": ""
     }
-  }
+  },
+  "quicSettings": {}
 }
diff --git a/writer.py b/writer.py
@@ -138,19 +138,24 @@ def write(self, **kw):
             self.part_json["streamSettings"] = self.load_template('kcp.json')
 
         elif self.stream_type == StreamType.KCP_UTP:
-            self.part_json["streamSettings"] = self.load_template('kcp_utp.json')
+            self.part_json["streamSettings"] = self.load_template('kcp.json')
+            self.part_json["streamSettings"]["kcpSettings"]["header"]["type"] = "utp"
 
         elif self.stream_type == StreamType.KCP_SRTP:
-            self.part_json["streamSettings"] = self.load_template('kcp_srtp.json')
+            self.part_json["streamSettings"] = self.load_template('kcp.json')
+            self.part_json["streamSettings"]["kcpSettings"]["header"]["type"] = "srtp"
 
         elif self.stream_type == StreamType.KCP_WECHAT:
-            self.part_json["streamSettings"] = self.load_template('kcp_wechat.json')
+            self.part_json["streamSettings"] = self.load_template('kcp.json')
+            self.part_json["streamSettings"]["kcpSettings"]["header"]["type"] = "wechat-video"
 
         elif self.stream_type == StreamType.KCP_DTLS:
-            self.part_json["streamSettings"] = self.load_template('kcp_dtls.json')
+            self.part_json["streamSettings"] = self.load_template('kcp.json')
+            self.part_json["streamSettings"]["kcpSettings"]["header"]["type"] = "dtls"
 
         elif self.stream_type == StreamType.KCP_WG:
-            self.part_json["streamSettings"] = self.load_template('kcp_wireguard.json')
+            self.part_json["streamSettings"] = self.load_template('kcp.json')
+            self.part_json["streamSettings"]["kcpSettings"]["header"]["type"] = "wireguard"
 
         elif self.stream_type == StreamType.TCP:
             self.part_json["streamSettings"] = self.load_template('tcp.json')
@@ -267,8 +272,8 @@ def write_tls(self, status = False, *, crt_file=None, key_file=None, domain=None
         else:
             if self.part_json["streamSettings"]["network"] == StreamType.H2.value:
                 print("关闭tls同时也会关闭HTTP/2！\n")
-                print("已重置为kcp utp传输方式, 若要其他方式请自行切换")
-                self.part_json["streamSettings"] = self.load_template('kcp_utp.json')
+                print("已重置为kcp传输方式, 若要其他方式请自行切换")
+                self.part_json["streamSettings"] = self.load_template('kcp.json')
             else:
                 self.part_json["streamSettings"]["security"] = "none"
                 self.part_json["streamSettings"]["tlsSettings"] = {}