complete TCP UDP support

Author: Neutree

COMTool/Main.py

@@ -28,15 +28,15 @@ def loadConfig():
     from i18n import _
     import version
     import utils_ui
-    from conn import Serial, ConnectionStatus
+    from conn import Serial, ConnectionStatus, TCP_UDP
     from plugins import plugins
     from widgets import TitleBar, CustomTitleBarWindowMixin, EventFilter
 except ImportError:
     from COMTool import helpAbout,autoUpdate, utils_ui
     from COMTool.Combobox import ComboBox
     from COMTool.i18n import _
     from COMTool import version
-    from COMTool.conn import Serial, ConnectionStatus
+    from COMTool.conn import Serial, ConnectionStatus, TCP_UDP
     from COMTool.plugins import plugins
     from .widgets import TitleBar, CustomTitleBarWindowMixin, EventFilter
 
@@ -75,21 +75,35 @@ def __init__(self,app, eventFilter, config):
         self.DataPath = parameters.dataPath
         self.config = config
         self.initVar()
-        self.initConn(self.config.basic["connId"], self.config.conns)
         self.initPlugins(self.config.basic["plugins"], self.config.basic["activePlugin"], self.config.plugins)
         self.initWindow()
+        self.initConn(self.config.basic["connId"], self.config.conns)
         self.uiLoadConfigs(self.config)
         self.initEvent()
         self.uiInitDone()
 
-    def __del__(self):
-        pass
+    def initVar(self):
+        self.strings = parameters.Strings(self.config.basic["locale"])
+        self.dataToSend = []
+        self.fileToSend = []
+        self.connSelectComboboxes = []
+        self.changingConn = False
+        self.connectionWidget = None
 
     def initConn(self, connId, configs):
         # get all conn info
-        self.connections = [Serial()]
+        self.connections = [Serial(), TCP_UDP()]
+        # add conn select combobox
+        self.changingConn = True
+        for i, conn in enumerate(self.connections):
+            for combobox in self.connSelectComboboxes:
+                combobox.addItem(conn.name)
+                if conn.id == connId:
+                    combobox.setCurrentIndex(i)
+        self.changingConn = False
         # init connections
-        for conn in self.connections:
+        activeConn = self.connections[0]
+        for i, conn in enumerate(self.connections):
             conn.onReceived = self.onReceived
             conn.configGlobal = self.config.basic
             conn.hintSignal.connect(self.showHint)
@@ -100,14 +114,11 @@ def initConn(self, connId, configs):
             else: # add new dict obj for conn to use
                 configs[conn.id] = config
             conn.onInit(config)
-        # init last used one
-        self.connection = None
-        for conn in self.connections:
+            conn.onWidget()
             if conn.id == connId:
-                self.connection = conn
-        if not self.connection:
-            self.connection = self.connections[0]
-
+                activeConn = conn
+        # init last used one
+        self.changeConn(activeConn)
 
     def initPlugins(self, enabled, activeId, configs):
         if not enabled:
@@ -117,6 +128,7 @@ def initPlugins(self, enabled, activeId, configs):
         for plugin in self.plugins:
             plugin.hintSignal = self.hintSignal
             plugin.send = self.sendData
+            plugin.isConnected = self.isConnected
             plugin.clearCountSignal = self.clearCountSignal
             plugin.reloadWindowSignal = self.reloadWindowSignal
             plugin.configGlobal = self.config.basic
@@ -145,29 +157,22 @@ def activePlugin(self, plugin):
         plugin.active = True
         parent = None
         if (not "main" in plugin.connParent) and plugin.connParent:
-            plugin.isConnected = self.connection.isConnected
             for pluginParent in self.plugins:
                 if pluginParent.id == plugin.connParent:
                     pluginParent.active = True
-                    pluginParent.isConnected = self.connection.isConnected
                     pluginParent.send = self.sendData
                     if not plugin in pluginParent.connChilds:
                         pluginParent.connChilds.append(plugin)
                     parent = pluginParent
                     break
             plugin.send = parent.sendData
         if not parent:
-            plugin.isConnected = self.connection.isConnected
             plugin.send = self.sendData
         self.config.basic["activePlugin"] = plugin.id
 
-    def initVar(self):
-        self.strings = parameters.Strings(self.config.basic["locale"])
-        self.dataToSend = []
-        self.fileToSend = []
-
     def uiInitDone(self):
-        self.connection.onUiInitDone()
+        for conn in self.connections:
+            conn.onUiInitDone()
         for plugin in self.plugins:
             plugin.onUiInitDone()
         # always hide functional, and show before init complete so we can get its width height
@@ -231,11 +236,21 @@ def addTabPanel(tabWidget, name, plugin, connectionWidget = None):
             settingLayout = QVBoxLayout()
             settingWidget.setLayout(settingLayout)
             #    connection settings
