verify faces from camera

nodered flow upload

progress.md

@@ -45,3 +45,16 @@
 
 ### Next Steps
 - WiFi self-healing and MQTT reconnection & testing
+
+## Week 4
+### Completed
+- Tag & Scanner CLI for configuration & persistent config
+- Core script (MQTT, location estimation, Store in Redis)
+- NGSI-LD public api
+- public dashboard (Node-RED)
+
+### In Progress
+- Admin API with CRUD functions
+
+### Next Steps
+- Add verification with camera in core script

src/officesense_nodered/flows.json

@@ -0,0 +1,352 @@
+[
+    {
+        "id": "f1398f7c64b1d0ea",
+        "type": "tab",
+        "label": "OfficeSense Flow",
+        "disabled": false,
+        "info": "",
+        "env": []
+    },
+    {
+        "id": "20bb112ec6e856de",
+        "type": "ui-table",
+        "z": "f1398f7c64b1d0ea",
+        "group": "05cf402c93866d4e",
+        "name": "",
+        "label": "",
+        "order": 1,
+        "width": 0,
+        "height": 0,
+        "maxrows": 0,
+        "passthru": false,
+        "autocols": true,
+        "showSearch": true,
+        "deselect": true,
+        "selectionType": "none",
+        "columns": [],
+        "mobileBreakpoint": "sm",
+        "mobileBreakpointType": "defaults",
+        "action": "replace",
+        "className": "",
+        "x": 690,
+        "y": 360,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "0a5259b54388cdfc",
+        "type": "inject",
+        "z": "f1398f7c64b1d0ea",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "3",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 70,
+        "y": 400,
+        "wires": [
+            [
+                "4030b9e7bcab5435",
+                "f37401387ca7a595"
+            ]
+        ]
+    },
+    {
+        "id": "4030b9e7bcab5435",
+        "type": "http request",
+        "z": "f1398f7c64b1d0ea",
+        "name": "",
+        "method": "GET",
+        "ret": "obj",
+        "paytoqs": "ignore",
+        "url": "http://192.168.1.2/livedata/entities",
+        "tls": "",
+        "persist": false,
+        "proxy": "",
+        "insecureHTTPParser": false,
+        "authType": "",
+        "senderr": false,
+        "headers": [],
+        "x": 270,
+        "y": 360,
+        "wires": [
+            [
+                "4aee360198b34403"
+            ]
+        ]
+    },
+    {
+        "id": "f37401387ca7a595",
+        "type": "http request",
+        "z": "f1398f7c64b1d0ea",
+        "name": "",
+        "method": "GET",
+        "ret": "obj",
+        "paytoqs": "ignore",
+        "url": "http://192.168.1.2/livedata/entities?type=room",
+        "tls": "",
+        "persist": false,
+        "proxy": "",
+        "insecureHTTPParser": false,
+        "authType": "",
+        "senderr": false,
+        "headers": [],
+        "x": 270,
+        "y": 440,
+        "wires": [
+            [
+                "448ba65b518d534d"
+            ]
+        ]
+    },
+    {
+        "id": "448ba65b518d534d",
+        "type": "function",
+        "z": "f1398f7c64b1d0ea",
+        "name": "ParseNGSI",
+        "func": "msg.payload = msg.payload.map(r => {\n    return {\n        Room: r.name?.value,\n        Occupancy: r.occupancy?.value\n    };\n});\n\nreturn msg;",
+        "outputs": 1,
+        "timeout": 0,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 490,
+        "y": 440,
+        "wires": [
+            [
+                "586c57be87bf8bc6",
+                "49042a0c5086d4b8"
+            ]
+        ]
+    },
+    {
+        "id": "586c57be87bf8bc6",
+        "type": "ui-table",
+        "z": "f1398f7c64b1d0ea",
+        "group": "a98ec11a60f808be",
+        "name": "",
+        "label": "",
+        "order": 1,
+        "width": 0,
+        "height": 0,
+        "maxrows": 0,
+        "passthru": false,
+        "autocols": true,
+        "showSearch": true,
+        "deselect": true,
+        "selectionType": "none",
+        "columns": [],
+        "mobileBreakpoint": "sm",
+        "mobileBreakpointType": "defaults",
+        "action": "replace",
+        "className": "",
+        "x": 690,
+        "y": 440,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4aee360198b34403",
+        "type": "function",
+        "z": "f1398f7c64b1d0ea",
+        "name": "ParseNGSI",
+        "func": "const entities = msg.payload;\n\nconst users = entities.filter(e => e.type === \"User\");\nconst rooms = entities.filter(e => e.type === \"Room\");\n\nconst roomMap = {};\nfor (const r of rooms) {\n    roomMap[r.id.replace(\"urn:ngsi-ld:Room:\", \"\")] = r;\n}\n\nmsg.payload = users.map(u => {\n\n    const roomId = u.locatedIn?.object;\n    const room = roomMap[roomId];\n\n    return {\n        Name: u.name?.value,\n        Room: room ? room.name?.value : \"Unknown\",\n        RSSI: u.rssi?.value,\n        Auth: u.authenticationStatus?.value,\n        Time: new Date(u.observedAt?.value)\n            .toLocaleString(\"el-GR\", { timeZone: \"Europe/Athens\" })\n    };\n});\n\nreturn msg;",
+        "outputs": 1,
+        "timeout": 0,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 490,
+        "y": 360,
+        "wires": [
+            [
+                "20bb112ec6e856de"
+            ]
+        ]
+    },
+    {
+        "id": "49042a0c5086d4b8",
+        "type": "ui-chart",
+        "z": "f1398f7c64b1d0ea",
+        "group": "a98ec11a60f808be",
+        "name": "",
+        "label": "Room Occupancy Chart",
+        "order": 2,
+        "chartType": "bar",
+        "category": "",
+        "categoryType": "none",
+        "xAxisLabel": "Room",
+        "xAxisProperty": "Room",
+        "xAxisPropertyType": "property",
+        "xAxisType": "category",
+        "xAxisFormat": "",
+        "xAxisFormatType": "auto",
+        "xmin": "",
+        "xmax": "",
+        "yAxisLabel": "Occupancy",
+        "yAxisProperty": "Occupancy",
+        "yAxisPropertyType": "property",
+        "ymin": "0",
+        "ymax": "10",
+        "bins": 10,
+        "action": "replace",
+        "stackSeries": false,
+        "pointShape": "circle",
+        "pointRadius": 4,
+        "showLegend": true,
+        "removeOlder": 1,
+        "removeOlderUnit": "3600",
+        "removeOlderPoints": "",
+        "colors": [
+            "#0095ff",
+            "#ff0000",
+            "#ff7f0e",
+            "#2ca02c",
+            "#a347e1",
+            "#d62728",
+            "#ff9896",
+            "#9467bd",
+            "#c5b0d5"
+        ],
+        "textColor": [
+            "#666666"
+        ],
+        "textColorDefault": true,
+        "gridColor": [
+            "#e5e5e5"
+        ],
+        "gridColorDefault": true,
+        "width": 6,
+        "height": 8,
+        "className": "",
+        "interpolation": "linear",
+        "x": 750,
+        "y": 520,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "05cf402c93866d4e",
+        "type": "ui-group",
+        "name": "Users",
+        "page": "fc203945d260d5ec",
+        "width": 6,
+        "height": 1,
+        "order": 1,
+        "showTitle": true,
+        "className": "",
+        "visible": "true",
+        "disabled": "false",
+        "groupType": "default"
+    },
+    {
+        "id": "a98ec11a60f808be",
+        "type": "ui-group",
+        "name": "Rooms",
+        "page": "fc203945d260d5ec",
+        "width": 6,
+        "height": 1,
+        "order": 2,
+        "showTitle": true,
+        "className": "",
+        "visible": "true",
+        "disabled": "false",
+        "groupType": "default"
+    },
+    {
+        "id": "fc203945d260d5ec",
+        "type": "ui-page",
+        "name": "OfficeSense",
+        "ui": "7d0f4d8165214cca",
+        "path": "/officesense",
+        "icon": "home",
+        "layout": "grid",
+        "theme": "f49a05b173b6cac3",
+        "breakpoints": [
+            {
+                "name": "Default",
+                "px": "0",
+                "cols": "3"
+            },
+            {
+                "name": "Tablet",
+                "px": "576",
+                "cols": "6"
+            },
+            {
+                "name": "Small Desktop",
+                "px": "768",
+                "cols": "9"
+            },
+            {
+                "name": "Desktop",
+                "px": "1024",
+                "cols": "12"
+            }
+        ],
+        "order": 1,
+        "className": "",
+        "visible": "true",
+        "disabled": "false"
+    },
+    {
+        "id": "7d0f4d8165214cca",
+        "type": "ui-base",
+        "name": "My Dashboard",
+        "path": "/dashboard",
+        "appIcon": "",
+        "includeClientData": true,
+        "acceptsClientConfig": [
+            "ui-notification",
+            "ui-control"
+        ],
+        "showPathInSidebar": false,
+        "headerContent": "page",
+        "navigationStyle": "default",
+        "titleBarStyle": "default",
+        "showReconnectNotification": true,
+        "notificationDisplayTime": 1,
+        "showDisconnectNotification": true,
+        "allowInstall": false
+    },
+    {
+        "id": "f49a05b173b6cac3",
+        "type": "ui-theme",
+        "name": "Default Theme",
+        "colors": {
+            "surface": "#ffffff",
+            "primary": "#0094ce",
+            "bgPage": "#eeeeee",
+            "groupBg": "#ffffff",
+            "groupOutline": "#cccccc"
+        },
+        "sizes": {
+            "density": "default",
+            "pagePadding": "12px",
+            "groupGap": "12px",
+            "groupBorderRadius": "4px",
+            "widgetGap": "12px"
+        }
+    },
+    {
+        "id": "2372b8eb214a55ee",
+        "type": "global-config",
+        "env": [],
+        "modules": {
+            "@flowfuse/node-red-dashboard": "1.30.2"
+        }
+    }
+]

