@noya-app/noya-multiplayer-react 0.1.71 → 0.1.72

package/src/noyaApp.ts

@@ -1,12 +1,15 @@
 "use client";
 
 import { findAllDefs } from "@noya-app/noya-schemas";
+import type { LocalStorageSyncOptions } from "@noya-app/state-manager";
 import {
+  AccessType,
   createOrCastValue,
   isEmbeddedApp,
   localStorageSync,
   NoyaManager,
   parentFrameSync,
+  PolicyAuthContext,
   Static,
   stubSync,
   SyncAdapter,
@@ -30,6 +33,7 @@ export type AppData<State> = {
   inspector: boolean | StateInspectorOptions;
   userId?: string;
   isDemo: boolean;
+  access?: AccessType;
 };
 
 export function createDefaultAppData<State>(
@@ -41,6 +45,7 @@ export function createDefaultAppData<State>(
     initialState,
     inspector: false,
     isDemo: false,
+    access: undefined,
   };
 }
 
@@ -97,6 +102,9 @@ export function getAppData<State>(
 
   appData.initialState = enforceSchema(appData.initialState, schema) as State;
   appData.isDemo = appData.isDemo ?? false;
+  const fallbackAccess: AccessType =
+    appData.viewType === "editable" ? "write" : "read";
+  appData.access = appData.access ?? fallbackAccess;
 
   return appData as AppData<State>;
 }
@@ -106,20 +114,32 @@ export function getSyncAdapter<
   M extends object = object,
   E extends object = object,
   MenuT extends string = string,
+  I extends Record<string, any> = Record<string, unknown>,
 >(params?: {
   multiplayerUrl?: string;
   offlineStorageKey?: string;
   debug?: boolean;
-}): SyncAdapter<S, M, E, MenuT> {
-  const { multiplayerUrl, offlineStorageKey, debug } = params ?? {};
+  policyAuthContext?: PolicyAuthContext;
+  serverScripts?: LocalStorageSyncOptions["serverScripts"];
+}): SyncAdapter<S, M, E, MenuT, I> {
+  const {
+    multiplayerUrl,
+    offlineStorageKey,
+    debug,
+    policyAuthContext,
+    serverScripts,
+  } = params ?? {};
 
   return isEmbeddedApp()
-    ? parentFrameSync<S, M, E, MenuT>({ debug })
+    ? parentFrameSync<S, M, E, MenuT, I>({ debug, policyAuthContext })
     : multiplayerUrl
-      ? webSocketSync<S, M, E, MenuT>({ url: multiplayerUrl, debug })
+      ? webSocketSync<S, M, E, MenuT, I>({ url: multiplayerUrl, debug })
       : offlineStorageKey
-        ? localStorageSync<S, M, E, MenuT>({ key: offlineStorageKey })
-        : stubSync<S, M, E, MenuT>();
+        ? localStorageSync<S, M, E, MenuT, I>({
+            key: offlineStorageKey,
+            ...(serverScripts ? { serverScripts } : {}),
+          })
+        : stubSync<S, M, E, MenuT, I>();
 }
 
 export type UseNoyaStateOptions<
@@ -127,7 +147,8 @@ export type UseNoyaStateOptions<
   M extends object = object,
   E extends object = object,
   MenuT extends string = string,
