refactor: await init rundown

apps/cli/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@getontime/cli",
-    "version": "3.6.0",
+    "version": "3.6.1",
     "author": "Carlos Valente",
     "description": "Time keeping for live events",
     "repository": "https://github.com/cpvalente/ontime",

apps/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontime-ui",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "private": true,
   "type": "module",
   "dependencies": {

apps/client/src/common/utils/__tests__/regex.test.ts

@@ -1,4 +1,4 @@
-import { isAlphanumeric, isIPAddress, isNotEmpty, isOnlyNumbers, startsWithHttp, startsWithSlash } from '../regex';
+import { isAlphanumeric, isIPAddress, isNotEmpty, isOnlyNumbers, startsWithSlash } from '../regex';
 
 describe('simple tests for regex', () => {
   test('isOnlyNumbers', () => {
@@ -25,18 +25,6 @@ describe('simple tests for regex', () => {
     });
   });
 
-  test('startsWithHttp', () => {
-    const right = ['http://test'];
-    const wrong = ['https://test', 'testing', '123.0.1'];
-
-    right.forEach((t) => {
-      expect(startsWithHttp.test(t)).toBe(true);
-    });
-    wrong.forEach((t) => {
-      expect(startsWithHttp.test(t)).toBe(false);
-    });
-  });
-
   test('startsWithSlash', () => {
     const right = ['//test'];
     const wrong = ['testing', '123.0.1'];

apps/client/src/common/utils/regex.ts

@@ -5,7 +5,6 @@
 
 export const isOnlyNumbers = /^\d+$/;
 export const isIPAddress = /^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}$/;
-export const startsWithHttp = /^http:\/\//;
 export const startsWithSlash = /^\//;
 export const isAlphanumeric = /^[a-z0-9]+$/i;
 export const isASCII = /^[ -~]+$/; //https://catonmat.net/my-favorite-regex

apps/client/src/features/app-settings/panel/integrations-panel/HttpIntegrations.tsx

@@ -8,7 +8,6 @@ import { generateId } from 'ontime-utils';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import { useHttpSettings, usePostHttpSettings } from '../../../../common/hooks-query/useHttpSettings';
 import { isKeyEscape } from '../../../../common/utils/keyEvent';
-import { startsWithHttp } from '../../../../common/utils/regex';
 import * as Panel from '../PanelUtils';
 
 import { cycles } from './integrationUtils';
@@ -158,10 +157,6 @@ export default function HttpIntegrations() {
                           placeholder='http://third-party/vt1/{{timer.current}}'
                           {...register(`subscriptions.${index}.message`, {
                             required: { value: true, message: 'Required field' },
-                            pattern: {
-                              value: startsWithHttp,
-                              message: 'HTTP messages should start with http://',
-                            },
                           })}
                         />
                         {maybeError && <Panel.Error>{maybeError}</Panel.Error>}

apps/client/src/features/control/message/TimerPreview.tsx

@@ -52,7 +52,7 @@ export default function TimerPreview() {
       <div className={contentClasses}>
         <div
           className={style.mainContent}
-          data-phase={phase}
+          data-phase={showColourOverride && phase}
           style={showColourOverride ? { '--override-colour': overrideColour } : {}}
         >
           {main}

apps/electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontime",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "author": "Carlos Valente",
   "description": "Time keeping for live events",
   "repository": "https://github.com/cpvalente/ontime",

apps/server/package.json

@@ -2,7 +2,7 @@
   "name": "ontime-server",
   "type": "module",
   "main": "src/index.ts",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "exports": "./src/index.js",
   "dependencies": {
     "@googleapis/sheets": "^5.0.5",

apps/server/src/services/project-service/ProjectService.ts

@@ -172,7 +172,7 @@ export async function loadProjectFile(name: string) {
   const { rundown, customFields, osc, http } = result.data;
 
   // apply the rundown
-  initRundown(rundown, customFields);
+  await initRundown(rundown, customFields);
 
   // apply integrations
   oscIntegration.init(osc);
@@ -246,7 +246,7 @@ export async function renameProjectFile(originalFile: string, newFilename: strin
     const { rundown, customFields, osc, http } = result.data;
 
     // apply the rundown
-    initRundown(rundown, customFields);
+    await initRundown(rundown, customFields);
 
     // apply integrations
     oscIntegration.init(osc);
@@ -334,7 +334,7 @@ export async function patchCurrentProject(data: Partial<DatabaseModel>) {
   // ... but rundown and custom fields need to be checked
   if (rundown != null) {
     const result = parseRundown(data);
-    initRundown(result.rundown, result.customFields);
+    await initRundown(result.rundown, result.customFields);
   }
 
   return newData;

apps/server/src/utils/__tests__/parserFunctions.test.ts

@@ -128,7 +128,6 @@ describe('parseHttp()', () => {
         { id: '1', cycle: 'onLoad', message: 'http://', enabled: true }, // OK
         {}, // no data
         { id: '2', cycle: 'onStart', enabled: true }, // no message
-        { id: '3', cycle: 'onLoad', message: '/test', enabled: true }, // doesnt start with http
       ],
     } as HttpSettings;
     const result = parseHttp({ http }, errorEmitter);

apps/server/src/utils/parserFunctions.ts

@@ -222,11 +222,7 @@ export function sanitiseHttpSubscriptions(subscriptions?: HttpSubscription[]): H
 
   return subscriptions.filter(
     ({ id, cycle, message, enabled }) =>
-      typeof id === 'string' &&
+      typeof id === 'string' && isOntimeCycle(cycle) && typeof message === 'string' && typeof enabled === 'boolean',
-      isOntimeCycle(cycle) &&
-      typeof message === 'string' &&
-      message.startsWith('http://') &&
-      typeof enabled === 'boolean',
   );
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontime",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Time keeping for live events",
   "keywords": [
     "ontime",