Exiles on 1.1 #160

anselor · 2024-05-23T15:01:38Z

Aggregation of many PRs

Integrates the following PRs

Supersedes #139

… to upcoming/*

Added ability to use wss for ssl deployments (eg traefik/nginx proxy manager).

This change allows to monitor and send MQTT messages from/to the AnkerMake M5C on the command line as well as observe the printer status via the Web GUI. It is also possible to send print jobs from your slicer to the printer without using AnkerMake Slicer or Studio (see README.md). Due to the M5's additional hardware (camera, light) still being expected to exist, the Web GUI will continuously wait for a camera connection. This should be fixed in the future.

Now the PPPP badge just shows the status of the PPPP connection, and this also works for the AnkerMake M5C. The new VIDEO badge now has the same behavior as the original PPPP badge in that it shows the status of the video stream.

Implemented new command 'config login', which also supports captcha queries, should they happen.

If there is already a valid ankerctl configuration and the user just wants to re-login via 'config login' then the printer IP addresses are restored to their original value if the server did not provide those IP addresses (for me it never does). Also, moved around some code parts.

This new form also supports captcha requests. Also fixed is the behavior that loading/importing a new configuration led to the printer IP addresses being cleared.

This affects both the CLI 'config show' as well as the 'Setup' tab of the web interface.

For this the flag '--store' was added to 'pppp lan-search'.

This fixes issue Ankermgmt#152.

…rs. Added helper shell script for docker. Changed docker import to accept a login.json in the currect directory if available.

Added stand-alone dockerfile for building runtime container.

Instead of copying the whole gcode file data and then splitting it into 32 KB chunks (2nd copy), use a generator function which emits the chunks along with the current offset to be used in the AABB request.

Added pyinstaller packaging for windows users. Updated requirements needed to run transwarp.

sondregronas · 2024-07-05T15:40:46Z

static/ankersrv.js

        badge: "#badge-ctrl",
    });

+    sockets.pppp_state = new AutoWebSocket({
+        name: "PPPP socket",
+        url: `ws://${location.host}/ws/pppp-state`,


Found an error in the pppp_state that would prevent PPPP connection over https:

Suggested change

url: `ws://${location.host}/ws/pppp-state`,

url: `${location.protocol.replace('http','ws')}${location.host}/ws/pppp-state`,

@treitmayr This was from your changes in this PR:
1089b49

My changes were done in a consistent way in the existing code base at the time of the commit. However, the merge of d6c727b introduced wss support, again on the code base from back then. This is the explanation for the current state.
However, I agree with @sondregronas to change the affected line in the proposed way.

sondregronas · 2024-07-11T17:46:54Z

Just commenting here to say that I've opened a PR to this PR with some more changes - let me know if you want me to switch targets to the main repo. PR: anselor#4

Changes within that PR to this one

updating pycryptodomex, flask, flask-sock to the latest version + adding python-dotenv to dependencies
addresses the change mentioned above in ankersrv.js
restart the pppp api worker (by calling worker_start(), which restarts the api state) on pppp failure (see notes below)
start the videoqueue service on /video if it isn't running, allowing webrtc access via go2rtc (see Add rudimentary WebRTC support via go2rtc #162)
bugfix: allow webserver access with missing credentials (webserver couldn't start without any camera present in cfg)
/api/ankerctl/status endpoint, displays a JSON of every services state and the app_api_version dict

Note regarding pppp:

With this version, pppp should not crash (at least not as often). I've noticed before it would stop working after 2-3 hours of uptime, (but that could also be my really old xeon failing). Instead of crashing it will "flicker" for lack of better words, where sending gcode will sometimes work, and the videostream will have corrupted B/P-frames that only get worse over time. Reloading services are to no avail. Restarting the entire application every 2 hours does circumvent this as far as I can tell.

I tried getting the webserver to run with a different WSGI server, but had no luck. I only tested gevent or eventlet. I wanted to try gunicorn but from my understanding it would require some refactoring to how the cfg is loaded so I stopped trying.

All of these prs combined should resolve (at least to my limited understanding):

#163, #161, #158, partially #156 (PPPP will work but stops being reliable), #154, #151, #147, #127 (might be unrelated?), #112

Might be missing a few issues as well that I haven't encountered myself.

Seems to not work well to have them separated. This does now work, but it raises a lot more exceptions than just AnkerCriticalError (KeyboardInterrupt & TypeError) - probably from separate threads

Restarting pppp will initiate new connection attempts. Will monitor this for a bit, a lot more graceful than a force shutdown

Removed these by mistake

Will leave this running for a while

Felt fitting to add this here - though I can change target to the main repo

Hopefully the last commit - has survived 3 lost connections so far. (The previous method had the service always running, which was stable but not realistic)

…le (by design)

Haven't had a single error message since updating requirements!

Without this, logging in was never an option (would crash on start)

mtoner23 and others added 20 commits May 23, 2024 11:00

Changing mqtt padding from zeros to bytes

8f9a56d

remove .vscode from git ignore

b0f369d

1.0.1 - Fix mqtt bug release

6d3b9b5

Updating GHA to push docker images tagged 'edge/upcoming' from merges…

12dfa94

… to upcoming/*

Fix padding in mqttapi::make_mqtt_pkt

f157a57

wss:// support

d6c727b

Added ability to use wss for ssl deployments (eg traefik/nginx proxy manager).

Split PPPP badge into proper PPPP and VIDEO badges

6d16f3c

Now the PPPP badge just shows the status of the PPPP connection, and this also works for the AnkerMake M5C. The new VIDEO badge now has the same behavior as the original PPPP badge in that it shows the status of the video stream.

Add support for fetching configuration via login

8b6436a

Implemented new command 'config login', which also supports captcha queries, should they happen.

Add possiblity to log in via web interface

bd407f1

This new form also supports captcha requests. Also fixed is the behavior that loading/importing a new configuration led to the printer IP addresses being cleared.

Provide more privacy by redacting the country code

509eb63

This affects both the CLI 'config show' as well as the 'Setup' tab of the web interface.

Support updating printer IP addresses from CLI

936f1d5

For this the flag '--store' was added to 'pppp lan-search'.

Support updating printer IP addresses via web interface

7c40af7

Bind socket on broadcasts when running in Windows OS

144a97b

This fixes issue Ankermgmt#152.

Show proper error messages when printer IP address is not available

50bcc2c

Changed docker compose file to accept optional configuration paramete…

601d1f0

…rs. Added helper shell script for docker. Changed docker import to accept a login.json in the currect directory if available.

Changed default yaml for exiles to pull pre-built exiles image

f9dc158

Added stand-alone dockerfile for building runtime container.

Optimize chunk splitting in gcode file transfers

4fe5704

Instead of copying the whole gcode file data and then splitting it into 32 KB chunks (2nd copy), use a generator function which emits the chunks along with the current offset to be used in the AABB request.

Changed ankerctl to read from .env or .flaskenv on startup.

6131f6b

Added pyinstaller packaging for windows users. Updated requirements needed to run transwarp.

sondregronas reviewed Jul 5, 2024

View reviewed changes

sondregronas mentioned this pull request Jul 9, 2024

Add rudimentary WebRTC support via go2rtc #162

Closed

sondregronas added 7 commits July 11, 2024 13:54

Update ankersrv.js

0926fe0

Add some exceptions & shutdown on critical errors

66120b0

Forgot to import logging

d761998

Remove logging from exceptions

f41e6c6

Seems to not work well to have them separated. This does now work, but it raises a lot more exceptions than just AnkerCriticalError (KeyboardInterrupt & TypeError) - probably from separate threads

Rework auto-restart on pppp-disconnect

eee2456

Restarting pppp will initiate new connection attempts. Will monitor this for a bit, a lot more graceful than a force shutdown

Re-add deleted comments

157aa5d

Removed these by mistake

Add timestamp to log - everything seems to work 😄

2741a0f

Will leave this running for a while

sondregronas added 9 commits July 11, 2024 13:54

Add an /api/ankerctl/status endpoint

9d82345

Felt fitting to add this here - though I can change target to the main repo

Don't restart an already starting service

b6cb72f

More trial and error with pppp restarting

32f0550

Hopefully the last commit - has survived 3 lost connections so far. (The previous method had the service always running, which was stable but not realistic)

Some more effort into restarting PPPP - turns out restart is unreliab…

a0a187c

…le (by design)

Working code; with a caveat

bb09336

Update API & update some dependencies

05f7070

Haven't had a single error message since updating requirements!

Fix webserver access without config

d7314b7

Without this, logging in was never an option (would crash on start)

Addressing some minor oversights + adding version to api status

7fe40b5

Reduce log level of pppp connection attempts

e430b9a

sondregronas mentioned this pull request Oct 19, 2024

Proper M5C support sondregronas/ankermake-hass-component#12

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Exiles on 1.1 #160

Exiles on 1.1 #160

anselor commented May 23, 2024 •

edited

Loading

sondregronas Jul 5, 2024

anselor Jul 5, 2024

treitmayr Jul 6, 2024

sondregronas commented Jul 11, 2024

	url: `ws://${location.host}/ws/pppp-state`,
	url: `${location.protocol.replace('http','ws')}${location.host}/ws/pppp-state`,

Exiles on 1.1 #160

Are you sure you want to change the base?

Exiles on 1.1 #160

Conversation

anselor commented May 23, 2024 • edited Loading

sondregronas Jul 5, 2024

Choose a reason for hiding this comment

anselor Jul 5, 2024

Choose a reason for hiding this comment

treitmayr Jul 6, 2024

Choose a reason for hiding this comment

sondregronas commented Jul 11, 2024

Changes within that PR to this one

Note regarding pppp:

All of these prs combined should resolve (at least to my limited understanding):

anselor commented May 23, 2024 •

edited

Loading