@robelest/convex-auth 0.0.4-preview.27 → 0.0.4-preview.28

package/dist/browser/index.js

@@ -1,11 +1,10 @@
 import { ClientAdapterFactoriesLive, ClientAdaptersLive } from "../client/services/adapters.js";
 import { ClientHttpLive } from "../client/services/http.js";
-import { ClientRuntimeLive } from "../client/services/runtime.js";
 import { resolveClientServices } from "../client/services/resolve.js";
+import { ClientRuntimeLive } from "../client/services/runtime.js";
 import { client as client$1 } from "../client/index.js";
 import { createBrowserRuntime } from "./runtime.js";
 import { createPasskeyClient } from "./passkey.js";
-import { Layer } from "effect";
 import { ConvexHttpClient } from "convex/browser";
 
 //#region src/browser/index.ts
@@ -42,11 +41,15 @@ import { ConvexHttpClient } from "convex/browser";
 */
 function client(options) {
 	const url = options.proxyPath === void 0 ? options.url ?? inferConvexUrl(options.convex) : void 0;
-	const runtime = mergeBrowserRuntime(options.runtime);
-	const services = resolveClientServices(Layer.mergeAll(ClientRuntimeLive(runtime), ClientAdaptersLive(options.adapters ?? {}), ClientAdapterFactoriesLive({
-		...options.adapterFactories,
-		passkey: options.adapterFactories?.passkey ?? ((deps) => createPasskeyClient(deps))
-	}), ClientHttpLive(options.proxyPath !== void 0 ? null : options.httpClient ?? (url ? new ConvexHttpClient(url) : null))));
+	const services = resolveClientServices({
+		runtime: ClientRuntimeLive(mergeBrowserRuntime(options.runtime)),
+		adapters: ClientAdaptersLive(options.adapters ?? {}),
+		adapterFactories: ClientAdapterFactoriesLive({
+			...options.adapterFactories,
+			passkey: options.adapterFactories?.passkey ?? ((deps) => createPasskeyClient(deps))
+		}),
+		http: ClientHttpLive(options.proxyPath !== void 0 ? null : options.httpClient ?? (url ? new ConvexHttpClient(url) : null))
+	});
 	return client$1({
 		...options,
 		storage: options.storage === void 0 && options.proxyPath !== void 0 ? null : options.storage,

package/dist/browser/locks.js

@@ -1,13 +1,11 @@
 import { localMutex } from "../client/runtime/mutex.js";
-import { Effect, Layer, ServiceMap } from "effect";
 
 //#region src/browser/locks.ts
-var BrowserLocks = class extends ServiceMap.Service()("BrowserLocks") {};
-const BrowserLocksLive = Layer.succeed(BrowserLocks)({ withKey: (key, callback) => Effect.promise(async () => {
+const BrowserLocksLive = { withKey: async (key, callback) => {
 	const lockManager = typeof navigator === "undefined" ? void 0 : navigator.locks;
 	return lockManager !== void 0 ? await lockManager.request(key, callback) : await localMutex(key, callback);
-}) });
+} };
 
 //#endregion
-export { BrowserLocks, BrowserLocksLive };
+export { BrowserLocksLive };
 //# sourceMappingURL=locks.js.map

package/dist/browser/navigation.js

@@ -1,17 +1,14 @@
-import { Effect, Layer, ServiceMap } from "effect";
-
 //#region src/browser/navigation.ts
-var BrowserNavigation = class extends ServiceMap.Service()("BrowserNavigation") {};
-const BrowserNavigationLive = Layer.succeed(BrowserNavigation)({
+const BrowserNavigationLive = {
 	get: () => typeof window === "undefined" ? null : new URL(window.location.href),
-	replace: (url) => Effect.sync(() => {
+	replace: (url) => {
 		if (typeof window !== "undefined") window.history.replaceState({}, "", url);
-	}),
-	redirect: (url) => Effect.sync(() => {
+	},
+	redirect: (url) => {
 		if (typeof window !== "undefined") window.location.href = url.toString();
-	})
-});
+	}
+};
 
 //#endregion
-export { BrowserNavigation, BrowserNavigationLive };
+export { BrowserNavigationLive };
 //# sourceMappingURL=navigation.js.map

package/dist/browser/runtime.js

@@ -1,27 +1,24 @@
-import { BrowserLocks, BrowserLocksLive } from "./locks.js";
-import { BrowserNavigation, BrowserNavigationLive } from "./navigation.js";
-import { Effect, Fiber, Stream } from "effect";
-import * as BrowserHttpClient from "@effect/platform-browser/BrowserHttpClient";
-import * as BrowserKeyValueStore from "@effect/platform-browser/BrowserKeyValueStore";
-import * as BrowserStream from "@effect/platform-browser/BrowserStream";
-import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore";
+import { BrowserLocksLive } from "./locks.js";
+import { BrowserNavigationLive } from "./navigation.js";
 
 //#region src/browser/runtime.ts
 const browserStorage = {
 	async getItem(key) {
-		return Effect.runPromise(Effect.gen(function* () {
-			return yield* (yield* KeyValueStore.KeyValueStore).get(key);
-		}).pipe(Effect.provide(BrowserKeyValueStore.layerLocalStorage)));
+		try {
+			return localStorage.getItem(key);
+		} catch {
+			return null;
+		}
 	},
 	async setItem(key, value) {
-		return Effect.runPromise(Effect.gen(function* () {
-			yield* (yield* KeyValueStore.KeyValueStore).set(key, value);
-		}).pipe(Effect.provide(BrowserKeyValueStore.layerLocalStorage)));
+		try {
+			localStorage.setItem(key, value);
+		} catch {}
 	},
 	async removeItem(key) {
-		return Effect.runPromise(Effect.gen(function* () {
-			yield* (yield* KeyValueStore.KeyValueStore).remove(key);
-		}).pipe(Effect.provide(BrowserKeyValueStore.layerLocalStorage)));
+		try {
+			localStorage.removeItem(key);
+		} catch {}
 	}
 };
 /** @internal */
@@ -51,33 +48,38 @@ function createBrowserRuntime() {
 		environment: typeof window === "undefined" ? "server" : "client",
 		storage: typeof window === "undefined" ? null : browserStorage,
 		location: {
-			get: () => Effect.runSync(BrowserNavigation.useSync((navigation) => navigation.get()).pipe(Effect.provide(BrowserNavigationLive))),
-			replace: (url) => Effect.runPromise(BrowserNavigation.use((navigation) => navigation.replace(url)).pipe(Effect.provide(BrowserNavigationLive))),
-			redirect: (url) => Effect.runPromise(BrowserNavigation.use((navigation) => navigation.redirect(url)).pipe(Effect.provide(BrowserNavigationLive)))
+			get: () => BrowserNavigationLive.get(),
+			replace: (url) => {
+				BrowserNavigationLive.replace(url);
+				return Promise.resolve();
+			},
+			redirect: (url) => {
+				BrowserNavigationLive.redirect(url);
+				return Promise.resolve();
+			}
 		},
-		mutex: { withKey: (key, callback) => Effect.runPromise(BrowserLocks.use((locks) => locks.withKey(key, callback)).pipe(Effect.provide(BrowserLocksLive))) },
+		mutex: { withKey: (key, callback) => BrowserLocksLive.withKey(key, callback) },
 		proxy: { fetch: async (body, proxyPath) => {
-			return Effect.runPromise(Effect.gen(function* () {
-				const fetch = yield* BrowserHttpClient.Fetch;
-				return yield* Effect.promise(() => fetch(new URL(proxyPath, window.location.origin), {
-					method: "POST",
-					headers: { "Content-Type": "application/json" },
-					credentials: "include",
-					body: JSON.stringify(body)
-				}));
-			}).pipe(Effect.provide(BrowserHttpClient.layerFetch)));
+			return fetch(new URL(proxyPath, window.location.origin), {
+				method: "POST",
+				headers: { "Content-Type": "application/json" },
+				credentials: "include",
+				body: JSON.stringify(body)
+			});
 		} },
 		sync: { subscribe: (key, callback) => {
 			if (typeof window === "undefined") return null;
 			const registry = getStorageListenerRegistry();
 			const existingSubscription = registry[key];
 			if (existingSubscription !== void 0) existingSubscription();
-			const fiber = Effect.runFork(BrowserStream.fromEventListenerWindow("storage").pipe(Stream.runForEach((event) => event.key !== key ? Effect.void : Effect.promise(async () => {
-				await callback(event.newValue ?? null);
-			}))));
+			const controller = new AbortController();
+			window.addEventListener("storage", (event) => {
+				if (event.key !== key) return;
+				callback(event.newValue ?? null);
+			}, { signal: controller.signal });
 			const unsubscribe = () => {
 				if (registry[key] === unsubscribe) delete registry[key];
-				Effect.runFork(Fiber.interrupt(fiber));
+				controller.abort();
 			};
 			registry[key] = unsubscribe;
 			return unsubscribe;

package/dist/client/core/types.js

@@ -0,0 +1,17 @@
+//#region src/client/core/types.ts
+function createDeferred() {
+	let resolve;
+	let reject;
+	return {
+		promise: new Promise((res, rej) => {
+			resolve = res;
+			reject = rej;
+		}),
+		resolve,
+		reject
+	};
+}
+
+//#endregion
+export { createDeferred };
+//# sourceMappingURL=types.js.map

package/dist/client/factors/device.js

@@ -1,5 +1,4 @@
 import { ConvexError } from "convex/values";
-import { Effect } from "effect";
 
 //#region src/client/factors/device.ts
 function isSignedInResult(result) {
@@ -8,8 +7,8 @@ function isSignedInResult(result) {
 /** @internal */
 function createDeviceClient(deps) {
 	const { proxy, convex, requireApiRefs, proxyFetch, setTokenAndMaybeWait } = deps;
-	const requestDeviceSignIn = (params) => Effect.tryPromise({
-		try: async () => proxy ? await proxyFetch({
+	const requestDeviceSignIn = async (params) => {
+		return proxy ? await proxyFetch({
 			action: "auth:signIn",
 			args: {
 				provider: "device",
@@ -18,9 +17,8 @@ function createDeviceClient(deps) {
 		}) : await convex.action(requireApiRefs().signIn, {
 			provider: "device",
 			params
-		}),
-		catch: (error) => error
-	});
+		});
+	};
 	return {
 		poll: async (opts) => {
 			const { code } = opts;
@@ -32,15 +30,20 @@ function createDeviceClient(deps) {
 					flow: "poll",
 					deviceCode: code.deviceCode
 				};
-				const pollResult = await Effect.runPromise(requestDeviceSignIn(params).pipe(Effect.catchIf((error) => error instanceof ConvexError, (error) => {
-					const code$1 = error.data?.code;
-					if (code$1 === "DEVICE_AUTHORIZATION_PENDING") return Effect.succeed(null);
-					if (code$1 === "DEVICE_SLOW_DOWN") return Effect.promise(async () => {
-						await new Promise((resolve) => setTimeout(resolve, intervalMs));
-						return null;
-					});
-					return Effect.fail(error);
-				})));
+				let pollResult;
+				try {
+					pollResult = await requestDeviceSignIn(params);
+				} catch (error) {
+					if (error instanceof ConvexError) {
+						const errorCode = error.data?.code;
+						if (errorCode === "DEVICE_AUTHORIZATION_PENDING") continue;
+						if (errorCode === "DEVICE_SLOW_DOWN") {
+							await new Promise((resolve) => setTimeout(resolve, intervalMs));
+							continue;
+						}
+					}
+					throw error;
+				}
 				if (pollResult === null) continue;
 				if (isSignedInResult(pollResult) && pollResult.tokens) {
 					if (proxy) await setTokenAndMaybeWait({
@@ -74,10 +77,14 @@ function createDeviceClient(deps) {
 				flow: "verify",
 				userCode: opts.code
 			};
-			await Effect.runPromise(requestDeviceSignIn(params).pipe(Effect.asVoid, Effect.mapError((error) => new ConvexError({
-				code: "DEVICE_AUTHORIZATION_FAILED",
-				message: error instanceof Error ? error.message : "Invalid or expired code."
-			}))));
+			try {
+				await requestDeviceSignIn(params);
+			} catch (error) {
+				throw new ConvexError({
+					code: "DEVICE_AUTHORIZATION_FAILED",
+					message: error instanceof Error ? error.message : "Invalid or expired code."
+				});
+			}
 		}
 	};
 }