@rpcbase/client 0.443.0 → 0.445.0

package/dist/index.js

@@ -2420,7 +2420,7 @@ const getNormalizedNotificationAppName = (appName) => {
 const getScopedNotificationKey = (userId, appName) => `${encodeURIComponent(appName)}:${encodeURIComponent(userId)}`;
 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, notificationId) => `${DELIVERY_KEY_PREFIX}${getScopedNotificationKey(userId, appName)}:${encodeURIComponent(notificationId)}`;
+const getDeliveryKey = (userId, appName, mode, notificationId) => `${DELIVERY_KEY_PREFIX}${mode}:${getScopedNotificationKey(userId, appName)}:${encodeURIComponent(notificationId)}`;
 const getDeliveryLockName = (userId, appName) => `${DELIVERY_LOCK_PREFIX}${getScopedNotificationKey(userId, appName)}`;
 const getFallbackDeliveryLockKey = (userId, appName) => `${FALLBACK_DELIVERY_LOCK_KEY_PREFIX}${getScopedNotificationKey(userId, appName)}`;
 const getLocalStorage = () => {
@@ -2501,7 +2501,7 @@ const claimNotificationDeliveriesFromStorage = (items, userId, appName, mode) =>
   const now = Date.now();
   const claimed = [];
   for (const item of items) {
-    const key = getDeliveryKey(userId, appName, item.id);
+    const key = getDeliveryKey(userId, appName, mode, item.id);
     const current = parseJsonRecord(storage.getItem(key));
     const deliveredAt = typeof current?.deliveredAt === "number" ? current.deliveredAt : 0;
     if (deliveredAt && now - deliveredAt < DELIVERY_TTL_MS) continue;
@@ -2606,6 +2606,11 @@ const showInAppNotifications = (items) => {
     });
   }
 };
+const sortNotificationsByCreatedAt = (items) => [...items].sort((a2, b2) => {
+  const aMs = Date.parse(a2.createdAt);
+  const bMs = Date.parse(b2.createdAt);
+  return (Number.isFinite(aMs) ? aMs : 0) - (Number.isFinite(bMs) ? bMs : 0);
+});
 const canShowNativeNotification = () => {
   if (typeof window === "undefined") return false;
   if (!("Notification" in window)) return false;
@@ -2662,16 +2667,34 @@ const showNotificationsForCurrentFocusState = async (items, userId, appName) =>
     if (claimed2.length > 0) {
       showInAppNotifications(claimed2);
     }
-    return;
+    return [];
   }
-  if (!canShowNativeNotification()) return;
+  if (!canShowNativeNotification()) return items;
   const claimed = await claimNotificationDeliveries(items, userId, appName, "native");
   if (claimed.length > 0) {
     showNativeNotifications(claimed);
   }
