From 7c67d2e57d7c8cae3ad898c20f0ada78493b7339 Mon Sep 17 00:00:00 2001
From: cv <34649812+cpvalente@users.noreply.github.com>
Date: Wed, 26 May 2021 22:33:14 +0200
Subject: [PATCH 1/2] update lib

---
 server/package.json | 2 +-
 server/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/package.json b/server/package.json
index 45025a56a..8ecb67af8 100644
--- a/server/package.json
+++ b/server/package.json
@@ -8,7 +8,7 @@
     "express-session": "~1.17.1",
     "lowdb": "^1.0.0",
     "nanoid": "^3.1.22",
-    "node-osc": "^6.0.1",
+    "node-osc": "6.0.2",
     "passport": "~0.4.1",
     "passport-local": "~1.0.0",
     "socket.io": "^4.0.0"
diff --git a/server/yarn.lock b/server/yarn.lock
index 4b7da8610..9778a0c2f 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -380,10 +380,10 @@ negotiator@0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
-node-osc@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/node-osc/-/node-osc-6.0.1.tgz#6f2c39996c64460435b678dc91c128d3a9711031"
-  integrity sha512-UZBQGH4vVTw3Ub5/xcnhlrhL6bpaYz3hhNjO4eup4tknyP5qOi2GVVnEmEn/qaTgTvs7SVyytj3OHg9JWRD4Aw==
+node-osc@6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/node-osc/-/node-osc-6.0.2.tgz#185d387928b186a84e8d0eebcae9e54a8bf50729"
+  integrity sha512-RW8PRLMh4H14veC5gZVUTcRkrk5pXd+b4vmitWL55c9ZI+5yEvMXkrokfnRH0u7DYveqw4h+uCPIUDifY/vjfA==
   dependencies:
     osc-min "^1.1.1"
 

From 9314594051ca772aca0627cc9d1a5dd6fc46b51d Mon Sep 17 00:00:00 2001
From: cv <34649812+cpvalente@users.noreply.github.com>
Date: Thu, 27 May 2021 15:01:34 +0200
Subject: [PATCH 2/2] handle error messages

---
 server/controllers/OscController.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/controllers/OscController.js b/server/controllers/OscController.js
index dba6d9cc1..e4ddcb983 100644
--- a/server/controllers/OscController.js
+++ b/server/controllers/OscController.js
@@ -5,6 +5,9 @@ const initiateOSC = (config) => {
     console.log(`OSC Server is listening on port ${config.port}`);
   });
 
+  // error
+  oscServer.on('error', console.error);
+
   oscServer.on('message', function (msg) {
     // message should look like /ontime/{path}/{args} where
     // ontime: fixed message for app
@@ -62,8 +65,8 @@ const initiateOSC = (config) => {
         console.log('calling goto with', args);
         try {
           let eventIndex = parseInt(args);
-          if (isNaN(eventIndex) || eventIndex <= 0) return;
-          global.timer.pause();
+          if (isNaN(eventIndex) || eventIndex <= 0 || eventIndex == null)
+            return;
           global.timer.loadEvent(eventIndex - 1, undefined, true);
         } catch (error) {
           console.log('error calling goto: ', error);
@@ -71,6 +74,7 @@ const initiateOSC = (config) => {
         break;
       case 'gotoid':
         console.log('calling gotoid with', args);
+        if (args == null) return;
         try {
           global.timer.loadEventById(args.toString().toLowerCase());
         } catch (error) {