edmaxlabs-core 2.4.9 → 2.5.0

package/dist/index.d.cts

@@ -53,23 +53,25 @@ declare class Credentials {
     toMap(): Record<string, any>;
 }
 
-type Listener<T = any> = (value: T) => void;
 declare class Authentication {
     static instance: Authentication | null;
-    private eUser?;
-    private client?;
-    private app?;
+    private eUser;
+    private client;
+    private app;
     private eventListeners;
-    private eventWaiters;
-    private unsubscribers;
+    private isHandlingChange;
     constructor();
-    private isSameCredentials;
-    private restoreSession;
     static getInstance(): Authentication;
-    emitValue<T>(key: string, value: T): void;
-    onValue<T>(key: string, callback: Listener<T>): () => void;
+    private emitValue;
+    private onValue;
     currentUser(): Credentials | null;
     private saveCredentials;
+    private isSameCredentials;
+    private restoreSession;
+    /**
+     * Main method to listen to authentication state changes.
+     * This listener stays alive for the entire app lifetime.
+     */
     authState({ onChange, onSignOut, onDeleted, }: {
         onChange: (user: Credentials) => void;
         onSignOut?: () => void;
@@ -83,8 +85,8 @@ declare class Authentication {
         email: string;
         password: string;
     }) => Promise<Credentials | null>;
-    deleteUser: () => Promise<void>;
     signOut: () => Promise<void>;
+    deleteUser: () => Promise<void>;
     rules: (path: string, context: Record<string, any>) => Promise<{
         success: boolean;
         allowed: any;

package/dist/index.d.ts

@@ -53,23 +53,25 @@ declare class Credentials {
     toMap(): Record<string, any>;
 }
 
-type Listener<T = any> = (value: T) => void;
 declare class Authentication {
     static instance: Authentication | null;
-    private eUser?;
-    private client?;
-    private app?;
+    private eUser;
+    private client;
+    private app;
     private eventListeners;
-    private eventWaiters;
-    private unsubscribers;
+    private isHandlingChange;
     constructor();
-    private isSameCredentials;
-    private restoreSession;
     static getInstance(): Authentication;
-    emitValue<T>(key: string, value: T): void;
-    onValue<T>(key: string, callback: Listener<T>): () => void;
+    private emitValue;
+    private onValue;
     currentUser(): Credentials | null;
     private saveCredentials;
+    private isSameCredentials;
+    private restoreSession;
+    /**
+     * Main method to listen to authentication state changes.
+     * This listener stays alive for the entire app lifetime.
+     */
     authState({ onChange, onSignOut, onDeleted, }: {
         onChange: (user: Credentials) => void;
         onSignOut?: () => void;
@@ -83,8 +85,8 @@ declare class Authentication {
         email: string;
         password: string;
     }) => Promise<Credentials | null>;
-    deleteUser: () => Promise<void>;
     signOut: () => Promise<void>;
+    deleteUser: () => Promise<void>;
     rules: (path: string, context: Record<string, any>) => Promise<{
         success: boolean;
         allowed: any;

package/dist/index.mjs

@@ -97,116 +97,91 @@ var HttpsRequest = class {
 
 // src/authentication/Authentication.ts
 var _Authentication = class _Authentication {
+  // Re-entrancy guard
   constructor() {
+    this.eUser = null;
+    this.client = null;
+    this.app = null;
+    // Dedicated lightweight instance for auth
     this.eventListeners = /* @__PURE__ */ new Map();
-    this.eventWaiters = /* @__PURE__ */ new Map();
-    this.unsubscribers = /* @__PURE__ */ new Set();
-    this.isSameCredentials = (a, b) => {
-      if (!a && !b)
-        return true;
-      if (!a || !b)
-        return false;
-      return JSON.stringify(a.toMap()) === JSON.stringify(b.toMap());
-    };
+    this.isHandlingChange = false;
+    // ====================== AUTH METHODS ======================
     this.createUserWithEmailAndPassword = async ({
       email,
       password
     }) => {
-      this.eUser = void 0;
       this.saveCredentials(null);
-      const app = this.app?.getDatabase;
-      const data = await app?.collection("users").query.where({
-        key: "email",
-        op: "===",
-        value: email
-      }).get();
-      if (data.length > 0) {
+      const app = this.app.getDatabase;
+      const existing = await app.collection("users").query.where({ key: "email", op: "===", value: email }).get();
+      if (existing.length > 0) {
         throw new Error("Email Already In Use.");
       }
-      const userRef = await app?.collection("users").add({
+      const userRef = await app.collection("users").add({
         email,
         password,
-        token: this.client?.getConfig().token,
+        token: this.client.getConfig().token,
         logged: true,
         lastLogged: Date.now()
       });
-      if (!userRef?.id || userRef?.id === "") {
-        throw new Error("Something went wrong try Again.");
+      if (!userRef?.id) {
+        throw new Error("Something went wrong. Please try again.");
       }
-      this.eUser = Credentials.fromMap(userRef);
-      this.saveCredentials(this.eUser);
-      return Credentials.fromMap(userRef.toMap());
+      const newCreds = Credentials.fromMap(userRef.toMap());
+      this.saveCredentials(newCreds);
+      return newCreds;
     };
     this.signInWithEmailAndPassword = async ({
       email,
       password
     }) => {
-      const app = this.app?.getDatabase;
-      const data = await app?.collection("users").query.where({
-        key: "email",
-        op: "===",
-        value: email
-      }).where({
-        key: "password",
-        op: "===",
-        value: password
-      }).get();
-      if (data === void 0) {
-        throw new Error("Auth Failed.");
-      }
-      if (data?.length === 0) {
+      const app = this.app.getDatabase;
+      const data = await app.collection("users").query.where({ key: "email", op: "===", value: email }).where({ key: "password", op: "===", value: password }).get();
+      if (!data || data.length === 0) {
         throw new Error("User Not Found.");
       }
-      const _data = data[0];
-      await app?.collection("users").doc(data[0].id).update({
+      const userDoc = data[0];
+      await app.collection("users").doc(userDoc.id).update({
         logged: true,
         lastLogged: Date.now()
       });
-      this.eUser = Credentials.fromMap(_data);
-      this.saveCredentials(this.eUser);
-      return Credentials.fromMap(data[0].toMap());
+      const signedInUser = Credentials.fromMap(userDoc.toMap());
+      this.saveCredentials(signedInUser);
+      return signedInUser;
     };
-    this.deleteUser = async () => {
-      if (!this.eUser) {
-        throw new Error("No User Signed in");
-      }
-      const app = this.app?.getDatabase;
-      const userRef = await app?.collection("users").doc(this.eUser.uid).delete();
-      if (userRef) {
-        throw new Error("Something went wrong try Again.");
-      }
-      this.eUser = void 0;
+    this.signOut = async () => {
+      const current = this.currentUser();
+      if (!current)
+        return;
+      const app = this.app.getDatabase;
+      await app.collection("users").doc(current.uid).update({
+        logged: false,
+        lastLogged: Date.now()
+      });
       this.saveCredentials(null);
     };
-    this.signOut = async () => {
-      const app = this.app?.getDatabase;
-      const luid = this.currentUser();
-      this.eUser = void 0;
+    this.deleteUser = async () => {
+      if (!this.eUser)
+        throw new Error("No User Signed in");
+      const app = this.app.getDatabase;
+      await app.collection("users").doc(this.eUser.uid).delete();
       this.saveCredentials(null);
-      if (luid)
-        await app?.collection("users").doc(luid?.uid).update({
-          logged: false,
-          lastLogged: Date.now()
-        });
-      return;
     };
+    // Optional: Rules verification
     this.rules = async (path, context) => {
       const res = await new HttpsRequest({
         method: "POST" /* POST */,
-        endpoint: this.client.getBaseUrl() + "/auth/rules/verify",
+        endpoint: `${this.client.getBaseUrl()}/auth/rules/verify`,
         headers: {
           authorization: this.client.getConfig().token,
           project: this.client.getConfig().project
         },
-        body: {
-          path,
-          context
-        }
+        body: { path, context }
       }).sendRequest();
       return res;
     };
-    if (_Authentication.instance)
+    if (_Authentication.instance) {
       return _Authentication.instance;
+    }
     this.client = EdmaxLabs.instance;
     this.app = new EdmaxLabs({
       token: "auth",
@@ -215,26 +190,16 @@ var _Authentication = class _Authentication {
     _Authentication.instance = this;
     this.restoreSession();
   }
-  restoreSession() {
-    const saved = this.currentUser();
-    if (saved) {
-      this.eUser = saved;
-      this.emitValue("creds", saved);
-    }
-  }
-  // Better singleton
   static getInstance() {
     if (!_Authentication.instance) {
       _Authentication.instance = new _Authentication();
     }
     return _Authentication.instance;
   }
+  // ====================== EVENT SYSTEM ======================
   emitValue(key, value) {
     const listeners = this.eventListeners.get(key) || [];
-    listeners.forEach((l) => l(value));
-    const waiters = this.eventWaiters.get(key) || [];
-    waiters.forEach((resolve) => resolve(value));
-    this.eventWaiters.delete(key);
+    [...listeners].forEach((listener) => listener(value));
   }
   onValue(key, callback) {
     const listeners = this.eventListeners.get(key) || [];
@@ -245,6 +210,7 @@ var _Authentication = class _Authentication {
       this.eventListeners.set(key, filtered);
     };
   }
+  // ====================== CREDENTIALS ======================
   currentUser() {
     const data = localStorage.getItem("eauth");
     if (!data)
@@ -267,49 +233,71 @@ var _Authentication = class _Authentication {
     this.eUser = credentials;
     this.emitValue("creds", credentials);
   }
-  // Main auth state listener - should be called ONCE at app root
+  isSameCredentials(a, b) {
+    if (!a && !b)
+      return true;
+    if (!a || !b)
+      return false;
+    return a.uid === b.uid && a.displayInfo.email === b.displayInfo.email && a.lastLogged === b.lastLogged;
+  }
+  restoreSession() {
+    const saved = this.currentUser();
+    if (saved) {
+      this.eUser = saved;
+    }
+  }
+  // ====================== MAIN AUTH STATE LISTENER ======================
+  /**
+   * Main method to listen to authentication state changes.
+   * This listener stays alive for the entire app lifetime.
+   */
   authState({
     onChange,
     onSignOut,
     onDeleted
   }) {
     let userDocUnsubscribe;
+    let credsUnsub;
     const handleCredsChange = (creds) => {
-      if (userDocUnsubscribe) {
-        userDocUnsubscribe();
-        userDocUnsubscribe = void 0;
-      }
+      if (this.isHandlingChange)
+        return;
+      this.isHandlingChange = true;
+      userDocUnsubscribe?.();
+      userDocUnsubscribe = void 0;
       if (!creds) {
         this.eUser = null;
         onSignOut?.();
+        this.isHandlingChange = false;
         return;
       }
-      const userRef = this.app?.getDatabase.collection("users").doc(creds.uid);
-      if (!userRef)
-        return;
+      const userRef = this.app.getDatabase.collection("users").doc(creds.uid);
       userDocUnsubscribe = userRef.onSnapshot(
         (snapshot, change) => {
           if (change === "delete") {
             this.saveCredentials(null);
             onSignOut?.();
             onDeleted?.();
+            this.isHandlingChange = false;
             return;
           }
           if (change === "insert" || change === "update") {
-            if (!snapshot)
+            if (!snapshot?.data) {
+              this.isHandlingChange = false;
               return;
+            }
             if (snapshot.data.logged === false || snapshot.data.logged === "false") {
               this.saveCredentials(null);
               onSignOut?.();
+              this.isHandlingChange = false;
               return;
             }
             const newCreds = Credentials.fromMap(snapshot.toMap());
             if (!this.isSameCredentials(this.eUser, newCreds)) {
-              this.eUser = newCreds;
               this.saveCredentials(newCreds);
               onChange(newCreds);
             }
           }
+          this.isHandlingChange = false;
         }
       );
     };
@@ -318,10 +306,10 @@ var _Authentication = class _Authentication {
       this.eUser = initialUser;
       onChange(initialUser);
     }
+    credsUnsub = this.onValue("creds", handleCredsChange);
     handleCredsChange(initialUser);
-    const credsUnsub = this.onValue("creds", handleCredsChange);
     return () => {
-      credsUnsub();
+      credsUnsub?.();
       userDocUnsubscribe?.();
     };
   }