mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 15:33:57 +01:00
Four asks, plus the fixes two review passes turned up. Removals (all unused): - "Repeat last meal" button, and the reward/temptation-bundling prompt it was the sole trigger for. Replaced with a post-log progress card showing kcal against budget, macros, and the adherence streak. - The multi-item meal builder, on both the gate and the phone. The stored `components` field stays: nothing writes it now, but historical composite entries and the food bank still read it and it is part of the wire format. - Meal photos entirely: 13 files, `imagePath`, the photo filter, the wrapper's /blobs/ route, image_picker, and the CAMERA permission. Reminder false alarms had three real causes, all fixed: - Logging never reconciled notifications, so a reminder sat on screen up to 15 minutes after the meal was logged -- on the phone itself. - The background check never pulled, so a PC-logged meal nagged forever until the app was opened. Now mirrors _cli_gate._should_lock: cheap local check, network only when a slot looks due, then re-check. - Meals before 08:00 / after 22:00 were attributed to no slot at all. New slot_for_log/slotForLog clamps them to the first/last slot, byte-identical across Python and Dart. Deliberately separate from elapsed_slots, which would otherwise make every slot fall due at 23:00. Budget history, so lowering the budget stops rewriting the past: - Forward-only (effective_from, kcal) entries; each day is judged against the budget in force then. Verified live: setting 2000 left a 36-day adherence streak and the whole calendar pixel-identical. - Rides as hist:<date> fields on the existing budget record. crdt_sync merges per-field over the union of field names and both devices push the merged log, so a device that predates the feature relays them untouched -- no coordinated rollout, no second document. - The seed guard tests emptiness, not file presence: _sync can write an empty history after merging with a pre-feature peer, and a presence check would then never seed again, silently reclassifying every past day. One shared source of truth for every piece of data: - Body weight now travels as its own `weight` CRDT field. Inside `value` it was collateral damage of whole-map LWW -- any phone budget edit deleted it, and the protein target with it. - Both halves of the food bank sync. The curated half (foods added without eating them) was the last device-local state. The derived half merges with count as the clock, so LWW means max-count-wins; the log stays authoritative for membership, because a CRDT union never shrinks and a peer's stale copy would otherwise resurrect a deleted food permanently. - Bank adapters honour tombstones, and Dart parses bank records defensively: a cast failure there is an Error, not an Exception, so one malformed remote record would have broken phone sync permanently. _test_guard.py blocks any pathlib write to real user state while pytest is in the process, whatever conftest is loaded. A throwaway test run outside the package conftest destroyed a real GitHub token during this work; this makes that class of accident impossible rather than merely discouraged. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
193 lines
6.6 KiB
Dart
193 lines
6.6 KiB
Dart
/// Local HTTP server backing the desktop app.
|
|
///
|
|
/// The desktop app is a Flutter **web** build (Flutter's Linux embedder
|
|
/// manages only ~20fps at 4K, where the same Dart code in Chrome sustains
|
|
/// ~144fps -- see `~/todo/docs/desktop-performance-findings.md`), so it runs
|
|
/// in a browser and cannot touch the filesystem. This process is the other
|
|
/// half of the desktop app:
|
|
///
|
|
/// * it serves the built web assets;
|
|
/// * it owns an on-disk copy of every document the app stores, so a wiped
|
|
/// Chrome profile is not a total-loss event;
|
|
/// * it fronts GitHub, holding the sync token and running the CORS-less
|
|
/// device flow the page cannot (see `github_proxy.dart`).
|
|
///
|
|
/// Binds to loopback only. The endpoints overwrite files in the user's home
|
|
/// directory with no authentication, so exposing them on a routable address
|
|
/// would let anything on the network rewrite the food log.
|
|
library;
|
|
|
|
import 'dart:async';
|
|
import 'dart:io';
|
|
|
|
import 'package:diet_guard_app/desktop/github_proxy.dart';
|
|
import 'package:diet_guard_app/services/desktop_wrapper.dart';
|
|
import 'package:path/path.dart' as p;
|
|
|
|
/// Serves the desktop app's web build plus its disk-backed endpoints.
|
|
class WrapperServer {
|
|
/// Creates a server serving [webRoot], mirroring the app's storage under
|
|
/// [dataDir], and proxying GitHub through [gitHubProxy].
|
|
WrapperServer({
|
|
required this.webRoot,
|
|
required this.dataDir,
|
|
required this.gitHubProxy,
|
|
});
|
|
|
|
/// Directory holding the built Flutter web assets.
|
|
final String webRoot;
|
|
|
|
/// Directory holding the on-disk copies of the app's documents.
|
|
final String dataDir;
|
|
|
|
/// GitHub half of the wrapper.
|
|
final GitHubProxy gitHubProxy;
|
|
|
|
HttpServer? _server;
|
|
|
|
/// Port the server is listening on, once [start] has completed.
|
|
int get port => _server!.port;
|
|
|
|
/// Binds to loopback on [requestedPort] and begins serving.
|
|
///
|
|
/// Pass 0 to let the OS choose a port (tests do this); the desktop launcher
|
|
/// passes [desktopWrapperPort], because the browser keys IndexedDB by
|
|
/// origin -- a changing port would look like an app with no history.
|
|
Future<void> start(int requestedPort) async {
|
|
_server = await HttpServer.bind(
|
|
InternetAddress.loopbackIPv4,
|
|
requestedPort,
|
|
);
|
|
unawaited(_serve(_server!));
|
|
}
|
|
|
|
/// Stops serving and releases the port.
|
|
Future<void> stop() async {
|
|
await _server?.close(force: true);
|
|
gitHubProxy.close();
|
|
}
|
|
|
|
Future<void> _serve(HttpServer server) async {
|
|
await for (final request in server) {
|
|
try {
|
|
await _handle(request);
|
|
} on Exception {
|
|
request.response.statusCode = HttpStatus.internalServerError;
|
|
}
|
|
await request.response.close();
|
|
}
|
|
}
|
|
|
|
Future<void> _handle(HttpRequest request) async {
|
|
final path = request.uri.path;
|
|
if (path.startsWith(WrapperPaths.github)) {
|
|
final rest = path.substring(WrapperPaths.github.length);
|
|
if (await gitHubProxy.handle(request, rest)) return;
|
|
request.response.statusCode = HttpStatus.notFound;
|
|
return;
|
|
}
|
|
if (path.startsWith(WrapperPaths.documents)) {
|
|
return _storedFile(
|
|
request,
|
|
'documents',
|
|
path.substring(WrapperPaths.documents.length),
|
|
);
|
|
}
|
|
return _static(request, path);
|
|
}
|
|
|
|
/// GET returns the stored bytes (404 when absent); POST overwrites them.
|
|
///
|
|
/// [name] is rejected unless it is a plain filename: these handlers write
|
|
/// into the user's home directory, so a `..` segment would turn a mirror
|
|
/// write into an arbitrary-file overwrite.
|
|
Future<void> _storedFile(
|
|
HttpRequest request,
|
|
String subdirectory,
|
|
String name,
|
|
) async {
|
|
if (name.isEmpty || name.contains('/') || name.contains('..')) {
|
|
request.response.statusCode = HttpStatus.badRequest;
|
|
return;
|
|
}
|
|
final file = File(p.join(dataDir, subdirectory, name));
|
|
if (request.method == 'POST') {
|
|
await file.parent.create(recursive: true);
|
|
final bytes = [for (final chunk in await request.toList()) ...chunk];
|
|
await file.writeAsBytes(bytes);
|
|
request.response.statusCode = HttpStatus.noContent;
|
|
return;
|
|
}
|
|
if (request.method != 'GET') {
|
|
request.response.statusCode = HttpStatus.methodNotAllowed;
|
|
return;
|
|
}
|
|
if (!file.existsSync()) {
|
|
request.response.statusCode = HttpStatus.notFound;
|
|
return;
|
|
}
|
|
request.response.headers.contentType = subdirectory == 'documents'
|
|
? ContentType.json
|
|
: ContentType.binary;
|
|
await request.response.addStream(file.openRead());
|
|
}
|
|
|
|
Future<void> _static(HttpRequest request, String path) async {
|
|
final relative = path == '/' ? 'index.html' : path.substring(1);
|
|
// Reject traversal before touching the filesystem: the served root sits
|
|
// next to the user's files, so `../` must not escape it.
|
|
final resolved = p.normalize(p.join(webRoot, relative));
|
|
// coverage:ignore-start
|
|
// Defence in depth, and currently unreachable: Dart's HttpServer decodes
|
|
// and normalises the path before a handler runs, so even `%2e%2e` arrives
|
|
// already collapsed. Kept so the guarantee does not depend on that
|
|
// implementation detail holding.
|
|
if (!p.isWithin(webRoot, resolved) && resolved != p.normalize(webRoot)) {
|
|
request.response.statusCode = HttpStatus.forbidden;
|
|
return;
|
|
}
|
|
// coverage:ignore-end
|
|
final file = File(resolved);
|
|
if (!file.existsSync()) {
|
|
request.response.statusCode = HttpStatus.notFound;
|
|
return;
|
|
}
|
|
request.response.headers.contentType = contentTypeFor(resolved);
|
|
await request.response.addStream(file.openRead());
|
|
}
|
|
|
|
/// Content type for [filePath].
|
|
///
|
|
/// Flutter web is strict here: CanvasKit refuses to instantiate a `.wasm`
|
|
/// served as anything but `application/wasm`, and the app then renders
|
|
/// nothing at all.
|
|
static ContentType contentTypeFor(String filePath) {
|
|
switch (p.extension(filePath).toLowerCase()) {
|
|
case '.html':
|
|
return ContentType.html;
|
|
case '.js' || '.mjs':
|
|
return ContentType('text', 'javascript', charset: 'utf-8');
|
|
case '.json':
|
|
return ContentType.json;
|
|
case '.wasm':
|
|
return ContentType('application', 'wasm');
|
|
case '.css':
|
|
return ContentType('text', 'css', charset: 'utf-8');
|
|
case '.png':
|
|
return ContentType('image', 'png');
|
|
case '.jpg' || '.jpeg':
|
|
return ContentType('image', 'jpeg');
|
|
case '.svg':
|
|
return ContentType('image', 'svg+xml');
|
|
case '.ttf':
|
|
return ContentType('font', 'ttf');
|
|
case '.otf':
|
|
return ContentType('font', 'otf');
|
|
case '.woff2':
|
|
return ContentType('font', 'woff2');
|
|
default:
|
|
return ContentType.binary;
|
|
}
|
|
}
|
|
}
|