EspressoMonitor/ServerManager.cpp at optimization · TomCodesCode/EspressoMonitor · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
#include "ServerManager.h"
#include <WiFi.h>
#include <ESPmDNS.h>
#include <HTTPClient.h>
#include "secrets.h"

static const char INDEX_HTML[] = R"HTML(
<!DOCTYPE html>
<html>
<head>
<title>Espresso Monitor</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1">
<style>
body{font-family:sans-serif;max-width:520px;margin:20px auto;padding:0 16px;color:#111}
h1{font-size:1.3em;margin-bottom:4px}
.temps{display:flex;gap:12px;margin:12px 0}
.card{background:#f0f0f0;border-radius:8px;padding:14px;flex:1;text-align:center}
.val{font-size:2.2em;font-weight:bold;line-height:1}
.lbl{font-size:.75em;color:#666;margin-top:4px}
.state{font-size:.85em;padding:3px 10px;border-radius:10px;background:#e0e0e0;display:inline-block;margin-bottom:8px}
h2{font-size:1em;margin:16px 0 6px}
button{font-size:.8em;padding:3px 10px;cursor:pointer;margin-left:8px}
table{width:100%;border-collapse:collapse}
th,td{padding:5px 7px;text-align:left;border-bottom:1px solid #eee;font-size:.82em}
th{color:#888;font-weight:600}
.vbtn{font-size:.75em;padding:2px 7px;cursor:pointer;background:#333;color:#fff;border:none;border-radius:3px}
#modal{display:none;position:fixed;inset:0;background:rgba(0,0,0,.55);z-index:10;align-items:center;justify-content:center}
#modal.open{display:flex}
#mbox{background:#fff;border-radius:8px;padding:14px;width:320px;max-width:95vw}
#mtitle{font-size:.85em;font-weight:bold;margin-bottom:6px}
#mclose{float:right;cursor:pointer;background:none;border:none;font-size:1.1em;padding:0;line-height:1}
#mchart{width:100%;display:block}
</style>
</head>
<body>
<h1>Espresso Monitor</h1>
<span class="state" id="st">--</span>
<div class="temps">
  <div class="card"><div class="val" id="bl">--</div><div class="lbl">Boiler (C)</div></div>
  <div class="card"><div class="val" id="gh">--</div><div class="lbl">Grouphead (C)</div></div>
</div>
<h2>Brew Log <button onclick="loadLog()">Refresh</button></h2>
<table>
<thead><tr><th>#</th><th>Time</th><th>Duration (s)</th><th>Pts</th><th>Rating</th><th></th></tr></thead>
<tbody id="log"><tr><td colspan="5">Loading...</td></tr></tbody>
</table>
<div id="modal">
  <div id="mbox">
    <button id="mclose" onclick="closeChart()">&#10005;</button>
    <div id="mtitle"></div>
    <svg id="mchart" viewBox="0 0 300 120" xmlns="http://www.w3.org/2000/svg"></svg>
  </div>
</div>
<script>
var TMIN=85,TMAX=125,CW=300,CH=100,PAD=12;
function fmtTime(ms,unix){
  if(unix&&unix>0) return new Date(unix*1000).toLocaleString();
  var s=Math.floor(ms/1000),m=Math.floor(s/60),h=Math.floor(m/60);
  m=m%60;s=s%60;
  return 'boot+'+(h?h+'h ':'')+m+'m '+s+'s';
}
function poll(){
  fetch('/api/temps').then(function(r){return r.json();}).then(function(d){
    document.getElementById('bl').textContent=d.boiler.toFixed(1);
    document.getElementById('gh').textContent=d.grouphead.toFixed(1);
    document.getElementById('st').textContent=d.state;
  }).catch(function(){});
}
function loadLog(){
  fetch('/api/log').then(function(r){return r.text();}).then(function(t){
    var rows=t.trim().split('\n').filter(function(l){return l.length>0;});
    var tb=document.getElementById('log');
    if(!rows.length){tb.innerHTML='<tr><td colspan="5">No brews logged yet.</td></tr>';return;}
    rows.reverse();
    tb.innerHTML=rows.map(function(r,i){
      var p=r.split(',');
      var ms=parseInt(p[0]),dur=parseFloat(p[1]),pts=parseInt(p[2]),unix=p.length>=4?parseInt(p[3]):0;
      var rating=p.length>=5?parseInt(p[4]):-1;
      var ratingStr=rating>=0?rating+'/10':'-';
      return '<tr>'
        +'<td>'+(rows.length-i)+'</td>'
        +'<td>'+fmtTime(ms,unix)+'</td>'
        +'<td>'+dur.toFixed(1)+'</td>'
        +'<td>'+pts+'</td>'
        +'<td>'+ratingStr+'</td>'
        +'<td><button class="vbtn" onclick="showChart('+ms+','+dur.toFixed(1)+')">View</button></td>'
        +'</tr>';
    }).join('');
  }).catch(function(){});
}
function showChart(id,dur){
  fetch('/api/brew?id='+id).then(function(r){
    if(!r.ok)throw new Error();
    return r.text();
  }).then(function(t){
    var vals=t.trim().split('\n').filter(function(l){return l.length>0;}).map(Number);
    if(!vals.length)return;
    var n=vals.length;
    function tx(i){return PAD+(CW-2*PAD)*i/(n>1?n-1:1);}
    function ty(v){
      var y=PAD+(CH-2*PAD)*(1-(v-TMIN)/(TMAX-TMIN));
      return Math.max(PAD,Math.min(CH+PAD,y));
    }
    var pts=vals.map(function(v,i){return tx(i).toFixed(1)+','+ty(v).toFixed(1);}).join(' ');
    var grids=[90,100,110,120].map(function(t){
      var y=ty(t).toFixed(1);
      return '<line x1="'+PAD+'" y1="'+y+'" x2="'+(CW-PAD)+'" y2="'+y
            +'" stroke="#ddd" stroke-width="0.5"/>'
            +'<text x="1" y="'+(parseFloat(y)+3)+'" font-size="6" fill="#aaa">'+t+'</text>';
    }).join('');
    document.getElementById('mchart').innerHTML=grids
      +'<polyline points="'+pts+'" fill="none" stroke="#c00" stroke-width="1.5" stroke-linejoin="round"/>';
    document.getElementById('mtitle').textContent='Brew '+id+' — '+dur+'s, '+n+' pts';
    document.getElementById('modal').className='open';
  }).catch(function(){alert('Chart data not on SD card.');});
}
function closeChart(){document.getElementById('modal').className='';}
poll();loadLog();setInterval(poll,5000);
</script>
</body>
</html>
)HTML";

ServerManager::ServerManager() : _server(80) {}

void ServerManager::begin(const char* ssid, const char* password) {
    _ssid     = ssid;
    _password = password;
    WiFi.setAutoReconnect(true);
    WiFi.setSleep(false);   // disable modem sleep- keeps the connection stable
    WiFi.mode(WIFI_STA);
    WiFi.begin(ssid, password);
    _reconnectAt = millis() + 60000UL;  // arm fallback from boot, not just after disconnect
    Serial.print("WiFi connecting to: ");
    Serial.println(ssid);
}

void ServerManager::setDataSources(TempSnapshot* temps, portMUX_TYPE* tempMux,
                                    const SystemState* state, SDManager* sd) {
    _temps   = temps;
    _tempMux = tempMux;
    _state   = state;
    _sd      = sd;
}

void ServerManager::handleClient() {
    if (!_ssid) return;

    bool connected = (WiFi.status() == WL_CONNECTED);

    if (!connected && _started) {
        _server.stop();
        _started = false;
        _reconnectAt = millis() + 60000UL;  // 1-min fallback — let autoReconnect do the work first
        Serial.println("WiFi lost — server stopped.");
        return;
    }

    if (!connected) {
        // setAutoReconnect(true) handles normal reconnection.
        // Only force WiFi.begin() if it has truly stalled for 5 minutes.
        if (_reconnectAt > 0 && millis() >= _reconnectAt) {
            Serial.println("WiFi: forcing reconnect after 1-min stall.");
            WiFi.begin(_ssid, _password);
            _reconnectAt = millis() + 60000UL;
        }
        return;
    }

    // WiFi is up
    if (_reconnectAt > 0) {
        Serial.println("WiFi reconnected.");
        _reconnectAt = 0;
    }
    if (!_started) {
        tryStartServer();
        return;
    }

    _server.handleClient();
}

bool ServerManager::isConnected() {
    return WiFi.status() == WL_CONNECTED;
}

void ServerManager::notifyReady() {
    if (WiFi.status() != WL_CONNECTED) return;
    HTTPClient http;
    http.begin("http://ntfy.sh/" NTFY_TOPIC);
    http.addHeader("Title", "Espresso Ready");
    http.addHeader("Priority", "high");
    http.addHeader("Tags", "coffee");
    http.POST("Your machine is ready to brew.");
    http.end();
    Serial.println("ntfy: ready notification sent.");
}

void ServerManager::tryStartServer() {
    delay(500);  // let TCP stack settle after WiFi (re)connect before binding port 80
    if (!_routesRegistered) {
        configTime(0, 0, "pool.ntp.org", "time.cloudflare.com");
        _server.on("/",          [this]() { handleRoot(); });
        _server.on("/api/temps", [this]() { handleApiTemps(); });
        _server.on("/api/log",   [this]() { handleApiLog(); });
        _server.on("/api/brew",  [this]() { handleApiBrewTemps(); });
        _routesRegistered = true;
    }

    MDNS.end();
    if (MDNS.begin("espresso")) {
        Serial.println("mDNS started: espresso.local");
    }
    _server.begin();
    _started = true;
    Serial.print("Web server started. IP: ");
    Serial.println(WiFi.localIP());
}

void ServerManager::handleRoot() {
    _server.sendHeader("Connection", "close");
    _server.send_P(200, "text/html", INDEX_HTML);
    _server.client().setTimeout(2);
}

void ServerManager::handleApiTemps() {
    TempSnapshot snap;
    portENTER_CRITICAL(_tempMux);
    snap = *_temps;
    portEXIT_CRITICAL(_tempMux);

    SystemState st = _state ? *_state : WARMUP;

    char json[80];
    snprintf(json, sizeof(json),
             "{\"boiler\":%.1f,\"grouphead\":%.1f,\"state\":\"%s\"}",
             snap.boiler, snap.grouphead, stateToString(st));
    _server.sendHeader("Connection", "close");
    _server.send(200, "application/json", json);
    _server.client().setTimeout(2);
}

void ServerManager::handleApiLog() {
    if (!_sd || !_sd->isInitialized()) {
        _server.sendHeader("Connection", "close");
        _server.send(503, "text/plain", "SD not ready");
        _server.client().setTimeout(2);
        return;
    }
    _server.sendHeader("Connection", "close");
    _server.send(200, "text/plain", _sd->readLogString("/brew_log.csv"));
    _server.client().setTimeout(2);
}

void ServerManager::handleApiBrewTemps() {
    String idStr = _server.arg("id");
    if (idStr.isEmpty() || !_sd || !_sd->isInitialized()) {
        _server.sendHeader("Connection", "close");
        _server.send(400, "text/plain", "missing id or SD not ready");
        _server.client().setTimeout(2);
        return;
    }
    unsigned long brewId = strtoul(idStr.c_str(), nullptr, 10);
    String data = _sd->readBrewTempsString(brewId);
    if (data.isEmpty()) {
        _server.sendHeader("Connection", "close");
        _server.send(404, "text/plain", "brew not found");
        _server.client().setTimeout(2);
        return;
    }
    _server.sendHeader("Connection", "close");
    _server.send(200, "text/plain", data);
    _server.client().setTimeout(2);
}

const char* ServerManager::stateToString(SystemState s) {
    switch (s) {
        case WARMUP:   return "Warming Up";
        case READY:    return "Ready";
        case BREWING:  return "Brewing";
        case DONE:     return "Done";
        case SETTINGS: return "Settings";
        default:       return "Unknown";
    }
}