src/officesense_pi/src/api/livedata/livadata.routes.ts

@@ -0,0 +1,10 @@
+import express from "express";
+import { getEntities, getEntitiesOfType, getEntity } from "./livedata.controller.js";
+
+const router = express.Router();
+
+router.get("/entities", getEntities);
+router.get("/entities", getEntitiesOfType);
+router.get("/entities/:urn", getEntity);
+
+export default router;

src/officesense_pi/src/api/livedata/livedata.controller.ts

@@ -0,0 +1,172 @@
+import type { Request, Response, NextFunction } from "express";
+import { getActiveUserData, getRedisRoomData, type RedisRoomData, type RedisUserData } from "./livedata.repository.js";
+import { prisma } from "../../lib/prisma.js";
+
+interface Params {
+    urn: string;
+}
+
+type Relationship = {
+    type: "Relationship";
+    object: string;
+};
+
+type Property<T = any> = {
+    type: "Property";
+    value: T;
+};
+
+interface Entity {
+    id: string;
+    type: string;
+    name: {
+        type: "Property";
+        value: string;
+    };
+}
+
+interface User extends Entity {
+    type: "User";
+    locatedIn: Relationship;
+    rssi: Property<number>;
+    authenticationStatus: Property<string>;
+    observedAt: Property<string>;
+}
+
+interface Room extends Entity {
+    type: "Room";
+    occupancy: Property<number>;
+}
+
+function convertToNGSIUser(user: RedisUserData): User {
+    return {
+        id: `urn:ngsi-ld:User:${user.userID}`,
+        type: "User",
+        name: {
+            type: "Property",
+            value: user.name
+        },
+        locatedIn: {
+            type: "Relationship",
+            object: user.room
+        },
+        rssi: {
+            type: "Property",
+            value: user.rssi,
+        },
+        authenticationStatus: {
+            type: "Property",
+            value: user.verified ? "verified" : "unverified"
+        },
+        observedAt: {
+            type: "Property",
+            value: (new Date(user.timestamp)).toISOString()
+        }
+    }
+}
+
+async function convertToNGSIRoom(room: RedisRoomData): Promise<Room | null> {
+    const roomName = await prisma.room.findUnique({
+        where: { id: room.roomID },
+        select: { name: true }
+    })
+
+    if (!roomName?.name) return null;
+
+    return {
+        id: `urn:ngsi-ld:Room:${room.roomID}`,
+        type: "Room",
+        name: {
+            type: "Property",
+            value: roomName.name
+        },
+        occupancy: {
+            type: "Property",
+            value: room.occupancy
+        }
+    }
+}
+
+async function getNGSIUsers(): Promise<User[]> {
+    let users: User[] = [];
+
+    const result: RedisUserData[] = await getActiveUserData();
+
+    for (const r of result) {
+        const user = convertToNGSIUser(r);
+
+        users.push(user);
+    }
+
+    return users;
+}
+
+async function getNGSIRooms(): Promise<Room[]> {
+    let rooms: Room[] = [];
+
+    const result: RedisRoomData[] = await getRedisRoomData();
+
+    for (const r of result) {
+        const room = await convertToNGSIRoom(r);
+        if (room == null) continue;
+
+        rooms.push(room);
+    }
+
+    return rooms;
+}
+
+export async function getEntities(req: Request, res: Response, next: NextFunction) {
+    if (Object.keys(req.query).length > 0) return next();
+
+    let entities: Entity[] = [];
+
+    entities.push(...await getNGSIUsers());
+    entities.push(...await getNGSIRooms());
+
+    return res.status(200).send(entities);
+}
+
+export async function getEntitiesOfType(req: Request, res: Response) {
+    const { type } = req.query;
+
+    switch (type) {
+        case "user": return res.status(200).send(await getNGSIUsers());
+        case "room": return res.status(200).send(await getNGSIRooms());
+        default:
+            return res.sendStatus(400);
+    }
+}
+
+export async function getEntity(req: Request<Params>, res: Response) {
+    const { urn } = req.params;
+
+    if (!urn || !urn.startsWith("urn:ngsi-ld:")) return res.sendStatus(400);
+
+    const entity = urn.slice(12);
+
+    if (!entity) return res.sendStatus(400);
+
+    if (entity.toLowerCase().startsWith("room:")) {
+        const roomID = entity.slice(5);
+
+        if (!roomID) return res.sendStatus(400);
+
+        const data = await getRedisRoomData(roomID);
+
+        if (!data.length) return res.sendStatus(404);
+
+        return res.status(200).send(await convertToNGSIRoom(data[0]!));
+    } else if (entity.toLowerCase().startsWith("user:")) {
+        const userID = entity.slice(5);
+
+        if (!userID) return res.sendStatus(400);
+
+        const data = await getActiveUserData(userID);
+
+        if (!data.length) return res.sendStatus(404);
+
+        return res.status(200).send(convertToNGSIUser(data[0]!));
+    } else
+        return res.sendStatus(400);
+}

