@noya-app/noya-multiplayer-react 0.1.50 → 0.1.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noya-app/noya-multiplayer-react",
-  "version": "0.1.50",
+  "version": "0.1.52",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -12,11 +12,11 @@
     "dev": "npm run build -- --watch"
   },
   "dependencies": {
-    "@noya-app/state-manager": "0.1.39",
+    "@noya-app/state-manager": "0.1.41",
     "@noya-app/emitter": "0.1.0",
     "@noya-app/observable": "0.1.5",
     "@noya-app/task-runner": "0.1.5",
-    "@noya-app/react-utils": "0.1.15",
+    "@noya-app/react-utils": "0.1.16",
     "react-inspector": "6.0.2"
   },
   "peerDependencies": {

package/src/NoyaStateContext.tsx

@@ -46,13 +46,14 @@ interface NoyaStateProviderProps<
   fallback?: React.ReactNode;
 }
 
-const AnyNoyaStateContext = createContext<
-  | {
-      noyaManager: NoyaManager<any, any, any, any>;
-      theme: AppTheme;
-      viewType: AppViewType;
-    }
-  | undefined
+export type AnyNoyaStateContextValue = {
+  noyaManager: NoyaManager<any, any, any, any>;
+  theme: AppTheme;
+  viewType: AppViewType;
+};
+
+export const AnyNoyaStateContext = createContext<
+  AnyNoyaStateContextValue | undefined
 >(undefined);
 
 export function useAnyNoyaStateContext() {
@@ -172,9 +173,9 @@ export function useIsInitialized() {
   return useObservable(isInitializedObservable);
 }
 
-export function useWorkflowManager() {
+export function usePipelineManager() {
   const { noyaManager } = useAnyNoyaStateContext();
-  return noyaManager.workflowManager;
+  return noyaManager.pipelineManager;
 }
 
 export const ConnectedUsersContext = createContext<

package/src/WebSocketConnection.ts

@@ -32,9 +32,7 @@ export type ConnectionOptions<State> = {
 
 export class WebSocketConnection<State> {
   private ws: ReconnectingWebSocket;
-  private pingCount = 0;
-  private pendingPingId?: string;
-  private intervalId?: NodeJS.Timer;
+  private closedForever = false;
 
   constructor(
     private url: URL,
@@ -50,38 +48,13 @@ export class WebSocketConnection<State> {
   }
 
   async connect() {
-    this.ws.connect(this.url.toString());
-
-    // Start ping interval
-    this.intervalId = setInterval(() => {
-      if (this.ws.state !== "OPEN") return;
-
-      // A response to a previous ping hasn't been received, so we'll reset the connection
-      if (this.pendingPingId) {
-        this.ws.close();
-        return;
-      }
-
-      const pingId = (this.pingCount++).toString();
+    if (this.closedForever) return;
 
-      const message: ClientToServerMessage<State> = {
-        type: "ping",
-        id: pingId,
-      };
-
-      this.pendingPingId = message.id;
-
-      this.options.onConnectionEvent?.({
-        type: "send",
-        message,
-      });
-
-      this.ws.send(JSON.stringify(message));
-    }, 10000);
+    this.ws.connect(this.url.toString());
   }
 
   private handleOpen = () => {
-    this.pendingPingId = undefined;
+    if (this.closedForever) return;
 
     if (this.options.debug) {
       console.info("ws connected");
@@ -94,6 +67,8 @@ export class WebSocketConnection<State> {
   };
 
   private handleMessage = (event: MessageEvent) => {
+    if (this.closedForever) return;
+
     if (this.options.debug) {
       console.info("ws receiving message ", event.data);
     }
@@ -104,14 +79,10 @@ export class WebSocketConnection<State> {
       type: "receive",
       message: parsed,
     });
-
-    if (parsed.type === "pong" && parsed.id === this.pendingPingId) {
-      this.pendingPingId = undefined;
-    }
   };
 
   private handleClose = () => {
-    this.pendingPingId = undefined;
+    if (this.closedForever) return;
 
     if (this.options.debug) {
       console.info("ws disconnected");
@@ -124,6 +95,8 @@ export class WebSocketConnection<State> {
   };
 
   send(message: ClientToServerMessage<State>) {
+    if (this.closedForever) return;
+
     if (this.options.debug) {
       console.info("ws sending message", message);
     }
@@ -137,10 +110,15 @@ export class WebSocketConnection<State> {
   }
 
   close() {
-    if (this.intervalId) {
-      clearInterval(this.intervalId);
-    }
+    if (this.closedForever) return;
+
+    this.closedForever = true;
     this.ws.shutdown();
+
+    // remove all listeners
+    this.ws.listeners.forEach((listener) => {
+      this.ws.removeListener(listener);
+    });
   }
 
   addListener(listener: (state: ReconnectingWebSocketState) => void) {

package/src/ai.ts

@@ -0,0 +1,17 @@
+import { AIToolDefinition } from "@noya-app/state-manager";
+import { useEffect } from "react";
+import { useAIManager } from "./NoyaStateContext";
+import { useObservable } from "./useObservable";
+
+export function useRegisterAITool(tool: AIToolDefinition) {
+  const aiManager = useAIManager();
+
+  useEffect(() => {
+    return aiManager.registerTool(tool);
+  }, [aiManager, tool]);
+}
+
+export function useCallableAITools() {
+  const aiManager = useAIManager();
+  return useObservable(aiManager.callableTools$);
+}

package/src/hooks.ts

@@ -166,7 +166,7 @@ export function useMultiplayerState<
     assetManager: typeof noyaManager.assetManager;
     aiManager: typeof noyaManager.aiManager;
     rpcManager: typeof noyaManager.rpcManager;
-    workflowManager: typeof noyaManager.workflowManager;
+    pipelineManager: typeof noyaManager.pipelineManager;
     secretManager: typeof noyaManager.secretManager;
     menuItemsManager: typeof noyaManager.menuManager;
     createAsset: typeof noyaManager.assetManager.create;
@@ -185,7 +185,7 @@ export function useMultiplayerState<
       assetManager: noyaManager.assetManager,
       aiManager: noyaManager.aiManager,
       rpcManager: noyaManager.rpcManager,
-      workflowManager: noyaManager.workflowManager,
+      pipelineManager: noyaManager.pipelineManager,
       secretManager: noyaManager.secretManager,
       menuItemsManager: noyaManager.menuManager,
       createAsset: noyaManager.assetManager.create,

package/src/index.ts

@@ -1,4 +1,5 @@
 export * from "@noya-app/state-manager";
+export * from "./ai";
 export * from "./components/UserPointersOverlay";
 export * from "./hooks";
 export * from "./inspector/StateInspector";