defuss-runtime 1.2.0 → 1.3.1

package/dist/index.cjs

@@ -270,42 +270,76 @@ 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 () => {
+    (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 = null;
+  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");
+    }
+    return ref.current;
+  }, timeout);
 }
 
 const asString = (value) => {

package/dist/index.d.cts

@@ -571,4 +571,5 @@ declare const isNull: ValidatorPrimitiveFn;
 type PreloadAs = "image" | "script" | "style" | "fetch" | "track" | "font";
 declare function preload(url: string | string[], as?: PreloadAs): void;
 
-export { type DateValue, type Dynamic, PATH_ACCESSOR_SYMBOL, type PathAccessor, type PreloadAs, type SingleValidationResult, type ValidationFnResult, type ValidationMessage, type ValidationStep, type ValidatorFn, type ValidatorPrimitiveFn, _BASE64_CHARS, _HEX_PREFIX, _base64LookupMap, _getBase64LookupMap, access, asArray, asBoolean, asDate, asInteger, asNumber, asString, base64ToBinary, binaryToBase64, binaryToHex, binaryToText, createTimeoutPromise, debounce, ensureKey, equalsJSON, getAllKeysFromPath, getByPath, getDateValue, hasDateFormat, hasPattern, hexToBinary, is, isAfter, isArray, isBefore, isBoolean, isDate, isDefined, isEmail, isEmpty, isEqual, isFalse, isFalsy, isGreaterThan, isInstanceOf, isInteger, isLessThan, isLongerThan, isNull, isObject, isOneOf, isPathAccessor, isPhoneNumber, isRequired, isSafeNumber, isSafeNumeric, isShorterThan, isSlug, isString, isTrue, isTruthy, isTypeOf, isUrl, isUrlPath, omit, pick, preload, setByPath, textToBinary, throttle, unique, wait, waitForRef, waitForWithPolling };
+export { PATH_ACCESSOR_SYMBOL, _BASE64_CHARS, _HEX_PREFIX, _base64LookupMap, _getBase64LookupMap, access, asArray, asBoolean, asDate, asInteger, asNumber, asString, base64ToBinary, binaryToBase64, binaryToHex, binaryToText, createTimeoutPromise, debounce, ensureKey, equalsJSON, getAllKeysFromPath, getByPath, getDateValue, hasDateFormat, hasPattern, hexToBinary, is, isAfter, isArray, isBefore, isBoolean, isDate, isDefined, isEmail, isEmpty, isEqual, isFalse, isFalsy, isGreaterThan, isInstanceOf, isInteger, isLessThan, isLongerThan, isNull, isObject, isOneOf, isPathAccessor, isPhoneNumber, isRequired, isSafeNumber, isSafeNumeric, isShorterThan, isSlug, isString, isTrue, isTruthy, isTypeOf, isUrl, isUrlPath, omit, pick, preload, setByPath, textToBinary, throttle, unique, wait, waitForRef, waitForWithPolling };
+export type { DateValue, Dynamic, PathAccessor, PreloadAs, SingleValidationResult, ValidationFnResult, ValidationMessage, ValidationStep, ValidatorFn, ValidatorPrimitiveFn };

package/dist/index.d.mts

@@ -571,4 +571,5 @@ declare const isNull: ValidatorPrimitiveFn;
 type PreloadAs = "image" | "script" | "style" | "fetch" | "track" | "font";
 declare function preload(url: string | string[], as?: PreloadAs): void;
 
-export { type DateValue, type Dynamic, PATH_ACCESSOR_SYMBOL, type PathAccessor, type PreloadAs, type SingleValidationResult, type ValidationFnResult, type ValidationMessage, type ValidationStep, type ValidatorFn, type ValidatorPrimitiveFn, _BASE64_CHARS, _HEX_PREFIX, _base64LookupMap, _getBase64LookupMap, access, asArray, asBoolean, asDate, asInteger, asNumber, asString, base64ToBinary, binaryToBase64, binaryToHex, binaryToText, createTimeoutPromise, debounce, ensureKey, equalsJSON, getAllKeysFromPath, getByPath, getDateValue, hasDateFormat, hasPattern, hexToBinary, is, isAfter, isArray, isBefore, isBoolean, isDate, isDefined, isEmail, isEmpty, isEqual, isFalse, isFalsy, isGreaterThan, isInstanceOf, isInteger, isLessThan, isLongerThan, isNull, isObject, isOneOf, isPathAccessor, isPhoneNumber, isRequired, isSafeNumber, isSafeNumeric, isShorterThan, isSlug, isString, isTrue, isTruthy, isTypeOf, isUrl, isUrlPath, omit, pick, preload, setByPath, textToBinary, throttle, unique, wait, waitForRef, waitForWithPolling };
+export { PATH_ACCESSOR_SYMBOL, _BASE64_CHARS, _HEX_PREFIX, _base64LookupMap, _getBase64LookupMap, access, asArray, asBoolean, asDate, asInteger, asNumber, asString, base64ToBinary, binaryToBase64, binaryToHex, binaryToText, createTimeoutPromise, debounce, ensureKey, equalsJSON, getAllKeysFromPath, getByPath, getDateValue, hasDateFormat, hasPattern, hexToBinary, is, isAfter, isArray, isBefore, isBoolean, isDate, isDefined, isEmail, isEmpty, isEqual, isFalse, isFalsy, isGreaterThan, isInstanceOf, isInteger, isLessThan, isLongerThan, isNull, isObject, isOneOf, isPathAccessor, isPhoneNumber, isRequired, isSafeNumber, isSafeNumeric, isShorterThan, isSlug, isString, isTrue, isTruthy, isTypeOf, isUrl, isUrlPath, omit, pick, preload, setByPath, textToBinary, throttle, unique, wait, waitForRef, waitForWithPolling };
+export type { DateValue, Dynamic, PathAccessor, PreloadAs, SingleValidationResult, ValidationFnResult, ValidationMessage, ValidationStep, ValidatorFn, ValidatorPrimitiveFn };

package/dist/index.mjs

@@ -268,42 +268,76 @@ 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 () => {
+    (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 = null;
+  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");
+    }
+    return ref.current;
+  }, timeout);
 }
 
 const asString = (value) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defuss-runtime",
-  "version": "1.2.0",
+  "version": "1.3.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": {
@@ -44,17 +51,10 @@
     "node": "^18.17.1 || ^20.3.0 || >=21.0.0"
   },
   "devDependencies": {
-    "pkgroll": "^2.5.1",
-    "tsx": "^4.19.2",
-    "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"
+    "@vitest/coverage-v8": "^4.0.17",
+    "pkgroll": "^2.21.5",
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.17"
   }
 }