better-convex 0.8.0 → 0.8.1

package/dist/plugins/ratelimit/index.js

@@ -511,8 +511,7 @@ var Ratelimit = class Ratelimit {
 		while (Date.now() <= deadline) {
 			latest = await this.limit(identifier);
 			if (latest.success) return latest;
-			const waitMs = Math.max(1, Math.min(latest.reset, deadline) - Date.now());
-			await new Promise((resolve) => setTimeout(resolve, waitMs));
+			await sleep(Math.max(1, Math.min(latest.reset, deadline) - Date.now()));
 		}
 		return latest;
 	}
@@ -707,22 +706,14 @@ var Ratelimit = class Ratelimit {
 	}
 	async runWithTimeout(operation) {
 		if (this.timeout <= 0) return operation();
-		let timeoutHandle;
-		const timeoutResult = this.timeoutResponse(this.failureMode === "open");
-		let timerUnavailable = false;
-		const timeoutPromise = new Promise((resolve) => {
-			try {
-				timeoutHandle = setTimeout(() => resolve(timeoutResult), this.timeout);
-			} catch {
-				timerUnavailable = true;
-				resolve(timeoutResult);
-			}
-		});
-		if (timerUnavailable) return operation();
+		const startedAt = Date.now();
 		try {
-			return await Promise.race([operation(), timeoutPromise]);
-		} finally {
-			if (timeoutHandle !== void 0) clearTimeout(timeoutHandle);
+			const result = await operation();
+			if (Date.now() - startedAt > this.timeout) return this.timeoutResponse(this.failureMode === "open");
+			return result;
+		} catch (error) {
+			if (Date.now() - startedAt > this.timeout) return this.timeoutResponse(this.failureMode === "open");
+			throw error;
 		}
 	}
 	timeoutResponse(success) {
@@ -767,6 +758,21 @@ function pickSampleShards(total, sample) {
 	}
 	return selected.length > 0 ? selected : [0];
 }
+async function sleep(ms) {
+	try {
+		await new Promise((resolve) => {
+			setTimeout(resolve, ms);
+		});
+	} catch (error) {
+		if (isTimerUnsupportedError(error)) throw new Error("blockUntilReady is not supported in Convex queries/mutations. Use an action or non-Convex runtime.");
+		throw error;
+	}
+}
+function isTimerUnsupportedError(error) {
+	if (!(error instanceof Error)) return false;
+	const message = error.message.toLowerCase();
+	return message.includes("can't use settimeout in queries and mutations") || message.includes("settimeout");
+}
 async function resolveIdentifier(identifierOption, ctx, fromClient) {
 	if (!identifierOption) {
 		if (!fromClient) throw new Error("hookAPI requires identifier in options or request args");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-convex",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Better Convex - React Query integration and CLI tools for Convex",
   "keywords": [
     "convex",