Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Fix mcp gateway race condition (#971)

Jonas Scholz1a51777cc0ef
diff --git a/.changeset/chilly-spoons-hear.md b/.changeset/chilly-spoons-hear.md
new file mode 100644
index 000000000..01cd88c5c
--- /dev/null
+++ b/.changeset/chilly-spoons-hear.md
@@ -0,0 +1,6 @@
+---
+'@e2b/python-sdk': patch
+'e2b': patch
+---
+
+fix racecondition in mcp gateway
diff --git a/packages/js-sdk/src/sandbox/index.ts b/packages/js-sdk/src/sandbox/index.ts
index 9e6337d5c..1fadfac4f 100644
--- a/packages/js-sdk/src/sandbox/index.ts
+++ b/packages/js-sdk/src/sandbox/index.ts
@@ -64,7 +64,7 @@ export interface SandboxUrlOpts {
*/
export class Sandbox extends SandboxApi {
protected static readonly defaultTemplate: string = 'base'
- protected static readonly defaultMcpTemplate: string = 'mcp-gateway-v0-1'
+ protected static readonly defaultMcpTemplate: string = 'mcp-gateway-v0-2'
protected static readonly defaultSandboxTimeoutMs = DEFAULT_SANDBOX_TIMEOUT_MS
/**
@@ -336,19 +336,18 @@ export class Sandbox extends SandboxApi {
if (sandboxOpts?.mcp) {
sandbox.mcpToken = crypto.randomUUID()
-
- const handle = await sandbox.commands.run(
+ const res = await sandbox.commands.run(
`mcp-gateway --config '${JSON.stringify(sandboxOpts?.mcp)}'`,
{
user: 'root',
envs: {
GATEWAY_ACCESS_TOKEN: sandbox.mcpToken ?? '',
},
- background: true,
- timeoutMs: 0,
}
)
- await handle.disconnect()
+ if (res.exitCode !== 0) {
+ throw new Error(`Failed to start MCP gateway: ${res.stderr}`)
+ }
}
return sandbox
diff --git a/packages/python-sdk/e2b/sandbox/main.py b/packages/python-sdk/e2b/sandbox/main.py
index 2a91fe6ee..babd2776b 100644
--- a/packages/python-sdk/e2b/sandbox/main.py
+++ b/packages/python-sdk/e2b/sandbox/main.py
@@ -31,7 +31,7 @@ class SandboxBase:
default_sandbox_timeout = 300
default_template = "base"
- default_mcp_template = "mcp-gateway-v0-1"
+ default_mcp_template = "mcp-gateway-v0-2"
def __init__(
self,
diff --git a/packages/python-sdk/e2b/sandbox_async/main.py b/packages/python-sdk/e2b/sandbox_async/main.py
index a17c09ba9..93e091f41 100644
--- a/packages/python-sdk/e2b/sandbox_async/main.py
+++ b/packages/python-sdk/e2b/sandbox_async/main.py
@@ -551,14 +551,13 @@ class AsyncSandbox(SandboxApi):
token = str(uuid.uuid4())
sandbox._mcp_token = token
- handle = await sandbox.commands.run(
+ res = await sandbox.commands.run(
f"mcp-gateway --config '{json.dumps(mcp)}'",
user="root",
envs={"GATEWAY_ACCESS_TOKEN": token},
- background=True,
- timeout=0,
)
- await handle.disconnect()
+ if res.exit_code != 0:
+ raise Exception(f"Failed to start MCP gateway: {res.stderr}")
return sandbox
diff --git a/packages/python-sdk/e2b/sandbox_sync/main.py b/packages/python-sdk/e2b/sandbox_sync/main.py
index d67ed0499..1978a3ee0 100644
--- a/packages/python-sdk/e2b/sandbox_sync/main.py
+++ b/packages/python-sdk/e2b/sandbox_sync/main.py
@@ -557,14 +557,13 @@ class Sandbox(SandboxApi):
token = str(uuid.uuid4())
sandbox._mcp_token = token
- handle = sandbox.commands.run(
+ res = sandbox.commands.run(
f"mcp-gateway --config '{json.dumps(mcp)}'",
- background=True,
user="root",
envs={"GATEWAY_ACCESS_TOKEN": token},
- timeout=0,
)
- handle.disconnect()
+ if res.exit_code != 0:
+ raise Exception(f"Failed to start MCP gateway: {res.stderr}")
return sandbox