mirror of
https://github.com/duckietm/Nitro-V3.git
synced 2026-06-20 07:26:19 +00:00
feat(hooks): generalise security-level family + audit catch + reactivity test
Build on the useIsModerator landing (532cb28c) along three axes: 1. Family. Extract `useHasSecurityLevel(min)` as the primitive, backed by a fresh `useUserSecurityLevel()` raw-level reader. The six SecurityLevel constants (1..9) deserve named wrappers so the "show this only to X-and-up" pattern doesn't get re-derived ad-hoc each time: shipped `useIsModerator` / `useIsPlayerSupport` / `useIsCommunity` / `useIsAdmin` as one-line shims. Also added `useIsAmbassador()` as a sibling — not derived from security level, reads the boolean field on the snapshot directly. 2. Audit. The532cb28cmigration covered 6 React-render reads but missed 5 more discovered by a follow-up grep: - FurniEditorView (top-level `const isMod`) - InfoStandWidgetFurniView (inline JSX, mod-only build-tools button) - NavigatorRoomInfoView (3 reads in hasPermission(): isModerator and securityLevel >= COMMUNITY for the staff-pick gate. The userId read stays imperative — userId doesn't flip at runtime in practice, no reactivity gain.) - AvatarInfoWidgetPetView (inside useMemo with [roomSession] deps; migrated and isModerator added to the deps so a runtime promote/demote re-derives canPickUp without remount) - FurnitureMannequinView (inside useEffect; same treatment — added isModerator to the deps so the mode re-resolves on flip) The remaining ~17 reads (CanManipulateFurniture, AvatarInfoUtilities.populate*, useChatInputActions, useFurnitureDimmerWidget / useFurniturePlaylistEditorWidget / useFurnitureStickieWidget canModify checks, useCatalog admin filter, useNavigator door-mode guard) are click-time / event-time imperative — they read at the moment a user action fires, so a reactive value would be cached at hook execution and stale by the time the action runs. Leaving them on the synchronous manager read is correct. 3. Test. Added four cases pinning the contract: - useUserSecurityLevel returns the raw level. - useHasSecurityLevel does `>=` against the threshold. - Named wrappers map to the right constants (MODERATOR=5, COMMUNITY=7, ADMINISTRATOR=8). - **Reactive flip** — mutate the snapshot, dispatch the SESSION_DATA_UPDATED event on the mock dispatcher, assert the hook re-derives. Locks in the whole point of the snapshot pattern (a static read would pass cases 1-3 but fail case 4). Mock changes: - Added SecurityLevel class (mirrors the renderer enum 0..9) so the family wrappers resolve to actual numbers in jsdom — without it `useIsModerator()` would call `useHasSecurityLevel(undefined)` and the test would silently pass false-positives. Verification: yarn typecheck clean, yarn lint:hooks clean, yarn test 213/213 (209 baseline + 4 new family/reactivity cases).
This commit is contained in:
@@ -1,9 +1,11 @@
|
||||
/* @vitest-environment jsdom */
|
||||
|
||||
import { cleanup, render, renderHook } from '@testing-library/react';
|
||||
import { act, cleanup, render, renderHook } from '@testing-library/react';
|
||||
import { Component, ReactNode, useSyncExternalStore } from 'react';
|
||||
import { useBetween } from 'use-between';
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest';
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
import { GetEventDispatcher, GetSessionDataManager } from '../../nitro-renderer.mock';
|
||||
import { useHasSecurityLevel, useIsAdmin, useIsCommunity, useIsModerator, useUserSecurityLevel } from './useSessionSnapshots';
|
||||
|
||||
// Regression guard for the rolled-back snapshot-consumer migration.
|
||||
//
|
||||
@@ -106,3 +108,113 @@ describe('use-between + useSyncExternalStore incompatibility', () =>
|
||||
expect(result.current.count).toBe(0);
|
||||
});
|
||||
});
|
||||
|
||||
// ============================================================================
|
||||
// useHasSecurityLevel + named wrappers — reactive flip on snapshot invalidation
|
||||
// ============================================================================
|
||||
//
|
||||
// The family hangs off useUserDataSnapshot() which is a useSyncExternalStore
|
||||
// wrapper. The renderer's real SessionDataManager pushes a frozen snapshot
|
||||
// out of getUserDataSnapshot() and dispatches a SESSION_DATA_UPDATED event
|
||||
// whenever a mutator invalidates the cache. These tests fake both sides:
|
||||
// a mock dispatcher with a real .subscribe(), and a mock SessionDataManager
|
||||
// whose snapshot can be mutated between dispatches.
|
||||
|
||||
const makeFakeDispatcher = () =>
|
||||
{
|
||||
const listeners = new Map<string, Set<() => void>>();
|
||||
|
||||
return {
|
||||
subscribe(type: string, cb: () => void): () => void
|
||||
{
|
||||
let bucket = listeners.get(type);
|
||||
if(!bucket)
|
||||
{
|
||||
bucket = new Set();
|
||||
listeners.set(type, bucket);
|
||||
}
|
||||
bucket.add(cb);
|
||||
return () => bucket!.delete(cb);
|
||||
},
|
||||
dispatch(type: string): void
|
||||
{
|
||||
listeners.get(type)?.forEach(cb => cb());
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
describe('useHasSecurityLevel + named wrappers', () =>
|
||||
{
|
||||
let snapshot: { securityLevel: number };
|
||||
let fakeDispatcher: ReturnType<typeof makeFakeDispatcher>;
|
||||
|
||||
beforeEach(() =>
|
||||
{
|
||||
snapshot = { securityLevel: 0 };
|
||||
fakeDispatcher = makeFakeDispatcher();
|
||||
|
||||
vi.mocked(GetSessionDataManager).mockReturnValue({
|
||||
// useSessionSnapshots reads getUserDataSnapshot() and guards on
|
||||
// `typeof manager.getUserDataSnapshot !== 'function'`, so we
|
||||
// expose it as a real function returning the mutable test snapshot.
|
||||
getUserDataSnapshot: () => snapshot
|
||||
} as any);
|
||||
|
||||
vi.mocked(GetEventDispatcher).mockReturnValue(fakeDispatcher as any);
|
||||
});
|
||||
|
||||
afterEach(() =>
|
||||
{
|
||||
cleanup();
|
||||
vi.mocked(GetSessionDataManager).mockReset();
|
||||
vi.mocked(GetEventDispatcher).mockReset();
|
||||
});
|
||||
|
||||
it('useUserSecurityLevel reads the raw level', () =>
|
||||
{
|
||||
snapshot = { securityLevel: 7 };
|
||||
const { result } = renderHook(() => useUserSecurityLevel());
|
||||
expect(result.current).toBe(7);
|
||||
});
|
||||
|
||||
it('useHasSecurityLevel compares >= the threshold', () =>
|
||||
{
|
||||
snapshot = { securityLevel: 5 };
|
||||
const { result } = renderHook(() => useHasSecurityLevel(5));
|
||||
expect(result.current).toBe(true);
|
||||
|
||||
const { result: lowResult } = renderHook(() => useHasSecurityLevel(8));
|
||||
expect(lowResult.current).toBe(false);
|
||||
});
|
||||
|
||||
it('named wrappers map to the right thresholds (MODERATOR=5, COMMUNITY=7, ADMINISTRATOR=8)', () =>
|
||||
{
|
||||
snapshot = { securityLevel: 7 }; // COMMUNITY
|
||||
|
||||
expect(renderHook(() => useIsModerator()).result.current).toBe(true); // 7 >= 5
|
||||
expect(renderHook(() => useIsCommunity()).result.current).toBe(true); // 7 >= 7
|
||||
expect(renderHook(() => useIsAdmin()).result.current).toBe(false); // 7 < 8
|
||||
});
|
||||
|
||||
it('re-renders when SESSION_DATA_UPDATED fires after the snapshot mutates', () =>
|
||||
{
|
||||
snapshot = { securityLevel: 0 };
|
||||
const { result } = renderHook(() => useIsModerator());
|
||||
expect(result.current).toBe(false);
|
||||
|
||||
// Mutate the snapshot reference (renderer invariant: every
|
||||
// invalidation produces a NEW frozen object) and dispatch the
|
||||
// event. The hook's getSnapshot closure reads `snapshot`, so a
|
||||
// fresh object reference flips React's bailout.
|
||||
act(() =>
|
||||
{
|
||||
snapshot = { securityLevel: 5 };
|
||||
// The mock's NitroEventType proxy resolves any property to
|
||||
// `mock:NitroEventType:<PROP>`, so that's the wire string
|
||||
// useSessionSnapshots subscribes against.
|
||||
fakeDispatcher.dispatch('mock:NitroEventType:SESSION_DATA_UPDATED');
|
||||
});
|
||||
|
||||
expect(result.current).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user