mqtt publish for temperature change

.gitignore

@@ -42,3 +42,6 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+
+access.log
+

package.json

@@ -6,6 +6,7 @@
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build --prod",
+    "server": "cd server && npm start",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"

sample-configuration.json

@@ -0,0 +1,64 @@
+{
+    "switches": [
+        { 
+            "room": "Wohnzimmer", 
+            "switches": [
+                {
+                    "label": "kleine Lampe",
+                    "actionTopic": "dispatcher_ng/items/Gnd/LivingRoom/SmallLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/LivingRoom/SmallLight/state/feedback"
+                },
+                {
+                    "label": "große Lampe",
+                    "actionTopic": "dispatcher_ng/items/Gnd/LivingRoom/LargeLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/LivingRoom/LargeLight/state/feedback"
+                },
+                {
+                    "label": "Sterne",
+                    "actionTopic": "dispatcher_ng/items/Gnd/LivingRoom/Stars/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/LivingRoom/Stars/state/feedback"
+                },
+                {
+                    "label": "Stehlampe",
+                    "actionTopic": "dispatcher_ng/items/Gnd/LivingRoom/StandLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/LivingRoom/StandLight/state/feedback"
+                }
+            ]
+        },
+        {
+            "room": "Esszimmer",
+            "switches": [
+                {
+                    "label": "kleine Lampe",
+                    "actionTopic": "dispatcher_ng/items/Gnd/DiningRoom/SmallLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/DiningRoom/SmallLight/state/feedback"
+                },
+                {
+                    "label": "Stehlampe",
+                    "actionTopic": "dispatcher_ng/items/Gnd/DiningRoom/StandLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/DiningRoom/StandLight/state/feedback"
+                },
+                {
+                    "label": "Schranklicht",
+                    "actionTopic": "dispatcher_ng/items/Gnd/DiningRoom/CupboardLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/DiningRoom/CupboardLight/state/feedback"
+                },
+                {
+                    "label": "Naehkaestchenlicht",
+                    "actionTopic": "dispatcher_ng/items/Gnd/DiningRoom/NaehkaestchenLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/DiningRoom/NaehkaestchenLight/state/feedback"
+                },
+                {
+                    "label": "Regallicht",
+                    "actionTopic": "dispatcher_ng/items/Gnd/DiningRoom/ShelfLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/DiningRoom/ShelfLight/state/feedback"
+                }
+            ]
+        }
+    ],
+    "windows": [
+        { "label": "Fenster 1", "topic": "test/fenster1" },
+        { "label": "Fenster 2", "topic": "test/fenster2" },
+        { "label": "Fenster 3", "topic": "test/fenster3" }
+    ]
+}

server/.gitignore

@@ -0,0 +1,44 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/dist-server
+/tmp
+/out-tsc
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+# System Files
+.DS_Store
+Thumbs.db

server/package-lock.json

