@mohasinac/appkit 4.30.17 → 4.30.19

package/dist/react/hooks/useRealtimeEvent.js

@@ -2,7 +2,7 @@
 import { normalizeError } from "../../errors/normalize";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { getClientRealtimeProvider, } from "../../contracts/client-realtime";
-import { acquireExternalRealtimeLease } from "../../contracts/realtime-session";
+import { acquireRealtimeSession } from "../../contracts/realtime-session";
 import { RealtimeEventType, RealtimeEventStatus, RTDBPayloadStatus, } from "./realtime-event-constants";
 // Re-exported for existing client import paths — the canonical definitions
 // now live in realtime-event-constants.ts (a plain, non-"use client" module)
@@ -32,8 +32,10 @@ export function useRealtimeEvent(config) {
     const unsubscribeRef = useRef(null);
     const timeoutRef = useRef(null);
     const eventIdRef = useRef(null);
-    /** Lease on the shared realtime session — see cleanup() for why. */
+    /** Lease on this event's realtime session — see cleanup() for why. */
     const releaseSessionRef = useRef(null);
+    /** Provider bound to THIS scope's app; subscribe through it, not the global. */
+    const scopedProviderRef = useRef(null);
     const cleanup = useCallback(() => {
         if (unsubscribeRef.current) {
             unsubscribeRef.current();
@@ -57,6 +59,7 @@ export function useRealtimeEvent(config) {
         // end one, and only once the last consumer has let go.
         releaseSessionRef.current?.();
         releaseSessionRef.current = null;
+        scopedProviderRef.current = null;
     }, []);
     const subscribe = useCallback((eventId, customToken) => {
         const { type, rtdbPath, realtimeProvider, timeoutMs = DEFAULT_TIMEOUT_MS, extractData, messages, onLogError, } = configRef.current;
@@ -72,12 +75,20 @@ export function useRealtimeEvent(config) {
         setData(null);
         (async () => {
             try {
-                await provider.signInWithToken(customToken);
-                // Hold a lease for as long as this subscription lives. This hook owns
-                // its own sign-in (the token carries a job-scoped `bulkJobId` claim),
-                // but it must still participate in the ref-count so its cleanup
-                // cannot end a session another channel is relying on.
-                releaseSessionRef.current = acquireExternalRealtimeLease();
+                // Sign in through the session, which gives this event its OWN Firebase
+                // app for the `event:*` scope.
+                //
+                // That isolation is the fix. Firebase Auth state is per-app, so while
+                // every channel shared one app, this hook's `{ bulkJobId }`-only token
+                // replaced the claims of any live messages or chat subscription the
+                // moment a job started — and theirs replaced this one's in return.
+                // Ref-counting had only stopped a FINISHING channel from signing the
+                // others out; it could not stop a STARTING one from signing itself in
+                // over them, because there was nothing to coordinate: two channels
+                // legitimately need two different claim sets at the same time.
+                const lease = await acquireRealtimeSession(`event:${type}:${eventId}`, () => Promise.resolve({ customToken, expiresAt: Date.now() + 3600000 }));
+                releaseSessionRef.current = lease.release;
+                scopedProviderRef.current = lease.provider;
             }
             catch (authErr) {
                 void normalizeError(authErr);
@@ -102,7 +113,7 @@ export function useRealtimeEvent(config) {
                 return;
             }
             setStatus(RealtimeEventStatus.PENDING);
-            unsubscribeRef.current = provider.subscribe(`${rtdbPath}/${eventId}`, (snapshot) => {
+            unsubscribeRef.current = (scopedProviderRef.current ?? provider).subscribe(`${rtdbPath}/${eventId}`, (snapshot) => {
                 if (!snapshot.exists())
                     return;
                 const raw = snapshot.val();

package/dist/ui/components/toolbar-collapse.js

@@ -48,11 +48,10 @@ export function readCollapsedPref(id) {
 export function writeCollapsedPref(id, value) {
     try {
         window.sessionStorage.setItem(STORAGE_PREFIX + id, value ? "1" : "0");
+        // sessionStorage blocked (private browsing). Collapsing still works this render, it just will not survive a re-mount.
     }
     catch (_err) {
         void normalizeError(_err);
-        // sessionStorage unavailable (private browsing, etc.) — collapsing still
-        // works for the current render, it just doesn't survive a re-mount.
     }
 }
 export function defaultCollapsedForViewport() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mohasinac/appkit",
-  "version": "4.30.17",
+  "version": "4.30.19",
   "license": "MIT",
   "publishConfig": {
     "access": "public"