From 159ba82e00c23d26bdf18e4c9f74be1772c73114 Mon Sep 17 00:00:00 2001
From: Carlos Valente <34649812+cpvalente@users.noreply.github.com>
Date: Thu, 3 Nov 2022 14:57:53 +0100
Subject: [PATCH] feat: OSC feedback (#236)

* feat: add playback status feedback to OSC API
---
 client/package.json                     |  2 +-
 server/package.json                     |  2 +-
 server/src/controllers/OscController.js | 10 ++++++++--
 server/src/package.json                 |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/client/package.json b/client/package.json
index 1ed6320d9..3f362754e 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ontime-ui",
-  "version": "1.9.3",
+  "version": "1.9.4",
   "private": true,
   "dependencies": {
     "@chakra-ui/react": "^2.3.2",
diff --git a/server/package.json b/server/package.json
index 432d47ec6..53c6c0fe2 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ontime",
-  "version": "1.9.3",
+  "version": "1.9.4",
   "author": "Carlos Valente",
   "description": "Time keeping for live events",
   "repository": "https://github.com/cpvalente/ontime",
diff --git a/server/src/controllers/OscController.js b/server/src/controllers/OscController.js
index 0233a547e..cd6d15794 100644
--- a/server/src/controllers/OscController.js
+++ b/server/src/controllers/OscController.js
@@ -3,7 +3,7 @@ import { Server } from 'node-osc';
 let oscServer = null;
 
 /**
- * @description utilty function to shutdown osc server
+ * @description utility function to shut down osc server
  */
 export const shutdownOSCServer = () => {
   if (oscServer != null) oscServer.close();
@@ -23,7 +23,7 @@ export const initiateOSC = (config) => {
     // message should look like /ontime/{path}/{args} where
     // ontime: fixed message for app
     // path: command to be called
-    // args: extra data, only used on some of the API entries (delay, goto)
+    // args: extra data, only used on some API entries (delay, goto)
 
     // split message
     const [, address, path] = msg[0].split('/');
@@ -145,6 +145,12 @@ export const initiateOSC = (config) => {
         break;
       }
 
+      case 'get-playback': {
+        const playback = global.timer.state;
+        global.timer.sendOsc('playback', playback);
+        break;
+      }
+
       default: {
         global.timer.warning('RX', `OSC IN: unhandled message ${path}`);
         break;
diff --git a/server/src/package.json b/server/src/package.json
index 1eae3c477..a019b0445 100644
--- a/server/src/package.json
+++ b/server/src/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ontime-server",
   "type": "module",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "dependencies": {
     "body-parser": "^1.20.0",
     "dotenv": "^16.0.1",