@marimo-team/islands 0.25.3-dev48 → 0.25.3-dev51

package/src/core/websocket/useNotebookClient.ts

@@ -11,7 +11,6 @@ import type {
 import {
   createNotebookClient,
   type NotebookClient,
-  type NotebookConnection,
 } from "../host/notebook-client";
 import { classifyCloseEvent } from "./connection-state";
 import { notebookClientAtom } from "./state";
@@ -21,24 +20,20 @@ import {
 } from "./transports/create";
 
 type Options = ConnectionTransportOptions & {
-  sessionId: string;
-  messageFormat: NotebookConnection["messageFormat"];
   waitUntilReady: () => Promise<void>;
   checkHealth: () => Promise<boolean>;
   onNotification: (notification: NotificationPayload) => void;
-  onMessageError: NotebookConnection["onMessageError"];
 };
 
 export function useNotebookClient(options: Options): NotebookClient {
   const store = useStore();
-  const { sessionId, static: isStatic, transportType, messageFormat } = options;
+  const { static: isStatic, transportType } = options;
   const controller = useMemo(() => createNotebookClient(store), [store]);
   const url = useEvent(options.url);
   const headers = useEvent(options.headers);
   const waitUntilReady = useEvent(options.waitUntilReady);
   const checkHealth = useEvent(options.checkHealth);
   const onNotification = useEvent(options.onNotification);
-  const onMessageError = useEvent(options.onMessageError);
 
   useEffect(() => {
     const lifetime = new AbortController();
@@ -52,11 +47,9 @@ export function useNotebookClient(options: Options): NotebookClient {
           transportType,
         }),
       url,
-      messageFormat,
       signal: lifetime.signal,
       waitUntilReady,
       checkHealth,
-      onMessageError,
       // The host validates the envelope, not the native notification contents.
       onNotification: (notification) =>
         onNotification({ data: notification as NotificationMessage }),
@@ -72,16 +65,13 @@ export function useNotebookClient(options: Options): NotebookClient {
   }, [
     controller,
     store,
-    sessionId,
     isStatic,
     transportType,
-    messageFormat,
     url,
     headers,
     waitUntilReady,
     checkHealth,
     onNotification,
-    onMessageError,
   ]);
 
   return controller.client;

package/src/core/websocket/useNotebookSession.tsx

@@ -65,7 +65,7 @@ import { type LayoutState, useLayoutActions } from "../layout/state";
 import { kioskModeAtom } from "../mode";
 import { connectionAtom, startupProgressAtom } from "../network/connection";
 import type { RequestId } from "../network/DeferredRequestRegistry";
-import { runtimeConfigAtom, useRuntimeManager } from "../runtime/config";
+import { useRuntimeManager } from "../runtime/config";
 import { SECRETS_REGISTRY } from "../secrets/request-registry";
 import { isStaticNotebook } from "../static/static-state";
 import {
@@ -135,7 +135,6 @@ export function useNotebookSession(opts: {
   const setStableSessionId = useSetAtom(stableSessionIdAtom);
   const setCapabilities = useSetAtom(capabilitiesAtom);
   const runtimeManager = useRuntimeManager();
-  const { notebookId } = useAtomValue(runtimeConfigAtom);
   const transportType = useAtomValue(connectionTransportTypeAtom);
   const setCacheInfo = useSetAtom(cacheInfoAtom);
   const setKernelStartupError = useSetAtom(kernelStartupErrorAtom);
@@ -411,11 +410,8 @@ export function useNotebookSession(opts: {
     });
   };
   const notebook = useNotebookClient({
-    sessionId,
     static: isStaticNotebook(),
     transportType,
-    messageFormat:
-      notebookId && transportType === "websocket" ? "host" : "session",
     url: () =>
       transportType === "sse"
         ? runtimeManager.getSseURL(sessionId).toString()
@@ -428,7 +424,6 @@ export function useNotebookSession(opts: {
       }
     },
     checkHealth: () => runtimeManager.reconcileFromHealth(),
-    onMessageError,
     onNotification: (notification) => {
       try {
         handleNotification(notification);

package/src/mount.tsx

@@ -274,8 +274,6 @@ const mountOptionsSchema = z.object({
       .transform((val) => val as api.Notebook["NotebookV1"]),
   ]),
 
-  notebookId: z.string().optional(),
-
   /**
    * Runtime configs
    */
@@ -286,7 +284,6 @@ const mountOptionsSchema = z.object({
         // Lazy by default, but can be overridden by the runtime config
         lazy: z.boolean().default(true),
         authToken: z.string().nullish(),
-        notebookId: z.string().optional(),
       }),
     )
     .nullish()
@@ -367,7 +364,6 @@ function initStore(options: unknown) {
   } else {
     store.set(runtimeConfigAtom, {
       ...DEFAULT_RUNTIME_CONFIG,
-      notebookId: parsedOptions.data.notebookId,
       lazy: false,
       serverToken: parsedOptions.data.serverToken,
     });