@@ -0,0 +1,432 @@
+{
+  "name": "server",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/node": {
+      "version": "10.3.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.3.5.tgz",
+      "integrity": "sha512-6lRwZN0Y3TuglwaaZN2XPocobmzLlhxcqDjKFjNYSsXG/TFAGYkCqkzZh4+ms8iTHHQE6gJXLHPV7TziVGeWhg==",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
+      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+      "requires": {
+        "mime-types": "2.1.18",
+        "negotiator": "0.6.1"
+      }
+    },
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+    },
+    "basic-auth": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz",
+      "integrity": "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o=",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "body-parser": {
+      "version": "1.18.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
+      "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
+      "requires": {
+        "bytes": "3.0.0",
+        "content-type": "1.0.4",
+        "debug": "2.6.9",
+        "depd": "1.1.2",
+        "http-errors": "1.6.3",
+        "iconv-lite": "0.4.19",
+        "on-finished": "2.3.0",
+        "qs": "6.5.1",
+        "raw-body": "2.3.2",
+        "type-is": "1.6.16"
+      }
+    },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+    },
+    "content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+    },
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+    },
+    "express": {
+      "version": "4.16.3",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz",
+      "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
+      "requires": {
+        "accepts": "1.3.5",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.18.2",
+        "content-disposition": "0.5.2",
+        "content-type": "1.0.4",
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "1.1.2",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "etag": "1.8.1",
+        "finalhandler": "1.1.1",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "1.1.2",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "2.0.3",
+        "qs": "6.5.1",
+        "range-parser": "1.2.0",
+        "safe-buffer": "5.1.1",
+        "send": "0.16.2",
+        "serve-static": "1.13.2",
+        "setprototypeof": "1.1.0",
+        "statuses": "1.4.0",
+        "type-is": "1.6.16",
+        "utils-merge": "1.0.1",
+        "vary": "1.1.2"
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
+      "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "statuses": "1.4.0",
+        "unpipe": "1.0.0"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+    },
+    "http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "requires": {
+        "depd": "1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": "1.4.0"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "ipaddr.js": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
+      "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs="
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+    },
+    "mime": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
+    },
+    "mime-db": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
+    },
+    "mime-types": {
+      "version": "2.1.18",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+      "requires": {
+        "mime-db": "1.33.0"
+      }
+    },
+    "morgan": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz",
+      "integrity": "sha1-0B+mxlhZt2/PMbPLU6OCGjEdgFE=",
+      "requires": {
+        "basic-auth": "2.0.0",
+        "debug": "2.6.9",
+        "depd": "1.1.2",
+        "on-finished": "2.3.0",
+        "on-headers": "1.0.1"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "negotiator": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
+      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c="
+    },
+    "parseurl": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
+      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
+    },
+    "path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
+      "requires": {
+        "process": "0.11.10",
+        "util": "0.10.4"
+      }
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+    },
+    "proxy-addr": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz",
+      "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==",
+      "requires": {
+        "forwarded": "0.1.2",
+        "ipaddr.js": "1.6.0"
+      }
+    },
+    "qs": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
+    },
+    "range-parser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
+    },
+    "raw-body": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
+      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+      "requires": {
+        "bytes": "3.0.0",
+        "http-errors": "1.6.2",
+        "iconv-lite": "0.4.19",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "depd": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+          "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
+        },
+        "http-errors": {
+          "version": "1.6.2",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
+          "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
+          "requires": {
+            "depd": "1.1.1",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.0.3",
+            "statuses": "1.4.0"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
+        }
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+    },
+    "send": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "1.1.2",
+        "destroy": "1.0.4",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "etag": "1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "1.6.3",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "2.3.0",
+        "range-parser": "1.2.0",
+        "statuses": "1.4.0"
+      }
+    },
+    "serve-static": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
+      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
+      "requires": {
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "parseurl": "1.3.2",
+        "send": "0.16.2"
+      }
+    },
+    "setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+    },
+    "statuses": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
+    },
+    "type-is": {
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "2.1.18"
+      }
+    },
+    "typescript": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+      "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+      "dev": true
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+    },
+    "util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+    }
+  }
+}

server/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "server",
+  "version": "1.0.0",
+  "description": "",
+  "main": "main.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "tsc -p ./",
+    "start": "node dist/out-tsc/main.js"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/node": "^10.3.5",
+    "typescript": "^2.9.2"
+  },
+  "dependencies": {
+    "express": "^4.16.3",
+    "morgan": "^1.9.0",
+    "path": "^0.12.7"
+  }
+}

server/src/main.ts

@@ -0,0 +1,20 @@
+import * as http from 'http'
+import * as express from 'express'
+import * as path from 'path'
+import * as morgan from 'morgan'
+import * as fs from 'fs'
+
+
+let app = express()
+
+let accessLogStream = fs.createWriteStream(path.join(__dirname, '/../../../access.log'), {flags: 'a'})
+app.use(morgan('combined', {stream: accessLogStream}))
+
+app.use('/', express.static(path.join(__dirname, '/../../../dist')))
+
+app.listen(3000, () => {
+    console.log('smartclient app listening on port 3000!')
+})
+
+
+

server/tsconfig.json

@@ -0,0 +1,22 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es5",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2017",
+      "dom"
+    ]
+  },
+  "include": [
+    "src/**/*.*"
+  ]
+}

smartclient.service

@@ -0,0 +1,18 @@
+[Unit]
+Description=smartclient
+Wants=network-online.target
+After=network-online.target
+
+
+[Service]
+Type=simple
+GuessMainPID=yes
+ExecStart=/usr/bin/npm run server
+ExecStop=kill -SIGINT $mainpid
+Restart=on-failure
+WorkingDirectory=/opt/services/smartclient
+
+[Install]
+Alias=smartclient
+WantedBy=multi-user.target
+

src/app/app.component.css

@@ -6,7 +6,16 @@ ledbox {
     float: left;
     display: block;
 }
+onoff {
+    float: left;
+    display: block;
+}
 
 p.clear {
     clear: both;
+}
+
+div#scenes {
+    margin-top: 10px;
+    margin-bottom: 10px;
 }

src/app/app.component.html

@@ -1,67 +1,33 @@
 
 <mat-tab-group>
     <mat-tab label="Licht">
