@notificationapi/react 1.3.0 → 1.4.0

package/dist/components/Provider/index.js

@@ -1,26 +1,59 @@
-import { jsx as te } from "react/jsx-runtime";
-import { useMemo as B, useState as b, useCallback as N, useRef as R, useEffect as y, useContext as oe } from "react";
+import { jsx as oe } from "react/jsx-runtime";
+import { useMemo as z, useState as N, useCallback as A, useRef as F, useEffect as E, useContext as ie } from "react";
 import { NotificationAPIContext as V } from "./context.js";
-import { createDebugLogger as ie, formatApiCall as k } from "../../utils/debug.js";
-const ne = async (i, e, g, s, c, p, w) => {
-  const h = re(s, c, p), f = await fetch(
-    `https://${e}/${s}/users/${encodeURIComponent(
-      c
-    )}/${g}`,
-    {
-      method: i,
-      body: JSON.stringify(w),
-      headers: {
-        Authorization: `Basic ${h}`
-      }
-    }
-  );
+import { createDebugLogger as ne, formatApiCall as C } from "../../utils/debug.js";
+const re = async (o, e, u, a, c, h, I, l) => {
+  const p = se(a, c, h), b = `https://${e}/${a}/users/${encodeURIComponent(
+    c
+  )}/${u}`, w = {
+    Authorization: `Basic ${p}`
+  };
+  l && l.log("HTTP Request:", {
+    method: o,
+    host: e,
+    url: b,
+    body: I
+  });
+  const v = Date.now();
   try {
-    return await f.json();
-  } catch {
-    return;
+    const m = await fetch(b, {
+      method: o,
+      body: JSON.stringify(I),
+      headers: w
+    });
+    l && l.log("HTTP Response:", m);
+    try {
+      const P = await m.json();
+      return l && l.log("Response Data:", P), P;
+    } catch (P) {
+      l && l.warn("Failed to parse response as JSON:", P);
+      return;
+    }
+  } catch (m) {
+    const P = Date.now() - v;
+    throw l && l.error("HTTP Request Failed:", {
+      error: m,
+      url: b,
+      headers: w,
+      duration: `${P}ms`
+    }), m;
+  }
+}, se = (o, e, u) => btoa(u ? o + ":" + e + ":" + u : o + ":" + e);
+class B {
+  constructor(e = !1) {
+    this.debug = e;
+  }
+  log(...e) {
+    this.debug && console.log("[NotificationAPI js core SDK Debug]", ...e);
+  }
+  warn(...e) {
+    this.debug && console.warn("[NotificationAPI js core SDK Debug]", ...e);
   }
-}, re = (i, e, g) => btoa(g ? i + ":" + e + ":" + g : i + ":" + e), K = {
+  error(...e) {
+    this.debug && console.error("[NotificationAPI js core SDK Debug]", ...e);
+  }
+}
+const J = {
   host: "api.notificationapi.com",
   websocketHost: "ws.notificationapi.com",
   userId: "",
@@ -28,84 +61,114 @@ const ne = async (i, e, g, s, c, p, w) => {
   hashedUserId: "",
   getInAppDefaultCount: 100,
   getInAppDefaultOldest: new Date(
-    Date.now() - 2592e6
+    Date.now() - 30 * 24 * 60 * 60 * 1e3
   ).toISOString(),
   onNewInAppNotifications: void 0,
-  keepWebSocketAliveForSeconds: 86400
+  keepWebSocketAliveForSeconds: 24 * 60 * 60,
   // 24 hours
-}, a = {
-  config: K,
-  init: function(i) {
-    return this.config = { ...K, ...i }, {
+  debug: !1
+}, s = {
+  config: J,
+  logger: new B(!1),
+  init: function(o) {
+    return this.config = { ...J, ...o }, this.logger = new B(this.config.debug), this.logger.log("Initialized with config:", {
+      userId: this.config.userId,
+      clientId: this.config.clientId,
+      host: this.config.host,
+      websocketHost: this.config.websocketHost,
+      debug: this.config.debug,
+      hasHashedUserId: !!this.config.hashedUserId
+    }), {
       ...this
     };
   },
   rest: {
-    generic: function(i, e, g) {
-      return ne(
-        i,
-        a.config.host,
+    generic: function(o, e, u) {
+      return s.logger.log(
+        `API Call: ${o} ${e}`,
+        u ? { body: u } : ""
+      ), re(
+        o,
+        s.config.host,
         e,
-        a.config.clientId,
-        a.config.userId,
-        a.config.hashedUserId,
-        g
+        s.config.clientId,
+        s.config.userId,
+        s.config.hashedUserId,
+        u,
+        s.logger
       );
     },
     // The functions below are nice wrappers over the generic
     // rest  api function above. They must follow REST API naming:
     // Method + Resource, representing the end-point.
-    getNotifications: function(i, e) {
-      return a.rest.generic(
+    getNotifications: function(o, e) {
+      return s.rest.generic(
         "GET",
-        `notifications/INAPP_WEB?count=${e}&before=${i}`
+        `notifications/INAPP_WEB?count=${e}&before=${o}`
       );
     },
-    patchNotifications: function(i) {
-      return a.rest.generic(
+    patchNotifications: function(o) {
+      return s.rest.generic(
         "PATCH",
         "notifications/INAPP_WEB",
-        i
+        o
       );
     },
     getPreferences: function() {
-      return a.rest.generic("GET", "preferences");
+      return s.rest.generic("GET", "preferences");
     },
-    postPreferences: function(i) {
-      return a.rest.generic(
+    postPreferences: function(o) {
+      return s.rest.generic(
         "POST",
         "preferences",
-        i
+        o
       );
     },
-    postUser: function(i) {
-      return a.rest.generic("POST", "", i);
+    postUser: function(o) {
+      return s.rest.generic("POST", "", o);
     },
     getUserAccountMetadata: function() {
-      return a.rest.generic("GET", "account_metadata");
+      return s.rest.generic("GET", "account_metadata");
     }
   },
   websocket: {
     object: void 0,
     connect: function() {
-      let i = `wss://${a.config.websocketHost}?userId=${encodeURIComponent(a.config.userId)}&envId=${a.config.clientId}`;
-      return a.config.hashedUserId && (i += `&userIdHash=${encodeURIComponent(a.config.hashedUserId)}`), a.websocket.object = new WebSocket(i), a.websocket.object.onmessage = (e) => {
-        const g = JSON.parse(e.data);
-        if (!(!g || !g.route) && g.route === "inapp_web/new_notifications") {
-          const s = g;
-          a.config.onNewInAppNotifications && a.config.onNewInAppNotifications(
-            s.payload.notifications
+      let o = `wss://${s.config.websocketHost}?userId=${encodeURIComponent(s.config.userId)}&envId=${s.config.clientId}`;
+      return s.config.hashedUserId && (o += `&userIdHash=${encodeURIComponent(s.config.hashedUserId)}`), s.logger.log("WebSocket connecting to:", o), s.websocket.object = new WebSocket(o), s.websocket.object.onopen = () => {
+        s.logger.log("WebSocket connection opened");
+      }, s.websocket.object.onclose = (e) => {
+        s.logger.log("WebSocket connection closed:", {
+          code: e.code,
+          reason: e.reason,
+          wasClean: e.wasClean
+        });
+      }, s.websocket.object.onerror = (e) => {
+        s.logger.error("WebSocket error:", e);
+      }, s.websocket.object.onmessage = (e) => {
+        s.logger.log(
+          "WebSocket message received:",
+          e.data
+        );
+        const u = JSON.parse(e.data);
+        if (!(!u || !u.route) && u.route === "inapp_web/new_notifications") {
+          const a = u;
+          s.logger.log(
+            "New notifications received:",
+            a.payload.notifications
+          ), s.config.onNewInAppNotifications && s.config.onNewInAppNotifications(
+            a.payload.notifications
           );
         }
-      }, a.websocket.object;
+      }, s.websocket.object;
     },
-    disconnect: function(i) {
+    disconnect: function(o) {
       var e;
-      a.websocket.object && ((e = a.websocket.object) == null || e.close(), i && i(a.websocket.object));
+      s.websocket.object && (s.logger.log("WebSocket disconnecting"), (e = s.websocket.object) == null || e.close(), o && o(s.websocket.object));
     }
   },
   openWebSocket: function() {
-    return a.websocket.connect(() => {
+    return s.websocket.connect(() => {
       setTimeout(
         () => {
           this.websocket.disconnect(() => {
@@ -119,55 +182,83 @@ const ne = async (i, e, g, s, c, p, w) => {
   // These functions are developer friendly wrappers over the rest APIs
   // They may or may not do additional tasks.
   // e.g. identify simply maps to postUsers
-  getInAppNotifications: async (i) => {
-    const e = i.maxCountNeeded || a.config.getInAppDefaultCount, g = i.oldestNeeded || a.config.getInAppDefaultOldest;
-    let s = [], c = i.before, p = !0, w = !0;
-    for (; w; ) {
-      const h = (await a.rest.getNotifications(
+  getInAppNotifications: async (o) => {
+    s.logger.log(
+      "getInAppNotifications called with params:",
+      o
+    );
+    const e = o.maxCountNeeded || s.config.getInAppDefaultCount, u = o.oldestNeeded || s.config.getInAppDefaultOldest;
+    s.logger.log("Fetching notifications with:", {
+      maxCountNeeded: e,
+      oldestNeeded: u,
+      before: o.before
+    });
+    let a = [], c = o.before, h = !0, I = !0;
+    for (; I; ) {
+      const l = (await s.rest.getNotifications(
         c,
         e
-      )).notifications.filter(
-        (f) => !s.find((I) => I.id === f.id)
+      )).notifications, p = l.filter(
+        (b) => !a.find((w) => w.id === b.id)
       );
-      c = h.reduce(
-        (f, I) => f < I.date ? f : I.date,
-        i.before
-      ), s = [...s, ...h], p = h.length > 0, w = !0, (!p || s.length >= e || c < g) && (w = !1);
+      s.logger.log(
+        `Received ${l.length} notifications, ${p.length} unique`
+      ), c = p.reduce(
+        (b, w) => b < w.date ? b : w.date,
+        o.before
+      ), a = [...a, ...p], h = p.length > 0, I = !0, (!h || a.length >= e || c < u) && (I = !1, s.logger.log("Stopping fetch loop:", {
+        hasMore: h,
+        totalResults: a.length,
+        maxCountNeeded: e,
+        oldestReceived: c,
+        oldestNeeded: u
+      }));
     }
-    return {
-      items: s,
-      hasMore: p,
+    return s.logger.log("getInAppNotifications completed:", {
+      totalItems: a.length,
+      hasMore: h,
+      oldestReceived: c
+    }), {
+      items: a,
+      hasMore: h,
       oldestReceived: c
     };
   },
-  updateInAppNotifications: async (i) => {
+  updateInAppNotifications: async (o) => {
+    s.logger.log(
+      "updateInAppNotifications called with params:",
+      o
+    );
     const e = {
-      trackingIds: i.ids
+      trackingIds: o.ids
     };
-    return i.archived === !0 ? e.archived = (/* @__PURE__ */ new Date()).toISOString() : i.archived === !1 && (e.archived = null), i.clicked === !0 ? e.clicked = (/* @__PURE__ */ new Date()).toISOString() : i.clicked === !1 && (e.clicked = null), i.opened === !0 ? e.opened = (/* @__PURE__ */ new Date()).toISOString() : i.opened === !1 && (e.opened = null), a.rest.patchNotifications(e);
+    return o.archived === !0 ? e.archived = (/* @__PURE__ */ new Date()).toISOString() : o.archived === !1 && (e.archived = null), o.clicked === !0 ? e.clicked = (/* @__PURE__ */ new Date()).toISOString() : o.clicked === !1 && (e.clicked = null), o.opened === !0 ? e.opened = (/* @__PURE__ */ new Date()).toISOString() : o.opened === !1 && (e.opened = null), s.logger.log(
+      "Updating notifications with body:",
+      e
+    ), s.rest.patchNotifications(e);
   },
-  getPreferences: async () => a.rest.getPreferences(),
-  updateDeliveryOption: async (i) => a.rest.postPreferences([i]),
-  identify: async (i) => {
-    if (i.id && i.id !== a.config.userId)
+  getPreferences: async () => s.rest.getPreferences(),
+  updateDeliveryOption: async (o) => s.rest.postPreferences([o]),
+  identify: async (o) => {
+    if (o.id && o.id !== s.config.userId)
       throw new Error(
         "The id in the parameters does not match the initialized userId."
       );
-    return a.rest.postUser(i);
+    return s.rest.postUser(o);
   },
-  getUserAccountMetadata: async () => a.rest.getUserAccountMetadata()
-}, G = typeof window < "u", se = (i) => {
-  const e = B(
-    () => ie(i.debug || !1),
-    [i.debug]
+  getUserAccountMetadata: async () => s.rest.getUserAccountMetadata()
+}, G = typeof window < "u", ae = (o) => {
+  const e = z(
+    () => ne(o.debug || !1),
+    [o.debug]
   );
   e.log("NotificationAPI Provider initializing", {
-    clientId: i.clientId,
-    userId: "userId" in i ? i.userId : i.user.id,
-    debug: i.debug || !1,
+    clientId: o.clientId,
+    userId: "userId" in o ? o.userId : o.user.id,
+    debug: o.debug || !1,
     timestamp: (/* @__PURE__ */ new Date()).toISOString()
   });
-  const s = {
+  const a = {
     ...{
       apiURL: "api.notificationapi.com",
       wsURL: "ws.notificationapi.com",
@@ -178,44 +269,44 @@ const ne = async (i, e, g, s, c, p, w) => {
       webPushOptInMessage: "AUTOMATIC",
       customServiceWorkerPath: "/notificationapi-service-worker.js"
     },
-    ...i,
-    user: "userId" in i ? { id: i.userId } : i.user
+    ...o,
+    user: "userId" in o ? { id: o.userId } : o.user
   };
-  e.log("Configuration loaded", s);
-  const [c, p] = b(), [w, h] = b(), [f, I] = b(), [E, C] = b(!1), [O, F] = b((/* @__PURE__ */ new Date()).toISOString()), [M, x] = b(!0), [P, m] = b(s.webPushOptInMessage), [S, J] = b(!1), q = N(() => {
-    s.playSoundOnNewNotification && (e.log("Playing notification sound", {
-      soundPath: s.newNotificationSoundPath
-    }), new Audio(s.newNotificationSoundPath).play().catch((n) => {
+  e.log("Configuration loaded", a);
+  const [c, h] = N(), [I, l] = N(), [p, b] = N(), [w, v] = N(!1), [m, P] = N((/* @__PURE__ */ new Date()).toISOString()), [D, x] = N(!0), [k, y] = N(a.webPushOptInMessage), [M, Q] = N(!1), $ = A(() => {
+    a.playSoundOnNewNotification && (e.log("Playing notification sound", {
+      soundPath: a.newNotificationSoundPath
+    }), new Audio(a.newNotificationSoundPath).play().catch((n) => {
       e.error("Failed to play new notification sound", n), console.log("Failed to play new notification sound:", n);
     }));
   }, [
-    s.newNotificationSoundPath,
-    s.playSoundOnNewNotification,
+    a.newNotificationSoundPath,
+    a.playSoundOnNewNotification,
     e
-  ]), A = N(
+  ]), O = A(
     (t) => {
       e.group("Adding notifications to state"), e.log("Received notifications", {
         count: (t == null ? void 0 : t.length) || 0,
         notifications: t
       });
       const n = (/* @__PURE__ */ new Date()).toISOString();
-      p((o) => {
-        const r = (o == null ? void 0 : o.length) || 0;
-        e.log("Current notifications count", r), t = Array.isArray(t) ? t : [], t = t.filter((u) => {
-          const v = u.expDate && new Date(u.expDate).toISOString() > n, T = new Date(u.date).getTime() > new Date(n).getTime() + 1e3, z = !v && !T;
-          return z || e.log("Filtering out notification", {
-            id: u.id,
-            reason: v ? "expired" : "future",
-            expDate: u.expDate,
-            date: u.date
-          }), z;
-        }), o = Array.isArray(o) ? o : [];
+      h((i) => {
+        const r = (i == null ? void 0 : i.length) || 0;
+        e.log("Current notifications count", r), t = Array.isArray(t) ? t : [], t = t.filter((g) => {
+          const S = g.expDate && new Date(g.expDate).toISOString() > n, L = new Date(g.date).getTime() > new Date(n).getTime() + 1e3, K = !S && !L;
+          return K || e.log("Filtering out notification", {
+            id: g.id,
+            reason: S ? "expired" : "future",
+            expDate: g.expDate,
+            date: g.date
+          }), K;
+        }), i = Array.isArray(i) ? i : [];
         const d = [
-          ...t.filter((u) => {
-            const v = o.find((T) => T.id === u.id);
-            return v && e.log("Filtering out duplicate notification", { id: u.id }), !v;
+          ...t.filter((g) => {
+            const S = i.find((L) => L.id === g.id);
+            return S && e.log("Filtering out duplicate notification", { id: g.id }), !S;
           }),
-          ...o
+          ...i
         ];
         return e.log("State updated", {
           previousCount: r,
@@ -225,121 +316,123 @@ const ne = async (i, e, g, s, c, p, w) => {
       });
     },
     [e]
-  ), l = B(() => {
+  ), f = z(() => {
     e.group("Initializing NotificationAPI client");
     const t = {
-      clientId: s.clientId,
-      userId: s.user.id,
-      hashedUserId: s.hashedUserId,
-      host: s.apiURL,
-      websocketHost: s.wsURL
+      clientId: a.clientId,
+      userId: a.user.id,
+      hashedUserId: a.hashedUserId,
+      host: a.apiURL,
+      websocketHost: a.wsURL,
+      debug: a.debug
     };
     e.log("Client configuration", t);
-    const n = i.client ? i.client : a.init({
+    const n = o.client ? o.client : s.init({
       ...t,
       onNewInAppNotifications: (r) => {
         e.log("Received new in-app notifications via WebSocket", {
           count: (r == null ? void 0 : r.length) || 0,
           notifications: r
-        }), q(), A(r);
+        }), $(), O(r);
       }
-    }), o = {
-      email: s.user.email,
-      number: s.user.number
+    }), i = {
+      email: a.user.email,
+      number: a.user.number
     };
-    return e.log("Identifying user", o), n.identify(o), e.groupEnd(), n;
+    return e.log("Identifying user", i), n.identify(i), e.groupEnd(), n;
   }, [
-    s.clientId,
-    s.user.id,
-    s.user.email,
-    s.user.number,
-    s.hashedUserId,
-    A,
-    q,
-    i.client,
-    s.apiURL,
-    s.wsURL,
+    a.clientId,
+    a.user.id,
+    a.user.email,
+    a.user.number,
+    a.hashedUserId,
+    a.debug,
+    O,
+    $,
+    o.client,
+    a.apiURL,
+    a.wsURL,
     e
-  ]), $ = N(
+  ]), j = A(
     async (t, n) => {
-      var o;
+      var i;
       e.group("Fetching notifications"), e.log(
         "Fetch parameters",
-        k("GET", "/notifications", { date: t, count: n })
+        C("GET", "/notifications", { date: t, count: n })
       );
       try {
-        const r = await l.rest.getNotifications(t, n);
+        const r = await f.rest.getNotifications(t, n);
         e.log("Fetch successful", {
-          notificationsCount: ((o = r.notifications) == null ? void 0 : o.length) || 0,
+          notificationsCount: ((i = r.notifications) == null ? void 0 : i.length) || 0,
           oldestReceived: r.oldestReceived,
           couldLoadMore: r.couldLoadMore
-        }), F(r.oldestReceived), x(r.couldLoadMore), A(r.notifications), e.groupEnd();
+        }), P(r.oldestReceived), x(r.couldLoadMore), O(r.notifications), e.groupEnd();
       } catch (r) {
         throw e.error("Failed to fetch notifications", r, { date: t, count: n }), e.groupEnd(), r;
       }
     },
-    [A, l.rest, e]
-  ), U = R(M), D = R(E), j = R(O);
-  y(() => {
-    U.current = M, D.current = E, j.current = O;
-  }, [M, E, O]);
-  const L = N(
+    [O, f.rest, e]
+  ), U = F(D), W = F(w), q = F(m);
+  E(() => {
+    U.current = D, W.current = w, q.current = m;
+  }, [D, w, m]);
+  const T = A(
     async (t) => {
       if (e.group(`Loading notifications (${t ? "initial" : "more"})`), e.log("Load conditions", {
         initial: t,
         hasMore: U.current,
-        loading: D.current
-      }), !t && (!U.current || D.current)) {
+        loading: W.current
+      }), !t && (!U.current || W.current)) {
         e.log("Skipping load - conditions not met"), e.groupEnd();
         return;
       }
-      C(!0), e.log("Loading started");
+      v(!0), e.log("Loading started");
       try {
-        await $(
-          t ? (/* @__PURE__ */ new Date()).toISOString() : j.current,
-          t ? s.initialLoadMaxCount : 1e3
+        await j(
+          t ? (/* @__PURE__ */ new Date()).toISOString() : q.current,
+          t ? a.initialLoadMaxCount : 1e3
         ), e.log("Loading completed successfully");
       } catch (n) {
         throw e.error("Loading failed", n), n;
       } finally {
-        C(!1), e.groupEnd();
+        v(!1), e.groupEnd();
       }
     },
-    [s.initialLoadMaxCount, $, e]
-  ), Q = async (t) => {
+    [a.initialLoadMaxCount, j, e]
+  ), X = async (t) => {
     if (e.group("Marking notifications as clicked"), e.log("Requested IDs", t), !c) {
       e.warn("No notifications available"), e.groupEnd();
       return;
     }
-    const n = (/* @__PURE__ */ new Date()).toISOString(), o = c.filter((r) => t.includes(r.id) && !r.clicked).map((r) => r.id);
+    const n = (/* @__PURE__ */ new Date()).toISOString(), i = c.filter((r) => t.includes(r.id) && !r.clicked).map((r) => r.id);
     if (e.log("Filtered IDs for update", {
       requestedCount: t.length,
-      actualCount: o.length,
-      ids: o
-    }), o.length === 0) {
+      actualCount: i.length,
+      ids: i
+    }), i.length === 0) {
       e.log("No notifications to update"), e.groupEnd();
       return;
     }
     try {
       e.log(
         "Updating notifications via API",
-        k("PUT", "/notifications/clicked", { ids: o })
-      ), l.updateInAppNotifications({ ids: o, clicked: !0 }), p((r) => {
+        C("PUT", "/notifications/clicked", { ids: i })
+      ), f.updateInAppNotifications({ ids: i, clicked: !0 }), h((r) => {
         if (!r) return [];
         const d = [...r];
-        return d.filter((u) => o.includes(u.id)).forEach((u) => {
-          u.clicked = n;
-        }), e.log("Local state updated", { updatedCount: o.length }), d;
+        return d.filter((g) => i.includes(g.id)).forEach((g) => {
+          g.clicked = n;
+        }), e.log("Local state updated", { updatedCount: i.length }), d;
       }), e.groupEnd();
     } catch (r) {
-      throw e.error("Failed to mark notifications as clicked", r, { ids: o }), e.groupEnd(), r;
+      throw e.error("Failed to mark notifications as clicked", r, { ids: i }), e.groupEnd(), r;
     }
-  }, X = async () => {
+  }, Y = async () => {
     if (e.group("Marking notifications as opened"), !c) {
       e.warn("No notifications available"), e.groupEnd();
       return;
     }
-    const t = (/* @__PURE__ */ new Date()).toISOString(), n = c.filter((o) => !o.opened || !o.seen).map((o) => o.id);
+    const t = (/* @__PURE__ */ new Date()).toISOString(), n = c.filter((i) => !i.opened || !i.seen).map((i) => i.id);
     if (e.log("Notifications to mark as opened", { count: n.length, ids: n }), n.length === 0) {
       e.log("All notifications already opened"), e.groupEnd();
       return;
@@ -347,26 +440,26 @@ const ne = async (i, e, g, s, c, p, w) => {
     try {
       e.log(
         "Updating notifications via API",
-        k("PUT", "/notifications/opened", { ids: n })
-      ), l.updateInAppNotifications({
+        C("PUT", "/notifications/opened", { ids: n })
+      ), f.updateInAppNotifications({
         ids: n,
         opened: !0
-      }), p((o) => {
-        if (!o) return [];
-        const r = [...o];
+      }), h((i) => {
+        if (!i) return [];
+        const r = [...i];
         return r.filter((d) => n.includes(d.id)).forEach((d) => {
           d.opened = t, d.seen = !0;
         }), e.log("Local state updated", { updatedCount: n.length }), r;
       }), e.groupEnd();
-    } catch (o) {
-      throw e.error("Failed to mark notifications as opened", o, { ids: n }), e.groupEnd(), o;
+    } catch (i) {
+      throw e.error("Failed to mark notifications as opened", i, { ids: n }), e.groupEnd(), i;
     }
-  }, Y = async (t) => {
+  }, Z = async (t) => {
     if (e.group("Marking notifications as unarchived"), e.log("Requested operation", { ids: t }), !c) {
       e.warn("No notifications available"), e.groupEnd();
       return;
     }
-    const n = c.filter((o) => o.archived && (t === "ALL" || t.includes(o.id))).map((o) => o.id);
+    const n = c.filter((i) => i.archived && (t === "ALL" || t.includes(i.id))).map((i) => i.id);
     if (e.log("Filtered notifications for unarchiving", {
       count: n.length,
       ids: n
@@ -377,72 +470,72 @@ const ne = async (i, e, g, s, c, p, w) => {
     try {
       e.log(
         "Updating notifications via API",
-        k("PUT", "/notifications/unarchived", { ids: n })
-      ), l.updateInAppNotifications({
+        C("PUT", "/notifications/unarchived", { ids: n })
+      ), f.updateInAppNotifications({
         ids: n,
         archived: !1
-      }), p((o) => {
-        if (!o) return [];
-        const r = [...o];
+      }), h((i) => {
+        if (!i) return [];
+        const r = [...i];
         return r.filter((d) => n.includes(d.id)).forEach((d) => {
           d.archived = void 0;
         }), e.log("Local state updated", { unarchivedCount: n.length }), r;
       }), e.groupEnd();
-    } catch (o) {
-      throw e.error("Failed to unarchive notifications", o, { ids: n }), e.groupEnd(), o;
+    } catch (i) {
+      throw e.error("Failed to unarchive notifications", i, { ids: n }), e.groupEnd(), i;
     }
-  }, Z = async (t) => {
+  }, _ = async (t) => {
     if (e.group("Marking notifications as archived"), e.log("Requested operation", { ids: t }), !c) {
       e.warn("No notifications available"), e.groupEnd();
       return;
     }
-    const n = (/* @__PURE__ */ new Date()).toISOString(), o = c.filter((r) => !r.archived && (t === "ALL" || t.includes(r.id))).map((r) => r.id);
+    const n = (/* @__PURE__ */ new Date()).toISOString(), i = c.filter((r) => !r.archived && (t === "ALL" || t.includes(r.id))).map((r) => r.id);
     if (e.log("Filtered notifications for archiving", {
-      count: o.length,
-      ids: o
-    }), o.length === 0) {
+      count: i.length,
+      ids: i
+    }), i.length === 0) {
       e.log("No unarchived notifications to archive"), e.groupEnd();
       return;
     }
     try {
       e.log(
         "Updating notifications via API",
-        k("PUT", "/notifications/archived", { ids: o })
-      ), l.updateInAppNotifications({ ids: o, archived: !0 }), p((r) => {
+        C("PUT", "/notifications/archived", { ids: i })
+      ), f.updateInAppNotifications({ ids: i, archived: !0 }), h((r) => {
         if (!r) return [];
         const d = [...r];
-        return d.filter((u) => o.includes(u.id)).forEach((u) => {
-          u.archived = n;
-        }), e.log("Local state updated", { archivedCount: o.length }), d;
+        return d.filter((g) => i.includes(g.id)).forEach((g) => {
+          g.archived = n;
+        }), e.log("Local state updated", { archivedCount: i.length }), d;
       }), e.groupEnd();
     } catch (r) {
-      throw e.error("Failed to archive notifications", r, { ids: o }), e.groupEnd(), r;
+      throw e.error("Failed to archive notifications", r, { ids: i }), e.groupEnd(), r;
     }
-  }, _ = (t, n, o, r) => (e.log("Updating single delivery preference", {
+  }, ee = (t, n, i, r) => (e.log("Updating single delivery preference", {
     notificationId: t,
     channel: n,
-    delivery: o,
+    delivery: i,
     subNotificationId: r
   }), H([
     {
       notificationId: t,
       channel: n,
-      delivery: o,
+      delivery: i,
       subNotificationId: r
     }
   ])), H = (t) => {
     e.group("Updating delivery preferences"), e.log("Preference updates", { count: t.length, params: t });
     try {
-      l.rest.postPreferences(t).then(() => {
+      f.rest.postPreferences(t).then(() => {
         e.log(
           "Preferences updated successfully, fetching latest preferences"
-        ), l.getPreferences().then((n) => {
-          var o, r, d;
+        ), f.getPreferences().then((n) => {
+          var i, r, d;
           e.log("Latest preferences fetched", {
-            preferencesCount: ((o = n.preferences) == null ? void 0 : o.length) || 0,
+            preferencesCount: ((i = n.preferences) == null ? void 0 : i.length) || 0,
             notificationsCount: ((r = n.notifications) == null ? void 0 : r.length) || 0,
             subNotificationsCount: ((d = n.subNotifications) == null ? void 0 : d.length) || 0
-          }), h(n), e.groupEnd();
+          }), l(n), e.groupEnd();
         }).catch((n) => {
           e.error("Failed to fetch updated preferences", n), e.groupEnd();
         });
@@ -452,28 +545,28 @@ const ne = async (i, e, g, s, c, p, w) => {
     } catch (n) {
       throw e.error("Error in updateDeliveries", n, { params: t }), e.groupEnd(), n;
     }
-  }, W = N(() => {
+  }, R = A(() => {
     e.group("Requesting web push permission"), e.log("Service worker support check", {
       supported: "serviceWorker" in navigator,
-      customServiceWorkerPath: s.customServiceWorkerPath
-    }), "serviceWorker" in navigator ? (e.log("Registering service worker"), navigator.serviceWorker.register(s.customServiceWorkerPath).then(async (t) => {
-      e.log("Service worker registered successfully"), m(!1), ce().then(async (n) => {
+      customServiceWorkerPath: a.customServiceWorkerPath
+    }), "serviceWorker" in navigator ? (e.log("Registering service worker"), navigator.serviceWorker.register(a.customServiceWorkerPath).then(async (t) => {
+      e.log("Service worker registered successfully"), y(!1), de().then(async (n) => {
         e.log("Notification permission result", { permission: n }), n === "granted" ? (e.log("Permission granted, subscribing to push manager"), await t.pushManager.subscribe({
           userVisibleOnly: !0,
-          applicationServerKey: f == null ? void 0 : f.userAccountMetadata.environmentVapidPublicKey
-        }).then(async (o) => {
+          applicationServerKey: p == null ? void 0 : p.userAccountMetadata.environmentVapidPublicKey
+        }).then(async (i) => {
           e.log("Push subscription successful");
           const r = {
             webPushTokens: [
               {
                 sub: {
-                  endpoint: o.toJSON().endpoint,
-                  keys: o.toJSON().keys
+                  endpoint: i.toJSON().endpoint,
+                  keys: i.toJSON().keys
                 }
               }
             ]
           };
-          e.log("Identifying user with web push tokens"), await l.identify(r), localStorage.setItem("hideWebPushOptInMessage", "true"), e.log("Web push setup completed successfully"), e.groupEnd();
+          e.log("Identifying user with web push tokens"), await f.identify(r), localStorage.setItem("hideWebPushOptInMessage", "true"), e.log("Web push setup completed successfully"), e.groupEnd();
         })) : n === "denied" && (e.warn("Permission for notifications was denied"), console.log("Permission for notifications was denied"), e.groupEnd());
       });
     }).catch((t) => {
@@ -482,7 +575,7 @@ const ne = async (i, e, g, s, c, p, w) => {
         t,
         {
           errorCode: t.code,
-          customServiceWorkerPath: s.customServiceWorkerPath
+          customServiceWorkerPath: a.customServiceWorkerPath
         }
       ), t.code === 18 ? console.error(
         "NotificationAPI guide: Probably you are not setup the service worker correctly. Please check the documentation at https://docs.notificationapi.com/guides/web-push#step-by-step-implementation Step 3: Service Worker Setup."
@@ -497,92 +590,92 @@ const ne = async (i, e, g, s, c, p, w) => {
       ) : console.error(t), e.groupEnd();
     })) : (e.warn("Service worker not supported in this browser"), e.groupEnd());
   }, [
-    l,
-    s.customServiceWorkerPath,
-    f == null ? void 0 : f.userAccountMetadata.environmentVapidPublicKey,
+    f,
+    a.customServiceWorkerPath,
+    p == null ? void 0 : p.userAccountMetadata.environmentVapidPublicKey,
     e
   ]);
-  y(() => {
-    e.group("Provider initialization effect"), e.log("Resetting state and loading initial data"), p([]), C(!1), h(void 0), F((/* @__PURE__ */ new Date()).toISOString()), x(!0), L(!0), e.log("Opening WebSocket connection"), l.openWebSocket(), e.log("Fetching user preferences"), l.getPreferences().then((t) => {
-      var n, o, r;
+  E(() => {
+    e.group("Provider initialization effect"), e.log("Resetting state and loading initial data"), h([]), v(!1), l(void 0), P((/* @__PURE__ */ new Date()).toISOString()), x(!0), T(!0), e.log("Opening WebSocket connection"), f.openWebSocket(), e.log("Fetching user preferences"), f.getPreferences().then((t) => {
+      var n, i, r;
       e.log("Initial preferences loaded", {
         preferencesCount: ((n = t.preferences) == null ? void 0 : n.length) || 0,
-        notificationsCount: ((o = t.notifications) == null ? void 0 : o.length) || 0,
+        notificationsCount: ((i = t.notifications) == null ? void 0 : i.length) || 0,
         subNotificationsCount: ((r = t.subNotifications) == null ? void 0 : r.length) || 0
-      }), h(t), e.groupEnd();
+      }), l(t), e.groupEnd();
     }).catch((t) => {
       e.error("Failed to fetch initial preferences", t), e.groupEnd();
     });
-  }, [l, L, W, e]), y(() => {
-    e.group("Fetching user account metadata"), l.getUserAccountMetadata().then((t) => {
+  }, [f, T, R, e]), E(() => {
+    e.group("Fetching user account metadata"), f.getUserAccountMetadata().then((t) => {
       e.log("User account metadata loaded", {
         hasWebPushEnabled: t.userAccountMetadata.hasWebPushEnabled,
         environmentVapidPublicKey: t.userAccountMetadata.environmentVapidPublicKey ? "present" : "missing"
-      }), I(t), G && "Notification" in window && typeof Notification.requestPermission == "function" ? (e.log("Browser notification support detected", {
+      }), b(t), G && "Notification" in window && typeof Notification.requestPermission == "function" ? (e.log("Browser notification support detected", {
         permission: Notification.permission
       }), Notification.permission !== "default" && (e.log(
         "Setting webPushOptInMessage to false (permission already set)"
-      ), m(!1))) : (e.log(
+      ), y(!1))) : (e.log(
         "Browser notification not supported, using server setting",
         {
           hasWebPushEnabled: t.userAccountMetadata.hasWebPushEnabled
         }
-      ), m(t.userAccountMetadata.hasWebPushEnabled)), e.groupEnd();
+      ), y(t.userAccountMetadata.hasWebPushEnabled)), e.groupEnd();
     }).catch((t) => {
       e.error("Failed to fetch user account metadata", t), e.groupEnd();
     });
-  }, [l, e]), y(() => {
-    if (e.group("Handling webPushOptInMessage state"), e.log("webPushOptInMessage value", P), P === "AUTOMATIC") {
+  }, [f, e]), E(() => {
+    if (e.group("Handling webPushOptInMessage state"), e.log("webPushOptInMessage value", k), k === "AUTOMATIC") {
       const t = localStorage.getItem("hideWebPushOptInMessage") === "true";
       e.log("Automatic mode - checking localStorage", {
         hideMessage: t,
         shouldShow: !t
-      }), m(!t);
+      }), y(!t);
     }
     e.groupEnd();
-  }, [P, e]), y(() => {
-    e.group("Handling webPushOptIn state"), e.log("webPushOptIn state", S), S && (e.log("User opted in for web push, requesting permission"), W()), e.groupEnd();
-  }, [S, W, e]);
-  const ee = {
+  }, [k, e]), E(() => {
+    e.group("Handling webPushOptIn state"), e.log("webPushOptIn state", M), M && (e.log("User opted in for web push, requesting permission"), R()), e.groupEnd();
+  }, [M, R, e]);
+  const te = {
     notifications: c,
-    preferences: w,
-    userAccountMetaData: f,
-    webPushOptInMessage: P,
-    loadNotifications: L,
-    markAsOpened: X,
-    markAsArchived: Z,
-    markAsUnarchived: Y,
-    markAsClicked: Q,
-    updateDelivery: _,
+    preferences: I,
+    userAccountMetaData: p,
+    webPushOptInMessage: k,
+    loadNotifications: T,
+    markAsOpened: Y,
+    markAsArchived: _,
+    markAsUnarchived: Z,
+    markAsClicked: X,
+    updateDelivery: ee,
     updateDeliveries: H,
-    getClient: () => l,
-    setWebPushOptInMessage: m,
-    setWebPushOptIn: J
+    getClient: () => f,
+    setWebPushOptInMessage: y,
+    setWebPushOptIn: Q
   };
   return e.log("NotificationAPI Provider rendering", {
     notificationsCount: (c == null ? void 0 : c.length) || 0,
-    hasPreferences: !!w,
-    hasUserAccountMetaData: !!f,
-    webPushOptInMessage: P,
-    webPushOptIn: S
-  }), /* @__PURE__ */ te(V.Provider, { value: ee, children: i.children });
-}, ae = () => {
-  const i = oe(V);
-  if (!i)
+    hasPreferences: !!I,
+    hasUserAccountMetaData: !!p,
+    webPushOptInMessage: k,
+    webPushOptIn: M
+  }), /* @__PURE__ */ oe(V.Provider, { value: te, children: o.children });
+}, ce = () => {
+  const o = ie(V);
+  if (!o)
     throw new Error("useMyContext must be used within a MyProvider");
-  return i;
+  return o;
 };
-se.useNotificationAPIContext = ae;
-const ce = async () => {
+ae.useNotificationAPIContext = ce;
+const de = async () => {
   if (G && "Notification" in window && typeof Notification.requestPermission == "function")
     try {
       return await Notification.requestPermission();
-    } catch (i) {
-      return console.error("Error requesting notification permission:", i), "default";
+    } catch (o) {
+      return console.error("Error requesting notification permission:", o), "default";
     }
   else
     return console.warn("Web Push Notifications are not supported in this browser."), "default";
 };
 export {
-  se as NotificationAPIProvider
+  ae as NotificationAPIProvider
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notificationapi/react",
   "private": false,
-  "version": "1.3.0",
+  "version": "1.4.0",
   "type": "module",
   "overrides": {
     "esbuild": "^0.25.0",
@@ -51,7 +51,7 @@
     "@playwright/test": "^1.48.0",
     "prettier": "^3.3.3",
     "typescript": "^5.2.2",
-    "vite": "^5.4.18",
+    "vite": "^5.4.19",
     "vite-plugin-dts": "^3.9.1",
     "vite-plugin-lib-inject-css": "^2.1.1"
   },
@@ -67,7 +67,7 @@
     "@fontsource/roboto": "^5.1.1",
     "@mui/icons-material": "^6.3.1",
     "@mui/material": "^6.3.1",
-    "@notificationapi/core": "^0.0.16",
+    "@notificationapi/core": "^0.0.17",
     "javascript-time-ago": "^2.5.10",
     "liquidjs": "^10.14.0",
     "rc-virtual-list": "^3.11.5",