Sultan
/
Flowise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

leave default timeout for sandbox execution

This commit is contained in:
Henry 2025-09-27 19:57:27 +01:00
parent dd284e37c3
commit c10d91725e
19 changed files with 25 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/components/nodes/agentflow/CustomFunction/CustomFunction.ts
View File

@ -175,8 +175,7 @@ class CustomFunction_Agentflow implements INode {
try { try {
const response = await executeJavaScriptCode(javascriptFunction, sandbox, { const response = await executeJavaScriptCode(javascriptFunction, sandbox, {
libraries: ['axios'], libraries: ['axios'],
streamOutput, streamOutput
timeout: 10000
}) })
let finalOutput = response let finalOutput = response

3
packages/components/nodes/documentloaders/CustomDocumentLoader/CustomDocumentLoader.ts
View File

@ -119,8 +119,7 @@ class CustomDocumentLoader_DocumentLoaders implements INode {
try { try {
const response = await executeJavaScriptCode(javascriptFunction, sandbox, { const response = await executeJavaScriptCode(javascriptFunction, sandbox, {
libraries: ['axios'], libraries: ['axios']
timeout: 10000
}) })
if (output === 'document' && Array.isArray(response)) { if (output === 'document' && Array.isArray(response)) {

3
packages/components/nodes/prompts/ChatPromptTemplate/ChatPromptTemplate.ts
View File

@ -130,8 +130,7 @@ class ChatPromptTemplate_Prompts implements INode {
try { try {
const response = await executeJavaScriptCode(messageHistoryCode, sandbox, { const response = await executeJavaScriptCode(messageHistoryCode, sandbox, {
libraries: ['axios', '@langchain/core'], libraries: ['axios', '@langchain/core']
timeout: 10000
}) })
const parsedResponse = JSON.parse(response) const parsedResponse = JSON.parse(response)

4
packages/components/nodes/sequentialagents/Agent/Agent.ts
View File

@ -940,9 +940,7 @@ const getReturnOutput = async (nodeData: INodeData, input: string, options: ICom
const sandbox = createCodeExecutionSandbox(input, variables, flow) const sandbox = createCodeExecutionSandbox(input, variables, flow)
try { try {
const response = await executeJavaScriptCode(updateStateMemoryCode, sandbox, { const response = await executeJavaScriptCode(updateStateMemoryCode, sandbox)
timeout: 10000
})
if (typeof response !== 'object') throw new Error('Return output must be an object') if (typeof response !== 'object') throw new Error('Return output must be an object')
return response return response

4
packages/components/nodes/sequentialagents/Condition/Condition.ts
View File

@ -282,9 +282,7 @@ const runCondition = async (nodeData: INodeData, input: string, options: ICommon
const sandbox = createCodeExecutionSandbox(input, variables, flow) const sandbox = createCodeExecutionSandbox(input, variables, flow)
try { try {
const response = await executeJavaScriptCode(conditionFunction, sandbox, { const response = await executeJavaScriptCode(conditionFunction, sandbox)
timeout: 10000
})
if (typeof response !== 'string') throw new Error('Condition function must return a string') if (typeof response !== 'string') throw new Error('Condition function must return a string')
return response return response

4
packages/components/nodes/sequentialagents/ConditionAgent/ConditionAgent.ts
View File

@ -549,9 +549,7 @@ const runCondition = async (
const sandbox = createCodeExecutionSandbox(input, variables, flow) const sandbox = createCodeExecutionSandbox(input, variables, flow)
try { try {
const response = await executeJavaScriptCode(conditionFunction, sandbox, { const response = await executeJavaScriptCode(conditionFunction, sandbox)
timeout: 10000
})
if (typeof response !== 'string') throw new Error('Condition function must return a string') if (typeof response !== 'string') throw new Error('Condition function must return a string')
return response return response

4
packages/components/nodes/sequentialagents/CustomFunction/CustomFunction.ts
View File

@ -166,9 +166,7 @@ class CustomFunction_SeqAgents implements INode {
const sandbox = createCodeExecutionSandbox(input, variables, flow, additionalSandbox) const sandbox = createCodeExecutionSandbox(input, variables, flow, additionalSandbox)
try { try {
const response = await executeJavaScriptCode(javascriptFunction, sandbox, { const response = await executeJavaScriptCode(javascriptFunction, sandbox)
timeout: 10000
})
if (returnValueAs === 'stateObj') { if (returnValueAs === 'stateObj') {
if (typeof response !== 'object') { if (typeof response !== 'object') {

3
packages/components/nodes/sequentialagents/ExecuteFlow/ExecuteFlow.ts
View File

@ -264,8 +264,7 @@ class ExecuteFlow_SeqAgents implements INode {
try { try {
let response = await executeJavaScriptCode(code, sandbox, { let response = await executeJavaScriptCode(code, sandbox, {
useSandbox: false, useSandbox: false
timeout: 10000
}) })
if (typeof response === 'object') { if (typeof response === 'object') {

4
packages/components/nodes/sequentialagents/LLMNode/LLMNode.ts
View File

@ -712,9 +712,7 @@ const getReturnOutput = async (nodeData: INodeData, input: string, options: ICom
const sandbox = createCodeExecutionSandbox(input, variables, flow) const sandbox = createCodeExecutionSandbox(input, variables, flow)
try { try {
const response = await executeJavaScriptCode(updateStateMemoryCode, sandbox, { const response = await executeJavaScriptCode(updateStateMemoryCode, sandbox)
timeout: 10000
})
if (typeof response !== 'object') throw new Error('Return output must be an object') if (typeof response !== 'object') throw new Error('Return output must be an object')
return response return response

4
packages/components/nodes/sequentialagents/State/State.ts
View File

@ -204,9 +204,7 @@ class State_SeqAgents implements INode {
const sandbox = createCodeExecutionSandbox('', variables, flow) const sandbox = createCodeExecutionSandbox('', variables, flow)
try { try {
const response = await executeJavaScriptCode(`return ${stateMemoryCode}`, sandbox, { const response = await executeJavaScriptCode(`return ${stateMemoryCode}`, sandbox)
timeout: 10000
})
if (typeof response !== 'object') throw new Error('State must be an object') if (typeof response !== 'object') throw new Error('State must be an object')
const returnOutput: ISeqAgentNode = { const returnOutput: ISeqAgentNode = {

4
packages/components/nodes/sequentialagents/ToolNode/ToolNode.ts
View File

@ -575,9 +575,7 @@ const getReturnOutput = async (
const sandbox = createCodeExecutionSandbox(input, variables, flow) const sandbox = createCodeExecutionSandbox(input, variables, flow)
try { try {
const response = await executeJavaScriptCode(updateStateMemoryCode, sandbox, { const response = await executeJavaScriptCode(updateStateMemoryCode, sandbox)
timeout: 10000
})
if (typeof response !== 'object') throw new Error('Return output must be an object') if (typeof response !== 'object') throw new Error('Return output must be an object')
return response return response

4
packages/components/nodes/sequentialagents/commonUtils.ts
View File

@ -396,9 +396,7 @@ export const checkMessageHistory = async (
const sandbox = createCodeExecutionSandbox('', variables, flow) const sandbox = createCodeExecutionSandbox('', variables, flow)
try { try {
const response = await executeJavaScriptCode(messageHistory, sandbox, { const response = await executeJavaScriptCode(messageHistory, sandbox)
timeout: 10000
})
if (!Array.isArray(response)) throw new Error('Returned message history must be an array') if (!Array.isArray(response)) throw new Error('Returned message history must be an array')
if (sysPrompt) { if (sysPrompt) {

3
packages/components/nodes/tools/AgentAsTool/AgentAsTool.ts
View File

@ -364,8 +364,7 @@ try {
const sandbox = createCodeExecutionSandbox('', [], {}, additionalSandbox) const sandbox = createCodeExecutionSandbox('', [], {}, additionalSandbox)
let response = await executeJavaScriptCode(code, sandbox, { let response = await executeJavaScriptCode(code, sandbox, {
useSandbox: false, useSandbox: false
timeout: 10000
}) })
if (typeof response === 'object') { if (typeof response === 'object') {

3
packages/components/nodes/tools/ChatflowTool/ChatflowTool.ts
View File

@ -372,8 +372,7 @@ try {
const sandbox = createCodeExecutionSandbox('', [], {}, additionalSandbox) const sandbox = createCodeExecutionSandbox('', [], {}, additionalSandbox)
let response = await executeJavaScriptCode(code, sandbox, { let response = await executeJavaScriptCode(code, sandbox, {
useSandbox: false, useSandbox: false
timeout: 10000
}) })
if (typeof response === 'object') { if (typeof response === 'object') {

4
packages/components/nodes/tools/CustomTool/core.ts
View File

@ -124,9 +124,7 @@ export class DynamicStructuredTool<
const sandbox = createCodeExecutionSandbox('', this.variables || [], flow, additionalSandbox) const sandbox = createCodeExecutionSandbox('', this.variables || [], flow, additionalSandbox)
let response = await executeJavaScriptCode(this.code, sandbox, { let response = await executeJavaScriptCode(this.code, sandbox)
timeout: 10000
})
if (typeof response === 'object') { if (typeof response === 'object') {
response = JSON.stringify(response) response = JSON.stringify(response)

4
packages/components/nodes/tools/OpenAPIToolkit/core.ts
View File

@ -253,9 +253,7 @@ export class DynamicStructuredTool<
const sandbox = createCodeExecutionSandbox('', this.variables || [], flow, additionalSandbox) const sandbox = createCodeExecutionSandbox('', this.variables || [], flow, additionalSandbox)
let response = await executeJavaScriptCode(this.customCode || defaultCode, sandbox, { let response = await executeJavaScriptCode(this.customCode || defaultCode, sandbox)
timeout: 10000
})
if (typeof response === 'object') { if (typeof response === 'object') {
response = JSON.stringify(response) response = JSON.stringify(response)

4
packages/components/nodes/utilities/CustomFunction/CustomFunction.ts
View File

@ -132,9 +132,7 @@ class CustomFunction_Utilities implements INode {
const sandbox = createCodeExecutionSandbox(input, variables, flow, additionalSandbox) const sandbox = createCodeExecutionSandbox(input, variables, flow, additionalSandbox)
try { try {
const response = await executeJavaScriptCode(javascriptFunction, sandbox, { const response = await executeJavaScriptCode(javascriptFunction, sandbox)
timeout: 10000
})
if (typeof response === 'string' && !isEndingNode) { if (typeof response === 'string' && !isEndingNode) {
return handleEscapeCharacters(response, false) return handleEscapeCharacters(response, false)

8
packages/components/nodes/utilities/IfElseFunction/IfElseFunction.ts
View File

@ -131,16 +131,12 @@ class IfElseFunction_Utilities implements INode {
const sandbox = createCodeExecutionSandbox(input, variables, flow, additionalSandbox) const sandbox = createCodeExecutionSandbox(input, variables, flow, additionalSandbox)
try { try {
const responseTrue = await executeJavaScriptCode(ifFunction, sandbox, { const responseTrue = await executeJavaScriptCode(ifFunction, sandbox)
timeout: 10000
})
if (responseTrue) if (responseTrue)
return { output: typeof responseTrue === 'string' ? handleEscapeCharacters(responseTrue, false) : responseTrue, type: true } return { output: typeof responseTrue === 'string' ? handleEscapeCharacters(responseTrue, false) : responseTrue, type: true }
const responseFalse = await executeJavaScriptCode(elseFunction, sandbox, { const responseFalse = await executeJavaScriptCode(elseFunction, sandbox)
timeout: 10000
})
return { output: typeof responseFalse === 'string' ? handleEscapeCharacters(responseFalse, false) : responseFalse, type: false } return { output: typeof responseFalse === 'string' ? handleEscapeCharacters(responseFalse, false) : responseFalse, type: false }
} catch (e) { } catch (e) {

8
packages/components/src/utils.ts
View File

@ -1439,6 +1439,10 @@ export const executeJavaScriptCode = async (
): Promise<any> => { ): Promise<any> => {
const { timeout = 300000, useSandbox = true, streamOutput, libraries = [], nodeVMOptions = {} } = options const { timeout = 300000, useSandbox = true, streamOutput, libraries = [], nodeVMOptions = {} } = options
const shouldUseSandbox = useSandbox && process.env.E2B_APIKEY const shouldUseSandbox = useSandbox && process.env.E2B_APIKEY
let timeoutMs = timeout
if (process.env.SANDBOX_TIMEOUT) {
timeoutMs = parseInt(process.env.SANDBOX_TIMEOUT, 10)
}
if (shouldUseSandbox) { if (shouldUseSandbox) {
try { try {
@ -1495,7 +1499,7 @@ export const executeJavaScriptCode = async (
} }
} }
const sbx = await Sandbox.create({ apiKey: process.env.E2B_APIKEY, timeoutMs: timeout }) const sbx = await Sandbox.create({ apiKey: process.env.E2B_APIKEY, timeoutMs })
// Install libraries // Install libraries
for (const library of libraries) { for (const library of libraries) {
@ -1554,7 +1558,7 @@ export const executeJavaScriptCode = async (
}, },
eval: false, eval: false,
wasm: false, wasm: false,
timeout timeout: timeoutMs
} }
// Merge with custom nodeVMOptions if provided // Merge with custom nodeVMOptions if provided