freestyle-sandboxes 0.1.2 → 0.1.3

package/index.cjs

@@ -3853,6 +3853,14 @@ class FileSystem {
     this.vmId = vmId;
     this.client = client;
   }
+  vm = null;
+  /**
+   * @internal
+   * Set the parent VM instance for exec operations
+   */
+  _setVm(vm) {
+    this.vm = vm;
+  }
   /**
    * Read a file from the VM as a buffer.
    * @param filepath The path to the file in the VM
@@ -3910,21 +3918,47 @@ class FileSystem {
    * @returns Array of file/directory names
    */
   async readDir(path) {
-    throw new Error("Not implemented");
+    const response = await this.client.get("/v1/vms/{vm_id}/files/{filepath}", {
+      params: { vm_id: this.vmId, filepath: path }
+    });
+    if ("files" in response && response.files) {
+      return response.files;
+    }
+    throw new Error("Path is not a directory");
   }
   /**
    * Create a directory in the VM.
    * @param path The path to create
+   * @param recursive Create parent directories if needed (default: false)
    */
-  async mkdir(path) {
-    throw new Error("Not implemented");
+  async mkdir(path, recursive = false) {
+    if (!this.vm) {
+      throw new Error("FileSystem not properly initialized");
+    }
+    const flag = recursive ? "-p" : "";
+    const result = await this.vm.exec(`mkdir ${flag} "${path}"`);
+    if (result.statusCode !== 0) {
+      throw new Error(
+        `Failed to create directory: ${result.stderr || "Unknown error"}`
+      );
+    }
   }
   /**
    * Remove a file or directory from the VM.
    * @param path The path to remove
+   * @param recursive Remove directories and their contents recursively (default: false)
    */
-  async remove(path) {
-    throw new Error("Not implemented");
+  async remove(path, recursive = false) {
+    if (!this.vm) {
+      throw new Error("FileSystem not properly initialized");
+    }
+    const flag = recursive ? "-rf" : "-f";
+    const result = await this.vm.exec(`rm ${flag} "${path}"`);
+    if (result.statusCode !== 0) {
+      throw new Error(
+        `Failed to remove path: ${result.stderr || "Unknown error"}`
+      );
+    }
   }
   /**
    * Check if a file or directory exists in the VM.
@@ -3932,7 +3966,11 @@ class FileSystem {
    * @returns True if exists, false otherwise
    */
   async exists(path) {
-    throw new Error("Not implemented");
+    if (!this.vm) {
+      throw new Error("FileSystem not properly initialized");
+    }
+    const result = await this.vm.exec(`test -e "${path}"`);
+    return result.statusCode === 0;
   }
   /**
    * Get file/directory stats.
@@ -3940,7 +3978,37 @@ class FileSystem {
    * @returns File/directory stats
    */
   async stat(path) {
-    throw new Error("Not implemented");
+    if (!this.vm) {
+      throw new Error("FileSystem not properly initialized");
+    }
+    const result = await this.vm.exec(
+      `stat -c '%s|%F|%a|%U|%G|%y' "${path}" 2>/dev/null || stat -f '%z|%HT|%p|%Su|%Sg|%Sm' "${path}"`
+    );
+    if (result.statusCode !== 0 || !result.stdout) {
+      throw new Error(
+        `Failed to stat path: ${result.stderr || "Unknown error"}`
+      );
+    }
+    const parts = result.stdout.trim().split("|");
+    if (parts.length < 6) {
+      throw new Error(`Invalid stat output: ${result.stdout}`);
+    }
+    const size = parseInt(parts[0] || "0");
+    const fileType = parts[1] || "";
+    const permissions = parts[2] || "";
+    const owner = parts[3] || "";
+    const group = parts[4] || "";
+    const modified = parts[5] || "";
+    return {
+      size,
+      isFile: fileType.includes("regular file") || fileType.includes("Regular File"),
+      isDirectory: fileType.includes("directory") || fileType.includes("Directory"),
+      isSymlink: fileType.includes("symbolic link") || fileType.includes("Symbolic Link"),
+      permissions,
+      owner,
+      group,
+      modified
+    };
   }
   /**
    * Watch for file changes in the VM.
@@ -4125,8 +4193,8 @@ function composeCreateVmOptions(arr) {
       if (!result.template) {
         result.template = options.template;
       } else if (options.template !== null) {
-        const baseTemplate = result.template instanceof VmTemplate ? result.template["template"] : result.template;
-        const newTemplate = options.template instanceof VmTemplate ? options.template["template"] : options.template;
+        const baseTemplate = result.template instanceof VmTemplate ? result.template["raw"] : result.template;
+        const newTemplate = options.template instanceof VmTemplate ? options.template["raw"] : options.template;
         result.template = {
           // Simple overrides - start with base, override with new
           snapshotId: newTemplate.snapshotId !== void 0 ? newTemplate.snapshotId : baseTemplate.snapshotId,
@@ -4294,6 +4362,7 @@ class Vm {
     this.apiClient = apiClient;
     this.vmId = vmId;
     this.fs = new FileSystem(vmId, apiClient);
+    this.fs._setVm(this);
     this.terminals = new VmTerminals(vmId, apiClient);
   }
   vmId;
@@ -4424,15 +4493,44 @@ class VmSnapshotsNamespace {
     this.apiClient = apiClient;
   }
   async ensure(options) {
+    if (options.template.raw.template instanceof VmTemplate) {
+      options.template = await ensureNestedTemplates(options.template, this);
+    }
     return this.apiClient.post("/v1/vms/snapshots", {
       body: {
         ...options,
         // @ts-ignore
-        template: options.template?.template
+        template: options.template?.raw
       }
     });
   }
 }
+async function ensureNestedTemplates(template, snapshots) {
+  let templates = [template];
+  while (templates.at(-1)?.raw.template instanceof VmTemplate) {
+    let innerTemplate = templates.at(-1).raw.template;
+    templates.at(-1).raw.template = void 0;
+    templates.push(innerTemplate);
+  }
+  return await layerTemplates(templates, snapshots);
+}
+async function layerTemplates(templates, snapshots) {
+  let lastTemplate = templates.pop();
+  const { snapshotId } = await snapshots.ensure({
+    template: lastTemplate
+  });
+  let lastSnapshotId = snapshotId;
+  while (templates.length > 0) {
+    const template = templates.pop();
+    template.raw.snapshotId = lastSnapshotId;
+    const { snapshotId: snapshotId2 } = await snapshots.ensure({
+      template
+    });
+    lastSnapshotId = snapshotId2;
+    lastTemplate = template;
+  }
+  return lastTemplate;
+}
 class VmsNamespace {
   constructor(apiClient) {
     this.apiClient = apiClient;
@@ -4448,6 +4546,12 @@ class VmsNamespace {
     const builders = options.with || {};
     const { with: _, ...baseConfig } = options;
     let config = baseConfig;
+    if (config.template instanceof VmTemplate) {
+      config.template = await ensureNestedTemplates(
+        config.template,
+        this.snapshots
+      );
+    }
     const keys = Object.keys(builders);
     for (const key of keys) {
       const builder = builders[key];
@@ -4458,7 +4562,7 @@ class VmsNamespace {
     const response = await this.apiClient.post("/v1/vms", {
       body: {
         ...config,
-        template: config.template instanceof VmTemplate ? config.template["template"] : config.template
+        template: config.template instanceof VmTemplate ? config.template["raw"] : config.template
       }
     });
     const vmId = response.id;
@@ -4504,9 +4608,9 @@ class VmsNamespace {
   }
 }
 class VmTemplate {
-  template;
+  raw;
   constructor(template) {
-    this.template = template;
+    this.raw = template;
   }
 }
 

package/index.d.cts

@@ -9349,7 +9349,13 @@ interface CreateSnapshotRequest {
 declare class FileSystem {
     private vmId;
     private client;
+    private vm;
     constructor(vmId: string, client: ApiClient);
+    /**
+     * @internal
+     * Set the parent VM instance for exec operations
+     */
+    _setVm(vm: Vm): void;
     /**
      * Read a file from the VM as a buffer.
      * @param filepath The path to the file in the VM
@@ -9381,17 +9387,22 @@ declare class FileSystem {
      * @param path The path to the directory in the VM
      * @returns Array of file/directory names
      */
-    readDir(path: string): Promise<string[]>;
+    readDir(path: string): Promise<{
+        name: string;
+        kind: string;
+    }[]>;
     /**
      * Create a directory in the VM.
      * @param path The path to create
+     * @param recursive Create parent directories if needed (default: false)
      */
-    mkdir(path: string): Promise<void>;
+    mkdir(path: string, recursive?: boolean): Promise<void>;
     /**
      * Remove a file or directory from the VM.
      * @param path The path to remove
+     * @param recursive Remove directories and their contents recursively (default: false)
      */
-    remove(path: string): Promise<void>;
+    remove(path: string, recursive?: boolean): Promise<void>;
     /**
      * Check if a file or directory exists in the VM.
      * @param path The path to check
@@ -9403,7 +9414,16 @@ declare class FileSystem {
      * @param path The path to stat
      * @returns File/directory stats
      */
-    stat(path: string): Promise<any>;
+    stat(path: string): Promise<{
+        size: number;
+        isFile: boolean;
+        isDirectory: boolean;
+        isSymlink: boolean;
+        permissions: string;
+        owner: string;
+        group: string;
+        modified: string;
+    }>;
     /**
      * Watch for file changes in the VM.
      * @returns An async generator that yields file change events
@@ -9606,9 +9626,12 @@ declare class VmsNamespace {
         vmId: string;
     }): Promise<ResponseDeleteV1VmsVmId200>;
 }
+type TemplateOptions = CreateSnapshotRequest["template"] & {
+    template?: VmTemplate;
+};
 declare class VmTemplate {
-    private template;
-    constructor(template: CreateSnapshotRequest["template"]);
+    raw: TemplateOptions;
+    constructor(template: TemplateOptions);
 }
 
 type FreestyleOptions = ApiClientConfig;

package/index.d.mts

@@ -9349,7 +9349,13 @@ interface CreateSnapshotRequest {
 declare class FileSystem {
     private vmId;
     private client;
+    private vm;
     constructor(vmId: string, client: ApiClient);
+    /**
+     * @internal
+     * Set the parent VM instance for exec operations
+     */
+    _setVm(vm: Vm): void;
     /**
      * Read a file from the VM as a buffer.
      * @param filepath The path to the file in the VM
@@ -9381,17 +9387,22 @@ declare class FileSystem {
      * @param path The path to the directory in the VM
      * @returns Array of file/directory names
      */
-    readDir(path: string): Promise<string[]>;
+    readDir(path: string): Promise<{
+        name: string;
+        kind: string;
+    }[]>;
     /**
      * Create a directory in the VM.
      * @param path The path to create
+     * @param recursive Create parent directories if needed (default: false)
      */
-    mkdir(path: string): Promise<void>;
+    mkdir(path: string, recursive?: boolean): Promise<void>;
     /**
      * Remove a file or directory from the VM.
      * @param path The path to remove
+     * @param recursive Remove directories and their contents recursively (default: false)
      */
-    remove(path: string): Promise<void>;
+    remove(path: string, recursive?: boolean): Promise<void>;
     /**
      * Check if a file or directory exists in the VM.
      * @param path The path to check
@@ -9403,7 +9414,16 @@ declare class FileSystem {
      * @param path The path to stat
      * @returns File/directory stats
      */
-    stat(path: string): Promise<any>;
+    stat(path: string): Promise<{
+        size: number;
+        isFile: boolean;
+        isDirectory: boolean;
+        isSymlink: boolean;
+        permissions: string;
+        owner: string;
+        group: string;
+        modified: string;
+    }>;
     /**
      * Watch for file changes in the VM.
      * @returns An async generator that yields file change events
@@ -9606,9 +9626,12 @@ declare class VmsNamespace {
         vmId: string;
     }): Promise<ResponseDeleteV1VmsVmId200>;
 }
+type TemplateOptions = CreateSnapshotRequest["template"] & {
+    template?: VmTemplate;
+};
 declare class VmTemplate {
-    private template;
-    constructor(template: CreateSnapshotRequest["template"]);
+    raw: TemplateOptions;
+    constructor(template: TemplateOptions);
 }
 
 type FreestyleOptions = ApiClientConfig;

package/index.mjs

@@ -3851,6 +3851,14 @@ class FileSystem {
     this.vmId = vmId;
     this.client = client;
   }
+  vm = null;
+  /**
+   * @internal
+   * Set the parent VM instance for exec operations
+   */
+  _setVm(vm) {
+    this.vm = vm;
+  }
   /**
    * Read a file from the VM as a buffer.
    * @param filepath The path to the file in the VM
@@ -3908,21 +3916,47 @@ class FileSystem {
    * @returns Array of file/directory names
    */
   async readDir(path) {
-    throw new Error("Not implemented");
+    const response = await this.client.get("/v1/vms/{vm_id}/files/{filepath}", {
+      params: { vm_id: this.vmId, filepath: path }
+    });
+    if ("files" in response && response.files) {
+      return response.files;
+    }
+    throw new Error("Path is not a directory");
   }
   /**
    * Create a directory in the VM.
    * @param path The path to create
+   * @param recursive Create parent directories if needed (default: false)
    */
-  async mkdir(path) {
-    throw new Error("Not implemented");
+  async mkdir(path, recursive = false) {
+    if (!this.vm) {
+      throw new Error("FileSystem not properly initialized");
+    }
+    const flag = recursive ? "-p" : "";
+    const result = await this.vm.exec(`mkdir ${flag} "${path}"`);
+    if (result.statusCode !== 0) {
+      throw new Error(
+        `Failed to create directory: ${result.stderr || "Unknown error"}`
+      );
+    }
   }
   /**
    * Remove a file or directory from the VM.
    * @param path The path to remove
+   * @param recursive Remove directories and their contents recursively (default: false)
    */
-  async remove(path) {
-    throw new Error("Not implemented");
+  async remove(path, recursive = false) {
+    if (!this.vm) {
+      throw new Error("FileSystem not properly initialized");
+    }
+    const flag = recursive ? "-rf" : "-f";
+    const result = await this.vm.exec(`rm ${flag} "${path}"`);
+    if (result.statusCode !== 0) {
+      throw new Error(
+        `Failed to remove path: ${result.stderr || "Unknown error"}`
+      );
+    }
   }
   /**
    * Check if a file or directory exists in the VM.
@@ -3930,7 +3964,11 @@ class FileSystem {
    * @returns True if exists, false otherwise
    */
   async exists(path) {
-    throw new Error("Not implemented");
+    if (!this.vm) {
+      throw new Error("FileSystem not properly initialized");
+    }
+    const result = await this.vm.exec(`test -e "${path}"`);
+    return result.statusCode === 0;
   }
   /**
    * Get file/directory stats.
@@ -3938,7 +3976,37 @@ class FileSystem {
    * @returns File/directory stats
    */
   async stat(path) {
-    throw new Error("Not implemented");
+    if (!this.vm) {
+      throw new Error("FileSystem not properly initialized");
+    }
+    const result = await this.vm.exec(
+      `stat -c '%s|%F|%a|%U|%G|%y' "${path}" 2>/dev/null || stat -f '%z|%HT|%p|%Su|%Sg|%Sm' "${path}"`
+    );
+    if (result.statusCode !== 0 || !result.stdout) {
+      throw new Error(
+        `Failed to stat path: ${result.stderr || "Unknown error"}`
+      );
+    }
+    const parts = result.stdout.trim().split("|");
+    if (parts.length < 6) {
+      throw new Error(`Invalid stat output: ${result.stdout}`);
+    }
+    const size = parseInt(parts[0] || "0");
+    const fileType = parts[1] || "";
+    const permissions = parts[2] || "";
+    const owner = parts[3] || "";
+    const group = parts[4] || "";
+    const modified = parts[5] || "";
+    return {
+      size,
+      isFile: fileType.includes("regular file") || fileType.includes("Regular File"),
+      isDirectory: fileType.includes("directory") || fileType.includes("Directory"),
+      isSymlink: fileType.includes("symbolic link") || fileType.includes("Symbolic Link"),
+      permissions,
+      owner,
+      group,
+      modified
+    };
   }
   /**
    * Watch for file changes in the VM.
@@ -4123,8 +4191,8 @@ function composeCreateVmOptions(arr) {
       if (!result.template) {
         result.template = options.template;
       } else if (options.template !== null) {
-        const baseTemplate = result.template instanceof VmTemplate ? result.template["template"] : result.template;
-        const newTemplate = options.template instanceof VmTemplate ? options.template["template"] : options.template;
+        const baseTemplate = result.template instanceof VmTemplate ? result.template["raw"] : result.template;
+        const newTemplate = options.template instanceof VmTemplate ? options.template["raw"] : options.template;
         result.template = {
           // Simple overrides - start with base, override with new
           snapshotId: newTemplate.snapshotId !== void 0 ? newTemplate.snapshotId : baseTemplate.snapshotId,
@@ -4292,6 +4360,7 @@ class Vm {
     this.apiClient = apiClient;
     this.vmId = vmId;
     this.fs = new FileSystem(vmId, apiClient);
+    this.fs._setVm(this);
     this.terminals = new VmTerminals(vmId, apiClient);
   }
   vmId;
@@ -4422,15 +4491,44 @@ class VmSnapshotsNamespace {
     this.apiClient = apiClient;
   }
   async ensure(options) {
+    if (options.template.raw.template instanceof VmTemplate) {
+      options.template = await ensureNestedTemplates(options.template, this);
+    }
     return this.apiClient.post("/v1/vms/snapshots", {
       body: {
         ...options,
         // @ts-ignore
-        template: options.template?.template
+        template: options.template?.raw
       }
     });
   }
 }
+async function ensureNestedTemplates(template, snapshots) {
+  let templates = [template];
+  while (templates.at(-1)?.raw.template instanceof VmTemplate) {
+    let innerTemplate = templates.at(-1).raw.template;
+    templates.at(-1).raw.template = void 0;
+    templates.push(innerTemplate);
+  }
+  return await layerTemplates(templates, snapshots);
+}
+async function layerTemplates(templates, snapshots) {
+  let lastTemplate = templates.pop();
+  const { snapshotId } = await snapshots.ensure({
+    template: lastTemplate
+  });
+  let lastSnapshotId = snapshotId;
+  while (templates.length > 0) {
+    const template = templates.pop();
+    template.raw.snapshotId = lastSnapshotId;
+    const { snapshotId: snapshotId2 } = await snapshots.ensure({
+      template
+    });
+    lastSnapshotId = snapshotId2;
+    lastTemplate = template;
+  }
+  return lastTemplate;
+}
 class VmsNamespace {
   constructor(apiClient) {
     this.apiClient = apiClient;
@@ -4446,6 +4544,12 @@ class VmsNamespace {
     const builders = options.with || {};
     const { with: _, ...baseConfig } = options;
     let config = baseConfig;
+    if (config.template instanceof VmTemplate) {
+      config.template = await ensureNestedTemplates(
+        config.template,
+        this.snapshots
+      );
+    }
     const keys = Object.keys(builders);
     for (const key of keys) {
       const builder = builders[key];
@@ -4456,7 +4560,7 @@ class VmsNamespace {
     const response = await this.apiClient.post("/v1/vms", {
       body: {
         ...config,
-        template: config.template instanceof VmTemplate ? config.template["template"] : config.template
+        template: config.template instanceof VmTemplate ? config.template["raw"] : config.template
       }
     });
     const vmId = response.id;
@@ -4502,9 +4606,9 @@ class VmsNamespace {
   }
 }
 class VmTemplate {
-  template;
+  raw;
   constructor(template) {
-    this.template = template;
+    this.raw = template;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "freestyle-sandboxes",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "type": "module",
     "exports": {
         "require": {