Quellcode-Ordner umbenannt

.gitignore

@@ -0,0 +1 @@
+/Server/scripts/

Server/Source/Config.ts

@@ -0,0 +1,61 @@
+export interface Config {
+    abfall: Abfall;
+    abfall_after: Abfall;
+    heizmodus: Heizprogramm;
+    fensterzf: Fensterstatus;
+    aussenklima: Aussenklima;
+}
+
+export interface Abfall {
+    uri: string;
+    text: string;
+    date: string;
+    in_days: string;
+    type: string;
+}
+
+export interface Heizprogramm {
+    uri: string;
+    state: string;
+}
+
+export interface Fensterstatus {
+    uri: string;
+    state: string;
+}
+
+export interface Aussenklima {
+    uri: string;
+    temp: string;
+    feuchte: string;
+}
+
+export const cfg: Config = {
+    "abfall": {
+        "uri": "/abfall",
+        "text": "Nächste Abholung",
+        "date": "trashschedule.0.next.dateFormat",
+        "in_days": "trashschedule.0.next.daysLeft",
+        "type": "trashschedule.0.next.typesText"
+    },
+    "abfall_after": {
+        "uri": "/danachabfall",
+        "text": "Kommende Abholung",
+        "date": "trashschedule.0.nextAfter.dateFormat",
+        "in_days": "trashschedule.0.nextAfter.daysLeft",
+        "type": "trashschedule.0.nextAfter.typesText"
+    },
+    "heizmodus": {
+        "uri": "/heizmodus",
+        "state": "hm-rega.0.3897"
+    },
+    "fensterzf": {
+        "uri": "/fensterzf",
+        "state": "0_userdata.0.OPEN_WINDOWS.COUNT"
+    },
+    "aussenklima": {
+        "uri": "/aussenklima",
+        "temp": "hm-rpc.0.000EDD89B3A1C4.1.ACTUAL_TEMPERATURE",
+        "feuchte": "hm-rpc.0.000EDD89B3A1C4.1.HUMIDITY"
+    }
+}

Server/Source/DataHandler.ts

@@ -0,0 +1,51 @@
+import { cfg } from "./Config";
+import { Database } from "./LocalDatabase";
+
+export class DataHandler {
+    private db: &Database;
+
+    constructor(db: &Database) {
+        this.db = db;
+    }
+
+    valid_uri(uri: string) {
+        let found: boolean = false;
+        for(const key of Object.keys(cfg)) {
+            if(cfg[key].uri == uri) {
+                found = true;
+                break;
+            }
+        }
+        return found;
+    }
+
+    get_data_json(uri: string): string {
+        let found: boolean = false;
+        let data: string = '{';
+        let dp;
+        for(const key of Object.keys(cfg)) {
+            if(cfg[key].uri == uri) {
+                found = true;
+                dp = cfg[key];
+                break;
+            }
+        }
+
+        let add_comma: boolean = false;
+        let o = Object.keys(dp);
+        o.forEach(d => {
+            let s = this.db.get(dp[d]);
+            if(s != null) {
+                if(add_comma) {
+                    data += ","
+                }
+                data += '"' + d + '":"' + s + '"';
+                add_comma = true;
+            }
+        });
+
+        data += '}';
+
+        return data;
+    }
+}

Server/Source/DataRequester.ts

@@ -0,0 +1,27 @@
+import { IncomingMessage, request } from "http";
+import { Database } from "./LocalDatabase";
+
+export function request_data(id: string, self: &Database): void {
+    let url: string = 'http://192.168.178.34:8082/getBulk/' + id;
+    let data: string = "";
+
+    let req = request(url, (res: IncomingMessage) => {
+        res.setEncoding('utf8');
+
+        res.on('data', (chunk) => {
+          data += chunk;
+        });
+        
+        res.on('end', () => {
+          let d = JSON.parse(data);
+          d.forEach(element => {
+            self.add(element.id, element.val)
+          });
+        });
+    });
+
+    req.on('error', (e) => {
+        console.error(`problem with request: ${e.message}`);
+      });
+    req.end();
+}

Server/Source/FileHandler.ts

