@notificationapi/react 0.0.8 → 0.0.10

package/dist/components/Preferences/PreferenceGroup.d.ts

@@ -1,5 +1,4 @@
-import { default as React } from 'react';
-
+/// <reference types="react" />
 type PreferenceGroupProps = {
     subNotificationId?: string;
     title: string;

package/dist/components/Preferences/Preferences.d.ts

@@ -1,6 +1,5 @@
-import { default as React } from 'react';
 import { Channels } from '../Provider';
 
 export declare const getChannelLabel: (c: Channels) => string;
 export declare const getChannelIcon: (channel: Channels) => React.ReactElement;
-export declare function Preferences(): React.JSX.Element | null;
+export declare function Preferences(): JSX.Element | null;

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

@@ -1,8 +1,9 @@
-import { default as React, PropsWithChildren } from 'react';
+import { PropsWithChildren } from 'react';
 
 type Props = {
     clientId: string;
     userId: string;
+    hashedUserId?: string;
     apiURL?: string;
     wsURL?: string;
     initialLoadMaxCount?: number;
@@ -125,6 +126,6 @@ export type Context = {
     markAsClicked: (id: string) => void;
     updateDelivery: (notificationId: string, channel: Channels, delivery: DeliveryOptions, subNotificationId?: string) => void;
 };
-export declare const NotificationAPIContext: React.Context<Context | undefined>;
+export declare const NotificationAPIContext: import('react').Context<Context | undefined>;
 export declare const NotificationAPIProvider: React.FunctionComponent<PropsWithChildren<Props>>;
 export {};

package/dist/components/Provider/index.js

@@ -1,5 +1,5 @@
-import { jsx as B } from "react/jsx-runtime";
-import { createContext as O, useState as f, useEffect as v } from "react";
+import { jsx as y } from "react/jsx-runtime";
+import { createContext as B, useState as f, useEffect as O } from "react";
 import { api as u } from "../../api.js";
 const j = {
   opened: "opened",
@@ -9,160 +9,166 @@ const j = {
   actioned1: "actioned1",
   actioned2: "actioned2"
 };
-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(
+var $ = /* @__PURE__ */ ((e) => (e.EMAIL = "EMAIL", e.INAPP_WEB = "INAPP_WEB", e.SMS = "SMS", e.CALL = "CALL", e.PUSH = "PUSH", e.WEB_PUSH = "WEB_PUSH", e))($ || {}), C = /* @__PURE__ */ ((e) => (e.OFF = "off", e.INSTANT = "instant", e.HOURLY = "hourly", e.DAILY = "daily", e.WEEKLY = "weekly", e.MONTHLY = "monthly", e))(C || {});
+const x = B(
   void 0
-), p = (t) => {
-  const r = {
+), J = (e) => {
+  const c = {
     ...{
       apiURL: "https://api.notificationapi.com",
       wsURL: "wss://ws.notificationapi.com",
       initialLoadMaxCount: 1e3,
       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) => {
-    l((e) => e ? [
-      ...o.filter((i) => !e.find((n) => n.id === i.id)),
-      ...e
+    ...e
+  }, [r, l] = f(), [L, w] = f(), [S, A] = f(!1), [U, E] = f((/* @__PURE__ */ new Date()).toISOString()), [m, M] = f(!0), P = (o) => {
+    l((t) => t ? [
+      ...o.filter((i) => !t.find((n) => n.id === i.id)),
+      ...t
     ] : o);
-  }, T = async (o, e) => (await u(
-    r.apiURL,
+  }, k = async (o, t) => (await u(
+    c.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(
-        e,
-        new Date(c).getTime()
+    `notifications/INAPP_WEB?count=${o}&before=${t}`,
+    e.clientId,
+    e.userId,
+    e.hashedUserId
+  )).notifications, T = async (o, t, i) => {
+    let n = [], a = o, s = !0, d = !0;
+    for (; d; ) {
+      const g = (await k(
+        t,
+        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], s = g.length > 0, d = !0, (!s || n.length >= t || i && a < i) && (d = !1);
     }
-    return console.log(n.length, a, c), {
+    return console.log(n.length, s, a), {
       notifications: n,
-      couldLoadMore: a,
-      oldestReceived: c
+      couldLoadMore: s,
+      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
+    A(!0);
+    const t = await T(
+      U,
+      o ? c.initialLoadMaxCount : 1e3,
+      o ? c.initialLoadMaxAge.toISOString() : void 0
     );
-    m(e.oldestReceived), k(e.couldLoadMore), N(e.notifications), P(!1);
+    E(t.oldestReceived), M(t.couldLoadMore), P(t.notifications), A(!1);
   }, R = async (o) => {
-    const e = (/* @__PURE__ */ new Date()).toISOString();
+    const t = (/* @__PURE__ */ new Date()).toISOString();
     u(
-      r.apiURL,
+      c.apiURL,
       "PATCH",
       "notifications/INAPP_WEB",
-      t.clientId,
-      t.userId,
-      "",
+      e.clientId,
+      e.userId,
+      e.hashedUserId,
       {
         trackingIds: [o],
-        clicked: e
+        clicked: t
       }
     ), 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((s) => s.id === o);
+      return a && (a.clicked = t), n;
     });
-  }, W = async () => {
-    if (!d)
+  }, H = async () => {
+    if (!r)
       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,
+    const o = (/* @__PURE__ */ new Date()).toISOString(), t = r.filter((i) => !i.opened || !i.seen).map((i) => i.id);
+    t.length !== 0 && (u(
+      c.apiURL,
       "PATCH",
       "notifications/INAPP_WEB",
-      t.clientId,
-      t.userId,
-      "",
+      e.clientId,
+      e.userId,
+      e.hashedUserId,
       {
-        trackingIds: e,
+        trackingIds: t,
         opened: o
       }
     ), l((i) => {
       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) => t.includes(a.id)).forEach((a) => {
+        a.opened = o, a.seen = !0;
       }), n;
     }));
-  }, _ = async (o) => {
-    if (!d)
+  }, W = async (o) => {
+    if (!r)
       return;
-    const e = (/* @__PURE__ */ new Date()).toISOString(), i = d.filter((n) => !n.archived && (o === "ALL" || o.includes(n.id))).map((n) => n.id);
+    const t = (/* @__PURE__ */ new Date()).toISOString(), i = r.filter((n) => !n.archived && (o === "ALL" || o.includes(n.id))).map((n) => n.id);
     i.length !== 0 && (u(
-      r.apiURL,
+      c.apiURL,
       "PATCH",
       "notifications/INAPP_WEB",
-      t.clientId,
-      t.userId,
-      "",
+      e.clientId,
+      e.userId,
+      e.hashedUserId,
       {
         trackingIds: i,
-        archived: e
+        archived: t
       }
     ), 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((s) => i.includes(s.id)).forEach((s) => {
+        s.archived = t;
+      }), a;
     }));
-  }, H = (o, e, i, n) => {
-    if (!g)
+  }, _ = (o, t, i, n) => {
+    if (!L)
       return;
-    const c = { ...g }, a = c.preferences.find(
-      (s) => s.notificationId === o && s.subNotificationId === n && s.channel === e
+    const a = { ...L }, s = a.preferences.find(
+      (d) => d.notificationId === o && d.subNotificationId === n && d.channel === t
     );
-    a && (a.delivery = i), w(c);
+    s && (s.delivery = i), w(a);
   };
-  v(() => {
-    S(!0);
+  O(() => {
+    N(!0);
     const o = new WebSocket(
-      `${r.wsURL}?userId=${r.userId}&envId=${r.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);
-      }
+      c.hashedUserId ? `${c.wsURL}?userId=${c.userId}&envId=${c.clientId}&userIdHash=${c.hashedUserId}` : `${c.wsURL}?userId=${c.userId}&envId=${c.clientId}`
     );
+    o.onmessage = (t) => {
+      const i = JSON.parse(t.data);
+      !i || !i.route || i.route === "inapp_web/new_notifications" && P(i.payload.notifications);
+    }, u(
+      c.apiURL,
+      "GET",
+      "preferences",
+      e.clientId,
+      e.userId,
+      e.hashedUserId
+    ).then((t) => {
+      w(t);
+    });
   }, []);
-  const y = {
-    notifications: d,
-    preferences: g,
-    loadNotifications: S,
-    markAsOpened: W,
-    markAsArchived: _,
+  const v = {
+    notifications: r,
+    preferences: L,
+    loadNotifications: N,
+    markAsOpened: H,
+    markAsArchived: W,
     markAsClicked: R,
-    updateDelivery: H
+    updateDelivery: _
   };
-  return /* @__PURE__ */ B(D.Provider, { value: y, children: t.children });
+  return /* @__PURE__ */ y(x.Provider, { value: v, children: e.children });
 };
 export {
-  C as Channels,
-  x as DeliveryOptions,
+  $ as Channels,
+  C as DeliveryOptions,
   j as NOTIFICATION_ACTIONS,
-  D as NotificationAPIContext,
-  p as NotificationAPIProvider
+  x as NotificationAPIContext,
+  J as NotificationAPIProvider
 };

package/package.json

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