cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-09 09:23:51 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

unify osc and http validateSubscriptionEntry

Browse Source
This commit is contained in:
arc-alex
2023-11-04 20:32:30 +01:00
parent 563ea92a3b
commit 2b87f72acb
3 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/utils/parserFunctions.ts
+1 -18
View File
@@ -191,7 +191,7 @@ export const parseViewSettings = (data, enforce): ViewSettings => {
* Parses and validates subscription entry
* @param data
*/
export const validateOscSubscriptionEntry = (data: SubscriptionOptions): boolean => {
export const validateSubscriptionEntry = (data: SubscriptionOptions): boolean => {
for (const subscription in data) {
if (typeof data[subscription].message !== 'string' || typeof data[subscription].enabled !== 'boolean') {
return false;
@@ -253,19 +253,6 @@ export const parseOsc = (
} else return {};
};
/**
* Parses and validates subscription entry
* @param data
*/
export const validateHttpSubscriptionEntry = (data: SubscriptionOptions): boolean => {
for (const subscription in data) {
if (typeof data[subscription].message !== 'string' || typeof data[subscription].enabled !== 'boolean') {
return false;
}
}
return true;
};
/**
* Parses and validates subscription object
* @param data
@@ -309,10 +296,6 @@ export const parseHttp = (
: dbModel.http.subscriptions;
return {
portIn: loadedConfig.portIn ?? dbModel.http.portIn,
portOut: loadedConfig.portOut ?? dbModel.http.portOut,
targetIP: loadedConfig.targetIP ?? dbModel.http.targetIP,
enabledIn: loadedConfig.enabledIn ?? dbModel.http.enabledIn,
enabledOut: loadedConfig.enabledOut ?? dbModel.http.enabledOut,
subscriptions: validatedSubscriptions,
};