@@ -0,0 +1,69 @@
+import { existsSync, readFileSync } from 'node:fs';
+
+interface Mapping {
+    ending: string;
+    encoding: string;
+}
+
+export class File {
+    type: string;
+    content: Buffer;
+
+    constructor(type: string, content: Buffer) {
+        this.content = content;
+        this.type = type;
+    }
+}
+
+export class FileHandler {
+
+    private www_folder: string = '/home/carsten/Dokumente/SmartHomeDashboard/html/';
+    private index_alias: string = 'index.html';
+
+    private mappings: Mapping[] = [
+        { ending: 'html', encoding: 'text/html' },
+        { ending: 'js', encoding: 'text/javascript' },
+        { ending: 'css', encoding: 'text/css' },
+        { ending: 'json', encoding: 'application/json' },
+        { ending: 'ico', encoding: 'image/x-icon' },
+        { ending: 'svg', encoding: 'image/svg+xml' },
+        { ending: 'txt', encoding: 'text/plain' },
+    ]
+
+
+
+    file_allowed(url: string): boolean { 
+        let allowed: boolean = false;
+        let m = url.match('\\.\\.');
+        if (m == null) {
+            allowed = true;
+        }
+        return allowed;
+    }
+
+    file_exists(url: string): boolean {
+        if(url == '/') {
+            url = this.index_alias;
+        }
+        return existsSync(this.www_folder + url);
+    }
+
+    file_get(url: string): File {
+        if(url == '/') {
+            url = this.index_alias;
+        }
+        return new File(this.get_type(url), readFileSync(this.www_folder + url));
+    }
+
+    private get_type(url: string): string {
+        if(url == '/') {
+            url = this.index_alias;
+        }
+        let type: string = 'application/octet-stream';
+        let m: Mapping = this.mappings.find((e) => e.ending == url.split('.').pop());
+        if(m != undefined) {
+            type = m.encoding;
+        }
+        return type;
+    }
+}

Server/Source/LocalDatabase.ts

@@ -0,0 +1,63 @@
+import { Config, cfg } from "./Config";
+import { request_data } from "./DataRequester";
+
+export class Database {
+    private db: Datapoint[] = [];
+
+    constructor() {
+        let groups = Object.keys(cfg);
+        groups.forEach(group => {
+            let members = Object.keys(cfg[group]);
+            members.forEach(member => {
+                if((member != "text") && (member != "uri")) {
+                    this.add(cfg[group][member])
+                }
+            });
+        });
+    }
+
+    add(id: string, value?: string, type?: string): void {
+        let found: boolean = false;
+        this.db.forEach(element => {
+                if(element.id == id) {
+                    element.value = value;
+                    element.type = type
+                    found = true;
+                }
+        });
+        if(!found) {
+            this.db.push(new Datapoint(id, value, type));
+        }
+    }
+
+    get(id: string): string {
+        for(const el of this.db) {
+            if(el.id == id) {
+                return el.value;
+            }
+        }
+        return null;
+    }
+
+    start(): void {
+        setInterval(this.cyclic_requets, 1000, this);
+    }
+
+    cyclic_requets(self: &Database): void {
+            self.db.forEach(element => {
+                request_data(element.id, self)
+        });
+    }
+}
+
+class Datapoint {
+    id: string;
+    value: string;
+    type: string;
+
+    constructor(id: string, value: string, type: string) {
+        this.id = id;
+        this.type = type;
+        this.value = value;
+    }
+}

Server/Source/RequestHandler.ts

@@ -0,0 +1,36 @@
+import { IncomingMessage, ServerResponse } from "node:http";
+import { FileHandler, File } from "./FileHandler";
+import { DataHandler } from "./DataHandler";
+import { Database } from "./LocalDatabase";
+
+export class RequestHandler {
+    static dh: DataHandler;
+    static fh: FileHandler;
+
+    constructor(db: &Database) {
+        RequestHandler.dh = new DataHandler(db);
+        RequestHandler.fh = new FileHandler();
+    }
+
+    new_request(req: IncomingMessage, res: ServerResponse): void {
+        if(RequestHandler.dh.valid_uri(req.url)) {
+            res.statusCode = 200;
+            res.setHeader('Content-Type', 'application/json');
+            res.end(RequestHandler.dh.get_data_json(req.url));
+        }
+        else if(RequestHandler.fh.file_allowed(req.url)) {
+            if(RequestHandler.fh.file_exists(req.url)) {
+                res.statusCode = 200;
+                let f: File = RequestHandler.fh.file_get(req.url)
+                res.setHeader('Content-Type', f.type);
+                res.end(f.content);
+            } else {
+                res.statusCode = 404;
+            }
+        } else {
+            res.statusCode = 403;
+        }
+        console.log(req.url, res.statusCode);
+        res.end();
+    }
+}

