fix: also retry resume (#143)

* fix: also retry resume

* fix: retry resume and prevent double retries

Author: christianalfoni

src/Sandbox.ts

@@ -8,7 +8,7 @@ import {
   vmUpdateHibernationTimeout,
   vmUpdateSpecs,
 } from "./api-clients/client";
-import { handleResponse } from "./utils/api";
+import { handleResponse, retryWithDelay } from "./utils/api";
 import { VMTier } from "./VMTier";
 import { Client } from "@hey-api/client-fetch";
 import { connectToSandbox } from "./node";
@@ -91,7 +91,10 @@ export class Sandbox {
     const client = await connectToSandbox({
       session,
       getSession: async () =>
-        this.getSession(await startVm(this.apiClient, this.id), customSession),
+        this.getSession(
+          await retryWithDelay(() => startVm(this.apiClient, this.id), 3, 200),
+          customSession
+        ),
     });
 
     if (customSession.env) {
@@ -206,7 +209,11 @@ export class Sandbox {
         session,
         getSession: async () =>
           this.getSession(
-            await startVm(this.apiClient, this.id),
+            await retryWithDelay(
+              () => startVm(this.apiClient, this.id),
+              3,
+              200
+            ),
             customSession
           ),
       })

src/Sandboxes.ts

@@ -26,32 +26,26 @@ import {
   StartSandboxOpts,
 } from "./types";
 import { PitcherManagerResponse } from "@codesandbox/pitcher-client";
-import { sleep } from "./utils/sleep";
 
 export async function startVm(
   apiClient: Client,
   sandboxId: string,
   startOpts?: StartSandboxOpts
 ): Promise<PitcherManagerResponse> {
-  const startResult = await retryWithDelay(
-    () =>
-      vmStart({
-        client: apiClient,
-        body: startOpts
-          ? {
-              ipcountry: startOpts.ipcountry,
-              tier: startOpts.vmTier?.name,
-              hibernation_timeout_seconds: startOpts.hibernationTimeoutSeconds,
-              automatic_wakeup_config: startOpts.automaticWakeupConfig,
-            }
-          : undefined,
-        path: {
-          id: sandboxId,
-        },
-      }),
-    3,
-    200
-  );
+  const startResult = await vmStart({
+    client: apiClient,
+    body: startOpts
+      ? {
+          ipcountry: startOpts.ipcountry,
+          tier: startOpts.vmTier?.name,
+          hibernation_timeout_seconds: startOpts.hibernationTimeoutSeconds,
+          automatic_wakeup_config: startOpts.automaticWakeupConfig,
+        }
+      : undefined,
+    path: {
+      id: sandboxId,
+    },
+  });
 
   const response = handleResponse(
     startResult,
@@ -120,7 +114,11 @@ export class Sandboxes {
    * Note! On CLEAN bootups the setup will run again. When hibernated a new snapshot will be created.
    */
   async resume(sandboxId: string) {
-    const startResponse = await startVm(this.apiClient, sandboxId);
+    const startResponse = await retryWithDelay(
+      () => startVm(this.apiClient, sandboxId),
+      3,
+      200
+    );
     return new Sandbox(sandboxId, this.apiClient, startResponse);
   }
 

src/bin/commands/build.ts

@@ -198,11 +198,14 @@ export const buildCommand: yargs.CommandModule<
         try {
           spinner.start(updateSpinnerMessage(index, "Starting sandbox..."));
 
-          const startResponse = await retryWithDelay(() =>
-            withCustomError(
-              startVm(apiClient, id),
-              "Failed to start sandbox at all"
-            )
+          const startResponse = await retryWithDelay(
+            () =>
+              withCustomError(
+                startVm(apiClient, id),
+                "Failed to start sandbox at all"
+              ),
+            3,
+            200
           );
           let sandboxVM = new Sandbox(id, apiClient, startResponse);