+            connSelectCommbox = ComboBox()
+            self.connSelectComboboxes.append(connSelectCommbox)
+            connSelectCommbox.currentIndexChanged.connect(self.onConnChanged)
             connSettingsGroupBox = QGroupBox(_("Connection"))
             layout = QVBoxLayout()
             connSettingsGroupBox.setLayout(layout)
+            layout.addWidget(connSelectCommbox)
+            layout.setContentsMargins(1, 6, 0, 0)
+            connectionWidgetWrapper = QWidget()
+            layout2 = QVBoxLayout()
+            layout2.setContentsMargins(0, 0, 0, 0)
+            connectionWidgetWrapper.setLayout(layout2)
+            layout.addWidget(connectionWidgetWrapper)
             if connectionWidget:
-                layout.addWidget(connectionWidget)
+                layout2.addWidget(connectionWidget)
             settingLayout.addWidget(connSettingsGroupBox)
             #  other settings
             widget = plugin.onWidgetSettings(settingLayout)
@@ -250,7 +265,7 @@ def addTabPanel(tabWidget, name, plugin, connectionWidget = None):
             contentWidget.setStretchFactor(0, 1)
             contentWidget.setStretchFactor(1, 2)
             contentWidget.setStretchFactor(2, 1)
-            return contentWidget, connSettingsGroupBox
+            return contentWidget, connectionWidgetWrapper
         self.tabWidget = QTabWidget()
         # self.contentLayout.setSpacing(0)
         # self.contentLayout.setContentsMargins(0,0,0,0)
@@ -278,17 +293,13 @@ def addTabPanel(tabWidget, name, plugin, connectionWidget = None):
         self.contentLayout.addWidget(self.tabWidget)
         # get widgets from plugins
             # widget main
-        self.connectionWidget = self.connection.onWidget()
         self.tabWidgets = []
         self.connParentWidgets = []
         for i, plugin in enumerate(self.plugins):
             active = False
             if plugin.id == self.config.basic["activePlugin"]:
                 active = True
-                conn = self.connectionWidget
-            else:
-                conn = None
-            w, connParent = addTabPanel(self.tabWidget, plugin.name, plugin, conn)
+            w, connParent = addTabPanel(self.tabWidget, plugin.name, plugin, None)
             self.tabWidgets.append(w)
             self.connParentWidgets.append(connParent)
             if active:
