Merge branch 'master' into feat/http-integration

packages/types/.eslintrc

@@ -3,11 +3,6 @@
     "browser": true,
     "node": true
   },
-  "parser": "@typescript-eslint/parser",
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
   "parserOptions": {
     "ecmaVersion": 2020,
     "sourceType": "module"

packages/types/package.json

@@ -6,15 +6,16 @@
   "private": true,
   "description": "shared typings for ontime",
   "scripts": {
-    "cleanup": "rm -rf .turbo && rm -rf node_modules"
+    "cleanup": "rm -rf .turbo && rm -rf node_modules",
+    "lint": "eslint . --quiet"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.48.1",
-    "@typescript-eslint/parser": "^5.48.1",
-    "eslint": "^8.31.0",
-    "typescript": "^4.9.4"
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
+    "eslint": "^8.53.0",
+    "typescript": "^5.2.2"
   }
 }

packages/types/src/api/ontime-controller/BackendResponse.type.ts

@@ -0,0 +1,14 @@
+import { OSCSettings } from '../../definitions/core/OscSettings.type.js';
+
+export type NetworkInterface = {
+  name: string;
+  address: string;
+};
+
+export interface GetInfo {
+  networkInterfaces: NetworkInterface[];
+  version: string;
+  serverPort: number;
+  osc: OSCSettings;
+  cssOverride: string;
+}

packages/types/src/api/rundown-controller/BackendResponse.type.ts

@@ -0,0 +1,6 @@
+import { OntimeRundown } from '../../definitions/core/Rundown.type.js';
+
+export interface GetRundownCached {
+  rundown: OntimeRundown;
+  revision: number;
+}

packages/types/src/definitions/core/Alias.type.ts

@@ -2,4 +2,4 @@ export type Alias = {
   enabled: boolean;
   alias: string;
   pathAndParams: string;
-}
+};

packages/types/src/definitions/core/Settings.type.ts

@@ -1,8 +1,8 @@
-import { TimeFormat } from './TimeFormat.type';
+import { TimeFormat } from './TimeFormat.type.js';
 
 export type Settings = {
   app: 'ontime';
-  version: 2;
+  version: string;
   serverPort: number;
   editorKey: null | string;
   operatorKey: null | string;

packages/types/src/definitions/core/UserFields.type.ts

@@ -9,5 +9,4 @@ export type UserFields = {
   user7: string;
   user8: string;
   user9: string;
-}
-
+};

packages/types/src/definitions/core/Views.type.ts

@@ -6,4 +6,4 @@ export type ViewSettings = {
   warningThreshold: number;
   dangerColor: string;
   dangerThreshold: number;
-}
+};

packages/types/src/definitions/runtime/Logger.type.ts

@@ -23,5 +23,5 @@ export enum LogOrigin {
   Rx = 'RX',
   Server = 'SERVER',
   Tx = 'TX',
-  User = 'USER'
+  User = 'USER',
 }

packages/types/src/definitions/runtime/MessageControl.type.ts

@@ -6,4 +6,4 @@ export type Message = {
 export type TimerMessage = Message & {
   timerBlink: boolean;
   timerBlackout: boolean;
-}
+};

packages/types/src/index.ts

@@ -35,6 +35,10 @@ export type { OSCSettings } from './definitions/core/OscSettings.type.js';
 // ---> HTTP
 export type { HTTPSettings } from './definitions/core/HttpSettings.type.js';
 
+// SERVER RESPONSES
+export type { NetworkInterface, GetInfo } from './api/ontime-controller/BackendResponse.type.js';
+export type { GetRundownCached } from './api/rundown-controller/BackendResponse.type.js';
+
 // SERVER RUNTIME
 export { type Log, LogLevel, type LogMessage, LogOrigin } from './definitions/runtime/Logger.type.js';
 export { Playback } from './definitions/runtime/Playback.type.js';

packages/types/src/utils/guards.ts

@@ -1,7 +1,7 @@
 import { OntimeRundownEntry } from '../definitions/core/Rundown.type.js';
 import { OntimeBlock, OntimeDelay, OntimeEvent, SupportedEvent } from '../definitions/core/OntimeEvent.type.js';
 
-type MaybeEvent = OntimeRundownEntry | null | undefined;
+type MaybeEvent = Partial<OntimeRundownEntry> | null | undefined;
 
 export function isOntimeEvent(event: MaybeEvent): event is OntimeEvent {
   return event?.type === SupportedEvent.Event;