@calimero-network/mero-react 5.1.0 → 6.0.1

package/dist/index.cjs

@@ -328,6 +328,7 @@ function MeroProvider({
   const [contextId, setContextIdState] = react.useState(() => getContextId());
   const [contextIdentity, setContextIdentityState] = react.useState(() => getContextIdentity());
   const meroRef = react.useRef(null);
+  const recoveringRef = react.useRef(false);
   const callbackRef = react.useRef(void 0);
   if (callbackRef.current === void 0 && isBrowser) {
     callbackRef.current = meroJs.parseAuthCallback(window.location.href);
@@ -351,12 +352,18 @@ function MeroProvider({
     async (instance) => {
       const accessToken = tokenStore.getTokens()?.access_token;
       if (!accessToken) return false;
-      try {
-        const { valid } = await instance.auth.validateToken(accessToken);
-        return valid;
-      } catch {
-        return false;
-      }
+      const validate = async (token) => {
+        try {
+          const { valid } = await instance.auth.validateToken(token);
+          return valid;
+        } catch {
+          return false;
+        }
+      };
+      if (await validate(accessToken)) return true;
+      const rotated = tokenStore.getTokens()?.access_token;
+      if (!rotated || rotated === accessToken) return false;
+      return validate(rotated);
     },
     [tokenStore]
   );
@@ -483,9 +490,23 @@ function MeroProvider({
     const onError = (err) => {
       if (!active) return;
       setIsOnline(false);
-      if (err.message.includes("401")) {
-        logout();
-      }
+      if (!err.message.includes("401")) return;
+      if (recoveringRef.current) return;
+      recoveringRef.current = true;
+      void (async () => {
+        try {
+          const instance = meroRef.current;
+          if (!instance) return;
+          if (await checkAuth(instance)) {
+            if (active) await instance.events.connect().catch(() => {
+            });
+            return;
+          }
+          if (active) logout();
+        } finally {
+          recoveringRef.current = false;
+        }
+      })();
     };
     sse.on("connect", onConnect);
     sse.on("error", onError);
@@ -497,7 +518,7 @@ function MeroProvider({
       sse.off("connect", onConnect);
       sse.off("error", onError);
     };
-  }, [isAuthenticated, mero]);
+  }, [isAuthenticated, mero, checkAuth, logout]);
   const contextValue = react.useMemo(
     () => ({
       mero,
@@ -1990,6 +2011,15 @@ function useNamespace(namespaceId) {
   );
   return { namespace: data, loading, error, refetch };
 }
+function useNodeIdentity() {
+  const { mero } = useMero();
+  const { data, loading, error, refetch } = useAsyncResource(
+    mero ? () => mero.admin.getNodeIdentity() : null,
+    null,
+    [mero]
+  );
+  return { identity: data, loading, error, refetch };
+}
 function useNamespaceIdentity(namespaceId) {
   const { mero } = useMero();
   const { data, loading, error, refetch } = useAsyncResource(
@@ -2359,6 +2389,35 @@ function useDetachContextFromGroup() {
   );
   return { detachContextFromGroup, loading, error };
 }
+var DEFAULT_MIGRATION_POLL_INTERVAL_MS = 5e3;
+function useMigrationEvents(namespaceId, onEvent) {
+  const { mero } = useMero();
+  const mountedRef = useMountedRef();
+  const [live, setLive] = react.useState(false);
+  const handlerRef = react.useRef(onEvent);
+  handlerRef.current = onEvent;
+  react.useEffect(() => {
+    if (!mero || !namespaceId) return;
+    const sse = mero.events;
+    const unsubscribe = sse.onMigrationEvent((event) => handlerRef.current(event));
+    let cancelled = false;
+    void (async () => {
+      try {
+        await sse.connect();
+        await sse.subscribe({ groupIds: [namespaceId] });
+        if (!cancelled && mountedRef.current) setLive(true);
+      } catch {
+        if (!cancelled && mountedRef.current) setLive(false);
+      }
+    })();
+    return () => {
+      cancelled = true;
+      if (mountedRef.current) setLive(false);
+      unsubscribe();
+    };
+  }, [mero, namespaceId, mountedRef]);
+  return live;
+}
 function useMigrationStatus(namespaceId, options) {
   const { mero } = useMero();
   const [status, setStatus] = react.useState(null);
@@ -2403,7 +2462,8 @@ function useMigrationStatus(namespaceId, options) {
   react.useEffect(() => {
     void refetch();
   }, [refetch]);
-  const pollIntervalMs = options?.pollIntervalMs;
+  const sseLive = useMigrationEvents(namespaceId, () => void refetch());
+  const pollIntervalMs = options?.pollIntervalMs ?? (sseLive ? void 0 : DEFAULT_MIGRATION_POLL_INTERVAL_MS);
   react.useEffect(() => {
     if (!pollIntervalMs || !mero || !namespaceId) return;
     const handle = setInterval(() => void refetch(), pollIntervalMs);
@@ -2416,6 +2476,12 @@ function useMigrationStatus(namespaceId, options) {
     rollup,
     members,
     allMigrated: rollup?.allMigrated ?? false,
+    /**
+     * When this node watched the fleet converge, or `null`. Durable, unlike
+     * `allMigrated`, which is recomputed from in-TTL heartbeats and lapses back
+     * to false when a member simply goes quiet.
+     */
+    fleetCompletedAt: status?.fleetCompletedAt ?? null,
     membersPendingSignature: rollup?.membersPendingSignature ?? 0,
     /** Members whose migrate aborted (migration-check failed or apply errored). */
     failed: rollup?.failed ?? 0,
@@ -2535,7 +2601,6 @@ var EMPTY_GROUP_APP_VERSION = {
   version: null,
   applicationId: null,
   pendingApply: false,
-  upgradePolicy: null,
   activeUpgrade: null
 };
 function isZeroAppKey(appKey) {
@@ -2567,17 +2632,14 @@ function useGroupAppVersion(groupId) {
       const namespace = namespaces.find((entry) => entry.namespaceId === groupId);
       let appKey;
       let applicationId;
-      let upgradePolicy;
       let activeUpgrade = null;
       if (namespace) {
         appKey = namespace.appKey;
         applicationId = namespace.targetApplicationId;
-        upgradePolicy = namespace.upgradePolicy ?? null;
       } else {
         const info = await mero.admin.getGroupInfo(groupId);
         appKey = info.appKey;
         applicationId = info.targetApplicationId;
-        upgradePolicy = info.upgradePolicy ?? null;
         activeUpgrade = info.activeUpgrade ?? null;
       }
       let version = null;
@@ -2591,7 +2653,7 @@ function useGroupAppVersion(groupId) {
         }
       }
       if (mountedRef.current && seq === reqRef.current) {
-        setData({ version, applicationId, pendingApply, upgradePolicy, activeUpgrade });
+        setData({ version, applicationId, pendingApply, activeUpgrade });
       }
     } catch (err) {
       const errorValue = toError(err);
@@ -2802,6 +2864,7 @@ exports.AppMode = AppMode;
 exports.CalimeroLogo = CalimeroLogo;
 exports.ConnectButton = ConnectButton;
 exports.ConnectionType = ConnectionType;
+exports.DEFAULT_MIGRATION_POLL_INTERVAL_MS = DEFAULT_MIGRATION_POLL_INTERVAL_MS;
 exports.LoginModal = LoginModal;
 exports.MERO_CSS_VARS = MERO_CSS_VARS;
 exports.MeroContext = MeroContext;
@@ -2862,6 +2925,7 @@ exports.useJoinSubgroupInheritance = useJoinSubgroupInheritance;
 exports.useLatestVersion = useLatestVersion;
 exports.useMemberMetadata = useMemberMetadata;
 exports.useMero = useMero;
+exports.useMigrationEvents = useMigrationEvents;
 exports.useMigrationStatus = useMigrationStatus;
 exports.useMyAuthoredMigration = useMyAuthoredMigration;
 exports.useNamespace = useNamespace;
@@ -2869,6 +2933,7 @@ exports.useNamespaceGroups = useNamespaceGroups;
 exports.useNamespaceIdentity = useNamespaceIdentity;
 exports.useNamespaces = useNamespaces;
 exports.useNamespacesForApplication = useNamespacesForApplication;
+exports.useNodeIdentity = useNodeIdentity;
 exports.useRemoveGroupMembers = useRemoveGroupMembers;
 exports.useReparentGroup = useReparentGroup;
 exports.useResyncContext = useResyncContext;