@notificationapi/react 0.0.29 → 0.0.31

package/dist/components/Provider/index.js

@@ -1,10 +1,10 @@
 import { jsx as B } from "react/jsx-runtime";
-import { createContext as z, useState as N, useCallback as A, useMemo as F, useRef as y, useEffect as U, useContext as G } from "react";
-const J = async (e, s, c, a, f, w, p) => {
+import { createContext as z, useState as N, useCallback as m, useMemo as F, useRef as k, useEffect as U, useContext as G } from "react";
+const J = async (e, s, i, a, f, w, p) => {
   const h = _(a, f, w), l = await fetch(
     `https://${s}/${a}/users/${encodeURIComponent(
       f
-    )}/${c}`,
+    )}/${i}`,
     {
       method: e,
       body: JSON.stringify(p),
@@ -18,7 +18,7 @@ const J = async (e, s, c, a, f, w, p) => {
   } catch {
     return;
   }
-}, _ = (e, s, c) => btoa(c ? e + ":" + s + ":" + c : e + ":" + s), M = {
+}, _ = (e, s, i) => btoa(i ? e + ":" + s + ":" + i : e + ":" + s), M = {
   host: "api.notificationapi.com",
   websocketHost: "ws.notificationapi.com",
   userId: "",
@@ -39,7 +39,7 @@ const J = async (e, s, c, a, f, w, p) => {
     };
   },
   rest: {
-    generic: function(e, s, c) {
+    generic: function(e, s, i) {
       return J(
         e,
         n.config.host,
@@ -47,7 +47,7 @@ const J = async (e, s, c, a, f, w, p) => {
         n.config.clientId,
         n.config.userId,
         n.config.hashedUserId,
-        c
+        i
       );
     },
     // The functions below are nice wrappers over the generic
@@ -85,9 +85,9 @@ const J = async (e, s, c, a, f, w, p) => {
     connect: function() {
       let e = `wss://${n.config.websocketHost}?userId=${encodeURIComponent(n.config.userId)}&envId=${n.config.clientId}`;
       return n.config.hashedUserId && (e += `&userIdHash=${encodeURIComponent(n.config.hashedUserId)}`), n.websocket.object = new WebSocket(e), n.websocket.object.onmessage = (s) => {
-        const c = JSON.parse(s.data);
-        if (!(!c || !c.route) && c.route === "inapp_web/new_notifications") {
-          const a = c;
+        const i = JSON.parse(s.data);
+        if (!(!i || !i.route) && i.route === "inapp_web/new_notifications") {
+          const a = i;
           n.config.onNewInAppNotifications && n.config.onNewInAppNotifications(
             a.payload.notifications
           );
@@ -115,7 +115,7 @@ const J = async (e, s, c, a, f, w, p) => {
   // They may or may not do additional tasks.
   // e.g. identify simply maps to postUsers
   getInAppNotifications: async (e) => {
-    const s = e.maxCountNeeded || n.config.getInAppDefaultCount, c = e.oldestNeeded || n.config.getInAppDefaultOldest;
+    const s = e.maxCountNeeded || n.config.getInAppDefaultCount, i = e.oldestNeeded || n.config.getInAppDefaultOldest;
     let a = [], f = e.before, w = !0, p = !0;
     for (; p; ) {
       const h = (await n.rest.getNotifications(
@@ -127,7 +127,7 @@ const J = async (e, s, c, a, f, w, p) => {
       f = h.reduce(
         (l, g) => l < g.date ? l : g.date,
         e.before
-      ), a = [...a, ...h], w = h.length > 0, p = !0, (!w || a.length >= s || f < c) && (p = !1);
+      ), a = [...a, ...h], w = h.length > 0, p = !0, (!w || a.length >= s || f < i) && (p = !1);
     }
     return {
       items: a,
@@ -153,7 +153,7 @@ const J = async (e, s, c, a, f, w, p) => {
 }, E = z(
   void 0
 ), q = (e) => {
-  const c = {
+  const i = {
     ...{
       apiURL: "https://api.notificationapi.com",
       wsURL: "wss://ws.notificationapi.com",
@@ -164,65 +164,70 @@ const J = async (e, s, c, a, f, w, p) => {
     },
     ...e,
     user: "userId" in e ? { id: e.userId } : e.user
-  }, [a, f] = N(), [w, p] = N(), [h, l] = N(!1), [g, m] = N((/* @__PURE__ */ new Date()).toISOString()), [b, P] = N(!0), D = A(() => {
-    c.playSoundOnNewNotification && new Audio(c.newNotificationSoundPath).play().catch((r) => {
+  }, [a, f] = N(), [w, p] = N(), [h, l] = N(!1), [g, y] = N((/* @__PURE__ */ new Date()).toISOString()), [b, P] = N(!0), D = m(() => {
+    i.playSoundOnNewNotification && new Audio(i.newNotificationSoundPath).play().catch((r) => {
       console.log("Failed to play new notification sound:", r);
     });
-  }, [c.newNotificationSoundPath, c.playSoundOnNewNotification]), S = A((i) => {
+  }, [i.newNotificationSoundPath, i.playSoundOnNewNotification]), S = m((o) => {
     const r = (/* @__PURE__ */ new Date()).toISOString();
-    f((t) => (i = i.filter((o) => !(o.expDate && new Date(o.expDate * 1e3).toISOString() > r || o.date > r)), t ? [
-      ...i.filter((o) => !t.find((d) => d.id === o.id)),
+    f((t) => (o = o.filter((c) => !(c.expDate && new Date(c.expDate * 1e3).toISOString() > r || c.date > r)), t ? [
+      ...o.filter((c) => !t.find((d) => d.id === c.id)),
       ...t
-    ] : i));
+    ] : o));
   }, []), u = F(() => {
-    const i = n.init({
-      clientId: c.clientId,
-      userId: c.user.id,
-      hashedUserId: c.hashedUserId,
+    const o = n.init({
+      clientId: i.clientId,
+      userId: i.user.id,
+      hashedUserId: i.hashedUserId,
       onNewInAppNotifications: (r) => {
         D(), S(r);
       }
     });
-    return i.identify(c.user), i;
+    return o.identify({
+      email: i.user.email,
+      number: i.user.number
+    }), o;
   }, [
-    c.clientId,
-    c.user,
-    c.hashedUserId,
+    i.clientId,
+    i.user.id,
+    i.user.email,
+    i.user.number,
+    i.hashedUserId,
     S,
     D
-  ]), O = A(
-    async (i, r) => {
-      const t = await u.rest.getNotifications(i, r);
-      m(t.oldestReceived), P(t.couldLoadMore), S(t.notifications);
+  ]), O = m(
+    async (o, r) => {
+      const t = await u.rest.getNotifications(o, r);
+      y(t.oldestReceived), P(t.couldLoadMore), S(t.notifications);
     },
     [S, u.rest]
-  ), v = y(b), C = y(h), x = y(g);
+  ), v = k(b), C = k(h), x = k(g);
   U(() => {
     v.current = b, C.current = h, x.current = g;
   }, [b, h, g]);
-  const k = A(
-    async (i) => {
-      if (!(!i && (!v.current || C.current))) {
+  const A = m(
+    async (o) => {
+      if (!(!o && (!v.current || C.current))) {
         l(!0);
         try {
           await O(
-            i ? (/* @__PURE__ */ new Date()).toISOString() : x.current,
-            i ? c.initialLoadMaxCount : 1e3
+            o ? (/* @__PURE__ */ new Date()).toISOString() : x.current,
+            o ? i.initialLoadMaxCount : 1e3
           );
         } finally {
           l(!1);
         }
       }
     },
-    [c.initialLoadMaxCount, O]
-  ), R = async (i) => {
+    [i.initialLoadMaxCount, O]
+  ), R = async (o) => {
     if (!a)
       return;
-    const r = (/* @__PURE__ */ new Date()).toISOString(), t = a.filter((o) => i.includes(o.id) && !o.clicked).map((o) => o.id);
-    u.updateInAppNotifications({ ids: t, clicked: !0 }), f((o) => {
-      if (!o)
+    const r = (/* @__PURE__ */ new Date()).toISOString(), t = a.filter((c) => o.includes(c.id) && !c.clicked).map((c) => c.id);
+    u.updateInAppNotifications({ ids: t, clicked: !0 }), f((c) => {
+      if (!c)
         return [];
-      const d = [...o];
+      const d = [...c];
       return d.filter((I) => t.includes(I.id)).forEach((I) => {
         I.clicked = r;
       }), d;
@@ -230,68 +235,68 @@ const J = async (e, s, c, a, f, w, p) => {
   }, $ = async () => {
     if (!a)
       return;
-    const i = (/* @__PURE__ */ new Date()).toISOString(), r = a.filter((t) => !t.opened || !t.seen).map((t) => t.id);
+    const o = (/* @__PURE__ */ new Date()).toISOString(), r = a.filter((t) => !t.opened || !t.seen).map((t) => t.id);
     r.length !== 0 && (u.updateInAppNotifications({
       ids: r,
       opened: !0
     }), f((t) => {
       if (!t)
         return [];
-      const o = [...t];
-      return o.filter((d) => r.includes(d.id)).forEach((d) => {
-        d.opened = i, d.seen = !0;
-      }), o;
+      const c = [...t];
+      return c.filter((d) => r.includes(d.id)).forEach((d) => {
+        d.opened = o, d.seen = !0;
+      }), c;
     }));
-  }, j = async (i) => {
+  }, j = async (o) => {
     if (!a)
       return;
-    const r = a.filter((t) => t.archived && (i === "ALL" || i.includes(t.id))).map((t) => t.id);
+    const r = a.filter((t) => t.archived && (o === "ALL" || o.includes(t.id))).map((t) => t.id);
     r.length !== 0 && (u.updateInAppNotifications({
       ids: r,
       archived: !1
     }), f((t) => {
       if (!t)
         return [];
-      const o = [...t];
-      return o.filter((d) => r.includes(d.id)).forEach((d) => {
+      const c = [...t];
+      return c.filter((d) => r.includes(d.id)).forEach((d) => {
         d.archived = void 0;
-      }), o;
+      }), c;
     }));
-  }, T = async (i) => {
+  }, T = async (o) => {
     if (!a)
       return;
-    const r = (/* @__PURE__ */ new Date()).toISOString(), t = a.filter((o) => !o.archived && (i === "ALL" || i.includes(o.id))).map((o) => o.id);
-    t.length !== 0 && (u.updateInAppNotifications({ ids: t, archived: !0 }), f((o) => {
-      if (!o)
+    const r = (/* @__PURE__ */ new Date()).toISOString(), t = a.filter((c) => !c.archived && (o === "ALL" || o.includes(c.id))).map((c) => c.id);
+    t.length !== 0 && (u.updateInAppNotifications({ ids: t, archived: !0 }), f((c) => {
+      if (!c)
         return [];
-      const d = [...o];
+      const d = [...c];
       return d.filter((I) => t.includes(I.id)).forEach((I) => {
         I.archived = r;
       }), d;
     }));
-  }, W = (i, r, t, o) => L([
+  }, W = (o, r, t, c) => L([
     {
-      notificationId: i,
+      notificationId: o,
       channel: r,
       delivery: t,
-      subNotificationId: o
+      subNotificationId: c
     }
-  ]), L = (i) => {
-    u.rest.postPreferences(i).then(() => {
+  ]), L = (o) => {
+    u.rest.postPreferences(o).then(() => {
       u.getPreferences().then((r) => {
         p(r);
       });
     });
   };
   U(() => {
-    f([]), l(!1), p(void 0), m((/* @__PURE__ */ new Date()).toISOString()), P(!0), k(!0), u.openWebSocket(), u.getPreferences().then((i) => {
-      p(i);
+    f([]), l(!1), p(void 0), y((/* @__PURE__ */ new Date()).toISOString()), P(!0), A(!0), u.openWebSocket(), u.getPreferences().then((o) => {
+      p(o);
     });
-  }, [u, k]);
+  }, [u, A]);
   const H = {
     notifications: a,
     preferences: w,
-    loadNotifications: k,
+    loadNotifications: A,
     markAsOpened: $,
     markAsArchived: T,
     markAsUnarchived: j,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notificationapi/react",
   "private": false,
-  "version": "0.0.29",
+  "version": "0.0.31",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -43,7 +43,7 @@
     "**/*.css"
   ],
   "dependencies": {
-    "@notificationapi/core": "^0.0.9",
+    "@notificationapi/core": "^0.0.10",
     "antd": "^5.17.4",
     "javascript-time-ago": "^2.5.10",
     "liquidjs": "^10.14.0",