src/officesense_pi/src/api/livedata/livedata.repository.ts

@@ -0,0 +1,106 @@
+import { prisma } from "../../lib/prisma.js";
+import { getRedis } from "../../redis/redis.js";
+
+export interface RedisUserData {
+    userID: string;
+    name: string;
+    rssi: number;
+    room: string;
+    verified: boolean;
+    timestamp: number;
+}
+
+export interface RedisRoomData {
+    roomID: string;
+    occupancy: number;
+}
+
+export async function getActiveUserData(userID?: string): Promise<RedisUserData[]> {
+    const redis = getRedis();
+
+    if (!userID) {
+        let cursor = "0";
+        let result: RedisUserData[] = [];
+
+        do {
+            const res = await redis.scan(cursor, {
+                MATCH: "user:*",
+                COUNT: 100,
+            });
+
+            cursor = res.cursor;
+
+            const values = await Promise.all(
+                res.keys.map((key) => redis.get(key))
+            );
+
+            result.push(...values
+                .filter((v): v is string => v !== null)
+                .map((v) => JSON.parse(v))
+            );
+
+        } while (cursor !== "0");
+
+        return result;
+    }
+
+    const _userID = await redis.get(`_user:${userID}`);
+
+    if (!_userID) return [];
+
+    const res = await redis.get(`user:${_userID}`);
+
+    if (!res) return [];
+
+    const resObj: RedisUserData = JSON.parse(res);
+
+    return [resObj];
+}
+
+export async function getRedisRoomData(roomID?: string): Promise<RedisRoomData[]> {
+    const redis = getRedis();
+
+    if (!roomID) {
+        let cursor = "0";
+        let result: RedisRoomData[] = [];
+
+        do {
+            const res = await redis.scan(cursor, {
+                MATCH: "room:*",
+                COUNT: 100,
+            });
+
+            cursor = res.cursor;
+
+            const values = await Promise.all(
+                res.keys.map(async (key) => ({
+                    roomID: key,
+                    occupancy: await redis.get(key),
+                }))
+            );
+
+            result.push(...values
+                .filter((v) => v.occupancy !== null)
+                .map((v) => ({
+                    roomID: v.roomID.slice(5),
+                    occupancy: Number(v.occupancy),
+                }))
+            );
+
+        } while (cursor !== "0");
+
+        return result;
+    }
+
+    const res = await redis.get(`room:${roomID}`);
+
+    if (!res) return [];
+
+    return [{ roomID: roomID, occupancy: Number(res) }];
+}
+
+export async function getRoomIDs(): Promise<{ id: string; }[]> {
+    return await prisma.room.findMany({
+        select: { id: true }
+    });
+}

