@notificationapi/react 0.0.8 → 0.0.9

package/dist/components/Provider/index.d.ts

@@ -3,6 +3,7 @@ import { default as React, PropsWithChildren } from 'react';
 type Props = {
     clientId: string;
     userId: string;
+    hashedUserId?: string;
     apiURL?: string;
     wsURL?: string;
     initialLoadMaxCount?: number;

package/dist/components/Provider/index.js

@@ -12,8 +12,8 @@ const j = {
 var C = /* @__PURE__ */ ((t) => (t.EMAIL = "EMAIL", t.INAPP_WEB = "INAPP_WEB", t.SMS = "SMS", t.CALL = "CALL", t.PUSH = "PUSH", t.WEB_PUSH = "WEB_PUSH", t))(C || {}), x = /* @__PURE__ */ ((t) => (t.OFF = "off", t.INSTANT = "instant", t.HOURLY = "hourly", t.DAILY = "daily", t.WEEKLY = "weekly", t.MONTHLY = "monthly", t))(x || {});
 const D = O(
   void 0
-), p = (t) => {
-  const r = {
+), J = (t) => {
+  const s = {
     ...{
       apiURL: "https://api.notificationapi.com",
       wsURL: "wss://ws.notificationapi.com",
@@ -21,55 +21,56 @@ const D = O(
       initialLoadMaxAge: new Date((/* @__PURE__ */ new Date()).setMonth((/* @__PURE__ */ new Date()).getMonth() - 3))
     },
     ...t
-  }, [d, l] = f(), [g, w] = f(), [h, P] = f(!1), [E, m] = f((/* @__PURE__ */ new Date()).toISOString()), [M, k] = f(!0), N = (o) => {
+  }, [d, l] = f(), [L, A] = f(), [S, w] = f(!1), [U, E] = f((/* @__PURE__ */ new Date()).toISOString()), [m, M] = f(!0), P = (o) => {
     l((e) => e ? [
       ...o.filter((i) => !e.find((n) => n.id === i.id)),
       ...e
     ] : o);
-  }, T = async (o, e) => (await u(
-    r.apiURL,
+  }, k = async (o, e) => (await u(
+    s.apiURL,
     "GET",
     `notifications/INAPP_WEB?count=${o}&before=${e}`,
     t.clientId,
-    t.userId
-  )).notifications, U = async (o, e, i) => {
-    let n = [], c = o, a = !0, s = !0;
-    for (; s; ) {
-      const A = (await T(
+    t.userId,
+    t.hashedUserId
+  )).notifications, T = async (o, e, i) => {
+    let n = [], a = o, c = !0, r = !0;
+    for (; r; ) {
+      const g = (await k(
         e,
-        new Date(c).getTime()
+        new Date(a).getTime()
       )).filter(
-        (I) => !n.find((L) => L.id === I.id)
+        (I) => !n.find((h) => h.id === I.id)
       );
-      c = A.reduce(
-        (I, L) => I < L.date ? I : L.date,
+      a = g.reduce(
+        (I, h) => I < h.date ? I : h.date,
         o
-      ), n = [...n, ...A], a = A.length > 0, s = !0, (!a || n.length >= e || i && c < i) && (s = !1);
+      ), n = [...n, ...g], c = g.length > 0, r = !0, (!c || n.length >= e || i && a < i) && (r = !1);
     }
-    return console.log(n.length, a, c), {
+    return console.log(n.length, c, a), {
       notifications: n,
-      couldLoadMore: a,
-      oldestReceived: c
+      couldLoadMore: c,
+      oldestReceived: a
     };
-  }, S = async (o) => {
-    if (!M || h)
+  }, N = async (o) => {
+    if (!m || S)
       return;
-    P(!0);
-    const e = await U(
-      E,
-      o ? r.initialLoadMaxCount : 1e3,
-      o ? r.initialLoadMaxAge.toISOString() : void 0
+    w(!0);
+    const e = await T(
+      U,
+      o ? s.initialLoadMaxCount : 1e3,
+      o ? s.initialLoadMaxAge.toISOString() : void 0
     );
-    m(e.oldestReceived), k(e.couldLoadMore), N(e.notifications), P(!1);
+    E(e.oldestReceived), M(e.couldLoadMore), P(e.notifications), w(!1);
   }, R = async (o) => {
     const e = (/* @__PURE__ */ new Date()).toISOString();
     u(
-      r.apiURL,
+      s.apiURL,
       "PATCH",
       "notifications/INAPP_WEB",
       t.clientId,
       t.userId,
-      "",
+      t.hashedUserId,
       {
         trackingIds: [o],
         clicked: e
@@ -77,20 +78,20 @@ const D = O(
     ), l((i) => {
       if (!i)
         return [];
-      const n = [...i], c = n.find((a) => a.id === o);
-      return c && (c.clicked = e), n;
+      const n = [...i], a = n.find((c) => c.id === o);
+      return a && (a.clicked = e), n;
     });
   }, W = async () => {
     if (!d)
       return;
     const o = (/* @__PURE__ */ new Date()).toISOString(), e = d.filter((i) => !i.opened || !i.seen).map((i) => i.id);
     e.length !== 0 && (u(
-      r.apiURL,
+      s.apiURL,
       "PATCH",
       "notifications/INAPP_WEB",
       t.clientId,
       t.userId,
-      "",
+      t.hashedUserId,
       {
         trackingIds: e,
         opened: o
@@ -99,8 +100,8 @@ const D = O(
       if (!i)
         return [];
       const n = [...i];
-      return n.filter((c) => e.includes(c.id)).forEach((c) => {
-        c.opened = o, c.seen = !0;
+      return n.filter((a) => e.includes(a.id)).forEach((a) => {
+        a.opened = o, a.seen = !0;
       }), n;
     }));
   }, _ = async (o) => {
@@ -108,12 +109,12 @@ const D = O(
       return;
     const e = (/* @__PURE__ */ new Date()).toISOString(), i = d.filter((n) => !n.archived && (o === "ALL" || o.includes(n.id))).map((n) => n.id);
     i.length !== 0 && (u(
-      r.apiURL,
+      s.apiURL,
       "PATCH",
       "notifications/INAPP_WEB",
       t.clientId,
       t.userId,
-      "",
+      t.hashedUserId,
       {
         trackingIds: i,
         archived: e
@@ -121,37 +122,42 @@ const D = O(
     ), l((n) => {
       if (!n)
         return [];
-      const c = [...n];
-      return c.filter((a) => i.includes(a.id)).forEach((a) => {
-        a.archived = e;
-      }), c;
+      const a = [...n];
+      return a.filter((c) => i.includes(c.id)).forEach((c) => {
+        c.archived = e;
+      }), a;
     }));
   }, H = (o, e, i, n) => {
-    if (!g)
+    if (!L)
       return;
-    const c = { ...g }, a = c.preferences.find(
-      (s) => s.notificationId === o && s.subNotificationId === n && s.channel === e
+    const a = { ...L }, c = a.preferences.find(
+      (r) => r.notificationId === o && r.subNotificationId === n && r.channel === e
     );
-    a && (a.delivery = i), w(c);
+    c && (c.delivery = i), A(a);
   };
   v(() => {
-    S(!0);
+    N(!0);
     const o = new WebSocket(
-      `${r.wsURL}?userId=${r.userId}&envId=${r.clientId}`
+      `${s.wsURL}?userId=${s.userId}&envId=${s.clientId}`
     );
     o.onmessage = (e) => {
       const i = JSON.parse(e.data);
-      !i || !i.route || i.route === "inapp_web/new_notifications" && N(i.payload.notifications);
-    }, u(r.apiURL, "GET", "preferences", t.clientId, t.userId).then(
-      (e) => {
-        w(e);
-      }
-    );
+      !i || !i.route || i.route === "inapp_web/new_notifications" && P(i.payload.notifications);
+    }, u(
+      s.apiURL,
+      "GET",
+      "preferences",
+      t.clientId,
+      t.userId,
+      t.hashedUserId
+    ).then((e) => {
+      A(e);
+    });
   }, []);
   const y = {
     notifications: d,
-    preferences: g,
-    loadNotifications: S,
+    preferences: L,
+    loadNotifications: N,
     markAsOpened: W,
     markAsArchived: _,
     markAsClicked: R,
@@ -164,5 +170,5 @@ export {
   x as DeliveryOptions,
   j as NOTIFICATION_ACTIONS,
   D as NotificationAPIContext,
-  p as NotificationAPIProvider
+  J as NotificationAPIProvider
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notificationapi/react",
   "private": false,
-  "version": "0.0.8",
+  "version": "0.0.9",
   "type": "module",
   "scripts": {
     "dev": "vite",