edmaxlabs-core 1.2.3 → 1.3.4

package/dist/index.mjs

@@ -79,112 +79,18 @@ var HttpsRequest = class {
   }
 };
 
-// src/utils/waiter.ts
-var listeners = /* @__PURE__ */ new Map();
-var waiters = /* @__PURE__ */ new Map();
-function emitValue(key, value) {
-  const keyListeners = listeners.get(key) || [];
-  keyListeners.forEach((listener) => listener(value));
-  const keyWaiters = waiters.get(key) || [];
-  keyWaiters.forEach((resolve) => resolve(value));
-  waiters.delete(key);
-}
-function onValue(key, callback) {
-  const current = listeners.get(key) || [];
-  current.push(callback);
-  listeners.set(key, current);
-  return () => {
-    const next = (listeners.get(key) || []).filter((cb) => cb !== callback);
-    listeners.set(key, next);
-  };
-}
-
 // src/authentication/Authentication.ts
-var Authentication = class {
+var _Authentication = class _Authentication {
   constructor() {
-    this.init = () => {
-      const _currentUser = this.currentUser();
-      if (!_currentUser)
-        return void 0;
-      this.eUser = _currentUser;
-      return this.eUser;
-    };
-    this.saveCredentials = (credentials) => {
-      const ldb = localStorage;
-      if (!credentials) {
-        ldb.removeItem("eauth");
-        return;
-      }
-      ldb.setItem("eauth", JSON.stringify(credentials));
-      emitValue("credentials", credentials);
-    };
-    this.currentUser = () => {
-      const ldb = localStorage;
-      const data = ldb.getItem("eauth");
-      if (data === void 0 || data === null) {
-        return void 0;
-      }
-      const result = JSON.parse(data ?? "{}");
-      return Credentials.fromMap(result);
-    };
-    this.authState = ({
-      onChange,
-      onSignOut,
-      onDeleted
-    }) => {
-      let userDocUnsubscribe;
-      const attachUserListener = (creds) => {
-        if (userDocUnsubscribe) {
-          userDocUnsubscribe();
-          userDocUnsubscribe = void 0;
-        }
-        if (!creds) {
-          this.eUser = void 0;
-          onSignOut?.();
-          return;
-        }
-        const userRef = this.app?.database.collection("users").doc(creds.uid);
-        if (!userRef)
-          return;
-        userDocUnsubscribe = userRef.onSnapshot(
-          (snapshot, change) => {
-            if (change === "insert" || change === "update") {
-              if (snapshot.data.logged === "false" || snapshot.data.logged === false) {
-                this.eUser = void 0;
-                this.saveCredentials(null);
-                onSignOut?.();
-                return;
-              }
-              const result = Credentials.fromMap(snapshot.toMap());
-              this.eUser = result;
-              this.saveCredentials(result);
-              onChange(result);
-            }
-            if (change === "delete") {
-              this.eUser = void 0;
-              this.saveCredentials(null);
-              onSignOut?.();
-              onDeleted?.();
-            }
-          }
-        );
-      };
-      const current = this.currentUser();
-      if (current) {
-        this.eUser = current;
-        onChange(current);
-        attachUserListener(current);
-      }
-      const unsubscribeCredentials = onValue(
-        "credentials",
-        (creds) => {
-          attachUserListener(creds);
-        }
-      );
-      return () => {
-        unsubscribeCredentials?.();
-        userDocUnsubscribe?.();
-      };
+    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.createUserWithEmailAndPassword = async ({
       email,
@@ -236,13 +142,12 @@ var Authentication = class {
         throw new Error("User Not Found.");
       }
       const _data = data[0];
-      console.log("Signing ...");
-      this.eUser = Credentials.fromMap(_data);
-      this.saveCredentials(this.eUser);
       await db?.collection("users").doc(data[0].id).update({
         logged: true,
         lastLogged: Date.now()
       });
+      this.eUser = Credentials.fromMap(_data);
+      this.saveCredentials(this.eUser);
       return Credentials.fromMap(data[0].toMap());
     };
     this.deleteUser = async () => {
@@ -283,16 +188,127 @@ var Authentication = class {
       }).sendRequest();
       return res;
     };
+    if (_Authentication.instance)
+      return _Authentication.instance;
     this.client = EdmaxLabs.instance;
     this.app = new EdmaxLabs({
-      token: this.client.getAuth.authToken,
-      authToken: this.client.getAuth.authToken,
+      token: "auth",
       project: this.client.getAuth.project
     });
-    this.init();
+    _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;
+  }
+  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);
+  }
+  onValue(key, callback) {
+    const listeners = this.eventListeners.get(key) || [];
+    listeners.push(callback);
+    this.eventListeners.set(key, listeners);
+    return () => {
+      const filtered = listeners.filter((cb) => cb !== callback);
+      this.eventListeners.set(key, filtered);
+    };
+  }
+  currentUser() {
+    const data = localStorage.getItem("eauth");
+    if (!data)
+      return null;
+    try {
+      return Credentials.fromMap(JSON.parse(data));
+    } catch {
+      localStorage.removeItem("eauth");
+      return null;
+    }
+  }
+  saveCredentials(credentials) {
+    if (!credentials) {
+      localStorage.removeItem("eauth");
+      this.eUser = null;
+      this.emitValue("creds", null);
+      return;
+    }
+    localStorage.setItem("eauth", JSON.stringify(credentials.toMap()));
+    this.eUser = credentials;
+    this.emitValue("creds", credentials);
+  }
+  // Main auth state listener - should be called ONCE at app root
+  authState({
+    onChange,
+    onSignOut,
+    onDeleted
+  }) {
+    let userDocUnsubscribe;
+    const handleCredsChange = (creds) => {
+      if (userDocUnsubscribe) {
+        userDocUnsubscribe();
+        userDocUnsubscribe = void 0;
+      }
+      if (!creds) {
+        this.eUser = null;
+        onSignOut?.();
+        return;
+      }
+      const userRef = this.app?.database.collection("users").doc(creds.uid);
+      if (!userRef)
+        return;
+      userDocUnsubscribe = userRef.onSnapshot(
+        (snapshot, change) => {
+          if (change === "delete") {
+            this.saveCredentials(null);
+            onSignOut?.();
+            onDeleted?.();
+            return;
+          }
+          if (change === "insert" || change === "update") {
+            if (snapshot.data.logged === false || snapshot.data.logged === "false") {
+              this.saveCredentials(null);
+              onSignOut?.();
+              return;
+            }
+            const newCreds = Credentials.fromMap(snapshot.toMap());
+            if (!this.isSameCredentials(this.eUser, newCreds)) {
+              this.eUser = newCreds;
+              this.saveCredentials(newCreds);
+              onChange(newCreds);
+            }
+          }
+        }
+      );
+    };
+    const initialUser = this.currentUser();
+    if (initialUser) {
+      this.eUser = initialUser;
+      onChange(initialUser);
+    }
+    handleCredsChange(initialUser);
+    const credsUnsub = this.onValue("creds", handleCredsChange);
+    return () => {
+      credsUnsub();
+      userDocUnsubscribe?.();
+    };
   }
 };
-Authentication.instance = null;
+_Authentication.instance = null;
+var Authentication = _Authentication;
 
 // src/database/Timestamp.ts
 var Timestamp = class _Timestamp {
@@ -1572,11 +1588,11 @@ var socketURI = "https://api.edmaxlabs.com";
 
 // src/core/EdmaxLabs.ts
 var _EdmaxLabs = class _EdmaxLabs {
-  constructor({ token, authToken, project }) {
+  constructor({ token, project }) {
     this.persistence = false;
     this.baseUrl = serverURI;
     this.socketUrl = socketURI;
-    this.auth = { token, authToken, project };
+    this.auth = { token, project };
     this._db = new Database(this);
     this._hosting = new Hosting(this);
     this.realtime = new Realtime(this);
@@ -1640,6 +1656,7 @@ var EdmaxLabs = _EdmaxLabs;
 var src_default = EdmaxLabs;
 export {
   ArraySnapshot,
+  Authentication,
   Credentials,
   DocumentSnapshot,
   StorageSnapshot,