@daytonaio/sdk 0.18.0-alpha.1 → 0.18.0-alpha.3

package/dist/Process.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Process = exports.CodeRunParams = void 0;
 const ArtifactParser_1 = require("./utils/ArtifactParser");
-const Stream_1 = require("./utils/Stream");
 /**
  * Parameters for code execution.
  */
@@ -234,9 +233,20 @@ class Process {
             const response = await this.toolboxApi.getSessionCommandLogs(this.instance.id, sessionId, commandId);
             return response.data;
         }
-        await (0, Stream_1.processStreamingResponse)(() => this.toolboxApi.getSessionCommandLogs(this.instance.id, sessionId, commandId, undefined, true, {
-            responseType: 'stream',
-        }), onLogs, () => this.getSessionCommand(sessionId, commandId).then((res) => res.exitCode !== null && res.exitCode !== undefined));
+        await new Promise((resolve, reject) => {
+            this.toolboxApi
+                .getSessionCommandLogs(this.instance.id, sessionId, commandId, undefined, true, { responseType: 'stream' })
+                .then((res) => {
+                const stream = res.data;
+                this.streamWithStatusPoll(stream, (chunk) => onLogs(chunk), async () => {
+                    const statusRes = await this.getSessionCommand(sessionId, commandId);
+                    return statusRes.exitCode;
+                })
+                    .then(() => resolve())
+                    .catch((err) => reject(err));
+            })
+                .catch((err) => reject(err));
+        });
     }
     /**
      * Lists all active sessions in the Sandbox.
@@ -269,5 +279,60 @@ class Process {
     async deleteSession(sessionId) {
         await this.toolboxApi.deleteSession(this.instance.id, sessionId);
     }
+    async streamWithStatusPoll(stream, onLogs, getExitCode) {
+        let nextChunkPromise = null;
+        let exitCodeSeenCount = 0;
+        const readNext = () => {
+            return new Promise((resolve) => {
+                const onData = (data) => {
+                    cleanup();
+                    resolve(data);
+                };
+                const onClose = () => {
+                    cleanup();
+                    resolve(null);
+                };
+                const onError = () => {
+                    cleanup();
+                    resolve(null);
+                };
+                function cleanup() {
+                    stream.off('data', onData);
+                    stream.off('close', onClose);
+                    stream.off('error', onError);
+                }
+                stream.once('data', onData);
+                stream.once('close', onClose);
+                stream.once('error', onError);
+            });
+        };
+        while (true) {
+            // kick off reading and polling race
+            if (!nextChunkPromise) {
+                nextChunkPromise = readNext();
+            }
+            const timeoutPromise = new Promise((resolve) => setTimeout(() => resolve(null), 2000));
+            const result = await Promise.race([nextChunkPromise, timeoutPromise]);
+            if (result instanceof Buffer) {
+                // got data
+                const chunk = result.toString('utf8');
+                onLogs(chunk);
+                nextChunkPromise = null; // reset for next loop
+                exitCodeSeenCount = 0; // reset exit-code counter
+            } /* result === null from timeout */
+            else {
+                const exit_code = await getExitCode();
+                if (exit_code != undefined && exit_code != null) {
+                    exitCodeSeenCount += 1;
+                    // after seeing finished status twice in a row, break
+                    if (exitCodeSeenCount > 1) {
+                        stream.destroy();
+                        break;
+                    }
+                }
+                // else loop again: nextChunkPromise still pending
+            }
+        }
+    }
 }
 exports.Process = Process;

package/dist/Sandbox.d.ts

