Skip to content

Fix implementation for resetWebSocketClient method to allow websocket version bump#3212

Merged
sfeilmeier merged 3 commits intoOpenEMS:developfrom
Yuval-Roth:develop
Jul 15, 2025
Merged

Fix implementation for resetWebSocketClient method to allow websocket version bump#3212
sfeilmeier merged 3 commits intoOpenEMS:developfrom
Yuval-Roth:develop

Conversation

@Yuval-Roth
Copy link
Copy Markdown
Contributor

Hello, i am the author of TooTallNate/Java-WebSocket#1465
I'm here to offer you a solution for #2462 (comment) to allow you to bump the websocket client version from 1.5.4 to 1.6.0 and continue this #3196

As i understand it, the issue you had with closeBlocking() hanging indefinitely was fixed in version 1.5.5.
So, the implementation for resetting the websocket client is trivial - just call the private reset method.

This works in 1.6.0 as I have used it myself.

…rg.java-websocket:Java-WebSocket from 1.5.4 to 1.6.0 in /cnf
@Yuval-Roth Yuval-Roth changed the title New implementation for resetWebSocketClient method that allows websocket version bump Fix implementation for resetWebSocketClient method to allow websocket version bump Jun 25, 2025
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 15, 2025

Codecov Report

Attention: Patch coverage is 0% with 4 lines in your changes missing coverage. Please review.

❌ Your patch status has failed because the patch coverage (0.00%) is below the target coverage (75.00%). You can increase the patch coverage or adjust the target coverage.

Additional details and impacted files
@@              Coverage Diff              @@
##             develop    #3212      +/-   ##
=============================================
- Coverage      59.39%   59.38%   -0.01%     
  Complexity       139      139              
=============================================
  Files           2683     2683              
  Lines         116693   116650      -43     
  Branches        8643     8639       -4     
=============================================
- Hits           69303    69260      -43     
- Misses         44768    44774       +6     
+ Partials        2622     2616       -6     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copy link
Copy Markdown
Contributor

@sfeilmeier sfeilmeier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! 🚀 Thank you for your active support - and the great library! Java-WebSocket is really a super important core library for OpenEMS, as all the communication between Edge, Backend and UI is transferred via JSON/WebSocket.

@sfeilmeier sfeilmeier merged commit 633d0d0 into OpenEMS:develop Jul 15, 2025
6 of 7 checks passed
sfeilmeier added a commit that referenced this pull request Jul 21, 2025
- Fix NoSuchMethodException when trying to reset websocket connection
- Problem was introduced in #3212

Co-authored-by: Michael Grill <[email protected]>
Co-committed-by: Michael Grill <[email protected]>
sfeilmeier added a commit that referenced this pull request Jul 22, 2025
* UI
  * getNetworkInfoReq: add fallback
  * ENTSO-E: add custom formly Tariff template for German DSO
  * New navigation update
    - Add Option to enable new navigation, every user with `Controller.Single.EVSE` will be forced to use new ui
    - outsourcing link and image keys to seperate files for better readability -> `oem-meta`
    - add fallback image for non fetchable images
    - decreasing font-size on `oe-modal-buttons` text
    - lazy load evse img from docs with fallback for `openems Edge`
    - code clean up
    - fix navigationNodes triggering rebuild indefinitely
    - add eslint rule to accept vars ignored, if unused vars are starting with `_`
    - add history to navigation nodes and create opt in for new ui `userSettings.useNewUI` and force new navigation if component.factoryIds is in `[Evse.Controller.Single]`
  * Chartjs: avoid timing issue error
    - fixing nullpointer in chartjs

  * AppCenter: update heating element dependency appid
  * GoodWe Battery-Inverter: change Q(U) settings
    - Sending no Detailed Value for Q(U), as the values are already set by goodwe correctly after setting the country Code
  * HeatingElement: check if meter id is set
  * AppCenter: fix UpdateAppConfig
  * Heating Element: fix on not showing how measured
  * Geocoding-Integration via OpenCage API
    - Geo information storage was integrated into the Meta app
    - OpenCage Geocoding API was connected to resolve location data
    - Geocoding is performed via a JSON-RPC request with a location string as input
    - The API responds with two geocoding result options
    - A second JSON-RPC request selects one of the results
    - The selected geo data is stored in the Meta app
  * Websocket: reconnect fix reset
    - Fix NoSuchMethodException when trying to reset websocket connection
    - Problem was introduced in #3212

* Backend
  * Alerting cleanup
    - Improve alerting, according to SonarQube test.

---------

Co-authored-by: Lukas Rieger <[email protected]>
Co-authored-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Sagar Venu <[email protected]>
Co-authored-by: Sebastian Asen <[email protected]>
Co-authored-by: Michael Grill <[email protected]>
Co-authored-by: Johann Kaufmann <[email protected]>
Co-authored-by: Leon Blenk <[email protected]>
Co-authored-by: Leonhard Anderle <[email protected]>
Co-authored-by: Kai Jeschek <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants