rwsdk 1.0.0-alpha.20-test.20250929150529 → 1.0.0-alpha.20-test.20250929160709

package/dist/lib/e2e/testHarness.mjs

@@ -36,6 +36,12 @@ const DEV_SERVER_MIN_TRIES = process.env.RWSDK_DEV_SERVER_MIN_TRIES
 const SETUP_WAIT_TIMEOUT = process.env.RWSDK_SETUP_WAIT_TIMEOUT
     ? parseInt(process.env.RWSDK_SETUP_WAIT_TIMEOUT, 10)
     : 10 * 60 * 1000;
+const TEST_MAX_RETRIES = process.env.RWSDK_TEST_MAX_RETRIES
+    ? parseInt(process.env.RWSDK_TEST_MAX_RETRIES, 10)
+    : 10;
+const TEST_MAX_RETRIES_PER_CODE = process.env.RWSDK_TEST_MAX_RETRIES_PER_CODE
+    ? parseInt(process.env.RWSDK_TEST_MAX_RETRIES_PER_CODE, 10)
+    : 6;
 // Environment variable flags for skipping tests
 const SKIP_DEV_SERVER_TESTS = process.env.RWSDK_SKIP_DEV === "1";
 const SKIP_DEPLOYMENT_TESTS = process.env.RWSDK_SKIP_DEPLOY === "1";
@@ -258,10 +264,10 @@ export async function createDeployment(projectDir) {
  *                     called automatically on failure.
  */
 export async function runTestWithRetries(name, attemptFn) {
-    const MAX_RETRIES_PER_CODE = 6;
     const retryCounts = {};
     let attempt = 0;
-    while (true) {
+    let lastError;
+    while (attempt < TEST_MAX_RETRIES) {
         attempt++;
         try {
             await attemptFn();
@@ -271,26 +277,26 @@ export async function runTestWithRetries(name, attemptFn) {
             return; // Success
         }
         catch (e) {
+            lastError = e;
             const errorCode = e?.code;
             if (typeof errorCode === "string" && errorCode) {
                 const count = (retryCounts[errorCode] || 0) + 1;
                 retryCounts[errorCode] = count;
-                if (count <= MAX_RETRIES_PER_CODE) {
-                    console.log(`[runTestWithRetries] Attempt ${attempt} for "${name}" failed with code ${errorCode}. Retrying (failure ${count}/${MAX_RETRIES_PER_CODE} for this code)...`);
-                    await new Promise((resolve) => setTimeout(resolve, 1000));
-                    continue; // Next attempt
-                }
-                else {
-                    console.error(`[runTestWithRetries] Test "${name}" failed with code ${errorCode} after ${MAX_RETRIES_PER_CODE} retries for this code.`);
-                    throw e; // Give up
+                if (count > TEST_MAX_RETRIES_PER_CODE) {
+                    console.error(`[runTestWithRetries] Test "${name}" failed with code ${errorCode} after ${count - 1} retries. Max per-code retries (${TEST_MAX_RETRIES_PER_CODE}) exceeded.`);
+                    throw e; // Give up for this specific error code
                 }
             }
+            if (attempt < TEST_MAX_RETRIES) {
+                console.log(`[runTestWithRetries] Attempt ${attempt}/${TEST_MAX_RETRIES} for "${name}" failed. Retrying...`);
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+            }
             else {
-                console.error(`[runTestWithRetries] Test "${name}" failed on attempt ${attempt} with a non-retryable error:`, e);
-                throw e;
+                console.error(`[runTestWithRetries] Test "${name}" failed after ${attempt} attempts.`);
             }
         }
     }
+    throw lastError;
 }
 function createTestRunner(testFn, envType) {
     return (name, testLogic) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.0.0-alpha.20-test.20250929150529",
+  "version": "1.0.0-alpha.20-test.20250929160709",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {