From ee602236bced1303fa24df08464b99366e76c763 Mon Sep 17 00:00:00 2001
From: AmirSa12 <amirhosseinpr184@gmail.com>
Date: Fri, 29 May 2026 19:53:54 +0330
Subject: [PATCH 1/2] feat: add client retries

---
 packages/cli/index.ts | 77 +++++++++++++++++++++++++++++--------------
 1 file changed, 53 insertions(+), 24 deletions(-)

diff --git a/packages/cli/index.ts b/packages/cli/index.ts
index b4fd02e9..e7176a4f 100644
--- a/packages/cli/index.ts
+++ b/packages/cli/index.ts
@@ -246,7 +246,7 @@ const main = defineCommand({
 
           let checkResponse;
           try {
-            checkResponse = await fetch(new URL("/check", apiUrl), {
+            checkResponse = await fetchWithRetry(new URL("/check", apiUrl), {
               method: "POST",
               body: JSON.stringify({
                 owner,
@@ -652,14 +652,17 @@ const main = defineCommand({
                   continue;
                 }
                 const totalChunks = Math.ceil(file.size / chunkSize);
-                const createMultipartRes = await fetch(createMultipart, {
-                  method: "POST",
-                  headers: {
-                    "sb-key": key,
-                    "sb-name": name.slice("package:".length),
-                    "sb-sha": sha,
+                const createMultipartRes = await fetchWithRetry(
+                  createMultipart,
+                  {
+                    method: "POST",
+                    headers: {
+                      "sb-key": key,
+                      "sb-name": name.slice("package:".length),
+                      "sb-sha": sha,
+                    },
                   },
-                });
+                );
                 if (!createMultipartRes.ok) {
                   console.error(await createMultipartRes.text());
                   continue;
@@ -678,15 +681,18 @@ const main = defineCommand({
                   const end = Math.min(file.size, start + chunkSize);
                   const chunk = file.slice(start, end);
 
-                  const uploadMultipartRes = await fetch(uploadMultipart, {
-                    method: "PUT",
-                    headers: {
-                      key: uploadKey,
-                      id: uploadId,
-                      "part-number": `${i + 1}`,
+                  const uploadMultipartRes = await fetchWithRetry(
+                    uploadMultipart,
+                    {
+                      method: "PUT",
+                      headers: {
+                        key: uploadKey,
+                        id: uploadId,
+                        "part-number": `${i + 1}`,
+                      },
+                      body: chunk,
                     },
-                    body: chunk,
-                  });
+                  );
 
                   if (!uploadMultipartRes.ok) {
                     console.error(
@@ -697,14 +703,17 @@ const main = defineCommand({
                   const { part } = await uploadMultipartRes.json();
                   uploadedParts.push(part);
                 }
-                const completeMultipartRes = await fetch(completeMultipart, {
-                  method: "POST",
-                  headers: {
-                    key: uploadKey,
-                    id: uploadId,
-                    "uploaded-parts": JSON.stringify(uploadedParts),
+                const completeMultipartRes = await fetchWithRetry(
+                  completeMultipart,
+                  {
+                    method: "POST",
+                    headers: {
+                      key: uploadKey,
+                      id: uploadId,
+                      "uploaded-parts": JSON.stringify(uploadedParts),
+                    },
                   },
-                });
+                );
                 if (!completeMultipartRes.ok) {
                   console.error(
                     `Error completing ${key}: ${await completeMultipartRes.text()}`,
@@ -719,7 +728,7 @@ const main = defineCommand({
             }
           }
 
-          const res = await fetch(publishUrl, {
+          const res = await fetchWithRetry(publishUrl, {
             method: "POST",
             headers: {
               "sb-sha": sha,
@@ -906,6 +915,26 @@ function hijackDeps(
   }
 }
 
+// Retries on 5xx server errors (e.g. transient Cloudflare R2 / GitHub API
+// blips) with a 1s/2s/4s backoff. Non-5xx responses are returned as-is so the
+// caller can handle them. See https://github.com/stackblitz-labs/pkg.pr.new/issues/316
+async function fetchWithRetry(
+  input: URL | string,
+  init: RequestInit,
+): Promise<Response> {
+  const maxRetries = 3;
+  let res = await fetch(input, init);
+  for (let attempt = 1; attempt <= maxRetries && res.status >= 500; attempt++) {
+    const delay = 1000 * 2 ** (attempt - 1); // 1s, 2s, 4s
+    console.warn(
+      `Server error (${res.status}). Retrying in ${delay / 1000}s (attempt ${attempt}/${maxRetries})...`,
+    );
+    await new Promise((resolve) => setTimeout(resolve, delay));
+    res = await fetch(input, init);
+  }
+  return res;
+}
+
 function getFormEntrySize(entry: FormDataEntryValue) {
   if (typeof entry === "string") {
     return entry.length;

From 0334467777da0ef3313acc51c8191f9a8beba9dc Mon Sep 17 00:00:00 2001
From: AmirSa12 <amirhosseinpr184@gmail.com>
Date: Fri, 29 May 2026 19:56:20 +0330
Subject: [PATCH 2/2] update

---
 packages/cli/index.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/cli/index.ts b/packages/cli/index.ts
index e7176a4f..e48a1c7c 100644
--- a/packages/cli/index.ts
+++ b/packages/cli/index.ts
@@ -915,9 +915,6 @@ function hijackDeps(
   }
 }
 
-// Retries on 5xx server errors (e.g. transient Cloudflare R2 / GitHub API
-// blips) with a 1s/2s/4s backoff. Non-5xx responses are returned as-is so the
-// caller can handle them. See https://github.com/stackblitz-labs/pkg.pr.new/issues/316
 async function fetchWithRetry(
   input: URL | string,
   init: RequestInit,