@notificationapi/react 0.0.32 → 0.0.34

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

@@ -33,6 +33,7 @@ type Props = ({
     initialLoadMaxAge?: Date;
     playSoundOnNewNotification?: boolean;
     newNotificationSoundPath?: string;
+    client?: typeof NotificationAPIClientSDK;
 };
 export declare const NotificationAPIProvider: React.FunctionComponent<PropsWithChildren<Props>> & {
     useNotificationAPIContext: typeof useNotificationAPIContext;

package/dist/components/Provider/index.js

@@ -1,15 +1,15 @@
-import { jsx as B } from "react/jsx-runtime";
-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(
+import { jsx as F } from "react/jsx-runtime";
+import { createContext as z, useState as N, useCallback as m, useMemo as G, useRef as y, useEffect as M, useContext as J } from "react";
+const _ = async (e, c, i, a, f, I, h) => {
+  const g = q(a, f, I), l = await fetch(
+    `https://${c}/${a}/users/${encodeURIComponent(
       f
     )}/${i}`,
     {
       method: e,
-      body: JSON.stringify(p),
+      body: JSON.stringify(h),
       headers: {
-        Authorization: `Basic ${h}`
+        Authorization: `Basic ${g}`
       }
     }
   );
@@ -18,7 +18,7 @@ const J = async (e, s, i, a, f, w, p) => {
   } catch {
     return;
   }
-}, _ = (e, s, i) => btoa(i ? e + ":" + s + ":" + i : e + ":" + s), M = {
+}, q = (e, c, i) => btoa(i ? e + ":" + c + ":" + i : e + ":" + c), E = {
   host: "api.notificationapi.com",
   websocketHost: "ws.notificationapi.com",
   userId: "",
@@ -32,18 +32,18 @@ const J = async (e, s, i, a, f, w, p) => {
   keepWebSocketAliveForSeconds: 86400
   // 24 hours
 }, n = {
-  config: M,
+  config: E,
   init: function(e) {
-    return this.config = { ...M, ...e }, {
+    return this.config = { ...E, ...e }, {
       ...this
     };
   },
   rest: {
-    generic: function(e, s, i) {
-      return J(
+    generic: function(e, c, i) {
+      return _(
         e,
         n.config.host,
-        s,
+        c,
         n.config.clientId,
         n.config.userId,
         n.config.hashedUserId,
@@ -53,10 +53,10 @@ const J = async (e, s, i, a, f, w, p) => {
     // 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(e, s) {
+    getNotifications: function(e, c) {
       return n.rest.generic(
         "GET",
-        `notifications/INAPP_WEB?count=${s}&before=${e}`
+        `notifications/INAPP_WEB?count=${c}&before=${e}`
       );
     },
     patchNotifications: function(e) {
@@ -84,8 +84,8 @@ const J = async (e, s, i, a, f, w, p) => {
     object: void 0,
     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 i = JSON.parse(s.data);
+      return n.config.hashedUserId && (e += `&userIdHash=${encodeURIComponent(n.config.hashedUserId)}`), n.websocket.object = new WebSocket(e), n.websocket.object.onmessage = (c) => {
+        const i = JSON.parse(c.data);
         if (!(!i || !i.route) && i.route === "inapp_web/new_notifications") {
           const a = i;
           n.config.onNewInAppNotifications && n.config.onNewInAppNotifications(
@@ -95,8 +95,8 @@ const J = async (e, s, i, a, f, w, p) => {
       }, n.websocket.object;
     },
     disconnect: function(e) {
-      var s;
-      n.websocket.object && ((s = n.websocket.object) == null || s.close(), e && e(n.websocket.object));
+      var c;
+      n.websocket.object && ((c = n.websocket.object) == null || c.close(), e && e(n.websocket.object));
     }
   },
   openWebSocket: function() {
@@ -115,31 +115,31 @@ const J = async (e, s, i, 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, i = e.oldestNeeded || n.config.getInAppDefaultOldest;
-    let a = [], f = e.before, w = !0, p = !0;
-    for (; p; ) {
-      const h = (await n.rest.getNotifications(
+    const c = e.maxCountNeeded || n.config.getInAppDefaultCount, i = e.oldestNeeded || n.config.getInAppDefaultOldest;
+    let a = [], f = e.before, I = !0, h = !0;
+    for (; h; ) {
+      const g = (await n.rest.getNotifications(
         f,
-        s
+        c
       )).notifications.filter(
-        (l) => !a.find((g) => g.id === l.id)
+        (l) => !a.find((w) => w.id === l.id)
       );
-      f = h.reduce(
-        (l, g) => l < g.date ? l : g.date,
+      f = g.reduce(
+        (l, w) => l < w.date ? l : w.date,
         e.before
-      ), a = [...a, ...h], w = h.length > 0, p = !0, (!w || a.length >= s || f < i) && (p = !1);
+      ), a = [...a, ...g], I = g.length > 0, h = !0, (!I || a.length >= c || f < i) && (h = !1);
     }
     return {
       items: a,
-      hasMore: w,
+      hasMore: I,
       oldestReceived: f
     };
   },
   updateInAppNotifications: async (e) => {
-    const s = {
+    const c = {
       trackingIds: e.ids
     };
-    return e.archived === !0 ? s.archived = (/* @__PURE__ */ new Date()).toISOString() : e.archived === !1 && (s.archived = null), e.clicked === !0 ? s.clicked = (/* @__PURE__ */ new Date()).toISOString() : e.clicked === !1 && (s.clicked = null), e.opened === !0 ? s.opened = (/* @__PURE__ */ new Date()).toISOString() : e.opened === !1 && (s.opened = null), n.rest.patchNotifications(s);
+    return e.archived === !0 ? c.archived = (/* @__PURE__ */ new Date()).toISOString() : e.archived === !1 && (c.archived = null), e.clicked === !0 ? c.clicked = (/* @__PURE__ */ new Date()).toISOString() : e.clicked === !1 && (c.clicked = null), e.opened === !0 ? c.opened = (/* @__PURE__ */ new Date()).toISOString() : e.opened === !1 && (c.opened = null), n.rest.patchNotifications(c);
   },
   getPreferences: async () => n.rest.getPreferences(),
   updateDeliveryOption: async (e) => n.rest.postPreferences([e]),
@@ -150,9 +150,9 @@ const J = async (e, s, i, a, f, w, p) => {
       );
     return n.rest.postUser(e);
   }
-}, E = z(
+}, R = z(
   void 0
-), q = (e) => {
+), K = (e) => {
   const i = {
     ...{
       apiURL: "https://api.notificationapi.com",
@@ -164,23 +164,26 @@ const J = async (e, s, i, 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, 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);
+  }, [a, f] = N(), [I, h] = N(), [g, l] = N(!1), [w, D] = N((/* @__PURE__ */ new Date()).toISOString()), [b, P] = N(!0), O = m(() => {
+    i.playSoundOnNewNotification && new Audio(i.newNotificationSoundPath).play().catch((s) => {
+      console.log("Failed to play new notification sound:", s);
     });
   }, [i.newNotificationSoundPath, i.playSoundOnNewNotification]), S = m((o) => {
-    const r = (/* @__PURE__ */ new Date()).toISOString();
-    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)),
+    const s = (/* @__PURE__ */ new Date()).toISOString();
+    f((t) => (o = o.filter((d) => {
+      const p = d.expDate && new Date(d.expDate * 1e3).toISOString() < s, k = new Date(d.date).getTime() > new Date(s).getTime() + 1e3;
+      return !p && !k;
+    }), t ? [
+      ...o.filter((d) => !t.find((k) => k.id === d.id)),
       ...t
     ] : o));
-  }, []), u = F(() => {
-    const o = n.init({
+  }, []), u = G(() => {
+    const o = e.client ? e.client : n.init({
       clientId: i.clientId,
       userId: i.user.id,
       hashedUserId: i.hashedUserId,
-      onNewInAppNotifications: (r) => {
-        D(), S(r);
+      onNewInAppNotifications: (s) => {
+        O(), S(s);
       }
     });
     return o.identify({
@@ -194,24 +197,25 @@ const J = async (e, s, i, a, f, w, p) => {
     i.user.number,
     i.hashedUserId,
     S,
-    D
-  ]), O = m(
-    async (o, r) => {
-      const t = await u.rest.getNotifications(o, r);
-      y(t.oldestReceived), P(t.couldLoadMore), S(t.notifications);
+    O,
+    e.client
+  ]), v = m(
+    async (o, s) => {
+      const t = await u.rest.getNotifications(o, s);
+      D(t.oldestReceived), P(t.couldLoadMore), S(t.notifications);
     },
     [S, u.rest]
-  ), v = k(b), C = k(h), x = k(g);
-  U(() => {
-    v.current = b, C.current = h, x.current = g;
-  }, [b, h, g]);
+  ), C = y(b), x = y(g), L = y(w);
+  M(() => {
+    C.current = b, x.current = g, L.current = w;
+  }, [b, g, w]);
   const A = m(
     async (o) => {
-      if (!(!o && (!v.current || C.current))) {
+      if (!(!o && (!C.current || x.current))) {
         l(!0);
         try {
-          await O(
-            o ? (/* @__PURE__ */ new Date()).toISOString() : x.current,
+          await v(
+            o ? (/* @__PURE__ */ new Date()).toISOString() : L.current,
             o ? i.initialLoadMaxCount : 1e3
           );
         } finally {
@@ -219,93 +223,93 @@ const J = async (e, s, i, a, f, w, p) => {
         }
       }
     },
-    [i.initialLoadMaxCount, O]
-  ), R = async (o) => {
+    [i.initialLoadMaxCount, v]
+  ), $ = async (o) => {
     if (!a) return;
-    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 = [...c];
-      return d.filter((I) => t.includes(I.id)).forEach((I) => {
-        I.clicked = r;
+    const s = (/* @__PURE__ */ new Date()).toISOString(), t = a.filter((r) => o.includes(r.id) && !r.clicked).map((r) => r.id);
+    u.updateInAppNotifications({ ids: t, clicked: !0 }), f((r) => {
+      if (!r) return [];
+      const d = [...r];
+      return d.filter((p) => t.includes(p.id)).forEach((p) => {
+        p.clicked = s;
       }), d;
     });
-  }, $ = async () => {
+  }, T = async () => {
     if (!a) return;
-    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,
+    const o = (/* @__PURE__ */ new Date()).toISOString(), s = a.filter((t) => !t.opened || !t.seen).map((t) => t.id);
+    s.length !== 0 && (u.updateInAppNotifications({
+      ids: s,
       opened: !0
     }), f((t) => {
       if (!t) return [];
-      const c = [...t];
-      return c.filter((d) => r.includes(d.id)).forEach((d) => {
+      const r = [...t];
+      return r.filter((d) => s.includes(d.id)).forEach((d) => {
         d.opened = o, d.seen = !0;
-      }), c;
+      }), r;
     }));
   }, j = async (o) => {
     if (!a) return;
-    const r = a.filter((t) => t.archived && (o === "ALL" || o.includes(t.id))).map((t) => t.id);
-    r.length !== 0 && (u.updateInAppNotifications({
-      ids: r,
+    const s = a.filter((t) => t.archived && (o === "ALL" || o.includes(t.id))).map((t) => t.id);
+    s.length !== 0 && (u.updateInAppNotifications({
+      ids: s,
       archived: !1
     }), f((t) => {
       if (!t) return [];
-      const c = [...t];
-      return c.filter((d) => r.includes(d.id)).forEach((d) => {
+      const r = [...t];
+      return r.filter((d) => s.includes(d.id)).forEach((d) => {
         d.archived = void 0;
-      }), c;
+      }), r;
     }));
-  }, T = async (o) => {
+  }, W = async (o) => {
     if (!a) return;
-    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 = [...c];
-      return d.filter((I) => t.includes(I.id)).forEach((I) => {
-        I.archived = r;
+    const s = (/* @__PURE__ */ new Date()).toISOString(), t = a.filter((r) => !r.archived && (o === "ALL" || o.includes(r.id))).map((r) => r.id);
+    t.length !== 0 && (u.updateInAppNotifications({ ids: t, archived: !0 }), f((r) => {
+      if (!r) return [];
+      const d = [...r];
+      return d.filter((p) => t.includes(p.id)).forEach((p) => {
+        p.archived = s;
       }), d;
     }));
-  }, W = (o, r, t, c) => L([
+  }, H = (o, s, t, r) => U([
     {
       notificationId: o,
-      channel: r,
+      channel: s,
       delivery: t,
-      subNotificationId: c
+      subNotificationId: r
     }
-  ]), L = (o) => {
+  ]), U = (o) => {
     u.rest.postPreferences(o).then(() => {
-      u.getPreferences().then((r) => {
-        p(r);
+      u.getPreferences().then((s) => {
+        h(s);
       });
     });
   };
-  U(() => {
-    f([]), l(!1), p(void 0), y((/* @__PURE__ */ new Date()).toISOString()), P(!0), A(!0), u.openWebSocket(), u.getPreferences().then((o) => {
-      p(o);
+  M(() => {
+    f([]), l(!1), h(void 0), D((/* @__PURE__ */ new Date()).toISOString()), P(!0), A(!0), u.openWebSocket(), u.getPreferences().then((o) => {
+      h(o);
     });
   }, [u, A]);
-  const H = {
+  const B = {
     notifications: a,
-    preferences: w,
+    preferences: I,
     loadNotifications: A,
-    markAsOpened: $,
-    markAsArchived: T,
+    markAsOpened: T,
+    markAsArchived: W,
     markAsUnarchived: j,
-    markAsClicked: R,
-    updateDelivery: W,
-    updateDeliveries: L,
+    markAsClicked: $,
+    updateDelivery: H,
+    updateDeliveries: U,
     getClient: () => u
   };
-  return /* @__PURE__ */ B(E.Provider, { value: H, children: e.children });
-}, K = () => {
-  const e = G(E);
+  return /* @__PURE__ */ F(R.Provider, { value: B, children: e.children });
+}, Q = () => {
+  const e = J(R);
   if (!e)
     throw new Error("useMyContext must be used within a MyProvider");
   return e;
 };
-q.useNotificationAPIContext = K;
+K.useNotificationAPIContext = Q;
 export {
-  E as NotificationAPIContext,
-  q as NotificationAPIProvider
+  R as NotificationAPIContext,
+  K as NotificationAPIProvider
 };

package/package.json

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