@rpcbase/client 0.459.0 → 0.461.0

package/dist/index.js

@@ -373,7 +373,7 @@ const Toaster = () => {
   } else {
     t0 = $[0];
   }
-  useEffect(_temp8, t0);
+  useEffect(_temp8$1, t0);
   const requested = useSyncExternalStore(subscribeToasterRequested, getToasterRequested, getToasterRequested);
   if (!requested) {
     return null;
@@ -416,23 +416,23 @@ function _temp4$1() {
 function _temp5$1() {
   return startToaster();
 }
-function _temp6() {
+function _temp6$1() {
   return startToaster();
 }
-function _temp7() {
+function _temp7$1() {
   if (typeof window.requestIdleCallback === "function") {
     window.requestIdleCallback(_temp5$1, {
       timeout: 2e3
     });
     return;
   }
-  window.setTimeout(_temp6, 150);
+  window.setTimeout(_temp6$1, 150);
 }
-function _temp8() {
+function _temp8$1() {
   if (typeof window === "undefined") {
     return;
   }
-  const startDeferred = _temp7;
+  const startDeferred = _temp7$1;
   if (isPageLoaded()) {
     startDeferred();
     return;
@@ -2566,13 +2566,15 @@ const toIso = (value) => {
   return void 0;
 };
 const toNotificationItem = (doc) => {
-  const id = typeof doc._id === "string" ? doc._id : String(doc._id ?? "");
+  const rawId = doc.notificationId ?? doc._id;
+  const id = typeof rawId === "string" ? rawId : String(rawId ?? "");
   if (!id) return null;
   if (typeof doc.title !== "string") return null;
   return {
     id,
     topic: typeof doc.topic === "string" ? doc.topic : void 0,
     tag: typeof doc.tag === "string" ? doc.tag : void 0,
+    deliveryId: typeof doc.deliveryId === "string" ? doc.deliveryId : void 0,
     title: doc.title,
     body: doc.body,
     image: doc.image,
@@ -2644,6 +2646,7 @@ const getScopedNotificationKey = (userId, appName) => `${encodeURIComponent(appN
 const getTabStateKey = (userId, appName) => `${TAB_STATE_KEY_PREFIX}${getScopedNotificationKey(userId, appName)}:${NOTIFICATION_TAB_ID}`;
 const getTabStateKeyPrefix = (userId, appName) => `${TAB_STATE_KEY_PREFIX}${getScopedNotificationKey(userId, appName)}:`;
 const getDeliveryKey = (userId, appName, mode, notificationId) => `${DELIVERY_KEY_PREFIX}${mode}:${getScopedNotificationKey(userId, appName)}:${encodeURIComponent(notificationId)}`;
+const getNotificationDeliveryId = (item) => item.deliveryId ?? `${item.id}:${item.createdAt}`;
 const getDeliveryLockName = (userId, appName) => `${DELIVERY_LOCK_PREFIX}${getScopedNotificationKey(userId, appName)}`;
 const getFallbackDeliveryLockKey = (userId, appName) => `${FALLBACK_DELIVERY_LOCK_KEY_PREFIX}${getScopedNotificationKey(userId, appName)}`;
 const getLocalStorage = () => {
@@ -2734,20 +2737,20 @@ const removeNotificationDeliveryMarkers = (items, userId, appName, mode) => {
   if (!storage) return;
   try {
     for (const item of items) {
-      storage.removeItem(getDeliveryKey(userId, appName, mode, item.id));
+      storage.removeItem(getDeliveryKey(userId, appName, mode, getNotificationDeliveryId(item)));
     }
   } catch {
     return;
   }
 };
-const filterNotificationsWithoutDelivery = (items, userId, appName, mode) => items.filter((item) => !hasRecentNotificationDelivery(userId, appName, mode, item.id));
+const filterNotificationsWithoutDelivery = (items, userId, appName, mode) => items.filter((item) => !hasRecentNotificationDelivery(userId, appName, mode, getNotificationDeliveryId(item)));
 const claimNotificationDeliveriesFromStorage = (items, userId, appName, mode) => {
   const storage = getLocalStorage();
   if (!storage) return items;
   const now = Date.now();
   const claimed = [];
   for (const item of items) {
-    const key = getDeliveryKey(userId, appName, mode, item.id);
+    const key = getDeliveryKey(userId, appName, mode, getNotificationDeliveryId(item));
     const current = parseJsonRecord(storage.getItem(key));
     const deliveredAt = typeof current?.deliveredAt === "number" ? current.deliveredAt : 0;
     if (deliveredAt && now - deliveredAt < DELIVERY_TTL_MS) continue;
@@ -2838,7 +2841,7 @@ const claimNotificationDeliveries = async (items, userId, appName, mode) => {
 };
 const showCustomInAppNotification = (item, renderer) => {
   const action = getNotificationAction(item);
-  let toastId = item.tag ? `${NATIVE_NOTIFICATION_TAG_PREFIX}:${encodeURIComponent(item.tag)}` : void 0;
+  let toastId;
   const controls = {
     dismiss: () => {
       if (toastId !== void 0) toast.dismiss(toastId);
@@ -2852,7 +2855,6 @@ const showCustomInAppNotification = (item, renderer) => {
     const content = renderer(item, controls);
     if (content === null || content === void 0) return false;
     toastId = toast.custom(() => /* @__PURE__ */ jsx(Fragment, { children: content }), {
-      id: toastId,
       position: "top-right"
     });
     return true;
@@ -2873,7 +2875,6 @@ const showInAppNotifications = (items, renderNotificationToast) => {
     if (renderNotificationToast && showCustomInAppNotification(item, renderNotificationToast)) continue;
     toast(item.title, {
       ...notificationToastOptions,
-      id: item.tag ? `${NATIVE_NOTIFICATION_TAG_PREFIX}:${encodeURIComponent(item.tag)}` : void 0,
       description: item.body
     });
   }
@@ -2894,7 +2895,7 @@ const getNativeNotificationOptions = (item) => {
   return {
     body: item.body,
     icon: item.image,
-    tag: `${NATIVE_NOTIFICATION_TAG_PREFIX}:${encodeURIComponent(item.tag ?? item.id)}`,
+    tag: `${NATIVE_NOTIFICATION_TAG_PREFIX}:${encodeURIComponent(getNotificationDeliveryId(item))}`,
     data: {
       ...item.data,
       notificationId: item.id,
@@ -2972,12 +2973,12 @@ const flushPendingInAppToasts = (pendingInAppToastItems, userId, appName, render
 };
 const queuePendingInAppToasts = (pendingInAppToastItems, items, userId, appName, renderNotificationToast) => {
   for (const item of items) {
-    pendingInAppToastItems.current.set(item.id, item);
+    pendingInAppToastItems.current.set(getNotificationDeliveryId(item), item);
   }
   flushPendingInAppToasts(pendingInAppToastItems, userId, appName, renderNotificationToast);
 };
 function NotificationsRealtimeProvider(t0) {
-  const $ = c(66);
+  const $ = c(78);
   const {
     userId,
     appName,
@@ -2988,6 +2989,7 @@ function NotificationsRealtimeProvider(t0) {
   } = t0;
   const limit = t1 === void 0 ? 200 : t1;
   const toastOnNew = t2 === void 0 ? true : t2;
+  const location = useLocation();
   let t3;
   if ($[0] !== userId) {
     t3 = typeof userId === "string" ? userId.trim() : "";
@@ -3116,99 +3118,168 @@ function NotificationsRealtimeProvider(t0) {
   }
   const notificationsQuery = useQuery("RBNotification", query, t10);
   let t11;
+  if ($[22] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    t11 = {
+      createdAt: -1
+    };
+    $[22] = t11;
+  } else {
+    t11 = $[22];
+  }
+  let t12;
+  if ($[23] !== canUseRts || $[24] !== limit) {
+    t12 = {
+      key: "rb.notification-deliveries",
+      sort: t11,
+      limit,
+      enabled: canUseRts
+    };
+    $[23] = canUseRts;
+    $[24] = limit;
+    $[25] = t12;
+  } else {
+    t12 = $[25];
+  }
+  const notificationDeliveriesQuery = useQuery("RBNotificationDelivery", query, t12);
+  let t13;
   bb1: {
     const raw = notificationsQuery.data;
     if (!Array.isArray(raw)) {
-      let t123;
-      if ($[22] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-        t123 = [];
-        $[22] = t123;
+      let t143;
+      if ($[26] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+        t143 = [];
+        $[26] = t143;
       } else {
-        t123 = $[22];
+        t143 = $[26];
       }
-      t11 = t123;
+      t13 = t143;
       break bb1;
     }
-    let t122;
-    if ($[23] !== raw) {
-      t122 = raw.map(_temp).filter(_temp2);
-      $[23] = raw;
-      $[24] = t122;
+    let t142;
+    if ($[27] !== raw) {
+      t142 = raw.map(_temp).filter(_temp2);
+      $[27] = raw;
+      $[28] = t142;
     } else {
-      t122 = $[24];
+      t142 = $[28];
     }
-    t11 = t122;
+    t13 = t142;
   }
-  const notifications = t11;
-  let t12;
-  if ($[25] !== notifications) {
-    t12 = notifications.reduce(_temp3, 0);
-    $[25] = notifications;
-    $[26] = t12;
+  const notifications = t13;
+  let t14;
+  bb2: {
+    const raw_0 = notificationDeliveriesQuery.data;
+    if (!Array.isArray(raw_0)) {
+      let t153;
+      if ($[29] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+        t153 = [];
+        $[29] = t153;
+      } else {
+        t153 = $[29];
+      }
+      t14 = t153;
+      break bb2;
+    }
+    let t152;
+    if ($[30] !== raw_0) {
+      t152 = raw_0.map(_temp3).filter(_temp4);
+      $[30] = raw_0;
+      $[31] = t152;
+    } else {
+      t152 = $[31];
+    }
+    t14 = t152;
+  }
+  const notificationDeliveries = t14;
+  let t15;
+  if ($[32] !== notifications) {
+    t15 = notifications.reduce(_temp5, 0);
+    $[32] = notifications;
+    $[33] = t15;
   } else {
-    t12 = $[26];
+    t15 = $[33];
   }
-  const unreadCount = t12;
-  let t13;
-  if ($[27] !== notifications) {
-    t13 = notifications.reduce(_temp4, 0);
-    $[27] = notifications;
-    $[28] = t13;
+  const unreadCount = t15;
+  let t16;
+  if ($[34] !== notifications) {
+    t16 = notifications.reduce(_temp6, 0);
+    $[34] = notifications;
+    $[35] = t16;
   } else {
-    t13 = $[28];
+    t16 = $[35];
   }
-  const unseenCount = t13;
-  let t14;
-  if ($[29] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t14 = /* @__PURE__ */ new Set();
-    $[29] = t14;
+  const unseenCount = t16;
+  let t17;
+  if ($[36] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    t17 = /* @__PURE__ */ new Set();
+    $[36] = t17;
   } else {
-    t14 = $[29];
+    t17 = $[36];
   }
-  const lastToastIds = useRef(t14);
+  const lastToastDeliveryIds = useRef(t17);
   const hasSeededToastIds = useRef(false);
-  let t15;
-  if ($[30] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t15 = Date.now();
-    $[30] = t15;
+  let t18;
+  if ($[37] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    t18 = Date.now();
+    $[37] = t18;
   } else {
-    t15 = $[30];
+    t18 = $[37];
   }
-  const toastStartMs = useRef(t15);
-  let t16;
-  if ($[31] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t16 = /* @__PURE__ */ new Map();
-    $[31] = t16;
+  const toastStartMs = useRef(t18);
+  let t19;
+  if ($[38] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    t19 = /* @__PURE__ */ new Map();
+    $[38] = t19;
   } else {
-    t16 = $[31];
+    t19 = $[38];
   }
-  const pendingInAppToastItems = useRef(t16);
-  let t17;
-  if ($[32] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t17 = () => {
+  const pendingInAppToastItems = useRef(t19);
+  let t20;
+  let t21;
+  if ($[39] !== canUseRts || $[40] !== location.pathname || $[41] !== location.search) {
+    t20 = () => {
+      if (!canUseRts) {
+        return;
+      }
+      markNotificationsReadByUrl(`${location.pathname}${location.search}`).then(_temp7).catch(_temp8);
+    };
+    t21 = [canUseRts, location.pathname, location.search];
+    $[39] = canUseRts;
+    $[40] = location.pathname;
+    $[41] = location.search;
+    $[42] = t20;
+    $[43] = t21;
+  } else {
+    t20 = $[42];
+    t21 = $[43];
+  }
+  useEffect(t20, t21);
+  let t22;
+  if ($[44] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    t22 = () => {
       hasSeededToastIds.current = false;
-      lastToastIds.current = /* @__PURE__ */ new Set();
+      lastToastDeliveryIds.current = /* @__PURE__ */ new Set();
       toastStartMs.current = Date.now();
       pendingInAppToastItems.current = /* @__PURE__ */ new Map();
     };
-    $[32] = t17;
+    $[44] = t22;
   } else {
-    t17 = $[32];
+    t22 = $[44];
   }
-  let t18;
-  if ($[33] !== normalizedAppName || $[34] !== trimmedUserId) {
-    t18 = [normalizedAppName, trimmedUserId];
-    $[33] = normalizedAppName;
-    $[34] = trimmedUserId;
-    $[35] = t18;
+  let t23;
+  if ($[45] !== normalizedAppName || $[46] !== trimmedUserId) {
+    t23 = [normalizedAppName, trimmedUserId];
+    $[45] = normalizedAppName;
+    $[46] = trimmedUserId;
+    $[47] = t23;
   } else {
-    t18 = $[35];
+    t23 = $[47];
   }
-  useEffect(t17, t18);
-  let t19;
-  let t20;
-  if ($[36] !== canUseRts || $[37] !== normalizedAppName || $[38] !== trimmedUserId) {
-    t19 = () => {
+  useEffect(t22, t23);
+  let t24;
+  let t25;
+  if ($[48] !== canUseRts || $[49] !== normalizedAppName || $[50] !== trimmedUserId) {
+    t24 = () => {
       if (!canUseRts) {
         return;
       }
@@ -3234,21 +3305,21 @@ function NotificationsRealtimeProvider(t0) {
         removeState();
       };
     };
-    t20 = [canUseRts, normalizedAppName, trimmedUserId];
-    $[36] = canUseRts;
-    $[37] = normalizedAppName;
-    $[38] = trimmedUserId;
-    $[39] = t19;
-    $[40] = t20;
+    t25 = [canUseRts, normalizedAppName, trimmedUserId];
+    $[48] = canUseRts;
+    $[49] = normalizedAppName;
+    $[50] = trimmedUserId;
+    $[51] = t24;
+    $[52] = t25;
   } else {
-    t19 = $[39];
-    t20 = $[40];
+    t24 = $[51];
+    t25 = $[52];
   }
-  useEffect(t19, t20);
-  let t21;
-  let t22;
-  if ($[41] !== canUseRts || $[42] !== normalizedAppName || $[43] !== renderNotificationToast || $[44] !== trimmedUserId) {
-    t21 = () => {
+  useEffect(t24, t25);
+  let t26;
+  let t27;
+  if ($[53] !== canUseRts || $[54] !== normalizedAppName || $[55] !== renderNotificationToast || $[56] !== trimmedUserId) {
+    t26 = () => {
       if (!canUseRts) {
         return;
       }
@@ -3265,35 +3336,35 @@ function NotificationsRealtimeProvider(t0) {
         document.removeEventListener("visibilitychange", handlePendingInAppToastFlush);
       };
     };
-    t22 = [canUseRts, normalizedAppName, renderNotificationToast, trimmedUserId];
-    $[41] = canUseRts;
-    $[42] = normalizedAppName;
-    $[43] = renderNotificationToast;
-    $[44] = trimmedUserId;
-    $[45] = t21;
-    $[46] = t22;
-  } else {
-    t21 = $[45];
-    t22 = $[46];
-  }
-  useEffect(t21, t22);
-  let t23;
-  let t24;
-  if ($[47] !== canUseRts || $[48] !== normalizedAppName || $[49] !== notifications || $[50] !== notificationsQuery.loading || $[51] !== renderNotificationToast || $[52] !== toastOnNew || $[53] !== trimmedUserId) {
-    t23 = () => {
+    t27 = [canUseRts, normalizedAppName, renderNotificationToast, trimmedUserId];
+    $[53] = canUseRts;
+    $[54] = normalizedAppName;
+    $[55] = renderNotificationToast;
+    $[56] = trimmedUserId;
+    $[57] = t26;
+    $[58] = t27;
+  } else {
+    t26 = $[57];
+    t27 = $[58];
+  }
+  useEffect(t26, t27);
+  let t28;
+  let t29;
+  if ($[59] !== canUseRts || $[60] !== normalizedAppName || $[61] !== notificationDeliveries || $[62] !== notificationDeliveriesQuery.loading || $[63] !== renderNotificationToast || $[64] !== toastOnNew || $[65] !== trimmedUserId) {
+    t28 = () => {
       if (!toastOnNew) {
         return;
       }
       if (!canUseRts) {
         return;
       }
-      if (notificationsQuery.loading) {
+      if (notificationDeliveriesQuery.loading) {
         return;
       }
       if (!hasSeededToastIds.current) {
         hasSeededToastIds.current = true;
-        lastToastIds.current = new Set(notifications.map(_temp5));
-        const eligible = notifications.filter((n_3) => {
+        lastToastDeliveryIds.current = new Set(notificationDeliveries.map(getNotificationDeliveryId));
+        const eligible = notificationDeliveries.filter((n_3) => {
           const createdAtMs = Date.parse(n_3.createdAt);
           if (!Number.isFinite(createdAtMs)) {
             return false;
@@ -3307,12 +3378,12 @@ function NotificationsRealtimeProvider(t0) {
         }
         return;
       }
-      const nextNew = notifications.filter((n_4) => !lastToastIds.current.has(n_4.id));
+      const nextNew = notificationDeliveries.filter((n_4) => !lastToastDeliveryIds.current.has(getNotificationDeliveryId(n_4)));
       if (!nextNew.length) {
         return;
       }
       for (const n_5 of nextNew) {
-        lastToastIds.current.add(n_5.id);
+        lastToastDeliveryIds.current.add(getNotificationDeliveryId(n_5));
       }
       const eligible_0 = nextNew.filter((n_6) => {
         const createdAtMs_0 = Date.parse(n_6.createdAt);
@@ -3328,70 +3399,80 @@ function NotificationsRealtimeProvider(t0) {
         queuePendingInAppToasts(pendingInAppToastItems, pending_0, trimmedUserId, normalizedAppName, renderNotificationToast);
       });
     };
-    t24 = [canUseRts, normalizedAppName, notifications, notificationsQuery.loading, renderNotificationToast, toastOnNew, trimmedUserId];
-    $[47] = canUseRts;
-    $[48] = normalizedAppName;
-    $[49] = notifications;
-    $[50] = notificationsQuery.loading;
-    $[51] = renderNotificationToast;
-    $[52] = toastOnNew;
-    $[53] = trimmedUserId;
-    $[54] = t23;
-    $[55] = t24;
-  } else {
-    t23 = $[54];
-    t24 = $[55];
-  }
-  useEffect(t23, t24);
-  let t25;
-  if ($[56] !== notifications || $[57] !== notificationsQuery.error || $[58] !== notificationsQuery.loading || $[59] !== unreadCount || $[60] !== unseenCount) {
-    t25 = {
+    t29 = [canUseRts, normalizedAppName, notificationDeliveries, notificationDeliveriesQuery.loading, renderNotificationToast, toastOnNew, trimmedUserId];
+    $[59] = canUseRts;
+    $[60] = normalizedAppName;
+    $[61] = notificationDeliveries;
+    $[62] = notificationDeliveriesQuery.loading;
+    $[63] = renderNotificationToast;
+    $[64] = toastOnNew;
+    $[65] = trimmedUserId;
+    $[66] = t28;
+    $[67] = t29;
+  } else {
+    t28 = $[66];
+    t29 = $[67];
+  }
+  useEffect(t28, t29);
+  let t30;
+  if ($[68] !== notifications || $[69] !== notificationsQuery.error || $[70] !== notificationsQuery.loading || $[71] !== unreadCount || $[72] !== unseenCount) {
+    t30 = {
       notifications,
       unreadCount,
       unseenCount,
       loading: notificationsQuery.loading,
       error: notificationsQuery.error
     };
-    $[56] = notifications;
-    $[57] = notificationsQuery.error;
-    $[58] = notificationsQuery.loading;
-    $[59] = unreadCount;
-    $[60] = unseenCount;
-    $[61] = t25;
+    $[68] = notifications;
+    $[69] = notificationsQuery.error;
+    $[70] = notificationsQuery.loading;
+    $[71] = unreadCount;
+    $[72] = unseenCount;
+    $[73] = t30;
   } else {
-    t25 = $[61];
-  }
-  const value = t25;
-  const t26 = canUseRts ? value : null;
-  let t27;
-  if ($[62] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t27 = /* @__PURE__ */ jsx("style", { children: notificationToastStyles });
-    $[62] = t27;
+    t30 = $[73];
+  }
+  const value = t30;
+  const t31 = canUseRts ? value : null;
+  let t32;
+  if ($[74] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    t32 = /* @__PURE__ */ jsx("style", { children: notificationToastStyles });
+    $[74] = t32;
   } else {
-    t27 = $[62];
+    t32 = $[74];
   }
-  let t28;
-  if ($[63] !== children || $[64] !== t26) {
-    t28 = /* @__PURE__ */ jsxs(NotificationsRealtimeContext.Provider, { value: t26, children: [
-      t27,
+  let t33;
+  if ($[75] !== children || $[76] !== t31) {
+    t33 = /* @__PURE__ */ jsxs(NotificationsRealtimeContext.Provider, { value: t31, children: [
+      t32,
       children
     ] });
-    $[63] = children;
-    $[64] = t26;
-    $[65] = t28;
+    $[75] = children;
+    $[76] = t31;
+    $[77] = t33;
   } else {
-    t28 = $[65];
+    t33 = $[77];
+  }
+  return t33;
+}
+function _temp8() {
+}
+function _temp7(result) {
+  if (result.modifiedCount > 0) {
+    window.dispatchEvent(new Event("rb-notifications-refresh"));
   }
-  return t28;
 }
-function _temp5(n_2) {
-  return n_2.id;
+function _temp6(acc_0, n_2) {
+  return acc_0 + (n_2.seenAt ? 0 : 1);
+}
+function _temp5(acc, n_1) {
+  return acc + (n_1.readAt ? 0 : 1);
 }
-function _temp4(acc_0, n_1) {
-  return acc_0 + (n_1.seenAt ? 0 : 1);
+function _temp4(n_0) {
+  return Boolean(n_0);
 }
-function _temp3(acc, n_0) {
-  return acc + (n_0.readAt ? 0 : 1);
+function _temp3(doc_0) {
+  return toNotificationItem(doc_0);
 }
 function _temp2(n) {
   return Boolean(n);