freestyle-sandboxes 0.0.52 → 0.0.54

package/src/index.ts

@@ -797,60 +797,57 @@ 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(repo: { repoId: string } | { repoUrl: string }) {
+  async requestDevServer({
+    repoUrl,
+    repoId,
+  }: {
+    /**
+     * @deprecated
+     */
+    repoUrl?: string,
+    repoId?: string, repo?: string
+  }) {
+
     function formatHook(serverUrl: string, repoUrl: string) {
       const hook =
         serverUrl +
         "/__freestyle_dev_server/update/git?repo=" +
         encodeURIComponent(repoUrl);
-
-      console.log(hook);
       return hook;
     }
 
-    let repoId: string;
-    if ("repoId" in repo) {
-      repoId = repo.repoId;
-    } else if ("repoUrl" in repo) {
-      const parts = repo.repoUrl.split("/");
-      repoId = parts[parts.length - 1]; // Get the last part of the URL path
-    } else {
-      throw new Error("Either repoId or repoUrl must be provided");
-    }
-
-    const repoUrl =
-      (process.env.GIT_URL ?? "https://git.freestyle.sh/") + repoId;
-
     const response = await sandbox_openapi.handleEphemeralDevServer({
       client: this.client,
       body: {
+        // @ts-ignore
+        repo: repo || repoUrl,
         repoId: repoId,
       },
     });
 
     if (response.data.isNew) {
+      const rId = repoId || repoUrl.split("/").at(-1)!;
+
       await this.createGitTrigger({
-        repoId: repoId,
+        repoId: rId,
         action: {
-          endpoint: formatHook(response.data?.url!, repoUrl),
-          action: "webhook",
+          endpoint: formatHook(response.data?.url!, repoUrl || `https://git.freestyle.sh/${rId}`),
+          action: "webhook"
         },
         trigger: {
           event: "push",
         },
-      }).then(console.log);
+      });
     }
 
     if (!response.data) {
       throw new Error(`Failed to request dev server: ${response.error}`);
     }
-
     return {
       ...response.data,
       // @ts-ignore
       mcpEphemeralUrl:
-        (response.data as unknown as Record<string, unknown>).mcpEphemeralUrl ||
-        response.data.url + "/mcp",
+        (response.data as any).mcpEphemeralUrl || response.data.url + "/mcp",
       // @ts-ignore
       ephemeralUrl: response.data.ephemeralUrl ?? response.data.url,
     };

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

@@ -39,11 +39,11 @@ export function DefaultLoadingComponent({
 }
 
 export function FreestyleDevServer({
-  repoUrl,
   loadingComponent,
   actions,
+  repoId,
 }: {
-  repoUrl: string;
+  repoId: string;
   loadingComponent?: (props: {
     devCommandRunning: boolean;
     installCommandRunning: boolean;
@@ -55,7 +55,7 @@ export function FreestyleDevServer({
     <QueryClientProvider client={queryClient}>
       <FreestyleDevServerInner
         loadingComponent={loadingComponent ?? DefaultLoadingComponent}
-        repoUrl={repoUrl}
+        repoId={repoId}
         actions={actions}
       />
     </QueryClientProvider>
@@ -63,11 +63,11 @@ export function FreestyleDevServer({
 }
 
 function FreestyleDevServerInner({
-  repoUrl,
+  repoId,
   loadingComponent,
   actions: { requestDevServer },
 }: {
-  repoUrl: string;
+  repoId: string;
   loadingComponent: (props: {
     devCommandRunning: boolean;
     installCommandRunning: boolean;
@@ -76,8 +76,8 @@ function FreestyleDevServerInner({
   actions: RequestDevServerActions;
 }) {
   const { data, isLoading } = useQuery({
-    queryKey: ["dev-server", repoUrl],
-    queryFn: async () => await requestDevServer({ repoUrl: repoUrl }),
+    queryKey: ["dev-server", repoId],
+    queryFn: async () => await requestDevServer({ repoId: repoId }),
     refetchInterval: 1000,
   });
 

package/src/react/dev-server/types.ts

@@ -1,5 +1,5 @@
 export type RequestDevServerActions = {
     requestDevServer: (args: {
-        repoUrl: string;
+        repoId: string;
     }) => Promise<{ ephemeralUrl: string; devCommandRunning: boolean; installCommandRunning: boolean; }>;
 };