linksocks 3.0.12__cp312-cp312-win_amd64.whl → 3.0.13__cp312-cp312-win_amd64.whl

linksockslib/linksocks.py

@@ -2,7 +2,7 @@
 # python wrapper for package github.com/linksocks/linksocks/linksocks_go within overall package linksockslib
 # This is what you import to use the package.
 # File is generated by gopy. Do not edit.
-# gopy.EXE build -vm=C:\Users\RUNNER~1\AppData\Local\Temp\linksocks_pyvenv_2jn5e566\venv\Scripts\python.exe -output=D:\a\linksocks\linksocks\_bindings\python\linksockslib -name=linksockslib -no-make=true ./linksocks_go
+# gopy.EXE build -vm=C:\Users\RUNNER~1\AppData\Local\Temp\linksocks_pyvenv_rki5036q\venv\Scripts\python.exe -output=D:\a\linksocks\linksocks\_bindings\python\linksockslib -name=linksockslib -no-make=true ./linksocks_go
 
 # the following is required to enable dlopen to open the _go.so file
 import os,sys,inspect,collections
@@ -2548,9 +2548,9 @@ class BaseMessage(go.GoClass):
 
 # ---- Structs ---
 
-# Python type for struct linksocks.LogMessage
-class LogMessage(go.GoClass):
-	"""LogMessage represents a log message from server to client\n"""
+# Python type for struct linksocks.DataMessage
+class DataMessage(go.GoClass):
+	"""DataMessage represents a data transfer message\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -2564,21 +2564,45 @@ class LogMessage(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_LogMessage_CTor()
+			self.handle = _linksockslib.linksocks_DataMessage_CTor()
 			_linksockslib.IncRef(self.handle)
 			if  0 < len(args):
-				self.Level = args[0]
-			if "Level" in kwargs:
-				self.Level = kwargs["Level"]
+				self.Protocol = args[0]
+			if "Protocol" in kwargs:
+				self.Protocol = kwargs["Protocol"]
 			if  1 < len(args):
-				self.Msg = args[1]
-			if "Msg" in kwargs:
-				self.Msg = kwargs["Msg"]
+				self.ChannelID = args[1]
+			if "ChannelID" in kwargs:
+				self.ChannelID = kwargs["ChannelID"]
+			if  2 < len(args):
+				self.Data = args[2]
+			if "Data" in kwargs:
+				self.Data = kwargs["Data"]
+			if  3 < len(args):
+				self.Compression = args[3]
+			if "Compression" in kwargs:
+				self.Compression = kwargs["Compression"]
+			if  4 < len(args):
+				self.Address = args[4]
+			if "Address" in kwargs:
+				self.Address = kwargs["Address"]
+			if  5 < len(args):
+				self.Port = args[5]
+			if "Port" in kwargs:
+				self.Port = kwargs["Port"]
+			if  6 < len(args):
+				self.TargetAddr = args[6]
+			if "TargetAddr" in kwargs:
+				self.TargetAddr = kwargs["TargetAddr"]
+			if  7 < len(args):
+				self.TargetPort = args[7]
+			if "TargetPort" in kwargs:
+				self.TargetPort = kwargs["TargetPort"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.LogMessage{'
+		sv = 'linksocks.DataMessage{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -2591,36 +2615,84 @@ class LogMessage(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.LogMessage ( '
+		sv = 'linksocks.DataMessage ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
 	@property
-	def Level(self):
-		return _linksockslib.linksocks_LogMessage_Level_Get(self.handle)
-	@Level.setter
-	def Level(self, value):
+	def Protocol(self):
+		return _linksockslib.linksocks_DataMessage_Protocol_Get(self.handle)
+	@Protocol.setter
+	def Protocol(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_LogMessage_Level_Set(self.handle, value.handle)
+			_linksockslib.linksocks_DataMessage_Protocol_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_LogMessage_Level_Set(self.handle, value)
+			_linksockslib.linksocks_DataMessage_Protocol_Set(self.handle, value)
 	@property
-	def Msg(self):
-		return _linksockslib.linksocks_LogMessage_Msg_Get(self.handle)
-	@Msg.setter
-	def Msg(self, value):
+	def ChannelID(self):
+		return go.uuid_UUID(handle=_linksockslib.linksocks_DataMessage_ChannelID_Get(self.handle))
+	@property
+	def Data(self):
+		return go.Slice_byte(handle=_linksockslib.linksocks_DataMessage_Data_Get(self.handle))
+	@Data.setter
+	def Data(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_LogMessage_Msg_Set(self.handle, value.handle)
+			_linksockslib.linksocks_DataMessage_Data_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_LogMessage_Msg_Set(self.handle, value)
+			raise TypeError("supplied argument type {t} is not a go.GoClass".format(t=type(value)))
+	@property
+	def Compression(self):
+		return _linksockslib.linksocks_DataMessage_Compression_Get(self.handle)
+	@Compression.setter
+	def Compression(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_DataMessage_Compression_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_DataMessage_Compression_Set(self.handle, value)
+	@property
+	def Address(self):
+		return _linksockslib.linksocks_DataMessage_Address_Get(self.handle)
+	@Address.setter
+	def Address(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_DataMessage_Address_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_DataMessage_Address_Set(self.handle, value)
+	@property
+	def Port(self):
+		return _linksockslib.linksocks_DataMessage_Port_Get(self.handle)
+	@Port.setter
+	def Port(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_DataMessage_Port_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_DataMessage_Port_Set(self.handle, value)
+	@property
+	def TargetAddr(self):
+		return _linksockslib.linksocks_DataMessage_TargetAddr_Get(self.handle)
+	@TargetAddr.setter
+	def TargetAddr(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_DataMessage_TargetAddr_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_DataMessage_TargetAddr_Set(self.handle, value)
+	@property
+	def TargetPort(self):
+		return _linksockslib.linksocks_DataMessage_TargetPort_Get(self.handle)
+	@TargetPort.setter
+	def TargetPort(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_DataMessage_TargetPort_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_DataMessage_TargetPort_Set(self.handle, value)
 	def GetType(self):
 		"""GetType() str"""
-		return _linksockslib.linksocks_LogMessage_GetType(self.handle)
+		return _linksockslib.linksocks_DataMessage_GetType(self.handle)
 
-# Python type for struct linksocks.TokenStatus
-class TokenStatus(go.GoClass):
-	"""TokenStatus represents the status of a token\n"""
+# Python type for struct linksocks.DynamicForwarder
+class DynamicForwarder(go.GoClass):
+	"""DynamicForwarder handles dynamic batching and sending of network data\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -2634,25 +2706,13 @@ class TokenStatus(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_TokenStatus_CTor()
+			self.handle = _linksockslib.linksocks_DynamicForwarder_CTor()
 			_linksockslib.IncRef(self.handle)
-			if  0 < len(args):
-				self.Token = args[0]
-			if "Token" in kwargs:
-				self.Token = kwargs["Token"]
-			if  1 < len(args):
-				self.Type = args[1]
-			if "Type" in kwargs:
-				self.Type = kwargs["Type"]
-			if  2 < len(args):
-				self.ClientsCount = args[2]
-			if "ClientsCount" in kwargs:
-				self.ClientsCount = kwargs["ClientsCount"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.TokenStatus{'
+		sv = 'linksocks.DynamicForwarder{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -2665,42 +2725,33 @@ class TokenStatus(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.TokenStatus ( '
+		sv = 'linksocks.DynamicForwarder ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
-	@property
-	def Token(self):
-		return _linksockslib.linksocks_TokenStatus_Token_Get(self.handle)
-	@Token.setter
-	def Token(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_TokenStatus_Token_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_TokenStatus_Token_Set(self.handle, value)
-	@property
-	def Type(self):
-		return _linksockslib.linksocks_TokenStatus_Type_Get(self.handle)
-	@Type.setter
-	def Type(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_TokenStatus_Type_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_TokenStatus_Type_Set(self.handle, value)
-	@property
-	def ClientsCount(self):
-		return _linksockslib.linksocks_TokenStatus_ClientsCount_Get(self.handle)
-	@ClientsCount.setter
-	def ClientsCount(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_TokenStatus_ClientsCount_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_TokenStatus_ClientsCount_Set(self.handle, value)
+	def ProcessReads(self, conn, goRun=False):
+		"""ProcessReads(object conn) 
+		
+		ProcessReads handles reading from a network connection and forwarding to WebSocket with dynamic batching
+		"""
+		_linksockslib.linksocks_DynamicForwarder_ProcessReads(self.handle, conn.handle, goRun)
+	def ProcessReadsImmediate(self, conn, goRun=False):
+		"""ProcessReadsImmediate(object conn) 
+		
+		processReadsImmediate handles reading directly without batching
+		"""
+		_linksockslib.linksocks_DynamicForwarder_ProcessReadsImmediate(self.handle, conn.handle, goRun)
+	def ProcessUDPReads(self, conn, goRun=False):
+		"""ProcessUDPReads(object conn) 
+		
+		ProcessUDPReads handles reading from a UDP connection with appropriate metadata
+		"""
+		_linksockslib.linksocks_DynamicForwarder_ProcessUDPReads(self.handle, conn.handle, goRun)
 
-# Python type for struct linksocks.ReverseTokenStatus
-class ReverseTokenStatus(TokenStatus):
-	"""ReverseTokenStatus represents the status of a reverse token\n"""
+# Python type for struct linksocks.ReverseTokenResult
+class ReverseTokenResult(go.GoClass):
+	"""ReverseTokenResult represents the result of adding a reverse token\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -2714,21 +2765,21 @@ class ReverseTokenStatus(TokenStatus):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_ReverseTokenStatus_CTor()
+			self.handle = _linksockslib.linksocks_ReverseTokenResult_CTor()
 			_linksockslib.IncRef(self.handle)
+			if  0 < len(args):
+				self.Token = args[0]
+			if "Token" in kwargs:
+				self.Token = kwargs["Token"]
 			if  1 < len(args):
 				self.Port = args[1]
 			if "Port" in kwargs:
 				self.Port = kwargs["Port"]
-			if  2 < len(args):
-				self.ConnectorTokens = args[2]
-			if "ConnectorTokens" in kwargs:
-				self.ConnectorTokens = kwargs["ConnectorTokens"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ReverseTokenStatus{'
+		sv = 'linksocks.ReverseTokenResult{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -2741,33 +2792,33 @@ class ReverseTokenStatus(TokenStatus):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ReverseTokenStatus ( '
+		sv = 'linksocks.ReverseTokenResult ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
 	@property
-	def Port(self):
-		return _linksockslib.linksocks_ReverseTokenStatus_Port_Get(self.handle)
-	@Port.setter
-	def Port(self, value):
+	def Token(self):
+		return _linksockslib.linksocks_ReverseTokenResult_Token_Get(self.handle)
+	@Token.setter
+	def Token(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ReverseTokenStatus_Port_Set(self.handle, value.handle)
+			_linksockslib.linksocks_ReverseTokenResult_Token_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_ReverseTokenStatus_Port_Set(self.handle, value)
+			_linksockslib.linksocks_ReverseTokenResult_Token_Set(self.handle, value)
 	@property
-	def ConnectorTokens(self):
-		return go.Slice_string(handle=_linksockslib.linksocks_ReverseTokenStatus_ConnectorTokens_Get(self.handle))
-	@ConnectorTokens.setter
-	def ConnectorTokens(self, value):
+	def Port(self):
+		return _linksockslib.linksocks_ReverseTokenResult_Port_Get(self.handle)
+	@Port.setter
+	def Port(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ReverseTokenStatus_ConnectorTokens_Set(self.handle, value.handle)
+			_linksockslib.linksocks_ReverseTokenResult_Port_Set(self.handle, value.handle)
 		else:
-			raise TypeError("supplied argument type {t} is not a go.GoClass".format(t=type(value)))
+			_linksockslib.linksocks_ReverseTokenResult_Port_Set(self.handle, value)
 
-# Python type for struct linksocks.AuthMessage
-class AuthMessage(go.GoClass):
-	"""AuthMessage represents an authentication request\n"""
+# Python type for struct linksocks.StatusResponse
+class StatusResponse(go.GoClass):
+	"""StatusResponse represents the server status\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -2781,20 +2832,87 @@ class AuthMessage(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_AuthMessage_CTor()
+			self.handle = _linksockslib.linksocks_StatusResponse_CTor()
 			_linksockslib.IncRef(self.handle)
 			if  0 < len(args):
-				self.Token = args[0]
-			if "Token" in kwargs:
-				self.Token = kwargs["Token"]
+				self.Version = args[0]
+			if "Version" in kwargs:
+				self.Version = kwargs["Version"]
 			if  1 < len(args):
-				self.Reverse = args[1]
-			if "Reverse" in kwargs:
-				self.Reverse = kwargs["Reverse"]
-			if  2 < len(args):
-				self.Instance = args[2]
-			if "Instance" in kwargs:
-				self.Instance = kwargs["Instance"]
+				self.Tokens = args[1]
+			if "Tokens" in kwargs:
+				self.Tokens = kwargs["Tokens"]
+	def __del__(self):
+		_linksockslib.DecRef(self.handle)
+	def __str__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'linksocks.StatusResponse{'
+		first = True
+		for v in pr:
+			if callable(v[1]):
+				continue
+			if first:
+				first = False
+			else:
+				sv += ', '
+			sv += v[0] + '=' + str(v[1])
+		return sv + '}'
+	def __repr__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'linksocks.StatusResponse ( '
+		for v in pr:
+			if not callable(v[1]):
+				sv += v[0] + '=' + str(v[1]) + ', '
+		return sv + ')'
+	@property
+	def Version(self):
+		return _linksockslib.linksocks_StatusResponse_Version_Get(self.handle)
+	@Version.setter
+	def Version(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_StatusResponse_Version_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_StatusResponse_Version_Set(self.handle, value)
+	@property
+	def Tokens(self):
+		return Slice_interface_(handle=_linksockslib.linksocks_StatusResponse_Tokens_Get(self.handle))
+	@Tokens.setter
+	def Tokens(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_StatusResponse_Tokens_Set(self.handle, value.handle)
+		else:
+			raise TypeError("supplied argument type {t} is not a go.GoClass".format(t=type(value)))
+
+# Python type for struct linksocks.AuthMessage
+class AuthMessage(go.GoClass):
+	"""AuthMessage represents an authentication request\n"""
+	def __init__(self, *args, **kwargs):
+		"""
+		handle=A Go-side object is always initialized with an explicit handle=arg
+		otherwise parameters can be unnamed in order of field names or named fields
+		in which case a new Go object is constructed first
+		"""
+		if len(kwargs) == 1 and 'handle' in kwargs:
+			self.handle = kwargs['handle']
+			_linksockslib.IncRef(self.handle)
+		elif len(args) == 1 and isinstance(args[0], go.GoClass):
+			self.handle = args[0].handle
+			_linksockslib.IncRef(self.handle)
+		else:
+			self.handle = _linksockslib.linksocks_AuthMessage_CTor()
+			_linksockslib.IncRef(self.handle)
+			if  0 < len(args):
+				self.Token = args[0]
+			if "Token" in kwargs:
+				self.Token = kwargs["Token"]
+			if  1 < len(args):
+				self.Reverse = args[1]
+			if "Reverse" in kwargs:
+				self.Reverse = kwargs["Reverse"]
+			if  2 < len(args):
+				self.Instance = args[2]
+			if "Instance" in kwargs:
+				self.Instance = kwargs["Instance"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
@@ -2912,9 +3030,9 @@ class AuthResponseMessage(go.GoClass):
 		"""GetType() str"""
 		return _linksockslib.linksocks_AuthResponseMessage_GetType(self.handle)
 
-# Python type for struct linksocks.DataMessage
-class DataMessage(go.GoClass):
-	"""DataMessage represents a data transfer message\n"""
+# Python type for struct linksocks.LogMessage
+class LogMessage(go.GoClass):
+	"""LogMessage represents a log message from server to client\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -2928,45 +3046,21 @@ class DataMessage(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_DataMessage_CTor()
+			self.handle = _linksockslib.linksocks_LogMessage_CTor()
 			_linksockslib.IncRef(self.handle)
 			if  0 < len(args):
-				self.Protocol = args[0]
-			if "Protocol" in kwargs:
-				self.Protocol = kwargs["Protocol"]
+				self.Level = args[0]
+			if "Level" in kwargs:
+				self.Level = kwargs["Level"]
 			if  1 < len(args):
-				self.ChannelID = args[1]
-			if "ChannelID" in kwargs:
-				self.ChannelID = kwargs["ChannelID"]
-			if  2 < len(args):
-				self.Data = args[2]
-			if "Data" in kwargs:
-				self.Data = kwargs["Data"]
-			if  3 < len(args):
-				self.Compression = args[3]
-			if "Compression" in kwargs:
-				self.Compression = kwargs["Compression"]
-			if  4 < len(args):
-				self.Address = args[4]
-			if "Address" in kwargs:
-				self.Address = kwargs["Address"]
-			if  5 < len(args):
-				self.Port = args[5]
-			if "Port" in kwargs:
-				self.Port = kwargs["Port"]
-			if  6 < len(args):
-				self.TargetAddr = args[6]
-			if "TargetAddr" in kwargs:
-				self.TargetAddr = kwargs["TargetAddr"]
-			if  7 < len(args):
-				self.TargetPort = args[7]
-			if "TargetPort" in kwargs:
-				self.TargetPort = kwargs["TargetPort"]
+				self.Msg = args[1]
+			if "Msg" in kwargs:
+				self.Msg = kwargs["Msg"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.DataMessage{'
+		sv = 'linksocks.LogMessage{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -2979,84 +3073,36 @@ class DataMessage(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.DataMessage ( '
+		sv = 'linksocks.LogMessage ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
 	@property
-	def Protocol(self):
-		return _linksockslib.linksocks_DataMessage_Protocol_Get(self.handle)
-	@Protocol.setter
-	def Protocol(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_DataMessage_Protocol_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_DataMessage_Protocol_Set(self.handle, value)
-	@property
-	def ChannelID(self):
-		return go.uuid_UUID(handle=_linksockslib.linksocks_DataMessage_ChannelID_Get(self.handle))
-	@property
-	def Data(self):
-		return go.Slice_byte(handle=_linksockslib.linksocks_DataMessage_Data_Get(self.handle))
-	@Data.setter
-	def Data(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_DataMessage_Data_Set(self.handle, value.handle)
-		else:
-			raise TypeError("supplied argument type {t} is not a go.GoClass".format(t=type(value)))
-	@property
-	def Compression(self):
-		return _linksockslib.linksocks_DataMessage_Compression_Get(self.handle)
-	@Compression.setter
-	def Compression(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_DataMessage_Compression_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_DataMessage_Compression_Set(self.handle, value)
-	@property
-	def Address(self):
-		return _linksockslib.linksocks_DataMessage_Address_Get(self.handle)
-	@Address.setter
-	def Address(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_DataMessage_Address_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_DataMessage_Address_Set(self.handle, value)
-	@property
-	def Port(self):
-		return _linksockslib.linksocks_DataMessage_Port_Get(self.handle)
-	@Port.setter
-	def Port(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_DataMessage_Port_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_DataMessage_Port_Set(self.handle, value)
-	@property
-	def TargetAddr(self):
-		return _linksockslib.linksocks_DataMessage_TargetAddr_Get(self.handle)
-	@TargetAddr.setter
-	def TargetAddr(self, value):
+	def Level(self):
+		return _linksockslib.linksocks_LogMessage_Level_Get(self.handle)
+	@Level.setter
+	def Level(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_DataMessage_TargetAddr_Set(self.handle, value.handle)
+			_linksockslib.linksocks_LogMessage_Level_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_DataMessage_TargetAddr_Set(self.handle, value)
+			_linksockslib.linksocks_LogMessage_Level_Set(self.handle, value)
 	@property
-	def TargetPort(self):
-		return _linksockslib.linksocks_DataMessage_TargetPort_Get(self.handle)
-	@TargetPort.setter
-	def TargetPort(self, value):
+	def Msg(self):
+		return _linksockslib.linksocks_LogMessage_Msg_Get(self.handle)
+	@Msg.setter
+	def Msg(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_DataMessage_TargetPort_Set(self.handle, value.handle)
+			_linksockslib.linksocks_LogMessage_Msg_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_DataMessage_TargetPort_Set(self.handle, value)
+			_linksockslib.linksocks_LogMessage_Msg_Set(self.handle, value)
 	def GetType(self):
 		"""GetType() str"""
-		return _linksockslib.linksocks_DataMessage_GetType(self.handle)
+		return _linksockslib.linksocks_LogMessage_GetType(self.handle)
 
-# Python type for struct linksocks.ReverseTokenOptions
-class ReverseTokenOptions(go.GoClass):
-	"""ReverseTokenOptions represents configuration options for reverse token\n"""
+# Python type for struct linksocks.ServerOption
+class ServerOption(go.GoClass):
+	"""ServerOption represents configuration options for LinkSocksServer\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -3070,197 +3116,24 @@ class ReverseTokenOptions(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_ReverseTokenOptions_CTor()
+			self.handle = _linksockslib.linksocks_ServerOption_CTor()
 			_linksockslib.IncRef(self.handle)
 			if  0 < len(args):
-				self.Token = args[0]
-			if "Token" in kwargs:
-				self.Token = kwargs["Token"]
+				self.WSHost = args[0]
+			if "WSHost" in kwargs:
+				self.WSHost = kwargs["WSHost"]
 			if  1 < len(args):
-				self.Port = args[1]
-			if "Port" in kwargs:
-				self.Port = kwargs["Port"]
+				self.WSPort = args[1]
+			if "WSPort" in kwargs:
+				self.WSPort = kwargs["WSPort"]
 			if  2 < len(args):
-				self.Username = args[2]
-			if "Username" in kwargs:
-				self.Username = kwargs["Username"]
+				self.SocksHost = args[2]
+			if "SocksHost" in kwargs:
+				self.SocksHost = kwargs["SocksHost"]
 			if  3 < len(args):
-				self.Password = args[3]
-			if "Password" in kwargs:
-				self.Password = kwargs["Password"]
-			if  4 < len(args):
-				self.AllowManageConnector = args[4]
-			if "AllowManageConnector" in kwargs:
-				self.AllowManageConnector = kwargs["AllowManageConnector"]
-	def __del__(self):
-		_linksockslib.DecRef(self.handle)
-	def __str__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ReverseTokenOptions{'
-		first = True
-		for v in pr:
-			if callable(v[1]):
-				continue
-			if first:
-				first = False
-			else:
-				sv += ', '
-			sv += v[0] + '=' + str(v[1])
-		return sv + '}'
-	def __repr__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ReverseTokenOptions ( '
-		for v in pr:
-			if not callable(v[1]):
-				sv += v[0] + '=' + str(v[1]) + ', '
-		return sv + ')'
-	@property
-	def Token(self):
-		return _linksockslib.linksocks_ReverseTokenOptions_Token_Get(self.handle)
-	@Token.setter
-	def Token(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ReverseTokenOptions_Token_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_ReverseTokenOptions_Token_Set(self.handle, value)
-	@property
-	def Port(self):
-		return _linksockslib.linksocks_ReverseTokenOptions_Port_Get(self.handle)
-	@Port.setter
-	def Port(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ReverseTokenOptions_Port_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_ReverseTokenOptions_Port_Set(self.handle, value)
-	@property
-	def Username(self):
-		return _linksockslib.linksocks_ReverseTokenOptions_Username_Get(self.handle)
-	@Username.setter
-	def Username(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ReverseTokenOptions_Username_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_ReverseTokenOptions_Username_Set(self.handle, value)
-	@property
-	def Password(self):
-		return _linksockslib.linksocks_ReverseTokenOptions_Password_Get(self.handle)
-	@Password.setter
-	def Password(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ReverseTokenOptions_Password_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_ReverseTokenOptions_Password_Set(self.handle, value)
-	@property
-	def AllowManageConnector(self):
-		return _linksockslib.linksocks_ReverseTokenOptions_AllowManageConnector_Get(self.handle)
-	@AllowManageConnector.setter
-	def AllowManageConnector(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ReverseTokenOptions_AllowManageConnector_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_ReverseTokenOptions_AllowManageConnector_Set(self.handle, value)
-
-# Python type for struct linksocks.ReverseTokenResult
-class ReverseTokenResult(go.GoClass):
-	"""ReverseTokenResult represents the result of adding a reverse token\n"""
-	def __init__(self, *args, **kwargs):
-		"""
-		handle=A Go-side object is always initialized with an explicit handle=arg
-		otherwise parameters can be unnamed in order of field names or named fields
-		in which case a new Go object is constructed first
-		"""
-		if len(kwargs) == 1 and 'handle' in kwargs:
-			self.handle = kwargs['handle']
-			_linksockslib.IncRef(self.handle)
-		elif len(args) == 1 and isinstance(args[0], go.GoClass):
-			self.handle = args[0].handle
-			_linksockslib.IncRef(self.handle)
-		else:
-			self.handle = _linksockslib.linksocks_ReverseTokenResult_CTor()
-			_linksockslib.IncRef(self.handle)
-			if  0 < len(args):
-				self.Token = args[0]
-			if "Token" in kwargs:
-				self.Token = kwargs["Token"]
-			if  1 < len(args):
-				self.Port = args[1]
-			if "Port" in kwargs:
-				self.Port = kwargs["Port"]
-	def __del__(self):
-		_linksockslib.DecRef(self.handle)
-	def __str__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ReverseTokenResult{'
-		first = True
-		for v in pr:
-			if callable(v[1]):
-				continue
-			if first:
-				first = False
-			else:
-				sv += ', '
-			sv += v[0] + '=' + str(v[1])
-		return sv + '}'
-	def __repr__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ReverseTokenResult ( '
-		for v in pr:
-			if not callable(v[1]):
-				sv += v[0] + '=' + str(v[1]) + ', '
-		return sv + ')'
-	@property
-	def Token(self):
-		return _linksockslib.linksocks_ReverseTokenResult_Token_Get(self.handle)
-	@Token.setter
-	def Token(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ReverseTokenResult_Token_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_ReverseTokenResult_Token_Set(self.handle, value)
-	@property
-	def Port(self):
-		return _linksockslib.linksocks_ReverseTokenResult_Port_Get(self.handle)
-	@Port.setter
-	def Port(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ReverseTokenResult_Port_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_ReverseTokenResult_Port_Set(self.handle, value)
-
-# Python type for struct linksocks.ServerOption
-class ServerOption(go.GoClass):
-	"""ServerOption represents configuration options for LinkSocksServer\n"""
-	def __init__(self, *args, **kwargs):
-		"""
-		handle=A Go-side object is always initialized with an explicit handle=arg
-		otherwise parameters can be unnamed in order of field names or named fields
-		in which case a new Go object is constructed first
-		"""
-		if len(kwargs) == 1 and 'handle' in kwargs:
-			self.handle = kwargs['handle']
-			_linksockslib.IncRef(self.handle)
-		elif len(args) == 1 and isinstance(args[0], go.GoClass):
-			self.handle = args[0].handle
-			_linksockslib.IncRef(self.handle)
-		else:
-			self.handle = _linksockslib.linksocks_ServerOption_CTor()
-			_linksockslib.IncRef(self.handle)
-			if  0 < len(args):
-				self.WSHost = args[0]
-			if "WSHost" in kwargs:
-				self.WSHost = kwargs["WSHost"]
-			if  1 < len(args):
-				self.WSPort = args[1]
-			if "WSPort" in kwargs:
-				self.WSPort = kwargs["WSPort"]
-			if  2 < len(args):
-				self.SocksHost = args[2]
-			if "SocksHost" in kwargs:
-				self.SocksHost = kwargs["SocksHost"]
-			if  3 < len(args):
-				self.PortPool = args[3]
-			if "PortPool" in kwargs:
-				self.PortPool = kwargs["PortPool"]
+				self.PortPool = args[3]
+			if "PortPool" in kwargs:
+				self.PortPool = kwargs["PortPool"]
 			if  4 < len(args):
 				self.SocksWaitClient = args[4]
 			if "SocksWaitClient" in kwargs:
@@ -3528,9 +3401,9 @@ class ServerOption(go.GoClass):
 		"""
 		return ServerOption(handle=_linksockslib.linksocks_ServerOption_WithUpstreamAuth(self.handle, username, password))
 
-# Python type for struct linksocks.TokenRequest
-class TokenRequest(go.GoClass):
-	"""TokenRequest represents a request to create a new token\n"""
+# Python type for struct linksocks.ConnectorMessage
+class ConnectorMessage(go.GoClass):
+	"""ConnectorMessage represents a connector management command from reverse client\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -3544,41 +3417,25 @@ class TokenRequest(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_TokenRequest_CTor()
+			self.handle = _linksockslib.linksocks_ConnectorMessage_CTor()
 			_linksockslib.IncRef(self.handle)
 			if  0 < len(args):
-				self.Type = args[0]
-			if "Type" in kwargs:
-				self.Type = kwargs["Type"]
+				self.ChannelID = args[0]
+			if "ChannelID" in kwargs:
+				self.ChannelID = kwargs["ChannelID"]
 			if  1 < len(args):
-				self.Token = args[1]
-			if "Token" in kwargs:
-				self.Token = kwargs["Token"]
+				self.ConnectorToken = args[1]
+			if "ConnectorToken" in kwargs:
+				self.ConnectorToken = kwargs["ConnectorToken"]
 			if  2 < len(args):
-				self.Port = args[2]
-			if "Port" in kwargs:
-				self.Port = kwargs["Port"]
-			if  3 < len(args):
-				self.Username = args[3]
-			if "Username" in kwargs:
-				self.Username = kwargs["Username"]
-			if  4 < len(args):
-				self.Password = args[4]
-			if "Password" in kwargs:
-				self.Password = kwargs["Password"]
-			if  5 < len(args):
-				self.ReverseToken = args[5]
-			if "ReverseToken" in kwargs:
-				self.ReverseToken = kwargs["ReverseToken"]
-			if  6 < len(args):
-				self.AllowManageConnector = args[6]
-			if "AllowManageConnector" in kwargs:
-				self.AllowManageConnector = kwargs["AllowManageConnector"]
+				self.Operation = args[2]
+			if "Operation" in kwargs:
+				self.Operation = kwargs["Operation"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.TokenRequest{'
+		sv = 'linksocks.ConnectorMessage{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -3591,98 +3448,75 @@ class TokenRequest(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.TokenRequest ( '
+		sv = 'linksocks.ConnectorMessage ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
 	@property
-	def Type(self):
-		return _linksockslib.linksocks_TokenRequest_Type_Get(self.handle)
-	@Type.setter
-	def Type(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_TokenRequest_Type_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_TokenRequest_Type_Set(self.handle, value)
+	def ChannelID(self):
+		return go.uuid_UUID(handle=_linksockslib.linksocks_ConnectorMessage_ChannelID_Get(self.handle))
 	@property
-	def Token(self):
-		return _linksockslib.linksocks_TokenRequest_Token_Get(self.handle)
-	@Token.setter
-	def Token(self, value):
+	def ConnectorToken(self):
+		return _linksockslib.linksocks_ConnectorMessage_ConnectorToken_Get(self.handle)
+	@ConnectorToken.setter
+	def ConnectorToken(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_TokenRequest_Token_Set(self.handle, value.handle)
+			_linksockslib.linksocks_ConnectorMessage_ConnectorToken_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_TokenRequest_Token_Set(self.handle, value)
+			_linksockslib.linksocks_ConnectorMessage_ConnectorToken_Set(self.handle, value)
 	@property
-	def Port(self):
-		return _linksockslib.linksocks_TokenRequest_Port_Get(self.handle)
-	@Port.setter
-	def Port(self, value):
+	def Operation(self):
+		return _linksockslib.linksocks_ConnectorMessage_Operation_Get(self.handle)
+	@Operation.setter
+	def Operation(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_TokenRequest_Port_Set(self.handle, value.handle)
+			_linksockslib.linksocks_ConnectorMessage_Operation_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_TokenRequest_Port_Set(self.handle, value)
-	@property
-	def Username(self):
-		return _linksockslib.linksocks_TokenRequest_Username_Get(self.handle)
-	@Username.setter
-	def Username(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_TokenRequest_Username_Set(self.handle, value.handle)
+			_linksockslib.linksocks_ConnectorMessage_Operation_Set(self.handle, value)
+	def GetType(self):
+		"""GetType() str"""
+		return _linksockslib.linksocks_ConnectorMessage_GetType(self.handle)
+
+# Python type for struct linksocks.ConnectorResponseMessage
+class ConnectorResponseMessage(go.GoClass):
+	"""ConnectorResponseMessage represents a connector management response\n"""
+	def __init__(self, *args, **kwargs):
+		"""
+		handle=A Go-side object is always initialized with an explicit handle=arg
+		otherwise parameters can be unnamed in order of field names or named fields
+		in which case a new Go object is constructed first
+		"""
+		if len(kwargs) == 1 and 'handle' in kwargs:
+			self.handle = kwargs['handle']
+			_linksockslib.IncRef(self.handle)
+		elif len(args) == 1 and isinstance(args[0], go.GoClass):
+			self.handle = args[0].handle
+			_linksockslib.IncRef(self.handle)
 		else:
-			_linksockslib.linksocks_TokenRequest_Username_Set(self.handle, value)
-	@property
-	def Password(self):
-		return _linksockslib.linksocks_TokenRequest_Password_Get(self.handle)
-	@Password.setter
-	def Password(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_TokenRequest_Password_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_TokenRequest_Password_Set(self.handle, value)
-	@property
-	def ReverseToken(self):
-		return _linksockslib.linksocks_TokenRequest_ReverseToken_Get(self.handle)
-	@ReverseToken.setter
-	def ReverseToken(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_TokenRequest_ReverseToken_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_TokenRequest_ReverseToken_Set(self.handle, value)
-	@property
-	def AllowManageConnector(self):
-		return _linksockslib.linksocks_TokenRequest_AllowManageConnector_Get(self.handle)
-	@AllowManageConnector.setter
-	def AllowManageConnector(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_TokenRequest_AllowManageConnector_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_TokenRequest_AllowManageConnector_Set(self.handle, value)
-
-# Python type for struct linksocks.WSConn
-class WSConn(go.GoClass):
-	"""WSConn wraps a websocket.Conn with mutex protection\n"""
-	def __init__(self, *args, **kwargs):
-		"""
-		handle=A Go-side object is always initialized with an explicit handle=arg
-		otherwise parameters can be unnamed in order of field names or named fields
-		in which case a new Go object is constructed first
-		"""
-		if len(kwargs) == 1 and 'handle' in kwargs:
-			self.handle = kwargs['handle']
-			_linksockslib.IncRef(self.handle)
-		elif len(args) == 1 and isinstance(args[0], go.GoClass):
-			self.handle = args[0].handle
-			_linksockslib.IncRef(self.handle)
-		else:
-			self.handle = _linksockslib.linksocks_WSConn_CTor()
+			self.handle = _linksockslib.linksocks_ConnectorResponseMessage_CTor()
 			_linksockslib.IncRef(self.handle)
+			if  0 < len(args):
+				self.Success = args[0]
+			if "Success" in kwargs:
+				self.Success = kwargs["Success"]
+			if  1 < len(args):
+				self.Error = args[1]
+			if "Error" in kwargs:
+				self.Error = kwargs["Error"]
+			if  2 < len(args):
+				self.ChannelID = args[2]
+			if "ChannelID" in kwargs:
+				self.ChannelID = kwargs["ChannelID"]
+			if  3 < len(args):
+				self.ConnectorToken = args[3]
+			if "ConnectorToken" in kwargs:
+				self.ConnectorToken = kwargs["ConnectorToken"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.WSConn{'
+		sv = 'linksocks.ConnectorResponseMessage{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -3695,109 +3529,44 @@ class WSConn(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.WSConn ( '
+		sv = 'linksocks.ConnectorResponseMessage ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
-	def Label(self):
-		"""Label() str"""
-		return _linksockslib.linksocks_WSConn_Label(self.handle)
-	def GetClientIP(self):
-		"""GetClientIP() str
-		
-		GetClientIP returns the client IP address
-		"""
-		return _linksockslib.linksocks_WSConn_GetClientIP(self.handle)
-	def SetClientIPFromRequest(self, r, goRun=False):
-		"""SetClientIPFromRequest(object r) 
-		
-		SetClientIPFromRequest extracts and sets the client IP from HTTP request
-		"""
-		_linksockslib.linksocks_WSConn_SetClientIPFromRequest(self.handle, r.handle, goRun)
-	def SyncWriteBinary(self, data):
-		"""SyncWriteBinary([]int data) str
-		
-		SyncWriteBinary performs thread-safe binary writes to the websocket connection
-		"""
-		return _linksockslib.linksocks_WSConn_SyncWriteBinary(self.handle, data.handle)
-	def ReadMessage(self):
-		"""ReadMessage() object, str
-		
-		ReadMessage reads a BaseMessage from the websocket connection
-		"""
-		return BaseMessage(handle=_linksockslib.linksocks_WSConn_ReadMessage(self.handle))
-	def WriteMessage(self, msg):
-		"""WriteMessage(object msg) str
-		
-		WriteMessage writes a BaseMessage to the websocket connection
-		"""
-		return _linksockslib.linksocks_WSConn_WriteMessage(self.handle, msg.handle)
-	def SyncWriteControl(self, messageType, data, deadline):
-		"""SyncWriteControl(int messageType, []int data, object deadline) str
-		
-		SyncWriteControl performs thread-safe control message writes and tracks ping time
-		"""
-		return _linksockslib.linksocks_WSConn_SyncWriteControl(self.handle, messageType, data.handle, deadline.handle)
-	def Close(self):
-		"""Close() str
-		
-		Close closes the underlying websocket connection
-		"""
-		return _linksockslib.linksocks_WSConn_Close(self.handle)
-
-# Python type for struct linksocks.ContextWithCancel
-class ContextWithCancel(go.GoClass):
-	"""ContextWithCancel wraps context and cancel function for Python bindings\n"""
-	def __init__(self, *args, **kwargs):
-		"""
-		handle=A Go-side object is always initialized with an explicit handle=arg
-		otherwise parameters can be unnamed in order of field names or named fields
-		in which case a new Go object is constructed first
-		"""
-		if len(kwargs) == 1 and 'handle' in kwargs:
-			self.handle = kwargs['handle']
-			_linksockslib.IncRef(self.handle)
-		elif len(args) == 1 and isinstance(args[0], go.GoClass):
-			self.handle = args[0].handle
-			_linksockslib.IncRef(self.handle)
+	@property
+	def Success(self):
+		return _linksockslib.linksocks_ConnectorResponseMessage_Success_Get(self.handle)
+	@Success.setter
+	def Success(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_ConnectorResponseMessage_Success_Set(self.handle, value.handle)
 		else:
-			self.handle = _linksockslib.linksocks_ContextWithCancel_CTor()
-			_linksockslib.IncRef(self.handle)
-	def __del__(self):
-		_linksockslib.DecRef(self.handle)
-	def __str__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ContextWithCancel{'
-		first = True
-		for v in pr:
-			if callable(v[1]):
-				continue
-			if first:
-				first = False
-			else:
-				sv += ', '
-			sv += v[0] + '=' + str(v[1])
-		return sv + '}'
-	def __repr__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ContextWithCancel ( '
-		for v in pr:
-			if not callable(v[1]):
-				sv += v[0] + '=' + str(v[1]) + ', '
-		return sv + ')'
-	def Cancel(self, goRun=False):
-		"""Cancel() 
-		
-		Cancel calls the cancel function to cancel the context
-		"""
-		_linksockslib.linksocks_ContextWithCancel_Cancel(self.handle, goRun)
-	def Context(self):
-		"""Context() object
-		
-		Context returns the underlying context.Context
-		"""
-		return go.context_Context(handle=_linksockslib.linksocks_ContextWithCancel_Context(self.handle))
+			_linksockslib.linksocks_ConnectorResponseMessage_Success_Set(self.handle, value)
+	@property
+	def Error(self):
+		return _linksockslib.linksocks_ConnectorResponseMessage_Error_Get(self.handle)
+	@Error.setter
+	def Error(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_ConnectorResponseMessage_Error_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_ConnectorResponseMessage_Error_Set(self.handle, value)
+	@property
+	def ChannelID(self):
+		return go.uuid_UUID(handle=_linksockslib.linksocks_ConnectorResponseMessage_ChannelID_Get(self.handle))
+	@property
+	def ConnectorToken(self):
+		return _linksockslib.linksocks_ConnectorResponseMessage_ConnectorToken_Get(self.handle)
+	@ConnectorToken.setter
+	def ConnectorToken(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_ConnectorResponseMessage_ConnectorToken_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_ConnectorResponseMessage_ConnectorToken_Set(self.handle, value)
+	def GetType(self):
+		"""GetType() str"""
+		return _linksockslib.linksocks_ConnectorResponseMessage_GetType(self.handle)
 
 # Python type for struct linksocks.PortPool
 class PortPool(go.GoClass):
@@ -3960,9 +3729,9 @@ class Relay(go.GoClass):
 		"""
 		_linksockslib.linksocks_Relay_SetConnectionSuccess(self.handle, channelID.handle, goRun)
 
-# Python type for struct linksocks.RelayOption
-class RelayOption(go.GoClass):
-	"""RelayOption contains configuration options for Relay\n"""
+# Python type for struct linksocks.TokenStatus
+class TokenStatus(go.GoClass):
+	"""TokenStatus represents the status of a token\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -3976,65 +3745,25 @@ class RelayOption(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_RelayOption_CTor()
+			self.handle = _linksockslib.linksocks_TokenStatus_CTor()
 			_linksockslib.IncRef(self.handle)
 			if  0 < len(args):
-				self.BufferSize = args[0]
-			if "BufferSize" in kwargs:
-				self.BufferSize = kwargs["BufferSize"]
+				self.Token = args[0]
+			if "Token" in kwargs:
+				self.Token = kwargs["Token"]
 			if  1 < len(args):
-				self.ChannelTimeout = args[1]
-			if "ChannelTimeout" in kwargs:
-				self.ChannelTimeout = kwargs["ChannelTimeout"]
+				self.Type = args[1]
+			if "Type" in kwargs:
+				self.Type = kwargs["Type"]
 			if  2 < len(args):
-				self.ConnectTimeout = args[2]
-			if "ConnectTimeout" in kwargs:
-				self.ConnectTimeout = kwargs["ConnectTimeout"]
-			if  3 < len(args):
-				self.FastOpen = args[3]
-			if "FastOpen" in kwargs:
-				self.FastOpen = kwargs["FastOpen"]
-			if  4 < len(args):
-				self.UpstreamProxy = args[4]
-			if "UpstreamProxy" in kwargs:
-				self.UpstreamProxy = kwargs["UpstreamProxy"]
-			if  5 < len(args):
-				self.UpstreamUsername = args[5]
-			if "UpstreamUsername" in kwargs:
-				self.UpstreamUsername = kwargs["UpstreamUsername"]
-			if  6 < len(args):
-				self.UpstreamPassword = args[6]
-			if "UpstreamPassword" in kwargs:
-				self.UpstreamPassword = kwargs["UpstreamPassword"]
-			if  7 < len(args):
-				self.EnableDynamicBatching = args[7]
-			if "EnableDynamicBatching" in kwargs:
-				self.EnableDynamicBatching = kwargs["EnableDynamicBatching"]
-			if  8 < len(args):
-				self.MaxBatchWaitTime = args[8]
-			if "MaxBatchWaitTime" in kwargs:
-				self.MaxBatchWaitTime = kwargs["MaxBatchWaitTime"]
-			if  9 < len(args):
-				self.MinBatchWaitTime = args[9]
-			if "MinBatchWaitTime" in kwargs:
-				self.MinBatchWaitTime = kwargs["MinBatchWaitTime"]
-			if  10 < len(args):
-				self.HighSpeedThreshold = args[10]
-			if "HighSpeedThreshold" in kwargs:
-				self.HighSpeedThreshold = kwargs["HighSpeedThreshold"]
-			if  11 < len(args):
-				self.LowSpeedThreshold = args[11]
-			if "LowSpeedThreshold" in kwargs:
-				self.LowSpeedThreshold = kwargs["LowSpeedThreshold"]
-			if  12 < len(args):
-				self.CompressionThreshold = args[12]
-			if "CompressionThreshold" in kwargs:
-				self.CompressionThreshold = kwargs["CompressionThreshold"]
-	def __del__(self):
-		_linksockslib.DecRef(self.handle)
+				self.ClientsCount = args[2]
+			if "ClientsCount" in kwargs:
+				self.ClientsCount = kwargs["ClientsCount"]
+	def __del__(self):
+		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.RelayOption{'
+		sv = 'linksocks.TokenStatus{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -4047,214 +3776,42 @@ class RelayOption(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.RelayOption ( '
+		sv = 'linksocks.TokenStatus ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
 	@property
-	def BufferSize(self):
-		"""BufferSize controls the size of reusable buffers
-		Larger values may improve performance but increase memory usage
-		"""
-		return _linksockslib.linksocks_RelayOption_BufferSize_Get(self.handle)
-	@BufferSize.setter
-	def BufferSize(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_RelayOption_BufferSize_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_RelayOption_BufferSize_Set(self.handle, value)
-	@property
-	def ChannelTimeout(self):
-		return _linksockslib.linksocks_RelayOption_ChannelTimeout_Get(self.handle)
-	@ChannelTimeout.setter
-	def ChannelTimeout(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_RelayOption_ChannelTimeout_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_RelayOption_ChannelTimeout_Set(self.handle, value)
-	@property
-	def ConnectTimeout(self):
-		return _linksockslib.linksocks_RelayOption_ConnectTimeout_Get(self.handle)
-	@ConnectTimeout.setter
-	def ConnectTimeout(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_RelayOption_ConnectTimeout_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_RelayOption_ConnectTimeout_Set(self.handle, value)
-	@property
-	def FastOpen(self):
-		"""FastOpen controls whether to wait for connect success response
-		When false, assumes connection success immediately
-		"""
-		return _linksockslib.linksocks_RelayOption_FastOpen_Get(self.handle)
-	@FastOpen.setter
-	def FastOpen(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_RelayOption_FastOpen_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_RelayOption_FastOpen_Set(self.handle, value)
-	@property
-	def UpstreamProxy(self):
-		"""Upstream SOCKS5 proxy configuration
-		"""
-		return _linksockslib.linksocks_RelayOption_UpstreamProxy_Get(self.handle)
-	@UpstreamProxy.setter
-	def UpstreamProxy(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_RelayOption_UpstreamProxy_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_RelayOption_UpstreamProxy_Set(self.handle, value)
-	@property
-	def UpstreamUsername(self):
-		return _linksockslib.linksocks_RelayOption_UpstreamUsername_Get(self.handle)
-	@UpstreamUsername.setter
-	def UpstreamUsername(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_RelayOption_UpstreamUsername_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_RelayOption_UpstreamUsername_Set(self.handle, value)
-	@property
-	def UpstreamPassword(self):
-		return _linksockslib.linksocks_RelayOption_UpstreamPassword_Get(self.handle)
-	@UpstreamPassword.setter
-	def UpstreamPassword(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_RelayOption_UpstreamPassword_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_RelayOption_UpstreamPassword_Set(self.handle, value)
-	@property
-	def EnableDynamicBatching(self):
-		"""Adaptive batching configuration
-		"""
-		return _linksockslib.linksocks_RelayOption_EnableDynamicBatching_Get(self.handle)
-	@EnableDynamicBatching.setter
-	def EnableDynamicBatching(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_RelayOption_EnableDynamicBatching_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_RelayOption_EnableDynamicBatching_Set(self.handle, value)
-	@property
-	def MaxBatchWaitTime(self):
-		return _linksockslib.linksocks_RelayOption_MaxBatchWaitTime_Get(self.handle)
-	@MaxBatchWaitTime.setter
-	def MaxBatchWaitTime(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_RelayOption_MaxBatchWaitTime_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_RelayOption_MaxBatchWaitTime_Set(self.handle, value)
-	@property
-	def MinBatchWaitTime(self):
-		return _linksockslib.linksocks_RelayOption_MinBatchWaitTime_Get(self.handle)
-	@MinBatchWaitTime.setter
-	def MinBatchWaitTime(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_RelayOption_MinBatchWaitTime_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_RelayOption_MinBatchWaitTime_Set(self.handle, value)
-	@property
-	def HighSpeedThreshold(self):
-		"""HighSpeedThreshold defines the bytes/sec rate above which batch delay increases
-		"""
-		return _linksockslib.linksocks_RelayOption_HighSpeedThreshold_Get(self.handle)
-	@HighSpeedThreshold.setter
-	def HighSpeedThreshold(self, value):
+	def Token(self):
+		return _linksockslib.linksocks_TokenStatus_Token_Get(self.handle)
+	@Token.setter
+	def Token(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_RelayOption_HighSpeedThreshold_Set(self.handle, value.handle)
+			_linksockslib.linksocks_TokenStatus_Token_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_RelayOption_HighSpeedThreshold_Set(self.handle, value)
+			_linksockslib.linksocks_TokenStatus_Token_Set(self.handle, value)
 	@property
-	def LowSpeedThreshold(self):
-		"""LowSpeedThreshold defines the bytes/sec rate below which batch delay resets to zero
-		"""
-		return _linksockslib.linksocks_RelayOption_LowSpeedThreshold_Get(self.handle)
-	@LowSpeedThreshold.setter
-	def LowSpeedThreshold(self, value):
+	def Type(self):
+		return _linksockslib.linksocks_TokenStatus_Type_Get(self.handle)
+	@Type.setter
+	def Type(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_RelayOption_LowSpeedThreshold_Set(self.handle, value.handle)
+			_linksockslib.linksocks_TokenStatus_Type_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_RelayOption_LowSpeedThreshold_Set(self.handle, value)
+			_linksockslib.linksocks_TokenStatus_Type_Set(self.handle, value)
 	@property
-	def CompressionThreshold(self):
-		"""CompressionThreshold defines the data size in bytes above which compression is applied
-		"""
-		return _linksockslib.linksocks_RelayOption_CompressionThreshold_Get(self.handle)
-	@CompressionThreshold.setter
-	def CompressionThreshold(self, value):
+	def ClientsCount(self):
+		return _linksockslib.linksocks_TokenStatus_ClientsCount_Get(self.handle)
+	@ClientsCount.setter
+	def ClientsCount(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_RelayOption_CompressionThreshold_Set(self.handle, value.handle)
+			_linksockslib.linksocks_TokenStatus_ClientsCount_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_RelayOption_CompressionThreshold_Set(self.handle, value)
-	def WithBufferSize(self, size):
-		"""WithBufferSize(int size) object
-		
-		WithBufferSize sets the buffer size for the relay
-		"""
-		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithBufferSize(self.handle, size))
-	def WithChannelTimeout(self, timeout):
-		"""WithChannelTimeout(long timeout) object
-		
-		WithChannelTimeout sets the channel timeout for the relay
-		"""
-		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithChannelTimeout(self.handle, timeout))
-	def WithConnectTimeout(self, timeout):
-		"""WithConnectTimeout(long timeout) object
-		
-		WithConnectTimeout sets the connect timeout for the relay
-		"""
-		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithConnectTimeout(self.handle, timeout))
-	def WithFastOpen(self, fastOpen):
-		"""WithFastOpen(bool fastOpen) object
-		
-		WithFastOpen sets the fast open mode for the relay
-		"""
-		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithFastOpen(self.handle, fastOpen))
-	def WithUpstreamProxy(self, proxy):
-		"""WithUpstreamProxy(str proxy) object
-		
-		WithUpstreamProxy sets the upstream SOCKS5 proxy
-		"""
-		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithUpstreamProxy(self.handle, proxy))
-	def WithUpstreamAuth(self, username, password):
-		"""WithUpstreamAuth(str username, str password) object
-		
-		WithUpstreamAuth sets the upstream SOCKS5 proxy authentication
-		"""
-		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithUpstreamAuth(self.handle, username, password))
-	def WithDynamicBatching(self, enabled):
-		"""WithDynamicBatching(bool enabled) object
-		
-		WithDynamicBatching enables or disables adaptive batching for SOCKS TCP
-		"""
-		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithDynamicBatching(self.handle, enabled))
-	def WithBatchingTimeLimits(self, min, max):
-		"""WithBatchingTimeLimits(long min, long max) object
-		
-		WithBatchingTimeLimits sets the min/max wait times for SOCKS TCP batching
-		"""
-		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithBatchingTimeLimits(self.handle, min, max))
-	def WithHighSpeedThreshold(self, threshold):
-		"""WithHighSpeedThreshold(float threshold) object
-		
-		WithHighSpeedThreshold sets the threshold for increasing batch delay
-		"""
-		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithHighSpeedThreshold(self.handle, threshold))
-	def WithLowSpeedThreshold(self, threshold):
-		"""WithLowSpeedThreshold(float threshold) object
-		
-		WithLowSpeedThreshold sets the threshold for reverting to immediate send
-		"""
-		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithLowSpeedThreshold(self.handle, threshold))
-	def WithCompressionThreshold(self, threshold):
-		"""WithCompressionThreshold(int threshold) object
-		
-		WithCompressionThreshold sets the threshold for enabling data compression
-		"""
-		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithCompressionThreshold(self.handle, threshold))
+			_linksockslib.linksocks_TokenStatus_ClientsCount_Set(self.handle, value)
 
-# Python type for struct linksocks.LinkSocksServer
-class LinkSocksServer(go.GoClass):
-	"""LinkSocksServer represents a SOCKS5 over WebSocket protocol server\n"""
+# Python type for struct linksocks.WSConn
+class WSConn(go.GoClass):
+	"""WSConn wraps a websocket.Conn with mutex protection\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -4268,13 +3825,13 @@ class LinkSocksServer(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_LinkSocksServer_CTor()
+			self.handle = _linksockslib.linksocks_WSConn_CTor()
 			_linksockslib.IncRef(self.handle)
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.LinkSocksServer{'
+		sv = 'linksocks.WSConn{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -4287,75 +3844,60 @@ class LinkSocksServer(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.LinkSocksServer ( '
+		sv = 'linksocks.WSConn ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
-	def AddReverseToken(self, opts):
-		"""AddReverseToken(object opts) object, str
+	def Label(self):
+		"""Label() str"""
+		return _linksockslib.linksocks_WSConn_Label(self.handle)
+	def GetClientIP(self):
+		"""GetClientIP() str
 		
-		AddReverseToken adds a new token for reverse socks and assigns a port
+		GetClientIP returns the client IP address
 		"""
-		return ReverseTokenResult(handle=_linksockslib.linksocks_LinkSocksServer_AddReverseToken(self.handle, opts.handle))
-	def AddForwardToken(self, token):
-		"""AddForwardToken(str token) str, str
+		return _linksockslib.linksocks_WSConn_GetClientIP(self.handle)
+	def SetClientIPFromRequest(self, r, goRun=False):
+		"""SetClientIPFromRequest(object r) 
 		
-		AddForwardToken adds a new token for forward socks proxy
+		SetClientIPFromRequest extracts and sets the client IP from HTTP request
 		"""
-		return _linksockslib.linksocks_LinkSocksServer_AddForwardToken(self.handle, token)
-	def AddConnectorToken(self, connectorToken, reverseToken):
-		"""AddConnectorToken(str connectorToken, str reverseToken) str, str
+		_linksockslib.linksocks_WSConn_SetClientIPFromRequest(self.handle, r.handle, goRun)
+	def SyncWriteBinary(self, data):
+		"""SyncWriteBinary([]int data) str
 		
-		AddConnectorToken adds a new connector token that forwards requests to a reverse token
+		SyncWriteBinary performs thread-safe binary writes to the websocket connection
 		"""
-		return _linksockslib.linksocks_LinkSocksServer_AddConnectorToken(self.handle, connectorToken, reverseToken)
-	def RemoveToken(self, token):
-		"""RemoveToken(str token) bool
-		
-		RemoveToken removes a token and disconnects all its clients
-		"""
-		return _linksockslib.linksocks_LinkSocksServer_RemoveToken(self.handle, token)
-	def Serve(self, ctx):
-		"""Serve(object ctx) str
-		
-		Serve starts the WebSocket server and waits for clients
-		"""
-		return _linksockslib.linksocks_LinkSocksServer_Serve(self.handle, ctx.handle)
-	def WaitReady(self, ctx, timeout):
-		"""WaitReady(object ctx, long timeout) str
-		
-		WaitReady starts the server and waits for the server to be ready with optional timeout
-		"""
-		return _linksockslib.linksocks_LinkSocksServer_WaitReady(self.handle, ctx.handle, timeout)
-	def Close(self, goRun=False):
-		"""Close() 
+		return _linksockslib.linksocks_WSConn_SyncWriteBinary(self.handle, data.handle)
+	def ReadMessage(self):
+		"""ReadMessage() object, str
 		
-		Close gracefully shuts down the LinkSocksServer
+		ReadMessage reads a BaseMessage from the websocket connection
 		"""
-		_linksockslib.linksocks_LinkSocksServer_Close(self.handle, goRun)
-	def GetClientCount(self):
-		"""GetClientCount() int
+		return BaseMessage(handle=_linksockslib.linksocks_WSConn_ReadMessage(self.handle))
+	def WriteMessage(self, msg):
+		"""WriteMessage(object msg) str
 		
-		GetClientCount returns the total number of connected clients
+		WriteMessage writes a BaseMessage to the websocket connection
 		"""
-		return _linksockslib.linksocks_LinkSocksServer_GetClientCount(self.handle)
-	def HasClients(self):
-		"""HasClients() bool
+		return _linksockslib.linksocks_WSConn_WriteMessage(self.handle, msg.handle)
+	def SyncWriteControl(self, messageType, data, deadline):
+		"""SyncWriteControl(int messageType, []int data, object deadline) str
 		
-		HasClients returns true if there are any connected clients
+		SyncWriteControl performs thread-safe control message writes and tracks ping time
 		"""
-		return _linksockslib.linksocks_LinkSocksServer_HasClients(self.handle)
-	def GetTokenClientCount(self, token):
-		"""GetTokenClientCount(str token) int
+		return _linksockslib.linksocks_WSConn_SyncWriteControl(self.handle, messageType, data.handle, deadline.handle)
+	def Close(self):
+		"""Close() str
 		
-		GetTokenClientCount counts clients connected for a given token
+		Close closes the underlying websocket connection
 		"""
-		return _linksockslib.linksocks_LinkSocksServer_GetTokenClientCount(self.handle, token)
+		return _linksockslib.linksocks_WSConn_Close(self.handle)
 
-# Python type for struct linksocks.StatusResponse
-class StatusResponse(go.GoClass):
-	"""StatusResponse represents the server status\n"""
+# Python type for struct linksocks.CLI
+class CLI(go.GoClass):
+	"""CLI represents the command-line interface for LinkSocks\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -4369,21 +3911,13 @@ class StatusResponse(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_StatusResponse_CTor()
+			self.handle = _linksockslib.linksocks_CLI_CTor()
 			_linksockslib.IncRef(self.handle)
-			if  0 < len(args):
-				self.Version = args[0]
-			if "Version" in kwargs:
-				self.Version = kwargs["Version"]
-			if  1 < len(args):
-				self.Tokens = args[1]
-			if "Tokens" in kwargs:
-				self.Tokens = kwargs["Tokens"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.StatusResponse{'
+		sv = 'linksocks.CLI{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -4396,33 +3930,21 @@ class StatusResponse(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.StatusResponse ( '
+		sv = 'linksocks.CLI ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
-	@property
-	def Version(self):
-		return _linksockslib.linksocks_StatusResponse_Version_Get(self.handle)
-	@Version.setter
-	def Version(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_StatusResponse_Version_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_StatusResponse_Version_Set(self.handle, value)
-	@property
-	def Tokens(self):
-		return Slice_interface_(handle=_linksockslib.linksocks_StatusResponse_Tokens_Get(self.handle))
-	@Tokens.setter
-	def Tokens(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_StatusResponse_Tokens_Set(self.handle, value.handle)
-		else:
-			raise TypeError("supplied argument type {t} is not a go.GoClass".format(t=type(value)))
+	def Execute(self):
+		"""Execute() str
+		
+		Execute runs the CLI application
+		"""
+		return _linksockslib.linksocks_CLI_Execute(self.handle)
 
-# Python type for struct linksocks.CLI
-class CLI(go.GoClass):
-	"""CLI represents the command-line interface for LinkSocks\n"""
+# Python type for struct linksocks.LinkSocksClient
+class LinkSocksClient(go.GoClass):
+	"""LinkSocksClient represents a SOCKS5 over WebSocket protocol client\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -4436,13 +3958,17 @@ class CLI(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_CLI_CTor()
+			self.handle = _linksockslib.linksocks_LinkSocksClient_CTor()
 			_linksockslib.IncRef(self.handle)
+			if  2 < len(args):
+				self.IsConnected = args[2]
+			if "IsConnected" in kwargs:
+				self.IsConnected = kwargs["IsConnected"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.CLI{'
+		sv = 'linksocks.LinkSocksClient{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -4455,21 +3981,62 @@ class CLI(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.CLI ( '
+		sv = 'linksocks.LinkSocksClient ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
-	def Execute(self):
-		"""Execute() str
+	@property
+	def IsConnected(self):
+		return _linksockslib.linksocks_LinkSocksClient_IsConnected_Get(self.handle)
+	@IsConnected.setter
+	def IsConnected(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_LinkSocksClient_IsConnected_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_LinkSocksClient_IsConnected_Set(self.handle, value)
+	def WaitReady(self, ctx, timeout):
+		"""WaitReady(object ctx, long timeout) str
 		
-		Execute runs the CLI application
+		WaitReady start the client and waits for the client to be ready with optional timeout
 		"""
-		return _linksockslib.linksocks_CLI_Execute(self.handle)
+		return _linksockslib.linksocks_LinkSocksClient_WaitReady(self.handle, ctx.handle, timeout)
+	def Connect(self, ctx):
+		"""Connect(object ctx) str
+		
+		Connect starts the client operation
+		"""
+		return _linksockslib.linksocks_LinkSocksClient_Connect(self.handle, ctx.handle)
+	def Close(self, goRun=False):
+		"""Close() 
+		
+		Close gracefully shuts down the LinkSocksClient
+		"""
+		_linksockslib.linksocks_LinkSocksClient_Close(self.handle, goRun)
+	def AddConnector(self, connectorToken):
+		"""AddConnector(str connectorToken) str, str
+		
+		AddConnector sends a request to add a new connector token and waits for response.
+		This function is only available in reverse proxy mode.
+		"""
+		return _linksockslib.linksocks_LinkSocksClient_AddConnector(self.handle, connectorToken)
+	def RemoveConnector(self, connectorToken):
+		"""RemoveConnector(str connectorToken) str
+		
+		RemoveConnector sends a request to remove a connector token and waits for response.
+		This function is only available in reverse proxy mode.
+		"""
+		return _linksockslib.linksocks_LinkSocksClient_RemoveConnector(self.handle, connectorToken)
+	def GetPartnersCount(self):
+		"""GetPartnersCount() int
+		
+		GetPartnersCount returns the current number of partners
+		"""
+		return _linksockslib.linksocks_LinkSocksClient_GetPartnersCount(self.handle)
 
-# Python type for struct linksocks.ConnectMessage
-class ConnectMessage(go.GoClass):
-	"""ConnectMessage represents a TCP connection request\n"""
+# Python type for struct linksocks.TokenRequest
+class TokenRequest(go.GoClass):
+	"""TokenRequest represents a request to create a new token\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -4483,29 +4050,41 @@ class ConnectMessage(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_ConnectMessage_CTor()
+			self.handle = _linksockslib.linksocks_TokenRequest_CTor()
 			_linksockslib.IncRef(self.handle)
 			if  0 < len(args):
-				self.Protocol = args[0]
-			if "Protocol" in kwargs:
-				self.Protocol = kwargs["Protocol"]
+				self.Type = args[0]
+			if "Type" in kwargs:
+				self.Type = kwargs["Type"]
 			if  1 < len(args):
-				self.Address = args[1]
-			if "Address" in kwargs:
-				self.Address = kwargs["Address"]
+				self.Token = args[1]
+			if "Token" in kwargs:
+				self.Token = kwargs["Token"]
 			if  2 < len(args):
 				self.Port = args[2]
 			if "Port" in kwargs:
 				self.Port = kwargs["Port"]
 			if  3 < len(args):
-				self.ChannelID = args[3]
-			if "ChannelID" in kwargs:
-				self.ChannelID = kwargs["ChannelID"]
+				self.Username = args[3]
+			if "Username" in kwargs:
+				self.Username = kwargs["Username"]
+			if  4 < len(args):
+				self.Password = args[4]
+			if "Password" in kwargs:
+				self.Password = kwargs["Password"]
+			if  5 < len(args):
+				self.ReverseToken = args[5]
+			if "ReverseToken" in kwargs:
+				self.ReverseToken = kwargs["ReverseToken"]
+			if  6 < len(args):
+				self.AllowManageConnector = args[6]
+			if "AllowManageConnector" in kwargs:
+				self.AllowManageConnector = kwargs["AllowManageConnector"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ConnectMessage{'
+		sv = 'linksocks.TokenRequest{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -4518,80 +4097,157 @@ class ConnectMessage(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ConnectMessage ( '
+		sv = 'linksocks.TokenRequest ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
 	@property
-	def Protocol(self):
-		return _linksockslib.linksocks_ConnectMessage_Protocol_Get(self.handle)
-	@Protocol.setter
-	def Protocol(self, value):
+	def Type(self):
+		return _linksockslib.linksocks_TokenRequest_Type_Get(self.handle)
+	@Type.setter
+	def Type(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ConnectMessage_Protocol_Set(self.handle, value.handle)
+			_linksockslib.linksocks_TokenRequest_Type_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_ConnectMessage_Protocol_Set(self.handle, value)
+			_linksockslib.linksocks_TokenRequest_Type_Set(self.handle, value)
 	@property
-	def Address(self):
-		return _linksockslib.linksocks_ConnectMessage_Address_Get(self.handle)
-	@Address.setter
-	def Address(self, value):
+	def Token(self):
+		return _linksockslib.linksocks_TokenRequest_Token_Get(self.handle)
+	@Token.setter
+	def Token(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ConnectMessage_Address_Set(self.handle, value.handle)
+			_linksockslib.linksocks_TokenRequest_Token_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_ConnectMessage_Address_Set(self.handle, value)
+			_linksockslib.linksocks_TokenRequest_Token_Set(self.handle, value)
 	@property
 	def Port(self):
-		return _linksockslib.linksocks_ConnectMessage_Port_Get(self.handle)
+		return _linksockslib.linksocks_TokenRequest_Port_Get(self.handle)
 	@Port.setter
 	def Port(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ConnectMessage_Port_Set(self.handle, value.handle)
+			_linksockslib.linksocks_TokenRequest_Port_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_ConnectMessage_Port_Set(self.handle, value)
+			_linksockslib.linksocks_TokenRequest_Port_Set(self.handle, value)
 	@property
-	def ChannelID(self):
-		return go.uuid_UUID(handle=_linksockslib.linksocks_ConnectMessage_ChannelID_Get(self.handle))
-	def GetType(self):
-		"""GetType() str"""
-		return _linksockslib.linksocks_ConnectMessage_GetType(self.handle)
-
-# Python type for struct linksocks.ConnectorMessage
-class ConnectorMessage(go.GoClass):
-	"""ConnectorMessage represents a connector management command from reverse client\n"""
-	def __init__(self, *args, **kwargs):
-		"""
-		handle=A Go-side object is always initialized with an explicit handle=arg
-		otherwise parameters can be unnamed in order of field names or named fields
-		in which case a new Go object is constructed first
-		"""
-		if len(kwargs) == 1 and 'handle' in kwargs:
-			self.handle = kwargs['handle']
-			_linksockslib.IncRef(self.handle)
-		elif len(args) == 1 and isinstance(args[0], go.GoClass):
-			self.handle = args[0].handle
-			_linksockslib.IncRef(self.handle)
-		else:
-			self.handle = _linksockslib.linksocks_ConnectorMessage_CTor()
-			_linksockslib.IncRef(self.handle)
-			if  0 < len(args):
-				self.ChannelID = args[0]
-			if "ChannelID" in kwargs:
-				self.ChannelID = kwargs["ChannelID"]
+	def Username(self):
+		return _linksockslib.linksocks_TokenRequest_Username_Get(self.handle)
+	@Username.setter
+	def Username(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_TokenRequest_Username_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_TokenRequest_Username_Set(self.handle, value)
+	@property
+	def Password(self):
+		return _linksockslib.linksocks_TokenRequest_Password_Get(self.handle)
+	@Password.setter
+	def Password(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_TokenRequest_Password_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_TokenRequest_Password_Set(self.handle, value)
+	@property
+	def ReverseToken(self):
+		return _linksockslib.linksocks_TokenRequest_ReverseToken_Get(self.handle)
+	@ReverseToken.setter
+	def ReverseToken(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_TokenRequest_ReverseToken_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_TokenRequest_ReverseToken_Set(self.handle, value)
+	@property
+	def AllowManageConnector(self):
+		return _linksockslib.linksocks_TokenRequest_AllowManageConnector_Get(self.handle)
+	@AllowManageConnector.setter
+	def AllowManageConnector(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_TokenRequest_AllowManageConnector_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_TokenRequest_AllowManageConnector_Set(self.handle, value)
+
+# Python type for struct linksocks.APIHandler
+class APIHandler(go.GoClass):
+	"""APIHandler handles HTTP API requests for LinkSocksServer\n"""
+	def __init__(self, *args, **kwargs):
+		"""
+		handle=A Go-side object is always initialized with an explicit handle=arg
+		otherwise parameters can be unnamed in order of field names or named fields
+		in which case a new Go object is constructed first
+		"""
+		if len(kwargs) == 1 and 'handle' in kwargs:
+			self.handle = kwargs['handle']
+			_linksockslib.IncRef(self.handle)
+		elif len(args) == 1 and isinstance(args[0], go.GoClass):
+			self.handle = args[0].handle
+			_linksockslib.IncRef(self.handle)
+		else:
+			self.handle = _linksockslib.linksocks_APIHandler_CTor()
+			_linksockslib.IncRef(self.handle)
+	def __del__(self):
+		_linksockslib.DecRef(self.handle)
+	def __str__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'linksocks.APIHandler{'
+		first = True
+		for v in pr:
+			if callable(v[1]):
+				continue
+			if first:
+				first = False
+			else:
+				sv += ', '
+			sv += v[0] + '=' + str(v[1])
+		return sv + '}'
+	def __repr__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'linksocks.APIHandler ( '
+		for v in pr:
+			if not callable(v[1]):
+				sv += v[0] + '=' + str(v[1]) + ', '
+		return sv + ')'
+	def RegisterHandlers(self, mux, goRun=False):
+		"""RegisterHandlers(object mux) 
+		
+		RegisterHandlers registers API endpoints with the provided mux
+		"""
+		_linksockslib.linksocks_APIHandler_RegisterHandlers(self.handle, mux.handle, goRun)
+
+# Python type for struct linksocks.ConnectResponseMessage
+class ConnectResponseMessage(go.GoClass):
+	"""ConnectResponseMessage represents a connection response\n"""
+	def __init__(self, *args, **kwargs):
+		"""
+		handle=A Go-side object is always initialized with an explicit handle=arg
+		otherwise parameters can be unnamed in order of field names or named fields
+		in which case a new Go object is constructed first
+		"""
+		if len(kwargs) == 1 and 'handle' in kwargs:
+			self.handle = kwargs['handle']
+			_linksockslib.IncRef(self.handle)
+		elif len(args) == 1 and isinstance(args[0], go.GoClass):
+			self.handle = args[0].handle
+			_linksockslib.IncRef(self.handle)
+		else:
+			self.handle = _linksockslib.linksocks_ConnectResponseMessage_CTor()
+			_linksockslib.IncRef(self.handle)
+			if  0 < len(args):
+				self.Success = args[0]
+			if "Success" in kwargs:
+				self.Success = kwargs["Success"]
 			if  1 < len(args):
-				self.ConnectorToken = args[1]
-			if "ConnectorToken" in kwargs:
-				self.ConnectorToken = kwargs["ConnectorToken"]
+				self.Error = args[1]
+			if "Error" in kwargs:
+				self.Error = kwargs["Error"]
 			if  2 < len(args):
-				self.Operation = args[2]
-			if "Operation" in kwargs:
-				self.Operation = kwargs["Operation"]
+				self.ChannelID = args[2]
+			if "ChannelID" in kwargs:
+				self.ChannelID = kwargs["ChannelID"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ConnectorMessage{'
+		sv = 'linksocks.ConnectResponseMessage{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -4604,39 +4260,39 @@ class ConnectorMessage(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ConnectorMessage ( '
+		sv = 'linksocks.ConnectResponseMessage ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
 	@property
-	def ChannelID(self):
-		return go.uuid_UUID(handle=_linksockslib.linksocks_ConnectorMessage_ChannelID_Get(self.handle))
-	@property
-	def ConnectorToken(self):
-		return _linksockslib.linksocks_ConnectorMessage_ConnectorToken_Get(self.handle)
-	@ConnectorToken.setter
-	def ConnectorToken(self, value):
+	def Success(self):
+		return _linksockslib.linksocks_ConnectResponseMessage_Success_Get(self.handle)
+	@Success.setter
+	def Success(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ConnectorMessage_ConnectorToken_Set(self.handle, value.handle)
+			_linksockslib.linksocks_ConnectResponseMessage_Success_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_ConnectorMessage_ConnectorToken_Set(self.handle, value)
+			_linksockslib.linksocks_ConnectResponseMessage_Success_Set(self.handle, value)
 	@property
-	def Operation(self):
-		return _linksockslib.linksocks_ConnectorMessage_Operation_Get(self.handle)
-	@Operation.setter
-	def Operation(self, value):
+	def Error(self):
+		return _linksockslib.linksocks_ConnectResponseMessage_Error_Get(self.handle)
+	@Error.setter
+	def Error(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ConnectorMessage_Operation_Set(self.handle, value.handle)
+			_linksockslib.linksocks_ConnectResponseMessage_Error_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_ConnectorMessage_Operation_Set(self.handle, value)
+			_linksockslib.linksocks_ConnectResponseMessage_Error_Set(self.handle, value)
+	@property
+	def ChannelID(self):
+		return go.uuid_UUID(handle=_linksockslib.linksocks_ConnectResponseMessage_ChannelID_Get(self.handle))
 	def GetType(self):
 		"""GetType() str"""
-		return _linksockslib.linksocks_ConnectorMessage_GetType(self.handle)
+		return _linksockslib.linksocks_ConnectResponseMessage_GetType(self.handle)
 
-# Python type for struct linksocks.LogEntry
-class LogEntry(go.GoClass):
-	"""LogEntry represents a single log entry with metadata\n"""
+# Python type for struct linksocks.PartnersMessage
+class PartnersMessage(go.GoClass):
+	"""PartnersMessage represents a partners count update message\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -4650,25 +4306,17 @@ class LogEntry(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_LogEntry_CTor()
+			self.handle = _linksockslib.linksocks_PartnersMessage_CTor()
 			_linksockslib.IncRef(self.handle)
 			if  0 < len(args):
-				self.LoggerID = args[0]
-			if "LoggerID" in kwargs:
-				self.LoggerID = kwargs["LoggerID"]
-			if  1 < len(args):
-				self.Message = args[1]
-			if "Message" in kwargs:
-				self.Message = kwargs["Message"]
-			if  2 < len(args):
-				self.Time = args[2]
-			if "Time" in kwargs:
-				self.Time = kwargs["Time"]
+				self.Count = args[0]
+			if "Count" in kwargs:
+				self.Count = kwargs["Count"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.LogEntry{'
+		sv = 'linksocks.PartnersMessage{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -4681,42 +4329,27 @@ class LogEntry(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.LogEntry ( '
+		sv = 'linksocks.PartnersMessage ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
 	@property
-	def LoggerID(self):
-		return _linksockslib.linksocks_LogEntry_LoggerID_Get(self.handle)
-	@LoggerID.setter
-	def LoggerID(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_LogEntry_LoggerID_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_LogEntry_LoggerID_Set(self.handle, value)
-	@property
-	def Message(self):
-		return _linksockslib.linksocks_LogEntry_Message_Get(self.handle)
-	@Message.setter
-	def Message(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_LogEntry_Message_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_LogEntry_Message_Set(self.handle, value)
-	@property
-	def Time(self):
-		return _linksockslib.linksocks_LogEntry_Time_Get(self.handle)
-	@Time.setter
-	def Time(self, value):
+	def Count(self):
+		return _linksockslib.linksocks_PartnersMessage_Count_Get(self.handle)
+	@Count.setter
+	def Count(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_LogEntry_Time_Set(self.handle, value.handle)
+			_linksockslib.linksocks_PartnersMessage_Count_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_LogEntry_Time_Set(self.handle, value)
+			_linksockslib.linksocks_PartnersMessage_Count_Set(self.handle, value)
+	def GetType(self):
+		"""GetType() str"""
+		return _linksockslib.linksocks_PartnersMessage_GetType(self.handle)
 
-# Python type for struct linksocks.APIHandler
-class APIHandler(go.GoClass):
-	"""APIHandler handles HTTP API requests for LinkSocksServer\n"""
+# Python type for struct linksocks.ContextWithCancel
+class ContextWithCancel(go.GoClass):
+	"""ContextWithCancel wraps context and cancel function for Python bindings\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -4730,13 +4363,13 @@ class APIHandler(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_APIHandler_CTor()
+			self.handle = _linksockslib.linksocks_ContextWithCancel_CTor()
 			_linksockslib.IncRef(self.handle)
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.APIHandler{'
+		sv = 'linksocks.ContextWithCancel{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -4749,21 +4382,27 @@ class APIHandler(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.APIHandler ( '
+		sv = 'linksocks.ContextWithCancel ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
-	def RegisterHandlers(self, mux, goRun=False):
-		"""RegisterHandlers(object mux) 
+	def Cancel(self, goRun=False):
+		"""Cancel() 
 		
-		RegisterHandlers registers API endpoints with the provided mux
+		Cancel calls the cancel function to cancel the context
 		"""
-		_linksockslib.linksocks_APIHandler_RegisterHandlers(self.handle, mux.handle, goRun)
+		_linksockslib.linksocks_ContextWithCancel_Cancel(self.handle, goRun)
+	def Context(self):
+		"""Context() object
+		
+		Context returns the underlying context.Context
+		"""
+		return go.context_Context(handle=_linksockslib.linksocks_ContextWithCancel_Context(self.handle))
 
-# Python type for struct linksocks.ClientOption
-class ClientOption(go.GoClass):
-	"""ClientOption represents configuration options for LinkSocksClient\n"""
+# Python type for struct linksocks.DisconnectMessage
+class DisconnectMessage(go.GoClass):
+	"""DisconnectMessage represents a connection termination message\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -4777,14 +4416,238 @@ class ClientOption(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_ClientOption_CTor()
+			self.handle = _linksockslib.linksocks_DisconnectMessage_CTor()
 			_linksockslib.IncRef(self.handle)
 			if  0 < len(args):
-				self.WSURL = args[0]
-			if "WSURL" in kwargs:
-				self.WSURL = kwargs["WSURL"]
+				self.ChannelID = args[0]
+			if "ChannelID" in kwargs:
+				self.ChannelID = kwargs["ChannelID"]
 			if  1 < len(args):
-				self.Reverse = args[1]
+				self.Error = args[1]
+			if "Error" in kwargs:
+				self.Error = kwargs["Error"]
+	def __del__(self):
+		_linksockslib.DecRef(self.handle)
+	def __str__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'linksocks.DisconnectMessage{'
+		first = True
+		for v in pr:
+			if callable(v[1]):
+				continue
+			if first:
+				first = False
+			else:
+				sv += ', '
+			sv += v[0] + '=' + str(v[1])
+		return sv + '}'
+	def __repr__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'linksocks.DisconnectMessage ( '
+		for v in pr:
+			if not callable(v[1]):
+				sv += v[0] + '=' + str(v[1]) + ', '
+		return sv + ')'
+	@property
+	def ChannelID(self):
+		return go.uuid_UUID(handle=_linksockslib.linksocks_DisconnectMessage_ChannelID_Get(self.handle))
+	@property
+	def Error(self):
+		return _linksockslib.linksocks_DisconnectMessage_Error_Get(self.handle)
+	@Error.setter
+	def Error(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_DisconnectMessage_Error_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_DisconnectMessage_Error_Set(self.handle, value)
+	def GetType(self):
+		"""GetType() str"""
+		return _linksockslib.linksocks_DisconnectMessage_GetType(self.handle)
+
+# Python type for struct linksocks.TokenResponse
+class TokenResponse(go.GoClass):
+	"""TokenResponse represents the response for token operations\n"""
+	def __init__(self, *args, **kwargs):
+		"""
+		handle=A Go-side object is always initialized with an explicit handle=arg
+		otherwise parameters can be unnamed in order of field names or named fields
+		in which case a new Go object is constructed first
+		"""
+		if len(kwargs) == 1 and 'handle' in kwargs:
+			self.handle = kwargs['handle']
+			_linksockslib.IncRef(self.handle)
+		elif len(args) == 1 and isinstance(args[0], go.GoClass):
+			self.handle = args[0].handle
+			_linksockslib.IncRef(self.handle)
+		else:
+			self.handle = _linksockslib.linksocks_TokenResponse_CTor()
+			_linksockslib.IncRef(self.handle)
+			if  0 < len(args):
+				self.Success = args[0]
+			if "Success" in kwargs:
+				self.Success = kwargs["Success"]
+			if  1 < len(args):
+				self.Token = args[1]
+			if "Token" in kwargs:
+				self.Token = kwargs["Token"]
+			if  2 < len(args):
+				self.Port = args[2]
+			if "Port" in kwargs:
+				self.Port = kwargs["Port"]
+			if  3 < len(args):
+				self.Error = args[3]
+			if "Error" in kwargs:
+				self.Error = kwargs["Error"]
+	def __del__(self):
+		_linksockslib.DecRef(self.handle)
+	def __str__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'linksocks.TokenResponse{'
+		first = True
+		for v in pr:
+			if callable(v[1]):
+				continue
+			if first:
+				first = False
+			else:
+				sv += ', '
+			sv += v[0] + '=' + str(v[1])
+		return sv + '}'
+	def __repr__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'linksocks.TokenResponse ( '
+		for v in pr:
+			if not callable(v[1]):
+				sv += v[0] + '=' + str(v[1]) + ', '
+		return sv + ')'
+	@property
+	def Success(self):
+		return _linksockslib.linksocks_TokenResponse_Success_Get(self.handle)
+	@Success.setter
+	def Success(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_TokenResponse_Success_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_TokenResponse_Success_Set(self.handle, value)
+	@property
+	def Token(self):
+		return _linksockslib.linksocks_TokenResponse_Token_Get(self.handle)
+	@Token.setter
+	def Token(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_TokenResponse_Token_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_TokenResponse_Token_Set(self.handle, value)
+	@property
+	def Port(self):
+		return _linksockslib.linksocks_TokenResponse_Port_Get(self.handle)
+	@Port.setter
+	def Port(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_TokenResponse_Port_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_TokenResponse_Port_Set(self.handle, value)
+	@property
+	def Error(self):
+		return _linksockslib.linksocks_TokenResponse_Error_Get(self.handle)
+	@Error.setter
+	def Error(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_TokenResponse_Error_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_TokenResponse_Error_Set(self.handle, value)
+
+# Python type for struct linksocks.ReverseTokenStatus
+class ReverseTokenStatus(TokenStatus):
+	"""ReverseTokenStatus represents the status of a reverse token\n"""
+	def __init__(self, *args, **kwargs):
+		"""
+		handle=A Go-side object is always initialized with an explicit handle=arg
+		otherwise parameters can be unnamed in order of field names or named fields
+		in which case a new Go object is constructed first
+		"""
+		if len(kwargs) == 1 and 'handle' in kwargs:
+			self.handle = kwargs['handle']
+			_linksockslib.IncRef(self.handle)
+		elif len(args) == 1 and isinstance(args[0], go.GoClass):
+			self.handle = args[0].handle
+			_linksockslib.IncRef(self.handle)
+		else:
+			self.handle = _linksockslib.linksocks_ReverseTokenStatus_CTor()
+			_linksockslib.IncRef(self.handle)
+			if  1 < len(args):
+				self.Port = args[1]
+			if "Port" in kwargs:
+				self.Port = kwargs["Port"]
+			if  2 < len(args):
+				self.ConnectorTokens = args[2]
+			if "ConnectorTokens" in kwargs:
+				self.ConnectorTokens = kwargs["ConnectorTokens"]
+	def __del__(self):
+		_linksockslib.DecRef(self.handle)
+	def __str__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'linksocks.ReverseTokenStatus{'
+		first = True
+		for v in pr:
+			if callable(v[1]):
+				continue
+			if first:
+				first = False
+			else:
+				sv += ', '
+			sv += v[0] + '=' + str(v[1])
+		return sv + '}'
+	def __repr__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'linksocks.ReverseTokenStatus ( '
+		for v in pr:
+			if not callable(v[1]):
+				sv += v[0] + '=' + str(v[1]) + ', '
+		return sv + ')'
+	@property
+	def Port(self):
+		return _linksockslib.linksocks_ReverseTokenStatus_Port_Get(self.handle)
+	@Port.setter
+	def Port(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_ReverseTokenStatus_Port_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_ReverseTokenStatus_Port_Set(self.handle, value)
+	@property
+	def ConnectorTokens(self):
+		return go.Slice_string(handle=_linksockslib.linksocks_ReverseTokenStatus_ConnectorTokens_Get(self.handle))
+	@ConnectorTokens.setter
+	def ConnectorTokens(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_ReverseTokenStatus_ConnectorTokens_Set(self.handle, value.handle)
+		else:
+			raise TypeError("supplied argument type {t} is not a go.GoClass".format(t=type(value)))
+
+# Python type for struct linksocks.ClientOption
+class ClientOption(go.GoClass):
+	"""ClientOption represents configuration options for LinkSocksClient\n"""
+	def __init__(self, *args, **kwargs):
+		"""
+		handle=A Go-side object is always initialized with an explicit handle=arg
+		otherwise parameters can be unnamed in order of field names or named fields
+		in which case a new Go object is constructed first
+		"""
+		if len(kwargs) == 1 and 'handle' in kwargs:
+			self.handle = kwargs['handle']
+			_linksockslib.IncRef(self.handle)
+		elif len(args) == 1 and isinstance(args[0], go.GoClass):
+			self.handle = args[0].handle
+			_linksockslib.IncRef(self.handle)
+		else:
+			self.handle = _linksockslib.linksocks_ClientOption_CTor()
+			_linksockslib.IncRef(self.handle)
+			if  0 < len(args):
+				self.WSURL = args[0]
+			if "WSURL" in kwargs:
+				self.WSURL = kwargs["WSURL"]
+			if  1 < len(args):
+				self.Reverse = args[1]
 			if "Reverse" in kwargs:
 				self.Reverse = kwargs["Reverse"]
 			if  2 < len(args):
@@ -5157,9 +5020,9 @@ class ClientOption(go.GoClass):
 		"""
 		return ClientOption(handle=_linksockslib.linksocks_ClientOption_WithNoEnvProxy(self.handle, noEnvProxy))
 
-# Python type for struct linksocks.DisconnectMessage
-class DisconnectMessage(go.GoClass):
-	"""DisconnectMessage represents a connection termination message\n"""
+# Python type for struct linksocks.LogEntry
+class LogEntry(go.GoClass):
+	"""LogEntry represents a single log entry with metadata\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -5173,21 +5036,25 @@ class DisconnectMessage(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_DisconnectMessage_CTor()
+			self.handle = _linksockslib.linksocks_LogEntry_CTor()
 			_linksockslib.IncRef(self.handle)
 			if  0 < len(args):
-				self.ChannelID = args[0]
-			if "ChannelID" in kwargs:
-				self.ChannelID = kwargs["ChannelID"]
+				self.LoggerID = args[0]
+			if "LoggerID" in kwargs:
+				self.LoggerID = kwargs["LoggerID"]
 			if  1 < len(args):
-				self.Error = args[1]
-			if "Error" in kwargs:
-				self.Error = kwargs["Error"]
+				self.Message = args[1]
+			if "Message" in kwargs:
+				self.Message = kwargs["Message"]
+			if  2 < len(args):
+				self.Time = args[2]
+			if "Time" in kwargs:
+				self.Time = kwargs["Time"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.DisconnectMessage{'
+		sv = 'linksocks.LogEntry{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -5200,142 +5067,42 @@ class DisconnectMessage(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.DisconnectMessage ( '
+		sv = 'linksocks.LogEntry ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
 	@property
-	def ChannelID(self):
-		return go.uuid_UUID(handle=_linksockslib.linksocks_DisconnectMessage_ChannelID_Get(self.handle))
-	@property
-	def Error(self):
-		return _linksockslib.linksocks_DisconnectMessage_Error_Get(self.handle)
-	@Error.setter
-	def Error(self, value):
+	def LoggerID(self):
+		return _linksockslib.linksocks_LogEntry_LoggerID_Get(self.handle)
+	@LoggerID.setter
+	def LoggerID(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_DisconnectMessage_Error_Set(self.handle, value.handle)
+			_linksockslib.linksocks_LogEntry_LoggerID_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_DisconnectMessage_Error_Set(self.handle, value)
-	def GetType(self):
-		"""GetType() str"""
-		return _linksockslib.linksocks_DisconnectMessage_GetType(self.handle)
-
-# Python type for struct linksocks.DynamicForwarder
-class DynamicForwarder(go.GoClass):
-	"""DynamicForwarder handles dynamic batching and sending of network data\n"""
-	def __init__(self, *args, **kwargs):
-		"""
-		handle=A Go-side object is always initialized with an explicit handle=arg
-		otherwise parameters can be unnamed in order of field names or named fields
-		in which case a new Go object is constructed first
-		"""
-		if len(kwargs) == 1 and 'handle' in kwargs:
-			self.handle = kwargs['handle']
-			_linksockslib.IncRef(self.handle)
-		elif len(args) == 1 and isinstance(args[0], go.GoClass):
-			self.handle = args[0].handle
-			_linksockslib.IncRef(self.handle)
+			_linksockslib.linksocks_LogEntry_LoggerID_Set(self.handle, value)
+	@property
+	def Message(self):
+		return _linksockslib.linksocks_LogEntry_Message_Get(self.handle)
+	@Message.setter
+	def Message(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_LogEntry_Message_Set(self.handle, value.handle)
 		else:
-			self.handle = _linksockslib.linksocks_DynamicForwarder_CTor()
-			_linksockslib.IncRef(self.handle)
-	def __del__(self):
-		_linksockslib.DecRef(self.handle)
-	def __str__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.DynamicForwarder{'
-		first = True
-		for v in pr:
-			if callable(v[1]):
-				continue
-			if first:
-				first = False
-			else:
-				sv += ', '
-			sv += v[0] + '=' + str(v[1])
-		return sv + '}'
-	def __repr__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.DynamicForwarder ( '
-		for v in pr:
-			if not callable(v[1]):
-				sv += v[0] + '=' + str(v[1]) + ', '
-		return sv + ')'
-	def ProcessReads(self, conn, goRun=False):
-		"""ProcessReads(object conn) 
-		
-		ProcessReads handles reading from a network connection and forwarding to WebSocket with dynamic batching
-		"""
-		_linksockslib.linksocks_DynamicForwarder_ProcessReads(self.handle, conn.handle, goRun)
-	def ProcessReadsImmediate(self, conn, goRun=False):
-		"""ProcessReadsImmediate(object conn) 
-		
-		processReadsImmediate handles reading directly without batching
-		"""
-		_linksockslib.linksocks_DynamicForwarder_ProcessReadsImmediate(self.handle, conn.handle, goRun)
-	def ProcessUDPReads(self, conn, goRun=False):
-		"""ProcessUDPReads(object conn) 
-		
-		ProcessUDPReads handles reading from a UDP connection with appropriate metadata
-		"""
-		_linksockslib.linksocks_DynamicForwarder_ProcessUDPReads(self.handle, conn.handle, goRun)
-
-# Python type for struct linksocks.SocketManager
-class SocketManager(go.GoClass):
-	"""SocketManager manages socket lifecycle and reuse\n"""
-	def __init__(self, *args, **kwargs):
-		"""
-		handle=A Go-side object is always initialized with an explicit handle=arg
-		otherwise parameters can be unnamed in order of field names or named fields
-		in which case a new Go object is constructed first
-		"""
-		if len(kwargs) == 1 and 'handle' in kwargs:
-			self.handle = kwargs['handle']
-			_linksockslib.IncRef(self.handle)
-		elif len(args) == 1 and isinstance(args[0], go.GoClass):
-			self.handle = args[0].handle
-			_linksockslib.IncRef(self.handle)
+			_linksockslib.linksocks_LogEntry_Message_Set(self.handle, value)
+	@property
+	def Time(self):
+		return _linksockslib.linksocks_LogEntry_Time_Get(self.handle)
+	@Time.setter
+	def Time(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_LogEntry_Time_Set(self.handle, value.handle)
 		else:
-			self.handle = _linksockslib.linksocks_SocketManager_CTor()
-			_linksockslib.IncRef(self.handle)
-	def __del__(self):
-		_linksockslib.DecRef(self.handle)
-	def __str__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.SocketManager{'
-		first = True
-		for v in pr:
-			if callable(v[1]):
-				continue
-			if first:
-				first = False
-			else:
-				sv += ', '
-			sv += v[0] + '=' + str(v[1])
-		return sv + '}'
-	def __repr__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.SocketManager ( '
-		for v in pr:
-			if not callable(v[1]):
-				sv += v[0] + '=' + str(v[1]) + ', '
-		return sv + ')'
-	def GetListener(self, port):
-		"""GetListener(int port) object, str"""
-		return go.net_Listener(handle=_linksockslib.linksocks_SocketManager_GetListener(self.handle, port))
-	def ReleaseListener(self, port, goRun=False):
-		"""ReleaseListener(int port) """
-		_linksockslib.linksocks_SocketManager_ReleaseListener(self.handle, port, goRun)
-	def Close(self, goRun=False):
-		"""Close() 
-		
-		Close closes all managed sockets immediately
-		"""
-		_linksockslib.linksocks_SocketManager_Close(self.handle, goRun)
+			_linksockslib.linksocks_LogEntry_Time_Set(self.handle, value)
 
-# Python type for struct linksocks.TokenResponse
-class TokenResponse(go.GoClass):
-	"""TokenResponse represents the response for token operations\n"""
+# Python type for struct linksocks.RelayOption
+class RelayOption(go.GoClass):
+	"""RelayOption contains configuration options for Relay\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -5349,29 +5116,65 @@ class TokenResponse(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_TokenResponse_CTor()
+			self.handle = _linksockslib.linksocks_RelayOption_CTor()
 			_linksockslib.IncRef(self.handle)
 			if  0 < len(args):
-				self.Success = args[0]
-			if "Success" in kwargs:
-				self.Success = kwargs["Success"]
+				self.BufferSize = args[0]
+			if "BufferSize" in kwargs:
+				self.BufferSize = kwargs["BufferSize"]
 			if  1 < len(args):
-				self.Token = args[1]
-			if "Token" in kwargs:
-				self.Token = kwargs["Token"]
+				self.ChannelTimeout = args[1]
+			if "ChannelTimeout" in kwargs:
+				self.ChannelTimeout = kwargs["ChannelTimeout"]
 			if  2 < len(args):
-				self.Port = args[2]
-			if "Port" in kwargs:
-				self.Port = kwargs["Port"]
+				self.ConnectTimeout = args[2]
+			if "ConnectTimeout" in kwargs:
+				self.ConnectTimeout = kwargs["ConnectTimeout"]
 			if  3 < len(args):
-				self.Error = args[3]
-			if "Error" in kwargs:
-				self.Error = kwargs["Error"]
+				self.FastOpen = args[3]
+			if "FastOpen" in kwargs:
+				self.FastOpen = kwargs["FastOpen"]
+			if  4 < len(args):
+				self.UpstreamProxy = args[4]
+			if "UpstreamProxy" in kwargs:
+				self.UpstreamProxy = kwargs["UpstreamProxy"]
+			if  5 < len(args):
+				self.UpstreamUsername = args[5]
+			if "UpstreamUsername" in kwargs:
+				self.UpstreamUsername = kwargs["UpstreamUsername"]
+			if  6 < len(args):
+				self.UpstreamPassword = args[6]
+			if "UpstreamPassword" in kwargs:
+				self.UpstreamPassword = kwargs["UpstreamPassword"]
+			if  7 < len(args):
+				self.EnableDynamicBatching = args[7]
+			if "EnableDynamicBatching" in kwargs:
+				self.EnableDynamicBatching = kwargs["EnableDynamicBatching"]
+			if  8 < len(args):
+				self.MaxBatchWaitTime = args[8]
+			if "MaxBatchWaitTime" in kwargs:
+				self.MaxBatchWaitTime = kwargs["MaxBatchWaitTime"]
+			if  9 < len(args):
+				self.MinBatchWaitTime = args[9]
+			if "MinBatchWaitTime" in kwargs:
+				self.MinBatchWaitTime = kwargs["MinBatchWaitTime"]
+			if  10 < len(args):
+				self.HighSpeedThreshold = args[10]
+			if "HighSpeedThreshold" in kwargs:
+				self.HighSpeedThreshold = kwargs["HighSpeedThreshold"]
+			if  11 < len(args):
+				self.LowSpeedThreshold = args[11]
+			if "LowSpeedThreshold" in kwargs:
+				self.LowSpeedThreshold = kwargs["LowSpeedThreshold"]
+			if  12 < len(args):
+				self.CompressionThreshold = args[12]
+			if "CompressionThreshold" in kwargs:
+				self.CompressionThreshold = kwargs["CompressionThreshold"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.TokenResponse{'
+		sv = 'linksocks.RelayOption{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -5384,51 +5187,214 @@ class TokenResponse(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.TokenResponse ( '
+		sv = 'linksocks.RelayOption ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
 	@property
-	def Success(self):
-		return _linksockslib.linksocks_TokenResponse_Success_Get(self.handle)
-	@Success.setter
-	def Success(self, value):
+	def BufferSize(self):
+		"""BufferSize controls the size of reusable buffers
+		Larger values may improve performance but increase memory usage
+		"""
+		return _linksockslib.linksocks_RelayOption_BufferSize_Get(self.handle)
+	@BufferSize.setter
+	def BufferSize(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_TokenResponse_Success_Set(self.handle, value.handle)
+			_linksockslib.linksocks_RelayOption_BufferSize_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_TokenResponse_Success_Set(self.handle, value)
+			_linksockslib.linksocks_RelayOption_BufferSize_Set(self.handle, value)
 	@property
-	def Token(self):
-		return _linksockslib.linksocks_TokenResponse_Token_Get(self.handle)
-	@Token.setter
-	def Token(self, value):
+	def ChannelTimeout(self):
+		return _linksockslib.linksocks_RelayOption_ChannelTimeout_Get(self.handle)
+	@ChannelTimeout.setter
+	def ChannelTimeout(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_TokenResponse_Token_Set(self.handle, value.handle)
+			_linksockslib.linksocks_RelayOption_ChannelTimeout_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_TokenResponse_Token_Set(self.handle, value)
+			_linksockslib.linksocks_RelayOption_ChannelTimeout_Set(self.handle, value)
 	@property
-	def Port(self):
-		return _linksockslib.linksocks_TokenResponse_Port_Get(self.handle)
-	@Port.setter
-	def Port(self, value):
+	def ConnectTimeout(self):
+		return _linksockslib.linksocks_RelayOption_ConnectTimeout_Get(self.handle)
+	@ConnectTimeout.setter
+	def ConnectTimeout(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_TokenResponse_Port_Set(self.handle, value.handle)
+			_linksockslib.linksocks_RelayOption_ConnectTimeout_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_TokenResponse_Port_Set(self.handle, value)
+			_linksockslib.linksocks_RelayOption_ConnectTimeout_Set(self.handle, value)
 	@property
-	def Error(self):
-		return _linksockslib.linksocks_TokenResponse_Error_Get(self.handle)
-	@Error.setter
-	def Error(self, value):
+	def FastOpen(self):
+		"""FastOpen controls whether to wait for connect success response
+		When false, assumes connection success immediately
+		"""
+		return _linksockslib.linksocks_RelayOption_FastOpen_Get(self.handle)
+	@FastOpen.setter
+	def FastOpen(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_TokenResponse_Error_Set(self.handle, value.handle)
+			_linksockslib.linksocks_RelayOption_FastOpen_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_TokenResponse_Error_Set(self.handle, value)
+			_linksockslib.linksocks_RelayOption_FastOpen_Set(self.handle, value)
+	@property
+	def UpstreamProxy(self):
+		"""Upstream SOCKS5 proxy configuration
+		"""
+		return _linksockslib.linksocks_RelayOption_UpstreamProxy_Get(self.handle)
+	@UpstreamProxy.setter
+	def UpstreamProxy(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_RelayOption_UpstreamProxy_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_RelayOption_UpstreamProxy_Set(self.handle, value)
+	@property
+	def UpstreamUsername(self):
+		return _linksockslib.linksocks_RelayOption_UpstreamUsername_Get(self.handle)
+	@UpstreamUsername.setter
+	def UpstreamUsername(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_RelayOption_UpstreamUsername_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_RelayOption_UpstreamUsername_Set(self.handle, value)
+	@property
+	def UpstreamPassword(self):
+		return _linksockslib.linksocks_RelayOption_UpstreamPassword_Get(self.handle)
+	@UpstreamPassword.setter
+	def UpstreamPassword(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_RelayOption_UpstreamPassword_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_RelayOption_UpstreamPassword_Set(self.handle, value)
+	@property
+	def EnableDynamicBatching(self):
+		"""Adaptive batching configuration
+		"""
+		return _linksockslib.linksocks_RelayOption_EnableDynamicBatching_Get(self.handle)
+	@EnableDynamicBatching.setter
+	def EnableDynamicBatching(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_RelayOption_EnableDynamicBatching_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_RelayOption_EnableDynamicBatching_Set(self.handle, value)
+	@property
+	def MaxBatchWaitTime(self):
+		return _linksockslib.linksocks_RelayOption_MaxBatchWaitTime_Get(self.handle)
+	@MaxBatchWaitTime.setter
+	def MaxBatchWaitTime(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_RelayOption_MaxBatchWaitTime_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_RelayOption_MaxBatchWaitTime_Set(self.handle, value)
+	@property
+	def MinBatchWaitTime(self):
+		return _linksockslib.linksocks_RelayOption_MinBatchWaitTime_Get(self.handle)
+	@MinBatchWaitTime.setter
+	def MinBatchWaitTime(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_RelayOption_MinBatchWaitTime_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_RelayOption_MinBatchWaitTime_Set(self.handle, value)
+	@property
+	def HighSpeedThreshold(self):
+		"""HighSpeedThreshold defines the bytes/sec rate above which batch delay increases
+		"""
+		return _linksockslib.linksocks_RelayOption_HighSpeedThreshold_Get(self.handle)
+	@HighSpeedThreshold.setter
+	def HighSpeedThreshold(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_RelayOption_HighSpeedThreshold_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_RelayOption_HighSpeedThreshold_Set(self.handle, value)
+	@property
+	def LowSpeedThreshold(self):
+		"""LowSpeedThreshold defines the bytes/sec rate below which batch delay resets to zero
+		"""
+		return _linksockslib.linksocks_RelayOption_LowSpeedThreshold_Get(self.handle)
+	@LowSpeedThreshold.setter
+	def LowSpeedThreshold(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_RelayOption_LowSpeedThreshold_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_RelayOption_LowSpeedThreshold_Set(self.handle, value)
+	@property
+	def CompressionThreshold(self):
+		"""CompressionThreshold defines the data size in bytes above which compression is applied
+		"""
+		return _linksockslib.linksocks_RelayOption_CompressionThreshold_Get(self.handle)
+	@CompressionThreshold.setter
+	def CompressionThreshold(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_RelayOption_CompressionThreshold_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_RelayOption_CompressionThreshold_Set(self.handle, value)
+	def WithBufferSize(self, size):
+		"""WithBufferSize(int size) object
+		
+		WithBufferSize sets the buffer size for the relay
+		"""
+		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithBufferSize(self.handle, size))
+	def WithChannelTimeout(self, timeout):
+		"""WithChannelTimeout(long timeout) object
+		
+		WithChannelTimeout sets the channel timeout for the relay
+		"""
+		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithChannelTimeout(self.handle, timeout))
+	def WithConnectTimeout(self, timeout):
+		"""WithConnectTimeout(long timeout) object
+		
+		WithConnectTimeout sets the connect timeout for the relay
+		"""
+		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithConnectTimeout(self.handle, timeout))
+	def WithFastOpen(self, fastOpen):
+		"""WithFastOpen(bool fastOpen) object
+		
+		WithFastOpen sets the fast open mode for the relay
+		"""
+		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithFastOpen(self.handle, fastOpen))
+	def WithUpstreamProxy(self, proxy):
+		"""WithUpstreamProxy(str proxy) object
+		
+		WithUpstreamProxy sets the upstream SOCKS5 proxy
+		"""
+		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithUpstreamProxy(self.handle, proxy))
+	def WithUpstreamAuth(self, username, password):
+		"""WithUpstreamAuth(str username, str password) object
+		
+		WithUpstreamAuth sets the upstream SOCKS5 proxy authentication
+		"""
+		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithUpstreamAuth(self.handle, username, password))
+	def WithDynamicBatching(self, enabled):
+		"""WithDynamicBatching(bool enabled) object
+		
+		WithDynamicBatching enables or disables adaptive batching for SOCKS TCP
+		"""
+		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithDynamicBatching(self.handle, enabled))
+	def WithBatchingTimeLimits(self, min, max):
+		"""WithBatchingTimeLimits(long min, long max) object
+		
+		WithBatchingTimeLimits sets the min/max wait times for SOCKS TCP batching
+		"""
+		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithBatchingTimeLimits(self.handle, min, max))
+	def WithHighSpeedThreshold(self, threshold):
+		"""WithHighSpeedThreshold(float threshold) object
+		
+		WithHighSpeedThreshold sets the threshold for increasing batch delay
+		"""
+		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithHighSpeedThreshold(self.handle, threshold))
+	def WithLowSpeedThreshold(self, threshold):
+		"""WithLowSpeedThreshold(float threshold) object
+		
+		WithLowSpeedThreshold sets the threshold for reverting to immediate send
+		"""
+		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithLowSpeedThreshold(self.handle, threshold))
+	def WithCompressionThreshold(self, threshold):
+		"""WithCompressionThreshold(int threshold) object
+		
+		WithCompressionThreshold sets the threshold for enabling data compression
+		"""
+		return RelayOption(handle=_linksockslib.linksocks_RelayOption_WithCompressionThreshold(self.handle, threshold))
 
-# Python type for struct linksocks.ConnectorResponseMessage
-class ConnectorResponseMessage(go.GoClass):
-	"""ConnectorResponseMessage represents a connector management response\n"""
+# Python type for struct linksocks.ReverseTokenOptions
+class ReverseTokenOptions(go.GoClass):
+	"""ReverseTokenOptions represents configuration options for reverse token\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -5442,29 +5408,33 @@ class ConnectorResponseMessage(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_ConnectorResponseMessage_CTor()
+			self.handle = _linksockslib.linksocks_ReverseTokenOptions_CTor()
 			_linksockslib.IncRef(self.handle)
 			if  0 < len(args):
-				self.Success = args[0]
-			if "Success" in kwargs:
-				self.Success = kwargs["Success"]
+				self.Token = args[0]
+			if "Token" in kwargs:
+				self.Token = kwargs["Token"]
 			if  1 < len(args):
-				self.Error = args[1]
-			if "Error" in kwargs:
-				self.Error = kwargs["Error"]
+				self.Port = args[1]
+			if "Port" in kwargs:
+				self.Port = kwargs["Port"]
 			if  2 < len(args):
-				self.ChannelID = args[2]
-			if "ChannelID" in kwargs:
-				self.ChannelID = kwargs["ChannelID"]
+				self.Username = args[2]
+			if "Username" in kwargs:
+				self.Username = kwargs["Username"]
 			if  3 < len(args):
-				self.ConnectorToken = args[3]
-			if "ConnectorToken" in kwargs:
-				self.ConnectorToken = kwargs["ConnectorToken"]
+				self.Password = args[3]
+			if "Password" in kwargs:
+				self.Password = kwargs["Password"]
+			if  4 < len(args):
+				self.AllowManageConnector = args[4]
+			if "AllowManageConnector" in kwargs:
+				self.AllowManageConnector = kwargs["AllowManageConnector"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ConnectorResponseMessage{'
+		sv = 'linksocks.ReverseTokenOptions{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -5477,48 +5447,60 @@ class ConnectorResponseMessage(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ConnectorResponseMessage ( '
+		sv = 'linksocks.ReverseTokenOptions ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
 	@property
-	def Success(self):
-		return _linksockslib.linksocks_ConnectorResponseMessage_Success_Get(self.handle)
-	@Success.setter
-	def Success(self, value):
+	def Token(self):
+		return _linksockslib.linksocks_ReverseTokenOptions_Token_Get(self.handle)
+	@Token.setter
+	def Token(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ConnectorResponseMessage_Success_Set(self.handle, value.handle)
+			_linksockslib.linksocks_ReverseTokenOptions_Token_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_ConnectorResponseMessage_Success_Set(self.handle, value)
+			_linksockslib.linksocks_ReverseTokenOptions_Token_Set(self.handle, value)
 	@property
-	def Error(self):
-		return _linksockslib.linksocks_ConnectorResponseMessage_Error_Get(self.handle)
-	@Error.setter
-	def Error(self, value):
+	def Port(self):
+		return _linksockslib.linksocks_ReverseTokenOptions_Port_Get(self.handle)
+	@Port.setter
+	def Port(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ConnectorResponseMessage_Error_Set(self.handle, value.handle)
+			_linksockslib.linksocks_ReverseTokenOptions_Port_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_ConnectorResponseMessage_Error_Set(self.handle, value)
+			_linksockslib.linksocks_ReverseTokenOptions_Port_Set(self.handle, value)
 	@property
-	def ChannelID(self):
-		return go.uuid_UUID(handle=_linksockslib.linksocks_ConnectorResponseMessage_ChannelID_Get(self.handle))
+	def Username(self):
+		return _linksockslib.linksocks_ReverseTokenOptions_Username_Get(self.handle)
+	@Username.setter
+	def Username(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_ReverseTokenOptions_Username_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_ReverseTokenOptions_Username_Set(self.handle, value)
 	@property
-	def ConnectorToken(self):
-		return _linksockslib.linksocks_ConnectorResponseMessage_ConnectorToken_Get(self.handle)
-	@ConnectorToken.setter
-	def ConnectorToken(self, value):
+	def Password(self):
+		return _linksockslib.linksocks_ReverseTokenOptions_Password_Get(self.handle)
+	@Password.setter
+	def Password(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ConnectorResponseMessage_ConnectorToken_Set(self.handle, value.handle)
+			_linksockslib.linksocks_ReverseTokenOptions_Password_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_ConnectorResponseMessage_ConnectorToken_Set(self.handle, value)
-	def GetType(self):
-		"""GetType() str"""
-		return _linksockslib.linksocks_ConnectorResponseMessage_GetType(self.handle)
+			_linksockslib.linksocks_ReverseTokenOptions_Password_Set(self.handle, value)
+	@property
+	def AllowManageConnector(self):
+		return _linksockslib.linksocks_ReverseTokenOptions_AllowManageConnector_Get(self.handle)
+	@AllowManageConnector.setter
+	def AllowManageConnector(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_ReverseTokenOptions_AllowManageConnector_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_ReverseTokenOptions_AllowManageConnector_Set(self.handle, value)
 
-# Python type for struct linksocks.LinkSocksClient
-class LinkSocksClient(go.GoClass):
-	"""LinkSocksClient represents a SOCKS5 over WebSocket protocol client\n"""
+# Python type for struct linksocks.ConnectMessage
+class ConnectMessage(go.GoClass):
+	"""ConnectMessage represents a TCP connection request\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -5532,17 +5514,29 @@ class LinkSocksClient(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_LinkSocksClient_CTor()
+			self.handle = _linksockslib.linksocks_ConnectMessage_CTor()
 			_linksockslib.IncRef(self.handle)
+			if  0 < len(args):
+				self.Protocol = args[0]
+			if "Protocol" in kwargs:
+				self.Protocol = kwargs["Protocol"]
+			if  1 < len(args):
+				self.Address = args[1]
+			if "Address" in kwargs:
+				self.Address = kwargs["Address"]
 			if  2 < len(args):
-				self.IsConnected = args[2]
-			if "IsConnected" in kwargs:
-				self.IsConnected = kwargs["IsConnected"]
+				self.Port = args[2]
+			if "Port" in kwargs:
+				self.Port = kwargs["Port"]
+			if  3 < len(args):
+				self.ChannelID = args[3]
+			if "ChannelID" in kwargs:
+				self.ChannelID = kwargs["ChannelID"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.LinkSocksClient{'
+		sv = 'linksocks.ConnectMessage{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -5555,62 +5549,48 @@ class LinkSocksClient(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.LinkSocksClient ( '
+		sv = 'linksocks.ConnectMessage ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
 	@property
-	def IsConnected(self):
-		return _linksockslib.linksocks_LinkSocksClient_IsConnected_Get(self.handle)
-	@IsConnected.setter
-	def IsConnected(self, value):
+	def Protocol(self):
+		return _linksockslib.linksocks_ConnectMessage_Protocol_Get(self.handle)
+	@Protocol.setter
+	def Protocol(self, value):
 		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_LinkSocksClient_IsConnected_Set(self.handle, value.handle)
+			_linksockslib.linksocks_ConnectMessage_Protocol_Set(self.handle, value.handle)
 		else:
-			_linksockslib.linksocks_LinkSocksClient_IsConnected_Set(self.handle, value)
-	def WaitReady(self, ctx, timeout):
-		"""WaitReady(object ctx, long timeout) str
-		
-		WaitReady start the client and waits for the client to be ready with optional timeout
-		"""
-		return _linksockslib.linksocks_LinkSocksClient_WaitReady(self.handle, ctx.handle, timeout)
-	def Connect(self, ctx):
-		"""Connect(object ctx) str
-		
-		Connect starts the client operation
-		"""
-		return _linksockslib.linksocks_LinkSocksClient_Connect(self.handle, ctx.handle)
-	def Close(self, goRun=False):
-		"""Close() 
-		
-		Close gracefully shuts down the LinkSocksClient
-		"""
-		_linksockslib.linksocks_LinkSocksClient_Close(self.handle, goRun)
-	def AddConnector(self, connectorToken):
-		"""AddConnector(str connectorToken) str, str
-		
-		AddConnector sends a request to add a new connector token and waits for response.
-		This function is only available in reverse proxy mode.
-		"""
-		return _linksockslib.linksocks_LinkSocksClient_AddConnector(self.handle, connectorToken)
-	def RemoveConnector(self, connectorToken):
-		"""RemoveConnector(str connectorToken) str
-		
-		RemoveConnector sends a request to remove a connector token and waits for response.
-		This function is only available in reverse proxy mode.
-		"""
-		return _linksockslib.linksocks_LinkSocksClient_RemoveConnector(self.handle, connectorToken)
-	def GetPartnersCount(self):
-		"""GetPartnersCount() int
-		
-		GetPartnersCount returns the current number of partners
-		"""
-		return _linksockslib.linksocks_LinkSocksClient_GetPartnersCount(self.handle)
+			_linksockslib.linksocks_ConnectMessage_Protocol_Set(self.handle, value)
+	@property
+	def Address(self):
+		return _linksockslib.linksocks_ConnectMessage_Address_Get(self.handle)
+	@Address.setter
+	def Address(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_ConnectMessage_Address_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_ConnectMessage_Address_Set(self.handle, value)
+	@property
+	def Port(self):
+		return _linksockslib.linksocks_ConnectMessage_Port_Get(self.handle)
+	@Port.setter
+	def Port(self, value):
+		if isinstance(value, go.GoClass):
+			_linksockslib.linksocks_ConnectMessage_Port_Set(self.handle, value.handle)
+		else:
+			_linksockslib.linksocks_ConnectMessage_Port_Set(self.handle, value)
+	@property
+	def ChannelID(self):
+		return go.uuid_UUID(handle=_linksockslib.linksocks_ConnectMessage_ChannelID_Get(self.handle))
+	def GetType(self):
+		"""GetType() str"""
+		return _linksockslib.linksocks_ConnectMessage_GetType(self.handle)
 
-# Python type for struct linksocks.PartnersMessage
-class PartnersMessage(go.GoClass):
-	"""PartnersMessage represents a partners count update message\n"""
+# Python type for struct linksocks.LinkSocksServer
+class LinkSocksServer(go.GoClass):
+	"""LinkSocksServer represents a SOCKS5 over WebSocket protocol server\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -5624,17 +5604,13 @@ class PartnersMessage(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_PartnersMessage_CTor()
+			self.handle = _linksockslib.linksocks_LinkSocksServer_CTor()
 			_linksockslib.IncRef(self.handle)
-			if  0 < len(args):
-				self.Count = args[0]
-			if "Count" in kwargs:
-				self.Count = kwargs["Count"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.PartnersMessage{'
+		sv = 'linksocks.LinkSocksServer{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -5647,27 +5623,75 @@ class PartnersMessage(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.PartnersMessage ( '
+		sv = 'linksocks.LinkSocksServer ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
-	@property
-	def Count(self):
-		return _linksockslib.linksocks_PartnersMessage_Count_Get(self.handle)
-	@Count.setter
-	def Count(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_PartnersMessage_Count_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_PartnersMessage_Count_Set(self.handle, value)
-	def GetType(self):
-		"""GetType() str"""
-		return _linksockslib.linksocks_PartnersMessage_GetType(self.handle)
+	def AddReverseToken(self, opts):
+		"""AddReverseToken(object opts) object, str
+		
+		AddReverseToken adds a new token for reverse socks and assigns a port
+		"""
+		return ReverseTokenResult(handle=_linksockslib.linksocks_LinkSocksServer_AddReverseToken(self.handle, opts.handle))
+	def AddForwardToken(self, token):
+		"""AddForwardToken(str token) str, str
+		
+		AddForwardToken adds a new token for forward socks proxy
+		"""
+		return _linksockslib.linksocks_LinkSocksServer_AddForwardToken(self.handle, token)
+	def AddConnectorToken(self, connectorToken, reverseToken):
+		"""AddConnectorToken(str connectorToken, str reverseToken) str, str
+		
+		AddConnectorToken adds a new connector token that forwards requests to a reverse token
+		"""
+		return _linksockslib.linksocks_LinkSocksServer_AddConnectorToken(self.handle, connectorToken, reverseToken)
+	def RemoveToken(self, token):
+		"""RemoveToken(str token) bool
+		
+		RemoveToken removes a token and disconnects all its clients
+		"""
+		return _linksockslib.linksocks_LinkSocksServer_RemoveToken(self.handle, token)
+	def Serve(self, ctx):
+		"""Serve(object ctx) str
+		
+		Serve starts the WebSocket server and waits for clients
+		"""
+		return _linksockslib.linksocks_LinkSocksServer_Serve(self.handle, ctx.handle)
+	def WaitReady(self, ctx, timeout):
+		"""WaitReady(object ctx, long timeout) str
+		
+		WaitReady starts the server and waits for the server to be ready with optional timeout
+		"""
+		return _linksockslib.linksocks_LinkSocksServer_WaitReady(self.handle, ctx.handle, timeout)
+	def Close(self, goRun=False):
+		"""Close() 
+		
+		Close gracefully shuts down the LinkSocksServer
+		"""
+		_linksockslib.linksocks_LinkSocksServer_Close(self.handle, goRun)
+	def GetClientCount(self):
+		"""GetClientCount() int
+		
+		GetClientCount returns the total number of connected clients
+		"""
+		return _linksockslib.linksocks_LinkSocksServer_GetClientCount(self.handle)
+	def HasClients(self):
+		"""HasClients() bool
+		
+		HasClients returns true if there are any connected clients
+		"""
+		return _linksockslib.linksocks_LinkSocksServer_HasClients(self.handle)
+	def GetTokenClientCount(self, token):
+		"""GetTokenClientCount(str token) int
+		
+		GetTokenClientCount counts clients connected for a given token
+		"""
+		return _linksockslib.linksocks_LinkSocksServer_GetTokenClientCount(self.handle, token)
 
-# Python type for struct linksocks.ConnectResponseMessage
-class ConnectResponseMessage(go.GoClass):
-	"""ConnectResponseMessage represents a connection response\n"""
+# Python type for struct linksocks.SocketManager
+class SocketManager(go.GoClass):
+	"""SocketManager manages socket lifecycle and reuse\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -5681,25 +5705,13 @@ class ConnectResponseMessage(go.GoClass):
 			self.handle = args[0].handle
 			_linksockslib.IncRef(self.handle)
 		else:
-			self.handle = _linksockslib.linksocks_ConnectResponseMessage_CTor()
+			self.handle = _linksockslib.linksocks_SocketManager_CTor()
 			_linksockslib.IncRef(self.handle)
-			if  0 < len(args):
-				self.Success = args[0]
-			if "Success" in kwargs:
-				self.Success = kwargs["Success"]
-			if  1 < len(args):
-				self.Error = args[1]
-			if "Error" in kwargs:
-				self.Error = kwargs["Error"]
-			if  2 < len(args):
-				self.ChannelID = args[2]
-			if "ChannelID" in kwargs:
-				self.ChannelID = kwargs["ChannelID"]
 	def __del__(self):
 		_linksockslib.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ConnectResponseMessage{'
+		sv = 'linksocks.SocketManager{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -5712,35 +5724,23 @@ class ConnectResponseMessage(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'linksocks.ConnectResponseMessage ( '
+		sv = 'linksocks.SocketManager ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
-	@property
-	def Success(self):
-		return _linksockslib.linksocks_ConnectResponseMessage_Success_Get(self.handle)
-	@Success.setter
-	def Success(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ConnectResponseMessage_Success_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_ConnectResponseMessage_Success_Set(self.handle, value)
-	@property
-	def Error(self):
-		return _linksockslib.linksocks_ConnectResponseMessage_Error_Get(self.handle)
-	@Error.setter
-	def Error(self, value):
-		if isinstance(value, go.GoClass):
-			_linksockslib.linksocks_ConnectResponseMessage_Error_Set(self.handle, value.handle)
-		else:
-			_linksockslib.linksocks_ConnectResponseMessage_Error_Set(self.handle, value)
-	@property
-	def ChannelID(self):
-		return go.uuid_UUID(handle=_linksockslib.linksocks_ConnectResponseMessage_ChannelID_Get(self.handle))
-	def GetType(self):
-		"""GetType() str"""
-		return _linksockslib.linksocks_ConnectResponseMessage_GetType(self.handle)
+	def GetListener(self, port):
+		"""GetListener(int port) object, str"""
+		return go.net_Listener(handle=_linksockslib.linksocks_SocketManager_GetListener(self.handle, port))
+	def ReleaseListener(self, port, goRun=False):
+		"""ReleaseListener(int port) """
+		_linksockslib.linksocks_SocketManager_ReleaseListener(self.handle, port, goRun)
+	def Close(self, goRun=False):
+		"""Close() 
+		
+		Close closes all managed sockets immediately
+		"""
+		_linksockslib.linksocks_SocketManager_Close(self.handle, goRun)
 
 
 # ---- Slices ---
@@ -5750,162 +5750,162 @@ class ConnectResponseMessage(go.GoClass):
 
 
 # ---- Constructors ---
-def DefaultReverseTokenOptions():
-	"""DefaultReverseTokenOptions() object
-	
-	DefaultReverseTokenOptions returns default options for reverse token
-	"""
-	return ReverseTokenOptions(handle=_linksockslib.linksocks_DefaultReverseTokenOptions())
 def DefaultServerOption():
 	"""DefaultServerOption() object
 	
 	DefaultServerOption returns default server options
 	"""
 	return ServerOption(handle=_linksockslib.linksocks_DefaultServerOption())
-def NewWSConn(conn, label, logger):
-	"""NewWSConn(object conn, str label, object logger) object
-	
-	NewWSConn creates a new mutex-protected websocket connection
-	"""
-	return WSConn(handle=_linksockslib.linksocks_NewWSConn(conn.handle, label, logger.handle))
-def NewContextWithCancel():
-	"""NewContextWithCancel() object
+def NewPortPoolFromRange(start, end):
+	"""NewPortPoolFromRange(int start, int end) object
 	
-	NewContextWithCancel creates a new context from the global context
+	NewPortPoolFromRange creates a new port pool from a range of ports
 	"""
-	return ContextWithCancel(handle=_linksockslib.linksocks_NewContextWithCancel())
+	return PortPool(handle=_linksockslib.linksocks_NewPortPoolFromRange(start, end))
 def NewPortPool(ports):
 	"""NewPortPool([]int ports) object
 	
 	NewPortPool creates a new port pool from a slice of ports
 	"""
 	return PortPool(handle=_linksockslib.linksocks_NewPortPool(ports.handle))
-def NewPortPoolFromRange(start, end):
-	"""NewPortPoolFromRange(int start, int end) object
-	
-	NewPortPoolFromRange creates a new port pool from a range of ports
-	"""
-	return PortPool(handle=_linksockslib.linksocks_NewPortPoolFromRange(start, end))
 def NewRelay(logger, option):
 	"""NewRelay(object logger, object option) object
 	
 	NewRelay creates a new Relay instance
 	"""
 	return Relay(handle=_linksockslib.linksocks_NewRelay(logger.handle, option.handle))
-def NewDefaultRelayOption():
-	"""NewDefaultRelayOption() object
-	
-	NewDefaultRelayOption creates a RelayOption with default values
-	"""
-	return RelayOption(handle=_linksockslib.linksocks_NewDefaultRelayOption())
-def NewLinkSocksServer(opt):
-	"""NewLinkSocksServer(object opt) object
+def NewWSConn(conn, label, logger):
+	"""NewWSConn(object conn, str label, object logger) object
 	
-	NewLinkSocksServer creates a new LinkSocksServer instance
+	NewWSConn creates a new mutex-protected websocket connection
 	"""
-	return LinkSocksServer(handle=_linksockslib.linksocks_NewLinkSocksServer(opt.handle))
+	return WSConn(handle=_linksockslib.linksocks_NewWSConn(conn.handle, label, logger.handle))
 def NewCLI():
 	"""NewCLI() object
 	
 	NewCLI creates a new CLI instance
 	"""
 	return CLI(handle=_linksockslib.linksocks_NewCLI())
+def NewLinkSocksClient(token, opt):
+	"""NewLinkSocksClient(str token, object opt) object
+	
+	NewLinkSocksClient creates a new LinkSocksClient instance
+	"""
+	return LinkSocksClient(handle=_linksockslib.linksocks_NewLinkSocksClient(token, opt.handle))
 def NewAPIHandler(server, apiKey):
 	"""NewAPIHandler(object server, str apiKey) object
 	
 	NewAPIHandler creates a new API handler for the given server
 	"""
 	return APIHandler(handle=_linksockslib.linksocks_NewAPIHandler(server.handle, apiKey))
+def NewContextWithCancel():
+	"""NewContextWithCancel() object
+	
+	NewContextWithCancel creates a new context from the global context
+	"""
+	return ContextWithCancel(handle=_linksockslib.linksocks_NewContextWithCancel())
 def DefaultClientOption():
 	"""DefaultClientOption() object
 	
 	DefaultClientOption returns default client options
 	"""
 	return ClientOption(handle=_linksockslib.linksocks_DefaultClientOption())
+def NewDefaultRelayOption():
+	"""NewDefaultRelayOption() object
+	
+	NewDefaultRelayOption creates a RelayOption with default values
+	"""
+	return RelayOption(handle=_linksockslib.linksocks_NewDefaultRelayOption())
+def DefaultReverseTokenOptions():
+	"""DefaultReverseTokenOptions() object
+	
+	DefaultReverseTokenOptions returns default options for reverse token
+	"""
+	return ReverseTokenOptions(handle=_linksockslib.linksocks_DefaultReverseTokenOptions())
+def NewLinkSocksServer(opt):
+	"""NewLinkSocksServer(object opt) object
+	
+	NewLinkSocksServer creates a new LinkSocksServer instance
+	"""
+	return LinkSocksServer(handle=_linksockslib.linksocks_NewLinkSocksServer(opt.handle))
 def NewSocketManager(host, log):
 	"""NewSocketManager(str host, object log) object"""
 	return SocketManager(handle=_linksockslib.linksocks_NewSocketManager(host, log.handle))
-def NewLinkSocksClient(token, opt):
-	"""NewLinkSocksClient(str token, object opt) object
-	
-	NewLinkSocksClient creates a new LinkSocksClient instance
-	"""
-	return LinkSocksClient(handle=_linksockslib.linksocks_NewLinkSocksClient(token, opt.handle))
 
 
 # ---- Functions ---
-def GetLogEntries():
-	"""GetLogEntries() []object"""
-	return Slice_linksocks_LogEntry(handle=_linksockslib.linksocks_GetLogEntries())
-def SetLoggerGlobalLevel(level, goRun=False):
-	"""SetLoggerGlobalLevel(int level) 
+def CancelLogWaiters(goRun=False):
+	"""CancelLogWaiters() 
 	
-	SetLoggerGlobalLevel sets the global log level for all loggers
+	CancelLogWaiters cancels all waiting log listeners
 	"""
-	_linksockslib.linksocks_SetLoggerGlobalLevel(level, goRun)
-def NewLoggerWithID(id):
-	"""NewLoggerWithID(str id) object
+	_linksockslib.linksocks_CancelLogWaiters(goRun)
+def PackMessage(msg):
+	"""PackMessage(object msg) []int, str
 	
-	NewLoggerWithID creates a new zerolog.Logger that tags output with the given ID
+	PackMessage converts a message to binary format
 	"""
-	return go.zerolog_Logger(handle=_linksockslib.linksocks_NewLoggerWithID(id))
-def DebugLog(logger, msg, goRun=False):
-	"""DebugLog(object logger, str msg) 
+	return go.Slice_byte(handle=_linksockslib.linksocks_PackMessage(msg.handle))
+def WaitForLogEntries(timeoutMs):
+	"""WaitForLogEntries(long timeoutMs) []object"""
+	return Slice_linksocks_LogEntry(handle=_linksockslib.linksocks_WaitForLogEntries(timeoutMs))
+def NewContext():
+	"""NewContext() object
 	
-	DebugLog logs a debug message
+	NewContext creates a new context from the global context
 	"""
-	_linksockslib.linksocks_DebugLog(logger.handle, msg, goRun)
+	return go.context_Context(handle=_linksockslib.linksocks_NewContext())
 def NewLoggerWithIDAndLevel(id, level):
 	"""NewLoggerWithIDAndLevel(str id, int level) object
 	
 	NewLoggerWithIDAndLevel creates a new zerolog.Logger with specified level that tags output with the given ID
 	"""
 	return go.zerolog_Logger(handle=_linksockslib.linksocks_NewLoggerWithIDAndLevel(id, level))
-def NewLoggerWithLevel(level, cb):
-	"""NewLoggerWithLevel(int level, callable cb) object
-	
-	NewLoggerWithLevel creates a new zerolog.Logger with auto-generated ID and specified level
-	"""
-	return go.zerolog_Logger(handle=_linksockslib.linksocks_NewLoggerWithLevel(level, cb))
 def Background():
 	"""Background() object
 	
 	Background returns a global context
 	"""
 	return go.context_Context(handle=_linksockslib.linksocks_Background())
-def CancelGlobalContext(goRun=False):
-	"""CancelGlobalContext() 
+def DebugLog(logger, msg, goRun=False):
+	"""DebugLog(object logger, str msg) 
 	
-	CancelGlobalContext cancels the global context
+	DebugLog logs a debug message
 	"""
-	_linksockslib.linksocks_CancelGlobalContext(goRun)
+	_linksockslib.linksocks_DebugLog(logger.handle, msg, goRun)
+def GetLogEntries():
+	"""GetLogEntries() []object"""
+	return Slice_linksocks_LogEntry(handle=_linksockslib.linksocks_GetLogEntries())
 def NewLogger(cb):
 	"""NewLogger(callable cb) object
 	
 	NewLogger creates a new zerolog.Logger with auto-generated ID
 	"""
 	return go.zerolog_Logger(handle=_linksockslib.linksocks_NewLogger(cb))
-def CancelLogWaiters(goRun=False):
-	"""CancelLogWaiters() 
+def CancelGlobalContext(goRun=False):
+	"""CancelGlobalContext() 
 	
-	CancelLogWaiters cancels all waiting log listeners
+	CancelGlobalContext cancels the global context
 	"""
-	_linksockslib.linksocks_CancelLogWaiters(goRun)
-def NewContext():
-	"""NewContext() object
+	_linksockslib.linksocks_CancelGlobalContext(goRun)
+def NewLoggerWithID(id):
+	"""NewLoggerWithID(str id) object
 	
-	NewContext creates a new context from the global context
+	NewLoggerWithID creates a new zerolog.Logger that tags output with the given ID
 	"""
-	return go.context_Context(handle=_linksockslib.linksocks_NewContext())
-def PackMessage(msg):
-	"""PackMessage(object msg) []int, str
+	return go.zerolog_Logger(handle=_linksockslib.linksocks_NewLoggerWithID(id))
+def NewLoggerWithLevel(level, cb):
+	"""NewLoggerWithLevel(int level, callable cb) object
 	
-	PackMessage converts a message to binary format
+	NewLoggerWithLevel creates a new zerolog.Logger with auto-generated ID and specified level
 	"""
-	return go.Slice_byte(handle=_linksockslib.linksocks_PackMessage(msg.handle))
-def WaitForLogEntries(timeoutMs):
-	"""WaitForLogEntries(long timeoutMs) []object"""
-	return Slice_linksocks_LogEntry(handle=_linksockslib.linksocks_WaitForLogEntries(timeoutMs))
+	return go.zerolog_Logger(handle=_linksockslib.linksocks_NewLoggerWithLevel(level, cb))
+def SetLoggerGlobalLevel(level, goRun=False):
+	"""SetLoggerGlobalLevel(int level) 
+	
+	SetLoggerGlobalLevel sets the global log level for all loggers
+	"""
+	_linksockslib.linksocks_SetLoggerGlobalLevel(level, goRun)
 def ParseDuration(s):
 	"""ParseDuration(str s) long, str