-        <mat-accordion>
+      <div id="scenes">
-          <mat-expansion-panel>
+      <onoff *ngFor="let scene of configuration.scenes"
-            <mat-expansion-panel-header>
+        [label]="scene.label" [topic]="scene.actionTopic"></onoff>
-              <mat-panel-title>
+      <p class="clear"></p>
-                Wohnzimmer
+      </div>
-              </mat-panel-title>
+      <mat-divider></mat-divider>
-            </mat-expansion-panel-header>
-                    <ledbutton2 topic="led/test1" label="Küche Deckenlampe"></ledbutton2>
-                    <ledbutton2 topic="led/test2" label="Keller normal"></ledbutton2>
-                    <ledbutton2 topic="led/test3" label="Keller hell"></ledbutton2>
-                    <ledbutton2 topic="led/test4" label="test4"></ledbutton2>
-                    <ledbutton2 topic="led/test1" label="Küche Deckenlampe"></ledbutton2>
-                    <ledbutton2 topic="led/test2" label="Keller normal"></ledbutton2>
-                    <ledbutton2 topic="led/test3" label="Keller hell"></ledbutton2>
-                    <ledbutton2 topic="led/test4" label="test4"></ledbutton2>
-                    <ledbutton2 topic="led/test1" label="Küche Deckenlampe"></ledbutton2>
-                    <ledbutton2 topic="led/test2" label="Keller normal"></ledbutton2>
-                    <ledbutton2 topic="led/test3" label="Keller hell"></ledbutton2>
-                    <ledbutton2 topic="led/test4" label="test4"></ledbutton2>
-                    <p class="clear"></p>
-              </mat-expansion-panel>
-          <mat-expansion-panel>
-            <mat-expansion-panel-header>
-              <mat-panel-title>
-                Esszimmer
-              </mat-panel-title>
-            </mat-expansion-panel-header>
-            <table id="maintable">
-                <tr>
-                  <td>
-                    <ledbutton2 topic="led/test1" label="Küche Deckenlampe"></ledbutton2>
-                  </td>
-                  <td>
-                    <ledbutton2 topic="led/test2" label="Keller normal"></ledbutton2>
-                  </td>
-                  <td>
-                    <ledbutton2 topic="led/test3" label="Keller hell"></ledbutton2>
-                  </td>
-                  <td>
-                    <ledbutton2 topic="led/test4" label="test4"></ledbutton2>
-                  </td>
-                </tr>
-              </table>
-              </mat-expansion-panel>
-        </mat-accordion>
-          
 
-
+      <mat-accordion>
-
+        <mat-expansion-panel *ngFor="let room of configuration.switches">
-
+          <mat-expansion-panel-header>
-
+            <mat-panel-title>
-          
+              {{room.room}}
+            </mat-panel-title>
+          </mat-expansion-panel-header >
+            <ledbutton2 *ngFor="let switch of room.switches" 
+              [actionTopic]="switch.actionTopic" [feedbackTopic]="switch.feedbackTopic"
+              [label]="switch.label"></ledbutton2>
+            <p class="clear"></p>
+        </mat-expansion-panel>
+      </mat-accordion>
     </mat-tab>
     <mat-tab label="Fenster">
-        <ledbox topic="led/test4" label="test4"></ledbox>
+      <ledbox *ngFor="let window of configuration.windows" [topic]="window.topic" [label]="window.label"></ledbox>
-        <ledbox topic="led/test4" label="test4"></ledbox>
+      <p class="clear"></p>
-        <p class="clear"></p>
-
     </mat-tab>
     <mat-tab label="Heizung">
-
+      <heatingcontroller topicPre="testTopic" label="testLabel"></heatingcontroller>
     </mat-tab>
 </mat-tab-group>
 

src/app/app.component.ts

@@ -1,10 +1,30 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { MqttclientService } from './mqttclient.service'
 
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.css']
 })
