blsmedia/bot
2
0
Fork 0
Code Activity

🔧 Add disableRequestTimeout param for automation integrations

Browse Source
This commit is contained in:
Baptiste Arnaud
2023-12-27 07:44:54 +01:00
parent 3bbaf670a2
commit cee1373e6a
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/bot-engine/blocks/integrations/webhook/executeWebhookBlock.ts
View File

@@ -41,9 +41,12 @@ export const longReqTimeoutWhitelist = [
'https://api.anthropic.com', 'https://api.anthropic.com',
] ]
type Params = { disableRequestTimeout?: boolean }
export const executeWebhookBlock = async ( export const executeWebhookBlock = async (
state: SessionState, state: SessionState,
block: WebhookBlock | ZapierBlock | MakeComBlock | PabblyConnectBlock block: WebhookBlock | ZapierBlock | MakeComBlock | PabblyConnectBlock,
params: Params = {}
): Promise<ExecuteIntegrationResponse> => { ): Promise<ExecuteIntegrationResponse> => {
const logs: ChatLog[] = [] const logs: ChatLog[] = []
const webhook = const webhook =
@@ -80,7 +83,7 @@ export const executeWebhookBlock = async (
response: webhookResponse, response: webhookResponse,
logs: executeWebhookLogs, logs: executeWebhookLogs,
startTimeShouldBeUpdated, startTimeShouldBeUpdated,
} = await executeWebhook(parsedWebhook) } = await executeWebhook(parsedWebhook, params)
return { return {
...resumeWebhookExecution({ ...resumeWebhookExecution({
@@ -160,7 +163,8 @@ const parseWebhookAttributes =
} }
export const executeWebhook = async ( export const executeWebhook = async (
webhook: ParsedWebhook webhook: ParsedWebhook,
params: Params = {}
): Promise<{ ): Promise<{
response: WebhookResponse response: WebhookResponse
logs?: ChatLog[] logs?: ChatLog[]
@@ -170,9 +174,11 @@ export const executeWebhook = async (
const { headers, url, method, basicAuth, body, isJson } = webhook const { headers, url, method, basicAuth, body, isJson } = webhook
const contentType = headers ? headers['Content-Type'] : undefined const contentType = headers ? headers['Content-Type'] : undefined
const isLongRequest = longReqTimeoutWhitelist.some((whiteListedUrl) => const isLongRequest = params.disableRequestTimeout
url?.includes(whiteListedUrl) ? true
) : longReqTimeoutWhitelist.some((whiteListedUrl) =>
url?.includes(whiteListedUrl)
)
const request = { const request = {
url, url,

4
packages/bot-engine/executeIntegration.ts
View File

@@ -27,7 +27,9 @@ export const executeIntegration =
case IntegrationBlockType.MAKE_COM: case IntegrationBlockType.MAKE_COM:
case IntegrationBlockType.PABBLY_CONNECT: case IntegrationBlockType.PABBLY_CONNECT:
return { return {
...(await executeWebhookBlock(state, block)), ...(await executeWebhookBlock(state, block, {
disableRequestTimeout: true,
})),
startTimeShouldBeUpdated: true, startTimeShouldBeUpdated: true,
} }
case IntegrationBlockType.WEBHOOK: case IntegrationBlockType.WEBHOOK: