espid2sensor in Hauptstack aufnehmen, verschachteltes Git-Repo aufgeloest

espid2sensor lief bisher nur per eigenem Dev-Compose mit isolierter Wegwerf-Mongo. Jetzt Teil von noisesensors/docker-compose.yml, Port 3004, Zugriff auf die dort laufende mongodb-Instanz (sensor_data). DEV_AUTO_LOGIN explizit aus, SESSION_SECRET ueber neue Env-Variable statt Code-Default. Dockerfile_esp2sensor an das Muster der anderen Services angeglichen (node:22-alpine, /opt/app, npm ci, tzdata/Europe-Berlin, deluser node). espid2sensor/.git entfernt (war eigenes verschachteltes Repo) und der komplette Verzeichnisinhalt ins laermsensor-stack-Repo uebernommen. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-05 14:14:02 +00:00
parent cf55afda38
commit 0d10e17caf
30 changed files with 8158 additions and 4 deletions
@@ -0,0 +1,64 @@
+import { MongoClient } from 'mongodb';
+import { get_pflux } from '../db/mongo.js';
+import { getCollections, update_pflux, clientClose } from '../db/mongo.js';
+
+export function registerAddressRoute(app, requireLogin) {
+  const APIHOST = process.env.APIHOST || 'https://noise.fuerst-stuttgart.de/srv/';
+
+
+  const holAdresse = async (id) =>  { 
+    // Adresse wie bisher holen (über die Sensornummer via nominative)
+    let addressString = '';
+    let addrParts = {};
+    try {
+      const url = APIHOST + 'getaddress/' + `?sensorid=${id}`;
+      console.log(url)
+        const r = await fetch(url, { headers: { 'Accept': 'application/json' } });
+        if (r.ok) {
+          const data = await r.json();
+          const addrObj = data?.erg?.address || data?.address || {};
+          const street = addrObj.street ?? '';
+          const plz    = addrObj.plz ?? '';
+          const city   = addrObj.city ?? '';
+          const rightPart = [plz, city].filter(Boolean).join(' ').trim();
+          addressString = [street, rightPart].filter(Boolean).join(', ');
+          addrParts = { street, plz, city };
+        }
+      } catch (err) {
+        console.error('Address lookup failed:', err);
+      }
+      return {
+        address: addressString,
+        parts: addrParts,
+      }
+    }
+
+  app.get('/api/holAdresse/:sensorNumber', requireLogin, async (req, res) => {
+    const sensorNumber = parseInt(req.params.sensorNumber, 10);
+    if (isNaN(sensorNumber)) {
+      return res.status(400).json({ error: 'Ungültige Sensornummer' });
+    }
+    const addr = await holAdresse(sensorNumber)
+    res.json(addr)
+    })  
+
+  app.get('/api/address/:sensorNumber', requireLogin, async (req, res) => {
+    const sensorNumber = parseInt(req.params.sensorNumber, 10);
+    if (isNaN(sensorNumber)) {
+      return res.status(400).json({ error: 'Ungültige Sensornummer' });
+    }
+
+  const { propCollection, prop_fluxCollection } = getCollections();
+      
+  // Suche nach Sensornummer als _id
+  const propEntry = await propCollection.findOne({ _id: sensorNumber });
+    if (!propEntry) {
+      await clientClose()
+      return res.status(404).json({ error: 'Sensor nicht gefunden' });
+    }
+    const adr = await holAdresse(encodeURIComponent(propEntry._id))
+    adr.props = propEntry
+
+    return res.json(adr)
+  })
+}
@@ -0,0 +1,95 @@
+import { MongoAPIError, ObjectId } from 'mongodb';
+import bcrypt from 'bcrypt';
+import { getCollections, update_pflux } from '../db/mongo.js';
+
+export function registerApiRoutes(app, requireLogin) {
+  const { usersCollection, propCollection } = getCollections();
+
+  app.get('/api/check-email', async (req, res) => {
+    const email = (req.query.email || '').toLowerCase().trim();
+    if (!email) return res.json({ exists: false });
+    try {
+      const existingUser = await usersCollection.findOne({ email:`${email}` });
+      res.json({ exists: !!existingUser });
+    } catch (err) {
+      console.error(err);
+      res.status(500).json({ error: 'Fehler bei der E-Mail-Prüfung' });
+    }
+  });
+
+  app.post('/api/save', requireLogin, async (req, res) => {
+    let { espId, sensorNumber, name, description} = req.body;
+    if (!espId || !sensorNumber) {
+      return res.json({ error: 'ESP-ID und Sensornummer sind Pflichtfelder' });
+    }
+    sensorNumber = parseInt(sensorNumber, 10);
+    try {
+      const doc = {
+        id: espId,
+        name: name || '',
+        description: description || '',
+        lastUpdatedAt: new Date()
+      };
+      await update_pflux(sensorNumber, doc)
+      res.json({ success: true });
+    } catch (err) {
+      console.error(err);
+      res.status(500).json({ error: 'Fehler beim Speichern' });
+    }
+  });
+
+
+  app.get('/api/list', requireLogin, async (req, res) => {
+    const { id } = req.query;
+    if (id) {
+      try {
+        const item = await propCollection.findOne({ _id: parseInt(id) });
+        if (item) return res.json([item]);
+        return res.json([]);
+      } catch (err) {
+        console.error(err);
+        return res.status(500).json({ error: 'Fehler beim Laden' });
+      }
+    }
+
+    let gesamtZahl = 0
+    try {
+        gesamtZahl = await propCollection.countDocuments({chip: {$exists: true}})
+    } catch (err) {
+      console.error(err);
+    }
+    const page = parseInt(req.query.page) || 1;
+    const limit = parseInt(req.query.limit) || 50;
+    const skip = (page - 1) * limit;
+    try {
+      const items = await propCollection.find({chip: {$exists: true}})
+        .sort({ "chip.lastUpdatedAt": -1 })
+        .skip(skip)
+        .limit(limit)
+        .toArray();
+      const data = {items: items, anzahl: gesamtZahl}  
+      res.json(data);
+    } catch (err) {
+      console.error(err);
+      res.status(500).json({ error: 'Fehler beim Laden' });
+    }
+  });
+
+  app.delete('/api/delete/:id', requireLogin, async (req, res) => {
+    await propCollection.deleteOne({ _id: parseInt(req.params.id) });
+    res.json({ success: true });
+  });
+
+  app.post('/api/createUser', requireLogin, async (req, res) => {
+    if (!req.session.isAdmin) return res.status(403).json({ error: 'Nur Admins erlaubt' });
+    const { username, password, role } = req.body;
+    if (!username || !password) return res.status(400).json({ error: 'Benutzername und Passwort erforderlich' });
+    try {
+      const hash = await bcrypt.hash(password, 10);
+      await usersCollection.insertOne({ email: username.toLowerCase(), passwordHash: hash, role: role || 'user' });
+      res.json({ success: true });
+    } catch (err) {
+      res.status(500).json({ error: 'Fehler beim Anlegen' });
+    }
+  });
+}
@@ -0,0 +1,34 @@
+import bcrypt from 'bcrypt';
+import { getCollections } from '../db/mongo.js';
+import pkg from '../package.json' with { type: "json" }
+
+export function registerAuthRoutes(app) {
+  const { usersCollection } = getCollections();
+  const errText = 'Falsche Email oder falsches Passwort.' 
+
+
+  app.get('/login', (req, res) => {
+    const version = pkg.version
+    const vdate = pkg.date
+    res.render('login', { 
+      error: null,
+      version: version,
+      vdate: vdate
+    })
+  });
+
+  app.post('/login', async (req, res) => {
+    const { email, password } = req.body;
+    const user = await usersCollection.findOne({ email: email.toLowerCase() });
+    if (!user) return res.render('login', { error: errText });
+    const match = await bcrypt.compare(password, user.passwordHash);
+    if (!match) return res.render('login', { error: errText });
+  req.session.userId = user._id;
+  req.session.isAdmin = user.role === 'admin';
+  res.redirect('/');
+  });
+
+  app.get('/logout', (req, res) => {
+    req.session.destroy(() => res.redirect('/login'));
+  });
+}