@notificationapi/react 1.0.2 → 1.1.0

package/dist/components/Provider/index.js

@@ -1,11 +1,11 @@
 import { jsx as Q } from "react/jsx-runtime";
-import { useState as I, useCallback as m, useMemo as X, useRef as T, useEffect as P, useContext as Y } from "react";
+import { useState as I, useCallback as m, useMemo as X, useRef as U, useEffect as P, useContext as Y } from "react";
 import { NotificationAPIContext as H } from "./context.js";
-const Z = async (e, c, o, a, f, N, h) => {
-  const l = ee(a, f, N), g = await fetch(
+const Z = async (e, c, i, a, f, b, h) => {
+  const l = ee(a, f, b), g = await fetch(
     `https://${c}/${a}/users/${encodeURIComponent(
       f
-    )}/${o}`,
+    )}/${i}`,
     {
       method: e,
       body: JSON.stringify(h),
@@ -19,7 +19,7 @@ const Z = async (e, c, o, a, f, N, h) => {
   } catch {
     return;
   }
-}, ee = (e, c, o) => btoa(o ? e + ":" + c + ":" + o : e + ":" + c), q = {
+}, ee = (e, c, i) => btoa(i ? e + ":" + c + ":" + i : e + ":" + c), q = {
   host: "api.notificationapi.com",
   websocketHost: "ws.notificationapi.com",
   userId: "",
@@ -32,7 +32,7 @@ const Z = async (e, c, o, a, f, N, h) => {
   onNewInAppNotifications: void 0,
   keepWebSocketAliveForSeconds: 86400
   // 24 hours
-}, i = {
+}, o = {
   config: q,
   init: function(e) {
     return this.config = { ...q, ...e }, {
@@ -40,71 +40,71 @@ const Z = async (e, c, o, a, f, N, h) => {
     };
   },
   rest: {
-    generic: function(e, c, o) {
+    generic: function(e, c, i) {
       return Z(
         e,
-        i.config.host,
+        o.config.host,
         c,
-        i.config.clientId,
-        i.config.userId,
-        i.config.hashedUserId,
-        o
+        o.config.clientId,
+        o.config.userId,
+        o.config.hashedUserId,
+        i
       );
     },
     // 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, c) {
-      return i.rest.generic(
+      return o.rest.generic(
         "GET",
         `notifications/INAPP_WEB?count=${c}&before=${e}`
       );
     },
     patchNotifications: function(e) {
-      return i.rest.generic(
+      return o.rest.generic(
         "PATCH",
         "notifications/INAPP_WEB",
         e
       );
     },
     getPreferences: function() {
-      return i.rest.generic("GET", "preferences");
+      return o.rest.generic("GET", "preferences");
     },
     postPreferences: function(e) {
-      return i.rest.generic(
+      return o.rest.generic(
         "POST",
         "preferences",
         e
       );
     },
     postUser: function(e) {
-      return i.rest.generic("POST", "", e);
+      return o.rest.generic("POST", "", e);
     },
     getUserAccountMetadata: function() {
-      return i.rest.generic("GET", "account_metadata");
+      return o.rest.generic("GET", "account_metadata");
     }
   },
   websocket: {
     object: void 0,
     connect: function() {
-      let e = `wss://${i.config.websocketHost}?userId=${encodeURIComponent(i.config.userId)}&envId=${i.config.clientId}`;
-      return i.config.hashedUserId && (e += `&userIdHash=${encodeURIComponent(i.config.hashedUserId)}`), i.websocket.object = new WebSocket(e), i.websocket.object.onmessage = (c) => {
-        const o = JSON.parse(c.data);
-        if (!(!o || !o.route) && o.route === "inapp_web/new_notifications") {
-          const a = o;
-          i.config.onNewInAppNotifications && i.config.onNewInAppNotifications(
+      let e = `wss://${o.config.websocketHost}?userId=${encodeURIComponent(o.config.userId)}&envId=${o.config.clientId}`;
+      return o.config.hashedUserId && (e += `&userIdHash=${encodeURIComponent(o.config.hashedUserId)}`), o.websocket.object = new WebSocket(e), o.websocket.object.onmessage = (c) => {
+        const i = JSON.parse(c.data);
+        if (!(!i || !i.route) && i.route === "inapp_web/new_notifications") {
+          const a = i;
+          o.config.onNewInAppNotifications && o.config.onNewInAppNotifications(
             a.payload.notifications
           );
         }
-      }, i.websocket.object;
+      }, o.websocket.object;
     },
     disconnect: function(e) {
       var c;
-      i.websocket.object && ((c = i.websocket.object) == null || c.close(), e && e(i.websocket.object));
+      o.websocket.object && ((c = o.websocket.object) == null || c.close(), e && e(o.websocket.object));
     }
   },
   openWebSocket: function() {
-    return i.websocket.connect(() => {
+    return o.websocket.connect(() => {
       setTimeout(
         () => {
           this.websocket.disconnect(() => {
@@ -119,10 +119,10 @@ const Z = async (e, c, o, a, f, N, h) => {
   // They may or may not do additional tasks.
   // e.g. identify simply maps to postUsers
   getInAppNotifications: async (e) => {
-    const c = e.maxCountNeeded || i.config.getInAppDefaultCount, o = e.oldestNeeded || i.config.getInAppDefaultOldest;
-    let a = [], f = e.before, N = !0, h = !0;
+    const c = e.maxCountNeeded || o.config.getInAppDefaultCount, i = e.oldestNeeded || o.config.getInAppDefaultOldest;
+    let a = [], f = e.before, b = !0, h = !0;
     for (; h; ) {
-      const l = (await i.rest.getNotifications(
+      const l = (await o.rest.getNotifications(
         f,
         c
       )).notifications.filter(
@@ -131,11 +131,11 @@ const Z = async (e, c, o, a, f, N, h) => {
       f = l.reduce(
         (g, w) => g < w.date ? g : w.date,
         e.before
-      ), a = [...a, ...l], N = l.length > 0, h = !0, (!N || a.length >= c || f < o) && (h = !1);
+      ), a = [...a, ...l], b = l.length > 0, h = !0, (!b || a.length >= c || f < i) && (h = !1);
     }
     return {
       items: a,
-      hasMore: N,
+      hasMore: b,
       oldestReceived: f
     };
   },
@@ -143,23 +143,23 @@ const Z = async (e, c, o, a, f, N, h) => {
     const c = {
       trackingIds: e.ids
     };
-    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), i.rest.patchNotifications(c);
+    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), o.rest.patchNotifications(c);
   },
-  getPreferences: async () => i.rest.getPreferences(),
-  updateDeliveryOption: async (e) => i.rest.postPreferences([e]),
+  getPreferences: async () => o.rest.getPreferences(),
+  updateDeliveryOption: async (e) => o.rest.postPreferences([e]),
   identify: async (e) => {
-    if (e.id && e.id !== i.config.userId)
+    if (e.id && e.id !== o.config.userId)
       throw new Error(
         "The id in the parameters does not match the initialized userId."
       );
-    return i.rest.postUser(e);
+    return o.rest.postUser(e);
   },
-  getUserAccountMetadata: async () => i.rest.getUserAccountMetadata()
+  getUserAccountMetadata: async () => o.rest.getUserAccountMetadata()
 }, F = typeof window < "u", te = (e) => {
-  const o = {
+  const i = {
     ...{
-      apiURL: "https://api.notificationapi.com",
-      wsURL: "wss://ws.notificationapi.com",
+      apiURL: "api.notificationapi.com",
+      wsURL: "ws.notificationapi.com",
       initialLoadMaxCount: 1e3,
       initialLoadMaxAge: new Date((/* @__PURE__ */ new Date()).setMonth((/* @__PURE__ */ new Date()).getMonth() - 3)),
       playSoundOnNewNotification: !1,
@@ -169,11 +169,11 @@ const Z = async (e, c, o, a, f, N, h) => {
     },
     ...e,
     user: "userId" in e ? { id: e.userId } : e.user
-  }, [a, f] = I(), [N, h] = I(), [l, g] = I(), [w, S] = I(!1), [k, C] = I((/* @__PURE__ */ new Date()).toISOString()), [A, U] = I(!0), [v, b] = I(o.webPushOptInMessage), [W, J] = I(!1), x = m(() => {
-    o.playSoundOnNewNotification && new Audio(o.newNotificationSoundPath).play().catch((s) => {
+  }, [a, f] = I(), [b, h] = I(), [l, g] = I(), [w, S] = I(!1), [k, T] = I((/* @__PURE__ */ new Date()).toISOString()), [A, C] = I(!0), [v, N] = I(i.webPushOptInMessage), [L, J] = I(!1), W = m(() => {
+    i.playSoundOnNewNotification && new Audio(i.newNotificationSoundPath).play().catch((s) => {
       console.log("Failed to play new notification sound:", s);
     });
-  }, [o.newNotificationSoundPath, o.playSoundOnNewNotification]), y = m((t) => {
+  }, [i.newNotificationSoundPath, i.playSoundOnNewNotification]), y = m((t) => {
     const s = (/* @__PURE__ */ new Date()).toISOString();
     f((n) => (t = Array.isArray(t) ? t : [], t = t.filter((d) => {
       const p = d.expDate && new Date(d.expDate * 1e3).toISOString() < s, D = new Date(d.date).getTime() > new Date(s).getTime() + 1e3;
@@ -183,52 +183,56 @@ const Z = async (e, c, o, a, f, N, h) => {
       ...n
     ]));
   }, []), u = X(() => {
-    const t = e.client ? e.client : i.init({
-      clientId: o.clientId,
-      userId: o.user.id,
-      hashedUserId: o.hashedUserId,
+    const t = e.client ? e.client : o.init({
+      clientId: i.clientId,
+      userId: i.user.id,
+      hashedUserId: i.hashedUserId,
       onNewInAppNotifications: (s) => {
-        x(), y(s);
-      }
+        W(), y(s);
+      },
+      host: i.apiURL,
+      websocketHost: i.wsURL
     });
     return t.identify({
-      email: o.user.email,
-      number: o.user.number
+      email: i.user.email,
+      number: i.user.number
     }), t;
   }, [
-    o.clientId,
-    o.user.id,
-    o.user.email,
-    o.user.number,
-    o.hashedUserId,
+    i.clientId,
+    i.user.id,
+    i.user.email,
+    i.user.number,
+    i.hashedUserId,
     y,
-    x,
-    e.client
-  ]), E = m(
+    W,
+    e.client,
+    i.apiURL,
+    i.wsURL
+  ]), x = m(
     async (t, s) => {
       const n = await u.rest.getNotifications(t, s);
-      C(n.oldestReceived), U(n.couldLoadMore), y(n.notifications);
+      T(n.oldestReceived), C(n.couldLoadMore), y(n.notifications);
     },
     [y, u.rest]
-  ), L = T(A), R = T(w), $ = T(k);
+  ), E = U(A), R = U(w), $ = U(k);
   P(() => {
-    L.current = A, R.current = w, $.current = k;
+    E.current = A, R.current = w, $.current = k;
   }, [A, w, k]);
   const O = m(
     async (t) => {
-      if (!(!t && (!L.current || R.current))) {
+      if (!(!t && (!E.current || R.current))) {
         S(!0);
         try {
-          await E(
+          await x(
             t ? (/* @__PURE__ */ new Date()).toISOString() : $.current,
-            t ? o.initialLoadMaxCount : 1e3
+            t ? i.initialLoadMaxCount : 1e3
           );
         } finally {
           S(!1);
         }
       }
     },
-    [o.initialLoadMaxCount, E]
+    [i.initialLoadMaxCount, x]
   ), B = async (t) => {
     if (!a) return;
     const s = (/* @__PURE__ */ new Date()).toISOString(), n = a.filter((r) => t.includes(r.id) && !r.clicked).map((r) => r.id);
@@ -289,8 +293,8 @@ const Z = async (e, c, o, a, f, N, h) => {
       });
     });
   }, M = m(() => {
-    "serviceWorker" in navigator && navigator.serviceWorker.register(o.customServiceWorkerPath).then(async (t) => {
-      b(!1), ie().then(async (s) => {
+    "serviceWorker" in navigator && navigator.serviceWorker.register(i.customServiceWorkerPath).then(async (t) => {
+      N(!1), ne().then(async (s) => {
         s === "granted" ? await t.pushManager.subscribe({
           userVisibleOnly: !0,
           applicationServerKey: l == null ? void 0 : l.userAccountMetadata.environmentVapidPublicKey
@@ -323,25 +327,25 @@ const Z = async (e, c, o, a, f, N, h) => {
     });
   }, [
     u,
-    o.customServiceWorkerPath,
+    i.customServiceWorkerPath,
     l == null ? void 0 : l.userAccountMetadata.environmentVapidPublicKey
   ]);
   P(() => {
-    f([]), S(!1), h(void 0), C((/* @__PURE__ */ new Date()).toISOString()), U(!0), O(!0), u.openWebSocket(), u.getPreferences().then((t) => {
+    f([]), S(!1), h(void 0), T((/* @__PURE__ */ new Date()).toISOString()), C(!0), O(!0), u.openWebSocket(), u.getPreferences().then((t) => {
       h(t);
     });
   }, [u, O, M]), P(() => {
-    F && "Notification" in window && typeof Notification.requestPermission == "function" && Notification.permission !== "default" && b(!1), v === "AUTOMATIC" && (b(
+    F && "Notification" in window && typeof Notification.requestPermission == "function" && Notification.permission !== "default" && N(!1), v === "AUTOMATIC" && (N(
       localStorage.getItem("hideWebPushOptInMessage") !== "true"
     ), u.getUserAccountMetadata().then((t) => {
-      g(t), b(t.userAccountMetadata.hasWebPushEnabled);
+      g(t), N(t.userAccountMetadata.hasWebPushEnabled);
     }));
   }, [u, v]), P(() => {
-    W && M();
-  }, [W, M]);
+    L && M();
+  }, [L, M]);
   const z = {
     notifications: a,
-    preferences: N,
+    preferences: b,
     userAccountMetaData: l,
     webPushOptInMessage: v,
     loadNotifications: O,
@@ -352,18 +356,18 @@ const Z = async (e, c, o, a, f, N, h) => {
     updateDelivery: _,
     updateDeliveries: j,
     getClient: () => u,
-    setWebPushOptInMessage: b,
+    setWebPushOptInMessage: N,
     setWebPushOptIn: J
   };
   return /* @__PURE__ */ Q(H.Provider, { value: z, children: e.children });
-}, ne = () => {
+}, ie = () => {
   const e = Y(H);
   if (!e)
     throw new Error("useMyContext must be used within a MyProvider");
   return e;
 };
-te.useNotificationAPIContext = ne;
-const ie = async () => {
+te.useNotificationAPIContext = ie;
+const ne = async () => {
   if (F && "Notification" in window && typeof Notification.requestPermission == "function")
     try {
       return await Notification.requestPermission();

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@notificationapi/react",
   "private": false,
-  "version": "1.0.2",
+  "version": "1.1.0",
   "type": "module",
+  "overrides": {
+    "esbuild": "^0.25.0",
+    "vue-template-compiler": "^2.7.16"
+  },
   "browserslist": [
     "last 2 versions",
     "last 2 ChromeAndroid versions",
@@ -59,7 +63,7 @@
     "@fontsource/roboto": "^5.1.1",
     "@mui/icons-material": "^6.3.1",
     "@mui/material": "^6.3.1",
-    "@notificationapi/core": "^0.0.12",
+    "@notificationapi/core": "^0.0.15",
     "javascript-time-ago": "^2.5.10",
     "liquidjs": "^10.14.0",
     "rc-virtual-list": "^3.11.5",