@marimo-team/frontend 0.23.9-dev46 → 0.23.9-dev47

package/src/core/websocket/types.ts

@@ -14,7 +14,6 @@ export type WebSocketState =
 
 export const WebSocketClosedReason = {
   KERNEL_DISCONNECTED: "KERNEL_DISCONNECTED",
-  ALREADY_RUNNING: "ALREADY_RUNNING",
   MALFORMED_QUERY: "MALFORMED_QUERY",
   KERNEL_STARTUP_ERROR: "KERNEL_STARTUP_ERROR",
 } as const;
@@ -30,11 +29,6 @@ export type ConnectionStatus =
        * Human-readable reason for closing the connection.
        */
       reason: string;
-      /**
-       * Whether the current session can be taken over by another session,
-       * since we only allow single-user editing.
-       */
-      canTakeover?: boolean;
     }
   | {
       state:

package/src/core/websocket/useMarimoKernelConnection.tsx

@@ -82,7 +82,6 @@ const SUPPORTS_LAZY_KERNELS = true;
 // (marimo/_server/api/endpoints/ws_endpoint.py and ws/*.py). Keep in sync with
 // the backend literals.
 export type CloseReason =
-  | "MARIMO_ALREADY_CONNECTED"
   | "MARIMO_WRONG_KERNEL_ID"
   | "MARIMO_NO_FILE_KEY"
   | "MARIMO_NO_SESSION_ID"
@@ -99,17 +98,6 @@ export type CloseDecision =
 
 export function classifyCloseEvent(event: { reason?: string }): CloseDecision {
   switch (event.reason as CloseReason | undefined) {
-    case "MARIMO_ALREADY_CONNECTED":
-      return {
-        kind: "terminal",
-        status: {
-          state: WebSocketState.CLOSED,
-          code: WebSocketClosedReason.ALREADY_RUNNING,
-          reason: "another browser tab is already connected to the kernel",
-          canTakeover: true,
-        },
-        closeTransport: true,
-      };
     case TRANSPORT_EXHAUSTED_REASON:
       return {
         kind: "gave-up",
@@ -421,6 +409,9 @@ export function useMarimoKernelConnection(opts: {
       case "notebook-document-transaction":
         handleDocumentTransaction(msg.data.transaction);
         return;
+      case "consumer-capabilities":
+        setKioskMode(!msg.data.consumer_capabilities.edit);
+        return;
       default:
         logNever(msg.data);
     }

package/dist/assets/config-DdDKNgb1.js

@@ -1 +0,0 @@
-var S=Object.defineProperty;var g=(t,e,r)=>e in t?S(t,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[e]=r;var m=(t,e,r)=>g(t,typeof e!="symbol"?e+"":e,r);import{i as O,l as y,n as C,o as A,p as i,u as I}from"./useEvent-D91BmmQi.js";import{t as P}from"./compiler-runtime-B3qBwwSJ.js";import{_ as c}from"./useEventListener-DvoEXWke.js";import{t as _}from"./invariant-BUdrueMv.js";import{t as D}from"./utils-CvI-39U6.js";import{r as h}from"./constants-DMpttj8Q.js";import{t as k}from"./Deferred-CP7vq682.js";import{t as R}from"./session-0B5NBztP.js";function L(){return typeof document<"u"&&document.querySelector("marimo-wasm")!==null}const a={NOT_STARTED:"NOT_STARTED",CONNECTING:"CONNECTING",OPEN:"OPEN",CLOSING:"CLOSING",CLOSED:"CLOSED"},b={KERNEL_DISCONNECTED:"KERNEL_DISCONNECTED",ALREADY_RUNNING:"ALREADY_RUNNING",MALFORMED_QUERY:"MALFORMED_QUERY",KERNEL_STARTUP_ERROR:"KERNEL_STARTUP_ERROR"},o=i({state:a.NOT_STARTED});function v(){return A(o,t=>t.state===a.OPEN)}const H=i(t=>t(o).state===a.CONNECTING);i(t=>t(o).state===a.OPEN);const G=i(t=>{let e=t(o);return e.state===a.OPEN||e.state===a.NOT_STARTED}),W=i(t=>t(o).state===a.CLOSED),M=i(t=>t(o).state===a.NOT_STARTED);function $(t){return t===a.CLOSED}function z(t){return t===a.CONNECTING}function F(t){return t===a.OPEN}function j(t){return t===a.CLOSING}function N(t){return t===a.NOT_STARTED}function K(t){return t===a.CLOSED||t===a.CLOSING||t===a.CONNECTING}function B(t){switch(t){case a.CLOSED:return"App disconnected";case a.CONNECTING:return"Connecting to a runtime ...";case a.CLOSING:return"App disconnecting...";case a.OPEN:return"";case a.NOT_STARTED:return"Click to connect to a runtime";default:return""}}function Q(t){if(typeof t!="object"||!t||Array.isArray(t))return!1;for(let e of Object.values(t))if(typeof e!="string")return!1;return!0}function Y(t){if(typeof t!="object"||!t||Array.isArray(t))return!1;let e=t;return!(!Q(e.files)||e.modelNotifications!==void 0&&!Array.isArray(e.modelNotifications))}function f(){let t=typeof window>"u"?void 0:window.__MARIMO_STATIC__;return Y(t)?t:void 0}function p(){return f()!==void 0}function x(){let t=f();return _(t!==void 0,"Not a static notebook"),t.files}function q(){var t;return(t=f())==null?void 0:t.modelNotifications}var V=class{constructor(t,e=!1){m(this,"initialHealthyCheck",new k);this.config=t,this.lazy=e;try{new URL(this.config.url)}catch(r){throw Error(`Invalid runtime URL: ${this.config.url}. ${r instanceof Error?r.message:"Unknown error"}`,{cause:r})}this.lazy||this.init()}get isLazy(){return this.lazy}get httpURL(){return new URL(this.config.url)}get isSameOrigin(){return this.httpURL.origin===window.location.origin}get isServerless(){return L()||D()||p()}formatHttpURL({path:t="",searchParams:e,restrictToKnownQueryParams:r=!0}){let n=this.httpURL,s=new URLSearchParams(window.location.search);if(e)for(let[u,l]of e.entries())n.searchParams.set(u,l);for(let[u,l]of s.entries())r&&!Object.values(h).includes(u)||n.searchParams.set(u,l);return n.pathname=`${n.pathname.replace(/\/$/,"")}/${t.replace(/^\//,"")}`,n.hash="",n}formatWsURL(t,e){let r=this.formatHttpURL({path:t,searchParams:e,restrictToKnownQueryParams:!1});return!this.isSameOrigin&&this.config.authToken&&r.searchParams.set(h.accessToken,this.config.authToken),J(r.toString())}getWsURL(t){let e=new URL(this.config.url),r=new URLSearchParams(e.search);return new URLSearchParams(window.location.search).forEach((n,s)=>{r.has(s)||r.set(s,n)}),r.set(h.sessionId,t),this.formatWsURL("/ws",r)}getWsSyncURL(t){let e=new URL(this.config.url),r=new URLSearchParams(e.search);return new URLSearchParams(window.location.search).forEach((n,s)=>{r.has(s)||r.set(s,n)}),r.set(h.sessionId,t),this.formatWsURL("/ws_sync",r)}getTerminalWsURL(){return this.formatWsURL("/terminal/ws")}getLSPURL(t){if(t==="copilot"){let e=this.formatWsURL(`/lsp/${t}`),r=e.searchParams.get(h.accessToken);return e.search="",r&&e.searchParams.set(h.accessToken,r),e}return this.formatWsURL(`/lsp/${t}`)}getAiURL(t){return this.formatHttpURL({path:`/api/ai/${t}`})}healthURL(){return this.formatHttpURL({path:"/health"})}async fetchHealth(){try{return await fetch(this.healthURL().toString())}catch(t){return c.error(`Failed to check health: ${t instanceof Error?t.message:"Unknown error"}`,{cause:t}),null}}async reconcileFromHealth(){if(this.isServerless)return!0;let t=await this.fetchHealth();if(!t)return!1;if(t.redirected){c.debug(`Runtime redirected to ${t.url}`);let e=new URL(t.url);e.pathname=e.pathname.replace(/\/health$/,""),this.config.url=e.toString()}return t.ok&&this.setDOMBaseUri(this.config.url),t.ok}async probeHealth(){var t;return this.isServerless?!0:((t=await this.fetchHealth())==null?void 0:t.ok)??!1}setDOMBaseUri(t){t=t.split("?",1)[0],t.endsWith("/")||(t+="/");let e=document.querySelector("base");e?e.setAttribute("href",t):(e=document.createElement("base"),e.setAttribute("href",t),document.head.append(e))}async init(t){c.debug("Initializing runtime...");let e=0;for(;!await this.reconcileFromHealth();){if(e>=25){c.error("Failed to connect after 25 retries"),this.initialHealthyCheck.reject(Error("Failed to connect after 25 retries"));return}if(!(t!=null&&t.disableRetryDelay)){let r=Math.min(100*1.2**e,2e3);await new Promise(n=>setTimeout(n,r))}e++}c.debug("Runtime is healthy"),this.initialHealthyCheck.resolve()}async waitForHealthy(){return this.initialHealthyCheck.promise}headers(){let t={"Marimo-Session-Id":R(),"Marimo-Server-Token":this.config.serverToken??"","x-runtime-url":this.httpURL.toString()};return this.config.authToken&&(t.Authorization=`Bearer ${this.config.authToken}`),t}sessionHeaders(){return{"Marimo-Session-Id":R()}}};function J(t){if(!t.startsWith("http")){c.warn(`URL must start with http: ${t}`);let e=new URL(t);return e.protocol="ws",e}return new URL(t.replace(/^http/,"ws"))}var X=P();function Z(){let t=new URL(document.baseURI);return t.search="",t.hash="",t.toString()}const E={lazy:!0,url:Z()},w=i(E);var T=i(t=>{let e=t(w);return new V(e,e.lazy)});function U(){return I(T)}function tt(){let t=(0,X.c)(4),e=U(),[r,n]=y(o),s;return t[0]!==r.state||t[1]!==e||t[2]!==n?(s=async()=>{N(r.state)?(n({state:a.CONNECTING}),await e.init()):c.log("Runtime already started or starting...")},t[0]=r.state,t[1]=e,t[2]=n,t[3]=s):s=t[3],C(s)}function d(){return O.get(T)}function et(t){if(t.startsWith("http"))return new URL(t);let e=d().httpURL.toString();return e.startsWith("blob:")&&(e=e.replace("blob:","")),new URL(t,e)}export{b as C,v as S,L as T,G as _,tt as a,H as b,x as c,$ as d,j as f,N as g,K as h,w as i,p as l,z as m,et as n,U as o,F as p,d as r,q as s,E as t,B as u,o as v,a as w,M as x,W as y};