Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Join canceled and deadline exceeded errors; Add move operation

Tomas Valenta3e9fc04faa89
diff --git a/packages/js-sdk/src/connectionConfig.ts b/packages/js-sdk/src/connectionConfig.ts
index b09247fcc..bb6aa3779 100644
--- a/packages/js-sdk/src/connectionConfig.ts
+++ b/packages/js-sdk/src/connectionConfig.ts
@@ -26,6 +26,13 @@ export class TimeoutError extends SandboxError {
}
}
+export class InvalidUserError extends SandboxError {
+ constructor(message: string) {
+ super(message)
+ this.name = 'InvalidUsernameError'
+ }
+}
+
export class ConnectionConfig {
readonly debug: boolean
readonly domain: string
diff --git a/packages/js-sdk/src/sandbox/filesystem/index.ts b/packages/js-sdk/src/sandbox/filesystem/index.ts
index 14ac2dc7c..3c72fe506 100644
--- a/packages/js-sdk/src/sandbox/filesystem/index.ts
+++ b/packages/js-sdk/src/sandbox/filesystem/index.ts
@@ -6,7 +6,15 @@ import {
Code,
} from '@connectrpc/connect'
-import { ConnectionConfig, defaultUsername, SandboxError, Username, ConnectionOpts, TimeoutError } from '../../connectionConfig'
+import {
+ ConnectionConfig,
+ defaultUsername,
+ SandboxError,
+ Username,
+ ConnectionOpts,
+ TimeoutError,
+ InvalidUserError,
+} from '../../connectionConfig'
import { EnvdApiClient } from '../../envd/api'
import { Filesystem as FilesystemService } from '../../envd/filesystem/filesystem_connect'
import { FileType as FsFileType, WatchDirResponse } from '../../envd/filesystem/filesystem_pb'
@@ -39,15 +47,8 @@ export class FilesystemError extends SandboxError {
}
}
-export class InvalidUserError extends FilesystemError {
- constructor(message: string, readonly username: string) {
- super(message)
- this.name = 'InvalidUsernameError'
- }
-}
-
export class InvalidPathError extends FilesystemError {
- constructor(message: string, readonly path: string) {
+ constructor(message: string) {
super(message)
this.name = 'InvalidPathError'
}
@@ -61,7 +62,7 @@ export class NotEnoughDiskSpaceError extends FilesystemError {
}
export class NotFoundError extends FilesystemError {
- constructor(message: string, readonly path: string) {
+ constructor(message: string) {
super(message)
this.name = 'FileNotFoundError'
}
@@ -102,11 +103,11 @@ export class Filesystem {
switch (error?.code) {
case 400:
- throw new InvalidUserError(error.message, username)
+ throw new InvalidUserError(error.message)
case 403:
- throw new InvalidPathError(error.message, path)
+ throw new InvalidPathError(error.message)
case 404:
- throw new NotFoundError(error.message, path)
+ throw new NotFoundError(error.message)
default:
if (error) {
throw new FilesystemError(error.message)
@@ -145,9 +146,9 @@ export class Filesystem {
switch (error?.code) {
case 400:
- throw new InvalidUserError(error.message, username)
+ throw new InvalidUserError(error.message)
case 403:
- throw new InvalidPathError(error.message, path)
+ throw new InvalidPathError(error.message)
case 507:
throw new NotEnoughDiskSpaceError(error.message)
default:
@@ -181,10 +182,11 @@ export class Filesystem {
if (err instanceof ConnectError) {
switch (err.code) {
case Code.InvalidArgument:
- throw new InvalidUserError(err.message, username)
+ throw new InvalidUserError(err.message)
case Code.NotFound:
- throw new InvalidPathError(err.message, path)
+ throw new InvalidPathError(err.message)
case Code.DeadlineExceeded:
+ case Code.Canceled:
throw new TimeoutError(err.message)
default:
throw new FilesystemError(err.message)
@@ -215,14 +217,51 @@ export class Filesystem {
if (err instanceof ConnectError) {
switch (err.code) {
case Code.InvalidArgument:
- throw new InvalidUserError(err.message, username)
+ throw new InvalidUserError(err.message)
case Code.NotFound:
- throw new InvalidPathError(err.message, path)
+ throw new InvalidPathError(err.message)
case Code.AlreadyExists:
return false
case Code.FailedPrecondition:
- throw new InvalidPathError(err.message, path)
+ throw new InvalidPathError(err.message)
+ case Code.DeadlineExceeded:
+ case Code.Canceled:
+ throw new TimeoutError(err.message)
+ default:
+ throw new FilesystemError(err.message)
+ }
+ }
+ throw err
+ }
+ }
+
+ async move(from: string, to: string, opts?: FilesystemRequestOpts): Promise<boolean> {
+ const username = opts?.user || defaultUsername
+
+ try {
+ await this.rpc.move({
+ source: from,
+ destination: to,
+ user: {
+ selector: {
+ case: 'username',
+ value: username,
+ },
+ },
+ }, {
+ signal: this.connectionConfig.getSignal(opts?.requestTimeoutMs),
+ })
+
+ return true
+ } catch (err) {
+ if (err instanceof ConnectError) {
+ switch (err.code) {
+ case Code.InvalidArgument:
+ throw new InvalidUserError(err.message)
+ case Code.NotFound:
+ throw new InvalidPathError(err.message)
case Code.DeadlineExceeded:
+ case Code.Canceled:
throw new TimeoutError(err.message)
default:
throw new FilesystemError(err.message)
@@ -251,10 +290,11 @@ export class Filesystem {
if (err instanceof ConnectError) {
switch (err.code) {
case Code.InvalidArgument:
- throw new InvalidUserError(err.message, username)
+ throw new InvalidUserError(err.message)
case Code.NotFound:
- throw new InvalidPathError(err.message, path)
+ throw new InvalidPathError(err.message)
case Code.DeadlineExceeded:
+ case Code.Canceled:
throw new TimeoutError(err.message)
default:
throw new FilesystemError(err.message)
@@ -285,10 +325,11 @@ export class Filesystem {
if (err instanceof ConnectError) {
switch (err.code) {
case Code.InvalidArgument:
- throw new InvalidUserError(err.message, username)
+ throw new InvalidUserError(err.message)
case Code.NotFound:
return false
case Code.DeadlineExceeded:
+ case Code.Canceled:
throw new TimeoutError(err.message)
default:
throw new FilesystemError(err.message)
@@ -337,9 +378,12 @@ export class Filesystem {
if (err instanceof ConnectError) {
switch (err.code) {
case Code.InvalidArgument:
- throw new InvalidUserError(err.message, username)
+ throw new InvalidUserError(err.message)
case Code.NotFound:
- throw new InvalidPathError(err.message, path)
+ throw new InvalidPathError(err.message)
+ case Code.DeadlineExceeded:
+ case Code.Canceled:
+ throw new TimeoutError(err.message)
default:
throw new FilesystemError(err.message)
}
diff --git a/packages/js-sdk/src/sandbox/filesystem/watchHandle.ts b/packages/js-sdk/src/sandbox/filesystem/watchHandle.ts
index a9f942fe8..eced2acdd 100644
--- a/packages/js-sdk/src/sandbox/filesystem/watchHandle.ts
+++ b/packages/js-sdk/src/sandbox/filesystem/watchHandle.ts
@@ -1,12 +1,13 @@
-import { ConnectError } from '@connectrpc/connect'
+import { ConnectError, Code } from '@connectrpc/connect'
+
import { FilesystemError } from '.'
+import { TimeoutError } from '../../connectionConfig'
import {
EventType,
WatchDirResponse,
} from '../../envd/filesystem/filesystem_pb'
-
export enum FilesystemEventType {
CHMOD = 'chmod',
CREATE = 'create',
@@ -65,6 +66,9 @@ export class WatchHandle {
} catch (err) {
if (err instanceof ConnectError) {
switch (err.code) {
+ case Code.Canceled:
+ case Code.DeadlineExceeded:
+ throw new TimeoutError(err.message)
default:
throw new FilesystemError(err.message)
}