@liveblocks/core 1.0.7 → 1.0.9

package/dist/index.js

@@ -117,7 +117,7 @@ var onMessageFromPanel = eventSource.observable;
 // src/devtools/index.ts
 var VERSION = true ? (
   /* istanbul ignore next */
-  "1.0.7"
+  "1.0.9"
 ) : "dev";
 var _devtoolsSetupHasRun = false;
 function setupDevTools(getAllRooms) {
@@ -2983,20 +2983,22 @@ function parseJwtToken(token) {
 }
 function parseRoomAuthToken(tokenString) {
   const data = parseJwtToken(tokenString);
-  if (data && isRoomAuthToken(data)) {
-    const _a = data, {
-      maxConnections: _legacyField
-    } = _a, token = __objRest(_a, [
-      // If this legacy field is found on the token, pretend it wasn't there,
-      // to make all internally used token payloads uniform
-      "maxConnections"
-    ]);
-    return token;
-  } else {
+  if (!(data && isRoomAuthToken(data))) {
     throw new Error(
       "Authentication error: we expected a room token but did not get one. Hint: if you are using a callback, ensure the room is passed when creating the token. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClientCallback"
     );
   }
+  const _a = data, {
+    maxConnections: _legacyField
+  } = _a, parsedToken = __objRest(_a, [
+    // If this legacy field is found on the token, pretend it wasn't there,
+    // to make all internally used token payloads uniform
+    "maxConnections"
+  ]);
+  return {
+    raw: tokenString,
+    parsed: parsedToken
+  };
 }
 
 // src/protocol/ClientMsg.ts
@@ -3237,7 +3239,7 @@ var DerivedRef = class extends ImmutableRef {
   }
 };
 
-// src/types/WebsocketCloseCodes.ts
+// src/types/IWebSocket.ts
 var WebsocketCloseCodes = /* @__PURE__ */ ((WebsocketCloseCodes2) => {
   WebsocketCloseCodes2[WebsocketCloseCodes2["CLOSE_ABNORMAL"] = 1006] = "CLOSE_ABNORMAL";
   WebsocketCloseCodes2[WebsocketCloseCodes2["INVALID_MESSAGE_FORMAT"] = 4e3] = "INVALID_MESSAGE_FORMAT";
@@ -3273,8 +3275,10 @@ function userToTreeNode(key, user) {
     payload: user
   };
 }
-function makeStateMachine(config, initialPresence, initialStorage) {
+function createRoom(options, config) {
   var _a;
+  const initialPresence = typeof options.initialPresence === "function" ? options.initialPresence(config.roomId) : options.initialPresence;
+  const initialStorage = typeof options.initialStorage === "function" ? options.initialStorage(config.roomId) : options.initialStorage;
   const context = {
     token: null,
     lastConnectionId: null,
@@ -3378,36 +3382,38 @@ function makeStateMachine(config, initialPresence, initialStorage) {
     storageStatus: makeEventSource()
   };
   const effects = config.mockedEffects || {
-    authenticate(auth, createWebSocket) {
+    authenticateAndConnect(auth, createWebSocket) {
       const prevToken = context.token;
       if (prevToken !== null && !isTokenExpired(prevToken.parsed)) {
-        const socket = createWebSocket(prevToken.raw);
-        authenticationSuccess(prevToken.parsed, socket);
+        const socket = createWebSocket(prevToken);
+        handleAuthSuccess(prevToken.parsed, socket);
         return void 0;
       } else {
-        return auth(config.roomId).then(({ token }) => {
+        void auth().then((token) => {
           if (context.connection.current.status !== "authenticating") {
             return;
           }
-          const parsedToken = parseRoomAuthToken(token);
           const socket = createWebSocket(token);
-          authenticationSuccess(parsedToken, socket);
-          context.token = { raw: token, parsed: parsedToken };
+          handleAuthSuccess(token.parsed, socket);
+          context.token = token;
         }).catch(
           (er) => authenticationFailure(
             er instanceof Error ? er : new Error(String(er))
           )
         );
+        return void 0;
       }
     },
     send(messageOrMessages) {
       if (context.socket === null) {
         throw new Error("Can't send message if socket is null");
       }
-      context.socket.send(JSON.stringify(messageOrMessages));
+      if (context.socket.readyState === context.socket.OPEN) {
+        context.socket.send(JSON.stringify(messageOrMessages));
+      }
     },
     scheduleFlush: (delay) => setTimeout(tryFlushing, delay),
-    scheduleReconnect: (delay) => setTimeout(connect, delay),
+    scheduleReconnect: (delay) => setTimeout(handleConnect, delay),
     startHeartbeatInterval: () => setInterval(heartbeat, HEARTBEAT_INTERVAL),
     schedulePongTimeout: () => setTimeout(pongTimeout, PONG_TIMEOUT)
   };
@@ -3616,12 +3622,13 @@ function makeStateMachine(config, initialPresence, initialStorage) {
       }
     }
   }
-  function connect() {
+  function handleConnect() {
     var _a2, _b;
     if (context.connection.current.status !== "closed" && context.connection.current.status !== "unavailable") {
       return;
     }
     const auth = prepareAuthEndpoint(
+      config.roomId,
       config.authentication,
       (_a2 = config.polyfills) == null ? void 0 : _a2.fetch
     );
@@ -3630,9 +3637,9 @@ function makeStateMachine(config, initialPresence, initialStorage) {
       (_b = config.polyfills) == null ? void 0 : _b.WebSocket
     );
     updateConnection({ status: "authenticating" }, batchUpdates);
-    effects.authenticate(auth, createWebSocket);
+    effects.authenticateAndConnect(auth, createWebSocket);
   }
-  function updatePresence(patch, options) {
+  function updatePresence(patch, options2) {
     const oldValues = {};
     if (context.buffer.me === null) {
       context.buffer.me = {
@@ -3650,7 +3657,7 @@ function makeStateMachine(config, initialPresence, initialStorage) {
     }
     context.me.patch(patch);
     if (context.activeBatch) {
-      if (options == null ? void 0 : options.addToHistory) {
+      if (options2 == null ? void 0 : options2.addToHistory) {
         context.activeBatch.reverseOps.unshift({
           type: "presence",
           data: oldValues
@@ -3660,7 +3667,7 @@ function makeStateMachine(config, initialPresence, initialStorage) {
     } else {
       tryFlushing();
       batchUpdates(() => {
-        if (options == null ? void 0 : options.addToHistory) {
+        if (options2 == null ? void 0 : options2.addToHistory) {
           addToUndoStack(
             [{ type: "presence", data: oldValues }],
             doNotBatchUpdates
@@ -3673,11 +3680,11 @@ function makeStateMachine(config, initialPresence, initialStorage) {
   function isStorageReadOnly(scopes) {
     return scopes.includes("room:read" /* Read */) && scopes.includes("room:presence:write" /* PresenceWrite */) && !scopes.includes("room:write" /* Write */);
   }
-  function authenticationSuccess(token, socket) {
-    socket.addEventListener("message", onMessage);
-    socket.addEventListener("open", onOpen);
-    socket.addEventListener("close", onClose);
-    socket.addEventListener("error", onError);
+  function handleAuthSuccess(token, socket) {
+    socket.addEventListener("message", handleRawSocketMessage);
+    socket.addEventListener("open", handleSocketOpen);
+    socket.addEventListener("close", handleExplicitClose);
+    socket.addEventListener("error", handleSocketError);
     updateConnection(
       {
         status: "connecting",
@@ -3701,8 +3708,8 @@ function makeStateMachine(config, initialPresence, initialStorage) {
     clearTimeout(context.timers.reconnect);
     context.timers.reconnect = effects.scheduleReconnect(getRetryDelay());
   }
-  function onVisibilityChange(visibilityState) {
-    if (visibilityState === "visible" && context.connection.current.status === "open") {
+  function handleWindowGotFocus() {
+    if (context.connection.current.status === "open") {
       log("Heartbeat after visibility change");
       heartbeat();
     }
@@ -3756,7 +3763,7 @@ function makeStateMachine(config, initialPresence, initialStorage) {
     }
     return { type: "reset" };
   }
-  function onNavigatorOnline() {
+  function handleNavigatorBackOnline() {
     if (context.connection.current.status === "unavailable") {
       log("Try to reconnect after connectivity change");
       reconnect();
@@ -3819,9 +3826,18 @@ function makeStateMachine(config, initialPresence, initialStorage) {
     notify(result.updates, batchedUpdatesWrapper);
     effects.send(messages);
   }
-  function onMessage(event) {
+  function handleRawSocketMessage(event) {
     if (event.data === "pong") {
-      clearTimeout(context.timers.pongTimeout);
+      transition({ type: "RECEIVE_PONG" });
+    } else {
+      handleServerMessage(event);
+    }
+  }
+  function handlePong() {
+    clearTimeout(context.timers.pongTimeout);
+  }
+  function handleServerMessage(event) {
+    if (typeof event.data !== "string") {
       return;
     }
     const messages = parseServerMessages(event.data);
@@ -3921,7 +3937,7 @@ ${Array.from(traces).join("\n\n")}`
       notify(updates, doNotBatchUpdates);
     });
   }
-  function onClose(event) {
+  function handleExplicitClose(event) {
     context.socket = null;
     clearTimeout(context.timers.flush);
     clearTimeout(context.timers.reconnect);
@@ -3972,9 +3988,9 @@ ${Array.from(traces).join("\n\n")}`
     }
     return BACKOFF_RETRY_DELAYS[context.numRetries < BACKOFF_RETRY_DELAYS.length ? context.numRetries : BACKOFF_RETRY_DELAYS.length - 1];
   }
-  function onError() {
+  function handleSocketError() {
   }
-  function onOpen() {
+  function handleSocketOpen() {
     clearInterval(context.timers.heartbeat);
     context.timers.heartbeat = effects.startHeartbeatInterval();
     if (context.connection.current.status === "connecting") {
@@ -4017,12 +4033,12 @@ ${Array.from(traces).join("\n\n")}`
     log("Pong timeout. Trying to reconnect.");
     reconnect();
   }
-  function disconnect() {
+  function handleDisconnect() {
     if (context.socket) {
-      context.socket.removeEventListener("open", onOpen);
-      context.socket.removeEventListener("message", onMessage);
-      context.socket.removeEventListener("close", onClose);
-      context.socket.removeEventListener("error", onError);
+      context.socket.removeEventListener("open", handleSocketOpen);
+      context.socket.removeEventListener("message", handleRawSocketMessage);
+      context.socket.removeEventListener("close", handleExplicitClose);
+      context.socket.removeEventListener("error", handleSocketError);
       context.socket.close();
       context.socket = null;
     }
@@ -4041,10 +4057,10 @@ ${Array.from(traces).join("\n\n")}`
   }
   function reconnect() {
     if (context.socket) {
-      context.socket.removeEventListener("open", onOpen);
-      context.socket.removeEventListener("message", onMessage);
-      context.socket.removeEventListener("close", onClose);
-      context.socket.removeEventListener("error", onError);
+      context.socket.removeEventListener("open", handleSocketOpen);
+      context.socket.removeEventListener("message", handleRawSocketMessage);
+      context.socket.removeEventListener("close", handleExplicitClose);
+      context.socket.removeEventListener("error", handleSocketError);
       context.socket.close();
       context.socket = null;
     }
@@ -4053,7 +4069,7 @@ ${Array.from(traces).join("\n\n")}`
     clearInterval(context.timers.heartbeat);
     clearTimeout(context.timers.pongTimeout);
     updateConnection({ status: "unavailable" }, batchUpdates);
-    connect();
+    handleConnect();
   }
   function tryFlushing() {
     const storageOps = context.buffer.storageOperations;
@@ -4116,10 +4132,10 @@ ${Array.from(traces).join("\n\n")}`
     }
     return messages;
   }
-  function broadcastEvent(event, options = {
+  function broadcastEvent(event, options2 = {
     shouldQueueEventIfNotReady: false
   }) {
-    if (context.socket === null && !options.shouldQueueEventIfNotReady) {
+    if (context.socket === null && !options2.shouldQueueEventIfNotReady) {
       return;
     }
     context.buffer.messages.push({
@@ -4150,7 +4166,7 @@ ${Array.from(traces).join("\n\n")}`
     if (root !== void 0) {
       return root;
     } else {
-      startLoadingStorage();
+      void startLoadingStorage();
       return null;
     }
   }
@@ -4256,14 +4272,11 @@ ${Array.from(traces).join("\n\n")}`
       _addToRealUndoStack(historyOps, batchUpdates);
     }
   }
-  function simulateSocketClose() {
+  function handleImplicitClose() {
     if (context.socket) {
       context.socket = null;
     }
   }
-  function simulateSendCloseEvent(event) {
-    onClose(event);
-  }
   function getStorageStatus() {
     if (_getInitialStatePromise === null) {
       return "not-loaded";
@@ -4285,119 +4298,113 @@ ${Array.from(traces).join("\n\n")}`
     context.others,
     (others) => others.map((other, index) => userToTreeNode(`Other ${index}`, other))
   );
+  const events = {
+    customEvent: eventHub.customEvent.observable,
+    others: eventHub.others.observable,
+    me: eventHub.me.observable,
+    error: eventHub.error.observable,
+    connection: eventHub.connection.observable,
+    storage: eventHub.storage.observable,
+    history: eventHub.history.observable,
+    storageDidLoad: eventHub.storageDidLoad.observable,
+    storageStatus: eventHub.storageStatus.observable
+  };
+  function transition(event) {
+    switch (event.type) {
+      case "CONNECT":
+        return handleConnect();
+      case "DISCONNECT":
+        return handleDisconnect();
+      case "RECEIVE_PONG":
+        return handlePong();
+      case "AUTH_SUCCESS":
+        return handleAuthSuccess(event.token, event.socket);
+      case "WINDOW_GOT_FOCUS":
+        return handleWindowGotFocus();
+      case "NAVIGATOR_ONLINE":
+        return handleNavigatorBackOnline();
+      case "IMPLICIT_CLOSE":
+        return handleImplicitClose();
+      case "EXPLICIT_CLOSE":
+        return handleExplicitClose(event.closeEvent);
+      default:
+        return assertNever(event, "Invalid event");
+    }
+  }
   return {
-    // Internal
-    get state() {
-      return context;
+    /* NOTE: Exposing __internal here only to allow testing implementation details in unit tests */
+    __internal: {
+      get buffer() {
+        return context.buffer;
+      },
+      // prettier-ignore
+      get numRetries() {
+        return context.numRetries;
+      },
+      // prettier-ignore
+      get undoStack() {
+        return context.undoStack;
+      },
+      // prettier-ignore
+      get nodeCount() {
+        return context.nodes.size;
+      },
+      // prettier-ignore
+      // Support for the Liveblocks browser extension
+      getSelf_forDevTools: () => selfAsTreeNode.current,
+      getOthers_forDevTools: () => others_forDevTools.current,
+      // prettier-ignore
+      send: {
+        explicitClose: (closeEvent) => transition({ type: "EXPLICIT_CLOSE", closeEvent }),
+        implicitClose: () => transition({ type: "IMPLICIT_CLOSE" }),
+        authSuccess: (token, socket) => transition({ type: "AUTH_SUCCESS", token, socket }),
+        navigatorOnline: () => transition({ type: "NAVIGATOR_ONLINE" }),
+        windowGotFocus: () => transition({ type: "WINDOW_GOT_FOCUS" }),
+        pong: () => transition({ type: "RECEIVE_PONG" }),
+        connect: () => transition({ type: "CONNECT" }),
+        disconnect: () => transition({ type: "DISCONNECT" }),
+        /**
+         * This one looks differently from the rest, because receiving messages
+         * is handled orthorgonally from all other possible events above,
+         * because it does not matter what the connectivity state of the
+         * machine is, so there won't be an explicit state machine transition
+         * needed for this event.
+         */
+        incomingMessage: handleServerMessage
+      }
     },
-    onClose,
-    onMessage,
-    authenticationSuccess,
-    heartbeat,
-    onNavigatorOnline,
-    // Internal DevTools
-    simulateSocketClose,
-    simulateSendCloseEvent,
-    onVisibilityChange,
-    getUndoStack: () => context.undoStack,
-    getItemsCount: () => context.nodes.size,
-    // Core
-    connect,
-    disconnect,
+    id: config.roomId,
+    subscribe: makeClassicSubscribeFn(events),
     reconnect,
     // Presence
     updatePresence,
     broadcastEvent,
     // Storage
     batch,
-    undo,
-    redo,
-    canUndo,
-    canRedo,
-    pauseHistory,
-    resumeHistory,
+    history: {
+      undo,
+      redo,
+      canUndo,
+      canRedo,
+      pause: pauseHistory,
+      resume: resumeHistory
+    },
     getStorage,
     getStorageSnapshot,
     getStorageStatus,
-    events: {
-      customEvent: eventHub.customEvent.observable,
-      others: eventHub.others.observable,
-      me: eventHub.me.observable,
-      error: eventHub.error.observable,
-      connection: eventHub.connection.observable,
-      storage: eventHub.storage.observable,
-      history: eventHub.history.observable,
-      storageDidLoad: eventHub.storageDidLoad.observable,
-      storageStatus: eventHub.storageStatus.observable
-    },
+    events,
     // Core
     getConnectionState: () => context.connection.current.status,
     isSelfAware: () => isConnectionSelfAware(context.connection.current),
     getSelf: () => self.current,
     // Presence
     getPresence: () => context.me.current,
-    getOthers: () => context.others.current,
-    // Support for the Liveblocks browser extension
-    getSelf_forDevTools: () => selfAsTreeNode.current,
-    getOthers_forDevTools: () => others_forDevTools.current
+    getOthers: () => context.others.current
   };
 }
-function createRoom(options, config) {
-  const { initialPresence, initialStorage } = options;
-  const machine = makeStateMachine(
-    config,
-    typeof initialPresence === "function" ? initialPresence(config.roomId) : initialPresence,
-    typeof initialStorage === "function" ? initialStorage(config.roomId) : initialStorage
-  );
-  const room = {
-    id: config.roomId,
-    /////////////
-    // Core    //
-    /////////////
-    getConnectionState: machine.getConnectionState,
-    isSelfAware: machine.isSelfAware,
-    getSelf: machine.getSelf,
-    reconnect: machine.reconnect,
-    subscribe: makeClassicSubscribeFn(machine),
-    //////////////
-    // Presence //
-    //////////////
-    getPresence: machine.getPresence,
-    updatePresence: machine.updatePresence,
-    getOthers: machine.getOthers,
-    broadcastEvent: machine.broadcastEvent,
-    //////////////
-    // Storage  //
-    //////////////
-    getStorage: machine.getStorage,
-    getStorageSnapshot: machine.getStorageSnapshot,
-    getStorageStatus: machine.getStorageStatus,
-    events: machine.events,
-    batch: machine.batch,
-    history: {
-      undo: machine.undo,
-      redo: machine.redo,
-      canUndo: machine.canUndo,
-      canRedo: machine.canRedo,
-      pause: machine.pauseHistory,
-      resume: machine.resumeHistory
-    },
-    __internal: {
-      connect: machine.connect,
-      disconnect: machine.disconnect,
-      onNavigatorOnline: machine.onNavigatorOnline,
-      onVisibilityChange: machine.onVisibilityChange,
-      simulateCloseWebsocket: machine.simulateSocketClose,
-      simulateSendCloseEvent: machine.simulateSendCloseEvent,
-      getSelf_forDevTools: machine.getSelf_forDevTools,
-      getOthers_forDevTools: machine.getOthers_forDevTools
-    }
-  };
-  return room;
-}
-function makeClassicSubscribeFn(machine) {
+function makeClassicSubscribeFn(events) {
   function subscribeToLiveStructureDeeply(node, callback) {
-    return machine.events.storage.subscribe((updates) => {
+    return events.storage.subscribe((updates) => {
       const relatedUpdates = updates.filter(
         (update) => isSameNodeOrChildOf(update.node, node)
       );
@@ -4407,7 +4414,7 @@ function makeClassicSubscribeFn(machine) {
     });
   }
   function subscribeToLiveStructureShallowly(node, callback) {
-    return machine.events.storage.subscribe((updates) => {
+    return events.storage.subscribe((updates) => {
       for (const update of updates) {
         if (update.node._id === node._id) {
           callback(update.node);
@@ -4423,33 +4430,27 @@ function makeClassicSubscribeFn(machine) {
       const callback = second;
       switch (first) {
         case "event":
-          return machine.events.customEvent.subscribe(
+          return events.customEvent.subscribe(
             callback
           );
         case "my-presence":
-          return machine.events.me.subscribe(callback);
+          return events.me.subscribe(callback);
         case "others": {
           const cb = callback;
-          return machine.events.others.subscribe(
+          return events.others.subscribe(
             ({ others, event }) => cb(others, event)
           );
         }
         case "error":
-          return machine.events.error.subscribe(callback);
+          return events.error.subscribe(callback);
         case "connection":
-          return machine.events.connection.subscribe(
-            callback
-          );
-        case "storage":
-          return machine.events.storage.subscribe(
+          return events.connection.subscribe(
             callback
           );
         case "history":
-          return machine.events.history.subscribe(
-            callback
-          );
+          return events.history.subscribe(callback);
         case "storage-status":
-          return machine.events.storageStatus.subscribe(
+          return events.storageStatus.subscribe(
             callback
           );
         default:
@@ -4459,7 +4460,7 @@ function makeClassicSubscribeFn(machine) {
     if (second === void 0 || typeof first === "function") {
       if (typeof first === "function") {
         const storageCallback = first;
-        return machine.events.storage.subscribe(storageCallback);
+        return events.storage.subscribe(storageCallback);
       } else {
         throw new Error("Please specify a listener callback");
       }
@@ -4474,7 +4475,7 @@ function makeClassicSubscribeFn(machine) {
         return subscribeToLiveStructureShallowly(node, nodeCallback);
       }
     }
-    throw new Error(`"${first}" is not a valid event name`);
+    throw new Error(`"${String(first)}" is not a valid event name`);
   }
   return subscribe;
 }
@@ -4494,34 +4495,35 @@ function prepareCreateWebSocket(liveblocksServer, WebSocketPolyfill) {
     );
   }
   const ws = WebSocketPolyfill || WebSocket;
-  return (token) => {
+  return (richToken) => {
+    const token = richToken.raw;
     return new ws(
       `${liveblocksServer}/?token=${token}&version=${// prettier-ignore
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore (__PACKAGE_VERSION__ will be injected by the build script)
       true ? (
         /* istanbul ignore next */
-        "1.0.7"
+        "1.0.9"
       ) : "dev"}`
     );
   };
 }
-function prepareAuthEndpoint(authentication, fetchPolyfill) {
+function prepareAuthEndpoint(roomId, authentication, fetchPolyfill) {
   if (authentication.type === "public") {
     if (typeof window === "undefined" && fetchPolyfill === void 0) {
       throw new Error(
         "To use Liveblocks client in a non-dom environment with a publicApiKey, you need to provide a fetch polyfill."
       );
     }
-    return (room) => fetchAuthEndpoint(
+    return () => fetchAuthEndpoint(
       fetchPolyfill || /* istanbul ignore next */
       fetch,
       authentication.url,
       {
-        room,
+        room: roomId,
         publicApiKey: authentication.publicApiKey
       }
-    );
+    ).then(({ token }) => parseRoomAuthToken(token));
   }
   if (authentication.type === "private") {
     if (typeof window === "undefined" && fetchPolyfill === void 0) {
@@ -4529,19 +4531,19 @@ function prepareAuthEndpoint(authentication, fetchPolyfill) {
         "To use Liveblocks client in a non-dom environment with a url as auth endpoint, you need to provide a fetch polyfill."
       );
     }
-    return (room) => fetchAuthEndpoint(fetchPolyfill || fetch, authentication.url, {
-      room
-    });
+    return () => fetchAuthEndpoint(fetchPolyfill || fetch, authentication.url, {
+      room: roomId
+    }).then(({ token }) => parseRoomAuthToken(token));
   }
   if (authentication.type === "custom") {
-    return (room) => __async(this, null, function* () {
-      const response = yield authentication.callback(room);
+    return () => __async(this, null, function* () {
+      const response = yield authentication.callback(roomId);
       if (!response || !response.token) {
         throw new Error(
           'Authentication error. We expect the authentication callback to return a token, but it does not. Hint: the return value should look like: { token: "..." }'
         );
       }
-      return response;
+      return parseRoomAuthToken(response.token);
     });
   }
   throw new Error("Internal error. Unexpected authentication type");
@@ -4567,7 +4569,9 @@ function fetchAuthEndpoint(fetch2, endpoint, body) {
       data = yield res.json();
     } catch (er) {
       throw new AuthenticationError(
-        `Expected a JSON response when doing a POST request on "${endpoint}". ${er}`
+        `Expected a JSON response when doing a POST request on "${endpoint}". ${String(
+          er
+        )}`
       );
     }
     if (!isPlainObject(data) || typeof data.token !== "string") {
@@ -4591,6 +4595,10 @@ var AuthenticationError = class extends Error {
 var MIN_THROTTLE = 16;
 var MAX_THROTTLE = 1e3;
 var DEFAULT_THROTTLE = 100;
+function getServerFromClientOptions(clientOptions) {
+  const rawOptions = clientOptions;
+  return typeof rawOptions.liveblocksServer === "string" ? rawOptions.liveblocksServer : "wss://api.liveblocks.io/v6";
+}
 function createClient(options) {
   const clientOptions = options;
   const throttleDelay = getThrottleDelayFromOptions(clientOptions);
@@ -4619,11 +4627,7 @@ function createClient(options) {
         throttleDelay,
         polyfills: clientOptions.polyfills,
         unstable_batchedUpdates: options2 == null ? void 0 : options2.unstable_batchedUpdates,
-        liveblocksServer: (
-          // TODO Patch this using public but marked internal fields?
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          (clientOptions == null ? void 0 : clientOptions.liveblocksServer) || "wss://api.liveblocks.io/v6"
-        ),
+        liveblocksServer: getServerFromClientOptions(clientOptions),
         authentication: prepareAuthentication(clientOptions, roomId)
       }
     );
@@ -4640,7 +4644,7 @@ function createClient(options) {
         }
         global.atob = clientOptions.polyfills.atob;
       }
-      newRoom.__internal.connect();
+      newRoom.__internal.send.connect();
     }
     return newRoom;
   }
@@ -4648,7 +4652,7 @@ function createClient(options) {
     unlinkDevTools(roomId);
     const room = rooms.get(roomId);
     if (room !== void 0) {
-      room.__internal.disconnect();
+      room.__internal.send.disconnect();
       rooms.delete(roomId);
     }
   }
@@ -4656,14 +4660,16 @@ function createClient(options) {
   typeof window.addEventListener !== "undefined") {
     window.addEventListener("online", () => {
       for (const [, room] of rooms) {
-        room.__internal.onNavigatorOnline();
+        room.__internal.send.navigatorOnline();
       }
     });
   }
   if (typeof document !== "undefined") {
     document.addEventListener("visibilitychange", () => {
-      for (const [, room] of rooms) {
-        room.__internal.onVisibilityChange(document.visibilityState);
+      if (document.visibilityState === "visible") {
+        for (const [, room] of rooms) {
+          room.__internal.send.windowGotFocus();
+        }
       }
     });
   }
@@ -4864,7 +4870,9 @@ function patchLiveObjectKey(liveObject, key, prev, next) {
     const nonSerializableValue = findNonSerializableValue(next);
     if (nonSerializableValue) {
       error(
-        `New state path: '${nonSerializableValue.path}' value: '${nonSerializableValue.value}' is not serializable.
+        `New state path: '${nonSerializableValue.path}' value: '${String(
+          nonSerializableValue.value
+        )}' is not serializable.
 Only serializable value can be synced with Liveblocks.`
       );
       return;
@@ -4927,7 +4935,7 @@ function legacy_patchImmutableNode(state, path, update) {
   if (pathItem === void 0) {
     switch (update.type) {
       case "LiveObject": {
-        if (state === null || typeof state !== "object" || Array.isArray(state)) {
+        if (!isJsonObject(state)) {
           throw new Error(
             "Internal: received update on LiveObject but state was not an object"
           );
@@ -4993,7 +5001,7 @@ function legacy_patchImmutableNode(state, path, update) {
         return newState;
       }
       case "LiveMap": {
-        if (state === null || typeof state !== "object" || Array.isArray(state)) {
+        if (!isJsonObject(state)) {
           throw new Error(
             "Internal: received update on LiveMap but state was not an object"
           );
@@ -5021,12 +5029,13 @@ function legacy_patchImmutableNode(state, path, update) {
       update
     );
     return newArray;
-  } else if (state !== null && typeof state === "object") {
+  } else if (isJsonObject(state)) {
     const node = state[pathItem];
     if (node === void 0) {
       return state;
     } else {
-      return __spreadProps(__spreadValues({}, state), {
+      const stateAsObj = state;
+      return __spreadProps(__spreadValues({}, stateAsObj), {
         [pathItem]: legacy_patchImmutableNode(node, path, update)
       });
     }