@marimo-team/islands 0.25.3-dev81 → 0.25.3-dev85

package/src/core/runtime/runtime.ts

@@ -128,33 +128,32 @@ export class RuntimeManager {
     return asWsUrl(this.appendCrossOriginAuth(url).toString());
   }
 
-  /**
-   * Search params for a session connection: the base URL's params, merged
-   * with the current page's, plus the session id.
-   */
-  private getSessionSearchParams(sessionId: SessionId): URLSearchParams {
-    const baseUrl = new URL(this.config.url);
-    const searchParams = new URLSearchParams(baseUrl.search);
-
-    // Merge in current page's query parameters
-    const currentParams = new URLSearchParams(window.location.search);
-    currentParams.forEach((value, key) => {
-      // Don't override base URL params
-      if (!searchParams.has(key)) {
-        searchParams.set(key, value);
-      }
-    });
-
-    searchParams.set(KnownQueryParams.sessionId, sessionId);
-    return searchParams;
+  /** Keep notebook page parameters separate from connection options. */
+  private getSessionURL(path: string, sessionId: SessionId): URL {
+    const url = this.formatHttpURL({ path });
+    const notebookParams = new URLSearchParams(this.httpURL.search);
+    const pageParams = new URLSearchParams(window.location.search);
+    for (const key of pageParams.keys()) {
+      notebookParams.delete(key);
+    }
+    for (const [key, value] of pageParams) {
+      notebookParams.append(key, value);
+    }
+    // These parameters are internal and are not exposed by mo.query_params().
+    notebookParams.delete(KnownQueryParams.accessToken);
+    notebookParams.delete("refresh_token");
+    notebookParams.delete(KnownQueryParams.sessionId);
+    url.searchParams.set("query_params", notebookParams.toString());
+    url.searchParams.set(KnownQueryParams.sessionId, sessionId);
+    return url;
   }
 
   /**
    * The WebSocket URL of the runtime.
    */
   public getWsURL(sessionId: SessionId): URL {
-    const searchParams = this.getSessionSearchParams(sessionId);
-    return this.formatWsURL("/ws", searchParams);
+    const url = this.getSessionURL("/ws", sessionId);
+    return asWsUrl(this.appendCrossOriginAuth(url).toString());
   }
 
   /**
@@ -164,11 +163,7 @@ export class RuntimeManager {
    * (see `headers()`) instead of the URL.
    */
   public getSseURL(sessionId: SessionId): URL {
-    const url = this.formatHttpURL({
-      path: "/sse",
-      searchParams: this.getSessionSearchParams(sessionId),
-      restrictToKnownQueryParams: false,
-    });
+    const url = this.getSessionURL("/sse", sessionId);
     // The page URL can still carry access_token (merged in from the
     // current page's params, before auth cleanup strips it); never
     // forward it — a token in the URL leaks into proxy/server logs.
@@ -180,7 +175,8 @@ export class RuntimeManager {
    * The WebSocket Sync URL of the runtime, for real-time updates.
    */
   public getWsSyncURL(sessionId: SessionId): URL {
-    return this.formatWsURL("/ws_sync", this.getSessionSearchParams(sessionId));
+    const url = this.getSessionURL("/ws_sync", sessionId);
+    return asWsUrl(this.appendCrossOriginAuth(url).toString());
   }
 
   /**

package/src/core/wasm/bridge.ts

@@ -38,8 +38,6 @@ import type {
 } from "../network/types";
 import { filenameAtom } from "../saving/file-state";
 import { store } from "../state/jotai";
-import { BasicTransport } from "../websocket/transports/basic";
-import type { IConnectionTransport } from "../websocket/transports/transport";
 import { PyodideRouter } from "./router";
 import { getWorkerRPC } from "./rpc";
 import { getWasmRuntimeConfig } from "./runtime-config";
@@ -719,12 +717,6 @@ export class PyodideBridge implements RunRequests, EditRequests {
   }
 }
 
-export function createPyodideConnection(): IConnectionTransport {
-  return BasicTransport.withProducerCallback((callback) => {
-    PyodideBridge.INSTANCE.attachMessageConsumer(callback);
-  });
-}
-
 // Compose the worker name. The optional "::controller" suffix tells
 // getController.ts that the host page provides a custom /wasm/controller.js
 // and that the dynamic import should be attempted. Hosts opt in by setting

package/src/core/websocket/__tests__/connection-state.test.ts

@@ -64,16 +64,4 @@ describe("classifyCloseEvent", () => {
       });
     });
   });
-
-  describe("transport exhaustion", () => {
-    it("MARIMO_TRANSPORT_EXHAUSTED → gave-up with KERNEL_DISCONNECTED", () => {
-      const decision = classify("MARIMO_TRANSPORT_EXHAUSTED");
-      expect(decision.kind).toBe("gave-up");
-      expect(decision.status).toEqual({
-        state: ConnectionState.CLOSED,
-        code: WebSocketClosedReason.KERNEL_DISCONNECTED,
-        reason: "kernel not found",
-      });
-    });
-  });
 });

package/src/core/websocket/connection-state.ts

@@ -2,22 +2,12 @@
 
 import type { CloseDecision } from "../host/connection";
 import { Logger } from "@/utils/Logger";
-import { TRANSPORT_EXHAUSTED_REASON } from "./transports/ws";
 import { ConnectionState, WebSocketClosedReason } from "./types";
 
 // Keep server reasons in sync with ws_endpoint.py and ws/*.py.
 // SSE carries the same reasons in close events. Unclassified reasons retry.
 export function classifyCloseEvent(event: { reason?: string }): CloseDecision {
   switch (event.reason) {
-    case TRANSPORT_EXHAUSTED_REASON:
-      return {
-        kind: "gave-up",
-        status: {
-          state: ConnectionState.CLOSED,
-          code: WebSocketClosedReason.KERNEL_DISCONNECTED,
-          reason: "kernel not found",
-        },
-      };
     case "MARIMO_NO_FILE_KEY":
     case "MARIMO_NO_SESSION_ID":
     case "MARIMO_NO_SESSION":

package/src/core/host/__tests__/events.test.ts

@@ -1,49 +0,0 @@
-/* Copyright 2026 Marimo. All rights reserved. */
-
-import { describe, expect, expectTypeOf, it } from "vitest";
-import { z } from "zod";
-import { type NotebookEvent, parseNotebookEvent } from "../events";
-
-describe("notebook messages", () => {
-  it("normalizes session and host envelopes for native marimo messages", () => {
-    const notification = {
-      op: "variables",
-      variables: [{ name: "x", value: Number.NaN }],
-    };
-    expectTypeOf<
-      Extract<NotebookEvent, { event: "marimo" }>["data"]["marimo"]
-    >().toBeUnknown();
-    const host = { event: "marimo", data: { marimo: notification } };
-    expect(parseNotebookEvent({ data: notification })).toEqual(host);
-    expect(parseNotebookEvent({ ...host, id: "42" })).toEqual({
-      ...host,
-      id: "42",
-    });
-  });
-
-  it("retains unknown event cursors without interpreting their payloads", () => {
-    expect(
-      parseNotebookEvent({ event: "future", id: "42", data: null }),
-    ).toEqual({ event: "unknown", name: "future", id: "42" });
-  });
-
-  it("decodes known events outside the client's subscription filters", () => {
-    const event = {
-      event: "run.removed",
-      id: "42",
-      data: { id: "r1", time: "2026-10-19T12:00:00Z" },
-    };
-    expect(parseNotebookEvent(event)).toEqual(event);
-  });
-
-  it.each([
-    { event: "cell", id: "42", data: { cell: { id: "c1" } } },
-    { event: "run.removed", id: "42", data: {} },
-    { event: "ready", data: {} },
-    { event: "marimo", data: {} },
-    {},
-    null,
-  ])("rejects malformed known messages: %j", (message) => {
-    expect(() => parseNotebookEvent(message)).toThrow(z.ZodError);
-  });
-});

package/src/core/host/events.ts

@@ -1,68 +0,0 @@
-/* Copyright 2026 Marimo. All rights reserved. */
-
-import { z } from "zod";
-import * as Protocol from "@marimo-team/client/protocol";
-
-/**
- * Notebook stream events, including native marimo notifications.
- *
- * Known events follow the generated protocol. Unknown events retain their name
- * and cursor so clients can skip them without losing their place in the stream.
- */
-
-const envelope = z.object({
-  event: z.string().min(1),
-  data: z.unknown(),
-  id: z.string().min(1).optional(),
-});
-
-const knownNames = new Set<string>(
-  Protocol.Event.options.flatMap((schema) => schema.shape.event.options),
-);
-
-/**
- * A native marimo message carried by a host stream.
- *
- * The protocol leaves extension events to their producer. The payload is
- * passed through for the session handler to interpret.
- */
-const MarimoEvent = z.object({
-  event: z.literal("marimo"),
-  id: z.string().min(1).optional(),
-  data: z.object({ marimo: z.unknown() }),
-});
-
-/** A decoded event, or the name and cursor of an unrecognized event. */
-export type NotebookEvent =
-  | Protocol.EventOutput
-  | z.output<typeof MarimoEvent>
-  | {
-      readonly event: "unknown";
-      readonly name: string;
-      readonly id?: string;
-    };
-
-const sessionEnvelope = z.object({ data: z.unknown() });
-
-/**
- * Decode a host event or an in-process WASM `{ data: notification }` message.
- *
- * Throws if the envelope or a known event is malformed. Native notification
- * payloads are passed through for the session handler to interpret.
- */
-export function parseNotebookEvent(value: unknown): NotebookEvent {
-  if (typeof value === "object" && value !== null && !("event" in value)) {
-    return {
-      event: "marimo",
-      data: { marimo: sessionEnvelope.parse(value).data },
-    };
-  }
-  const parsed = envelope.parse(value);
-  if (parsed.event === "marimo") {
-    return MarimoEvent.parse(parsed);
-  }
-  if (knownNames.has(parsed.event)) {
-    return Protocol.Event.parse(parsed);
-  }
-  return { event: "unknown", name: parsed.event, id: parsed.id };
-}

package/src/core/websocket/__tests__/createConnectionTransport.test.ts

@@ -1,49 +0,0 @@
-/* Copyright 2026 Marimo. All rights reserved. */
-
-import { afterEach, describe, expect, it, vi } from "vitest";
-import { BasicTransport } from "../transports/basic";
-import { SseTransport } from "../transports/sse";
-import { WsTransport } from "../transports/ws";
-import { createConnectionTransport } from "../transports/create";
-
-vi.mock("../../wasm/utils", () => ({
-  isWasm: () => false,
-}));
-
-describe("createConnectionTransport", () => {
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
-  const options = {
-    url: () => "http://localhost/ws",
-    headers: () => ({}),
-  };
-
-  it("uses BasicTransport for static notebooks", () => {
-    const transport = createConnectionTransport({
-      ...options,
-      static: true,
-      transportType: "websocket",
-    });
-    expect(transport).toBeInstanceOf(BasicTransport);
-  });
-
-  it("uses WsTransport by default", () => {
-    const transport = createConnectionTransport({
-      ...options,
-      static: false,
-      transportType: "websocket",
-    });
-    expect(transport).toBeInstanceOf(WsTransport);
-  });
-
-  it("uses SseTransport when the transport type is sse", () => {
-    const transport = createConnectionTransport({
-      ...options,
-      static: false,
-      transportType: "sse",
-    });
-    expect(transport).toBeInstanceOf(SseTransport);
-  });
-});

package/src/core/websocket/transports/__tests__/basic.test.ts

@@ -1,275 +0,0 @@
-/* Copyright 2026 Marimo. All rights reserved. */
-
-import { describe, expect, it, vi } from "vitest";
-import { BasicTransport } from "../basic";
-
-describe("BasicTransport", () => {
-  describe("close", () => {
-    it("should trigger close event", () => {
-      const transport = BasicTransport.empty();
-      const closeCallback = vi.fn();
-
-      transport.addEventListener("close", closeCallback);
-      transport.close();
-
-      expect(closeCallback).toHaveBeenCalledTimes(1);
-      expect(closeCallback).toHaveBeenCalledWith(expect.any(Event));
-    });
-  });
-
-  describe("reconnect", () => {
-    it("should trigger close and open events", async () => {
-      const transport = BasicTransport.empty();
-      const openCallback = vi.fn();
-      const closeCallback = vi.fn();
-
-      transport.addEventListener("open", openCallback);
-      transport.addEventListener("close", closeCallback);
-
-      // Clear the initial open callback
-      openCallback.mockClear();
-
-      transport.reconnect();
-
-      // Wait for connect to complete
-      await new Promise((resolve) => setTimeout(resolve, 10));
-
-      expect(closeCallback).toHaveBeenCalledTimes(1);
-      expect(openCallback).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe("send", () => {
-    it("should trigger message event with string data", async () => {
-      const transport = BasicTransport.empty();
-      const messageCallback = vi.fn();
-
-      transport.addEventListener("message", messageCallback);
-
-      transport.send("test message");
-
-      expect(messageCallback).toHaveBeenCalledTimes(1);
-      expect(messageCallback).toHaveBeenCalledWith(
-        expect.objectContaining({
-          data: "test message",
-        }),
-      );
-    });
-
-    it("should trigger message event with ArrayBuffer data", async () => {
-      const transport = BasicTransport.empty();
-      const messageCallback = vi.fn();
-
-      transport.addEventListener("message", messageCallback);
-
-      const buffer = new ArrayBuffer(8);
-      transport.send(buffer);
-
-      expect(messageCallback).toHaveBeenCalledTimes(1);
-      expect(messageCallback).toHaveBeenCalledWith(
-        expect.objectContaining({
-          data: buffer,
-        }),
-      );
-    });
-  });
-
-  describe("addEventListener", () => {
-    it("should add open event listener and call it immediately", () => {
-      const transport = BasicTransport.empty();
-      const callback = vi.fn();
-
-      transport.addEventListener("open", callback);
-
-      expect(callback).toHaveBeenCalledTimes(1);
-      expect(callback).toHaveBeenCalledWith(expect.any(Event));
-    });
-
-    it("should add message event listener and start producer", () => {
-      const producer = vi.fn();
-      const transport = BasicTransport.withProducerCallback(producer);
-      const callback = vi.fn();
-
-      transport.addEventListener("message", callback);
-
-      // Producer should be called once
-      expect(producer).toHaveBeenCalledTimes(1);
-      expect(producer).toHaveBeenCalledWith(expect.any(Function));
-    });
-  });
-
-  describe("removeEventListener", () => {
-    it("should remove event listener", async () => {
-      const transport = BasicTransport.empty();
-      const callback = vi.fn();
-
-      transport.addEventListener("message", callback);
-      transport.removeEventListener("message", callback);
-
-      transport.send("test");
-
-      expect(callback).not.toHaveBeenCalled();
-    });
-
-    it("should only remove the specific listener", () => {
-      const transport = BasicTransport.empty();
-      const callback1 = vi.fn();
-      const callback2 = vi.fn();
-
-      transport.addEventListener("close", callback1);
-      transport.addEventListener("close", callback2);
-
-      transport.removeEventListener("close", callback1);
-
-      transport.close();
-
-      expect(callback1).not.toHaveBeenCalled();
-      expect(callback2).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe("Producer functionality", () => {
-    it("should pass producer callback that triggers message events", () => {
-      let producerCallback: ((message: MessageEvent) => void) | undefined;
-      const producer = vi.fn((callback) => {
-        producerCallback = callback;
-      });
-      const transport = BasicTransport.withProducerCallback(producer);
-      const messageCallback = vi.fn();
-
-      transport.addEventListener("message", messageCallback);
-
-      expect(producerCallback).toBeDefined();
-
-      const testMessage = new MessageEvent("message", { data: "test" });
-      producerCallback?.(testMessage);
-
-      expect(messageCallback).toHaveBeenCalledWith(testMessage);
-    });
-
-    it("should handle multiple messages from producer", () => {
-      let producerCallback: ((message: MessageEvent) => void) | undefined;
-      const producer = vi.fn((callback) => {
-        producerCallback = callback;
-      });
-      const transport = BasicTransport.withProducerCallback(producer);
-      const messageCallback = vi.fn();
-
-      transport.addEventListener("message", messageCallback);
-
-      producerCallback?.(new MessageEvent("message", { data: "msg1" }));
-      producerCallback?.(new MessageEvent("message", { data: "msg2" }));
-      producerCallback?.(new MessageEvent("message", { data: "msg3" }));
-
-      expect(messageCallback).toHaveBeenCalledTimes(3);
-      expect(messageCallback).toHaveBeenNthCalledWith(
-        1,
-        expect.objectContaining({ data: "msg1" }),
-      );
-      expect(messageCallback).toHaveBeenNthCalledWith(
-        2,
-        expect.objectContaining({ data: "msg2" }),
-      );
-      expect(messageCallback).toHaveBeenNthCalledWith(
-        3,
-        expect.objectContaining({ data: "msg3" }),
-      );
-    });
-
-    it("should not start producer if no message listener is added", () => {
-      const producer = vi.fn();
-      const transport = BasicTransport.withProducerCallback(producer);
-
-      transport.addEventListener("open", vi.fn());
-      transport.addEventListener("close", vi.fn());
-
-      expect(producer).not.toHaveBeenCalled();
-    });
-  });
-
-  describe("Integration scenarios", () => {
-    it("should handle complete connection lifecycle", async () => {
-      const transport = BasicTransport.empty();
-      const openCallback = vi.fn();
-      const closeCallback = vi.fn();
-
-      transport.addEventListener("open", openCallback);
-      transport.addEventListener("close", closeCallback);
-
-      expect(openCallback).toHaveBeenCalledTimes(1);
-
-      transport.reconnect();
-      await new Promise((resolve) => setTimeout(resolve, 10));
-      expect(openCallback).toHaveBeenCalledTimes(2);
-      expect(closeCallback).toHaveBeenCalledTimes(1);
-
-      transport.close();
-      expect(closeCallback).toHaveBeenCalledTimes(2);
-    });
-
-    it("should handle send and receive flow", async () => {
-      let producerCallback: ((message: MessageEvent) => void) | undefined;
-      const producer = vi.fn((callback) => {
-        producerCallback = callback;
-      });
-      const transport = BasicTransport.withProducerCallback(producer);
-      const messageCallback = vi.fn();
-
-      transport.addEventListener("message", messageCallback);
-
-      transport.send("outgoing");
-      expect(messageCallback).toHaveBeenCalledWith(
-        expect.objectContaining({ data: "outgoing" }),
-      );
-
-      messageCallback.mockClear();
-
-      producerCallback?.(new MessageEvent("message", { data: "incoming" }));
-      expect(messageCallback).toHaveBeenCalledWith(
-        expect.objectContaining({ data: "incoming" }),
-      );
-    });
-
-    it("should maintain separate event queues for different event types", async () => {
-      const transport = BasicTransport.empty();
-      const openCallback = vi.fn();
-      const closeCallback = vi.fn();
-      const messageCallback = vi.fn();
-
-      transport.addEventListener("open", openCallback);
-      transport.addEventListener("close", closeCallback);
-      transport.addEventListener("message", messageCallback);
-
-      openCallback.mockClear();
-
-      transport.reconnect();
-      await new Promise((resolve) => setTimeout(resolve, 10));
-      transport.send("test");
-      transport.close();
-
-      expect(openCallback).toHaveBeenCalledTimes(1);
-      expect(messageCallback).toHaveBeenCalledTimes(1);
-      expect(closeCallback).toHaveBeenCalledTimes(2);
-    });
-
-    it("should handle rapid reconnections", async () => {
-      const transport = BasicTransport.empty();
-      const openCallback = vi.fn();
-      const closeCallback = vi.fn();
-
-      transport.addEventListener("open", openCallback);
-      transport.addEventListener("close", closeCallback);
-
-      openCallback.mockClear();
-
-      transport.reconnect();
-      transport.reconnect();
-      transport.reconnect();
-
-      await new Promise((resolve) => setTimeout(resolve, 20));
-
-      expect(closeCallback).toHaveBeenCalledTimes(3);
-      expect(openCallback).toHaveBeenCalledTimes(3);
-    });
-  });
-});