diff --git a/public/images/Blue Lagoon.png b/public/images/Blue Lagoon.png new file mode 100644 index 0000000..a546cca Binary files /dev/null and b/public/images/Blue Lagoon.png differ diff --git a/public/images/Caipirinha.png b/public/images/Caipirinha.png new file mode 100644 index 0000000..a261129 Binary files /dev/null and b/public/images/Caipirinha.png differ diff --git a/public/images/Cosmopolitan.png b/public/images/Cosmopolitan.png new file mode 100644 index 0000000..32dc501 Binary files /dev/null and b/public/images/Cosmopolitan.png differ diff --git a/public/images/Cubralibre.png b/public/images/Cubralibre.png new file mode 100644 index 0000000..1cb6b1e Binary files /dev/null and b/public/images/Cubralibre.png differ diff --git a/public/images/Gin Tonic.png b/public/images/Gin Tonic.png new file mode 100644 index 0000000..9b79df1 Binary files /dev/null and b/public/images/Gin Tonic.png differ diff --git a/public/images/Malibu Beach.png b/public/images/Malibu Beach.png new file mode 100644 index 0000000..78ff35d Binary files /dev/null and b/public/images/Malibu Beach.png differ diff --git a/public/images/Mezzo Mix.png b/public/images/Mezzo Mix.png new file mode 100644 index 0000000..be5fe95 Binary files /dev/null and b/public/images/Mezzo Mix.png differ diff --git a/public/images/Mojito.png b/public/images/Mojito.png new file mode 100644 index 0000000..3ec43d6 Binary files /dev/null and b/public/images/Mojito.png differ diff --git a/public/images/Moscow Mule.png b/public/images/Moscow Mule.png new file mode 100644 index 0000000..465b52e Binary files /dev/null and b/public/images/Moscow Mule.png differ diff --git a/public/images/Pina Colada.png b/public/images/Pina Colada.png new file mode 100644 index 0000000..163482f Binary files /dev/null and b/public/images/Pina Colada.png differ diff --git a/public/images/Sex on the Beach.png b/public/images/Sex on the Beach.png new file mode 100644 index 0000000..9711fa2 Binary files /dev/null and b/public/images/Sex on the Beach.png differ diff --git a/public/images/Swimming Pool.png b/public/images/Swimming Pool.png new file mode 100644 index 0000000..04f86c1 Binary files /dev/null and b/public/images/Swimming Pool.png differ diff --git a/public/images/Tequila Sunrise.png b/public/images/Tequila Sunrise.png new file mode 100644 index 0000000..61db825 Binary files /dev/null and b/public/images/Tequila Sunrise.png differ diff --git a/public/images/Wodka Bull.png b/public/images/Wodka Bull.png new file mode 100644 index 0000000..045fa93 Binary files /dev/null and b/public/images/Wodka Bull.png differ diff --git a/public/images/Wodka Cola.png b/public/images/Wodka Cola.png new file mode 100644 index 0000000..530eb8b Binary files /dev/null and b/public/images/Wodka Cola.png differ diff --git a/public/images/Wodka Fanta.png b/public/images/Wodka Fanta.png new file mode 100644 index 0000000..b91d9d7 Binary files /dev/null and b/public/images/Wodka Fanta.png differ diff --git a/public/images/Wodka Lemon.png b/public/images/Wodka Lemon.png new file mode 100644 index 0000000..a8d17f6 Binary files /dev/null and b/public/images/Wodka Lemon.png differ diff --git a/public/images/Wodka O.png b/public/images/Wodka O.png new file mode 100644 index 0000000..4d04285 Binary files /dev/null and b/public/images/Wodka O.png differ diff --git a/public/images/Zombie.png b/public/images/Zombie.png new file mode 100644 index 0000000..ec50688 Binary files /dev/null and b/public/images/Zombie.png differ diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 6845fe6..2a030fa 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -5,7 +5,7 @@ :root { - cursor: none; + cursor: none !important; } @@ -22,7 +22,7 @@ body { scroll-behavior: smooth; font-family: "Roboto", serif; font-style: normal; - cursor: none; + cursor: none !important; } @@ -40,15 +40,35 @@ body { height: 9%; background-color: #1F5E5F; color: white; + font-size: 2em; + padding-right: 3px; + padding-left: 3px; + } - #title { - float: right; - width: 100%; - font-size: 1.9em; text-align: center; + float: left; + width: calc(100% / 3); +} + + +#left { + font-size: 0.5em; + float: left; + width: calc(100% / 3); + text-align: left; + padding-top: 1.2%; +} + + +#right { + float: left; + width: calc(100% / 3); + text-align: right; + font-size: 0.5em; + padding-top: 1.2%; } @@ -108,7 +128,7 @@ body { #main { display: grid; height: 100%; - + padding: 1% 2%; grid-template-columns: repeat(3, calc(90% / 3)); grid-template-rows: repeat(2, calc(90% / 2)); grid-gap: 10% 5%; @@ -122,26 +142,44 @@ body { #main .drink { grid-row: span 1; grid-column: span 1; - background-color: black; - width: 100%; - height: 100%; + background-color: rgba(57, 57, 57, 0.6); + width: 90%; + height: 97%; display: grid; grid-template-columns: 100%; grid-template-rows: repeat(3, calc(100% / 3)); - grid-row-gap: 5%; + grid-row-gap: 4%; text-align: center; border-radius: 30px 10px 30px; + color: black; + /*box-shadow: 3px 3px 3px;*/ + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.3), 0 6px 20px 0 rgba(0, 0, 0, 0.29); + transition: 0.4s; + overflow: hidden; + padding-bottom: 1%; +} + +#main .drink:hover { + background-color: rgba(57, 57, 57, 0.8); + width: 100%; + height: 100%; } .drink .thumbnail { grid-column: span 1; grid-row: span 2; + margin-left: auto; + margin-right: auto; + max-height: 100%; + overflow: hidden; + transition: 0.5s; } -.drink .name { +.drink .drinkName { + font-family: Ubuntu, sans-serif; grid-column: span 1; grid-row: span 1; - font-size: 140%; + font-size: 150%; } \ No newline at end of file diff --git a/src/App.ts b/src/App.ts index 7504133..275470e 100644 --- a/src/App.ts +++ b/src/App.ts @@ -50,7 +50,7 @@ export class App { public loadRoutes( ) : void { - this._app.use( "/", require("./routes/index") ); + this._app.use( "/", require("./routes/indexRouter") ); } diff --git a/src/Category.ts b/src/Category.ts index 1115b77..cb7f82d 100644 --- a/src/Category.ts +++ b/src/Category.ts @@ -1,6 +1,7 @@ export enum Category { - ALCOHOLIC, - ALCOHOL_FREE, - SYRUP, - JUICE + ALCOHOLIC = "ALCOHOLIC", + ALCOHOL_FREE = "ALCOHOL_FREE", + SYRUP = "SYRUP", + JUICE = "JUICE", + SOFTDRINK = "SOFTDRINK" } \ No newline at end of file diff --git a/src/Utils.ts b/src/Utils.ts index 258af84..ba0e9da 100644 --- a/src/Utils.ts +++ b/src/Utils.ts @@ -12,4 +12,11 @@ export class Utils { }); } + + static sleep(ms: number): Promise { + return new Promise(resolve => { + setTimeout(() => resolve(), ms); + }) + } + } \ No newline at end of file diff --git a/src/WebSocketEvent.ts b/src/WebSocketEvent.ts index bfd9d87..5dfcfdc 100644 --- a/src/WebSocketEvent.ts +++ b/src/WebSocketEvent.ts @@ -1,7 +1,5 @@ export enum WebSocketEvent { - STATUS_STARTING, - STATUS_READY, - STATUS_FILLING, - STATUS_REFRESHING, - STATUS_ERROR + STATUS= "STATUS", + DRINKS = "DRINKS", + CONTAINERS = "CONTAINERS", } \ No newline at end of file diff --git a/src/WebSocketHandler.ts b/src/WebSocketHandler.ts index b319489..f7d6641 100644 --- a/src/WebSocketHandler.ts +++ b/src/WebSocketHandler.ts @@ -1,4 +1,6 @@ import {WebSocketPayload} from "./WebSocketPayload"; +import {WebSocketEvent} from "./WebSocketEvent"; +import {iTender} from "./iTender"; export class WebSocketHandler { private static _ws: WebSocket; @@ -14,20 +16,21 @@ export class WebSocketHandler { public static send(payload: WebSocketPayload): Promise { return new Promise(async (resolve, reject) => { try { - if( this.ws && this.ws.readyState == 1 ) - { + if (this.ws && this.ws.readyState == 1) { await this.ws.send(payload.toString()); resolve(); } - else - { - reject("Websocket is not connected!"); - } - } catch (e) { - reject(e); + } }); } + public static sendStatus() { + return new Promise(resolve => { + let payload = new WebSocketPayload(WebSocketEvent.STATUS, false, {status: iTender.status}); + WebSocketHandler.send(payload).then(resolve); + }); + } + } \ No newline at end of file diff --git a/src/WebSocketPayload.ts b/src/WebSocketPayload.ts index 147b6da..0c15ab3 100644 --- a/src/WebSocketPayload.ts +++ b/src/WebSocketPayload.ts @@ -5,40 +5,40 @@ export class WebSocketPayload { this._event = value; } - set status(value: boolean) { - this._status = value; + set error(value: boolean) { + this._error = value; } - set data(value: object | undefined) { + set data(value: any | undefined) { this._data = value; } private _event: WebSocketEvent; - private _status: boolean; - private _data: object | undefined; + private _error: boolean; + private _data: any | undefined; get event(): WebSocketEvent { return this._event; } - get status(): boolean { - return this._status; + get error(): boolean { + return this._error; } - get data(): object | undefined { + get data(): any | undefined { return this._data; } - constructor(event: WebSocketEvent, status: boolean, data?: object) { + constructor(event: WebSocketEvent, error: boolean = false, data?: any) { this._event = event; - this._status = status; + this._error = error; this._data = data; } - public static parseFromJSON(json: string): WebSocketPayload | null { - json = (window) ? atob(json) : Buffer.from(json, "base64").toString(); - let rawPayload: { event: string, status: boolean, data: object }; + public static parseFromBase64Json(json: string): WebSocketPayload | null { + json = (typeof window != 'undefined') ? atob(json) : Buffer.from(json, "base64").toString(); + let rawPayload: { event: string, error: boolean, data: any }; try { rawPayload = JSON.parse(json); } catch (e) { @@ -47,15 +47,15 @@ export class WebSocketPayload { let wsEvent = WebSocketEvent[rawPayload.event]; - return new WebSocketPayload(wsEvent, rawPayload.status, rawPayload.data); + return new WebSocketPayload(wsEvent, rawPayload.error, rawPayload.data); } /** * Returns the payload as base64 encoded json string */ public toString(): string { - let json = JSON.stringify({"event": this._event, status: this._status, data: this._data}); - json = (window) ? btoa(json) : Buffer.from(json).toString("base64"); + let json = JSON.stringify({"event": this._event, status: this._error, data: this._data}); + json = ((typeof window != 'undefined') ? btoa(json) : Buffer.from(json).toString("base64")); return json; } } \ No newline at end of file diff --git a/src/WebsocketApp.ts b/src/WebsocketApp.ts index 7e85d74..b7540fd 100644 --- a/src/WebsocketApp.ts +++ b/src/WebsocketApp.ts @@ -38,7 +38,7 @@ export class WebsocketApp { public loadRoutes( ) : void { - this._app.use( "/", require("./routes/ws/websocket") ); + this._app.use( "/", require("./routes/ws/websocketRoute") ); } public listen(): Promise { diff --git a/src/database/Drink.ts b/src/database/Drink.ts index a57ec0d..a04fbfa 100644 --- a/src/database/Drink.ts +++ b/src/database/Drink.ts @@ -4,8 +4,7 @@ import * as mongoose from "mongoose"; export const DrinkSchema = new mongoose.Schema({ name: {type: String, required: true}, ingredients: [{type: {type: mongoose.Types.ObjectId, ref: "Ingredient", required: true}, amount: { type: Number } }], - category: String, - recommendedQuantity: {type: Number, default: 200 } + category: String }); const Drink = mongoose.model('Drink', DrinkSchema); diff --git a/src/database/IDrink.ts b/src/database/IDrink.ts index c19367a..ca58dcc 100644 --- a/src/database/IDrink.ts +++ b/src/database/IDrink.ts @@ -12,7 +12,5 @@ export interface IDrink extends mongoose.Document { // Category of the drink category: Category; - // Recommended amount in milliliters - recommendedQuantity: number; } \ No newline at end of file diff --git a/src/database/IJob.ts b/src/database/IJob.ts new file mode 100644 index 0000000..a5ab748 --- /dev/null +++ b/src/database/IJob.ts @@ -0,0 +1,10 @@ +import mongoose from "mongoose"; +import {IDrink} from "./IDrink"; + +export interface IJob extends mongoose.Document { + drink: IDrink; + amount: number; + startedAt: Date; + endAt: Date; + successful: boolean; +} \ No newline at end of file diff --git a/src/database/Job.ts b/src/database/Job.ts new file mode 100644 index 0000000..654977e --- /dev/null +++ b/src/database/Job.ts @@ -0,0 +1,15 @@ +import mongoose from "mongoose"; +import {IJob} from "./IJob"; + + +export const JobSchema = new mongoose.Schema({ + drink: {type: mongoose.Types.ObjectId, ref: "Drink"}, + amount: Number, + startedAt: Date, + endAt: Date, + successful: Boolean +}); + + +const Job = mongoose.model('Job', JobSchema); +export default Job; \ No newline at end of file diff --git a/src/iTender.ts b/src/iTender.ts index 90a7ef4..9a00f21 100644 --- a/src/iTender.ts +++ b/src/iTender.ts @@ -4,15 +4,35 @@ import {HCSR04} from "hc-sr04"; import {IContainer} from "./database/IContainer"; import Drink from "./database/Drink"; import {IDrink} from "./database/IDrink"; +import debug from "debug"; +import {WebSocketHandler} from "./WebSocketHandler"; +import {IJob} from "./database/IJob"; + +const log = debug("itender:station"); export class iTender { - private static _status: iTenderStatus; + static get containers(): { container: IContainer; sensor: HCSR04; pump: null }[] { + return this._containers; + } - private static containers: { container: IContainer, sensor: HCSR04, pump: null }[]; - private static drinks: IDrink[]; + static get drinks(): IDrink[] { + return this._drinks; + } - static set status(value: iTenderStatus) { - this._status = value; + static get currentJob(): IJob | null { + return this._currentJob; + } + + private static _status: iTenderStatus = iTenderStatus.STARTING; + private static _currentJob: IJob | null = null; + + private static _containers: { container: IContainer, sensor: HCSR04, pump: null }[] = []; + private static _drinks: IDrink[]; + + static setStatus(status: iTenderStatus) { + this._status = status; + if (WebSocketHandler.ws && WebSocketHandler.ws.readyState == 1) + WebSocketHandler.sendStatus().then().catch(console.error); } static get status(): iTenderStatus { @@ -21,32 +41,42 @@ export class iTender { static startFill() { // todo Fill method + + + // End + this.measureContainers().then(); } - static stopFill() { + static cancelFill() { // todo Stop fill method } static measureContainers(): Promise { + log("Measuring containers..."); + return new Promise(async resolve => { - let containers = await Container.find(); - /* - public measure() : Number { - let dist = this.sensor.distance(); - return dist * 100 / (this.sensorFilledMax + this.sensorFilledMin); - } - */ - }) + for (let c of this._containers) { + try { + let dist = c.sensor.distance(); + c.container.filled = dist * 100 / (c.container.sensorFilledMax + c.container.sensorFilledMin); + } catch (e) { + c.container.filled = -1; + } + await c.container.save(); + } + log("Containers measured!"); + resolve(); + }); } static refreshDrinks(): Promise { + this.setStatus(iTenderStatus.REFRESHING); + log("Refreshing drinks..."); return new Promise(async resolve => { - this.drinks = []; + this._drinks = []; for (let d of (await Drink.find().populate("ingredients.type"))) { - let drinkAccept = true; - for (let i of d.ingredients) { let c = await Container.findOne({content: i["type"]}); @@ -54,26 +84,37 @@ export class iTender { drinkAccept = false; break; } - } - if (drinkAccept) - this.drinks.push(d); + if (drinkAccept) { + this._drinks.push(d); + } + } + log("Drinks refreshed!"); + + resolve(); + this.setStatus(iTenderStatus.READY); }); } static refreshContainers(): Promise { - + log("Refreshing containers..."); + this.setStatus(iTenderStatus.CALCULATING); return new Promise(async resolve => { let containers = await Container.find(); for (let c of containers) { let i = 0; let found = false; - for (let c2 of this.containers) { + for (let c2 of this._containers) { if (c2.container._id == c._id) { - this.containers[i] = { + let sensor; + try { + sensor = new HCSR04(c.sensorTrigger, c.sensorEcho); + } catch (e) { + } + this._containers[i] = { container: c, - sensor: new HCSR04(c.sensorTrigger, c.sensorEcho), + sensor: sensor, pump: null }; found = true; @@ -81,10 +122,42 @@ export class iTender { } i++; } - if (!found) - this.containers.push({container: c, sensor: new HCSR04(c.sensorTrigger, c.sensorEcho), pump: null}); + if (!found) { + let sensor; + try { + sensor = new HCSR04(c.sensorTrigger, c.sensorEcho); + } catch (e) { + } + this._containers.push({ + container: c, + sensor: sensor, + pump: null + }); + } + } - }) + + log("Containers refreshed!"); + this.measureContainers().then().catch(console.error); + + resolve(); + this.setStatus(iTenderStatus.READY); + }); + } + + public static async autoCheckup() { + setInterval(async () => { + if (!this._currentJob) + return; + // Check if startedTime plus 2 mins smaller than now + if (this._currentJob.startedAt.getTime() + 1000 * 60 * 2 <= Date.now()) { + // Job can be declared as stuck! + this._currentJob.successful = false; + this._currentJob.endAt = new Date(); + await this._currentJob.save(); + this._currentJob = null; + } + }, 30000); } diff --git a/src/iTenderStatus.ts b/src/iTenderStatus.ts index e2b1821..4704b3e 100644 --- a/src/iTenderStatus.ts +++ b/src/iTenderStatus.ts @@ -1,14 +1,14 @@ export enum iTenderStatus { // Machine is going to start - STARTING, + STARTING= "STARTING", // Machine is ready - READY, + READY = "READY", // Machine is filling your drink and destroying your leberwurst - FILLING, + FILLING = "FILLING", // Drinks will be refreshed from global database (the internet neuland :O) - REFRESHING, + REFRESHING = "REFRESHING", // Drinks will be calculated (check containers and which drinks can be done) - CALCULATING, + CALCULATING = "CALCULATING", // An error happened; Oh no :( - ERROR + ERROR = "ERROR" } \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index b5d8346..f395251 100644 --- a/src/main.ts +++ b/src/main.ts @@ -2,10 +2,13 @@ import {App} from "./App"; import debug from "debug"; import {WebsocketApp} from "./WebsocketApp"; import {Database} from "./database/Database"; -import Drink from "./database/Drink"; import Ingredient from "./database/Ingredient"; -import Container from "./database/Container"; import {iTender} from "./iTender"; +import {iTenderStatus} from "./iTenderStatus"; +import {Utils} from "./Utils"; +import {Category} from "./Category"; +import Drink from "./database/Drink"; +import Container from "./database/Container"; const log = debug("itender:server"); @@ -17,9 +20,18 @@ const wsApp = new WebsocketApp(); try { log("Starting..."); await Database.connect(); + //await test(); await app.listen(); await wsApp.listen(); + + iTender.setStatus(iTenderStatus.STARTING); + await Utils.sleep(5000); + await init(); + + setInterval(refresh, 1000 * 60 * 10); + + iTender.setStatus(iTenderStatus.READY); } catch (e) { console.error("---- ERROR ----") console.error(e); @@ -27,19 +39,61 @@ const wsApp = new WebsocketApp(); } })(); -function init() : Promise { +function init(): Promise { log("Initializing..."); return new Promise(async resolve => { await iTender.refreshContainers(); await iTender.refreshDrinks(); + await iTender.autoCheckup(); + resolve(); }); } +function refresh(): Promise { + return new Promise(async resolve => { + // If there is a current job, DO NOT REFRESH! + if (iTender.currentJob) + return; + + //await iTender.refreshContainers(); Not needed because there is no change in containers? + await iTender.measureContainers(); + //await iTender.refreshDrinks(); Not needed because there is no change in drinks? + }); +} + async function test() { console.log("Testing fn"); - let ingredient = await Ingredient.findOne({name: "Cola"}); + /* + let cola = new Ingredient(); + cola.name = "Cola"; + cola.category = Category.SOFTDRINK; + await cola.save(); + + let sprite = new Ingredient(); + sprite.name = "Sprite"; + sprite.category = Category.SOFTDRINK; + await sprite.save(); + + let fanta = new Ingredient(); + fanta.name = "Fanta"; + fanta.category = Category.SOFTDRINK; + await fanta.save(); + + let drink = new Drink(); + drink.name = "Fanta"; + drink.category = Category.ALCOHOL_FREE; + drink.ingredients = [{type: fanta, amount: 200}]; + await drink.save(); + + drink = new Drink(); + drink.name = "Mezzo Mix"; + drink.category = Category.ALCOHOL_FREE; + drink.ingredients = [{type: fanta, amount: 100}, {type: cola, amount: 100}]; + await drink.save();*/ + + let ingredient = await Ingredient.findOne({name: "Fanta"}); if (!ingredient) return; @@ -49,26 +103,26 @@ async function test() { await drink.save();*/ - let drink = await Drink.findOne({name: "Cola"}).populate("ingredients.type"); - if (!drink) return; + /* let drink = await Drink.findOne({name: "Cola"}).populate("ingredients.type"); + if (!drink) return; - console.log(drink); + console.log(drink);*/ - /*let container = new Container(); - container.slot = 1; + let container = new Container(); + container.slot = 2; container.volume = 750; - container.sensorEcho = 26; - container.sensorTrigger = 27; + container.sensorEcho = 28; + container.sensorTrigger = 29; container.content = ingredient; container.sensorFilledMax = 2; container.sensorFilledMin = 15; - await container.save();*/ + await container.save(); - let container = await Container.findOne({slot: 1}); - if (!container) return; + /* let container = await Container.findOne({slot: 1}); + if (!container) return; - console.log(container); + console.log(container);*/ //console.log(drink.ingredients) diff --git a/src/routes/index.ts b/src/routes/indexRouter.ts similarity index 100% rename from src/routes/index.ts rename to src/routes/indexRouter.ts diff --git a/src/routes/ws/websocket.ts b/src/routes/ws/websocket.ts deleted file mode 100644 index 1517f7d..0000000 --- a/src/routes/ws/websocket.ts +++ /dev/null @@ -1,33 +0,0 @@ -import {WebSocketPayload} from "../../WebSocketPayload"; -import debug from "debug"; -import {WebSocketHandler} from "../../WebSocketHandler"; - -const express = require('express'); -const router = express.Router(); - - -const log = debug("itender:websocket"); - -router.ws('/', (ws, req, next) => { - log("Incoming websocket connection") - ws.on('message', async (raw, bool) => { - let msg = WebSocketPayload.parseFromJSON(raw); - // If message is null, close the socket because it could not be decompiled - if (!msg) { - ws.close(1011); - return; - } - - switch (msg.event) { - - } - }); - - ws.on('open', (listener) => { - if (WebSocketHandler.ws) - WebSocketHandler.ws.close(1001); - WebSocketHandler.ws = ws; - }); -}); - -module.exports = router; diff --git a/src/routes/ws/websocketRoute.ts b/src/routes/ws/websocketRoute.ts new file mode 100644 index 0000000..2125de9 --- /dev/null +++ b/src/routes/ws/websocketRoute.ts @@ -0,0 +1,59 @@ +import {WebSocketPayload} from "../../WebSocketPayload"; +import debug from "debug"; +import {WebSocketHandler} from "../../WebSocketHandler"; +import {iTender} from "../../iTender"; +import {iTenderStatus} from "../../iTenderStatus"; +import {WebSocketEvent} from "../../WebSocketEvent"; + +const express = require('express'); +const router = express.Router(); + + +const log = debug("itender:websocket"); + +router.ws('/', async (ws, req, next) => { + log("Incoming websocket connection..."); + + if (WebSocketHandler.ws) + WebSocketHandler.ws.close(1001); + WebSocketHandler.ws = ws; + + + await WebSocketHandler.sendStatus(); + + async function sendWhenReady() { + if (iTender.status != iTenderStatus.READY) { + setTimeout(sendWhenReady, 100); + return; + } + + iTender.setStatus(iTenderStatus.REFRESHING); + + let payload = new WebSocketPayload(WebSocketEvent.DRINKS, false, iTender.drinks); + await WebSocketHandler.send(payload); + + setTimeout(() => { + if (iTender.status == iTenderStatus.REFRESHING) + iTender.setStatus(iTenderStatus.READY); + }, 2000); + + } + + sendWhenReady().then(); + + ws.on('message', async (raw, bool) => { + let msg = WebSocketPayload.parseFromBase64Json(raw); + // If message is null, close the socket because it could not be decompiled + if (!msg) { + ws.close(1011); + return; + } + + switch (msg.event) { + + } + }); + +}); + +module.exports = router; diff --git a/src/test.ts b/src/test.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/web/Modal.ts b/src/web/Modal.ts index af2fa9c..abe77c9 100644 --- a/src/web/Modal.ts +++ b/src/web/Modal.ts @@ -2,14 +2,19 @@ import {ButtonType} from "./ButtonType"; export class Modal { - private static currentModalId = ""; + private static currentModalId: string | undefined = ""; private _title: string = "iTender"; private _content: string | undefined = ""; private _id: string = ""; private _loader: boolean = false; private _buttons: { type: string, content: string, onclick: Function }[] = []; + private _leftCentered: boolean = false; + set leftCentered(value: boolean) { + this._leftCentered = value; + } + private static modalInClose = false; constructor(id, title: string, content?: string) { this._id = id; @@ -17,6 +22,10 @@ export class Modal { this._content = content; } + public static isModalOpen(): boolean { + return !(!this.currentModalId); + } + set title(value: string) { this._title = value; @@ -34,8 +43,7 @@ export class Modal { this._loader = value; } - public addButton( type: ButtonType, content: string, onclick: Function ) - { + public addButton(type: ButtonType, content: string, onclick: Function) { this._buttons.push({type: type, content: content, onclick: onclick}); } @@ -43,16 +51,39 @@ export class Modal { if (!this._content) this._content = ""; + if( this._leftCentered ) + { + this._content = "
" + this._content; + } + if (this._loader) this._content += "
\n" + "
\n" + "
"; for (let btn of this._buttons) { - this._content += ``; + this._content += ``; } - Modal.open(this._title, this._content, this._id); + if( this._leftCentered ) + { + this._content+= "
"; + } + + let title = this._title; + let content = this._content; + let id = this._id; + function tryOpen() + { + if( Modal.modalInClose ) + { + setTimeout( tryOpen, 50 ); + return; + } + Modal.open(title, content, id ); + } + + tryOpen(); } /** @@ -61,6 +92,7 @@ export class Modal { * @param id */ public static open(title: string, content: string, id?: string): void { + const modal = document.getElementById("modal"); const modalContent = document.getElementById("modalInnerContent"); @@ -82,9 +114,11 @@ export class Modal { } public static close(id?: string): void { - if (this.currentModalId != id) + if (id && this.currentModalId != id) return; + Modal.modalInClose = true; + const modal = document.getElementById("modal"); const modalContent = document.getElementById("modal-content"); const modalInnerContent = document.getElementById("modalInnerContent"); @@ -100,6 +134,9 @@ export class Modal { modalInnerContent.innerHTML = ""; modalContent.classList.remove("modalBlendOut"); modal.classList.remove("modalBlendOut"); + this.modalInClose = false; }, 800); + + this.currentModalId = undefined; } } \ No newline at end of file diff --git a/src/web/WebHandler.ts b/src/web/WebHandler.ts new file mode 100644 index 0000000..0b7f544 --- /dev/null +++ b/src/web/WebHandler.ts @@ -0,0 +1,54 @@ +import {WebSocketPayload} from "../WebSocketPayload"; +import {IDrink} from "../database/IDrink"; +import {Modal} from "./Modal"; + +export class WebHandler { + public static onDrinkUpdate(payload: WebSocketPayload) { + if (!payload.data) return; + + let drinks: IDrink[] = payload.data; + + const main = document.getElementById("main"); + if (!main) return; + + main.style.gridTemplateRows = `repeat(${Math.round(drinks.length / 3)}, calc(90%/2))`; + + for (let drink of drinks) { + let drinkEle = document.createElement("div"); + drinkEle.classList.add("drink"); + + + let drinkImg = document.createElement("img"); + drinkImg.classList.add("thumbnail"); + drinkEle.append(drinkImg); + + let drinkName = document.createElement("p"); + drinkName.classList.add("drinkName"); + drinkEle.append(drinkName); + + drinkImg.alt = "Foto von " + drink.name; + drinkImg.src = "/images/" + drink.name + ".png"; + drinkName.innerText = drink.name; + + let ingredients = "
    "; + for( let i of drink.ingredients ) + { + ingredients += "
  • " + i.amount + "ml " + i.type.name + "
    • "; + } + ingredients+="
" + + drinkEle.onclick = () => { + let modal = new Modal("drink", drink.name ); + modal.content = `Zutaten
+${ingredients}` + modal.leftCentered = true; + modal.open(); + }; + + main.append(drinkEle); + } + + } + + +} \ No newline at end of file diff --git a/src/web/WebWebSocketHandler.ts b/src/web/WebWebSocketHandler.ts index 3af1523..013387b 100644 --- a/src/web/WebWebSocketHandler.ts +++ b/src/web/WebWebSocketHandler.ts @@ -1,28 +1,117 @@ import {Modal} from "./Modal"; +import {WebSocketEvent} from "../WebSocketEvent"; +import {WebSocketPayload} from "../WebSocketPayload"; +import {ButtonType} from "./ButtonType"; +import {iTenderStatus} from "../iTenderStatus"; +import {WebHandler} from "./WebHandler"; export class WebWebSocketHandler { - private socket : WebSocket; + private socket: WebSocket; + private static url = (window.location.protocol == "http:" ? "ws://" : "wss://") + window.location.hostname + ":3005"; constructor() { - this.socket = new WebSocket((window.location.protocol == "http:" ? "ws://" : "wss://") + window.location.hostname + ":3005"); + this.socket = new WebSocket(WebWebSocketHandler.url); this.socket.onopen = this.onOpen; this.socket.onclose = this.onClose; this.socket.onerror = this.onError; + this.socket.onmessage = this.onMessage; } - private onOpen( event ) - { - Modal.close("start"); + private onMessage(msgEvent: MessageEvent) { + console.log("[WS] Incoming message", msgEvent); + let payload = WebSocketPayload.parseFromBase64Json(msgEvent.data); + if (!payload) { + console.log("[WS] Could not parse message: ", msgEvent); + return; + } + console.debug(payload) + + console.debug(payload.event); + + console.log("[WS] Received " + payload.event + " Event"); + + switch (payload.event) { + case WebSocketEvent.STATUS: { + let statusElement = document.getElementById("status"); + if (statusElement) + statusElement.innerText = payload.data.status; + + let status: iTenderStatus = payload.data.status; + + switch (status) { + case iTenderStatus.READY: { + Modal.close("start"); + Modal.close("refreshing"); + break; + } + case iTenderStatus.STARTING: { + let modal = new Modal("start", "Willkommen!", `Einen Augenblick bitte
iTender startet...`); + modal.loader = true; + modal.open(); + break; + } + case iTenderStatus.REFRESHING: { + let modal = new Modal("refreshing", "Aktualisieren...", `Einen Augenblick bitte
iTender aktualisiert die Getränke...`); + modal.loader = true; + modal.open(); + break; + + } + } + break; + } + + case WebSocketEvent.DRINKS: { + WebHandler.onDrinkUpdate(payload); + break; + } + } } - private onClose( event ) { - console.error("WS Closed!", event ); - //openModal("Einen Augenblick...", `Es wurde ein Verbindungsfehler erkannt.\nBitte warten Sie, während der Prozess neu gestartet wird...` ); - //window.location.reload(); + private onOpen(event) { + console.log("[WS] Connected", event); + + let connectionElement = document.getElementById("right"); + if (connectionElement) + { + connectionElement.innerText = "Verbunden"; + connectionElement.style.color = "green"; + } + } - private onError( event ) { - console.error("WS Error", event); + private onClose(event) { + console.error("[WS] Closed!", event); + if (event.wasClean) { + let modal = new Modal("socketClosed", "Sitzung beendet!"); + modal.content = `Diese Sitzung wurde beendet, da der iTender nun an einem anderen Gerät bzw. an dem Hauptgerät gesteuert wird.

`; + modal.addButton(ButtonType.SUCCESS, "Sitzung wiederherstellen", () => { + window.location.reload(); + }); + modal.open(); + } else { + let modal = new Modal("socketClosed", "Verbindungsproblem!"); + modal.content = `Die Benutzeroberfläche hat die Verbindung mit dem Gerät verloren.
Die Verbindung wird wiederhergestellt...
`; + modal.loader = true; + modal.open(); + setInterval(() => { + window.location.reload(); + }, 5000); + } + + let connectionElement = document.getElementById("right"); + if (connectionElement) + { + connectionElement.innerText = "Getrennt"; + connectionElement.style.color = "red"; + } + } + + private onError(event) { + console.error("[WS] Error", event); + let connectionElement = document.getElementById("right"); + if (connectionElement) + connectionElement.innerText = "Fehler"; //openModal("Einen Augenblick...", `Es wurde ein kritischer Fehler festgestellt.\nBitte warten Sie, während der Prozess neu gestartet wird...` ); //window.location.reload(); } diff --git a/src/web/main.ts b/src/web/main.ts index 5444e4b..b2a4df9 100644 --- a/src/web/main.ts +++ b/src/web/main.ts @@ -10,12 +10,13 @@ document.addEventListener("DOMContentLoaded", () => { let modal = new Modal("start", "iTender"); modal.content = "Willkommen"; modal.loader = true; - modal.open(); + //modal.open(); connect(); setTimeout( load, 1000); }); + function load() { if(!main||!time) @@ -25,35 +26,10 @@ function load() let currentDate = new Date(); time.innerText = "" + ( currentDate.getHours() < 10 ? "0" + currentDate.getHours() : currentDate.getHours() ) + ":" + ( currentDate.getMinutes() < 10 ? "0" + currentDate.getMinutes() : currentDate.getMinutes() ); }, 1000 ); - - let maxI = 20; - - main.style.gridTemplateRows = `repeat(${Math.round(maxI/3)}, calc(90%/2))`; - - - for( let i = 0; i + +iTender + + + + + + +
+
Status: iTenderVerbinden...
+
+ +
+
+
+ +
+
+
+ + + \ No newline at end of file diff --git a/staticWeb/web.bundle.js b/staticWeb/web.bundle.js new file mode 100644 index 0000000..21e3fef --- /dev/null +++ b/staticWeb/web.bundle.js @@ -0,0 +1,346 @@ +/******/ (() => { // webpackBootstrap +/******/ "use strict"; +/******/ var __webpack_modules__ = ({ + +/***/ "./src/WebSocketEvent.ts": +/*!*******************************!*\ + !*** ./src/WebSocketEvent.ts ***! + \*******************************/ +/***/ ((__unused_webpack_module, exports) => { + + +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.WebSocketEvent = void 0; +var WebSocketEvent; +(function (WebSocketEvent) { + WebSocketEvent["STATUS"] = "STATUS"; +})(WebSocketEvent = exports.WebSocketEvent || (exports.WebSocketEvent = {})); + + +/***/ }), + +/***/ "./src/WebSocketPayload.ts": +/*!*********************************!*\ + !*** ./src/WebSocketPayload.ts ***! + \*********************************/ +/***/ ((__unused_webpack_module, exports, __webpack_require__) => { + + +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.WebSocketPayload = void 0; +const WebSocketEvent_1 = __webpack_require__(/*! ./WebSocketEvent */ "./src/WebSocketEvent.ts"); +class WebSocketPayload { + constructor(event, error = false, data) { + this._event = event; + this._error = error; + this._data = data; + } + set event(value) { + this._event = value; + } + set error(value) { + this._error = value; + } + set data(value) { + this._data = value; + } + get event() { + return this._event; + } + get error() { + return this._error; + } + get data() { + return this._data; + } + static parseFromBase64Json(json) { + json = (typeof window != 'undefined') ? atob(json) : Buffer.from(json, "base64").toString(); + let rawPayload; + try { + rawPayload = JSON.parse(json); + } + catch (e) { + return null; + } + let wsEvent = WebSocketEvent_1.WebSocketEvent[rawPayload.event]; + return new WebSocketPayload(wsEvent, rawPayload.error, rawPayload.data); + } + toString() { + let json = JSON.stringify({ "event": this._event, status: this._error, data: this._data }); + json = ((typeof window != 'undefined') ? btoa(json) : Buffer.from(json).toString("base64")); + return json; + } +} +exports.WebSocketPayload = WebSocketPayload; + + +/***/ }), + +/***/ "./src/web/ButtonType.ts": +/*!*******************************!*\ + !*** ./src/web/ButtonType.ts ***! + \*******************************/ +/***/ ((__unused_webpack_module, exports) => { + + +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.ButtonType = void 0; +var ButtonType; +(function (ButtonType) { + ButtonType["SUCCESS"] = "success"; + ButtonType["ERROR"] = "error"; +})(ButtonType = exports.ButtonType || (exports.ButtonType = {})); + + +/***/ }), + +/***/ "./src/web/Modal.ts": +/*!**************************!*\ + !*** ./src/web/Modal.ts ***! + \**************************/ +/***/ ((__unused_webpack_module, exports) => { + + +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.Modal = void 0; +class Modal { + constructor(id, title, content) { + this._title = "iTender"; + this._content = ""; + this._id = ""; + this._loader = false; + this._buttons = []; + this._id = id; + this._title = title; + this._content = content; + } + set title(value) { + this._title = value; + } + set content(value) { + this._content = value; + } + set id(value) { + this._id = value; + } + set loader(value) { + this._loader = value; + } + addButton(type, content, onclick) { + this._buttons.push({ type: type, content: content, onclick: onclick }); + } + open() { + if (!this._content) + this._content = ""; + if (this._loader) + this._content += "
\n" + + "
\n" + + "
"; + for (let btn of this._buttons) { + this._content += ``; + } + Modal.open(this._title, this._content, this._id); + } + static open(title, content, id) { + const modal = document.getElementById("modal"); + const modalContent = document.getElementById("modalInnerContent"); + if (!modal || !modalContent) + return; + modalContent.classList.add("modalBlendIn"); + modal.classList.add("modalBlendIn"); + setTimeout(() => { + modalContent.classList.remove("modalBlendIn"); + modal.classList.remove("modalBlendIn"); + }, 800); + modalContent.innerHTML = `

${title}

${content}`; + modal.style.display = "block"; + this.currentModalId = id ? id : "null"; + } + static close(id) { + if (this.currentModalId != id) + return; + const modal = document.getElementById("modal"); + const modalContent = document.getElementById("modal-content"); + const modalInnerContent = document.getElementById("modalInnerContent"); + if (!modal || !modalContent || !modalInnerContent) + return; + modalContent.classList.add("modalBlendOut"); + modal.classList.add("modalBlendOut"); + setTimeout(() => { + modal.style.display = "none"; + modalInnerContent.innerHTML = ""; + modalContent.classList.remove("modalBlendOut"); + modal.classList.remove("modalBlendOut"); + }, 800); + } +} +exports.Modal = Modal; +Modal.currentModalId = ""; + + +/***/ }), + +/***/ "./src/web/WebWebSocketHandler.ts": +/*!****************************************!*\ + !*** ./src/web/WebWebSocketHandler.ts ***! + \****************************************/ +/***/ ((__unused_webpack_module, exports, __webpack_require__) => { + + +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.WebWebSocketHandler = void 0; +const Modal_1 = __webpack_require__(/*! ./Modal */ "./src/web/Modal.ts"); +const WebSocketEvent_1 = __webpack_require__(/*! ../WebSocketEvent */ "./src/WebSocketEvent.ts"); +const WebSocketPayload_1 = __webpack_require__(/*! ../WebSocketPayload */ "./src/WebSocketPayload.ts"); +const ButtonType_1 = __webpack_require__(/*! ./ButtonType */ "./src/web/ButtonType.ts"); +class WebWebSocketHandler { + constructor() { + this.socket = new WebSocket(WebWebSocketHandler.url); + this.socket.onopen = this.onOpen; + this.socket.onclose = this.onClose; + this.socket.onerror = this.onError; + this.socket.onmessage = this.onMessage; + } + onMessage(msgEvent) { + console.log("[WS] Incoming message", msgEvent); + let payload = WebSocketPayload_1.WebSocketPayload.parseFromBase64Json(msgEvent.data); + if (!payload) { + console.log("[WS] Could not parse message: ", msgEvent); + return; + } + console.debug(payload); + console.debug(payload.event); + console.log("[WS] Received " + payload.event + " Event"); + switch (payload.event) { + case WebSocketEvent_1.WebSocketEvent.STATUS: { + let statusElement = document.getElementById("status"); + if (statusElement) + statusElement.innerText = payload.data.status; + } + } + } + onOpen(event) { + console.log("[WS] Connected", event); + Modal_1.Modal.close("start"); + let connectionElement = document.getElementById("right"); + if (connectionElement) + connectionElement.innerText = "Verbunden"; + } + onClose(event) { + console.error("[WS] Closed!", event); + if (event.wasClean) { + let modal = new Modal_1.Modal("socketClosed", "Sitzung beendet!"); + modal.content = `Diese Sitzung wurde beendet, da der iTender nun an einem anderen Gerät bzw. an dem Hauptgerät gesteuert wird.

`; + modal.addButton(ButtonType_1.ButtonType.SUCCESS, "Sitzung wiederherstellen", () => { + window.location.reload(); + }); + modal.open(); + } + else { + let modal = new Modal_1.Modal("socketClosed", "Verbindungsproblem!"); + modal.content = `Die Benutzeroberfläche hat die Verbindung mit dem Gerät verloren.
Die Verbindung wird wiederhergestellt...
`; + modal.loader = true; + modal.open(); + setInterval(() => { + window.location.reload(); + }, 5000); + } + let connectionElement = document.getElementById("right"); + if (connectionElement) + connectionElement.innerText = "Keine Verbindung"; + } + onError(event) { + console.error("[WS] Error", event); + let connectionElement = document.getElementById("right"); + if (connectionElement) + connectionElement.innerText = "Fehler"; + } +} +exports.WebWebSocketHandler = WebWebSocketHandler; +WebWebSocketHandler.url = (window.location.protocol == "http:" ? "ws://" : "wss://") + window.location.hostname + ":3005"; + + +/***/ }) + +/******/ }); +/************************************************************************/ +/******/ // The module cache +/******/ var __webpack_module_cache__ = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ // Check if module is in cache +/******/ var cachedModule = __webpack_module_cache__[moduleId]; +/******/ if (cachedModule !== undefined) { +/******/ return cachedModule.exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = __webpack_module_cache__[moduleId] = { +/******/ // no module.id needed +/******/ // no module.loaded needed +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__); +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/************************************************************************/ +var __webpack_exports__ = {}; +// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk. +(() => { +var exports = __webpack_exports__; +/*!*************************!*\ + !*** ./src/web/main.ts ***! + \*************************/ + +Object.defineProperty(exports, "__esModule", ({ value: true })); +const WebWebSocketHandler_1 = __webpack_require__(/*! ./WebWebSocketHandler */ "./src/web/WebWebSocketHandler.ts"); +const Modal_1 = __webpack_require__(/*! ./Modal */ "./src/web/Modal.ts"); +const main = document.getElementById("main"); +const time = document.getElementById("title"); +document.addEventListener("DOMContentLoaded", () => { + console.log("DOM Loaded"); + let modal = new Modal_1.Modal("start", "iTender"); + modal.content = "Willkommen"; + modal.loader = true; + modal.open(); + connect(); + setTimeout(load, 1000); +}); +function load() { + if (!main || !time) + return; + setInterval(() => { + let currentDate = new Date(); + time.innerText = "" + (currentDate.getHours() < 10 ? "0" + currentDate.getHours() : currentDate.getHours()) + ":" + (currentDate.getMinutes() < 10 ? "0" + currentDate.getMinutes() : currentDate.getMinutes()); + }, 1000); + let maxI = 20; + main.style.gridTemplateRows = `repeat(${Math.round(maxI / 3)}, calc(90%/2))`; + for (let i = 0; i < maxI; i++) { + let testDrink = document.createElement("div"); + testDrink.classList.add("drink"); + let img = document.createElement("img"); + img.classList.add("thumbnail"); + testDrink.append(img); + let name = document.createElement("p"); + name.classList.add("name"); + testDrink.append(name); + img.alt = "Thumbnail"; + name.innerText = "Mixery"; + main.append(testDrink); + } +} +let wsHandler; +function connect() { + wsHandler = new WebWebSocketHandler_1.WebWebSocketHandler(); +} + +})(); + +/******/ })() +; +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"web.bundle.js","mappings":"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","sources":["webpack://itender/./src/WebSocketEvent.ts","webpack://itender/./src/WebSocketPayload.ts","webpack://itender/./src/web/ButtonType.ts","webpack://itender/./src/web/Modal.ts","webpack://itender/./src/web/WebWebSocketHandler.ts","webpack://itender/webpack/bootstrap","webpack://itender/./src/web/main.ts"],"sourcesContent":["export enum WebSocketEvent {\n    STATUS= \"STATUS\"\n}","import {WebSocketEvent} from \"./WebSocketEvent\";\n\nexport class WebSocketPayload {\n    set event(value: WebSocketEvent) {\n        this._event = value;\n    }\n\n    set error(value: boolean) {\n        this._error = value;\n    }\n\n    set data(value: any | undefined) {\n        this._data = value;\n    }\n\n    private _event: WebSocketEvent;\n    private _error: boolean;\n    private _data: any | undefined;\n\n\n    get event(): WebSocketEvent {\n        return this._event;\n    }\n\n    get error(): boolean {\n        return this._error;\n    }\n\n    get data(): any | undefined {\n        return this._data;\n    }\n\n    constructor(event: WebSocketEvent, error: boolean = false, data?: any) {\n        this._event = event;\n        this._error = error;\n        this._data = data;\n    }\n\n    public static parseFromBase64Json(json: string): WebSocketPayload | null {\n        json = (typeof window != 'undefined') ? atob(json) : Buffer.from(json, \"base64\").toString();\n        let rawPayload: { event: string, error: boolean, data: any };\n        try {\n            rawPayload = JSON.parse(json);\n        } catch (e) {\n            return null;\n        }\n\n        let wsEvent = WebSocketEvent[<keyof typeof WebSocketEvent>rawPayload.event];\n\n        return new WebSocketPayload(wsEvent, rawPayload.error, rawPayload.data);\n    }\n\n    /**\n     * Returns the payload as base64 encoded json string\n     */\n    public toString(): string {\n        let json = JSON.stringify({\"event\": this._event, status: this._error, data: this._data});\n        json = ((typeof window != 'undefined') ? btoa(json) : Buffer.from(json).toString(\"base64\"));\n        return json;\n    }\n}","export enum ButtonType {\n    SUCCESS = \"success\",\n    ERROR = \"error\",\n\n}","import {ButtonType} from \"./ButtonType\";\n\nexport class Modal {\n\n    private static currentModalId = \"\";\n\n    private _title: string = \"iTender\";\n    private _content: string | undefined = \"\";\n    private _id: string = \"\";\n    private _loader: boolean = false;\n    private _buttons: { type: string, content: string, onclick: Function }[] = [];\n\n\n    constructor(id, title: string, content?: string) {\n        this._id = id;\n        this._title = title;\n        this._content = content;\n    }\n\n\n    set title(value: string) {\n        this._title = value;\n    }\n\n    set content(value: string | undefined) {\n        this._content = value;\n    }\n\n    set id(value: string) {\n        this._id = value;\n    }\n\n    set loader(value: boolean) {\n        this._loader = value;\n    }\n\n    public addButton( type: ButtonType, content: string, onclick: Function )\n    {\n        this._buttons.push({type: type, content: content, onclick: onclick});\n    }\n\n    public open() {\n        if (!this._content)\n            this._content = \"\";\n\n        if (this._loader)\n            this._content += \"<br><div class=\\\"lds-ellipsis\\\">\\n\" +\n                \"  <div></div><div></div><div></div><div></div>\\n\" +\n                \"</div>\";\n\n        for (let btn of this._buttons) {\n            this._content += `<button class=\"btn btn-${btn.type}\" onclick=\"(${btn.onclick})();\">${btn.content}</button>`;\n        }\n\n        Modal.open(this._title, this._content, this._id);\n    }\n\n    /**\n     * @param title\n     * @param content\n     * @param id\n     */\n    public static open(title: string, content: string, id?: string): void {\n        const modal = document.getElementById(\"modal\");\n        const modalContent = document.getElementById(\"modalInnerContent\");\n\n        if (!modal || !modalContent)\n            return;\n\n        modalContent.classList.add(\"modalBlendIn\");\n        modal.classList.add(\"modalBlendIn\");\n\n        setTimeout(() => {\n            modalContent.classList.remove(\"modalBlendIn\");\n            modal.classList.remove(\"modalBlendIn\");\n        }, 800);\n\n        modalContent.innerHTML = `<h1 id=\"modalTitle\">${title}</h1>${content}`;\n        modal.style.display = \"block\";\n\n        this.currentModalId = id ? id : \"null\";\n    }\n\n    public static close(id?: string): void {\n        if (this.currentModalId != id)\n            return;\n\n        const modal = document.getElementById(\"modal\");\n        const modalContent = document.getElementById(\"modal-content\");\n        const modalInnerContent = document.getElementById(\"modalInnerContent\");\n\n        if (!modal || !modalContent || !modalInnerContent)\n            return;\n\n        modalContent.classList.add(\"modalBlendOut\");\n        modal.classList.add(\"modalBlendOut\");\n\n        setTimeout(() => {\n            modal.style.display = \"none\";\n            modalInnerContent.innerHTML = \"\";\n            modalContent.classList.remove(\"modalBlendOut\");\n            modal.classList.remove(\"modalBlendOut\");\n        }, 800);\n    }\n}","import {Modal} from \"./Modal\";\nimport {WebSocketEvent} from \"../WebSocketEvent\";\nimport {WebSocketPayload} from \"../WebSocketPayload\";\nimport {ButtonType} from \"./ButtonType\";\n\nexport class WebWebSocketHandler {\n    private socket: WebSocket;\n    private static url = (window.location.protocol == \"http:\" ? \"ws://\" : \"wss://\") + window.location.hostname + \":3005\";\n\n    constructor() {\n        this.socket = new WebSocket(WebWebSocketHandler.url);\n        this.socket.onopen = this.onOpen;\n        this.socket.onclose = this.onClose;\n        this.socket.onerror = this.onError;\n        this.socket.onmessage = this.onMessage;\n    }\n\n    private onMessage(msgEvent: MessageEvent) {\n        console.log(\"[WS] Incoming message\", msgEvent);\n        let payload = WebSocketPayload.parseFromBase64Json(msgEvent.data);\n        if (!payload) {\n            console.log(\"[WS] Could not parse message: \", msgEvent);\n            return;\n        }\n        console.debug(payload)\n\n        console.debug(payload.event);\n\n        console.log(\"[WS] Received \" + payload.event + \" Event\");\n\n        switch (payload.event) {\n            case WebSocketEvent.STATUS: {\n                let statusElement = document.getElementById(\"status\");\n                if (statusElement)\n                    statusElement.innerText = payload.data.status;\n            }\n        }\n    }\n\n    private onOpen(event) {\n        console.log(\"[WS] Connected\", event);\n        Modal.close(\"start\");\n        let connectionElement = document.getElementById(\"right\");\n        if (connectionElement)\n            connectionElement.innerText = \"Verbunden\";\n    }\n\n    private onClose(event) {\n        console.error(\"[WS] Closed!\", event);\n        if( event.wasClean )\n        {\n            let modal = new Modal(\"socketClosed\", \"Sitzung beendet!\");\n            modal.content = `Diese Sitzung wurde beendet, da der iTender nun an einem anderen Gerät bzw. an dem Hauptgerät gesteuert wird.<br><br>`;\n            modal.addButton(ButtonType.SUCCESS, \"Sitzung wiederherstellen\", () => {\n                window.location.reload();\n            });\n            modal.open();\n        }\n        else\n        {\n            let modal = new Modal(\"socketClosed\", \"Verbindungsproblem!\");\n            modal.content = `Die Benutzeroberfläche hat die Verbindung mit dem Gerät verloren.<br>Die Verbindung wird wiederhergestellt...<br>`;\n            modal.loader = true;\n            modal.open();\n            setInterval( () => {\n                window.location.reload();\n            }, 5000 );\n        }\n\n        let connectionElement = document.getElementById(\"right\");\n        if (connectionElement)\n            connectionElement.innerText = \"Keine Verbindung\";\n    }\n\n    private onError(event) {\n        console.error(\"[WS] Error\", event);\n        let connectionElement = document.getElementById(\"right\");\n        if (connectionElement)\n            connectionElement.innerText = \"Fehler\";\n        //openModal(\"Einen Augenblick...\", `Es wurde ein kritischer Fehler festgestellt.\\nBitte warten Sie, während der Prozess neu gestartet wird...` );\n        //window.location.reload();\n    }\n}","// The module cache\nvar __webpack_module_cache__ = {};\n\n// The require function\nfunction __webpack_require__(moduleId) {\n\t// Check if module is in cache\n\tvar cachedModule = __webpack_module_cache__[moduleId];\n\tif (cachedModule !== undefined) {\n\t\treturn cachedModule.exports;\n\t}\n\t// Create a new module (and put it into the cache)\n\tvar module = __webpack_module_cache__[moduleId] = {\n\t\t// no module.id needed\n\t\t// no module.loaded needed\n\t\texports: {}\n\t};\n\n\t// Execute the module function\n\t__webpack_modules__[moduleId](module, module.exports, __webpack_require__);\n\n\t// Return the exports of the module\n\treturn module.exports;\n}\n\n","import {WebWebSocketHandler} from \"./WebWebSocketHandler\";\nimport {Modal} from \"./Modal\";\n\nconst main = document.getElementById(\"main\");\nconst time = document.getElementById(\"title\");\n\ndocument.addEventListener(\"DOMContentLoaded\", () => {\n   console.log(\"DOM Loaded\");\n\n   let modal = new Modal(\"start\", \"iTender\");\n   modal.content = \"Willkommen\";\n   modal.loader = true;\n   modal.open();\n   connect();\n\n   setTimeout( load, 1000);\n});\n\nfunction load()\n{\n   if(!main||!time)\n      return;\n\n   setInterval( () => {\n      let currentDate = new Date();\n      time.innerText = \"\" + ( currentDate.getHours() < 10 ? \"0\" + currentDate.getHours() : currentDate.getHours() ) + \":\" + ( currentDate.getMinutes() < 10 ? \"0\" + currentDate.getMinutes() : currentDate.getMinutes() );\n   }, 1000 );\n\n   let maxI = 20;\n\n   main.style.gridTemplateRows = `repeat(${Math.round(maxI/3)}, calc(90%/2))`;\n\n\n   for( let i = 0; i<maxI; i++ )\n   {\n      let testDrink = document.createElement(\"div\");\n      testDrink.classList.add(\"drink\");\n\n      let img = document.createElement(\"img\");\n      img.classList.add(\"thumbnail\");\n      testDrink.append(img);\n\n      let name = document.createElement(\"p\");\n      name.classList.add(\"name\");\n      testDrink.append(name);\n\n      img.alt=\"Thumbnail\";\n      name.innerText = \"Mixery\"\n\n      main.append(testDrink);\n   }\n}\n\nlet wsHandler;\nfunction connect()\n{\n   wsHandler = new WebWebSocketHandler();\n\n}\n"],"names":[],"sourceRoot":""} \ No newline at end of file diff --git a/views/layout.pug b/views/layout.pug index e99ea90..f17103f 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -4,6 +4,7 @@ html title iTender link(rel='stylesheet', href='/stylesheets/reset.css') link(rel='stylesheet', href='/stylesheets/style.css') + meta(charset="UTF-8") body div.modal#modal div.modal-content#modal-content @@ -11,7 +12,9 @@ html div#overlay div#top + span#left Status: span#title iTender + span#right Verbinden... div#bottom button#menuBtn Menü div#container @@ -25,7 +28,7 @@ html block extra script(src="/web.js") script. - setTimeout( () => - { - window.location.reload(); - }, 120000 ); + // setTimeout( () => + // { + // window.location.reload(); + // }, 120000 ); diff --git a/webpack.config.js b/webpack.config.js index 7bf85f4..99ac5ea 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -11,7 +11,7 @@ module.exports = { { test: /\.tsx?$/, use: "ts-loader", - exclude: /node_modules/, + //exclude: /node_modules/, }, ], },