-export class AppComponent {
+export class AppComponent implements OnInit {
   title = 'app';
+  private topic : string = 'smartclient/configuration'
+  configuration : any = { 
+    'switches': [],
+    'windows': []
+  }
+
+  constructor(private mqttclientService : MqttclientService) { 
+  }
+
+  ngOnInit() {
+    this.mqttclientService.register(this.topic, (message: string) => {
+      try {
+        this.configuration = JSON.parse(message)
+      } catch (e) {
+        alert(`Error when parsing received configuration: ${e}`)
+      }
+    })
+  }
+
 }

src/app/app.module.ts

@@ -5,8 +5,10 @@ import { NgModule } from '@angular/core';
 import { MatTabsModule } from '@angular/material/tabs';
 import { MatExpansionModule } from '@angular/material/expansion';
 import { MatButtonModule } from '@angular/material/button';
-
+import { MatDividerModule } from '@angular/material/divider';
+import { MatInputModule } from '@angular/material/input'
 import { MqttclientService } from './mqttclient.service'
+import { FormsModule } from '@angular/forms';
 
 import { AppComponent } from './app.component';
 import { LedindicatorComponent } from './ledindicator/ledindicator.component';
@@ -15,6 +17,7 @@ import { LedButtonGroupComponent } from './led-button-group/led-button-group.com
 import { NumberFieldComponent } from './number-field/number-field.component';
 import { LedButtonGroup2Component } from './led-button-group2/led-button-group2.component';
 import { LedBoxComponent } from './led-box/led-box.component';
+import { HeatingControllerComponent } from './heating-controller/heating-controller.component';
 
 
 @NgModule({
@@ -25,14 +28,18 @@ import { LedBoxComponent } from './led-box/led-box.component';
     LedButtonGroupComponent,
     NumberFieldComponent,
     LedButtonGroup2Component,
-    LedBoxComponent
+    LedBoxComponent,
+    HeatingControllerComponent
   ],
   imports: [
     BrowserModule,
     BrowserAnimationsModule,
     MatTabsModule,
     MatExpansionModule,
-    MatButtonModule
+    MatButtonModule,
+    MatDividerModule,
+    MatInputModule,
+    FormsModule
   ],
   providers: [
     MqttclientService

src/app/heating-controller/heating-controller.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HeatingControllerComponent } from './heating-controller.component';
+
+describe('HeatingControllerComponent', () => {
+  let component: HeatingControllerComponent;
+  let fixture: ComponentFixture<HeatingControllerComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ HeatingControllerComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HeatingControllerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/heating-controller/heating-controller.component.ts

@@ -0,0 +1,91 @@
+import { Component, Input, OnInit } from '@angular/core'
+import { MqttclientService } from '../mqttclient.service'
+import {coerceNumberProperty} from '@angular/cdk/coercion'
+
+@Component({
+  selector: 'heatingcontroller',
+  template: `
+  <div [ngStyle]="{ 'text-align': 'center', 'background-color':'lightgrey', 'border-radius':'10px', 
+  'width': '300px', 'padding':'5px', 'margin': '5px 5px 5px 0',
+  'font-family': 'sans-serif' }">
+  {{label}}
+  <p>
+  <button mat-raised-button color="primary" (click)="clickOff()" [ngStyle]="{'font-size':'100%'}">off</button>
+  <button mat-raised-button color="accent" (click)="clickOn()" [ngStyle]="{'font-size':'100%'}">on</button>
+  <button mat-raised-button color="warn" (click)="clickForceOn()" [ngStyle]="{'font-size':'100%'}">forceOn</button>
+  </p>
+  <p>
+  <mat-form-field [ngStyle]="{'margin':'10px', 'width':'40%'}">
+    <input type="checkbox" [(ngModel)]="enableCurrentTemperature">
+    <input matInput type="number" placeholder="Current" [(ngModel)]="currentTemperature"
+           (click)="setCurrentTemperature()" (keyup)="setCurrentTemperature()"
+           [disabled]="! enableCurrentTemperature">
+  </mat-form-field>
+  <mat-form-field [ngStyle]="{'margin':'10px', 'width':'40%'}">
+    <input type="checkbox" [(ngModel)]="enablePresetTemperature">
+    <input matInput type="number" placeholder="Preset" [(ngModel)]="presetTemperature" 
+           (click)="setPresetTemperature()" (keyup)="setPresetTemperature()"
+           [disabled]="! enablePresetTemperature">
+  </mat-form-field>
+  </p>
+  </div>
+  `
+  
+})
+export class HeatingControllerComponent implements OnInit {
+  @Input() topicPre : string = 'invalid'
+  commandTopic : string = 'invalid'
+  presetTopic : string = 'invalid'
+  feedbackPresetTopic : string = 'invalid'
+  temperatureTopic : string = 'invalid'
+  feedbackTemperatureTopic : string = 'invalid'
+  @Input() label : string = 'invalid'
+
+  enableCurrentTemperature : boolean = false
+  currentTemperature : number = 20
+  enablePresetTemperature : boolean = false
+  presetTemperature : number = 20
+  
+  constructor(private mqttclientService : MqttclientService) { }
+  
+  ngOnInit() {
+    this.commandTopic = this.topicPre + '/command'
+    this.presetTopic = this.topicPre + '/presetTemperature'
+    this.feedbackPresetTopic = this.topicPre + '/presetTemperature/feedback'
+    this.temperatureTopic = this.topicPre + '/temperature'
+    this.feedbackTemperatureTopic = this.topicPre + '/temperature/feedback'
+
+    this.mqttclientService.register(this.feedbackTemperatureTopic, (message: string) => {
+      this.currentTemperature = parseInt(message)
+    })
+    this.mqttclientService.register(this.feedbackPresetTopic, (message: string) => {
+      this.presetTemperature = parseInt(message)
+    })
+  }
+  
+  clickOn() {
+    console.log(`click on for ${this.commandTopic}`)
+    this.mqttclientService.publish(this.commandTopic, "ON")
+  }
+  
+  clickForceOn() {
+    console.log(`click absent for ${this.commandTopic}`)
+    this.mqttclientService.publish(this.commandTopic, "FORCE_ON")
+  }
+  
+  clickOff() {
+    console.log(`click off for ${this.commandTopic}`)
+    this.mqttclientService.publish(this.commandTopic, "OFF")
+  }
+  
+  setCurrentTemperature() {
+    console.log(`click on currentTemperature ${this.currentTemperature}`)
+    this.mqttclientService.publish(this.temperatureTopic, this.currentTemperature.toString())
+  }
+
+  setPresetTemperature() {
+    console.log(`click on presetTemperature ${this.presetTemperature}`)
+    this.mqttclientService.publish(this.presetTopic, this.presetTemperature.toString())
+  }
+}
+

src/app/led-box/led-box.component.ts

@@ -5,7 +5,7 @@ import { MqttclientService } from '../mqttclient.service'
   selector: 'ledbox',
   template: `
   <div [ngStyle]="{ 'text-align': 'center', 'background-color':'lightgrey', 'border-radius':'10px', 
-  'width': '100px', 'padding':'5px', 'margin': '5px',
+  'width': '100px', 'height':'80px', 'padding':'5px', 'margin': '5px',
   'font-family': 'sans-serif' }">
     {{label}}<br/>
     <led [topic]="topic" greenToken="CLOSED" redToken="OPEN"></led>

src/app/led-button-group2/led-button-group2.component.ts

@@ -16,16 +16,13 @@ import { MqttclientService } from '../mqttclient.service'
 })
 export class LedButtonGroup2Component implements OnInit {
 
-  actionTopic : string
+  @Input() actionTopic : string
-  feedbackTopic : string
+  @Input() feedbackTopic : string
-  @Input('topic') topicPre : string
   @Input() label : string
 
   constructor(private mqttclientService : MqttclientService) { }
 
   ngOnInit() {
-    this.actionTopic = this.topicPre + '/state'
-    this.feedbackTopic = this.topicPre + '/feedback'
   }
 
 

src/app/mqttclient.service.ts

@@ -9,7 +9,8 @@ export class MqttclientService {
   private callbacks : Map<string, callbackFunc> = new Map()
 
   constructor() { 
-    this.mqttClient = Mqtt.connect('ws://localhost:9001')
+//    this.mqttClient = Mqtt.connect('ws://172.16.2.16:9001')
+    this.mqttClient = Mqtt.connect('ws://127.0.0.1:9001')
     this.mqttClient.on('connect', () => {
       console.log('MQTT connected')
       this.callbacks.forEach((value: callbackFunc, key: string) => {

src/app/on-off-button/on-off-button.component.ts

@@ -4,14 +4,18 @@ import { MqttclientService } from '../mqttclient.service'
 @Component({
   selector: 'onoff',
   template: `
-  <div class="button">
+  <div [ngStyle]="{ 'text-align': 'center', 'background-color':'lightgrey', 'border-radius':'10px', 
-    <button (click)="clickOn()" [ngStyle]="{'font-size':'150%'}">on</button>
+                    'width': '150px', 'padding':'5px', 'margin': '5px',
-    <button (click)="clickOff()" [ngStyle]="{'font-size':'150%'}">off</button>
+                    'font-family': 'sans-serif' }">
+    {{label}}<br/>
+    <button mat-mini-fab color="primary" (click)="clickOff()" [ngStyle]="{'font-size':'100%'}">off</button>
+    <button mat-mini-fab color="primary" (click)="clickOn()" [ngStyle]="{'font-size':'100%'}">on</button>
   </div>
   `
 })
 export class OnOffButtonComponent implements OnInit {
   @Input() topic : string = 'invalid'
+  @Input() label : string = 'invalid'
 
   constructor(private mqttclientService : MqttclientService) { }