@rpcbase/client 0.454.0 → 0.455.0

package/dist/browserNotifications.d.ts

@@ -0,0 +1,8 @@
+export type BrowserNotificationInput = {
+    title: string;
+    options?: NotificationOptions;
+    onClick?: () => void;
+};
+export declare const canShowBrowserNotification: () => boolean;
+export declare const showBrowserNotification: ({ title, options, onClick, }: BrowserNotificationInput) => Promise<boolean>;
+//# sourceMappingURL=browserNotifications.d.ts.map

package/dist/browserNotifications.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"browserNotifications.d.ts","sourceRoot":"","sources":["../src/browserNotifications.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB,CAAA;AAiBD,eAAO,MAAM,0BAA0B,QAAO,OAI7C,CAAA;AAED,eAAO,MAAM,uBAAuB,GAAU,8BAI3C,wBAAwB,KAAG,OAAO,CAAC,OAAO,CAoB5C,CAAA"}

package/dist/index.js

@@ -2336,6 +2336,46 @@ const runNotificationDigest = async ({
     skippedReason: result.skippedReason
   };
 };
+const getActiveServiceWorkerRegistration = async () => {
+  if (typeof navigator === "undefined") return null;
+  const serviceWorker = navigator.serviceWorker;
+  if (!serviceWorker || typeof serviceWorker.getRegistration !== "function") return null;
+  try {
+    const registration = await serviceWorker.getRegistration();
+    if (!registration?.active) return null;
+    return typeof registration.showNotification === "function" ? registration : null;
+  } catch {
+    return null;
+  }
+};
+const canShowBrowserNotification = () => {
+  if (typeof window === "undefined") return false;
+  if (!("Notification" in window)) return false;
+  return window.Notification.permission === "granted";
+};
+const showBrowserNotification = async ({
+  title,
+  options,
+  onClick
+}) => {
+  if (!canShowBrowserNotification()) return false;
+  try {
+    const browserNotification = new window.Notification(title, options);
+    if (onClick) {
+      browserNotification.onclick = onClick;
+    }
+    return true;
+  } catch {
+    const registration = await getActiveServiceWorkerRegistration();
+    if (!registration) return false;
+    try {
+      await registration.showNotification(title, options);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+};
 const NEW_NOTIFICATION_START_TOLERANCE_MS = 5e3;
 const NATIVE_NOTIFICATION_TAG_PREFIX = "rb-notification";
 const ACTIVE_TAB_HEARTBEAT_MS = 5e3;
@@ -2688,6 +2728,17 @@ const hasRecentNotificationDelivery = (userId, appName, mode, notificationId) =>
     return false;
   }
 };
+const removeNotificationDeliveryMarkers = (items, userId, appName, mode) => {
+  const storage = getLocalStorage();
+  if (!storage) return;
+  try {
+    for (const item of items) {
+      storage.removeItem(getDeliveryKey(userId, appName, mode, item.id));
+    }
+  } catch {
+    return;
+  }
+};
 const filterNotificationsWithoutDelivery = (items, userId, appName, mode) => items.filter((item) => !hasRecentNotificationDelivery(userId, appName, mode, item.id));
 const claimNotificationDeliveriesFromStorage = (items, userId, appName, mode) => {
   const storage = getLocalStorage();
@@ -2804,54 +2855,55 @@ const sortNotificationsByCreatedAt = (items) => [...items].sort((a2, b2) => {
   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;
-  return window.Notification.permission === "granted";
-};
 const focusNotificationAction = (action) => {
   window.focus();
   if (action) {
     applyNotificationAction(action);
   }
 };
-const showNativeNotification = (item) => {
-  if (!canShowNativeNotification()) return;
-  try {
-    const action = getNotificationAction(item);
-    const browserNotification = new window.Notification(item.title, {
-      body: item.body,
-      icon: item.image,
-      tag: `${NATIVE_NOTIFICATION_TAG_PREFIX}:${item.id}`,
-      data: {
-        ...item.data,
-        notificationId: item.id,
-        link: action?.link ?? "",
-        linkMode: action?.mode ?? "navigate"
-      }
-    });
-    browserNotification.onclick = () => focusNotificationAction(action);
-  } catch {
-    return;
-  }
+const getNativeNotificationOptions = (item) => {
+  const action = getNotificationAction(item);
+  return {
+    body: item.body,
+    icon: item.image,
+    tag: `${NATIVE_NOTIFICATION_TAG_PREFIX}:${item.id}`,
+    data: {
+      ...item.data,
+      notificationId: item.id,
+      link: action?.link ?? "",
+      linkMode: action?.mode ?? "navigate"
+    }
+  };
+};
+const showNativeNotification = async (item) => {
+  const action = getNotificationAction(item);
+  return showBrowserNotification({
+    title: item.title,
+    options: getNativeNotificationOptions(item),
+    onClick: () => focusNotificationAction(action)
+  });
 };
-const showNativeNotifications = (items) => {
-  if (!canShowNativeNotification()) return;
+const showNativeNotifications = async (items) => {
+  if (!canShowBrowserNotification()) return [];
   if (items.length > 3) {
-    try {
-      const browserNotification = new window.Notification(`${items.length} new notifications`, {
+    const shown = await showBrowserNotification({
+      title: `${items.length} new notifications`,
+      options: {
         body: "Open the notifications drawer to view them.",
         tag: `${NATIVE_NOTIFICATION_TAG_PREFIX}:summary`
-      });
-      browserNotification.onclick = () => focusNotificationAction(null);
-    } catch {
-      return;
-    }
-    return;
+      },
+      onClick: () => focusNotificationAction(null)
+    });
+    return shown ? items : [];
   }
+  const shownItems = [];
   for (const item of items) {
-    showNativeNotification(item);
+    const shown = await showNativeNotification(item);
+    if (shown) {
+      shownItems.push(item);
+    }
   }
+  return shownItems;
 };
 const showNotificationsForCurrentFocusState = async (items, userId, appName) => {
   writeNotificationTabState(userId, appName);
@@ -2862,7 +2914,7 @@ const showNotificationsForCurrentFocusState = async (items, userId, appName) =>
     }
     return [];
   }
-  if (!canShowNativeNotification()) return items;
+  if (!canShowBrowserNotification()) return items;
   let nativeItems = items;
   if (hasActiveNotificationTab(userId, appName)) {
     await new Promise((resolve) => window.setTimeout(resolve, ACTIVE_TAB_NATIVE_GRACE_MS));
@@ -2871,7 +2923,11 @@ const showNotificationsForCurrentFocusState = async (items, userId, appName) =>
   }
   const claimed = await claimNotificationDeliveries(nativeItems, userId, appName, "native");
   if (claimed.length > 0) {
-    showNativeNotifications(claimed);
+    const shown = await showNativeNotifications(claimed);
+    if (shown.length < claimed.length) {
+      const shownIds = new Set(shown.map((item) => item.id));
+      removeNotificationDeliveryMarkers(claimed.filter((item) => !shownIds.has(item.id)), userId, appName, "native");
+    }
   }
   return nativeItems;
 };