Rewrite to async #58

Snuffy2 · 2024-04-28T15:53:07Z

This is a behind the scenes rewrite to change to async functions. The existing Docker and Command-line settings didn't change so all previous setups will continue to work.

Changes

Change JuiceboxTelnet from telnetlib to telnetlib3 (Fixes Transition from deprecated python telnetlib #25)
- This started the cascade of needing to update every other class to async as well
Update JuiceboxUDPCUpdater, JuiceboxMQTTHandler (fka. JuiceboxMessageHandler) to async and moved to separate files.
- In JuiceboxMQTTHandler, built out framework that should better support sending commands from JPP to the JuiceBox as well as storing the latest value sent to HA. Hopefully this, along with the Experimental option below, will facilitate further development of controlling the JuiceBox from JPP/HA.
Updating PyProxy required essentially a full rewrite so renamed to JuiceboxMITM. Incorporated asyncio-dgram
Add EXPERIMENTAL option for users to opt in to the in development functions. Currently this exposes:
- Data from JuiceBox and Data from EnelX sensors to HA
- A MVP Text field to send "commands" to the JuiceBox
Improved logging including logging to both stderr and a file. Implement log rotation to keep 14 days of file logs.
Implemented aiorun and tini for better garbage management, thread cleanup, and graceful shutdowns
Attempted to incorporate better handling when connections or updates fail. This includes restarting connections, implementing timeouts to prevent freezing, as well as fully exiting the program when too many errors have occurred to allow a docker restart of the app.
Incorporate several items from implement some numbers to prepare to control charging current #55
- Add ignore remote option, now called IGNORE_ENELX option to prevent commands from EnelX to going to the JuiceBox and data from the JuiceBox from going to EnelX
  - Any commands from EnelX will still be captured by JPP
- Add Current Rating sensor
- Add the parsed fields from the JuiceBox status messages as attributes in the Local Data experimental sensor
Moving away from SRC and DST in both the settings and the code as it was not clear what they should contain.
- Deprecated the SRC option and replaced it with LOCAL_IP
- Deprecated the DST option and replaced it with ENELX_IP
- Current setups using SRC and DST will continue to work for now but should eventually be updated to the new terms.
Add LOCAL_PORT option (Fixes Add option for different local port #60)

telnetlib to telnetlib3 add aiorun logging improvements

telnetlib to telnetlib3 add aiorun logging improvements add experimental options

…ssproxy into Rewrite-to-async

Setting up async_beta branch

Snuffy2 · 2024-05-08T01:51:26Z

At this point, I believe this is ready for review and testing. I released it with the async_beta docker tag for testing as well.

services:
  juicepassproxy:
    image: ghcr.io/snicker/juicepassproxy:async_beta

   [...]

I'll likely end up making some more small tweaks and will remove some extraneous logging and commented out code.
@snicker
@ivanfmartinez
@FalconFour

Use asyncio-dgram from PyPi again

ivanfmartinez · 2024-05-09T10:31:59Z

At this point, I believe this is ready for review and testing. I released it with the async_beta docker tag for testing as well.
services:
  juicepassproxy:
    image: ghcr.io/snicker/juicepassproxy:async_beta

   [...]
I'll likely end up making some more small tweaks and will remove some extraneous logging and commented out code. @snicker @ivanfmartinez @FalconFour

I will try to test on this weekend.

Thanks

ivanfmartinez · 2024-05-15T12:07:24Z

@Snuffy2 I think that when using ignore_enel_x, the telnet to juicebox step can be skipped

juicepassproxy_tst | 2024-05-15 09:04:33 INFO [entrypoint.sh] IGNORE_ENELX: true
juicepassproxy_tst | 2024-05-15 09:04:33 INFO [entrypoint.sh] EXPERIMENTAL: true
juicepassproxy_tst | 2024-05-15 09:04:33 WARNING [main] Starting JuicePass Proxy v0.2.2 (Log Level: INFO)
juicepassproxy_tst | 2024-05-15 09:04:33 INFO [main] log_loc: /log/juicepassproxy.log
juicepassproxy_tst | 2024-05-15 09:04:33 INFO [main] config_loc: /config/juicepassproxy.yaml
juicepassproxy_tst | 2024-05-15 09:04:33 INFO [main] telnet timeout: 30
juicepassproxy_tst | 2024-05-15 09:05:03 WARNING [main] Error in getting EnelX Server and Port via Telnet. (TimeoutError: Telnet Connection Failed)
juicepassproxy_tst | 2024-05-15 09:05:03 INFO [main] enelx_server: jbv1.emotorwerks.com
juicepassproxy_tst | 2024-05-15 09:05:03 INFO [main] enelx_port: 8042
juicepassproxy_tst | 2024-05-15 09:05:03 INFO [main] local_addr: 172.30.0.2:8042
juicepassproxy_tst | 2024-05-15 09:05:03 INFO [main] enelx_addr: 158.47.1.128:8042

ivanfmartinez · 2024-05-15T12:48:00Z

When I stopped charging the car, the current value did not change to 0, the proxy just stopped sending updates.

juicepassproxy_tst    | 2024-05-15 09:42:10  INFO      [ha_mqtt_discoverable.sensors] Setting Voltage to 133.0 using hmd/sensor/JuiceBox/Voltage/state
juicepassproxy_tst    | 2024-05-15 09:42:10  INFO      [ha_mqtt_discoverable.sensors] Setting Energy (Lifetime) to 4117615.0 using hmd/sensor/JuiceBox/Energy--Lifetime-/state
juicepassproxy_tst    | 2024-05-15 09:42:10  INFO      [ha_mqtt_discoverable.sensors] Setting Status to Charging using hmd/sensor/JuiceBox/Status/state
juicepassproxy_tst    | 2024-05-15 09:42:10  INFO      [ha_mqtt_discoverable.sensors] Setting Temperature to 69.8 using hmd/sensor/JuiceBox/Temperature/state
juicepassproxy_tst    | 2024-05-15 09:42:10  INFO      [ha_mqtt_discoverable.sensors] Setting Current Rating to 32.0 using hmd/sensor/JuiceBox/Current-Rating/state
juicepassproxy_tst    | 2024-05-15 09:42:10  INFO      [ha_mqtt_discoverable.sensors] Setting Frequency to 60.07 using hmd/sensor/JuiceBox/Frequency/state
juicepassproxy_tst    | 2024-05-15 09:42:10  INFO      [ha_mqtt_discoverable.sensors] Setting Energy (Session) to 1379.0 using hmd/sensor/JuiceBox/Energy--Session-/state
juicepassproxy_tst    | 2024-05-15 09:42:10  INFO      [ha_mqtt_discoverable.sensors] Setting Current to 12.0 using hmd/sensor/JuiceBox/Current/state
juicepassproxy_tst    | 2024-05-15 09:42:10  INFO      [ha_mqtt_discoverable.sensors] Setting Power to 1596.0 using hmd/sensor/JuiceBox/Power/state
juicepassproxy_tst    | 2024-05-15 09:42:10  INFO      [ha_mqtt_discoverable.sensors] Setting Data from JuiceBox to X:v09u,s001,F31,u00064112,V1330,L00004117615,S02,T21,M0024,C0024,m0032,t09,i45,e-0001,f6007,r99,b000,B0000000,P0,E0001379,A00120,p0995!ZHS: using hmd/sensor/JuiceBox/Data-from-JuiceBox/state
juicepassproxy_tst    | 2024-05-15 09:42:16  INFO      [ha_mqtt_discoverable.sensors] Setting Voltage to 133.4 using hmd/sensor/JuiceBox/Voltage/state
juicepassproxy_tst    | 2024-05-15 09:42:16  INFO      [ha_mqtt_discoverable.sensors] Setting Energy (Lifetime) to 4117618.0 using hmd/sensor/JuiceBox/Energy--Lifetime-/state
juicepassproxy_tst    | 2024-05-15 09:42:16  INFO      [ha_mqtt_discoverable.sensors] Setting Status to Plugged In using hmd/sensor/JuiceBox/Status/state
juicepassproxy_tst    | 2024-05-15 09:42:16  INFO      [ha_mqtt_discoverable.sensors] Setting Temperature to 69.8 using hmd/sensor/JuiceBox/Temperature/state
juicepassproxy_tst    | 2024-05-15 09:42:16  INFO      [ha_mqtt_discoverable.sensors] Setting Current Rating to 32.0 using hmd/sensor/JuiceBox/Current-Rating/state
juicepassproxy_tst    | 2024-05-15 09:42:16  INFO      [ha_mqtt_discoverable.sensors] Setting Frequency to 60.09 using hmd/sensor/JuiceBox/Frequency/state
juicepassproxy_tst    | 2024-05-15 09:42:16  INFO      [ha_mqtt_discoverable.sensors] Setting Power to 0.0 using hmd/sensor/JuiceBox/Power/state
juicepassproxy_tst    | 2024-05-15 09:42:16  INFO      [ha_mqtt_discoverable.sensors] Setting Data from JuiceBox to X:v09u,s001,F30,u00064118,V1334,L00004117618,S01,T21,M0024,C0024,m0032,t09,i46,e-0001,f6009,r99,b000,B0000000!YM7: using hmd/sensor/JuiceBox/Data-from-JuiceBox/state
juicepassproxy_tst    | 2024-05-15 09:42:17  INFO      [ha_mqtt_discoverable.sensors] Setting Voltage to 205.7 using hmd/sensor/JuiceBox/Voltage/state
juicepassproxy_tst    | 2024-05-15 09:42:17  INFO      [ha_mqtt_discoverable.sensors] Setting Energy (Lifetime) to 4117618.0 using hmd/sensor/JuiceBox/Energy--Lifetime-/state
juicepassproxy_tst    | 2024-05-15 09:42:17  INFO      [ha_mqtt_discoverable.sensors] Setting Status to Unplugged using hmd/sensor/JuiceBox/Status/state
juicepassproxy_tst    | 2024-05-15 09:42:17  INFO      [ha_mqtt_discoverable.sensors] Setting Temperature to 69.8 using hmd/sensor/JuiceBox/Temperature/state
juicepassproxy_tst    | 2024-05-15 09:42:17  INFO      [ha_mqtt_discoverable.sensors] Setting Current Rating to 32.0 using hmd/sensor/JuiceBox/Current-Rating/state
juicepassproxy_tst    | 2024-05-15 09:42:17  INFO      [ha_mqtt_discoverable.sensors] Setting Frequency to 60.09 using hmd/sensor/JuiceBox/Frequency/state
juicepassproxy_tst    | 2024-05-15 09:42:17  INFO      [ha_mqtt_discoverable.sensors] Setting Power to 0.0 using hmd/sensor/JuiceBox/Power/state
juicepassproxy_tst    | 2024-05-15 09:42:17  INFO      [ha_mqtt_discoverable.sensors] Setting Data from JuiceBox to X:v09u,s001,F10,u00064119,V2057,L00004117618,S00,T21,M0024,C0024,m0032,t09,i47,e-0001,f6009,r99,b000,B0000000!Z79: using hmd/sensor/JuiceBox/Data-from-JuiceBox/state

Co-authored-by: Snuffy2 <[email protected]>

…ssproxy into Rewrite-to-async

dont try to telnet when ignoring enelx, set current to 0 when not charging

Snuffy2 · 2024-05-31T12:25:39Z

Will merge this PR into master.
It can be tested from the edge Docker tag until packaged into a release
For those previously testing with the async_beta Docker tag, please switch to edge

Snuffy2 · 2024-05-31T12:27:01Z

services:
  juicepassproxy:
    image: ghcr.io/snicker/juicepassproxy:edge

   [...]

snicker · 2024-06-04T00:33:42Z

amazing work @Snuffy2, about to set up 0.3.0 locally!

Snuffy2 added 3 commits April 28, 2024 11:26

Separate classes into files

b13bf37

Upgrade PyProxy to async JuiceboxMITM

e854363

Update Dockerfiles, add tini

8cd3cb5

Snuffy2 force-pushed the Rewrite-to-async branch 7 times, most recently from bf8bff7 to 5074cbc Compare April 28, 2024 23:13

Snuffy2 mentioned this pull request Apr 28, 2024

implement some numbers to prepare to control charging current #55

Closed

Snuffy2 force-pushed the Rewrite-to-async branch 4 times, most recently from ce399bc to 829b7b4 Compare April 30, 2024 00:40

Rewrite to async

261bc9b

telnetlib to telnetlib3 add aiorun logging improvements

Snuffy2 force-pushed the Rewrite-to-async branch 3 times, most recently from c4dfaf9 to 4cd4fff Compare April 30, 2024 21:00

Rewrite to async

1a90a55

telnetlib to telnetlib3 add aiorun logging improvements add experimental options

Snuffy2 force-pushed the Rewrite-to-async branch from c77ee86 to 1a90a55 Compare April 30, 2024 22:04

Merge branch 'Rewrite-to-async' of https://github.com/Snuffy2/juicepa…

a7495f0

…ssproxy into Rewrite-to-async

Snuffy2 force-pushed the Rewrite-to-async branch 2 times, most recently from 72276cb to 5fcf79a Compare May 1, 2024 02:37

Rewrite to async

3e97b82

Snuffy2 force-pushed the Rewrite-to-async branch from 5fcf79a to 3e97b82 Compare May 1, 2024 03:46

Snuffy2 added 4 commits May 1, 2024 21:18

Change MITM to use asyncio-dgram

3093b67

Logger rename

03664e4

Logging and Exception Refinement

f02b6a3

Cleanup

8670927

Snuffy2 force-pushed the Rewrite-to-async branch 2 times, most recently from 37136e5 to 605d061 Compare May 8, 2024 00:12

Snuffy2 added 2 commits May 7, 2024 20:55

Create async_beta.yml

2c2dde3

Name Refinement and further cleanup

557dc8f

Snuffy2 force-pushed the Rewrite-to-async branch from 605d061 to 557dc8f Compare May 8, 2024 01:02

Snuffy2 marked this pull request as ready for review May 8, 2024 01:19

Snuffy2 added 2 commits May 7, 2024 21:36

Merge remote-tracking branch 'origin/async_beta' into Rewrite-to-async

8ac9d54

Merge pull request snicker#62 from Snuffy2/Rewrite-to-async

e2b438a

Setting up async_beta branch

Snuffy2 requested a review from snicker May 8, 2024 01:51

Snuffy2 added 2 commits May 8, 2024 17:46

Use asyncio-dgram from PyPi again

801e475

Use asyncio-dgram from PyPi again

5f09640

Snuffy2 force-pushed the Rewrite-to-async branch from 801e475 to 5f09640 Compare May 8, 2024 21:56

Snuffy2 added 2 commits May 8, 2024 18:02

Merge pull request snicker#63 from Snuffy2/Rewrite-to-async

1ee9f5e

Use asyncio-dgram from PyPi again

Cleanup

473303e

dont try to telnet when ignoring, set current to 0 when not charging

3f1e358

ivanfmartinez mentioned this pull request May 15, 2024

dont try to telnet when ignoring enelx, set current to 0 when not charging #64

Merged

ivanfmartinez and others added 6 commits May 15, 2024 19:32

add energy_session

bd8fd39

Co-authored-by: Snuffy2 <[email protected]>

Make current and energy_session go to 0 when not charging

5e8a61e

Merge branch 'Rewrite-to-async' of https://github.com/Snuffy2/juicepa…

c13c9ae

…ssproxy into Rewrite-to-async

Merge branch 'Rewrite-to-async' into async_beta_changes

6748044

Merge pull request #20 from ivanfmartinez/async_beta_changes

2870bf0

dont try to telnet when ignoring enelx, set current to 0 when not charging

Code Cleanup

57e56ec

Snuffy2 merged commit 44f7f0f into snicker:master May 31, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rewrite to async #58

Rewrite to async #58

Snuffy2 commented Apr 28, 2024 •

edited

Loading

Snuffy2 commented May 8, 2024

ivanfmartinez commented May 9, 2024

ivanfmartinez commented May 15, 2024

ivanfmartinez commented May 15, 2024

Snuffy2 commented May 31, 2024

Snuffy2 commented May 31, 2024

snicker commented Jun 4, 2024

Rewrite to async #58

Rewrite to async #58

Conversation

Snuffy2 commented Apr 28, 2024 • edited Loading

This is a behind the scenes rewrite to change to async functions. The existing Docker and Command-line settings didn't change so all previous setups will continue to work.

Changes

Snuffy2 commented May 8, 2024

ivanfmartinez commented May 9, 2024

ivanfmartinez commented May 15, 2024

ivanfmartinez commented May 15, 2024

Snuffy2 commented May 31, 2024

Snuffy2 commented May 31, 2024

snicker commented Jun 4, 2024

Snuffy2 commented Apr 28, 2024 •

edited

Loading