@base44-preview/cli 0.1.8-pr.584.ae3c2f4 → 0.1.8-pr.584.c8b5c9f

package/dist/cli/index.js

@@ -248318,18 +248318,6 @@ async function createDeployment(request) {
   }
   return result.data;
 }
-async function uploadAssetBucket(target, formData) {
-  const response = await distribution_default.post(target.url, {
-    searchParams: { base64: "true" },
-    headers: { Authorization: `Bearer ${target.jwt}` },
-    body: formData,
-    timeout: 120000,
-    retry: 0
-  });
-  const parsed = AssetUploadResponseSchema.safeParse(await response.json());
-  const jwt3 = parsed.success ? parsed.data.result?.jwt : null;
-  return jwt3 || null;
-}
 async function finalizeDeployment(deploymentId, completionJwt, modules) {
   const formData = new FormData;
   formData.append("payload", JSON.stringify({ completion_jwt: completionJwt }));
@@ -248716,8 +248704,10 @@ var DEFAULT_UPLOAD_CONCURRENCY = 3;
 var MAX_UPLOAD_CONCURRENCY = 50;
 var MAX_UPLOAD_ATTEMPTS = 3;
 var RETRY_BASE_DELAY_MS = 500;
-var MAX_RATE_LIMIT_WAITS = 10;
-var RATE_LIMIT_DELAY_MS = 15000;
+var UPLOAD_RETRY = {
+  limit: MAX_UPLOAD_ATTEMPTS - 1,
+  delay: (attempt) => RETRY_BASE_DELAY_MS * 2 ** (attempt - 1)
+};
 async function uploadAssetBuckets(target, filesByHash, options = {}) {
   const { concurrency = DEFAULT_UPLOAD_CONCURRENCY, onProgress } = options;
   const { buckets } = target;
@@ -248725,7 +248715,7 @@ async function uploadAssetBuckets(target, filesByHash, options = {}) {
   let uploadedFiles = 0;
   let completionJwt = null;
   await pMap(buckets, async (bucket) => {
-    const jwt3 = await uploadBucketWithRetry(target, bucket, filesByHash);
+    const jwt3 = await uploadAssetBucket(target, bucket, filesByHash);
     if (jwt3) {
       completionJwt = jwt3;
     }
@@ -248737,30 +248727,26 @@ async function uploadAssetBuckets(target, filesByHash, options = {}) {
   }
   return completionJwt;
 }
-async function uploadBucketWithRetry(target, bucket, filesByHash) {
-  let lastError;
-  let rateLimitWaits = 0;
+async function uploadAssetBucket(target, bucket, filesByHash) {
   const formData = await buildBucketForm(bucket, filesByHash);
-  for (let attempt = 0;attempt < MAX_UPLOAD_ATTEMPTS; attempt++) {
-    if (attempt > 0) {
-      await sleep3(RETRY_BASE_DELAY_MS * 2 ** (attempt - 1));
-    }
-    try {
-      return await uploadAssetBucket(target, formData);
-    } catch (error48) {
-      if (error48 instanceof HTTPError && error48.response.status === 429 && rateLimitWaits < MAX_RATE_LIMIT_WAITS) {
-        rateLimitWaits++;
-        attempt--;
-        await sleep3(RATE_LIMIT_DELAY_MS);
-        continue;
-      }
-      lastError = error48;
+  let response;
+  try {
+    response = await distribution_default.post(target.url, {
+      searchParams: { base64: "true" },
+      headers: { Authorization: `Bearer ${target.jwt}` },
+      body: formData,
+      timeout: 120000,
+      retry: { ...UPLOAD_RETRY, methods: ["post"] }
+    });
+  } catch (error48) {
+    if (error48 instanceof HTTPError && (error48.response.status === 401 || error48.response.status === 403)) {
+      throw new ApiError("This deploy's upload session has expired — rerun deploy. Already-uploaded assets are skipped on the next attempt.", { statusCode: error48.response.status, cause: error48 });
     }
+    throw await ApiError.fromHttpError(error48, "uploading assets to Cloudflare");
   }
-  if (lastError instanceof HTTPError && (lastError.response.status === 401 || lastError.response.status === 403)) {
-    throw new ApiError("This deploy's upload session has expired — rerun deploy. Already-uploaded assets are skipped on the next attempt.", { statusCode: lastError.response.status, cause: lastError });
-  }
-  throw await ApiError.fromHttpError(lastError, "uploading assets to Cloudflare");
+  const parsed = AssetUploadResponseSchema.safeParse(await response.json());
+  const jwt3 = parsed.success ? parsed.data.result?.jwt : null;
+  return jwt3 || null;
 }
 async function buildBucketForm(bucket, filesByHash) {
   const formData = new FormData;
@@ -248795,18 +248781,12 @@ async function uploadPresignedAsset(upload, assets) {
       body: new Uint8Array(content),
       headers: { "Content-Type": upload.contentType },
       timeout: 120000,
-      retry: {
-        limit: MAX_UPLOAD_ATTEMPTS - 1,
-        delay: (attempt) => RETRY_BASE_DELAY_MS * 2 ** (attempt - 1)
-      }
+      retry: UPLOAD_RETRY
     });
   } catch (error48) {
     throw await ApiError.fromHttpError(error48, "uploading static assets");
   }
 }
-function sleep3(ms) {
-  return new Promise((resolve4) => setTimeout(resolve4, ms));
-}
 
 // src/core/site/wrangler-config.ts
 import { dirname as dirname10, join as join16, resolve as resolve4 } from "node:path";
@@ -255500,9 +255480,8 @@ async function deployStaticSite(options) {
   if (created.assetUploads && created.assetUploads.type !== "s3") {
     throw new ApiError(`The server answered a static-site deploy with the "${created.assetUploads.type}" upload target.`);
   }
-  const totalAssets = Object.keys(assets.manifest).length;
   progress?.onAssets?.({
-    totalAssets,
+    totalAssets: Object.keys(assets.manifest).length,
     newAssets: created.assetUploads?.uploads.length ?? 0
   });
   if (created.assetUploads) {
@@ -268423,4 +268402,4 @@ export {
   CLIExitError
 };
 
-//# debugId=0F2CA340A345A14E64756E2164756E21
+//# debugId=4AED7703132F8F3A64756E2164756E21