- improves WebSocket performance for slow servers

- fixes settings issue related to scales configurations (Issue #1847)

Author: MAKOMO

src/Info.plist

@@ -120,7 +120,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.4</string>
+	<string>3.1.5</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -131,7 +131,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>Artisan 3.1.4</string>
+	<string>Artisan 3.1.5</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSArchitecturePriority</key>

src/artisanlib/kaleido.py

@@ -235,6 +235,7 @@ async def ws_write(self, websocket: 'ClientConnection', message: str) -> None:
         if self._logging:
             _log.info('write: %s',message)
         await websocket.send(message)
+        await asyncio.sleep(0.1)  # yield control to the event loop
 
     async def ws_handle_writes(self, websocket: 'ClientConnection', queue: 'asyncio.Queue[str]') -> None:
         message = await queue.get()
@@ -305,7 +306,14 @@ async def ws_connect(self, mode:str, host:str, port:int, path:str,
                         done, pending = await asyncio.wait([read_handler, write_handler], return_when=asyncio.FIRST_COMPLETED)
 
                         _log.debug('disconnected')
+                        for task in pending:
+                            task.cancel()
+                        for task in done:
+                            exception = task.exception()
+                            if isinstance(exception, Exception):
+                                raise exception
                     except websockets.ConnectionClosed:
+                        _log.debug('reconnecting')
                         continue
                     finally:
                         for task in pending:

src/artisanlib/main.py

@@ -17578,7 +17578,7 @@ def settingsLoad(self, filename:Optional[str] = None, theme:bool = False, machin
             self.qmc.phasesLCDmode = toInt(settings.value('phasesLCDmode',self.qmc.phasesLCDmode))
             if settings.contains('step100temp'):
                 try:
-                    self.qmc.step100temp = int(settings.value('step100temp',self.qmc.step100temp))
+                    self.qmc.step100temp = toInt(settings.value('step100temp',self.qmc.step100temp))
                 except Exception: # pylint: disable=broad-except
                     self.qmc.step100temp = None
             # Important - this must come after the code that restores phasesLCDmode
@@ -18643,13 +18643,37 @@ def settingsLoad(self, filename:Optional[str] = None, theme:bool = False, machin
 #--- BEGIN GROUP Scales
             # Scales
             settings.beginGroup('Scales')
-            self.scale1_model = settings.value('scale1_model',self.scale1_model)
-            self.scale1_name = settings.value('scale1_name',self.scale1_name)
-            self.scale1_id = settings.value('scale1_id',self.scale1_id)
+            if settings.contains('scale1_model'):
+                try:
+                    self.scale1_model = toInt(settings.value('scale1_model',self.scale1_model))
+                except Exception: # pylint: disable=broad-except
+                    self.scale1_model = None
+            if settings.contains('scale1_name'):
+                try:
+                    self.scale1_name = toString(settings.value('scale1_name',self.scale1_name))
+                except Exception: # pylint: disable=broad-except
+                    self.scale1_name = None
+            if settings.contains('scale1_id'):
+                try:
+                    self.scale1_id = settings.value('scale1_id',self.scale1_id)
+                except Exception: # pylint: disable=broad-except
+                    self.scale1_id = None
             self.container1_idx = toInt(settings.value('container1_idx',int(self.container1_idx)))
-            self.scale2_model = settings.value('scale2_model',self.scale2_model)
-            self.scale2_name = settings.value('scale2_name',self.scale2_name)
-            self.scale2_id = settings.value('scale2_id',self.scale2_id)
+            if settings.contains('scale2_model'):
+                try:
+                    self.scale2_model = toInt(settings.value('scale2_model',self.scale2_model))
+                except Exception: # pylint: disable=broad-except
+                    self.scale2_model = None
+            if settings.contains('scale2_name'):
+                try:
+                    self.scale2_name = toString(settings.value('scale2_name',self.scale2_name))
+                except Exception: # pylint: disable=broad-except
+                    self.scale2_name = None
+            if settings.contains('scale2_id'):
+                try:
+                    self.scale2_id = settings.value('scale2_id',self.scale2_id)
+                except Exception: # pylint: disable=broad-except
+                    self.scale2_id = None
             self.container2_idx = toInt(settings.value('container2_idx',int(self.container2_idx)))
             settings.endGroup()
 #--- END GROUP Scales

src/artisanlib/wsport.py

@@ -45,7 +45,7 @@ class wsport:
 
     __slots__ = [ 'aw', '_loop', '_thread', '_write_queue', 'default_host', 'host', 'port', 'path', 'machineID', 'lastReadResult', 'channels', 'readings', 'tx',
                     'channel_requests', 'channel_nodes', 'channel_modes', 'connect_timeout', 'request_timeout', 'compression',
-                    'reconnect_interval', 'ping_interval', 'ping_timeout', 'id_node', 'machine_node',
+                    'reconnect_interval', '_ping_interval', '_ping_timeout', 'id_node', 'machine_node',
                     'command_node', 'data_node', 'pushMessage_node', 'request_data_command', 'charge_message', 'drop_message', 'addEvent_message', 'event_node',
                     'DRY_node', 'FCs_node', 'FCe_node', 'SCs_node', 'SCe_node', 'STARTonCHARGE', 'OFFonDROP', 'open_event', 'pending_events',
                     'ws', 'wst' ]
@@ -79,12 +79,12 @@ def __init__(self, aw:'ApplicationWindow') -> None:
         self.channel_modes:List[int] = [0]*self.channels # temp mode is an int here, 0:__,1:C,2:F
 
         # configurable via the UI:
-        self.connect_timeout:float = 4    # in seconds
-        self.request_timeout:float = 0.5  # in seconds
-        self.reconnect_interval:float = 2 # in seconds # not used for now
+        self.connect_timeout:float = 4      # in seconds (websockets default is 10)
+        self.request_timeout:float = 0.5    # in seconds
+        self.reconnect_interval:float = 0.2 # in seconds # not used for now (reconnect delay)
         # not configurable via the UI:
-        self.ping_interval:float = 0      # in seconds; if 0 pings are not send automatically
-        self.ping_timeout:Optional[float] = None    # in seconds
+        self._ping_interval:Optional[float] = 20     # in seconds; None disables keepalive (default is 20)
+        self._ping_timeout:Optional[float] = 20      # in seconds; None disables timeouts (default is 20)
 
         # JSON nodes
         self.id_node:str = 'id'
@@ -256,6 +256,7 @@ async def producer_handler(self, websocket:'ClientConnection') -> None:
             message = await self.producer()
             if message is not None:
                 await websocket.send(message)
+                await asyncio.sleep(0.1)  # yield control to the event loop
 
 
     # if serial settings are given, host/port are ignore and communication is handled by the given serial port
@@ -273,8 +274,11 @@ async def connect(self) -> None:
                     hostport = f'{self.host}:{self.port}'
                 async for websocket in websockets.connect(
                         f'ws://{hostport}/{self.path}',
-                        compression=('deflate' if self.compression else None),
-                        origin=websockets.Origin(f'http://{socket.gethostname()}'),
+                        open_timeout = self.connect_timeout,
+                        ping_interval = self._ping_interval,
+                        ping_timeout = self._ping_timeout,
+                        compression = ('deflate' if self.compression else None),
+                        origin = websockets.Origin(f'http://{socket.gethostname()}'),
                         user_agent_header = f'Artisan/{__version__} websockets'):
                     done: Set[asyncio.Task[Any]] = set()
                     pending: Set[asyncio.Task[Any]] = set()
@@ -288,15 +292,28 @@ async def connect(self) -> None:
                             [consumer_task, producer_task],
                             return_when=asyncio.FIRST_COMPLETED,
                         )
+                        _log.debug('disconnected')
+                        for task in pending:
+                            task.cancel()
+                        for task in done:
+                            exception = task.exception()
+                            if isinstance(exception, Exception):
+                                raise exception
                     except websockets.ConnectionClosed:
+                        _log.debug('ConnectionClosed exception')
                         continue
+                    except Exception as e: # pylint: disable=broad-except
+                        _log.exception(e)
                     finally:
                         for task in pending:
                             task.cancel()
                         for task in done:
                             exception = task.exception()
                             if isinstance(exception, Exception):
                                 raise exception
+                    _log.debug('reconnecting')
+                    self.aw.sendmessageSignal.emit(QApplication.translate('Message', '{} disconnected').format('WebSocket'),True,None)
+                    await asyncio.sleep(0.1)
             except asyncio.TimeoutError:
                 _log.info('connection timeout')
             except Exception as e: # pylint: disable=broad-except

src/requirements-dev.txt

@@ -13,8 +13,8 @@ types-docutils>=0.21.0.20241128
 lxml-stubs>=0.5.1
 mypy==1.15.0
 pyright==1.1.400
-ruff>=0.11.7
-pylint==3.3.6
+ruff>=0.11.8
+pylint==3.3.7
 pre-commit>=4.2.0
 pytest>=8.3.5
 pytest-cov==6.1.1

src/requirements.txt

@@ -36,7 +36,7 @@ python-snap7==2.0.2; python_version >= '3.10'
 Phidget22==1.22.20250422
 Unidecode==1.3.8
 qrcode==7.4.2;  python_version < '3.9' # last Python 3.8 release
-qrcode==8.1; python_version >= '3.9'
+qrcode==8.2; python_version >= '3.9'
 requests==2.32.3
 requests-file==2.1.0
 pyusb==1.2.1;  python_version < '3.9' # last Python 3.8 release
@@ -85,7 +85,7 @@ bleak==0.22.3
 #
 ### yoctopuce 1.10.42060 on macOS 10.13
 yoctopuce==1.10.42060; sys_platform=='darwin' and platform_release<'20.0' # last version supporting macOS 10.13
-yoctopuce==2.1.5971; sys_platform!='darwin' or (sys_platform=='darwin' and platform_release>='20.0')
+yoctopuce==2.1.6320; sys_platform!='darwin' or (sys_platform=='darwin' and platform_release>='20.0')
 # last 1.x yoctopuce lib: 1.10.57762
 # 2.0.59414 is no longer universal2 lacking arm64 support; 2.0.59503 should fix this
 ##