40 Commits
Author SHA1 Message Date
adminandGitHub 8e4c1e99e1 architecture image 2026-06-27 15:35:45 +03:00
adminandGitHub 0222f34621 pitch presentation 2026-06-27 14:53:44 +03:00
adminandGitHub 97dbdade45 one-slide display 2026-06-22 23:48:31 +03:00
adminandGitHub 4ab27bbabc Final report 2026-06-22 22:45:32 +03:00
admin 5c7af613ff fix camera timeout 2026-06-22 22:05:08 +03:00
adminandGitHub 6040ce4c1d docker compose for secondary services 2026-06-22 22:03:54 +03:00
adminandGitHub 733e76a4bd Final report 2026-06-22 22:01:14 +03:00
admin ff7d0d4ee1 influxdb implementation 2026-06-22 18:55:32 +03:00
admin 60277dfbd7 format 2026-06-22 18:53:46 +03:00
admin 67695e8d47 add influxdb 2026-06-22 18:52:47 +03:00
admin f9a14fa2f1 add bin dir copy 2026-06-19 16:42:20 +03:00
admin 2ae3674869 duplicate 2026-06-19 16:42:10 +03:00
admin 40c7fbda9c iot ips 2026-06-18 19:07:04 +03:00
admin cbb89defe1 publish bundler files with express 2026-06-18 19:03:10 +03:00
admin b4f66069d2 final dockerfile 2026-06-18 19:02:39 +03:00
admin 31fc14310b update using env vars 2026-06-18 19:01:28 +03:00
admin 0576e1becf bundler config for prod build 2026-06-18 19:01:12 +03:00
admin 2f7454147a install dotenv and bundler 2026-06-18 19:00:11 +03:00
admin 51b06ae868 upload makefile 2026-06-18 18:59:55 +03:00
admin 734d1a29ad updated dockerignore 2026-06-18 18:59:40 +03:00
admin a16e8cc4ea added password to redis 2026-06-18 18:59:16 +03:00
admin d3ced437ec static wifi config & wifi-reconnect 2026-06-03 23:22:34 +03:00
Kostas Drakontidis 691fc3318e update default values 2026-06-03 02:21:14 +03:00
Kostas Drakontidis ccb71ecbd9 update help command 2026-06-03 02:20:50 +03:00
Kostas Drakontidis 1d50ec3791 debug msg 2026-06-03 02:00:42 +03:00
Kostas Drakontidis 368806f5ed debug msg & signal lost better handling 2026-06-03 02:00:35 +03:00
Kostas Drakontidis 65e088f8e8 redis ttl fix & potential bug fix 2026-06-03 02:00:13 +03:00
Kostas Drakontidis 657c1db80d fine tuning & camera scan interval 2026-06-03 01:58:50 +03:00
Kostas Drakontidis 9cf8ddd921 change adv_interval 2026-06-03 01:54:41 +03:00
Kostas Drakontidis 600dfbe2a4 debug led & adv_interval fix 2026-06-02 23:43:13 +03:00
Kostas DrakontidisandGitHub 5b1c8e83a8 Integrate camera scripts and update progress details 2026-06-01 10:43:23 +03:00
Kostas DrakontidisandGitHub 52da5fa2cb Increase verifyTimeout to 5 minutes 2026-06-01 02:33:25 +03:00
Kostas DrakontidisandGitHub 1075c7c7ad Merge pull request #25 from dkwstas/prettier
prettier format
2026-06-01 02:31:28 +03:00
Kostas Drakontidis 3221e95d0e prettier format 2026-06-01 02:30:59 +03:00
Kostas DrakontidisandGitHub a7974c78f3 Merge pull request #24 from dkwstas/vision_integration
Vision integration
2026-06-01 02:25:54 +03:00
Kostas Drakontidis 98bffc4117 cameraSession integration 2026-06-01 02:24:33 +03:00
Kostas Drakontidis c7a0d921ea extractEmbeddings integration 2026-05-30 17:56:52 +03:00
Kostas Drakontidis a788ea2642 prettier 2026-05-30 17:56:21 +03:00
Kostas DrakontidisandGitHub 2fb15443ef Update progress.md with Week 5 details 2026-05-30 14:03:04 +03:00
Kostas DrakontidisandGitHub e3d8f41f02 Merge pull request #21 from dkwstas/adminjs
Adminjs
2026-05-30 05:50:51 +03:00
45 changed files with 1306 additions and 424 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 556 KiB