Server/Source/Webserver.ts

@@ -0,0 +1,22 @@
+import { createServer } from 'node:http'
+import { RequestHandler } from './RequestHandler';
+import { Database } from './LocalDatabase';
+
+export class Webserver {
+    private port: number = 8080;
+    private hostname: string = '0.0.0.0';
+    private rh: RequestHandler;
+
+    constructor(db: &Database) {
+        this.rh = new RequestHandler(db);
+    }
+
+    start_server(): void {
+
+        const server = createServer(this.rh.new_request);
+
+        server.listen(this.port, this.hostname, () => {
+            console.log('Server running at http://' + this.hostname  + ':' + this.port);
+        });
+    }
+}

Server/Source/main.ts

@@ -0,0 +1,11 @@
+import { Webserver } from "./Webserver";
+import { Database } from "./LocalDatabase";
+
+let db = new Database();
+let ws = new Webserver(db);
+
+ws.start_server();
+console.log("Server started");
+
+db.start();
+console.log("DB started");

Server/scripts/FileHandler.js

@@ -1,61 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.file_get = exports.file_exists = exports.file_allowed = exports.File = void 0;
-var node_fs_1 = require("node:fs");
-var Webserver_1 = require("./Webserver");
-var Mapping = /** @class */ (function () {
-    function Mapping() {
-    }
-    return Mapping;
-}());
-var mappings = [
-    { ending: 'html', encoding: 'text/html' },
-    { ending: 'js', encoding: 'text/javascript' },
-    { ending: 'css', encoding: 'text/css' },
-    { ending: 'json', encoding: 'application/json' },
-    { ending: 'ico', encoding: 'image/x-icon' },
-    { ending: 'svg', encoding: 'image/svg+xml' },
-    { ending: 'txt', encoding: 'text/plain' },
-];
-var File = /** @class */ (function () {
-    function File(type, content) {
-        this.content = content;
-        this.type = type;
-    }
-    return File;
-}());
-exports.File = File;
-function file_allowed(url) {
-    var allowed = false;
-    var m = url.match('\\.\\.');
-    if (m == null) {
-        allowed = true;
-    }
-    return allowed;
-}
-exports.file_allowed = file_allowed;
-function file_exists(url) {
-    if (url == '/') {
-        url = Webserver_1.index_alias;
-    }
-    return (0, node_fs_1.existsSync)(Webserver_1.www_folder + url);
-}
-exports.file_exists = file_exists;
-function file_get(url) {
-    if (url == '/') {
-        url = Webserver_1.index_alias;
-    }
-    return new File(get_type(url), (0, node_fs_1.readFileSync)(Webserver_1.www_folder + url));
-}
-exports.file_get = file_get;
-function get_type(url) {
-    if (url == '/') {
-        url = Webserver_1.index_alias;
-    }
-    var type = 'application/octet-stream';
-    var m = mappings.find(function (e) { return e.ending == url.split('.').pop(); });
-    if (m != undefined) {
-        type = m.encoding;
-    }
-    return type;
-}

Server/scripts/FileHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"FileHandler.js","sourceRoot":"","sources":["../server/FileHandler.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AAEpC,IAAM,UAAU,GAAW,iDAAiD,CAAA;AAC5E,IAAM,WAAW,GAAW,YAAY,CAAA;AAExC,SAAgB,YAAY,CAAC,GAAW;IACpC,IAAI,OAAO,GAAY,KAAK,CAAC;IAC7B,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;QAC1B,OAAO,GAAG,IAAI,CAAC;IACnB,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAND,oCAMC;AAED,SAAgB,WAAW,CAAC,GAAW;IACnC,OAAO,IAAA,oBAAU,EAAC,UAAU,GAAG,GAAG,CAAC,CAAC;AACxC,CAAC;AAFD,kCAEC"}

Server/scripts/RequestHandler.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.new_request = void 0;
-var FileHandler_1 = require("./FileHandler");
-function new_request(req, res) {
-    if ((0, FileHandler_1.file_allowed)(req.url)) {
-        if ((0, FileHandler_1.file_exists)(req.url)) {
-            res.statusCode = 200;
-            var f = (0, FileHandler_1.file_get)(req.url);
-            res.setHeader('Content-Type', f.type);
-            res.end(f.content);
-        }
-        else {
-            res.statusCode = 404;
-        }
-    }
-    else {
-        res.statusCode = 403;
-    }
-    console.log(req.url, res.statusCode);
-    res.end();
-}
-exports.new_request = new_request;

