fix bug

viplq · Nov 15, 2021 · b9157f2 · b9157f2
1 parent 0d90581
commit b9157f2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/v2ray_util/json_template/server.json b/v2ray_util/json_template/server.json
@@ -24,7 +24,8 @@
       "network": "",
       "kcpSettings": {},
       "tcpSettings": {},
-      "quicSettings": {}
+      "quicSettings": {},
+      "grpcSettings": {}
     }
   }
   ],

diff --git a/v2ray_util/util_core/writer.py b/v2ray_util/util_core/writer.py
@@ -122,17 +122,6 @@ def to_kcp(self, header_type):
             type_str = "wireguard"
         self.part_json["streamSettings"]["kcpSettings"]["header"]["type"] = type_str
 
-    def to_vmess(self):
-        self.part_json["protocol"] = "vmess"
-        self.part_json["settings"] = {
-            "clients": [
-                {
-                    "alterId": 0,
-                    "id": str(uuid.uuid1())
-                }
-            ]
-        }
-
     def write(self, **kw):
         security_backup, tls_settings_backup, origin_protocol, domain = "", "", None, ""
         no_tls_group = (StreamType.MTPROTO, StreamType.SS)
@@ -168,9 +157,15 @@ def write(self, **kw):
         if origin_protocol == StreamType.MTPROTO and origin_protocol != self.stream_type:
             clean_mtproto_tag(self.config, self.group_index)
 
+        server = self.load_template('server.json')
+        server["inbounds"][0]["port"] = self.part_json["port"]
+        server["inbounds"][0]["settings"]["clients"][0]["id"] = str(uuid.uuid1())
+        if "allocate" in self.part_json:
+            server["inbounds"][0]["allocate"] = self.part_json["allocate"]
+        self.part_json = server["inbounds"][0]
+
         if "KCP" in self.stream_type.name:
             self.to_kcp(self.stream_type.value)
-            self.to_vmess()
 
         elif self.stream_type == StreamType.TCP:
             self.part_json["streamSettings"] = self.load_template('tcp.json')
@@ -218,7 +213,6 @@ def write(self, **kw):
             self.part_json["streamSettings"] = ws
 
         elif self.stream_type == StreamType.GRPC:
-            self.to_vmess()
             alpn = ["h2"]
             self.part_json["streamSettings"] = self.load_template('tcp.json')
             self.part_json["streamSettings"]["network"] = "grpc"