From c73f7e2207e64a1db1d174463a98eb6424ba76e7 Mon Sep 17 00:00:00 2001 From: Carlos Valente <34649812+cpvalente@users.noreply.github.com> Date: Mon, 17 Jul 2023 13:53:50 +0200 Subject: [PATCH] fix: issues with clock overflow on midnight (#456) * fix: issues with clock overflow on midnight * chore: version bump --- apps/client/package.json | 2 +- apps/electron/package.json | 2 +- apps/server/package.json | 2 +- apps/server/src/services/TimerService.ts | 4 ++++ package.json | 2 +- packages/utils/package.json | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/client/package.json b/apps/client/package.json index 81db38c6c9..3cd8d5de04 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -1,6 +1,6 @@ { "name": "ontime-ui", - "version": "2.0.2", + "version": "2.0.8", "private": true, "dependencies": { "@chakra-ui/react": "^2.5.5", diff --git a/apps/electron/package.json b/apps/electron/package.json index 906e0b19b0..a767ef8684 100644 --- a/apps/electron/package.json +++ b/apps/electron/package.json @@ -1,6 +1,6 @@ { "name": "ontime", - "version": "2.0.2", + "version": "2.0.8", "author": "Carlos Valente", "description": "Time keeping for live events", "repository": "https://github.com/cpvalente/ontime", diff --git a/apps/server/package.json b/apps/server/package.json index 242ee39218..3e326d88cc 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -2,7 +2,7 @@ "name": "ontime-server", "type": "module", "main": "src/index.ts", - "version": "2.0.2", + "version": "2.0.8", "exports": "./src/index.js", "dependencies": { "body-parser": "^1.20.0", diff --git a/apps/server/src/services/TimerService.ts b/apps/server/src/services/TimerService.ts index 0608dcd241..8831692fbe 100644 --- a/apps/server/src/services/TimerService.ts +++ b/apps/server/src/services/TimerService.ts @@ -319,7 +319,11 @@ export class TimerService { } update(force = false) { + const previousTime = this.timer.clock; this.timer.clock = clock.timeNow(); + if (previousTime > this.timer.clock) { + force = true; + } // we call integrations if we update timers let shouldNotify = false; diff --git a/package.json b/package.json index 964cbdc7b6..ebe13f7519 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ontime", - "version": "2.0.2", + "version": "2.0.8", "description": "Time keeping for live events", "keywords": [ "lighdev", diff --git a/packages/utils/package.json b/packages/utils/package.json index 1e5bdd7cfd..0e00759ace 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -2,7 +2,7 @@ "name": "ontime-utils", "type": "module", "exports": "./index.ts", - "version": "2.0.2", + "version": "2.0.8", "private": true, "description": "shared logic for ontime", "scripts": {