freestyle-sandboxes 0.0.47 → 0.0.49

package/dist/index.cjs

@@ -783,12 +783,30 @@ ${response.error.message}`);
   async requestDevServer({
     repoUrl
   }) {
+    function formatHook(serverUrl, repoUrl2) {
+      const hook = serverUrl + "/__freestyle_dev_server/update/git?repo=" + encodeURIComponent(repoUrl2);
+      console.log(hook);
+      return hook;
+    }
     const response = await handleEphemeralDevServer({
       client: this.client,
       body: {
         repo: repoUrl
       }
     });
+    if (response.data.isNew) {
+      const repoId = repoUrl.split("/").at(-1);
+      await this.createGitTrigger({
+        repoId,
+        action: {
+          endpoint: formatHook(response.data?.url, repoUrl),
+          action: "webhook"
+        },
+        trigger: {
+          event: "push"
+        }
+      }).then(console.log);
+    }
     if (!response.data) {
       throw new Error(
         `Failed to request dev server: ${response.error}`

package/dist/index.mjs

@@ -781,12 +781,30 @@ ${response.error.message}`);
   async requestDevServer({
     repoUrl
   }) {
+    function formatHook(serverUrl, repoUrl2) {
+      const hook = serverUrl + "/__freestyle_dev_server/update/git?repo=" + encodeURIComponent(repoUrl2);
+      console.log(hook);
+      return hook;
+    }
     const response = await handleEphemeralDevServer({
       client: this.client,
       body: {
         repo: repoUrl
       }
     });
+    if (response.data.isNew) {
+      const repoId = repoUrl.split("/").at(-1);
+      await this.createGitTrigger({
+        repoId,
+        action: {
+          endpoint: formatHook(response.data?.url, repoUrl),
+          action: "webhook"
+        },
+        trigger: {
+          event: "push"
+        }
+      }).then(console.log);
+    }
     if (!response.data) {
       throw new Error(
         `Failed to request dev server: ${response.error}`

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

@@ -51,6 +51,16 @@ function FreestyleDevServerInner({
     queryFn: async () => await requestDevServer({ repoUrl }),
     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]);
   if (isLoading) {
     return loadingComponent({
       devCommandRunning: false,
@@ -68,6 +78,7 @@ function FreestyleDevServerInner({
   return /* @__PURE__ */ React.createElement(
     "iframe",
     {
+      ref,
       sandbox: "allow-scripts allow-same-origin allow-forms",
       src: data.ephemeralUrl,
       style: {

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

@@ -49,6 +49,16 @@ function FreestyleDevServerInner({
     queryFn: async () => await requestDevServer({ repoUrl }),
     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]);
   if (isLoading) {
     return loadingComponent({
       devCommandRunning: false,
@@ -66,6 +76,7 @@ function FreestyleDevServerInner({
   return /* @__PURE__ */ React.createElement(
     "iframe",
     {
+      ref,
       sandbox: "allow-scripts allow-same-origin allow-forms",
       src: data.ephemeralUrl,
       style: {

package/package.json

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

package/src/index.ts

@@ -811,6 +811,18 @@ export class FreestyleSandboxes {
   async requestDevServer({
     repoUrl
   }: { repoUrl: string }) {
+
+    function formatHook(serverUrl: string, repoUrl: string) {
+      const hook =
+        serverUrl +
+        "/__freestyle_dev_server/update/git?repo=" +
+        encodeURIComponent(repoUrl);
+
+      console.log(hook);
+      return hook;
+    }
+
+
     const response = await sandbox_openapi.handleEphemeralDevServer({
       client: this.client,
       body: {
@@ -818,6 +830,22 @@ export class FreestyleSandboxes {
       }
     });
 
+
+    if (response.data.isNew) {
+      const repoId = repoUrl.split("/").at(-1)!;
+
+      await this.createGitTrigger({
+        repoId: repoId,
+        action: {
+          endpoint: formatHook(response.data?.url!, repoUrl),
+          action: "webhook"
+        },
+        trigger: {
+          event: "push",
+        }
+      }).then(console.log);
+    }
+
     if (!response.data) {
       throw new Error(
         `Failed to request dev server: ${response.error}`,

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

@@ -81,6 +81,21 @@ 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]);
+
   if (isLoading) {
     return loadingComponent({
       devCommandRunning: false,
@@ -99,6 +114,7 @@ function FreestyleDevServerInner({
 
   return (
     <iframe
+      ref={ref}
       sandbox="allow-scripts allow-same-origin allow-forms"
       src={data.ephemeralUrl}
       style={{