+12
View File
@@ -58,3 +58,15 @@
### Next Steps ### Next Steps
- Add verification with camera in core script - Add verification with camera in core script
## Week 5
### Completed
- camera scripts
- adminjs configuration
- integrate camera scripts to system
### In Progress
- ~connect camera scripts to core script and adminjs~
### Next Steps
- Debugging and refactor
+43
View File
@@ -0,0 +1,43 @@
---
services:
mosquitto:
image: eclipse-mosquitto:latest
container_name: mosquitto
restart: unless-stopped
ports:
- "1883:1883"
volumes:
- ./mosquitto/config:/mosquitto/config
- ./mosquitto/data:/mosquitto/data
- ./mosquitto/log:/mosquitto/log
nodered:
image: nodered/node-red:latest
container_name: nodered
restart: unless-stopped
ports:
- "1880:1880"
volumes:
- nodered_data:/data
redis:
image: redis:7
container_name: redis
restart: unless-stopped
ports:
- "6379:6379"
command: ["redis-server", "/etc/redis/redis.conf"]
volumes:
- ./redis/data:/data
- ./redis/redis.conf:/etc/redis/redis.conf
influxdb:
image: influxdb:2
container_name: influxdb
restart: unless-stopped
ports:
- "8086:8086"
volumes:
- ./influxdb/data:/var/lib/influxdb2
- ./influxdb/config:/etc/influxdb2
volumes:
nodered_data:
external: true
+9
View File
@@ -1,3 +1,12 @@
node_modules node_modules
.git .git
npm-debug.log npm-debug.log
dist
.env*
*.log
.gitignore
README.md
*.md
.prettierrc*
data
+3 -1
View File
@@ -2,4 +2,6 @@ node_modules
# Keep environment variables out of version control # Keep environment variables out of version control
.env .env
**/generated/prisma /generated/prisma
/generated/prisma
+7
View File
@@ -0,0 +1,7 @@
{
"semi": true,
"singleQuote": false,
"tabWidth": 4,
"trailingComma": "es5",
"printWidth": 100
}
+61 -5
View File
@@ -1,19 +1,75 @@
FROM node:24-slim # ─── Stage 1: Build ───────────────────────────────────────────────────────────
FROM node:24-slim AS builder
WORKDIR /app WORKDIR /app
RUN apt-get update -y && apt-get install -y openssl RUN apt-get update && apt-get install -y --no-install-recommends \
openssl \
&& rm -rf /var/lib/apt/lists/*
# Copy package files
COPY package*.json ./ COPY package*.json ./
# Install all deps (including devDependencies for build)
RUN npm ci RUN npm ci
COPY . . # Generate Prisma client (needed for TypeScript types)
COPY prisma ./prisma
RUN npx prisma generate RUN npx prisma generate
# Copy source
COPY . .
# Pre-bundle AdminJS components at build time
RUN npm run bundle:adminjs && cp .adminjs/components.bundle.js .adminjs/bundle.js
# Compile TypeScript
RUN npm run build RUN npm run build
# ─── Stage 2: Production ──────────────────────────────────────────────────────
FROM node:24-slim AS production
WORKDIR /app
# Install native runtime libs
RUN apt-get update && apt-get install -y --no-install-recommends \
libdlib19.1 \
libjpeg62-turbo \
libblas3 \
libopenblas0 \
libatlas3-base \
liblapack3 \
openssl \
&& rm -rf /var/lib/apt/lists/*
# Copy package files
COPY package*.json ./
# Install production deps only
RUN npm ci --omit=dev
# Copy compiled JS from builder
COPY --from=builder /app/dist ./dist
# AdminJS ComponentLoader validates source file paths exist at startup
COPY --from=builder /app/src ./src
# Copy pre-built AdminJS bundle
COPY --from=builder /app/.adminjs ./.adminjs
# Copy pre-built Go binaries
COPY --from=builder /app/bin ./bin
# Copy Prisma schema + generated client
COPY --from=builder /app/node_modules/.prisma ./node_modules/.prisma
COPY --from=builder /app/prisma ./prisma
# Set permissions for non-root user
RUN chown -R node:node /app/.adminjs /app/dist /app/src /app/bin
EXPOSE 80 EXPOSE 80
USER node
ENV NODE_ENV=production
ENV ADMIN_JS_SKIP_BUNDLE="true"
CMD ["node", "dist/index.js"] CMD ["node", "dist/index.js"]
+44
View File
@@ -0,0 +1,44 @@
build:
docker build -t officesense:latest .
run:
docker run --rm -it --init -p 80:80 \
-e ADMIN_EMAIL=admin@officesense.com \
-e ADMIN_PASSWORD=supersecret \
-e ADMIN_COOKIE_SECRET=some-long-random-string \
-e NODE_ENV=production \
-e DATABASE_URL=file:/app/data/officesense.sqlite \
--device /dev/video0:/dev/video0 \
-v $(shell pwd)/data:/app/data \
officesense:latest
dev:
docker run --rm -it --init -p 80:80 \
-v $(shell pwd):/app \
-w /app \
-e ADMIN_EMAIL=admin@officesense.com \
-e ADMIN_PASSWORD=supersecret \
-e ADMIN_COOKIE_SECRET=some-long-random-string \
-e NODE_ENV=development \
--device /dev/video0:/dev/video0 \
node:24-slim \
bash -c "apt-get update && apt-get install -y libdlib19.1 libjpeg62-turbo libblas3 libopenblas0 libatlas3-base liblapack3 && node --run dev"
migrate:
docker run --rm \
-e DATABASE_URL=file:/app/data/officesense.sqlite \
-v $(shell pwd)/data:/app/data \
officesense:latest \
npx prisma migrate deploy
sh:
docker run --rm -it -v $(shell pwd):/app -w /app node:24-slim sh
format:
docker run --rm -it --init \
-v $(shell pwd):/app \
-w /app \
node:24-slim \
bash -c "node --run format"
.PHONY: build run dev migrate sh format
+48
View File
@@ -11,8 +11,10 @@
"dependencies": { "dependencies": {
"@adminjs/express": "^6.1.1", "@adminjs/express": "^6.1.1",
"@adminjs/prisma": "^5.0.4", "@adminjs/prisma": "^5.0.4",
"@influxdata/influxdb-client": "^1.35.0",
"@prisma/client": "^6.19.3", "@prisma/client": "^6.19.3",
"adminjs": "^7.8.17", "adminjs": "^7.8.17",
"dotenv": "^17.4.2",
"express": "^5.2.1", "express": "^5.2.1",
"express-session": "^1.19.0", "express-session": "^1.19.0",
"mqtt": "^5.15.1", "mqtt": "^5.15.1",
@@ -20,13 +22,25 @@
"redis": "^5.12.1" "redis": "^5.12.1"
}, },
"devDependencies": { "devDependencies": {
"@adminjs/bundler": "^3.0.0",
"@types/express": "^5.0.6", "@types/express": "^5.0.6",
"@types/express-session": "^1.19.0", "@types/express-session": "^1.19.0",
"@types/node": "^25.7.0", "@types/node": "^25.7.0",
"prettier": "^3.8.3",
"tsx": "^4.21.0", "tsx": "^4.21.0",
"typescript": "^6.0.3" "typescript": "^6.0.3"
} }
}, },
"node_modules/@adminjs/bundler": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@adminjs/bundler/-/bundler-3.0.0.tgz",
"integrity": "sha512-s8ItuELPQEXDIEI2jc5TB2iA1jGtNOdZrWrweJvIeE20ORE50m1Ws6uS+bLsAuZCGh6dHOxCWOKFZ/wDQg4TKg==",
"dev": true,
"license": "SEE LICENSE IN LICENSE",
"peerDependencies": {
"adminjs": "^7.0.0"
}
},
"node_modules/@adminjs/design-system": { "node_modules/@adminjs/design-system": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/@adminjs/design-system/-/design-system-4.1.1.tgz", "resolved": "https://registry.npmjs.org/@adminjs/design-system/-/design-system-4.1.1.tgz",
@@ -2363,6 +2377,12 @@
"react": ">=0.14.0" "react": ">=0.14.0"
} }
}, },
"node_modules/@influxdata/influxdb-client": {
"version": "1.35.0",
"resolved": "https://registry.npmjs.org/@influxdata/influxdb-client/-/influxdb-client-1.35.0.tgz",
"integrity": "sha512-woWMi8PDpPQpvTsRaUw4Ig+nOGS/CWwAwS66Fa1Vr/EkW+NEwxI8YfPBsdBMn33jK2Y86/qMiiuX/ROHIkJLTw==",
"license": "MIT"
},
"node_modules/@jridgewell/gen-mapping": { "node_modules/@jridgewell/gen-mapping": {
"version": "0.3.13", "version": "0.3.13",
"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
@@ -4905,6 +4925,18 @@
"csstype": "^3.0.2" "csstype": "^3.0.2"
} }
}, },
"node_modules/dotenv": {
"version": "17.4.2",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz",
"integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==",
"license": "BSD-2-Clause",
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://dotenvx.com"
}
},
"node_modules/dunder-proto": { "node_modules/dunder-proto": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -6653,6 +6685,22 @@
"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/prettier": {
"version": "3.8.3",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz",
"integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==",
"dev": true,
"license": "MIT",
"bin": {
"prettier": "bin/prettier.cjs"
},
"engines": {
"node": ">=14"
},
"funding": {
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
"node_modules/prisma": { "node_modules/prisma": {
"version": "6.19.3", "version": "6.19.3",
"resolved": "https://registry.npmjs.org/prisma/-/prisma-6.19.3.tgz", "resolved": "https://registry.npmjs.org/prisma/-/prisma-6.19.3.tgz",
+8 -1
View File
@@ -8,21 +8,28 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "tsx src/index.ts", "dev": "tsx src/index.ts",
"bundle:adminjs": "tsx src/api/management/bundler.ts",
"build": "tsc", "build": "tsc",
"start": "node dist/index.js" "start": "node dist/index.js",
"format": "prettier --write \"src/**/*.{ts,tsx}\"",
"format:check": "prettier --check \"src/**/*.{ts,tsx}\""
}, },
"devDependencies": { "devDependencies": {
"@adminjs/bundler": "^3.0.0",
"@types/express": "^5.0.6", "@types/express": "^5.0.6",
"@types/express-session": "^1.19.0", "@types/express-session": "^1.19.0",
"@types/node": "^25.7.0", "@types/node": "^25.7.0",
"prettier": "^3.8.3",
"tsx": "^4.21.0", "tsx": "^4.21.0",
"typescript": "^6.0.3" "typescript": "^6.0.3"
}, },
"dependencies": { "dependencies": {
"@adminjs/express": "^6.1.1", "@adminjs/express": "^6.1.1",
"@adminjs/prisma": "^5.0.4", "@adminjs/prisma": "^5.0.4",
"@influxdata/influxdb-client": "^1.35.0",
"@prisma/client": "^6.19.3", "@prisma/client": "^6.19.3",
"adminjs": "^7.8.17", "adminjs": "^7.8.17",
"dotenv": "^17.4.2",
"express": "^5.2.1", "express": "^5.2.1",
"express-session": "^1.19.0", "express-session": "^1.19.0",
"mqtt": "^5.15.1", "mqtt": "^5.15.1",
-14
View File
@@ -1,14 +0,0 @@
// This file was generated by Prisma, and assumes you have installed the following:
// npm install --save-dev prisma dotenv
import "dotenv/config";
import { defineConfig } from "prisma/config";
export default defineConfig({
schema: "prisma/schema.prisma",
migrations: {
path: "prisma/migrations",
},
datasource: {
url: process.env["DATABASE_URL"],
},
});
@@ -1,5 +1,10 @@
import type { Request, Response, NextFunction } from "express"; import type { Request, Response, NextFunction } from "express";
import { getActiveUserData, getRedisRoomData, type RedisRoomData, type RedisUserData } from "./livedata.repository.js"; import {
getActiveUserData,
getRedisRoomData,
type RedisRoomData,
type RedisUserData,
} from "./livedata.repository.js";
import { prisma } from "../../lib/prisma.js"; import { prisma } from "../../lib/prisma.js";
interface Params { interface Params {
@@ -44,11 +49,11 @@ function convertToNGSIUser(user: RedisUserData): User {
type: "User", type: "User",
name: { name: {
type: "Property", type: "Property",
value: user.name value: user.name,
}, },
locatedIn: { locatedIn: {
type: "Relationship", type: "Relationship",
object: user.room object: user.room,
}, },
rssi: { rssi: {
type: "Property", type: "Property",
@@ -56,20 +61,20 @@ function convertToNGSIUser(user: RedisUserData): User {
}, },
authenticationStatus: { authenticationStatus: {
type: "Property", type: "Property",
value: user.verified ? "verified" : "unverified" value: user.verified ? "verified" : "unverified",
}, },
observedAt: { observedAt: {
type: "Property", type: "Property",
value: (new Date(user.timestamp)).toISOString() value: new Date(user.timestamp).toISOString(),
} },
} };
} }
async function convertToNGSIRoom(room: RedisRoomData): Promise<Room | null> { async function convertToNGSIRoom(room: RedisRoomData): Promise<Room | null> {
const roomName = await prisma.room.findUnique({ const roomName = await prisma.room.findUnique({
where: { id: room.roomID }, where: { id: room.roomID },
select: { name: true } select: { name: true },
}) });
if (!roomName?.name) return null; if (!roomName?.name) return null;
@@ -78,13 +83,13 @@ async function convertToNGSIRoom(room: RedisRoomData): Promise<Room | null> {
type: "Room", type: "Room",
name: { name: {
type: "Property", type: "Property",
value: roomName.name value: roomName.name,
}, },
occupancy: { occupancy: {
type: "Property", type: "Property",
value: room.occupancy value: room.occupancy,
} },
} };
} }
async function getNGSIUsers(): Promise<User[]> { async function getNGSIUsers(): Promise<User[]> {
@@ -121,8 +126,8 @@ export async function getEntities(req: Request, res: Response, next: NextFunctio
let entities: Entity[] = []; let entities: Entity[] = [];
entities.push(...await getNGSIUsers()); entities.push(...(await getNGSIUsers()));
entities.push(...await getNGSIRooms()); entities.push(...(await getNGSIRooms()));
return res.status(200).send(entities); return res.status(200).send(entities);
} }
@@ -131,8 +136,10 @@ export async function getEntitiesOfType(req: Request, res: Response) {
const { type } = req.query; const { type } = req.query;
switch (type) { switch (type) {
case "user": return res.status(200).send(await getNGSIUsers()); case "user":
case "room": return res.status(200).send(await getNGSIRooms()); return res.status(200).send(await getNGSIUsers());
case "room":
return res.status(200).send(await getNGSIRooms());
default: default:
return res.sendStatus(400); return res.sendStatus(400);
} }
@@ -167,6 +174,5 @@ export async function getEntity(req: Request<Params>, res: Response) {
if (!data.length) return res.sendStatus(404); if (!data.length) return res.sendStatus(404);
return res.status(200).send(convertToNGSIUser(data[0]!)); return res.status(200).send(convertToNGSIUser(data[0]!));
} else } else return res.sendStatus(400);
return res.sendStatus(400);
} }
@@ -30,15 +30,9 @@ export async function getActiveUserData(userID?: string): Promise<RedisUserData[
cursor = res.cursor; cursor = res.cursor;
const values = await Promise.all( const values = await Promise.all(res.keys.map((key) => redis.get(key)));
res.keys.map((key) => redis.get(key))
);
result.push(...values
.filter((v): v is string => v !== null)
.map((v) => JSON.parse(v))
);
result.push(...values.filter((v): v is string => v !== null).map((v) => JSON.parse(v)));
} while (cursor !== "0"); } while (cursor !== "0");
return result; return result;
@@ -79,14 +73,14 @@ export async function getRedisRoomData(roomID?: string): Promise<RedisRoomData[]
})) }))
); );
result.push(...values result.push(
...values
.filter((v) => v.occupancy !== null) .filter((v) => v.occupancy !== null)
.map((v) => ({ .map((v) => ({
roomID: v.roomID.slice(5), roomID: v.roomID.slice(5),
occupancy: Number(v.occupancy), occupancy: Number(v.occupancy),
})) }))
); );
} while (cursor !== "0"); } while (cursor !== "0");
return result; return result;
@@ -99,8 +93,8 @@ export async function getRedisRoomData(roomID?: string): Promise<RedisRoomData[]
return [{ roomID: roomID, occupancy: Number(res) }]; return [{ roomID: roomID, occupancy: Number(res) }];
} }
export async function getRoomIDs(): Promise<{ id: string; }[]> { export async function getRoomIDs(): Promise<{ id: string }[]> {
return await prisma.room.findMany({ return await prisma.room.findMany({
select: { id: true } select: { id: true },
}); });
} }
@@ -2,7 +2,7 @@ import { prisma } from "../../lib/prisma.js";
export async function existsByUUID(uuid: string): Promise<boolean> { export async function existsByUUID(uuid: string): Promise<boolean> {
const tag = await prisma.tag.findUnique({ const tag = await prisma.tag.findUnique({
where: { id: uuid } where: { id: uuid },
}); });
return !!tag; return !!tag;
@@ -2,7 +2,7 @@ import AdminJS from "adminjs";
import AdminJSExpress from "@adminjs/express"; import AdminJSExpress from "@adminjs/express";
import * as AdminJSPrisma from "@adminjs/prisma"; import * as AdminJSPrisma from "@adminjs/prisma";
import session from "express-session"; import session from "express-session";
import { componentLoader, Components } from './components.js' import { componentLoader, Components } from "./components.bundler.js";
import userResource from "./resources/adminjs.user.resource.js"; import userResource from "./resources/adminjs.user.resource.js";
import tagResource from "./resources/adminjs.tag.resource.js"; import tagResource from "./resources/adminjs.tag.resource.js";
@@ -11,43 +11,41 @@ import roomResource from "./resources/adminjs.room.resource.js";
AdminJS.registerAdapter({ AdminJS.registerAdapter({
Database: AdminJSPrisma.Database, Database: AdminJSPrisma.Database,
Resource: AdminJSPrisma.Resource, Resource: AdminJSPrisma.Resource,
}) });
async function createAdmin() { async function createAdmin() {
const admin = new AdminJS({ const admin = new AdminJS({
rootPath: "/admin", rootPath: "/admin",
resources: [userResource, tagResource, roomResource],
branding: { companyName: "OfficeSense", logo: false }, branding: { companyName: "OfficeSense", logo: false },
dashboard: { component: Components.Dashboard },
componentLoader, componentLoader,
resources: [userResource, tagResource, roomResource],
dashboard: { component: Components.Dashboard },
}); });
await admin.watch(); if (process.env.NODE_ENV === "development") await admin.watch();
else await admin.initialize();
const router = AdminJSExpress.buildAuthenticatedRouter( const router = AdminJSExpress.buildAuthenticatedRouter(
admin, admin,
{ {
authenticate: async (email, password) => { authenticate: async (email, password) => {
if ( if (email === process.env.ADMIN_EMAIL && password === process.env.ADMIN_PASSWORD) {
email === process.env.ADMIN_EMAIL && return { email };
password === process.env.ADMIN_PASSWORD
) {
return { email }
} }
return null return null;
}, },
cookieName: 'adminjs', cookieName: "adminjs",
cookiePassword: process.env.ADMIN_COOKIE_SECRET ?? 'change-me', cookiePassword: process.env.ADMIN_COOKIE_SECRET ?? "change-me",
}, },
null, null,
{ {
resave: false, resave: false,
saveUninitialized: false, saveUninitialized: false,
secret: process.env.ADMIN_COOKIE_SECRET ?? 'change-me', secret: process.env.ADMIN_COOKIE_SECRET ?? "change-me",
} }
) );
return { admin, router } return { admin, router };
} }
const sessionMiddleware = session({ const sessionMiddleware = session({
@@ -56,4 +54,4 @@ const sessionMiddleware = session({
saveUninitialized: false, saveUninitialized: false,
}); });
export { createAdmin, sessionMiddleware } export { createAdmin, sessionMiddleware };
@@ -0,0 +1,9 @@
import { bundle } from "@adminjs/bundler";
import { componentLoader } from "./components.bundler.js";
void (async () => {
await bundle({
componentLoader,
destinationDir: "./.adminjs",
});
})();
@@ -0,0 +1,15 @@
import { ComponentLoader } from "adminjs";
import path from "path";
import * as url from "url";
const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
export const componentLoader = new ComponentLoader();
const add = (filePath: string, componentName: string): string =>
componentLoader.add(componentName, path.join(__dirname, filePath));
export const Components = {
Dashboard: add("components/Dashboard", "Dashboard"),
UploadFace: add("components/UploadFace", "UploadFace"),
FaceEmbeddingField: add("components/FaceEmbeddingField", "FaceEmbeddingField"),
};
@@ -1,11 +0,0 @@
import { ComponentLoader } from 'adminjs'
import { fileURLToPath } from 'url'
import path from 'path'
const __dirname = path.dirname(fileURLToPath(import.meta.url))
export const componentLoader = new ComponentLoader()
export const Components = {
Dashboard: componentLoader.add('Dashboard', path.join(__dirname, './components/Dashboard.tsx'), 'components'),
}
@@ -1,61 +1,68 @@
import React, { useEffect, useState } from 'react' import React, { useEffect, useState } from "react";
import { Box, H2, Text, Loader } from '@adminjs/design-system' import { Box, H2, Text, Loader } from "@adminjs/design-system";
import { ApiClient } from 'adminjs' import { ApiClient } from "adminjs";
type Session = { type Session = {
realUserId: string realUserId: string;
firstName: string firstName: string;
lastName: string lastName: string;
pseudoId: string pseudoId: string;
pseudoName: string pseudoName: string;
} };
const Dashboard = () => { const Dashboard = () => {
const [sessions, setSessions] = useState<Session[]>([]) const [sessions, setSessions] = useState<Session[]>([]);
const [loading, setLoading] = useState(true) const [loading, setLoading] = useState(true);
const [updated, setUpdated] = useState<string>('') const [updated, setUpdated] = useState<string>("");
const load = async () => { const load = async () => {
try { try {
const res = await fetch('/admin/map', { credentials: 'include' }) const res = await fetch("/admin/map", { credentials: "include" });
const data = await res.json() const data = await res.json();
setSessions(data) setSessions(data);
setUpdated(new Date().toLocaleTimeString()) setUpdated(new Date().toLocaleTimeString());
} catch (e) { } catch (e) {
console.error(e) console.error(e);
} finally { } finally {
setLoading(false) setLoading(false);
}
} }
};
useEffect(() => { useEffect(() => {
load() load();
const interval = setInterval(load, 10000) const interval = setInterval(load, 10000);
return () => clearInterval(interval) return () => clearInterval(interval);
}, []) }, []);
const initials = (first: string, last: string) => const initials = (first: string, last: string) =>
((first?.[0] ?? '') + (last?.[0] ?? '')).toUpperCase() || '?' ((first?.[0] ?? "") + (last?.[0] ?? "")).toUpperCase() || "?";
return ( return (
<Box padding="xl"> <Box padding="xl">
<Box display="flex" alignItems="center" justifyContent="space-between" marginBottom="xl"> <Box
display="flex"
alignItems="center"
justifyContent="space-between"
marginBottom="xl"
>
<Box> <Box>
<H2>OfficeSense Admin Dashboard</H2> <H2>OfficeSense Admin Dashboard</H2>
<Text color="grey60">Live Redis sessions mapped to registered users</Text> <Text color="grey60">Live Redis sessions mapped to registered users</Text>
</Box> </Box>
<Box display="flex" alignItems="center"> <Box display="flex" alignItems="center">
<Text color="grey60" fontSize="sm" marginRight="md">Updated {updated}</Text> <Text color="grey60" fontSize="sm" marginRight="md">
Updated {updated}
</Text>
<Box <Box
as="button" as="button"
onClick={load} onClick={load}
style={{ style={{
padding: '6px 14px', padding: "6px 14px",
borderRadius: '6px', borderRadius: "6px",
border: '1px solid #e5e7eb', border: "1px solid #e5e7eb",
background: '#fff', background: "#fff",
cursor: 'pointer', cursor: "pointer",
fontSize: '13px', fontSize: "13px",
}} }}
> >
Refresh Refresh
@@ -70,44 +77,89 @@ const Dashboard = () => {
) : ( ) : (
<Box <Box
style={{ style={{
background: '#fff', background: "#fff",
border: '1px solid #e5e7eb', border: "1px solid #e5e7eb",
borderRadius: '12px', borderRadius: "12px",
overflow: 'hidden', overflow: "hidden",
}} }}
> >
<table style={{ width: '100%', borderCollapse: 'collapse', fontSize: '13px' }}> <table style={{ width: "100%", borderCollapse: "collapse", fontSize: "13px" }}>
<thead> <thead>
<tr style={{ background: '#fafafa' }}> <tr style={{ background: "#fafafa" }}>
{['User', 'Real UUID', 'Pseudo UUID', 'Pseudo name'].map(h => ( {["User", "Real UUID", "Pseudo UUID", "Pseudo name"].map((h) => (
<th key={h} style={{ <th
textAlign: 'left', padding: '10px 16px', key={h}
fontSize: '11px', color: '#9ca3af', style={{
textTransform: 'uppercase', letterSpacing: '0.05em', textAlign: "left",
borderBottom: '1px solid #f3f4f6', fontWeight: 500, padding: "10px 16px",
}}>{h}</th> fontSize: "11px",
color: "#9ca3af",
textTransform: "uppercase",
letterSpacing: "0.05em",
borderBottom: "1px solid #f3f4f6",
fontWeight: 500,
}}
>
{h}
</th>
))} ))}
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{sessions.map(s => ( {sessions.map((s) => (
<tr key={s.realUserId} style={{ borderBottom: '1px solid #f9fafb' }}> <tr
<td style={{ padding: '12px 16px' }}> key={s.realUserId}
<div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}> style={{ borderBottom: "1px solid #f9fafb" }}
<div style={{ >
width: 28, height: 28, borderRadius: '50%', <td style={{ padding: "12px 16px" }}>
background: '#eff6ff', color: '#2563eb', <div
display: 'flex', alignItems: 'center', justifyContent: 'center', style={{
fontSize: '11px', fontWeight: 600, flexShrink: 0, display: "flex",
}}> alignItems: "center",
gap: "8px",
}}
>
<div
style={{
width: 28,
height: 28,
borderRadius: "50%",
background: "#eff6ff",
color: "#2563eb",
display: "flex",
alignItems: "center",
justifyContent: "center",
fontSize: "11px",
fontWeight: 600,
flexShrink: 0,
}}
>
{initials(s.firstName, s.lastName)} {initials(s.firstName, s.lastName)}
</div> </div>
{s.firstName} {s.lastName} {s.firstName} {s.lastName}
</div> </div>
</td> </td>
<td style={{ padding: '12px 16px', fontFamily: 'monospace', fontSize: '12px', color: '#6b7280' }}>{s.realUserId}</td> <td
<td style={{ padding: '12px 16px', fontFamily: 'monospace', fontSize: '12px', color: '#6b7280' }}>{s.pseudoId}</td> style={{
<td style={{ padding: '12px 16px' }}>{s.pseudoName ?? '—'}</td> padding: "12px 16px",
fontFamily: "monospace",
fontSize: "12px",
color: "#6b7280",
}}
>
{s.realUserId}
</td>
<td
style={{
padding: "12px 16px",
fontFamily: "monospace",
fontSize: "12px",
color: "#6b7280",
}}
>
{s.pseudoId}
</td>
<td style={{ padding: "12px 16px" }}>{s.pseudoName ?? "—"}</td>
</tr> </tr>
))} ))}
</tbody> </tbody>
@@ -115,7 +167,7 @@ const Dashboard = () => {
</Box> </Box>
)} )}
</Box> </Box>
) );
} };
export default Dashboard export default Dashboard;
@@ -0,0 +1,28 @@
import React from "react";
import type { BasePropertyProps } from "adminjs";
import { Label } from "@adminjs/design-system";
const FaceEmbeddingField: React.FC<BasePropertyProps> = ({ record, property }) => {
const has = !!record?.params?.faceEmbedding;
return (
<div style={{ marginBottom: "16px" }}>
<Label>{property.label}</Label>
<div style={{ marginTop: 6 }}>
<span
style={{
fontSize: "12px",
fontWeight: 600,
padding: "3px 10px",
borderRadius: "4px",
background: has ? "#dcfce7" : "#fee2e2",
color: has ? "#16a34a" : "#dc2626",
}}
>
{has ? "SET" : "UNSET"}
</span>
</div>
</div>
);
};
export default FaceEmbeddingField;
@@ -0,0 +1,100 @@
import React, { useState, useRef } from "react";
import { Box, H3, Text, Button, MessageBox } from "@adminjs/design-system";
import type { ActionProps } from "adminjs";
const UploadFace: React.FC<ActionProps> = ({ record, action }) => {
const [preview, setPreview] = useState<string | null>(null);
const [base64, setBase64] = useState<string | null>(null);
const [loading, setLoading] = useState(false);
const [notice, setNotice] = useState<{ message: string; type: "success" | "error" } | null>(
null
);
const inputRef = useRef<HTMLInputElement>(null);
const handleFile = (e: React.ChangeEvent<HTMLInputElement>) => {
const file = e.target.files?.[0];
if (!file) return;
const reader = new FileReader();
reader.onload = () => {
const result = reader.result as string;
setPreview(result);
setBase64(result.split(",")[1] ?? null); // strip data:image/jpeg;base64,
};
reader.readAsDataURL(file);
};
const handleSubmit = async () => {
if (!base64) return;
setLoading(true);
setNotice(null);
try {
const res = await fetch(
`/admin/api/resources/User/records/${record?.params.id}/uploadFace`,
{
method: "POST",
headers: { "Content-Type": "application/json" },
credentials: "include",
body: JSON.stringify({ base64 }),
}
);
const data = await res.json();
setNotice(data.notice);
} catch (e: any) {
setNotice({ message: e.message, type: "error" });
} finally {
setLoading(false);
}
};
return (
<Box padding="xl">
<H3 marginBottom="md">Upload face image</H3>
<Text color="grey60" marginBottom="lg">
Upload a JPEG photo of the user to generate and store their face embedding.
</Text>
{notice && (
<MessageBox
message={notice.message}
variant={notice.type === "success" ? "success" : "danger"}
marginBottom="lg"
/>
)}
<Box marginBottom="lg">
<input
ref={inputRef}
type="file"
accept="image/jpeg"
onChange={handleFile}
style={{ display: "none" }}
/>
<Button onClick={() => inputRef.current?.click()} variant="outlined">
Choose JPEG
</Button>
</Box>
{preview && (
<Box marginBottom="lg">
<img
src={preview}
alt="Preview"
style={{
width: 160,
height: 160,
objectFit: "cover",
borderRadius: 8,
border: "1px solid #e5e7eb",
}}
/>
</Box>
)}
<Button onClick={handleSubmit} disabled={!base64 || loading} variant="contained">
{loading ? "Processing…" : "Save embedding"}
</Button>
</Box>
);
};
export default UploadFace;
@@ -13,4 +13,4 @@ export default {
editProperties: ["name"], editProperties: ["name"],
filterProperties: ["name"], filterProperties: ["name"],
}, },
} };
@@ -18,4 +18,4 @@ export default {
}, },
}, },
}, },
} };
@@ -1,5 +1,49 @@
import { prisma } from "../../../lib/prisma.js"; import { prisma } from "../../../lib/prisma.js";
import { getModelByName } from "@adminjs/prisma"; import { getModelByName } from "@adminjs/prisma";
import { spawn } from "child_process";
import { Components } from "../components.bundler.js";
import { fileURLToPath } from "url";
import path from "path";
const __dirname = path.dirname(fileURLToPath(import.meta.url));
const execPath = "../../../../bin";
const binaryPath = path.join(__dirname, execPath, "extractEmbeddings");
async function extractEmbedding(base64: string): Promise<string> {
return new Promise((resolve, reject) => {
const proc = spawn(binaryPath, [], {
cwd: path.join(__dirname, execPath),
});
let stdout = "";
let stderr = "";
proc.stdout.on("data", (d) => (stdout += d));
proc.stderr.on("data", (d) => (stderr += d));
proc.stdin.on("error", (err) => {});
proc.on("error", (err) => {
reject(new Error(`Failed to start binary: ${err.message}`));
});
proc.on("close", (code) => {
console.log("extractEmbeddings exited with code", code);
console.log("stdout:", stdout);
console.log("stderr:", stderr);
if (code !== 0) return reject(new Error(stderr || `exited with code ${code}`));
try {
const result = JSON.parse(stdout);
if (!result.success) return reject(new Error(result.error));
resolve(JSON.stringify(result.descriptor));
} catch (e) {
reject(new Error(`Failed to parse output: ${stdout}`));
}
});
proc.stdin.write(base64);
proc.stdin.end();
});
}
export default { export default {
resource: { resource: {
@@ -10,14 +54,56 @@ export default {
titleProperty: "id", titleProperty: "id",
navigation: { icon: "User" }, navigation: { icon: "User" },
listProperties: ["id", "firstName", "lastName"], listProperties: ["id", "firstName", "lastName"],
showProperties: ["id", "firstName", "lastName"], showProperties: ["id", "firstName", "lastName", "faceEmbedding"],
editProperties: ["firstName", "lastName"], editProperties: ["firstName", "lastName"],
filterProperties: ["firstName", "lastName"], filterProperties: ["firstName", "lastName"],
properties: { properties: {
faceEmbedding: { faceEmbedding: {
isVisible: false, isVisible: { list: false, show: true, edit: false, filter: false },
type: "string" type: "string",
components: {
list: Components.FaceEmbeddingField,
show: Components.FaceEmbeddingField,
}, },
},
},
actions: {
uploadFace: {
actionType: "record",
icon: "Camera",
label: "Upload face",
showInDrawer: true,
handler: async (request: any, response: any, context: any) => {
const { record, currentAdmin } = context;
if (request.method === "post") {
const { base64 } = request.payload;
if (!base64) {
return {
record: record.toJSON(currentAdmin),
notice: { message: "No image provided", type: "error" },
};
} }
try {
const embedding = await extractEmbedding(base64);
await prisma.user.update({
where: { id: record.params.id },
data: { faceEmbedding: embedding },
});
return {
record: record.toJSON(currentAdmin),
notice: { message: "Face embedding saved!", type: "success" },
};
} catch (e: any) {
return {
record: record.toJSON(currentAdmin),
notice: { message: `Failed: ${e.message}`, type: "error" },
};
}
}
return { record: record.toJSON(currentAdmin) };
}, },
} component: Components.UploadFace,
},
},
},
};
@@ -3,7 +3,7 @@ import { generateMap } from "./mapper.repository.js";
export function checkSession(req: Request, res: Response, next: NextFunction) { export function checkSession(req: Request, res: Response, next: NextFunction) {
if (!(req.session as any)?.adminUser) { if (!(req.session as any)?.adminUser) {
return res.status(401).json({ error: 'Unauthorized' }) return res.status(401).json({ error: "Unauthorized" });
} }
next(); next();
} }
@@ -12,6 +12,6 @@ export async function getRedisMapping(req: Request, res: Response) {
try { try {
res.status(200).send(await generateMap()); res.status(200).send(await generateMap());
} catch (err) { } catch (err) {
res.status(500).json({ error: 'Failed to fetch sessions' }) res.status(500).json({ error: "Failed to fetch sessions" });
} }
} }
@@ -4,26 +4,28 @@ import { prisma } from "../../lib/prisma.js";
export async function generateMap() { export async function generateMap() {
const redis = getRedis(); const redis = getRedis();
const keys = await redis.keys('user:*') const keys = await redis.keys("user:*");
const sessions = await Promise.all(keys.map(async (key) => { const sessions = await Promise.all(
const raw = await redis.get(key) keys.map(async (key) => {
const session = JSON.parse(raw!) const raw = await redis.get(key);
const realUserId = key.replace('user:', '') const session = JSON.parse(raw!);
const realUserId = key.replace("user:", "");
const user = await prisma.user.findUnique({ const user = await prisma.user.findUnique({
where: { id: realUserId }, where: { id: realUserId },
select: { id: true, firstName: true, lastName: true } select: { id: true, firstName: true, lastName: true },
}) });
return { return {
realUserId, realUserId,
firstName: user?.firstName ?? 'Unknown', firstName: user?.firstName ?? "Unknown",
lastName: user?.lastName ?? 'Unknown', lastName: user?.lastName ?? "Unknown",
pseudoId: session.userID, pseudoId: session.userID,
pseudoName: session.name pseudoName: session.name,
} };
})) })
);
return sessions; return sessions;
} }
+41 -18
View File
@@ -1,3 +1,6 @@
import * as dotenv from "dotenv";
dotenv.config();
interface Config { interface Config {
api: { api: {
address: string; address: string;
@@ -13,6 +16,13 @@ interface Config {
redis: { redis: {
host: string; host: string;
port: number; port: number;
password: string;
};
influx: {
url: string;
token: string;
org: string;
bucket: string;
}; };
core: { core: {
hysteresis: number; hysteresis: number;
@@ -23,35 +33,48 @@ interface Config {
transitionCleanupInterval: number; transitionCleanupInterval: number;
lossThreshold: number; lossThreshold: number;
userTTL: number; userTTL: number;
verifyTimeout: number;
cameraInterval: number;
}; };
} }
const config: Config = { const config: Config = {
api: { api: {
address: "0.0.0.0", address: process.env.API_ADDRESS ?? "0.0.0.0",
port: 80, port: parseInt(process.env.API_PORT ?? "80"),
}, },
mqtt: { mqtt: {
host: "192.168.1.2", host: process.env.MQTT_HOST ?? "10.24.4.13",
port: 1883, port: parseInt(process.env.MQTT_PORT ?? "1883"),
username: "user", username: process.env.MQTT_USERNAME ?? "user",
password: "pass", password: process.env.MQTT_PASSWORD ?? "pass",
topic: "scanners/+", topic: process.env.MQTT_TOPIC ?? "scanners/+",
}, },
redis: { redis: {
host: "192.168.1.2", host: process.env.REDIS_HOST ?? "10.24.4.13",
port: 6379, port: parseInt(process.env.REDIS_PORT ?? "6379"),
password: process.env.REDIS_PASSWORD ?? "redispassword",
},
influx: {
url: process.env.INFLUX_URL ?? "http://10.24.4.13:8086",
token: process.env.INFLUX_TOKEN ?? "",
org: process.env.INFLUX_ORG ?? "officesense",
bucket: process.env.INFLUX_BUCKET ?? "officesense",
}, },
core: { core: {
hysteresis: 6, hysteresis: parseInt(process.env.CORE_HYSTERESIS ?? "6"),
candidateHysteresis: 3, candidateHysteresis: parseInt(process.env.CORE_CANDIDATE_HYSTERESIS ?? "5"),
debounceMS: 3000, debounceMS: parseInt(process.env.CORE_DEBOUNCE_MS ?? String(3 * 1000)),
minSamples: 4, minSamples: parseInt(process.env.CORE_MIN_SAMPLES ?? "4"),
transitionTTL: 5 * 60 * 1000, transitionTTL: parseInt(process.env.CORE_TRANSITION_TTL ?? String(5 * 60 * 1000)),
transitionCleanupInterval: 60 * 1000, transitionCleanupInterval: parseInt(
lossThreshold: 5000, process.env.CORE_TRANSITION_CLEANUP_INTERVAL ?? String(60 * 1000)
userTTL: 3 * 60 * 1000 ),
lossThreshold: parseInt(process.env.CORE_LOSS_THRESHOLD ?? String(8 * 1000)),
userTTL: parseInt(process.env.CORE_USER_TTL ?? String(3 * 60 * 1000)),
verifyTimeout: parseInt(process.env.CORE_VERIFY_TIMEOUT ?? String(5 * 60 * 1000)),
cameraInterval: parseInt(process.env.CORE_CAMERA_INTERVAL ?? String(5 * 60 * 1000)),
}, },
} };
export default config; export default config;
+78 -58
View File
@@ -3,31 +3,45 @@ import { prisma } from "../lib/prisma.js";
import { RoomTransition, transitions } from "./transition.js"; import { RoomTransition, transitions } from "./transition.js";
import config from "../config/config.js"; import config from "../config/config.js";
import { type RedisUserData } from "../api/livedata/livedata.repository.js"; import { type RedisUserData } from "../api/livedata/livedata.repository.js";
import { getInflux } from "../influx/influx.js";
import { Point } from "@influxdata/influxdb-client";
const adjectives = [ const adjectives = ["Crazy", "Silent", "Dark", "Fast", "Lucky", "Wild", "Epic"];
"Crazy", const nouns = ["Tiger", "Wolf", "Falcon", "Shadow", "Ninja", "Dragon", "Phoenix"];
"Silent",
"Dark",
"Fast",
"Lucky",
"Wild",
"Epic"
];
const nouns = [
"Tiger",
"Wolf",
"Falcon",
"Shadow",
"Ninja",
"Dragon",
"Phoenix"
];
const running = new Set<string>(); const running = new Set<string>();
const userRooms = new Map<string, string>(); const userRooms = new Map<string, string>();
const userPseudo = new Map<string, string>(); const userPseudo = new Map<string, string>();
async function writeRoomEvent(
event: "enter" | "leave",
pseudoID: string,
roomID: string,
rssi: number
) {
try {
const room = await prisma.room.findUnique({
where: { id: roomID },
select: { name: true },
});
const roomName = room?.name ?? roomID;
const point = new Point("room_events")
.tag("pseudo_id", pseudoID)
.tag("room_id", roomID)
.tag("room_name", roomName)
.tag("event", event)
.floatField("rssi", rssi);
getInflux().writePoint(point);
console.log(`[InfluxDB] Wrote '${event}' event for pseudo ${pseudoID} in room ${roomName}`);
} catch (err) {
console.error("[InfluxDB] Failed to write event:", err);
}
}
export async function updateRoomOccupancyListener(message: string, channel: string) { export async function updateRoomOccupancyListener(message: string, channel: string) {
console.log(`[Redis] Key ${message} expired.`); console.log(`[Redis] Key ${message} expired.`);
@@ -37,10 +51,11 @@ export async function updateRoomOccupancyListener(message: string, channel: stri
const redis = getRedis(); const redis = getRedis();
if (!lastRoomID) { if (!lastRoomID) console.log("[!] Key not found in local map");
console.log("[!] Key not found in local mapι") else {
} else {
await redis.decr(`room:${lastRoomID}`); await redis.decr(`room:${lastRoomID}`);
if (userPseudoID) await writeRoomEvent("leave", userPseudoID, lastRoomID, 0);
} }
await redis.del(`_user:${userPseudoID}`); await redis.del(`_user:${userPseudoID}`);
@@ -50,39 +65,39 @@ export async function updateRoomOccupancyListener(message: string, channel: stri
} }
function generateNickname() { function generateNickname() {
const adjective = const adjective = adjectives[Math.floor(Math.random() * adjectives.length)];
adjectives[Math.floor(Math.random() * adjectives.length)]; const noun = nouns[Math.floor(Math.random() * nouns.length)];
const noun =
nouns[Math.floor(Math.random() * nouns.length)];
const number = Math.floor(Math.random() * 1000); const number = Math.floor(Math.random() * 1000);
return `${adjective}${noun}${number}`; return `${adjective}${noun}${number}`;
} }
function newUser(): { pseudoID: string, psuedoName: string } { function newUser(): { pseudoID: string; psuedoName: string } {
return { return {
pseudoID: crypto.randomUUID(), pseudoID: crypto.randomUUID(),
psuedoName: generateNickname() psuedoName: generateNickname(),
}; };
} }
export async function analyzeData(roomID: string, metrics: { export async function analyzeData(
tagID: string, roomID: string,
rssi: number metrics: {
}) { tagID: string;
rssi: number;
}
) {
if (running.has(metrics.tagID)) { if (running.has(metrics.tagID)) {
console.log(`[!] Skipping TAG_ID: ${metrics.tagID} already in process.`); console.log(`[!] Skipping TAG_ID: ${metrics.tagID} ROOM_ID: ${roomID} already in process.`);
return; return;
} }
running.add(metrics.tagID); running.add(metrics.tagID);
try { try {
console.log(`\n=======================================================\n` + console.log(
`\n=======================================================\n` +
`ROOM_ID: ${roomID}\nTAG_ID: ${metrics.tagID}\nRSSI: ${metrics.rssi}\n` + `ROOM_ID: ${roomID}\nTAG_ID: ${metrics.tagID}\nRSSI: ${metrics.rssi}\n` +
`=======================================================\n`); `=======================================================\n`
);
const userID = ( const userID = (
await prisma.tag.findUnique({ await prisma.tag.findUnique({
@@ -93,8 +108,7 @@ export async function analyzeData(roomID: string, metrics: {
console.log(`[SQLite] Resolved USER_ID: ${userID}`); console.log(`[SQLite] Resolved USER_ID: ${userID}`);
if (!userID) if (!userID) return;
return;
const redis = getRedis(); const redis = getRedis();
const res = await redis.get(`user:${userID}`); const res = await redis.get(`user:${userID}`);
@@ -103,26 +117,28 @@ export async function analyzeData(roomID: string, metrics: {
const user = newUser(); const user = newUser();
console.log(`[Redis] Created USER: ${user.psuedoName} USER_ID: ${user.pseudoID}`); console.log(`[Redis] Created USER: ${user.psuedoName} USER_ID: ${user.pseudoID}`);
// trigger camera await redis.set(
`user:${userID}`,
await redis.set(`user:${userID}`, JSON.stringify({ JSON.stringify({
userID: user.pseudoID, userID: user.pseudoID,
name: user.psuedoName, name: user.psuedoName,
rssi: metrics.rssi, rssi: metrics.rssi,
room: roomID, room: roomID,
verified: false, verified: false,
timestamp: Date.now() timestamp: Date.now(),
}), { PX: config.core.userTTL }); }),
{ PX: config.core.userTTL }
);
await redis.set(`_user:${user.pseudoID}`, userID); await redis.set(`_user:${user.pseudoID}`, userID);
await redis.incr(`room:${roomID}`); await redis.incr(`room:${roomID}`);
userRooms.set(userID, roomID); userRooms.set(userID, roomID);
userPseudo.set(userID, user.pseudoID); userPseudo.set(userID, user.pseudoID);
console.log("[Redis] Stored new user in redis."); await writeRoomEvent("enter", user.pseudoID, roomID, metrics.rssi);
console.log("[Redis] Stored new user in redis.");
return; return;
} }
@@ -132,41 +148,45 @@ export async function analyzeData(roomID: string, metrics: {
if (roomID == resObj["room"]) { if (roomID == resObj["room"]) {
console.log("[Redis] Same room, updating redis..."); console.log("[Redis] Same room, updating redis...");
resObj["rssi"] = metrics.rssi; resObj["rssi"] = metrics.rssi;
resObj["timestamp"] = Date.now() resObj["timestamp"] = Date.now();
await redis.set(`user:${userID}`, JSON.stringify(resObj), { PX: config.core.userTTL }); await redis.set(`user:${userID}`, JSON.stringify(resObj), { PX: config.core.userTTL });
return; return;
} }
let transition = transitions.get(userID); let transition = transitions.get(userID);
// update room occupancy
if (!transition) { if (!transition) {
console.log("[!] Starting new transition"); console.log("[!] Starting new transition");
transition = new RoomTransition(); transition = new RoomTransition();
transitions.set(userID, transition); transitions.set(userID, transition);
} }
if (transition.shouldTransitionTo(roomID, metrics.rssi, resObj["rssi"], resObj["timestamp"])) { if (
// trigger camera transition.shouldTransitionTo(roomID, metrics.rssi, resObj["rssi"], resObj["timestamp"])
) {
console.log(`[!] Transition done ${resObj["room"]} -> ${roomID}`); console.log(`[!] Transition done ${resObj["room"]} -> ${roomID}`);
await redis.decr(`room:${resObj["room"]}`); const previousRoomID = resObj["room"];
const pseudoID = resObj["userID"];
await redis.decr(`room:${previousRoomID}`);
await redis.incr(`room:${roomID}`); await redis.incr(`room:${roomID}`);
userRooms.set(userID, roomID); userRooms.set(userID, roomID);
resObj["rssi"] = metrics.rssi; resObj["rssi"] = metrics.rssi;
resObj["room"] = roomID; resObj["room"] = roomID;
resObj["timestamp"] = Date.now() resObj["timestamp"] = Date.now();
resObj["verified"] = false;
await redis.set(`user:${userID}`, JSON.stringify(resObj), { PX: config.core.userTTL }); await redis.set(`user:${userID}`, JSON.stringify(resObj), { PX: config.core.userTTL });
} else
await writeRoomEvent("leave", pseudoID, previousRoomID, metrics.rssi);
await writeRoomEvent("enter", pseudoID, roomID, metrics.rssi);
} else {
console.log("[!] Transition declined"); console.log("[!] Transition declined");
}
} finally { } finally {
running.delete(metrics.tagID); running.delete(metrics.tagID);
} }
+7 -2
View File
@@ -1,7 +1,9 @@
import { getRoomIDs } from "../api/livedata/livedata.repository.js"; import { getRoomIDs } from "../api/livedata/livedata.repository.js";
import { initRedis, initSubRedis } from "../redis/redis.js"; import { initRedis, initSubRedis } from "../redis/redis.js";
import { initCamera } from "./camera.js";
import * as mqtt from "./mqtt.js"; import * as mqtt from "./mqtt.js";
import { cleanupWorker } from "./transition.js"; import { cleanupWorker } from "./transition.js";
import { initInflux } from "../influx/influx.js";
export async function bootstrap() { export async function bootstrap() {
try { try {
@@ -11,14 +13,17 @@ export async function bootstrap() {
console.log(`[!] Flushed Redis.`); console.log(`[!] Flushed Redis.`);
const rooms = await getRoomIDs(); const rooms = await getRoomIDs();
for (const { id } of rooms) for (const { id } of rooms) await redis.set(`room:${id}`, 0);
await redis.set(`room:${id}`, 0);
await initSubRedis(); await initSubRedis();
await mqtt.start(); await mqtt.start();
initInflux();
cleanupWorker(); cleanupWorker();
await initCamera();
console.log("[!] Core started."); console.log("[!] Core started.");
} catch (err: any) { } catch (err: any) {
console.log("[!] Bootstrap failed:", err.message); console.log("[!] Bootstrap failed:", err.message);
+138
View File
@@ -0,0 +1,138 @@
import { fileURLToPath } from "url";
import path from "path";
import { spawn } from "child_process";
import { getRedis } from "../redis/redis.js";
import { prisma } from "../lib/prisma.js";
import config from "../config/config.js";
const __dirname = path.dirname(fileURLToPath(import.meta.url));
const execPath = "../../bin";
const binaryPath = path.join(__dirname, execPath, "cameraSession");
type InputPacket = {
uuid: string;
descriptor: number[];
};
type ResultPacket = {
uuid: string;
verified: boolean;
};
export async function getUnverifiedUserKeys(): Promise<string[]> {
const redis = getRedis();
const keys = await redis.keys("user:*");
const unverified: string[] = [];
await Promise.all(
keys.map(async (key) => {
const raw = await redis.get(key);
if (!raw) return;
const session = JSON.parse(raw);
if (!session.verified) unverified.push(key.replace("user:", ""));
})
);
return unverified;
}
export async function getUnverifiedUsersWithEmbeddings(): Promise<
{ uuid: string; descriptor: number[] }[]
> {
const userIds = await getUnverifiedUserKeys();
const users = await prisma.user.findMany({
where: {
id: { in: userIds },
faceEmbedding: { not: null },
},
select: { id: true, faceEmbedding: true },
});
return users.map((user) => ({
uuid: user.id,
descriptor: JSON.parse(user.faceEmbedding!),
}));
}
async function cameraSession(packets: InputPacket[]): Promise<ResultPacket[] | null> {
return new Promise((resolve, reject) => {
const proc = spawn(binaryPath, [], {
cwd: path.join(__dirname, execPath),
});
let stdout = "";
let stderr = "";
proc.stdout.on("data", (d) => (stdout += d));
proc.stderr.on("data", (d) => (stderr += d));
proc.stdin.on("error", () => {});
proc.on("error", (err) => {
reject(new Error(`Failed to start binary: ${err.message}`));
});
proc.on("close", (code) => {
console.log("cameraSession exited with code", code);
const trimmed = stdout.trim();
if (trimmed === "no face found.") return resolve(null);
if (code !== 0) return reject(new Error(stderr || `exited with code ${code}`));
try {
const results: ResultPacket[] = JSON.parse(trimmed);
resolve(results);
} catch (e) {
reject(new Error(`Failed to parse output: ${trimmed}`));
}
});
for (const packet of packets) {
proc.stdin.write(JSON.stringify(packet) + "\n");
}
proc.stdin.end();
});
}
const setUnverified = async (uuid: string) => {
const redis = getRedis();
const key = `user:${uuid}`;
const raw = await redis.get(key);
if (!raw) return;
const session = JSON.parse(raw);
session.verified = false;
await redis.set(key, JSON.stringify(session), { KEEPTTL: true, XX: true });
console.log(`[Camera] Unverified user ${uuid} due to timeout`);
};
const run = async () => {
const redis = getRedis();
try {
const packets = await getUnverifiedUsersWithEmbeddings();
if (packets.length > 0) {
const results = await cameraSession(packets);
if (results) {
await Promise.all(
results.map(async (r) => {
if (!r.verified) return;
const key = `user:${r.uuid}`;
const raw = await redis.get(key);
if (!raw) return;
const session = JSON.parse(raw);
session.verified = true;
await redis.set(key, JSON.stringify(session), { KEEPTTL: true, XX: true });
setTimeout(() => setUnverified(r.uuid), config.core.verifyTimeout);
console.log(`[Camera] Verified user ${r.uuid}`);
})
);
}
}
} catch (e) {
console.error("camera run error:", e);
}
setTimeout(run, config.core.cameraInterval);
};
export { run as initCamera };
+4 -7
View File
@@ -4,13 +4,10 @@ import { analyzeData } from "./analyze.js";
function initMqtt(): Promise<MqttClient> { function initMqtt(): Promise<MqttClient> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const client = mqtt.connect( const client = mqtt.connect(`mqtt://${config.mqtt.host}:${config.mqtt.port}`, {
`mqtt://${config.mqtt.host}:${config.mqtt.port}`,
{
username: config.mqtt.username, username: config.mqtt.username,
password: config.mqtt.password password: config.mqtt.password,
} });
);
client.once("connect", () => { client.once("connect", () => {
console.log("[MQTT] MQTT connected."); console.log("[MQTT] MQTT connected.");
@@ -41,7 +38,7 @@ export async function start() {
mqttClient.on("error", (err) => { mqttClient.on("error", (err) => {
console.log(err.message); console.log(err.message);
}) });
} catch (err: any) { } catch (err: any) {
console.log("[MQTT] MQTT connection failed:", err.message); console.log("[MQTT] MQTT connection failed:", err.message);
} }
+15 -7
View File
@@ -9,8 +9,7 @@ export function cleanupWorker() {
for (const [userID, transition] of transitions) { for (const [userID, transition] of transitions) {
const inactiveFor = now - transition.lastSeen; const inactiveFor = now - transition.lastSeen;
if (inactiveFor > 5 * config.core.transitionTTL) if (inactiveFor > 5 * config.core.transitionTTL) transitions.delete(userID);
transitions.delete(userID);
} }
}, config.core.transitionCleanupInterval); }, config.core.transitionCleanupInterval);
} }
@@ -31,16 +30,20 @@ export class RoomTransition {
this.candidate = { roomID: null, since: null, samples: 0, rssi: null }; this.candidate = { roomID: null, since: null, samples: 0, rssi: null };
} }
shouldTransitionTo(roomID: string, candidateRSSI: number, currRSSI: number, lastCurrentSeen: number) { shouldTransitionTo(
roomID: string,
candidateRSSI: number,
currRSSI: number,
lastCurrentSeen: number
) {
const now = Date.now(); const now = Date.now();
this.lastSeen = now; this.lastSeen = now;
const stronger = candidateRSSI > currRSSI + config.core.hysteresis; const stronger = candidateRSSI > currRSSI + config.core.hysteresis;
const signalLost = now - lastCurrentSeen > config.core.lossThreshold; const signalLost = now - lastCurrentSeen > config.core.lossThreshold;
console.log(`[TRANSITION] stronger = ${stronger}`); console.log(`[TRANSITION] stronger = ${stronger}`);
console.log(`[TRANSITION] signalLost = ${signalLost}`); console.log(`[TRANSITION] signalLost = ${signalLost} (prev=${lastCurrentSeen} now=${now})`);
if (!stronger && !signalLost) { if (!stronger && !signalLost) {
this.reset(); this.reset();
@@ -48,7 +51,8 @@ export class RoomTransition {
} }
const noCandidate = this.candidate.roomID == null; const noCandidate = this.candidate.roomID == null;
const betterCandidate = this.candidate.roomID != roomID && const betterCandidate =
this.candidate.roomID != roomID &&
this.candidate.rssi !== null && this.candidate.rssi !== null &&
candidateRSSI > this.candidate.rssi + config.core.candidateHysteresis; candidateRSSI > this.candidate.rssi + config.core.candidateHysteresis;
@@ -77,7 +81,11 @@ export class RoomTransition {
console.log(`[TRANSITION] enoughConfirmations = ${enoughConfirmations}`); console.log(`[TRANSITION] enoughConfirmations = ${enoughConfirmations}`);
console.log(`[TRANSITION] signalLost = ${signalLost}`); console.log(`[TRANSITION] signalLost = ${signalLost}`);
if ((enoughTime && enoughConfirmations) || signalLost) { if (enoughTime && enoughConfirmations) {
this.reset();
return true;
}
if (signalLost && this.candidate.roomID !== null && enoughConfirmations) {
this.reset(); this.reset();
return true; return true;
} }
+5 -5
View File
@@ -1,8 +1,8 @@
import express from "express"; import express from "express";
import lookupRouter from "./api/lookup/lookup.routes.js"; import lookupRouter from "./api/lookup/lookup.routes.js";
import livedataRouter from "./api/livedata/livadata.routes.js" import livedataRouter from "./api/livedata/livadata.routes.js";
import mapperRouter from "./api/mapper/mapper.routes.js" import mapperRouter from "./api/mapper/mapper.routes.js";
import { createAdmin, sessionMiddleware } from './api/management/adminjs.routes.js' import { createAdmin, sessionMiddleware } from "./api/management/adminjs.routes.js";
import config from "./config/config.js"; import config from "./config/config.js";
import { bootstrap } from "./core/bootstrap.js"; import { bootstrap } from "./core/bootstrap.js";
@@ -16,6 +16,7 @@ import { bootstrap } from "./core/bootstrap.js";
app.use("/lookup", lookupRouter); app.use("/lookup", lookupRouter);
app.use("/livedata", livedataRouter); app.use("/livedata", livedataRouter);
app.use("/admin", mapperRouter); app.use("/admin", mapperRouter);
app.use("/admin/frontend/assets", express.static("/app/.adminjs"));
app.use("/admin", adminRouter); app.use("/admin", adminRouter);
app.listen(config.api.port, config.api.address, () => { app.listen(config.api.port, config.api.address, () => {
@@ -23,5 +24,4 @@ import { bootstrap } from "./core/bootstrap.js";
}); });
bootstrap(); bootstrap();
})();
})()
+22
View File
@@ -0,0 +1,22 @@
import { InfluxDB, type WriteApi } from "@influxdata/influxdb-client";
import config from "../config/config.js";
let writeApi: WriteApi | null = null;
export function initInflux(): void {
const client = new InfluxDB({
url: config.influx.url,
token: config.influx.token,
});
writeApi = client.getWriteApi(config.influx.org, config.influx.bucket, "ms");
writeApi.useDefaultTags({ host: "officesense-pi" });
console.log("[InfluxDB] Write API initialized.");
}
export function getInflux(): WriteApi {
if (!writeApi) throw new Error("[InfluxDB] Not initialized. Call initInflux() first.");
return writeApi;
}
+2 -2
View File
@@ -1,5 +1,5 @@
import { PrismaClient } from '@prisma/client' import { PrismaClient } from "@prisma/client";
const prisma = new PrismaClient() const prisma = new PrismaClient();
export { prisma }; export { prisma };
+10 -6
View File
@@ -5,10 +5,16 @@ import { updateRoomOccupancyListener } from "../core/analyze.js";
let redisClient: RedisClientType; let redisClient: RedisClientType;
let subRedisClient: RedisClientType; let subRedisClient: RedisClientType;
const redisOptions = {
socket: {
host: config.redis.host,
port: config.redis.port,
},
password: config.redis.password,
};
export async function initSubRedis(): Promise<void> { export async function initSubRedis(): Promise<void> {
subRedisClient = createClient({ subRedisClient = createClient(redisOptions);
url: `redis://${config.redis.host}:${config.redis.port}`
});
subRedisClient.on("error", (err) => { subRedisClient.on("error", (err) => {
console.log("[Redis] SubRedis error:", err.message); console.log("[Redis] SubRedis error:", err.message);
@@ -24,9 +30,7 @@ export async function initSubRedis(): Promise<void> {
} }
export async function initRedis(): Promise<RedisClientType> { export async function initRedis(): Promise<RedisClientType> {
redisClient = createClient({ redisClient = createClient(redisOptions);
url: `redis://${config.redis.host}:${config.redis.port}`
});
redisClient.on("error", (err) => { redisClient.on("error", (err) => {
console.log("[Redis] Redis error:", err.message); console.log("[Redis] Redis error:", err.message);
+93 -1
View File
@@ -128,6 +128,11 @@ void mqttTask(void *)
{ {
while (!mqtt.connected()) while (!mqtt.connected())
{ {
if (WiFi.status() != WL_CONNECTED)
{
vTaskDelay(pdMS_TO_TICKS(1000));
continue;
}
// Serial.printf("MQTT Disconnected. Connecting to %s:%d\n", config.mqtt.host.c_str(), config.mqtt.port); // Serial.printf("MQTT Disconnected. Connecting to %s:%d\n", config.mqtt.host.c_str(), config.mqtt.port);
if (mqtt.connect(config.dev_name.c_str(), config.mqtt.username.c_str(), config.mqtt.password.c_str())) if (mqtt.connect(config.dev_name.c_str(), config.mqtt.username.c_str(), config.mqtt.password.c_str()))
Serial.println("MQTT connected."); Serial.println("MQTT connected.");
@@ -253,6 +258,9 @@ void saveConfig()
prefs.putString(WIFI_SSID_CONFIG_KEY, config.wifi.ssid); prefs.putString(WIFI_SSID_CONFIG_KEY, config.wifi.ssid);
prefs.putString(WIFI_PASS_CONFIG_KEY, config.wifi.password); prefs.putString(WIFI_PASS_CONFIG_KEY, config.wifi.password);
prefs.putString(WIFI_IP_CONFIG_KEY, config.wifi.ip);
prefs.putString(WIFI_GW_CONFIG_KEY, config.wifi.gateway);
prefs.putString(WIFI_SUBNET_CONFIG_KEY, config.wifi.subnet);
prefs.putString(DEV_NAME_CONFIG_KEY, config.dev_name); prefs.putString(DEV_NAME_CONFIG_KEY, config.dev_name);
prefs.putString(TAG_NAME_CONFIG_KEY, config.tag_name); prefs.putString(TAG_NAME_CONFIG_KEY, config.tag_name);
@@ -280,6 +288,9 @@ void loadConfig()
config.wifi.ssid = prefs.getString(WIFI_SSID_CONFIG_KEY, WIFI_SSID); config.wifi.ssid = prefs.getString(WIFI_SSID_CONFIG_KEY, WIFI_SSID);
config.wifi.password = prefs.getString(WIFI_PASS_CONFIG_KEY, WIFI_PASS); config.wifi.password = prefs.getString(WIFI_PASS_CONFIG_KEY, WIFI_PASS);
config.wifi.ip = prefs.getString(WIFI_IP_CONFIG_KEY, WIFI_IP);
config.wifi.gateway = prefs.getString(WIFI_GW_CONFIG_KEY, WIFI_GW);
config.wifi.subnet = prefs.getString(WIFI_SUBNET_CONFIG_KEY, WIFI_SUBNET);
config.dev_name = prefs.getString(DEV_NAME_CONFIG_KEY, DEV_NAME); config.dev_name = prefs.getString(DEV_NAME_CONFIG_KEY, DEV_NAME);
config.tag_name = prefs.getString(TAG_NAME_CONFIG_KEY, TAG_NAME); config.tag_name = prefs.getString(TAG_NAME_CONFIG_KEY, TAG_NAME);
@@ -324,6 +335,12 @@ void handleCommand(String line)
config.wifi.ssid = value; config.wifi.ssid = value;
else if (key == WIFI_PASS_CONFIG_KEY) else if (key == WIFI_PASS_CONFIG_KEY)
config.wifi.password = value; config.wifi.password = value;
else if (key == WIFI_IP_CONFIG_KEY)
config.wifi.ip = value;
else if (key == WIFI_GW_CONFIG_KEY)
config.wifi.gateway = value;
else if (key == WIFI_SUBNET_CONFIG_KEY)
config.wifi.subnet = value;
else if (key == DEV_NAME_CONFIG_KEY) else if (key == DEV_NAME_CONFIG_KEY)
config.dev_name = value; config.dev_name = value;
else if (key == TAG_NAME_CONFIG_KEY) else if (key == TAG_NAME_CONFIG_KEY)
@@ -364,6 +381,12 @@ void handleCommand(String line)
Serial.println(config.wifi.ssid); Serial.println(config.wifi.ssid);
else if (key == WIFI_PASS_CONFIG_KEY) else if (key == WIFI_PASS_CONFIG_KEY)
Serial.println(config.wifi.password); Serial.println(config.wifi.password);
else if (key == WIFI_IP_CONFIG_KEY)
Serial.println(config.wifi.ip);
else if (key == WIFI_GW_CONFIG_KEY)
Serial.println(config.wifi.gateway);
else if (key == WIFI_SUBNET_CONFIG_KEY)
Serial.println(config.wifi.subnet);
else if (key == DEV_NAME_CONFIG_KEY) else if (key == DEV_NAME_CONFIG_KEY)
Serial.println(config.dev_name); Serial.println(config.dev_name);
else if (key == TAG_NAME_CONFIG_KEY) else if (key == TAG_NAME_CONFIG_KEY)
@@ -388,6 +411,25 @@ void handleCommand(String line)
Serial.println("Commands:"); Serial.println("Commands:");
Serial.println(" set <key> <value> - Set a configuration value"); Serial.println(" set <key> <value> - Set a configuration value");
Serial.println(" show <key> - Show a configuration value"); Serial.println(" show <key> - Show a configuration value");
Serial.println(" <key>:");
Serial.println(" int.cln");
Serial.println(" int.tagto");
Serial.println(" int.urtry");
Serial.println(" int.ucclean");
Serial.println(" api.url");
Serial.println(" api.uuidchk");
Serial.println(" mq.host");
Serial.println(" mq.port");
Serial.println(" mq.user");
Serial.println(" mq.pass");
Serial.println(" mq.topic");
Serial.println(" wf.ssid");
Serial.println(" wf.pass");
Serial.println(" wf.ip");
Serial.println(" wf.gw");
Serial.println(" wf.subnet");
Serial.println(" dev.name");
Serial.println(" tag.name");
Serial.println(" save - Save configuration to non-volatile storage"); Serial.println(" save - Save configuration to non-volatile storage");
Serial.println(" reset - Reset configuration to defaults"); Serial.println(" reset - Reset configuration to defaults");
Serial.println(" reboot - Reboot the device"); Serial.println(" reboot - Reboot the device");
@@ -395,13 +437,47 @@ void handleCommand(String line)
} }
} }
void wifiBegin()
{
WiFi.mode(WIFI_STA);
WiFi.disconnect();
delay(100);
IPAddress local_ip, gateway, subnet;
local_ip.fromString(config.wifi.ip);
if (local_ip != IPAddress(0, 0, 0, 0))
{
gateway.fromString(config.wifi.gateway);
subnet.fromString(config.wifi.subnet);
WiFi.config(local_ip, gateway, subnet);
}
WiFi.begin(config.wifi.ssid.c_str(), config.wifi.password.c_str());
}
void setup() void setup()
{ {
Serial.begin(115200); Serial.begin(115200);
loadConfig(); loadConfig();
WiFi.begin(config.wifi.ssid.c_str(), config.wifi.password.c_str()); WiFi.onEvent([](WiFiEvent_t event, WiFiEventInfo_t info)
{
switch (event)
{
case ARDUINO_EVENT_WIFI_STA_CONNECTED:
Serial.println("WiFi connected.");
break;
case ARDUINO_EVENT_WIFI_STA_GOT_IP:
Serial.printf("IP: %s\n", WiFi.localIP().toString().c_str());
break;
case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
Serial.printf("WiFi disconnected, reason: %d\n", info.wifi_sta_disconnected.reason);
break;
} });
wifiBegin();
MQTT_PUB_TOPIC = config.mqtt.topic + config.dev_name; MQTT_PUB_TOPIC = config.mqtt.topic + config.dev_name;
@@ -432,6 +508,22 @@ void setup()
void loop() void loop()
{ {
BleEvent ev; BleEvent ev;
static uint32_t last_wifi_check = 0;
if (millis() - last_wifi_check >= WIFI_TEST_INTERVAL)
{
last_wifi_check = millis();
wl_status_t status = WiFi.status();
if (status == WL_CONNECT_FAILED || status == WL_NO_SSID_AVAIL)
{
Serial.printf("WiFi failed (status %d), retrying...\n", status);
WiFi.disconnect();
delay(100);
wifiBegin();
}
}
while (xQueueReceive(ble_queue, &ev, 0)) while (xQueueReceive(ble_queue, &ev, 0))
processEvent(ev); processEvent(ev);
+11 -1
View File
@@ -18,6 +18,9 @@
#define MQTT_TOPIC_CONFIG_KEY "mq.topic" #define MQTT_TOPIC_CONFIG_KEY "mq.topic"
#define WIFI_SSID_CONFIG_KEY "wf.ssid" #define WIFI_SSID_CONFIG_KEY "wf.ssid"
#define WIFI_PASS_CONFIG_KEY "wf.pass" #define WIFI_PASS_CONFIG_KEY "wf.pass"
#define WIFI_IP_CONFIG_KEY "wf.ip"
#define WIFI_GW_CONFIG_KEY "wf.gw"
#define WIFI_SUBNET_CONFIG_KEY "wf.subnet"
#define DEV_NAME_CONFIG_KEY "dev.name" #define DEV_NAME_CONFIG_KEY "dev.name"
#define TAG_NAME_CONFIG_KEY "tag.name" #define TAG_NAME_CONFIG_KEY "tag.name"
@@ -26,7 +29,7 @@
#define UUID_CACHE_RETRY_TIMEOUT 5 * 60 * 1000 // ms #define UUID_CACHE_RETRY_TIMEOUT 5 * 60 * 1000 // ms
#define UUID_CACHE_CLEAN_TIMEOUT 60 * 60 * 1000 // ms #define UUID_CACHE_CLEAN_TIMEOUT 60 * 60 * 1000 // ms
#define API_URL "http://192.168.1.2" #define API_URL "http://192.168.1.2"
#define UUID_CHECK_ENDPOINT "/check" #define UUID_CHECK_ENDPOINT "/lookup/check"
#define TAG_NAME "X6TAG" #define TAG_NAME "X6TAG"
#define MQTT_HOST "192.168.1.2" #define MQTT_HOST "192.168.1.2"
#define MQTT_PORT 1883 #define MQTT_PORT 1883
@@ -35,7 +38,11 @@
#define MQTT_TOPIC "scanners/" #define MQTT_TOPIC "scanners/"
#define WIFI_SSID "COSMOTE-489882" #define WIFI_SSID "COSMOTE-489882"
#define WIFI_PASS "x32hbh54673ngccdsfa9" #define WIFI_PASS "x32hbh54673ngccdsfa9"
#define WIFI_IP "0.0.0.0"
#define WIFI_GW "0.0.0.0"
#define WIFI_SUBNET "255.255.255.0"
#define DEV_NAME "572b29cb-6a93-480e-adf0-c5c44e9a58df" #define DEV_NAME "572b29cb-6a93-480e-adf0-c5c44e9a58df"
#define WIFI_TEST_INTERVAL 5 * 1000 // ms
struct Config struct Config
{ {
@@ -66,6 +73,9 @@ struct Config
{ {
String ssid; String ssid;
String password; String password;
String ip;
String gateway;
String subnet;
} wifi; } wifi;
String dev_name; String dev_name;
+13 -7
View File
@@ -5,6 +5,7 @@
#include "nimble/nimble_port_freertos.h" #include "nimble/nimble_port_freertos.h"
#include "services/gap/ble_svc_gap.h" #include "services/gap/ble_svc_gap.h"
#include "driver/usb_serial_jtag.h" #include "driver/usb_serial_jtag.h"
#include "driver/gpio.h"
#include "main.h" #include "main.h"
static config_t config; static config_t config;
@@ -36,8 +37,8 @@ static void start_adv(void)
params.conn_mode = BLE_GAP_CONN_MODE_NON; params.conn_mode = BLE_GAP_CONN_MODE_NON;
params.disc_mode = BLE_GAP_DISC_MODE_GEN; params.disc_mode = BLE_GAP_DISC_MODE_GEN;
params.itvl_min = 0x80; // ~100ms params.itvl_min = config.adv_interval;
params.itvl_max = 0x80; params.itvl_max = config.adv_interval;
rc = ble_gap_adv_start( rc = ble_gap_adv_start(
BLE_ADDR_PUBLIC, BLE_ADDR_PUBLIC,
@@ -54,6 +55,7 @@ static void start_adv(void)
else else
{ {
ESP_LOGI(config.name, "advertising started"); ESP_LOGI(config.name, "advertising started");
gpio_set_level(GPIO_NUM_15, 0);
} }
} }
@@ -139,7 +141,7 @@ static esp_err_t save_config()
if (err != ESP_OK) if (err != ESP_OK)
goto exit; goto exit;
err = nvs_set_u32(nvs, "adv_int", config.adv_interval); err = nvs_set_u16(nvs, "adv_int", config.adv_interval);
if (err != ESP_OK) if (err != ESP_OK)
goto exit; goto exit;
@@ -177,7 +179,7 @@ static esp_err_t load_config()
nvs_get_str(nvs, "name", config.name, &len); nvs_get_str(nvs, "name", config.name, &len);
nvs_get_u32(nvs, "adv_int", &config.adv_interval); nvs_get_u16(nvs, "adv_int", &config.adv_interval);
nvs_close(nvs); nvs_close(nvs);
@@ -219,9 +221,9 @@ void serial_task(void *arg)
} }
else if (strncmp(line, "set adv_interval ", 17) == 0) else if (strncmp(line, "set adv_interval ", 17) == 0)
{ {
uint32_t interval = atoi(line + 17); float interval = atof(line + 17);
if (interval > 0) if (interval > 0)
config.adv_interval = interval; config.adv_interval = (uint16_t)(interval / 0.625f);
} }
else if (strcmp(line, "show uuid") == 0) else if (strcmp(line, "show uuid") == 0)
{ {
@@ -235,7 +237,7 @@ void serial_task(void *arg)
} }
else if (strcmp(line, "show adv_interval") == 0) else if (strcmp(line, "show adv_interval") == 0)
{ {
int len = snprintf(buf, sizeof(buf), "%lu\n", (unsigned long)config.adv_interval); int len = snprintf(buf, sizeof(buf), "%.3f\n", config.adv_interval * 0.625f);
usb_serial_jtag_write_bytes(buf, len, 20 / portTICK_PERIOD_MS); usb_serial_jtag_write_bytes(buf, len, 20 / portTICK_PERIOD_MS);
} }
else if (strcmp(line, "save") == 0) else if (strcmp(line, "save") == 0)
@@ -293,6 +295,10 @@ void serial_task(void *arg)
void app_main(void) void app_main(void)
{ {
gpio_reset_pin(GPIO_NUM_15);
gpio_set_direction(GPIO_NUM_15, GPIO_MODE_OUTPUT);
gpio_set_level(GPIO_NUM_15, 1);
ESP_ERROR_CHECK(nvs_flash_init()); ESP_ERROR_CHECK(nvs_flash_init());
usb_serial_jtag_driver_config_t cfg = USB_SERIAL_JTAG_DRIVER_CONFIG_DEFAULT(); usb_serial_jtag_driver_config_t cfg = USB_SERIAL_JTAG_DRIVER_CONFIG_DEFAULT();
+2 -2
View File
@@ -5,14 +5,14 @@
#define DEFAULT_UUID "12345678-9abc-def0-1234-56789abcdef0" #define DEFAULT_UUID "12345678-9abc-def0-1234-56789abcdef0"
#define DEFAULT_NAME "X6TAG" #define DEFAULT_NAME "X6TAG"
#define DEFAULT_ADV_INTERVAL 0x80 #define DEFAULT_ADV_INTERVAL 800
typedef struct typedef struct
{ {
ble_uuid128_t uuid; ble_uuid128_t uuid;
char uuid_str[37]; char uuid_str[37];
char name[32]; char name[32];
uint32_t adv_interval; uint16_t adv_interval;
} config_t; } config_t;
#endif #endif