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

Revert "split url and searchParams allow for post option"

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