freestyle-sandboxes 0.0.63 → 0.0.65

package/dist/inde.d.cts

@@ -180,7 +180,7 @@ declare class FreestyleSandboxes {
      * ephemeral so you should call this function every time you need a url. Do
      * not store the url in your database!
      */
-    requestDevServer({ repoUrl, repoId, baseId, }: {
+    requestDevServer(options: {
         /**
          * @deprecated
          */
@@ -188,10 +188,11 @@ declare class FreestyleSandboxes {
         repoId?: string;
         repo?: string;
         baseId?: string;
+        devCommand?: string;
     }): Promise<{
         mcpEphemeralUrl: any;
         ephemeralUrl: string;
-        codeServerUrl: string;
+        codeServerUrl: any;
         url: string;
         isNew: boolean;
         devCommandRunning: boolean;

package/dist/inde.d.mts

@@ -180,7 +180,7 @@ declare class FreestyleSandboxes {
      * ephemeral so you should call this function every time you need a url. Do
      * not store the url in your database!
      */
-    requestDevServer({ repoUrl, repoId, baseId, }: {
+    requestDevServer(options: {
         /**
          * @deprecated
          */
@@ -188,10 +188,11 @@ declare class FreestyleSandboxes {
         repoId?: string;
         repo?: string;
         baseId?: string;
+        devCommand?: string;
     }): Promise<{
         mcpEphemeralUrl: any;
         ephemeralUrl: string;
-        codeServerUrl: string;
+        codeServerUrl: any;
         url: string;
         isNew: boolean;
         devCommandRunning: boolean;

package/dist/index.cjs

@@ -777,30 +777,31 @@ ${response.error.message}`);
    * ephemeral so you should call this function every time you need a url. Do
    * not store the url in your database!
    */
-  async requestDevServer({
-    repoUrl,
-    repoId,
-    baseId
-  }) {
-    function formatHook(serverUrl, repoUrl2) {
-      const hook = serverUrl + "/__freestyle_dev_server/update/git?repo=" + encodeURIComponent(repoUrl2);
+  async requestDevServer(options) {
+    function formatHook(serverUrl, repoUrl) {
+      const hook = serverUrl + "/__freestyle_dev_server/update/git?repo=" + encodeURIComponent(repoUrl);
       return hook;
     }
     const response = await handleEphemeralDevServer({
       client: this.client,
       body: {
+        ...options,
         // @ts-ignore
-        repo: repoUrl,
-        repoId,
-        baseId
+        repo: options.repoUrl
       }
     });
+    if (response.error) {
+      throw new Error(`Failed to request dev server: ${response.error}`);
+    }
     if (response.data.isNew) {
-      const rId = repoId || repoUrl.split("/").at(-1);
+      const rId = options.repoId || options.repoUrl.split("/").at(-1);
       await this.createGitTrigger({
         repoId: rId,
         action: {
-          endpoint: formatHook(response.data?.url, repoUrl || `https://git.freestyle.sh/${rId}`),
+          endpoint: formatHook(
+            response.data?.url,
+            options.repoUrl || `https://git.freestyle.sh/${rId}`
+          ),
           action: "webhook"
         },
         trigger: {
@@ -815,9 +816,11 @@ ${response.error.message}`);
       ...response.data,
       // @ts-ignore
       mcpEphemeralUrl: response.data.mcpEphemeralUrl || response.data.url + "/mcp",
-      // @ts-ignore
       ephemeralUrl: response.data.ephemeralUrl ?? response.data.url,
-      codeServerUrl: response.data.ephemeralUrl + "/__freestyle_code_server/?folder=/template"
+      codeServerUrl: (
+        // @ts-ignore
+        response.data.codeServerUrl ?? response.data.ephemeralUrl + "/__freestyle_code_server/?folder=/template"
+      )
     };
   }
 }

package/dist/index.d.cts

@@ -180,7 +180,7 @@ declare class FreestyleSandboxes {
      * ephemeral so you should call this function every time you need a url. Do
      * not store the url in your database!
      */
-    requestDevServer({ repoUrl, repoId, baseId, }: {
+    requestDevServer(options: {
         /**
          * @deprecated
          */
@@ -188,10 +188,11 @@ declare class FreestyleSandboxes {
         repoId?: string;
         repo?: string;
         baseId?: string;
+        devCommand?: string;
     }): Promise<{
         mcpEphemeralUrl: any;
         ephemeralUrl: string;
-        codeServerUrl: string;
+        codeServerUrl: any;
         url: string;
         isNew: boolean;
         devCommandRunning: boolean;

package/dist/index.d.mts

@@ -180,7 +180,7 @@ declare class FreestyleSandboxes {
      * ephemeral so you should call this function every time you need a url. Do
      * not store the url in your database!
      */
-    requestDevServer({ repoUrl, repoId, baseId, }: {
+    requestDevServer(options: {
         /**
          * @deprecated
          */
@@ -188,10 +188,11 @@ declare class FreestyleSandboxes {
         repoId?: string;
         repo?: string;
         baseId?: string;
+        devCommand?: string;
     }): Promise<{
         mcpEphemeralUrl: any;
         ephemeralUrl: string;
-        codeServerUrl: string;
+        codeServerUrl: any;
         url: string;
         isNew: boolean;
         devCommandRunning: boolean;

package/dist/index.mjs

@@ -775,30 +775,31 @@ ${response.error.message}`);
    * ephemeral so you should call this function every time you need a url. Do
    * not store the url in your database!
    */
-  async requestDevServer({
-    repoUrl,
-    repoId,
-    baseId
-  }) {
-    function formatHook(serverUrl, repoUrl2) {
-      const hook = serverUrl + "/__freestyle_dev_server/update/git?repo=" + encodeURIComponent(repoUrl2);
+  async requestDevServer(options) {
+    function formatHook(serverUrl, repoUrl) {
+      const hook = serverUrl + "/__freestyle_dev_server/update/git?repo=" + encodeURIComponent(repoUrl);
       return hook;
     }
     const response = await handleEphemeralDevServer({
       client: this.client,
       body: {
+        ...options,
         // @ts-ignore
-        repo: repoUrl,
-        repoId,
-        baseId
+        repo: options.repoUrl
       }
     });
+    if (response.error) {
+      throw new Error(`Failed to request dev server: ${response.error}`);
+    }
     if (response.data.isNew) {
-      const rId = repoId || repoUrl.split("/").at(-1);
+      const rId = options.repoId || options.repoUrl.split("/").at(-1);
       await this.createGitTrigger({
         repoId: rId,
         action: {
-          endpoint: formatHook(response.data?.url, repoUrl || `https://git.freestyle.sh/${rId}`),
+          endpoint: formatHook(
+            response.data?.url,
+            options.repoUrl || `https://git.freestyle.sh/${rId}`
+          ),
           action: "webhook"
         },
         trigger: {
@@ -813,9 +814,11 @@ ${response.error.message}`);
       ...response.data,
       // @ts-ignore
       mcpEphemeralUrl: response.data.mcpEphemeralUrl || response.data.url + "/mcp",
-      // @ts-ignore
       ephemeralUrl: response.data.ephemeralUrl ?? response.data.url,
-      codeServerUrl: response.data.ephemeralUrl + "/__freestyle_code_server/?folder=/template"
+      codeServerUrl: (
+        // @ts-ignore
+        response.data.codeServerUrl ?? response.data.ephemeralUrl + "/__freestyle_code_server/?folder=/template"
+      )
     };
   }
 }

package/dist/react/dev-server/index.cjs

@@ -52,15 +52,6 @@ function FreestyleDevServerInner({
     refetchInterval: 1e3
   });
   const ref = React.useRef(null);
-  React.useEffect(() => {
-    if (!data?.ephemeralUrl) return;
-    const interval = setInterval(() => {
-      if (ref.current) {
-        ref.current.src = data.ephemeralUrl;
-      }
-    }, 45 * 1e3);
-    return () => clearInterval(interval);
-  }, [data?.ephemeralUrl]);
   const [wasLoaded, setWasLoaded] = React.useState(false);
   const [iframeLoaded, setIframeLoaded] = React.useState(false);
   React.useMemo(() => {
@@ -69,9 +60,13 @@ function FreestyleDevServerInner({
     }
   }, [isLoading, data?.devCommandRunning]);
   React.useEffect(() => {
-    ref.current?.addEventListener("load", () => {
+    function loadHandle() {
       setIframeLoaded(true);
-    });
+    }
+    ref.current?.addEventListener("load", loadHandle);
+    return () => {
+      ref.current?.removeEventListener("load", loadHandle);
+    };
   }, [ref]);
   if (isLoading) {
     return loadingComponent({

package/dist/react/dev-server/index.mjs

@@ -50,15 +50,6 @@ function FreestyleDevServerInner({
     refetchInterval: 1e3
   });
   const ref = React.useRef(null);
-  React.useEffect(() => {
-    if (!data?.ephemeralUrl) return;
-    const interval = setInterval(() => {
-      if (ref.current) {
-        ref.current.src = data.ephemeralUrl;
-      }
-    }, 45 * 1e3);
-    return () => clearInterval(interval);
-  }, [data?.ephemeralUrl]);
   const [wasLoaded, setWasLoaded] = React.useState(false);
   const [iframeLoaded, setIframeLoaded] = React.useState(false);
   React.useMemo(() => {
@@ -67,9 +58,13 @@ function FreestyleDevServerInner({
     }
   }, [isLoading, data?.devCommandRunning]);
   React.useEffect(() => {
-    ref.current?.addEventListener("load", () => {
+    function loadHandle() {
       setIframeLoaded(true);
-    });
+    }
+    ref.current?.addEventListener("load", loadHandle);
+    return () => {
+      ref.current?.removeEventListener("load", loadHandle);
+    };
   }, [ref]);
   if (isLoading) {
     return loadingComponent({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freestyle-sandboxes",
-  "version": "0.0.63",
+  "version": "0.0.65",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",

package/src/index.ts

@@ -797,17 +797,15 @@ export class FreestyleSandboxes {
    * ephemeral so you should call this function every time you need a url. Do
    * not store the url in your database!
    */
-  async requestDevServer({
-    repoUrl,
-    repoId,
-    baseId,
-  }: {
+  async requestDevServer(options: {
     /**
      * @deprecated
      */
-    repoUrl?: string,
-    repoId?: string, repo?: string,
-    baseId?: string,
+    repoUrl?: string;
+    repoId?: string;
+    repo?: string;
+    baseId?: string;
+    devCommand?: string;
   }) {
     function formatHook(serverUrl: string, repoUrl: string) {
       const hook =
@@ -820,21 +818,27 @@ export class FreestyleSandboxes {
     const response = await sandbox_openapi.handleEphemeralDevServer({
       client: this.client,
       body: {
+        ...options,
         // @ts-ignore
-        repo: repoUrl,
-        repoId: repoId,
-        baseId: baseId
+        repo: options.repoUrl,
       },
     });
 
+    if (response.error) {
+      throw new Error(`Failed to request dev server: ${response.error}`);
+    }
+
     if (response.data.isNew) {
-      const rId = repoId || repoUrl.split("/").at(-1)!;
+      const rId = options.repoId || options.repoUrl.split("/").at(-1)!;
 
       await this.createGitTrigger({
         repoId: rId,
         action: {
-          endpoint: formatHook(response.data?.url!, repoUrl || `https://git.freestyle.sh/${rId}`),
-          action: "webhook"
+          endpoint: formatHook(
+            response.data?.url!,
+            options.repoUrl || `https://git.freestyle.sh/${rId}`
+          ),
+          action: "webhook",
         },
         trigger: {
           event: "push",
@@ -850,9 +854,12 @@ export class FreestyleSandboxes {
       // @ts-ignore
       mcpEphemeralUrl:
         (response.data as any).mcpEphemeralUrl || response.data.url + "/mcp",
-      // @ts-ignore
       ephemeralUrl: response.data.ephemeralUrl ?? response.data.url,
-      codeServerUrl: response.data.ephemeralUrl + "/__freestyle_code_server/?folder=/template",
+      codeServerUrl:
+        // @ts-ignore
+        response.data.codeServerUrl ??
+        response.data.ephemeralUrl +
+          "/__freestyle_code_server/?folder=/template",
     };
   }
 }

package/src/react/dev-server/index.tsx

@@ -84,21 +84,7 @@ function FreestyleDevServerInner({
     refetchInterval: 1000,
   });
 
-  // keep reloading the iframe because there's a bug where the websocket
-  // connection to the dev server is closed every 1 minute
   const ref = React.useRef<HTMLIFrameElement>(null);
-  React.useEffect(() => {
-    if (!data?.ephemeralUrl) return;
-
-    const interval = setInterval(() => {
-      if (ref.current) {
-        ref.current.src = data.ephemeralUrl;
-      }
-    }, 45 * 1000);
-
-    return () => clearInterval(interval);
-  }, [data?.ephemeralUrl]);
-
   const [wasLoaded, setWasLoaded] = React.useState(false);
   const [iframeLoaded, setIframeLoaded] = React.useState(false);
 
@@ -109,9 +95,14 @@ function FreestyleDevServerInner({
   }, [isLoading, data?.devCommandRunning]);
 
   React.useEffect(() => {
-    ref.current?.addEventListener("load", () => {
+    function loadHandle() {
       setIframeLoaded(true);
-    });
+    }
+
+    ref.current?.addEventListener("load", loadHandle);
+    return () => {
+      ref.current?.removeEventListener("load", loadHandle);
+    };
   }, [ref]);
 
   if (isLoading) {