Three intertwined bodies of work developed and tested together this session. Full test suite green: python (edge) + phpunit (cloud). ## Edge/Pi install path - setup_online.sh: apt-lock retry (apt-daily contention), Type=exec unit + StartLimitIntervalSec in [Unit], journalctl-on-failure, crash-loop detection. - onnxruntime is now best-effort (no sdist / no 32-bit-ARM wheel); [6/8] probes the real backend and hard-fails if none works. - Hailo HEF auto-fetch: edge/tools/fetch_hailo_hef.py (pinned sha256, refuses to guess 8 vs 8L, HAILO_ARCH override for serial-less boards); hailo_pose.py run() timeout fix. - install_offline.sh: mirrors the backend gate; onnxruntime optional. ## Cafe24 cloud package (cloud/deploy/) - build_cafe24_package.sh emits move_detect_app/ (private, one folder) + www/move_detect/ (docroot subdir); no-dev classmap autoloader; preflight.php; hardened .htaccess. - Subdirectory mount support: Request::baseFrom/pathFor strip the mount prefix; index.php walks up to find the app root; views/JS prefix every URL with APP_BASE; session cookie scoped to the mount. ## Delivery audit — silent-failure & correctness (docs/delivery-audit.md) All 4 blockers + all Phase-1 silent-failure + Phase-2 HIGH correctness: - Edge cloud clients send a custom User-Agent (cafe24 WAF blocks python-requests) and allow_redirects=False. - Daemon fails loud on blank CAFE24_URL/DEVICE_SECRET; run_loop logs swallowed exceptions; heartbeat carries real fps + per-camera health; UvcSource reopens a dead camera; offline queue is size-capped and drops poison rows; TARGET_FPS/QUEUE_DB validated. - Zone coordinates normalized 0..1 on both sides (were canvas-px vs camera-px — every zone misplaced); pinch zones emit PINCH/HIGH (were downgraded to WARNING). - Fall detection uses bbox cues when keypoints are low-confidence (occluded fallen person); ghost incident not cancelled by a bystander; displacement normalized per-second (FPS-invariant). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019Xmn8KZWqiQUguEMRtn6rW
106 lines
5.3 KiB
PHP
106 lines
5.3 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
// The app root — the directory holding config.php, src/, vendor/ and storage/ — is found by
|
|
// walking up from this file rather than hardcoded as '/..'. Its depth genuinely varies:
|
|
// one level up when the docroot is the app's own directory, but two when the app is mounted
|
|
// in a subdirectory of a www/ that already serves another site, since nothing secret may live
|
|
// under a docroot that other site also serves. On shared hosting the private files are kept
|
|
// together in a single APP_PRIVATE_DIR beside www/, so that name is probed at every level.
|
|
//
|
|
// Two deliberate choices guard against binding to the CO-HOSTED site's files:
|
|
// * the container is probed BEFORE the bare directory, so our own root always wins;
|
|
// * all three markers must be present. config.php + vendor/ alone are ordinary names in any
|
|
// PHP project sharing this account — src/Config.php is specific to this app.
|
|
const APP_PRIVATE_DIR = 'move_detect_app';
|
|
(static function (): void {
|
|
$isAppRoot = static fn (string $d): bool =>
|
|
is_file($d . '/config.php')
|
|
&& is_file($d . '/vendor/autoload.php')
|
|
&& is_file($d . '/src/Config.php');
|
|
|
|
for ($dir = dirname(__DIR__), $i = 0; $i < 4; $i++) {
|
|
foreach ([$dir . '/' . APP_PRIVATE_DIR, $dir] as $candidate) {
|
|
if ($isAppRoot($candidate)) {
|
|
define('APP_ROOT', $candidate);
|
|
return;
|
|
}
|
|
}
|
|
if (dirname($dir) === $dir) break; // filesystem root; dirname() would spin here
|
|
$dir = dirname($dir);
|
|
}
|
|
http_response_code(500);
|
|
exit('config.php / vendor/autoload.php / src/Config.php not found above ' . __DIR__);
|
|
})();
|
|
|
|
require APP_ROOT . '/vendor/autoload.php';
|
|
|
|
use App\Config;
|
|
use App\Http\{Request, Router, Response};
|
|
use App\Db\Database;
|
|
use App\Auth\PhpSessionStore;
|
|
use App\Repository\Pdo\{PdoDeviceRepository, PdoNonceRepository, PdoRateLimiterRepository,
|
|
PdoEventRepository, PdoSnapshotRepository, PdoUserRepository, PdoZoneRepository,
|
|
PdoThresholdRepository, PdoAuditRepository};
|
|
use App\Ingest\IngestController;
|
|
use App\Api\{ConfigController, HeartbeatController};
|
|
use App\Auth\{AuthController, CsrfController};
|
|
use App\Dashboard\{EventListController, EventDetailController, SnapshotProxy, ZoneConfigController};
|
|
|
|
// The URL prefix this app is mounted under: '' at the web root, '/move_detect' in a
|
|
// subdirectory. Server-derived (SCRIPT_NAME), never client input. Views and the JS bundles
|
|
// prefix every link/fetch with it; without it they'd address the other site sharing www/.
|
|
define('APP_BASE', Request::baseFrom((string)($_SERVER['SCRIPT_NAME'] ?? '')));
|
|
|
|
$cfg = Config::fromArray(require APP_ROOT . '/config.php');
|
|
$pdo = Database::connect($cfg);
|
|
// Scope the session cookie to the mount, so a co-hosted site under the same www/ is never
|
|
// sent this app's session id.
|
|
$sess = new PhpSessionStore(APP_BASE . '/');
|
|
$now = time();
|
|
|
|
$devices = new PdoDeviceRepository($pdo);
|
|
$nonces = new PdoNonceRepository($pdo);
|
|
$rate = new PdoRateLimiterRepository($pdo);
|
|
$events = new PdoEventRepository($pdo);
|
|
$snaps = new PdoSnapshotRepository($pdo, $cfg->snapshotDir());
|
|
$users = new PdoUserRepository($pdo);
|
|
$zones = new PdoZoneRepository($pdo);
|
|
$thr = new PdoThresholdRepository($pdo);
|
|
$audit = new PdoAuditRepository($pdo);
|
|
|
|
$ingest = new IngestController($cfg, $devices, $nonces, $rate, $events, $snaps);
|
|
$config = new ConfigController($devices, $zones, $thr, $nonces, $cfg);
|
|
$heartbeat = new HeartbeatController($cfg, $devices, $nonces);
|
|
$auth = new AuthController($users, $audit, $rate);
|
|
$csrfCtl = new CsrfController();
|
|
$list = new EventListController($events, $sess);
|
|
$detail = new EventDetailController($events, $snaps, $audit, $sess);
|
|
$proxy = new SnapshotProxy($snaps, $sess);
|
|
$zoneCtl = new ZoneConfigController($zones, $audit, $sess);
|
|
|
|
$render = function (string $view): Response {
|
|
ob_start(); require APP_ROOT . '/src/View/' . $view . '.php';
|
|
return Response::text((string)ob_get_clean());
|
|
};
|
|
|
|
$r = new Router();
|
|
$r->add('POST', '/api/events', fn(Request $q) => $ingest->handle($q, $now, (string)($_SERVER['REMOTE_ADDR'] ?? '')));
|
|
$r->add('POST', '/api/heartbeat', fn(Request $q) => $heartbeat->post($q, $now));
|
|
$r->add('GET', '/api/config', fn(Request $q) => $config->get($q, $now));
|
|
$r->add('GET', '/api/csrf', fn(Request $q) => $csrfCtl->token($q, $sess));
|
|
$r->add('POST', '/login', fn(Request $q) => $auth->login($q, $sess, $now, (string)($_SERVER['REMOTE_ADDR'] ?? '')));
|
|
$r->add('POST', '/logout', fn(Request $q) => $auth->logout($sess));
|
|
$r->add('GET', '/api/events', fn(Request $q) => $list->json($q));
|
|
$r->add('GET', '/events/{id}', fn(Request $q, array $p) => $detail->show($q, $p));
|
|
$r->add('POST', '/events/{id}/ack', fn(Request $q, array $p) => $detail->acknowledge($q, $p));
|
|
$r->add('GET', '/api/zones/{camera}', fn(Request $q, array $p) => $zoneCtl->list($q, $p));
|
|
$r->add('POST', '/api/zones', fn(Request $q) => $zoneCtl->save($q));
|
|
$r->add('POST', '/api/zones/{id}/delete', fn(Request $q, array $p) => $zoneCtl->delete($q, $p));
|
|
$r->add('GET', '/snap/{uuid}', fn(Request $q, array $p) => $proxy->serve($q, $p));
|
|
$r->add('GET', '/', fn() => $render('events'));
|
|
$r->add('GET', '/login', fn() => $render('login'));
|
|
$r->add('GET', '/zones', fn() => $render('zones'));
|
|
$r->add('GET', '/events/{id}/view', fn(Request $q, array $p) => $render('event_detail'));
|
|
|
|
$r->dispatch(Request::fromGlobals())->send();
|