@@ -43,7 +43,7 @@ export interface SandboxResources {
  *
  * @interface
  * @property {string} id - Unique identifier for the Sandbox
- * @property {string} [image] - Docker image used for the Sandbox.
+ * @property {string} image - Docker image used for the Sandbox
  * @property {string} user - OS user running in the Sandbox
  * @property {Record<string, string>} env - Environment variables set in the Sandbox
  * @property {Record<string, string>} labels - Custom labels attached to the Sandbox

package/dist/Sandbox.js

@@ -169,18 +169,18 @@ class Sandbox {
         }
         const checkInterval = 100; // Wait 100 ms between checks
         const startTime = Date.now();
-        let state = (await this.info()).state;
-        while (state !== 'started') {
+        while (timeout === 0 || Date.now() - startTime < timeout * 1000) {
             const response = await this.sandboxApi.getWorkspace(this.id);
-            state = response.data.state;
+            const state = response.data.state;
+            if (state === 'started') {
+                return;
+            }
             if (state === 'error') {
                 throw new DaytonaError_1.DaytonaError(`Sandbox ${this.id} failed to start with status: ${state}, error reason: ${response.data.errorReason}`);
             }
-            if (timeout !== 0 && Date.now() - startTime > timeout * 1000) {
-                throw new DaytonaError_1.DaytonaError('Sandbox failed to become ready within the timeout period');
-            }
             await new Promise((resolve) => setTimeout(resolve, checkInterval));
         }
+        throw new DaytonaError_1.DaytonaError('Sandbox failed to become ready within the timeout period');
     }
     /**
      * Wait for Sandbox to reach 'stopped' state.
@@ -199,18 +199,18 @@ class Sandbox {
         }
         const checkInterval = 100; // Wait 100 ms between checks
         const startTime = Date.now();
-        let state = (await this.info()).state;
-        while (state !== 'stopped') {
+        while (timeout === 0 || Date.now() - startTime < timeout * 1000) {
             const response = await this.sandboxApi.getWorkspace(this.id);
-            state = response.data.state;
+            const state = response.data.state;
+            if (state === 'stopped') {
+                return;
+            }
             if (state === 'error') {
                 throw new DaytonaError_1.DaytonaError(`Sandbox failed to stop with status: ${state}, error reason: ${response.data.errorReason}`);
             }
-            if (timeout !== 0 && Date.now() - startTime > timeout * 1000) {
-                throw new DaytonaError_1.DaytonaError('Sandbox failed to become stopped within the timeout period');
-            }
             await new Promise((resolve) => setTimeout(resolve, checkInterval));
         }
+        throw new DaytonaError_1.DaytonaError('Sandbox failed to become stopped within the timeout period');
     }
     /**
      * Gets structured information about the Sandbox.

package/dist/index.d.ts

@@ -5,7 +5,6 @@ export { Git } from './Git';
 export { LspLanguageId } from './LspServer';
 export { Process } from './Process';
 export { DaytonaError } from './errors/DaytonaError';
-export { Image } from './Image';
 export { Sandbox } from './Sandbox';
 export type { SandboxCodeToolbox } from './Sandbox';
 export { ChartType } from './types/Charts';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WorkspaceTargetRegion = exports.WorkspaceState = exports.Workspace = exports.SandboxTargetRegion = exports.SandboxState = exports.ChartType = exports.Sandbox = exports.Image = exports.DaytonaError = exports.Process = exports.LspLanguageId = exports.Git = exports.FileSystem = exports.Daytona = exports.CodeLanguage = void 0;
+exports.WorkspaceTargetRegion = exports.WorkspaceState = exports.Workspace = exports.SandboxTargetRegion = exports.SandboxState = exports.ChartType = exports.Sandbox = exports.DaytonaError = exports.Process = exports.LspLanguageId = exports.Git = exports.FileSystem = exports.Daytona = exports.CodeLanguage = void 0;
 var Daytona_1 = require("./Daytona");
 Object.defineProperty(exports, "CodeLanguage", { enumerable: true, get: function () { return Daytona_1.CodeLanguage; } });
 Object.defineProperty(exports, "Daytona", { enumerable: true, get: function () { return Daytona_1.Daytona; } });
@@ -16,8 +16,6 @@ Object.defineProperty(exports, "Process", { enumerable: true, get: function () {
 // export type { LspLanguageId, Position } from './LspServer'
 var DaytonaError_1 = require("./errors/DaytonaError");
 Object.defineProperty(exports, "DaytonaError", { enumerable: true, get: function () { return DaytonaError_1.DaytonaError; } });
-var Image_1 = require("./Image");
-Object.defineProperty(exports, "Image", { enumerable: true, get: function () { return Image_1.Image; } });
 var Sandbox_1 = require("./Sandbox");
 Object.defineProperty(exports, "Sandbox", { enumerable: true, get: function () { return Sandbox_1.Sandbox; } });
 // Chart and artifact types

package/dist/utils/Path.js

@@ -36,15 +36,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.prefixRelativePath = prefixRelativePath;
 const _path = __importStar(require("path"));
 function prefixRelativePath(prefix, path) {
-    let result = path;
-    if (!result || result === '~') {
-        result = prefix;
-    }
-    else if (path && path.startsWith(prefix.replace(/^\/+/, ''))) {
-        result = path;
-    }
-    else if (path && !_path.isAbsolute(path)) {
-        result = _path.join(prefix, path);
+    let result = prefix;
+    if (path) {
+        path = path.trim();
+        if (path === '~') {
+            result = prefix;
+        }
+        else if (path.startsWith('~/')) {
+            result = _path.join(prefix, path.slice(2));
+        }
+        else if (_path.isAbsolute(path)) {
+            result = path;
+        }
+        else {
+            result = _path.join(prefix, path);
+        }
     }
     return result;
 }

package/dist/utils/Stream.d.ts

@@ -1,2 +1,18 @@
-export declare function processStreamingResponse(getStream: () => Promise<any>, // can return AxiosResponse with .data being the stream
-onChunk: (chunk: string) => void, shouldTerminate: () => Promise<boolean>, chunkTimeout?: number, requireConsecutiveTermination?: boolean): Promise<void>;
+/**
+ * Process a streaming response from a URL. Stream will terminate if the server-side stream
+ * ends or if the shouldTerminate function returns True.
+ *
+ * @param getStream - A function that returns a promise of an AxiosResponse with .data being the stream
+ * @param onChunk - A function to process each chunk of the response
+ * @param shouldTerminate - A function to check if the response should be terminated
+ * @param chunkTimeout - The timeout for each chunk
+ * @param requireConsecutiveTermination - Whether to require two consecutive termination signals
+ * to terminate the stream.
+ */
+export declare function processStreamingResponse(
+  getStream: () => Promise<any>, // can return AxiosResponse with .data being the stream
+  onChunk: (chunk: string) => void,
+  shouldTerminate: () => Promise<boolean>,
+  chunkTimeout?: number,
+  requireConsecutiveTermination?: boolean
+): Promise<void>

package/dist/utils/Stream.js

@@ -1,6 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processStreamingResponse = processStreamingResponse;
+/**
+ * Process a streaming response from a URL. Stream will terminate if the server-side stream
+ * ends or if the shouldTerminate function returns True.
+ *
+ * @param getStream - A function that returns a promise of an AxiosResponse with .data being the stream
+ * @param onChunk - A function to process each chunk of the response
+ * @param shouldTerminate - A function to check if the response should be terminated
+ * @param chunkTimeout - The timeout for each chunk
+ * @param requireConsecutiveTermination - Whether to require two consecutive termination signals
+ * to terminate the stream.
+ */
 async function processStreamingResponse(getStream, // can return AxiosResponse with .data being the stream
 onChunk, shouldTerminate, chunkTimeout = 2000, requireConsecutiveTermination = true) {
     const response = await getStream();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daytonaio/sdk",
-  "version": "0.18.0-alpha.1",
+  "version": "0.18.0-alpha.3",
   "description": "Daytona client library for AI Agents",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,23 +29,15 @@
     "@babel/preset-typescript": "^7.22.0",
     "@types/jest": "^29.5.0",
     "@types/node": "^22.10.0",
-    "@types/shell-quote": "^1.7.5",
-    "@types/tar": "^6.1.13",
     "jest": "^29.5.0",
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.445.0",
-    "@aws-sdk/lib-storage": "^3.798.0",
-    "@daytonaio/api-client": "^0.19.0-alpha.3",
+    "@daytonaio/api-client": "0.19.0-alpha.4",
+    "uuid": "^11.0.3",
     "@dotenvx/dotenvx": "^1.25.1",
-    "@iarna/toml": "^2.2.5",
     "axios": "^1.6.0",
-    "fast-glob": "^3.3.0",
-    "shell-quote": "^1.8.2",
-    "tar": "^6.2.0",
-    "untildify": "^5.0.0",
-    "uuid": "^11.0.3"
+    "form-data": "^4.0.0"
   }
 }