Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: casparcg restart action always responds 'OK' SOFIE-2588 #295

Merged
merged 3 commits into from
Oct 2, 2023
Merged

fix: casparcg restart action always responds 'OK' SOFIE-2588 #295

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dcbdf7
fix: casparcg restart action always responds 'OK'
Julusian Sep 29, 2023
08a1a41
fix: give restart request a timeout
Julusian Sep 29, 2023
621bbbc
fix: typings
Julusian Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 28 additions & 24 deletions packages/timeline-state-resolver/src/integrations/casparCG/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,10 +671,7 @@ export class CasparCGDevice extends DeviceWithState<State, DeviceOptionsCasparCG
case CasparCGActions.ClearAllChannels:
return this.clearAllChannels()
case CasparCGActions.RestartServer:
await this.restartCasparCG()
return {
result: ActionExecutionResultCode.Ok,
}
return this.restartCasparCG()
default:
return {
result: ActionExecutionResultCode.Error,
Expand Down Expand Up @@ -703,27 +700,34 @@ export class CasparCGDevice extends DeviceWithState<State, DeviceOptionsCasparCG
}
}

return new Promise<ActionExecutionResult>((resolve) => {
const url = `http://${this.initOptions?.launcherHost}:${this.initOptions?.launcherPort}/processes/${this.initOptions?.launcherProcess}/restart`
got
.post(url)
.then((response) => {
if (response.statusCode === 200) {
resolve({ result: ActionExecutionResultCode.Ok })
} else {
resolve({
result: ActionExecutionResultCode.Error,
response: t('Bad reply: [{{statusCode}}] {{body}}', {
statusCode: response.statusCode,
body: response.body,
}),
})
const url = `http://${this.initOptions?.launcherHost}:${this.initOptions?.launcherPort}/processes/${this.initOptions?.launcherProcess}/restart`
return got
.post(url, {
timeout: {
request: 5000, // Arbitary, long enough for realistic scenarios
},
})
.then((response) => {
if (response.statusCode === 200) {
return { result: ActionExecutionResultCode.Ok }
} else {
return {
result: ActionExecutionResultCode.Error,
response: t('Bad reply: [{{statusCode}}] {{body}}', {
statusCode: response.statusCode,
body: response.body,
}),
}
})
.catch((error) => {
resolve({ result: ActionExecutionResultCode.Error, response: error })
})
})
}
})
.catch((error) => {
return {
result: ActionExecutionResultCode.Error,
response: t('{{message}}', {
message: error.toString(),
}),
}
})
}
getStatus(): DeviceStatus {
let statusCode = StatusCode.GOOD
Expand Down
Loading