src/officesense_pi/src/core/analyze.ts

@@ -1,7 +1,8 @@
-import { getRedis } from "./redis.js";
+import { getRedis } from "../redis/redis.js";
 import { prisma } from "../lib/prisma.js";
 import { RoomTransition, transitions } from "./transition.js";
 import config from "../config/config.js";
+import { type RedisUserData } from "../api/livedata/livedata.repository.js";
 
 const adjectives = [
     "Crazy",
@@ -23,6 +24,31 @@ const nouns = [
     "Phoenix"
 ];
 
+const running = new Set<string>();
+const userRooms = new Map<string, string>();
+const userPseudo = new Map<string, string>();
+
+export async function updateRoomOccupancyListener(message: string, channel: string) {
+    console.log(`[Redis] Key ${message} expired.`);
+
+    const id = message.startsWith("user:") ? message.slice(5) : message;
+    const lastRoomID = userRooms.get(id);
+    const userPseudoID = userPseudo.get(id);
+
+    const redis = getRedis();
+
+    if (!lastRoomID) {
+        console.log("[!] Key not found in local mapι")
+    } else {
+        await redis.decr(`room:${lastRoomID}`);
+    }
+
+    await redis.del(`_user:${userPseudoID}`);
+
+    userRooms.delete(id);
+    userPseudo.delete(id);
+}
+
 function generateNickname() {
     const adjective =
         adjectives[Math.floor(Math.random() * adjectives.length)];
@@ -46,77 +72,102 @@ export async function analyzeData(roomID: string, metrics: {
     tagID: string,
     rssi: number
 }) {
-    console.log(`\n=======================================================\n` +
-        `ROOM_ID: ${roomID}\nTAG_ID: ${metrics.tagID}\nRSSI: ${metrics.rssi}\n` +
-        `=======================================================\n`);
-
-    const userID = (
-        await prisma.tag.findUnique({
-            where: { id: metrics.tagID },
-            select: { userId: true },
-        })
-    )?.userId;
-
-    console.log(`[SQLite] Resolved USER_ID: ${userID}`);
-
-    if (!userID)
-        return;
-
-    const redis = getRedis();
-    const res = await redis.get(`user:${userID}`);
-
-    if (!res) {
-        const user = newUser();
-        console.log(`[Redis] Created USER: ${user.psuedoName} USER_ID: ${user.pseudoID}`);
-
-        // trigger camera
-
-        await redis.set(`user:${userID}`, JSON.stringify({
-            userID: user.pseudoID,
-            name: user.psuedoName,
-            rssi: metrics.rssi,
-            room: roomID,
-            verified: false,
-            timestamp: Date.now()
-        }), { PX: config.core.userTTL });
-
-        console.log("[Redis] Stored new user in redis.");
-
+    if (running.has(metrics.tagID)) {
+        console.log(`[!] Skipping TAG_ID: ${metrics.tagID} already in process.`);
         return;
     }
 
-    let resObj = JSON.parse(res);
-    console.log(`[Redis] User exists in redis in ROOM_ID: ${resObj["room"]}`);
+    running.add(metrics.tagID);
 
-    if (roomID == resObj["room"]) {
-        console.log("[Redis] Same room, updating redis...");
-        resObj["rssi"] = metrics.rssi;
-        resObj["timestamp"] = Date.now()
+    try {
+        console.log(`\n=======================================================\n` +
+            `ROOM_ID: ${roomID}\nTAG_ID: ${metrics.tagID}\nRSSI: ${metrics.rssi}\n` +
+            `=======================================================\n`);
 
-        await redis.set(`user:${userID}`, JSON.stringify(resObj), { PX: config.core.userTTL });
+        const userID = (
+            await prisma.tag.findUnique({
+                where: { id: metrics.tagID },
+                select: { userId: true },
+            })
+        )?.userId;
 
-        return;
+        console.log(`[SQLite] Resolved USER_ID: ${userID}`);
+
+        if (!userID)
+            return;
+
+        const redis = getRedis();
+        const res = await redis.get(`user:${userID}`);
+
+        if (!res) {
+            const user = newUser();
+            console.log(`[Redis] Created USER: ${user.psuedoName} USER_ID: ${user.pseudoID}`);
+
+            // trigger camera
+
+            await redis.set(`user:${userID}`, JSON.stringify({
+                userID: user.pseudoID,
+                name: user.psuedoName,
+                rssi: metrics.rssi,
+                room: roomID,
+                verified: false,
+                timestamp: Date.now()
+            }), { PX: config.core.userTTL });
+
+            await redis.set(`_user:${user.pseudoID}`, userID);
+
+            await redis.incr(`room:${roomID}`);
+
+            userRooms.set(userID, roomID);
+            userPseudo.set(userID, user.pseudoID);
+
+            console.log("[Redis] Stored new user in redis.");
+
+            return;
+        }
+
+        let resObj: RedisUserData = JSON.parse(res);
+        console.log(`[Redis] User exists in redis in ROOM_ID: ${resObj["room"]}`);
+
+        if (roomID == resObj["room"]) {
+            console.log("[Redis] Same room, updating redis...");
+            resObj["rssi"] = metrics.rssi;
+            resObj["timestamp"] = Date.now()
+
+            await redis.set(`user:${userID}`, JSON.stringify(resObj), { PX: config.core.userTTL });
+
+            return;
+        }
+
+        let transition = transitions.get(userID);
+
+        // update room occupancy
+
+        if (!transition) {
+            console.log("[!] Starting new transition");
+            transition = new RoomTransition();
+            transitions.set(userID, transition);
+        }
+
+        if (transition.shouldTransitionTo(roomID, metrics.rssi, resObj["rssi"], resObj["timestamp"])) {
+            // trigger camera
+
+            console.log(`[!] Transition done ${resObj["room"]} -> ${roomID}`);
+
+            await redis.decr(`room:${resObj["room"]}`);
+            await redis.incr(`room:${roomID}`);
+
+            userRooms.set(userID, roomID);
+
+            resObj["rssi"] = metrics.rssi;
+            resObj["room"] = roomID;
+            resObj["timestamp"] = Date.now()
+
+
+            await redis.set(`user:${userID}`, JSON.stringify(resObj), { PX: config.core.userTTL });
+        } else
+            console.log("[!] Transition declined");
+    } finally {
+        running.delete(metrics.tagID);
     }
-
-    let transition = transitions.get(userID);
-
-    if (!transition) {
-        console.log("[!] Starting new transition");
-        transition = new RoomTransition();
-        transitions.set(userID, transition);
-    }
-
-    if (transition.shouldTransitionTo(roomID, metrics.rssi, resObj["rssi"], resObj["timestamp"])) {
-        // trigger camera
-
-        console.log(`[!] Transition done ${resObj["room"]} -> ${roomID}`);
-
-        resObj["rssi"] = metrics.rssi;
-        resObj["room"] = roomID;
-        resObj["timestamp"] = Date.now()
-
-
-        await redis.set(`user:${userID}`, JSON.stringify(resObj), { PX: config.core.userTTL });
-    } else
-        console.log("[!] Transition declined");
 }

src/officesense_pi/src/core/bootstrap.ts

@@ -1,16 +1,27 @@
-import { initRedis } from "./redis.js";
+import { getRoomIDs } from "../api/livedata/livedata.repository.js";
+import { initRedis, initSubRedis } from "../redis/redis.js";
 import * as mqtt from "./mqtt.js";
 import { cleanupWorker } from "./transition.js";
 
 export async function bootstrap() {
     try {
-        await initRedis();
+        const redis = await initRedis();
+
+        await redis.flushDb();
+        console.log(`[!] Flushed Redis.`);
+
+        const rooms = await getRoomIDs();
+        for (const { id } of rooms)
+            await redis.set(`room:${id}`, 0);
+
+        await initSubRedis();
         await mqtt.start();
+
         cleanupWorker();
 
-        console.log("Core started.");
+        console.log("[!] Core started.");
     } catch (err: any) {
-        console.log("Bootstrap failed:", err.message);
+        console.log("[!] Bootstrap failed:", err.message);
         process.exit(1);
     }
 }

src/officesense_pi/src/core/mqtt.ts

@@ -13,13 +13,13 @@ function initMqtt(): Promise<MqttClient> {
         );
 
         client.once("connect", () => {
-            console.log("MQTT connected.");
+            console.log("[MQTT] MQTT connected.");
 
             client.subscribe(config.mqtt.topic, (err) => {
                 if (err) {
                     reject(err);
                 } else {
-                    console.log("MQTT subscribed.");
+                    console.log("[MQTT] MQTT subscribed.");
                     resolve(client);
                 }
             });
@@ -43,6 +43,6 @@ export async function start() {
             console.log(err.message);
         })
     } catch (err: any) {
-        console.log("MQTT connection failed:", err.message);
+        console.log("[MQTT] MQTT connection failed:", err.message);
     }
 }

src/officesense_pi/src/core/redis.ts

@@ -1,28 +0,0 @@
-import { createClient, type RedisClientType } from "redis";
-import config from "../config/config.js";
-
-let redisClient: RedisClientType;
-
-export async function initRedis(): Promise<RedisClientType> {
-    redisClient = createClient({
-        url: `redis://${config.redis.host}:${config.redis.port}`
-    });
-
-    redisClient.on("error", (err) => {
-        console.log("Redis error:", err.message);
-    });
-
-    await redisClient.connect();
-
-    console.log("Redis connected.");
-
-    return redisClient;
-}
-
-export function getRedis(): RedisClientType {
-    if (!redisClient) {
-        throw new Error("Redis not initialized");
-    }
-
-    return redisClient;
-}

src/officesense_pi/src/core/transition.ts

@@ -72,7 +72,7 @@ export class RoomTransition {
 
         const enoughTime = now - (this.candidate.since ?? now) >= config.core.debounceMS;
         const enoughConfirmations = this.candidate.samples >= config.core.minSamples;
-        
+
         console.log(`[TRANSITION] enoughTime = ${enoughTime}`);
         console.log(`[TRANSITION] enoughConfirmations = ${enoughConfirmations}`);
         console.log(`[TRANSITION] signalLost = ${signalLost}`);

src/officesense_pi/src/index.ts

@@ -1,12 +1,14 @@
 import express from "express";
 import lookupRoutes from "./api/lookup/lookup.routes.js";
+import livedataRoutes from "./api/livedata/livadata.routes.js"
 import config from "./config/config.js";
 import { bootstrap } from "./core/bootstrap.js";
 
 (async () => {
     const app = express();
 
-    app.use("/", lookupRoutes);
+    app.use("/lookup", lookupRoutes);
+    app.use("/livedata", livedataRoutes);
 
     app.listen(config.api.port, config.api.address, () => {
         console.log(`Server listening on ${config.api.address}:${config.api.port}`);

src/officesense_pi/src/redis/redis.ts

@@ -0,0 +1,48 @@
+import { createClient, type RedisClientType } from "redis";
+import config from "../config/config.js";
+import { updateRoomOccupancyListener } from "../core/analyze.js";
+
+let redisClient: RedisClientType;
+let subRedisClient: RedisClientType;
+
+export async function initSubRedis(): Promise<void> {
+    subRedisClient = createClient({
+        url: `redis://${config.redis.host}:${config.redis.port}`
+    });
+
+    subRedisClient.on("error", (err) => {
+        console.log("[Redis] SubRedis error:", err.message);
+    });
+
+    await subRedisClient.connect();
+
+    console.log("[Redis] SubRedis connected.");
+
+    subRedisClient.pSubscribe("__keyevent@0__:expired", updateRoomOccupancyListener);
+
+    console.log("[Redis] SubRedis listener set.");
+}
+
+export async function initRedis(): Promise<RedisClientType> {
+    redisClient = createClient({
+        url: `redis://${config.redis.host}:${config.redis.port}`
+    });
+
+    redisClient.on("error", (err) => {
+        console.log("[Redis] Redis error:", err.message);
+    });
+
+    await redisClient.connect();
+
+    console.log("[Redis] Redis connected.");
+
+    return redisClient;
+}
+
+export function getRedis(): RedisClientType {
+    if (!redisClient) {
+        throw new Error("[Redis] Redis not initialized");
+    }
+
+    return redisClient;
+}

src/officesense_vision/.gitignore

@@ -0,0 +1,8 @@
+# dlib compile cache
+.docker-cache/
+
+# face recognition models
+models/
+
+# executable
+output/

src/officesense_vision/cameraSession/Dockerfile

@@ -0,0 +1,55 @@
+ARG BUILDPLATFORM=linux/amd64
+FROM --platform=$BUILDPLATFORM golang:1.26-bookworm AS builder
+
+# Install dlib deps
+RUN dpkg --add-architecture arm64 && \
+    apt-get update && apt-get install -y \
+    g++-aarch64-linux-gnu \
+    libdlib-dev:arm64 \
+    libjpeg-dev:arm64 \
+    libblas-dev:arm64 \
+    libopenblas-dev:arm64 \
+    libatlas-base-dev:arm64 \
+    liblapack-dev:arm64 \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+# Compiler wrapper for arm64
+RUN printf '#!/bin/bash\nexec aarch64-linux-gnu-gcc "${@//-march=native/-march=armv8-a}"\n' \
+      > /usr/local/bin/arm64-gcc && \
+    printf '#!/bin/bash\nexec aarch64-linux-gnu-g++ "${@//-march=native/-march=armv8-a}"\n' \
+      > /usr/local/bin/arm64-g++ && \
+    chmod +x /usr/local/bin/arm64-gcc /usr/local/bin/arm64-g++
+
+# Compiler variables for cross-compile to arm64
+ENV CGO_ENABLED=1 \
+    GOOS=linux \
+    GOARCH=arm64 \
+    CC=/usr/local/bin/arm64-gcc \
+    CXX=/usr/local/bin/arm64-g++ \
+    PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
+
+COPY go.mod go.sum ./
+RUN go mod download
+
+# Pre-compile all CGO deps into cache
+RUN go build -v ./... 2>/dev/null || \
+    go list -m all && \
+    CGO_ENABLED=1 GOOS=linux GOARCH=arm64 \
+    go build -gcflags="-trimpath" -v \
+    $(go list -f '{{if .CgoFiles}}{{.ImportPath}}{{end}}' ./...) 2>/dev/null; exit 0
+
+RUN --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=cache,target=/go/pkg \
+    go mod download
+
+COPY . .
+
+# Build - reuse CGO cache
+RUN --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=cache,target=/go/pkg \
+    go build -o cameraSession
+
+FROM scratch AS export
+COPY --from=builder /app/cameraSession /cameraSession

src/officesense_vision/cameraSession/Makefile

@@ -0,0 +1,10 @@
+all:
+	docker buildx build --platform linux/amd64 --cache-from type=local,src=./.docker-cache --cache-to type=local,dest=./.docker-cache --target export --output type=local,dest=./output .
+
+models:
+	wget https://github.com/Kagami/go-face-testdata/raw/master/models/shape_predictor_5_face_landmarks.dat
+	wget https://github.com/Kagami/go-face-testdata/raw/master/models/dlib_face_recognition_resnet_model_v1.dat
+	wget https://github.com/Kagami/go-face-testdata/raw/master/models/mmod_human_face_detector.dat
+
+clean:
+	rm -r output/

src/officesense_vision/cameraSession/cameraSession.go

@@ -0,0 +1,163 @@
+package main
+
+import (
+	"bufio"
+	"encoding/json"
+	"fmt"
+	"log"
+	"os"
+	"sync"
+
+	"github.com/Kagami/go-face"
+	"github.com/blackjack/webcam"
+)
+
+type InputPacket struct {
+	UUID       string          `json:"uuid"`
+	Descriptor face.Descriptor `json:"descriptor"`
+}
+
+type ResultPacket struct {
+	UUID     string `json:"uuid"`
+	Verified bool   `json:"verified"`
+}
+
+var (
+	rec     *face.Recognizer
+	mtx     sync.Mutex
+	results = make([]ResultPacket, 0)
+)
+
+func captureCameraFrame() ([]byte, error) {
+	cam, err := webcam.Open("/dev/video0")
+	if err != nil {
+		return nil, err
+	}
+	defer cam.Close()
+
+	format := webcam.PixelFormat(uint32(0x47504a4d)) // MJPG
+
+	_, _, _, err = cam.SetImageFormat(format, 1280, 720)
+	if err != nil {
+		return nil, fmt.Errorf("camera format error: %v", err)
+	}
+
+	err = cam.StartStreaming()
+	if err != nil {
+		return nil, err
+	}
+	defer cam.StopStreaming()
+
+	for {
+		err = cam.WaitForFrame(5)
+		if err != nil {
+			continue
+		}
+
+		frame, err := cam.ReadFrame()
+		if err != nil {
+			return nil, err
+		}
+
+		if len(frame) != 0 {
+			result := make([]byte, len(frame))
+			copy(result, frame)
+			return result, nil
+		}
+	}
+}
+
+// verfication thread
+func verifyFace(packet InputPacket, descriptors []face.Descriptor, wg *sync.WaitGroup) {
+	defer wg.Done()
+
+	const threshold = 0.35
+
+	verified := false
+
+	for _, descriptor := range descriptors {
+		distance := face.SquaredEuclideanDistance(packet.Descriptor, descriptor)
+
+		if distance < threshold {
+			verified = true
+			break
+		}
+	}
+
+	mtx.Lock()
+	results = append(results, ResultPacket{
+		UUID:     packet.UUID,
+		Verified: verified,
+	})
+	mtx.Unlock()
+}
+
+func main() {
+	var err error
+
+	// initialize recognizer
+	rec, err = face.NewRecognizer("./models")
+	if err != nil {
+		log.Fatalf("failed to initialize recognizer: %v", err)
+	}
+	defer rec.Close()
+
+	// capture image
+	cameraImage, err := captureCameraFrame()
+	if err != nil {
+		log.Fatalf("failed to read camera: %v", err)
+	}
+
+	// recognize faces from camera input
+	faces, err := rec.RecognizeCNN(cameraImage)
+	if err != nil {
+		log.Fatalf("recognition error: %v", err)
+	}
+
+	if len(faces) == 0 {
+		fmt.Println("no face found.")
+		return
+	}
+
+	var descriptors []face.Descriptor
+
+	// extract descriptors to array
+	for _, f := range faces {
+		descriptors = append(descriptors, f.Descriptor)
+	}
+
+	// read stdin
+	scanner := bufio.NewScanner(os.Stdin)
+	var wg sync.WaitGroup
+
+	for scanner.Scan() {
+		line := scanner.Bytes()
+
+		var packet InputPacket
+
+		err := json.Unmarshal(line, &packet)
+		if err != nil {
+			log.Printf("invalid json packet: %v", err)
+			continue
+		}
+
+		wg.Add(1)
+
+		go verifyFace(packet, descriptors, &wg)
+	}
+
+	if err := scanner.Err(); err != nil {
+		log.Printf("stdin error: %v", err)
+	}
+
+	// wait threads to finish
+	wg.Wait()
+
+	// print results to stdout
+	output, err := json.Marshal(results)
+	if err != nil {
+		log.Fatalf("failed to marshal results: %v", err)
+	}
+
+	fmt.Println(string(output))
+}

src/officesense_vision/cameraSession/go.mod

@@ -0,0 +1,10 @@
+module OfficeSense/cameraSession
+
+go 1.26.3
+
+require (
+	github.com/Kagami/go-face v0.0.0-20210630145111-0c14797b4d0e
+	github.com/blackjack/webcam v0.6.1
+)
+
+require golang.org/x/sys v0.14.0 // indirect

src/officesense_vision/cameraSession/go.sum

@@ -0,0 +1,6 @@
+github.com/Kagami/go-face v0.0.0-20210630145111-0c14797b4d0e h1:lqIUFzxaqyYqUn4MhzAvSAh4wIte/iLNcIEWxpT/qbc=
+github.com/Kagami/go-face v0.0.0-20210630145111-0c14797b4d0e/go.mod h1:9wdDJkRgo3SGTcFwbQ7elVIQhIr2bbBjecuY7VoqmPU=
+github.com/blackjack/webcam v0.6.1 h1:K0T6Q0zto23U99gNAa5q/hFoye6uGcKr2aE6hFoxVoE=
+github.com/blackjack/webcam v0.6.1/go.mod h1:zs+RkUZzqpFPHPiwBZ6U5B34ZXXe9i+SiHLKnnukJuI=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

src/officesense_vision/extractEmbeddings/Dockerfile

@@ -0,0 +1,55 @@
+ARG BUILDPLATFORM=linux/amd64
+FROM --platform=$BUILDPLATFORM golang:1.26-bookworm AS builder
+
+# Install dlib deps
+RUN dpkg --add-architecture arm64 && \
+    apt-get update && apt-get install -y \
+    g++-aarch64-linux-gnu \
+    libdlib-dev:arm64 \
+    libjpeg-dev:arm64 \
+    libblas-dev:arm64 \
+    libopenblas-dev:arm64 \
+    libatlas-base-dev:arm64 \
+    liblapack-dev:arm64 \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+# Compiler wrapper for arm64
+RUN printf '#!/bin/bash\nexec aarch64-linux-gnu-gcc "${@//-march=native/-march=armv8-a}"\n' \
+      > /usr/local/bin/arm64-gcc && \
+    printf '#!/bin/bash\nexec aarch64-linux-gnu-g++ "${@//-march=native/-march=armv8-a}"\n' \
+      > /usr/local/bin/arm64-g++ && \
+    chmod +x /usr/local/bin/arm64-gcc /usr/local/bin/arm64-g++
+
+# Compiler variables for cross-compile to arm64
+ENV CGO_ENABLED=1 \
+    GOOS=linux \
+    GOARCH=arm64 \
+    CC=/usr/local/bin/arm64-gcc \
+    CXX=/usr/local/bin/arm64-g++ \
+    PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
+
+COPY go.mod go.sum ./
+RUN go mod download
+
+# Pre-compile all CGO deps into cache
+RUN go build -v ./... 2>/dev/null || \
+    go list -m all && \
+    CGO_ENABLED=1 GOOS=linux GOARCH=arm64 \
+    go build -gcflags="-trimpath" -v \
+    $(go list -f '{{if .CgoFiles}}{{.ImportPath}}{{end}}' ./...) 2>/dev/null; exit 0
+
+RUN --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=cache,target=/go/pkg \
+    go mod download
+
+COPY . .
+
+# Build - reuse CGO cache
+RUN --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=cache,target=/go/pkg \
+    go build -o extractEmbeddings
+
+FROM scratch AS export
+COPY --from=builder /app/extractEmbeddings /extractEmbeddings

src/officesense_vision/extractEmbeddings/Makefile

@@ -0,0 +1,10 @@
+all:
+	docker buildx build --platform linux/amd64 --cache-from type=local,src=./.docker-cache --cache-to type=local,dest=./.docker-cache --target export --output type=local,dest=./output .
+
+models:
+	wget https://github.com/Kagami/go-face-testdata/raw/master/models/shape_predictor_5_face_landmarks.dat
+	wget https://github.com/Kagami/go-face-testdata/raw/master/models/dlib_face_recognition_resnet_model_v1.dat
+	wget https://github.com/Kagami/go-face-testdata/raw/master/models/mmod_human_face_detector.dat
+
+clean:
+	rm -r output/

src/officesense_vision/extractEmbeddings/extractEmbeddings.go

@@ -0,0 +1,126 @@
+package main
+
+import (
+	"bytes"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"image"
+	"image/jpeg"
+	"io"
+
+	"os"
+
+	"github.com/Kagami/go-face"
+	"golang.org/x/image/draw"
+)
+
+type Result struct {
+	Success    bool            `json:"success"`
+	Descriptor face.Descriptor `json:"descriptor"`
+	Error      string          `json:"error"`
+}
+
+var res Result
+
+func atExit() {
+	resString, err := json.Marshal(res)
+	if err != nil {
+		os.Exit(1)
+	}
+
+	fmt.Println(string(resString))
+
+	os.Exit(0)
+}
+
+func resizeIfNeeded(img image.Image, max int) image.Image {
+	b := img.Bounds()
+	w := b.Dx()
+	h := b.Dy()
+
+	if w <= max && h <= max {
+		return img
+	}
+
+	var scale float64
+	if w > h {
+		scale = float64(max) / float64(w)
+	} else {
+		scale = float64(max) / float64(h)
+	}
+
+	newW := int(float64(w) * scale)
+	newH := int(float64(h) * scale)
+
+	dst := image.NewRGBA(image.Rect(0, 0, newW, newH))
+	draw.BiLinear.Scale(dst, dst.Bounds(), img, b, draw.Over, nil)
+
+	return dst
+}
+
+func main() {
+	defer atExit()
+
+	// Read input image from stdin in Base64 encoding
+	input, err := io.ReadAll(os.Stdin)
+	if err != nil {
+		res.Success = false
+		res.Error = "[STDIN]: " + err.Error()
+		return
+	}
+
+	// Decode Base64
+	image, err := base64.StdEncoding.DecodeString(string(input))
+	if err != nil {
+		res.Success = false
+		res.Error = "[BASE64]: " + err.Error()
+		return
+	}
+
+	imageJPEG, err := jpeg.Decode(bytes.NewReader(image))
+	if err != nil {
+		res.Success = false
+		res.Error = "[JPEG][DECODE]: " + err.Error()
+		return
+	}
+
+	imageJPEG = resizeIfNeeded(imageJPEG, 600)
+
+	var buf bytes.Buffer
+	err = jpeg.Encode(&buf, imageJPEG, &jpeg.Options{Quality: 90})
+	if err != nil {
+		res.Success = false
+		res.Error = "[JPEG][ENCODE]: " + err.Error()
+		return
+	}
+
+	image = buf.Bytes()
+
+	// Create recognizer - provide ./models dir
+	rec, err := face.NewRecognizer("models")
+	if err != nil {
+		res.Success = false
+		res.Error = "[DLIB][INIT]: " + err.Error()
+		return
+	}
+	defer rec.Close()
+
+	faces, err := rec.RecognizeCNN(image)
+	if err != nil {
+		res.Success = false
+		res.Error = "[DLIB][CNN]: " + err.Error()
+		return
+	} else if len(faces) == 0 {
+		res.Success = false
+		res.Error = "[DLIB][CNN]: No face found in image."
+		return
+	} else if len(faces) != 1 {
+		res.Success = false
+		res.Error = "[DLIB][CNN]: Multiple faces found in image."
+		return
+	}
+
+	res.Success = true
+	res.Descriptor = faces[0].Descriptor
+}

src/officesense_vision/extractEmbeddings/go.mod

@@ -0,0 +1,8 @@
+module OfficeSense/extractEmbeddings
+
+go 1.26.3
+
+require (
+	github.com/Kagami/go-face v0.0.0-20210630145111-0c14797b4d0e
+	golang.org/x/image v0.41.0
+)

src/officesense_vision/extractEmbeddings/go.sum

@@ -0,0 +1,4 @@
+github.com/Kagami/go-face v0.0.0-20210630145111-0c14797b4d0e h1:lqIUFzxaqyYqUn4MhzAvSAh4wIte/iLNcIEWxpT/qbc=
+github.com/Kagami/go-face v0.0.0-20210630145111-0c14797b4d0e/go.mod h1:9wdDJkRgo3SGTcFwbQ7elVIQhIr2bbBjecuY7VoqmPU=
+golang.org/x/image v0.41.0 h1:8wS72eGJMJaBxK6okTzd4WaXumUlTVlb753MlsSvTCo=
+golang.org/x/image v0.41.0/go.mod h1:uIc348UZMSvS5Z65CVZ7iDPaNobNFEPeJ4kbqTOszmA=