Server/scripts/Webserver.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.start_server = exports.index_alias = exports.www_folder = void 0;
-var node_http_1 = require("node:http");
-var RequestHandler_1 = require("./RequestHandler");
-exports.www_folder = '/home/carsten/Dokumente/SmartHomeDashboard/html/';
-exports.index_alias = 'index.html';
-var port = 8080;
-var hostname = '0.0.0.0';
-function start_server() {
-    var server = (0, node_http_1.createServer)(RequestHandler_1.new_request);
-    server.listen(port, hostname, function () {
-        console.log('Server running at http://' + hostname + ':' + port);
-    });
-}
-exports.start_server = start_server;

Server/scripts/Webserver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Webserver.js","sourceRoot":"","sources":["../server/Webserver.ts"],"names":[],"mappings":""}

Server/scripts/main.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var Webserver_1 = require("./Webserver");
-(0, Webserver_1.start_server)();
-console.log("Server started");

Server/scripts/main.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../server/main.ts"],"names":[],"mappings":""}

Server/server/FileHandler.ts

@@ -1,62 +0,0 @@
-import { existsSync, readFileSync } from 'node:fs';
-import { www_folder, index_alias } from './Webserver';
-
-class Mapping {
-    ending: string;
-    encoding: string;
-}
-
-const mappings: Mapping[] = [
-    { ending: 'html', encoding: 'text/html' },
-    { ending: 'js', encoding: 'text/javascript' },
-    { ending: 'css', encoding: 'text/css' },
-    { ending: 'json', encoding: 'application/json' },
-    { ending: 'ico', encoding: 'image/x-icon' },
-    { ending: 'svg', encoding: 'image/svg+xml' },
-    { ending: 'txt', encoding: 'text/plain' },
-]
-
-export class File {
-    type: string;
-    content: Buffer;
-
-    constructor(type: string, content: Buffer) {
-        this.content = content;
-        this.type = type;
-    }
-}
-
-export function file_allowed(url: string): boolean { 
-    let allowed: boolean = false;
-    let m = url.match('\\.\\.');
-    if (m == null) {
-        allowed = true;
-    }
-    return allowed;
-}
-
-export function file_exists(url: string): boolean {
-    if(url == '/') {
-        url = index_alias;
-    }
-    return existsSync(www_folder + url);
-}
-
-export function file_get(url: string): File {
-    if(url == '/') {
-        url = index_alias;
-    }
-    return new File(get_type(url), readFileSync(www_folder + url));
-}
-
-function get_type(url: string): string {
-    if(url == '/') {
-        url = index_alias;
-    }
-    let type: string = 'application/octet-stream';
-    let m: Mapping = mappings.find((e) => e.ending == url.split('.').pop());
-    if(m != undefined) {
-        type = m.encoding;
-    }
-    return type;
-}

Server/server/RequestHandler.ts

@@ -1,19 +0,0 @@
-import { IncomingMessage, ServerResponse } from "node:http";
-import { file_allowed, file_exists, file_get, File } from "./FileHandler";
-
-export function new_request(req: IncomingMessage, res: ServerResponse): void {
-    if(file_allowed(req.url)) {
-        if(file_exists(req.url)) {
-            res.statusCode = 200;
-            let f: File = file_get(req.url)
-            res.setHeader('Content-Type', f.type);
-            res.end(f.content);
-        } else {
-            res.statusCode = 404;
-        }
-    } else {
-        res.statusCode = 403;
-    }
-    console.log(req.url, res.statusCode);
-    res.end();
-}

Server/server/Webserver.ts

@@ -1,18 +0,0 @@
-import { createServer } from 'node:http'
-import { new_request } from './RequestHandler';
-
-
-export const www_folder: string = '/home/carsten/Dokumente/SmartHomeDashboard/html/';
-export const index_alias: string = 'index.html';
-const port: number = 8080;
-const hostname: string = '0.0.0.0';
-
-
-export function start_server(): void {
-    const server = createServer(new_request);
-
-    server.listen(port, hostname, () => {
-        console.log('Server running at http://' + hostname  + ':' + port);
-    });
-}
-

Server/server/main.ts

@@ -1,4 +0,0 @@
-import { start_server } from "./Webserver";
-
-start_server();
-console.log("Server started");

Server/tsconfig.json

@@ -8,6 +8,6 @@
       "outDir": "scripts"
     },
     "include": [
-      "server/**/*"
+      "Source/**/*"
     ]
 }