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

split url and searchParams allow for post option

Browse Source
This commit is contained in:
arc-alex
2023-12-05 17:46:44 +01:00
parent 7f095f0f06
commit 54ab8d4ffe
4 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/services/integration-service/HttpIntegration.ts
+18 -10
View File
@@ -77,14 +77,15 @@ export class HttpIntegration implements IIntegration<HttpSubscriptionOptions> {
}
// check subscriptions for action
const eventSubscriptions = this.subscriptions?.[action] || [];
const eventSubscriptions = (this.subscriptions?.[action] as HttpSubscriptionOptions[]) || [];
eventSubscriptions.forEach((sub) => {
const { enabled, message } = sub;
if (enabled && message) {
const parsedMessage = parseTemplateNested(message, state || {});
const { enabled, url, options, method } = sub;
if (enabled && url) {
const templateUrl = parseTemplateNested(url, state || {});
const templateOptions = parseTemplateNested(options, state || {});
try {
const parsedUrl = new globalThis.URL(parsedMessage);
const parsedUrl = new globalThis.URL(templateUrl);
// if (parsedUrl.protocol != 'http:') {
// logger.error(LogOrigin.Tx, `HTTP Integration: Only HTTP allowed, got ${parsedUrl.protocol}`);
// return {
@@ -92,7 +93,7 @@ export class HttpIntegration implements IIntegration<HttpSubscriptionOptions> {
// message: `Only HTTP allowed, got ${parsedUrl.protocol}`,
// };
// }
this.emit(parsedUrl);
this.emit(templateUrl, templateOptions, method);
} catch (err) {
logger.error(LogOrigin.Tx, `HTTP Integration: ${err}`);
return {
@@ -104,11 +105,18 @@ export class HttpIntegration implements IIntegration<HttpSubscriptionOptions> {
});
}
async emit(path: globalThis.URL) {
async emit(path: string, options: string, method: 'GET' | 'POST') {
try {
await got.get(path, {
retry: { limit: 0 },
});
if (method === 'GET') {
await got.get(path, {
searchParams: options,
retry: { limit: 0 },
});
} else if (method === 'POST') {
await got.post(path, {
retry: { limit: 0 },
});
}
} catch (err) {
logger.error(LogOrigin.Tx, `HTTP integration: ${err}`);
}
apps/server/src/utils/parserFunctions.ts
+9 -3
View File
@@ -227,9 +227,15 @@ export const parseOsc = (data: { osc?: Partial<OSCSettings> }): OSCSettings => {
*/
export const validateHttpSubscriptionCycle = (data: HttpSubscriptionOptions[]): boolean => {
for (const subscriptionOption of data) {
const isHttp =
subscriptionOption.message?.startsWith('http://') || subscriptionOption.message?.startsWith('https://');
if (typeof subscriptionOption.message !== 'string' || !isHttp || typeof subscriptionOption.enabled !== 'boolean') {
const isHttp = subscriptionOption.url?.startsWith('http://') || subscriptionOption.url?.startsWith('https://');
const ishttpMethod = subscriptionOption.method == 'GET' || subscriptionOption.method == 'POST';
if (
typeof subscriptionOption.url !== 'string' ||
typeof subscriptionOption.options !== 'string' ||
!isHttp ||
!ishttpMethod ||
typeof subscriptionOption.enabled !== 'boolean'
) {
return false;
}
}