@@ -395,16 +406,49 @@ def bindVar(self, uiObj, varObj, varName: str, vtype=None, vErrorMsg="", checkVa
 
     def changeConnToTab(self, idx):
         print("-- switch to tab", idx)
+        # remove from old container
         parent = self.connectionWidget.parentWidget()
-        if parent.layout().indexOf(self.connectionWidget) >= 0:
-            parent.layout().removeWidget(self.connectionWidget)
+        parent.layout().removeWidget(self.connectionWidget)
+        # add to new container
         newParent = self.connParentWidgets[idx]
         newParent.layout().addWidget(self.connectionWidget)
         self.updateStyle(parent)
         self.updateStyle(newParent)
         self.activePlugin(self.plugins[idx])
 
-    def sendData(self, data_bytes=None, file_path=None, callback=lambda ok,msg:None):
+    def changeConn(self, connection:object):
+        # remove conn widget from the container
+        parent = None
+        if self.connectionWidget:
+            parent = self.connectionWidget.parentWidget()
+            parent.layout().removeWidget(self.connectionWidget)
+            self.connectionWidget.setParent(None)
+            self.updateStyle(parent)
+        # add new conn widget to container
+        self.connection = connection
+        self.connectionWidget = connection.widget
+        if not parent:
+            parent = self.connParentWidgets[self.tabWidget.currentIndex()]
+        parent.layout().addWidget(self.connectionWidget)
+        self.updateStyle(parent)
+
+    def onConnChanged(self, idx):
+        '''
+            combobox changed item
+        '''
+        if self.changingConn:
+            return
+        self.changingConn = True
+        # update all tab's connSelectCombobox widget show
+        for w in self.connSelectComboboxes:
+            w.setCurrentIndex(idx)
+        # change connection
+        print("-- change conn to", self.connections[idx].id)
+        self.changeConn(self.connections[idx])
+        self.config.basic["connId"] = self.connections[idx].id
+        self.changingConn = False
+
+    def sendData(self, data_bytes=None, file_path=None, callback=lambda ok, msg:None):
         if data_bytes:
             self.dataToSend.insert(0, (data_bytes, callback))
         if file_path:
@@ -422,6 +466,8 @@ def onReceived(self, data):
             if plugin.active:
                 plugin.onReceived(data)
 
+    def isConnected(self):
+        return self.connection.isConnected()
 
     def sendDataProcess(self):
         self.receiveProgressStop = False

COMTool/conn/__init__.py

@@ -1,4 +1,4 @@
 from .base import ConnectionStatus
 from .conn_serial import Serial
-
+from .conn_tcp_udp import TCP_UDP
 

COMTool/conn/base.py

@@ -25,10 +25,11 @@ class COMM(QObject):
     hintSignal = pyqtSignal(str, str, str)                    # hintSignal.emit(type(error, warning, info), title, msg)
     configGlobal = {}
     id = ""
+    name = ""
 
     def __init__(self) -> None:
         super().__init__()
-        if not self.id:
+        if (not self.id) or not self.name:
             raise ValueError(f"var id of {self} should be set")
 
     def onInit(self, config):

COMTool/conn/conn_serial.py

@@ -38,6 +38,7 @@ class Serial(COMM):
             getConfig
     '''
     id = "serial"
+    name = _("Serial")
     showSerialComboboxSignal = pyqtSignal(list)
     showSwitchSignal = pyqtSignal(ConnectionStatus)
     def onInit(self, config):
@@ -93,7 +94,7 @@ def onUiInitDone(self):
         self.detectSerialPort()
 
     def onWidget(self):
-        serialSetting = QWidget()
+        self.widget = QWidget()
         serialSettingsLayout = QGridLayout()
         serialPortLabek = QLabel(_("Port"))
         serailBaudrateLabel = QLabel(_("Baudrate"))
@@ -152,7 +153,7 @@ def onWidget(self):
         serialSettingsLayout.addWidget(self.checkBoxRTS, 6, 0,1,1)
         serialSettingsLayout.addWidget(self.checkBoxDTR, 6, 1,1,1)
         serialSettingsLayout.addWidget(self.serialOpenCloseButton, 7, 0,1,2)
-        serialSetting.setLayout(serialSettingsLayout)
+        self.widget.setLayout(serialSettingsLayout)
         self.widgetConfMap["port"]       = self.serialPortCombobox
         self.widgetConfMap["baudrate"]    = self.serailBaudrateCombobox
         self.widgetConfMap["bytesize"]    = self.serailBytesCombobox
@@ -162,8 +163,7 @@ def onWidget(self):
         self.widgetConfMap["rts"]         = self.checkBoxRTS
         self.widgetConfMap["dtr"]         = self.checkBoxDTR
         self.initEvet()
-        self.widget = serialSetting
-        return serialSetting
+        return self.widget
 
     def initEvet(self):
         self.serialPortCombobox.clicked.connect(self.detectSerialPort)

COMTool/conn/conn_tcp_udp.py

@@ -38,6 +38,7 @@ class TCP_UDP(COMM):
             getConfig
     '''
     id = "tcp_udp"
+    name = "TCP UDP"
     showSwitchSignal = pyqtSignal(ConnectionStatus)
     updateTargetSignal = pyqtSignal(str)
     updateClientsSignal = pyqtSignal(bool, tuple)
@@ -286,6 +287,7 @@ def setSerialConfig(self, conf_type, obj, value):
                 self.changeMode("client", init=True)
             else:
                 obj.setChecked(False)
+                self.modeServerRadioBtn.setChecked(True)
                 self.changeMode("server", init=True)
         elif conf_type == "target":
             for i, target in enumerate(self.config["target"][1]):
@@ -454,6 +456,10 @@ def receiveDataProcess(self, conn, remote_addr:tuple = None):
         t = 0
         conn.settimeout(0.1)
         protocolIsTcp = self.config["protocol"] == "tcp"
+        modeIsServer = self.config["mode"] == "server"
+        remoteStr = ""
+        if remote_addr:
+            remoteStr = f'{remote_addr[0]}:{remote_addr[1]}'
         while self.status != ConnectionStatus.CLOSED:
             if waitingReconnect:
                 try:
@@ -478,6 +484,9 @@ def receiveDataProcess(self, conn, remote_addr:tuple = None):
                 try:
                     if protocolIsTcp:
                         data = conn.recv(4096)
+                        # ignore not selected target's msg
+                        if modeIsServer and self.serverModeSelectedClient and (remoteStr != self.serverModeSelectedClient):
+                            data = None
                     else:
                         data, target = conn.recvfrom(4096)
                     if data == b'': # closed by peer(peer send FIN, now we can close this connection)
@@ -500,9 +509,9 @@ def receiveDataProcess(self, conn, remote_addr:tuple = None):
                     buffer = b''
             except Exception as e:
                 print("-- recv error:", e, type(e))
-                if not self.config["auto_reconnect"]:
+                if modeIsServer or not self.config["auto_reconnect"]:
                     over = False
-                    if self.config["protocol"] == "tcp" and self.config["mode"] == "server":
+                    if protocolIsTcp and modeIsServer:
                         self.onConnectionStatus.emit(ConnectionStatus.CLOSED, _("Connection") + f' {remote_addr[0]}:{remote_addr[1]} ' + _("closed!"))
                         over = True
                     else:

COMTool/version.py

@@ -1,7 +1,7 @@
 
 major = 2
-minor = 3
-dev   = 2
+minor = 4
+dev   = 0
 
 __version__ = "{}.{}.{}".format(major, minor, dev)