@liveblocks/react 2.17.0 → 2.18.0-yjsfactory

package/dist/{chunk-4KNGHD4I.mjs → chunk-OSTPNTQF.mjs}

@@ -98,6 +98,9 @@ function useSignal(signal, selector, isEqual) {
 }
 
 // src/liveblocks.tsx
+import {
+  HttpError
+} from "@liveblocks/core";
 import {
   assert,
   createClient,
@@ -130,7 +133,9 @@ var config = {
   HISTORY_VERSIONS_POLL_INTERVAL: 1 * MINUTES,
   HISTORY_VERSIONS_MAX_STALE_TIME: 5 * SECONDS,
   NOTIFICATION_SETTINGS_POLL_INTERVAL: 1 * MINUTES,
-  NOTIFICATION_SETTINGS_MAX_STALE_TIME: 5 * SECONDS
+  NOTIFICATION_SETTINGS_MAX_STALE_TIME: 5 * SECONDS,
+  USER_NOTIFICATION_SETTINGS_INTERVAL: 5 * MINUTES,
+  USER_NOTIFICATION_SETTINGS_MAX_STALE_TIME: 1 * MINUTES
 };
 
 // src/lib/AsyncResult.ts
@@ -233,6 +238,8 @@ import {
   console as console2,
   DefaultMap,
   DerivedSignal,
+  entries,
+  keys,
   kInternal,
   MutableSignal as MutableSignal2,
   nanoid,
@@ -723,6 +730,26 @@ function createStore_forPermissionHints() {
     update
   };
 }
+function createStore_forUserNotificationSettings(updates) {
+  const signal = new Signal({});
+  function update(settings) {
+    signal.set((prevSettings) => {
+      return {
+        ...prevSettings,
+        ...settings
+      };
+    });
+  }
+  return {
+    signal: DerivedSignal.from(
+      signal,
+      updates,
+      (base, updates2) => applyOptimisticUpdates_forUserNotificationSettings(base, updates2)
+    ),
+    // Mutations
+    update
+  };
+}
 function createStore_forOptimistic(client) {
   const signal = new Signal([]);
   const syncSource = client[kInternal].createSyncSource();
@@ -756,15 +783,17 @@ var UmbrellaStore = class {
   //
   //   Mutate inputs...                                             ...observe clean/consistent output!
   //
-  //            .-> Base ThreadDB ---------+                 +----> Clean threads by ID       (Part 1)
+  //            .-> Base ThreadDB ---------+                 +----> Clean threads by ID           (Part 1)
   //           /                           |                 |
-  //   mutate ----> Base Notifications --+ |                 | +--> Clean notifications       (Part 1)
+  //   mutate ----> Base Notifications --+ |                 | +--> Clean notifications           (Part 1)
   //          \                          | |                 | |    & notifications by ID
   //         | \                         | |      Apply      | |
-  //         |   `-> OptimisticUpdates --+--+--> Optimistic --+-+--> Notification Settings    (Part 2)
-  //          \                          |        Updates       |
-  //           `------- etc etc ---------+                      +--> History Versions         (Part 3)
-  //                       ^
+  //         |   `-> OptimisticUpdates --+--+--> Optimistic --+-+--> Room Notification Settings   (Part 2)
+  //          \                          |        Updates    |  |
+  //           `------- etc etc ---------+                   |  +--> History Versions             (Part 3)
+  //                       ^                                 |
+  //                       |                                 +-----> User Notification Settings   (Part 4)
+  //                       |
   //                       |
   //                       |                        ^                  ^
   //                    Signal                      |                  |
@@ -785,6 +814,7 @@ var UmbrellaStore = class {
   // prettier-ignore
   historyVersions;
   permissionHints;
+  userNotificationSettings;
   optimisticUpdates;
   //
   // Output signals.
@@ -805,6 +835,8 @@ var UmbrellaStore = class {
   #userThreadsLastRequestedAt = null;
   // Room versions
   #roomVersionsLastRequestedAtByRoom = /* @__PURE__ */ new Map();
+  // User Notification Settings
+  #userNotificationSettings;
   constructor(client) {
     this.#client = client[kInternal].as();
     this.optimisticUpdates = createStore_forOptimistic(this.#client);
@@ -820,6 +852,16 @@ var UmbrellaStore = class {
         return nextCursor;
       }
     );
+    const userNotificationSettingsFetcher = async () => {
+      const result = await this.#client.getNotificationSettings();
+      this.userNotificationSettings.update(result);
+    };
+    this.userNotificationSettings = createStore_forUserNotificationSettings(
+      this.optimisticUpdates.signal
+    );
+    this.#userNotificationSettings = new SinglePageResource(
+      userNotificationSettingsFetcher
+    );
     this.threads = new ThreadDB();
     this.notifications = createStore_forNotifications();
     this.roomNotificationSettings = createStore_forRoomNotificationSettings(
@@ -997,6 +1039,19 @@ var UmbrellaStore = class {
         return { signal, waitUntilLoaded: resource.waitUntilLoaded };
       }
     );
+    const userNotificationSettings = {
+      signal: DerivedSignal.from(() => {
+        const result = this.#userNotificationSettings.get();
+        if (result.isLoading || result.error) {
+          return result;
+        }
+        return ASYNC_OK(
+          "settings",
+          nn(this.userNotificationSettings.signal.get())
+        );
+      }, shallow3),
+      waitUntilLoaded: this.#userNotificationSettings.waitUntilLoaded
+    };
     this.outputs = {
       threadifications,
       threads,
@@ -1005,7 +1060,8 @@ var UmbrellaStore = class {
       notifications,
       loadingNotifications,
       settingsByRoomId,
-      versionsByRoomId
+      versionsByRoomId,
+      userNotificationSettings
     };
     autobind(this);
   }
@@ -1250,6 +1306,25 @@ var UmbrellaStore = class {
     const result = await room.getNotificationSettings({ signal });
     this.roomNotificationSettings.update(roomId, result);
   }
+  /**
+   * Refresh User Notification Settings from poller
+   */
+  async refreshUserNotificationSettings(signal) {
+    const result = await this.#client.getNotificationSettings({
+      signal
+    });
+    this.userNotificationSettings.update(result);
+  }
+  /**
+   * Updates user notification settings with a new value, replacing the
+   * corresponding optimistic update.
+   */
+  updateUserNotificationSettings_confirmOptimisticUpdate(settings, optimisticUpdateId) {
+    batch2(() => {
+      this.optimisticUpdates.remove(optimisticUpdateId);
+      this.userNotificationSettings.update(settings);
+    });
+  }
 };
 function applyOptimisticUpdates_forThreadifications(baseThreadsDB, notificationsLUT, optimisticUpdates) {
   const threadsDB = baseThreadsDB.clone();
@@ -1424,6 +1499,33 @@ function applyOptimisticUpdates_forSettings(settingsLUT, optimisticUpdates) {
   }
   return settingsByRoomId;
 }
+function applyOptimisticUpdates_forUserNotificationSettings(baseSettings, optimisticUpdates) {
+  const outcomingSettings = { ...baseSettings };
+  for (const optimisticUpdate of optimisticUpdates) {
+    switch (optimisticUpdate.type) {
+      case "update-user-notification-settings": {
+        const incomingSettings = optimisticUpdate.settings;
+        for (const channelKey of keys(incomingSettings)) {
+          const key = channelKey;
+          const channelUpdates = incomingSettings[key];
+          if (channelUpdates) {
+            const realChannelUpdates = Object.fromEntries(
+              entries(channelUpdates).filter(
+                ([_, value]) => value !== void 0
+              )
+            );
+            outcomingSettings[key] = {
+              ...outcomingSettings[key],
+              ...realChannelUpdates
+            };
+          }
+        }
+        break;
+      }
+    }
+  }
+  return outcomingSettings;
+}
 function compareInboxNotifications(inboxNotificationA, inboxNotificationB) {
   if (inboxNotificationA.notifiedAt > inboxNotificationB.notifiedAt) {
     return 1;
@@ -1717,10 +1819,25 @@ function makeLiveblocksExtrasForClient(client) {
     config.USER_THREADS_POLL_INTERVAL,
     { maxStaleTimeMs: config.USER_THREADS_MAX_STALE_TIME }
   );
+  const userNotificationSettingsPoller = makePoller(
+    async (signal) => {
+      try {
+        return await store.refreshUserNotificationSettings(signal);
+      } catch (err) {
+        console.warn(
+          `Polling new user notification settings failed: ${String(err)}`
+        );
+        throw err;
+      }
+    },
+    config.USER_NOTIFICATION_SETTINGS_INTERVAL,
+    { maxStaleTimeMs: config.USER_NOTIFICATION_SETTINGS_MAX_STALE_TIME }
+  );
   return {
     store,
     notificationsPoller,
-    userThreadsPoller
+    userThreadsPoller,
+    userNotificationSettingsPoller
   };
 }
 function makeLiveblocksContextBundle(client) {
@@ -1729,6 +1846,7 @@ function makeLiveblocksContextBundle(client) {
   const useMarkAllInboxNotificationsAsRead2 = () => useMarkAllInboxNotificationsAsRead_withClient(client);
   const useDeleteInboxNotification2 = () => useDeleteInboxNotification_withClient(client);
   const useDeleteAllInboxNotifications2 = () => useDeleteAllInboxNotifications_withClient(client);
+  const useUpdateNotificationSettings2 = () => useUpdateNotificationSettings_withClient(client);
   function LiveblocksProvider2(props) {
     useEnsureNoLiveblocksProvider();
     return /* @__PURE__ */ jsx(ClientContext.Provider, { value: client, children: props.children });
@@ -1742,6 +1860,8 @@ function makeLiveblocksContextBundle(client) {
     useMarkAllInboxNotificationsAsRead: useMarkAllInboxNotificationsAsRead2,
     useDeleteInboxNotification: useDeleteInboxNotification2,
     useDeleteAllInboxNotifications: useDeleteAllInboxNotifications2,
+    useNotificationSettings: () => useNotificationSettings_withClient(client),
+    useUpdateNotificationSettings: useUpdateNotificationSettings2,
     useInboxNotificationThread: useInboxNotificationThread2,
     useUserThreads_experimental,
     ...shared.classic,
@@ -1754,6 +1874,8 @@ function makeLiveblocksContextBundle(client) {
       useDeleteInboxNotification: useDeleteInboxNotification2,
       useDeleteAllInboxNotifications: useDeleteAllInboxNotifications2,
       useInboxNotificationThread: useInboxNotificationThread2,
+      useNotificationSettings: () => useNotificationSettingsSuspense_withClient(client),
+      useUpdateNotificationSettings: useUpdateNotificationSettings2,
       useUserThreads_experimental: useUserThreadsSuspense_experimental,
       ...shared.suspense
     }
@@ -1938,6 +2060,72 @@ function useInboxNotificationThread_withClient(client, inboxNotificationId) {
     )
   );
 }
+function useUpdateNotificationSettings_withClient(client) {
+  return useCallback2(
+    (settings) => {
+      const { store } = getLiveblocksExtrasForClient(client);
+      const optimisticUpdateId = store.optimisticUpdates.add({
+        type: "update-user-notification-settings",
+        settings
+      });
+      client.updateNotificationSettings(settings).then(
+        (settings2) => {
+          store.updateUserNotificationSettings_confirmOptimisticUpdate(
+            settings2,
+            optimisticUpdateId
+          );
+        },
+        (err) => {
+          store.optimisticUpdates.remove(optimisticUpdateId);
+          if (err instanceof HttpError) {
+            if (err.status === 422) {
+              const msg = [err.details?.error, err.details?.reason].filter(Boolean).join("\n");
+              console.error(msg);
+            }
+            client[kInternal2].emitError(
+              {
+                type: "UPDATE_USER_NOTIFICATION_SETTINGS_ERROR"
+              },
+              err
+            );
+          } else {
+            throw err;
+          }
+        }
+      );
+    },
+    [client]
+  );
+}
+function useNotificationSettings_withClient(client) {
+  const updateNotificationSettings = useUpdateNotificationSettings_withClient(client);
+  const { store, userNotificationSettingsPoller: poller } = getLiveblocksExtrasForClient(client);
+  useEffect3(() => {
+    void store.outputs.userNotificationSettings.waitUntilLoaded();
+  });
+  useEffect3(() => {
+    poller.inc();
+    poller.pollNowIfStale();
+    return () => {
+      poller.dec();
+    };
+  }, [poller]);
+  const result = useSignal(store.outputs.userNotificationSettings.signal);
+  return useMemo2(() => {
+    return [result, updateNotificationSettings];
+  }, [result, updateNotificationSettings]);
+}
+function useNotificationSettingsSuspense_withClient(client) {
+  ensureNotServerSide();
+  const store = getLiveblocksExtrasForClient(client).store;
+  use(store.outputs.userNotificationSettings.waitUntilLoaded());
+  const [result, updateNotificationSettings] = useNotificationSettings_withClient(client);
+  assert(!result.error, "Did not expect error");
+  assert(!result.isLoading, "Did not expect loading");
+  return useMemo2(() => {
+    return [result, updateNotificationSettings];
+  }, [result, updateNotificationSettings]);
+}
 function useUser_withClient(client, userId) {
   const usersStore = client[kInternal2].usersStore;
   const getUserState = useCallback2(
@@ -2203,6 +2391,15 @@ function useUnreadInboxNotificationsCount() {
 function useUnreadInboxNotificationsCountSuspense() {
   return useUnreadInboxNotificationsCountSuspense_withClient(useClient());
 }
+function useNotificationSettings() {
+  return useNotificationSettings_withClient(useClient());
+}
+function useNotificationSettingsSuspense() {
+  return useNotificationSettingsSuspense_withClient(useClient());
+}
+function useUpdateNotificationSettings() {
+  return useUpdateNotificationSettings_withClient(useClient());
+}
 function useUser(userId) {
   const client = useClient();
   return useUser_withClient(client, userId);
@@ -2280,7 +2477,7 @@ import {
   createThreadId,
   DefaultMap as DefaultMap2,
   errorIf,
-  HttpError,
+  HttpError as HttpError2,
   kInternal as kInternal3,
   makePoller as makePoller2,
   ServerMsgCode
@@ -2397,7 +2594,7 @@ function makeRoomExtrasForClient(client) {
   const store = getUmbrellaStoreForClient(client);
   function onMutationFailure(optimisticId, context, innerError) {
     store.optimisticUpdates.remove(optimisticId);
-    if (innerError instanceof HttpError) {
+    if (innerError instanceof HttpError2) {
       if (innerError.status === 403) {
         const detailedMessage = [
           innerError.message,
@@ -3850,6 +4047,9 @@ export {
   useDeleteInboxNotification,
   useUnreadInboxNotificationsCount,
   useUnreadInboxNotificationsCountSuspense,
+  useNotificationSettings,
+  useNotificationSettingsSuspense,
+  useUpdateNotificationSettings,
   useRoomInfo,
   useRoomInfoSuspense,
   _useInboxNotificationThread,
@@ -3934,4 +4134,4 @@ export {
   _useStorageRoot,
   _useUpdateMyPresence
 };
-//# sourceMappingURL=chunk-4KNGHD4I.mjs.map
+//# sourceMappingURL=chunk-OSTPNTQF.mjs.map