-> = UseMultiplayerStateOptions<S, M, E, MenuT> & {
+  I extends Record<string, any> = Record<string, unknown>,
+> = UseMultiplayerStateOptions<S, M, E, MenuT, I> & {
   offlineStorageKey?: string;
 };
 
@@ -136,10 +157,11 @@ export type UseNoyaStateResult<
   M extends object = object,
   E extends object = object,
   MenuT extends string = string,
+  I extends Record<string, any> = Record<string, unknown>,
 > = [
-  ReturnType<typeof useBindNoyaManager<S, M, E, MenuT>>[0],
-  ReturnType<typeof useBindNoyaManager<S, M, E, MenuT>>[1],
-  ReturnType<typeof useBindNoyaManager<S, M, E, MenuT>>[2] & {
+  ReturnType<typeof useBindNoyaManager<S, M, E, MenuT, I>>[0],
+  ReturnType<typeof useBindNoyaManager<S, M, E, MenuT, I>>[1],
+  ReturnType<typeof useBindNoyaManager<S, M, E, MenuT, I>>[2] & {
     theme: AppTheme;
     viewType: AppViewType;
     isDemo: boolean;
@@ -160,11 +182,13 @@ export function useNoyaStateInternal<
   M extends object = object,
   E extends object = object,
   MenuT extends string = string,
-  O extends UseNoyaStateOptions<S, M, E, MenuT> = UseNoyaStateOptions<
+  I extends Record<string, any> = Record<string, unknown>,
+  O extends UseNoyaStateOptions<S, M, E, MenuT, I> = UseNoyaStateOptions<
     S,
     M,
     E,
-    MenuT
+    MenuT,
+    I
   >,
 >(
   ...args:
@@ -179,7 +203,8 @@ export function useNoyaStateInternal<
   O["schema"] extends TSchema ? Static<O["schema"]> : S,
   M,
   E,
-  MenuT
+  MenuT,
+  I
 > {
   const [initialState, options] =
     typeof args[0] === "object" &&
@@ -199,6 +224,7 @@ export function useNoyaStateInternal<
       viewType,
       userId,
       isDemo,
+      access,
     },
   ] = useState(() => {
     return getAppData(initialState, options?.schema, {
@@ -206,26 +232,57 @@ export function useNoyaStateInternal<
     });
   });
 
-  const sync = useMemo((): SyncAdapter<S, M, E, MenuT> => {
-    return getSyncAdapter<S, M, E, MenuT>({
+  const basePolicyAuthContext = useMemo((): PolicyAuthContext | undefined => {
+    if (!access && userId === undefined) return undefined;
+
+    const context: PolicyAuthContext = {};
+
+    if (access) {
+      context.access = access;
+    }
+
+    if (userId !== undefined) {
+      context.id = userId ?? null;
+    }
+
+    return context;
+  }, [access, userId]);
+
+  const sync = useMemo((): SyncAdapter<S, M, E, MenuT, I> => {
+    return getSyncAdapter<S, M, E, MenuT, I>({
       multiplayerUrl,
       offlineStorageKey: options?.offlineStorageKey,
       debug: options?.debug,
+      policyAuthContext: basePolicyAuthContext,
     });
-  }, [multiplayerUrl, options?.offlineStorageKey, options?.debug]);
+  }, [
+    multiplayerUrl,
+    options?.offlineStorageKey,
+    options?.debug,
+    basePolicyAuthContext,
+  ]);
 
   const [noyaManager] = useState(
-    () => new NoyaManager<S, M, E, MenuT>(noyaAppInitialState as S, options)
+    () => new NoyaManager<S, M, E, MenuT, I>(noyaAppInitialState as S, options)
   );
 
   useEffect(() => {
     if (!userId) return;
 
-    noyaManager.ephemeralUserDataManager.setCurrentUserId(userId);
+    noyaManager.sharedConnectionDataManager.setCurrentConnectionId(userId);
+    noyaManager.userManager.setCurrentConnectionId(userId);
     noyaManager.userManager.setCurrentUserId(userId);
   }, [noyaManager, userId]);
 
-  const result = useBindNoyaManager<S, M, E, MenuT>(noyaManager, {
+  useEffect(() => {
+    if (!basePolicyAuthContext) return;
+
+    noyaManager.multiplayerStateManager.setPolicyAuthContext(
+      basePolicyAuthContext
+    );
+  }, [noyaManager, basePolicyAuthContext]);
+
+  const result = useBindNoyaManager<S, M, E, MenuT, I>(noyaManager, {
     inspector: options?.inspector ?? inspector,
     sync: options?.sync ?? sync,
   });
@@ -240,7 +297,8 @@ export function useNoyaStateInternal<
     O["schema"] extends TSchema ? Static<O["schema"]> : S,
     M,
     E,
-    MenuT
+    MenuT,
+    I
   >;
 }
 

package/src/singleton.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import type { LocalStorageSyncOptions } from "@noya-app/state-manager";
 import {
   NoyaManager,
   NoyaManagerOptions,
@@ -16,11 +17,11 @@ import {
   getSyncAdapter,
 } from "./noyaApp";
 
-let noyaManagerSingleton: NoyaManager<any, any, any, any> | undefined;
+let noyaManagerSingleton: NoyaManager<any, any, any, any, any> | undefined;
 let noyaSingletonBindings: AnyNoyaSingletonBindings | undefined;
 
 export type AnyNoyaSingletonBindings = {
-  sync?: SyncAdapter<any, any, any, any>;
+  sync?: SyncAdapter<any, any, any, any, any>;
   inspector?: boolean | StateInspectorOptions;
   theme: AppTheme;
   viewType: AppViewType;
@@ -33,14 +34,16 @@ export type AnyNoyaSingletonOptions<
   M extends object,
   E extends object,
   MenuT extends string,
+  I extends Record<string, any> = Record<string, unknown>,
 > = NoyaManagerOptions<S, M> & {
   initialState?: S | (() => S);
-  sync?: SyncAdapter<S, M, E, MenuT>;
+  sync?: SyncAdapter<S, M, E, MenuT, I>;
   inspector?: boolean | StateInspectorOptions;
   theme?: AppTheme;
   viewType?: AppViewType;
   offlineStorageKey?: string;
   multiplayerUrl?: string;
+  serverScripts?: LocalStorageSyncOptions["serverScripts"];
 };
 
 export function initializeNoyaSingleton<
@@ -48,7 +51,8 @@ export function initializeNoyaSingleton<
   M extends object,
   E extends object,
   MenuT extends string,
->(options?: AnyNoyaSingletonOptions<S, M, E, MenuT>) {
+  I extends Record<string, any> = Record<string, unknown>,
+>(options?: AnyNoyaSingletonOptions<S, M, E, MenuT, I>) {
   if (noyaManagerSingleton) {
     throw new Error(
       "Noya has already been initialized. Call `useNoyaState` instead."
@@ -63,8 +67,9 @@ export function initializeNoyaSingleton<
     viewType,
     offlineStorageKey,
     multiplayerUrl,
+    serverScripts,
     ...managerOptions
-  } = (options ?? {}) as AnyNoyaSingletonOptions<S, M, E, MenuT>;
+  } = (options ?? {}) as AnyNoyaSingletonOptions<S, M, E, MenuT, I>;
 
   const appData = getAppData<S>(
     (initialState ?? null) as S | (() => S),
@@ -72,24 +77,37 @@ export function initializeNoyaSingleton<
     { overrideExistingState: managerOptions?.overrideExistingState }
   );
 
-  noyaManagerSingleton = new NoyaManager<S, M, E, MenuT>(
+  const policyAuthContext =
+    appData.access || appData.userId !== undefined
+      ? {
+          ...(appData.access ? { access: appData.access } : {}),
+          ...(appData.userId !== undefined
+            ? { id: appData.userId ?? null }
+            : {}),
+        }
+      : undefined;
+
+  noyaManagerSingleton = new NoyaManager<S, M, E, MenuT, I>(
     appData.initialState as S,
     managerOptions
   );
 
   if (appData.userId) {
-    noyaManagerSingleton.ephemeralUserDataManager.setCurrentUserId(
+    noyaManagerSingleton.sharedConnectionDataManager.setCurrentConnectionId(
       appData.userId
     );
+    noyaManagerSingleton.userManager.setCurrentConnectionId(appData.userId);
     noyaManagerSingleton.userManager.setCurrentUserId(appData.userId);
   }
 
   const resolvedSync =
     sync ??
-    getSyncAdapter<S, M, E, MenuT>({
+    getSyncAdapter<S, M, E, MenuT, I>({
       multiplayerUrl: multiplayerUrl ?? appData.multiplayerUrl,
       offlineStorageKey,
       debug: managerOptions?.debug,
+      serverScripts,
+      policyAuthContext,
     });
 
   // Activate sync immediately for the singleton
@@ -134,7 +152,13 @@ export function initializeNoyaSingleton<
   };
 }
 
-export function getNoyaManagerSingleton() {
+export function getNoyaManagerSingleton(): NoyaManager<
+  any,
+  any,
+  any,
+  any,
+  any
+> {
   if (!noyaManagerSingleton || !noyaSingletonBindings) {
     throw new Error(
       "Noya has not been initialized. Call initializeNoya once before using Noya hooks."