+  return items;
+};
+const flushPendingInAppToasts = (pendingInAppToastItems, userId, appName) => {
+  if (!isDocumentActive()) return;
+  const pending = sortNotificationsByCreatedAt(Array.from(pendingInAppToastItems.current.values()));
+  pendingInAppToastItems.current.clear();
+  if (pending.length === 0) return;
+  void claimNotificationDeliveries(pending, userId, appName, "in-app").then((claimed) => {
+    if (claimed.length > 0) {
+      showInAppNotifications(claimed);
+    }
+  });
+};
+const queuePendingInAppToasts = (pendingInAppToastItems, items, userId, appName) => {
+  for (const item of items) {
+    pendingInAppToastItems.current.set(item.id, item);
+  }
+  flushPendingInAppToasts(pendingInAppToastItems, userId, appName);
 };
 function NotificationsRealtimeProvider(t0) {
-  const $ = c(57);
+  const $ = c(63);
   const {
     userId,
     appName,
@@ -2870,29 +2893,38 @@ function NotificationsRealtimeProvider(t0) {
   const toastStartMs = useRef(t15);
   let t16;
   if ($[31] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t16 = () => {
-      hasSeededToastIds.current = false;
-      lastToastIds.current = /* @__PURE__ */ new Set();
-      toastStartMs.current = Date.now();
-    };
+    t16 = /* @__PURE__ */ new Map();
     $[31] = t16;
   } else {
     t16 = $[31];
   }
+  const pendingInAppToastItems = useRef(t16);
   let t17;
-  if ($[32] !== normalizedAppName || $[33] !== trimmedUserId) {
-    t17 = [normalizedAppName, trimmedUserId];
-    $[32] = normalizedAppName;
-    $[33] = trimmedUserId;
-    $[34] = t17;
+  if ($[32] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    t17 = () => {
+      hasSeededToastIds.current = false;
+      lastToastIds.current = /* @__PURE__ */ new Set();
+      toastStartMs.current = Date.now();
+      pendingInAppToastItems.current = /* @__PURE__ */ new Map();
+    };
+    $[32] = t17;
   } else {
-    t17 = $[34];
+    t17 = $[32];
   }
-  useEffect(t16, t17);
   let t18;
+  if ($[33] !== normalizedAppName || $[34] !== trimmedUserId) {
+    t18 = [normalizedAppName, trimmedUserId];
+    $[33] = normalizedAppName;
+    $[34] = trimmedUserId;
+    $[35] = t18;
+  } else {
+    t18 = $[35];
+  }
+  useEffect(t17, t18);
   let t19;
-  if ($[35] !== canUseRts || $[36] !== normalizedAppName || $[37] !== trimmedUserId) {
-    t18 = () => {
+  let t20;
+  if ($[36] !== canUseRts || $[37] !== normalizedAppName || $[38] !== trimmedUserId) {
+    t19 = () => {
       if (!canUseRts) {
         return;
       }
@@ -2918,21 +2950,52 @@ function NotificationsRealtimeProvider(t0) {
         removeState();
       };
     };
-    t19 = [canUseRts, normalizedAppName, trimmedUserId];
-    $[35] = canUseRts;
-    $[36] = normalizedAppName;
-    $[37] = trimmedUserId;
-    $[38] = t18;
+    t20 = [canUseRts, normalizedAppName, trimmedUserId];
+    $[36] = canUseRts;
+    $[37] = normalizedAppName;
+    $[38] = trimmedUserId;
     $[39] = t19;
+    $[40] = t20;
   } else {
-    t18 = $[38];
     t19 = $[39];
+    t20 = $[40];
   }
-  useEffect(t18, t19);
-  let t20;
+  useEffect(t19, t20);
   let t21;
-  if ($[40] !== canUseRts || $[41] !== normalizedAppName || $[42] !== notifications || $[43] !== notificationsQuery.loading || $[44] !== toastOnNew || $[45] !== trimmedUserId) {
-    t20 = () => {
+  let t22;
+  if ($[41] !== canUseRts || $[42] !== normalizedAppName || $[43] !== trimmedUserId) {
+    t21 = () => {
+      if (!canUseRts) {
+        return;
+      }
+      if (typeof window === "undefined" || typeof document === "undefined") {
+        return;
+      }
+      const handlePendingInAppToastFlush = () => {
+        flushPendingInAppToasts(pendingInAppToastItems, trimmedUserId, normalizedAppName);
+      };
+      window.addEventListener("focus", handlePendingInAppToastFlush);
+      document.addEventListener("visibilitychange", handlePendingInAppToastFlush);
+      return () => {
+        window.removeEventListener("focus", handlePendingInAppToastFlush);
+        document.removeEventListener("visibilitychange", handlePendingInAppToastFlush);
+      };
+    };
+    t22 = [canUseRts, normalizedAppName, trimmedUserId];
+    $[41] = canUseRts;
+    $[42] = normalizedAppName;
+    $[43] = trimmedUserId;
+    $[44] = t21;
+    $[45] = t22;
+  } else {
+    t21 = $[44];
+    t22 = $[45];
+  }
+  useEffect(t21, t22);
+  let t23;
+  let t24;
+  if ($[46] !== canUseRts || $[47] !== normalizedAppName || $[48] !== notifications || $[49] !== notificationsQuery.loading || $[50] !== toastOnNew || $[51] !== trimmedUserId) {
+    t23 = () => {
       if (!toastOnNew) {
         return;
       }
@@ -2953,7 +3016,9 @@ function NotificationsRealtimeProvider(t0) {
           return createdAtMs >= toastStartMs.current - NEW_NOTIFICATION_START_TOLERANCE_MS;
         });
         if (eligible.length) {
-          showNotificationsForCurrentFocusState(eligible, trimmedUserId, normalizedAppName);
+          showNotificationsForCurrentFocusState(eligible, trimmedUserId, normalizedAppName).then((pending) => {
+            queuePendingInAppToasts(pendingInAppToastItems, pending, trimmedUserId, normalizedAppName);
+          });
         }
         return;
       }
@@ -2974,52 +3039,54 @@ function NotificationsRealtimeProvider(t0) {
       if (!eligible_0.length) {
         return;
       }
-      showNotificationsForCurrentFocusState(eligible_0, trimmedUserId, normalizedAppName);
+      showNotificationsForCurrentFocusState(eligible_0, trimmedUserId, normalizedAppName).then((pending_0) => {
+        queuePendingInAppToasts(pendingInAppToastItems, pending_0, trimmedUserId, normalizedAppName);
+      });
     };
-    t21 = [canUseRts, normalizedAppName, notifications, notificationsQuery.loading, toastOnNew, trimmedUserId];
-    $[40] = canUseRts;
-    $[41] = normalizedAppName;
-    $[42] = notifications;
-    $[43] = notificationsQuery.loading;
-    $[44] = toastOnNew;
-    $[45] = trimmedUserId;
-    $[46] = t20;
-    $[47] = t21;
+    t24 = [canUseRts, normalizedAppName, notifications, notificationsQuery.loading, toastOnNew, trimmedUserId];
+    $[46] = canUseRts;
+    $[47] = normalizedAppName;
+    $[48] = notifications;
+    $[49] = notificationsQuery.loading;
+    $[50] = toastOnNew;
+    $[51] = trimmedUserId;
+    $[52] = t23;
+    $[53] = t24;
   } else {
-    t20 = $[46];
-    t21 = $[47];
+    t23 = $[52];
+    t24 = $[53];
   }
-  useEffect(t20, t21);
-  let t22;
-  if ($[48] !== notifications || $[49] !== notificationsQuery.error || $[50] !== notificationsQuery.loading || $[51] !== unreadCount || $[52] !== unseenCount) {
-    t22 = {
+  useEffect(t23, t24);
+  let t25;
+  if ($[54] !== notifications || $[55] !== notificationsQuery.error || $[56] !== notificationsQuery.loading || $[57] !== unreadCount || $[58] !== unseenCount) {
+    t25 = {
       notifications,
       unreadCount,
       unseenCount,
       loading: notificationsQuery.loading,
       error: notificationsQuery.error
     };
-    $[48] = notifications;
-    $[49] = notificationsQuery.error;
-    $[50] = notificationsQuery.loading;
-    $[51] = unreadCount;
-    $[52] = unseenCount;
-    $[53] = t22;
+    $[54] = notifications;
+    $[55] = notificationsQuery.error;
+    $[56] = notificationsQuery.loading;
+    $[57] = unreadCount;
+    $[58] = unseenCount;
+    $[59] = t25;
   } else {
-    t22 = $[53];
-  }
-  const value = t22;
-  const t23 = canUseRts ? value : null;
-  let t24;
-  if ($[54] !== children || $[55] !== t23) {
-    t24 = /* @__PURE__ */ jsx(NotificationsRealtimeContext.Provider, { value: t23, children });
-    $[54] = children;
-    $[55] = t23;
-    $[56] = t24;
+    t25 = $[59];
+  }
+  const value = t25;
+  const t26 = canUseRts ? value : null;
+  let t27;
+  if ($[60] !== children || $[61] !== t26) {
+    t27 = /* @__PURE__ */ jsx(NotificationsRealtimeContext.Provider, { value: t26, children });
+    $[60] = children;
+    $[61] = t26;
+    $[62] = t27;
   } else {
-    t24 = $[56];
+    t27 = $[62];
   }
-  return t24;
+  return t27;
 }
 function _temp5(n_2) {
   return n_2.id;