defuss-runtime 1.2.0 → 1.2.1

package/dist/index.cjs

@@ -270,42 +270,77 @@ function wait(ms) {
 }
 function createTimeoutPromise(timeoutMs, operation, timeoutCallback) {
   return new Promise((resolve, reject) => {
+    let completed = false;
     const timeoutId = setTimeout(() => {
-      timeoutCallback?.(timeoutMs);
-      reject(new Error(`Timeout after ${timeoutMs}ms`));
+      if (!completed) {
+        completed = true;
+        timeoutCallback?.(timeoutMs);
+        reject(new Error(`Timeout after ${timeoutMs}ms`));
+      }
     }, timeoutMs);
     Promise.resolve().then(async () => {
       try {
         const result = await operation();
-        clearTimeout(timeoutId);
-        resolve(result);
+        if (!completed) {
+          completed = true;
+          clearTimeout(timeoutId);
+          resolve(result);
+        }
       } catch (error) {
-        clearTimeout(timeoutId);
-        reject(error);
+        if (!completed) {
+          completed = true;
+          clearTimeout(timeoutId);
+          reject(error);
+        }
       }
     });
   });
 }
 async function waitForWithPolling(check, timeout, interval = 1) {
-  return createTimeoutPromise(timeout, () => {
-    return new Promise((resolve, reject) => {
-      const timer = setInterval(() => {
-        try {
-          const result = check();
-          if (result != null) {
-            clearInterval(timer);
-            resolve(result);
+  const start = Date.now();
+  let timer;
+  const cleanup = () => {
+    if (timer) {
+      clearInterval(timer);
+    }
+  };
+  try {
+    return await createTimeoutPromise(timeout, () => {
+      return new Promise((resolve, reject) => {
+        let pollCount = 0;
+        timer = setInterval(() => {
+          pollCount++;
+          const elapsed = Date.now() - start;
+          try {
+            const result = check();
+            if (result != null) {
+              cleanup();
+              resolve(result);
+            }
+          } catch (err) {
+            console.log(
+              `\u274C waitForWithPolling() error on poll #${pollCount}:`,
+              err
+            );
+            cleanup();
+            reject(err);
           }
-        } catch (err) {
-          clearInterval(timer);
-          reject(err);
-        }
-      }, interval);
+        }, interval);
+      });
     });
-  });
+  } catch (error) {
+    cleanup();
+    throw error;
+  }
 }
 async function waitForRef(ref, timeout) {
-  return waitForWithPolling(() => ref.current, timeout);
+  return waitForWithPolling(() => {
+    if (ref.orphan) {
+      console.log("\u26A0\uFE0F waitForRef() - ref is marked as orphaned, failing fast");
+      throw new Error("Ref has been orphaned from component unmount");
+    }
+    return ref.current;
+  }, timeout);
 }
 
 const asString = (value) => {

package/dist/index.mjs

@@ -268,42 +268,77 @@ function wait(ms) {
 }
 function createTimeoutPromise(timeoutMs, operation, timeoutCallback) {
   return new Promise((resolve, reject) => {
+    let completed = false;
     const timeoutId = setTimeout(() => {
-      timeoutCallback?.(timeoutMs);
-      reject(new Error(`Timeout after ${timeoutMs}ms`));
+      if (!completed) {
+        completed = true;
+        timeoutCallback?.(timeoutMs);
+        reject(new Error(`Timeout after ${timeoutMs}ms`));
+      }
     }, timeoutMs);
     Promise.resolve().then(async () => {
       try {
         const result = await operation();
-        clearTimeout(timeoutId);
-        resolve(result);
+        if (!completed) {
+          completed = true;
+          clearTimeout(timeoutId);
+          resolve(result);
+        }
       } catch (error) {
-        clearTimeout(timeoutId);
-        reject(error);
+        if (!completed) {
+          completed = true;
+          clearTimeout(timeoutId);
+          reject(error);
+        }
       }
     });
   });
 }
 async function waitForWithPolling(check, timeout, interval = 1) {
-  return createTimeoutPromise(timeout, () => {
-    return new Promise((resolve, reject) => {
-      const timer = setInterval(() => {
-        try {
-          const result = check();
-          if (result != null) {
-            clearInterval(timer);
-            resolve(result);
+  const start = Date.now();
+  let timer;
+  const cleanup = () => {
+    if (timer) {
+      clearInterval(timer);
+    }
+  };
+  try {
+    return await createTimeoutPromise(timeout, () => {
+      return new Promise((resolve, reject) => {
+        let pollCount = 0;
+        timer = setInterval(() => {
+          pollCount++;
+          const elapsed = Date.now() - start;
+          try {
+            const result = check();
+            if (result != null) {
+              cleanup();
+              resolve(result);
+            }
+          } catch (err) {
+            console.log(
+              `\u274C waitForWithPolling() error on poll #${pollCount}:`,
+              err
+            );
+            cleanup();
+            reject(err);
           }
-        } catch (err) {
-          clearInterval(timer);
-          reject(err);
-        }
-      }, interval);
+        }, interval);
+      });
     });
-  });
+  } catch (error) {
+    cleanup();
+    throw error;
+  }
 }
 async function waitForRef(ref, timeout) {
-  return waitForWithPolling(() => ref.current, timeout);
+  return waitForWithPolling(() => {
+    if (ref.orphan) {
+      console.log("\u26A0\uFE0F waitForRef() - ref is marked as orphaned, failing fast");
+      throw new Error("Ref has been orphaned from component unmount");
+    }
+    return ref.current;
+  }, timeout);
 }
 
 const asString = (value) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defuss-runtime",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -20,6 +20,13 @@
     "url": "git+https://github.com/kyr0/defuss.git",
     "type": "git"
   },
+  "scripts": {
+    "clean": "rm -rf ./node_modules/.pnpm",
+    "pretest": "pnpm run build",
+    "prebuild": "pnpm run clean",
+    "build": "pkgroll",
+    "test": "vitest --run  --coverage"
+  },
   "author": "Aron Homberg <info@aron-homberg.de>",
   "sideEffects": false,
   "exports": {
@@ -37,9 +44,7 @@
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.cts",
-  "files": [
-    "dist"
-  ],
+  "files": ["dist"],
   "engines": {
     "node": "^18.17.1 || ^20.3.0 || >=21.0.0"
   },
@@ -49,12 +54,5 @@
     "typescript": "^5.6.3",
     "vitest": "^3.1.3",
     "@vitest/coverage-v8": "^3.1.3"
-  },
-  "scripts": {
-    "clean": "rm -rf ./node_modules/.pnpm",
-    "pretest": "pnpm run build",
-    "prebuild": "pnpm run clean",
-    "build": "pkgroll",
-    "test": "vitest --run  --coverage"
   }
-}
+}