mirror of
https://github.com/daveallie/crosspoint-reader.git
synced 2026-02-04 22:57:50 +03:00
3a761b18af
Our esp32 consistently dropped the last few packets of the TCP transfer in the old implementation. Only about 1/5 transfers would complete. I've refactored that entire system into an actual Calibre Device Plugin that basically uses the exact same system as the web server's file transfer protocol. I kept them separate so that we don't muddy up the existing file transfer stuff even if it's basically the same at the end of the day I didn't want to limit our ability to change it later. I've also added basic auth to OPDS and renamed that feature to OPDS Browser to just disassociate it from Calibre. --------- Co-authored-by: Arthur Tazhitdinov <lisnake@gmail.com> Co-authored-by: Dave Allie <dave@daveallie.com>
56 lines
1.9 KiB
C++
56 lines
1.9 KiB
C++
#pragma once
|
|
#include <freertos/FreeRTOS.h>
|
|
#include <freertos/semphr.h>
|
|
#include <freertos/task.h>
|
|
|
|
#include <functional>
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include "activities/ActivityWithSubactivity.h"
|
|
#include "network/CrossPointWebServer.h"
|
|
|
|
enum class CalibreConnectState { WIFI_SELECTION, SERVER_STARTING, SERVER_RUNNING, ERROR };
|
|
|
|
/**
|
|
* CalibreConnectActivity starts the file transfer server in STA mode,
|
|
* but renders Calibre-specific instructions instead of the web transfer UI.
|
|
*/
|
|
class CalibreConnectActivity final : public ActivityWithSubactivity {
|
|
TaskHandle_t displayTaskHandle = nullptr;
|
|
SemaphoreHandle_t renderingMutex = nullptr;
|
|
bool updateRequired = false;
|
|
CalibreConnectState state = CalibreConnectState::WIFI_SELECTION;
|
|
const std::function<void()> onComplete;
|
|
|
|
std::unique_ptr<CrossPointWebServer> webServer;
|
|
std::string connectedIP;
|
|
std::string connectedSSID;
|
|
unsigned long lastHandleClientTime = 0;
|
|
size_t lastProgressReceived = 0;
|
|
size_t lastProgressTotal = 0;
|
|
std::string currentUploadName;
|
|
std::string lastCompleteName;
|
|
unsigned long lastCompleteAt = 0;
|
|
bool exitRequested = false;
|
|
|
|
static void taskTrampoline(void* param);
|
|
[[noreturn]] void displayTaskLoop();
|
|
void render() const;
|
|
void renderServerRunning() const;
|
|
|
|
void onWifiSelectionComplete(bool connected);
|
|
void startWebServer();
|
|
void stopWebServer();
|
|
|
|
public:
|
|
explicit CalibreConnectActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
|
const std::function<void()>& onComplete)
|
|
: ActivityWithSubactivity("CalibreConnect", renderer, mappedInput), onComplete(onComplete) {}
|
|
void onEnter() override;
|
|
void onExit() override;
|
|
void loop() override;
|
|
bool skipLoopDelay() override { return webServer && webServer->isRunning(); }
|
|
bool preventAutoSleep() override { return webServer && webServer->isRunning(); }
|
|
};
|