fix: Complete launcher and client-server integration fixes #71
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixed two critical issues preventing proper client-server communication: 1. JSON parsing error on connection: - Changed client get_server_info() to call /api endpoint instead of / - Root endpoint (/) returns HTML, while /api returns JSON as expected - Fixes "Expecting value: line 1 column 1 (char 0)" error 2. Async coroutine warning: - Fixed disconnect_from_server() to properly await async disconnect() - Uses asyncio.create_task() to schedule the async operation - Eliminates "coroutine was never awaited" RuntimeWarning 3. Version consistency: - Updated server /api endpoint version from 0.24.0 to 0.27.0 - Now matches actual server version shown in startup logs Changes: - client/api/client.py: Changed endpoint from "/" to "/api" in get_server_info() - client/ui/main_window.py: Fixed async disconnect with asyncio.create_task() - server/main.py: Updated API version to 0.27.0
Added _check_externally_managed() and _check_command_exists() methods to LabLinkLauncher class. These methods were already in CheckWorker but were being called by LabLinkLauncher.apply_fixes(), causing AttributeError. Fixes: 'LabLinkLauncher' object has no attribute '_check_command_exists'
Fixed authentication errors when connecting to servers with security disabled: 1. Server changes: - Added 'security_enabled' field to /api endpoint response - Indicates whether advanced security system is active 2. Client changes: - Check security_enabled flag before attempting login - If disabled, connect as 'anonymous' user without authentication - Avoids "Expecting value: line 1 column 1" errors from missing /api/security/login endpoint - Updated _complete_connection to check authenticated flag directly This allows the client to work with both secured and unsecured servers without requiring manual configuration changes. Fixes connection errors when server has enable_advanced_security=False (default).
Fixed three issues that appeared after successful authentication bypass: 1. Added refresh() method to AcquisitionPanel: - Calls refresh_sessions(silent=True) - Fixes AttributeError: 'AcquisitionPanel' object has no attribute 'refresh' 2. Added refresh() method to SyncPanel: - Calls refresh_groups(silent=True) - Ensures all panels have consistent refresh interface 3. Fixed async WebSocket connection: - Changed from asyncio.create_task() to asyncio.ensure_future() with qasync event loop - Fixes "coroutine was expected" and "no running event loop" errors - Properly integrates with qasync's Qt event loop These errors only appeared after client successfully connected to server (thanks to the authentication bypass fix).
Fixed two runtime errors: 1. Client async event loop error: - Changed from qasync.QEventLoop.instance() to asyncio.get_event_loop() - QSelectorEventLoop doesn't have 'instance' attribute - Fixes: "type object 'QSelectorEventLoop' has no attribute 'instance'" 2. Server diagnostics endpoint error: - Changed equipment_manager._equipment to equipment_manager.equipment - EquipmentManager uses 'equipment' not '_equipment' attribute - Fixes: "'EquipmentManager' object has no attribute '_equipment'" - Resolves 500 Internal Server Error on /api/diagnostics/health endpoint
Fixed WebSocket connection to use the correct port:
- Changed WebSocketManager to use api_port instead of ws_port
- The server's WebSocket endpoint is at ws://{host}:{api_port}/ws
- The server doesn't actually use the separate ws_port setting
- Fixes connection errors to port 8001 (should be 8000)
This resolves the continuous WebSocket connection retry messages.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Major fixes to the LabLink GUI launcher and client-server communication, resolving all connection and dependency issues on Ubuntu 24.04.
Launcher Improvements
Client-Server Fixes
Testing
Tested on Ubuntu 24.04: