@liveblocks/core 1.1.0-fsm4 → 1.1.0-test1

package/dist/index.d.ts

@@ -636,6 +636,44 @@ declare enum WebsocketCloseCodes {
     CLOSE_WITHOUT_RETRY = 4999
 }
 
+/**
+ * Arbitrary record that will be used as the authentication "token". It's the
+ * value that is returned by calling the authentication delegate, and will get
+ * passed to the connection factory delegate. This value will be remembered by
+ * the connection manager, but its value will not be interpreted, so it can be
+ * any object value.
+ */
+declare type BaseAuthResult = Record<string, unknown>;
+declare type Delegates<T extends BaseAuthResult> = {
+    authenticate: () => Promise<T>;
+    createSocket: (token: T) => IWebSocketInstance;
+};
+
+declare type AppOnlyAuthToken = {
+    appId: string;
+    roomId?: never;
+    scopes: string[];
+};
+declare type RoomAuthToken = {
+    appId: string;
+    roomId: string;
+    scopes: string[];
+    actor: number;
+    maxConnectionsPerRoom?: number;
+    info?: Json;
+    groupIds?: string[];
+} & ({
+    id: string;
+    anonymousId?: never;
+} | {
+    id?: never;
+    anonymousId: string;
+});
+declare type AuthToken = AppOnlyAuthToken | RoomAuthToken;
+declare function isAppOnlyAuthToken(data: JsonObject): data is AppOnlyAuthToken;
+declare function isRoomAuthToken(data: JsonObject): data is RoomAuthToken;
+declare function isAuthToken(data: JsonObject): data is AuthToken;
+
 declare type ReadonlyArrayWithLegacyMethods<T> = readonly T[] & {
     /**
      * @deprecated Prefer the normal .length property on arrays.
@@ -1133,11 +1171,13 @@ declare type ClientOptions = {
     polyfills?: Polyfills;
     unstable_fallbackToHTTP?: boolean;
     /**
-     * Backward-compatible way to set `polyfills.fetch`.
+     * @deprecated Use `polyfills: { fetch: ... }` instead.
+     * This option will be removed in a future release.
      */
     fetchPolyfill?: Polyfills["fetch"];
     /**
-     * Backward-compatible way to set `polyfills.WebSocket`.
+     * @deprecated Use `polyfills: { WebSocket: ... }` instead.
+     * This option will be removed in a future release.
      */
     WebSocketPolyfill?: Polyfills["WebSocket"];
 } & ({
@@ -1269,6 +1309,12 @@ declare function tryParseJson(rawMessage: string): Json | undefined;
  * Decode base64 string.
  */
 declare function b64decode(b64value: string): string;
+/**
+ * Returns whatever the given promise returns, but will be rejected with
+ * a "Timed out" error if the given promise does not return or reject within
+ * the given timeout period (in milliseconds).
+ */
+declare function withTimeout<T>(promise: Promise<T>, millis: number, errmsg?: string): Promise<T>;
 
 /**
  * Positions, aka the Pos type, are efficient encodings of "positions" in
@@ -1346,31 +1392,6 @@ declare function asPos(str: string): Pos;
  */
 declare function shallow(a: unknown, b: unknown): boolean;
 
-declare type AppOnlyAuthToken = {
-    appId: string;
-    roomId?: never;
-    scopes: string[];
-};
-declare type RoomAuthToken = {
-    appId: string;
-    roomId: string;
-    scopes: string[];
-    actor: number;
-    maxConnectionsPerRoom?: number;
-    info?: Json;
-    groupIds?: string[];
-} & ({
-    id: string;
-    anonymousId?: never;
-} | {
-    id?: never;
-    anonymousId: string;
-});
-declare type AuthToken = AppOnlyAuthToken | RoomAuthToken;
-declare function isAppOnlyAuthToken(data: JsonObject): data is AppOnlyAuthToken;
-declare function isRoomAuthToken(data: JsonObject): data is RoomAuthToken;
-declare function isAuthToken(data: JsonObject): data is AuthToken;
-
 declare enum ClientMsgCode {
     UPDATE_PRESENCE = 100,
     BROADCAST_EVENT = 103,
@@ -1803,4 +1824,4 @@ declare type EnsureJson<T> = [
     [K in keyof T]: EnsureJson<T[K]>;
 };
 
-export { AckOp, AppOnlyAuthToken, AuthToken, BaseUserMeta, BroadcastEventClientMsg, BroadcastOptions, BroadcastedEventServerMsg, Client, ClientMsg, ClientMsgCode, ConnectionStatus, CrdtType, CreateChildOp, CreateListOp, CreateMapOp, CreateObjectOp, CreateOp, CreateRegisterOp, CreateRootObjectOp, DeleteCrdtOp, DeleteObjectKeyOp, DevToolsTreeNode as DevTools, protocol as DevToolsMsg, EnsureJson, FetchStorageClientMsg, History, IWebSocket, IWebSocketCloseEvent, IWebSocketEvent, IWebSocketInstance, IWebSocketMessageEvent, IdTuple, Immutable, InitialDocumentStateServerMsg, Json, JsonArray, JsonObject, JsonScalar, LiveList, LiveListUpdate, LiveMap, LiveMapUpdate, LiveNode, LiveObject, LiveObjectUpdate, LiveStructure, Lson, LsonObject, NodeMap, Op, OpCode, Others, ParentToChildNodeMap, PlainLson, PlainLsonFields, PlainLsonList, PlainLsonMap, PlainLsonObject, RejectedStorageOpServerMsg, Resolve, Room, RoomAuthToken, RoomInitializers, RoomStateServerMsg, SerializedChild, SerializedCrdt, SerializedList, SerializedMap, SerializedObject, SerializedRegister, SerializedRootObject, ServerMsg, ServerMsgCode, SetParentKeyOp, StorageStatus, StorageUpdate, ToImmutable, ToJson, UpdateObjectOp, UpdatePresenceClientMsg, UpdatePresenceServerMsg, UpdateStorageClientMsg, UpdateStorageServerMsg, User, UserJoinServerMsg, UserLeftServerMsg, WebsocketCloseCodes, asArrayWithLegacyMethods, asPos, assert, assertNever, b64decode, createClient, deprecate, deprecateIf, errorIf, freeze, isAppOnlyAuthToken, isAuthToken, isChildCrdt, isJsonArray, isJsonObject, isJsonScalar, isPlainObject, isRoomAuthToken, isRootCrdt, legacy_patchImmutableObject, lsonToJson, makePosition, nn, patchLiveObjectKey, shallow, throwUsageError, toPlainLson, tryParseJson };
+export { AckOp, AppOnlyAuthToken, AuthToken, BaseAuthResult, BaseUserMeta, BroadcastEventClientMsg, BroadcastOptions, BroadcastedEventServerMsg, Client, ClientMsg, ClientMsgCode, ConnectionStatus, CrdtType, CreateChildOp, CreateListOp, CreateMapOp, CreateObjectOp, CreateOp, CreateRegisterOp, CreateRootObjectOp, Delegates, DeleteCrdtOp, DeleteObjectKeyOp, DevToolsTreeNode as DevTools, protocol as DevToolsMsg, EnsureJson, FetchStorageClientMsg, History, IWebSocket, IWebSocketCloseEvent, IWebSocketEvent, IWebSocketInstance, IWebSocketMessageEvent, IdTuple, Immutable, InitialDocumentStateServerMsg, Json, JsonArray, JsonObject, JsonScalar, LiveList, LiveListUpdate, LiveMap, LiveMapUpdate, LiveNode, LiveObject, LiveObjectUpdate, LiveStructure, Lson, LsonObject, NodeMap, Op, OpCode, Others, ParentToChildNodeMap, PlainLson, PlainLsonFields, PlainLsonList, PlainLsonMap, PlainLsonObject, RejectedStorageOpServerMsg, Resolve, Room, RoomAuthToken, RoomInitializers, RoomStateServerMsg, SerializedChild, SerializedCrdt, SerializedList, SerializedMap, SerializedObject, SerializedRegister, SerializedRootObject, ServerMsg, ServerMsgCode, SetParentKeyOp, StorageStatus, StorageUpdate, ToImmutable, ToJson, UpdateObjectOp, UpdatePresenceClientMsg, UpdatePresenceServerMsg, UpdateStorageClientMsg, UpdateStorageServerMsg, User, UserJoinServerMsg, UserLeftServerMsg, WebsocketCloseCodes, asArrayWithLegacyMethods, asPos, assert, assertNever, b64decode, createClient, deprecate, deprecateIf, errorIf, freeze, isAppOnlyAuthToken, isAuthToken, isChildCrdt, isJsonArray, isJsonObject, isJsonScalar, isPlainObject, isRoomAuthToken, isRootCrdt, legacy_patchImmutableObject, lsonToJson, makePosition, nn, patchLiveObjectKey, shallow, throwUsageError, toPlainLson, tryParseJson, withTimeout };

package/dist/index.js

@@ -157,7 +157,7 @@ var onMessageFromPanel = eventSource.observable;
 // src/devtools/index.ts
 var VERSION = true ? (
   /* istanbul ignore next */
-  "1.1.0-fsm4"
+  "1.1.0-test1"
 ) : "dev";
 var _devtoolsSetupHasRun = false;
 function setupDevTools(getAllRooms) {
@@ -386,17 +386,6 @@ function nn(value, errmsg = "Expected value to be non-nullable") {
 }
 
 // src/lib/fsm.ts
-function withTimeout(promise, millis, errmsg = "Timed out") {
-  return __async(this, null, function* () {
-    let timerID;
-    const timer$ = new Promise((_, reject) => {
-      timerID = setTimeout(() => {
-        reject(new Error(errmsg));
-      }, millis);
-    });
-    return Promise.race([promise, timer$]).finally(() => clearTimeout(timerID));
-  });
-}
 function distance(state1, state2) {
   if (state1 === state2) {
     return [0, 0];
@@ -772,6 +761,67 @@ var FSM = class {
   }
 };
 
+// src/lib/utils.ts
+function isPlainObject(blob) {
+  return blob !== null && typeof blob === "object" && Object.prototype.toString.call(blob) === "[object Object]";
+}
+function fromEntries(iterable) {
+  const obj = {};
+  for (const [key, val] of iterable) {
+    obj[key] = val;
+  }
+  return obj;
+}
+function entries(obj) {
+  return Object.entries(obj);
+}
+function tryParseJson(rawMessage) {
+  try {
+    return JSON.parse(rawMessage);
+  } catch (e) {
+    return void 0;
+  }
+}
+function b64decode(b64value) {
+  try {
+    const formattedValue = b64value.replace(/-/g, "+").replace(/_/g, "/");
+    const decodedValue = decodeURIComponent(
+      atob(formattedValue).split("").map(function(c) {
+        return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
+      }).join("")
+    );
+    return decodedValue;
+  } catch (err) {
+    return atob(b64value);
+  }
+}
+function compact(items) {
+  return items.filter(
+    (item) => item !== null && item !== void 0
+  );
+}
+function compactObject(obj) {
+  const newObj = __spreadValues({}, obj);
+  Object.keys(obj).forEach((k) => {
+    const key = k;
+    if (newObj[key] === void 0) {
+      delete newObj[key];
+    }
+  });
+  return newObj;
+}
+function withTimeout(promise, millis, errmsg = "Timed out") {
+  return __async(this, null, function* () {
+    let timerID;
+    const timer$ = new Promise((_, reject) => {
+      timerID = setTimeout(() => {
+        reject(new Error(errmsg));
+      }, millis);
+    });
+    return Promise.race([promise, timer$]).finally(() => clearTimeout(timerID));
+  });
+}
+
 // src/connection.ts
 function toPublicConnectionStatus(state) {
   switch (state) {
@@ -800,7 +850,10 @@ var HEARTBEAT_INTERVAL = 3e4;
 var PONG_TIMEOUT = 2e3;
 var AUTH_TIMEOUT = 1e4;
 var SOCKET_CONNECT_TIMEOUT = 1e4;
-var UnauthorizedError = class extends Error {
+var StopRetrying = class extends Error {
+  constructor(reason) {
+    super(reason);
+  }
 };
 var LiveblocksError = class extends Error {
   constructor(message, code) {
@@ -843,21 +896,15 @@ function enableTracing(machine) {
     );
   }
   const unsubs = [
-    machine.events.didReceiveEvent.subscribe((e) => {
-      log2(`Event ${e.type}`);
-    }),
-    machine.events.willTransition.subscribe(({ from, to }) => {
-      log2("Transitioning", from, "\u2192", to);
-    }),
-    machine.events.didIgnoreEvent.subscribe((e) => {
-      log2("Ignored event", e.type, e, "(current state won't handle it)");
-    })
-    // machine.events.willExitState.subscribe((s) => {
-    //   log("Exiting state", s);
-    // }),
-    // machine.events.didEnterState.subscribe((s) => {
-    //   log("Entering state", s);
-    // }),
+    machine.events.didReceiveEvent.subscribe((e) => log2(`Event ${e.type}`)),
+    machine.events.willTransition.subscribe(
+      ({ from, to }) => log2("Transitioning", from, "\u2192", to)
+    ),
+    machine.events.didIgnoreEvent.subscribe(
+      (e) => log2("Ignored event", e.type, e, "(current state won't handle it)")
+    )
+    // machine.events.willExitState.subscribe((s) => log("Exiting state", s)),
+    // machine.events.didEnterState.subscribe((s) => log("Entering state", s)),
   ];
   return () => {
     for (const unsub of unsubs) {
@@ -888,7 +935,7 @@ function defineConnectivityEvents(machine) {
   };
 }
 var assign = (patch) => (ctx) => ctx.patch(patch);
-function createConnectionStateMachine(delegates) {
+function createConnectionStateMachine(delegates, enableDebugLogging) {
   const onMessage = makeEventSource();
   onMessage.pause();
   const onLiveblocksError = makeEventSource();
@@ -933,21 +980,23 @@ function createConnectionStateMachine(delegates) {
       })
     }),
     // Auth failed
-    (failedEvent) => failedEvent.reason instanceof UnauthorizedError ? {
-      target: "@idle.failed",
-      effect: log(
-        2 /* ERROR */,
-        `Unauthorized: ${failedEvent.reason.message}`
-      )
-    } : {
-      target: "@auth.backoff",
-      effect: [
-        increaseBackoffDelay,
-        log(
-          0 /* INFO */,
-          `Authentication failed: ${String(failedEvent.reason)}`
-        )
-      ]
+    (failedEvent) => {
+      if (failedEvent.reason instanceof StopRetrying) {
+        return {
+          target: "@idle.failed",
+          effect: log(2 /* ERROR */, failedEvent.reason.message)
+        };
+      }
+      return {
+        target: "@auth.backoff",
+        effect: [
+          increaseBackoffDelay,
+          log(
+            2 /* ERROR */,
+            `Authentication failed: ${failedEvent.reason instanceof Error ? failedEvent.reason.message : String(failedEvent.reason)}`
+          )
+        ]
+      };
     }
   );
   const onSocketError = (event) => machine.send({ type: "EXPLICIT_SOCKET_ERROR", event });
@@ -1042,6 +1091,12 @@ function createConnectionStateMachine(delegates) {
     // If the WebSocket connection cannot be established
     (failure) => {
       const err = failure.reason;
+      if (err instanceof StopRetrying) {
+        return {
+          target: "@idle.failed",
+          effect: log(2 /* ERROR */, err.message)
+        };
+      }
       return {
         target: "@auth.backoff",
         effect: [
@@ -1096,7 +1151,7 @@ function createConnectionStateMachine(delegates) {
     // not. When still OPEN, don't transition.
     EXPLICIT_SOCKET_ERROR: (_, context) => {
       var _a;
-      if (((_a = context.socket) == null ? void 0 : _a.readyState) === WebSocket.OPEN) {
+      if (((_a = context.socket) == null ? void 0 : _a.readyState) === 1) {
         return null;
       }
       return {
@@ -1167,7 +1222,9 @@ function createConnectionStateMachine(delegates) {
   const cleanups = [];
   const { statusDidChange, didConnect, didDisconnect, unsubscribe } = defineConnectivityEvents(machine);
   cleanups.push(unsubscribe);
-  cleanups.push(enableTracing(machine));
+  if (enableDebugLogging) {
+    cleanups.push(enableTracing(machine));
+  }
   machine.start();
   return {
     machine,
@@ -1183,8 +1240,11 @@ function createConnectionStateMachine(delegates) {
   };
 }
 var ManagedSocket = class {
-  constructor(delegates) {
-    const { machine, events, cleanups } = createConnectionStateMachine(delegates);
+  constructor(delegates, enableDebugLogging = false) {
+    const { machine, events, cleanups } = createConnectionStateMachine(
+      delegates,
+      enableDebugLogging
+    );
     this.machine = machine;
     this.events = events;
     this.cleanups = cleanups;
@@ -1248,7 +1308,7 @@ var ManagedSocket = class {
     const socket = (_a = this.machine.context) == null ? void 0 : _a.socket;
     if (socket === null) {
       warn("Cannot send: not connected yet", data);
-    } else if (socket.readyState !== WebSocket.OPEN) {
+    } else if (socket.readyState !== 1) {
       warn("Cannot send: WebSocket no longer open", data);
     } else {
       socket.send(data);
@@ -1574,56 +1634,6 @@ var AbstractCrdt = class {
   }
 };
 
-// src/lib/utils.ts
-function isPlainObject(blob) {
-  return blob !== null && typeof blob === "object" && Object.prototype.toString.call(blob) === "[object Object]";
-}
-function fromEntries(iterable) {
-  const obj = {};
-  for (const [key, val] of iterable) {
-    obj[key] = val;
-  }
-  return obj;
-}
-function entries(obj) {
-  return Object.entries(obj);
-}
-function tryParseJson(rawMessage) {
-  try {
-    return JSON.parse(rawMessage);
-  } catch (e) {
-    return void 0;
-  }
-}
-function b64decode(b64value) {
-  try {
-    const formattedValue = b64value.replace(/-/g, "+").replace(/_/g, "/");
-    const decodedValue = decodeURIComponent(
-      atob(formattedValue).split("").map(function(c) {
-        return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
-      }).join("")
-    );
-    return decodedValue;
-  } catch (err) {
-    return atob(b64value);
-  }
-}
-function compact(items) {
-  return items.filter(
-    (item) => item !== null && item !== void 0
-  );
-}
-function compactObject(obj) {
-  const newObj = __spreadValues({}, obj);
-  Object.keys(obj).forEach((k) => {
-    const key = k;
-    if (newObj[key] === void 0) {
-      delete newObj[key];
-    }
-  });
-  return newObj;
-}
-
 // src/protocol/SerializedCrdt.ts
 var CrdtType = /* @__PURE__ */ ((CrdtType2) => {
   CrdtType2[CrdtType2["OBJECT"] = 0] = "OBJECT";
@@ -4174,11 +4184,11 @@ function userToTreeNode(key, user) {
     payload: user
   };
 }
-function createRoom(options, config, mockedDelegates) {
-  var _a, _b, _c;
+function createRoom(options, config) {
+  var _a, _b, _c, _d;
   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 delegates = mockedDelegates != null ? mockedDelegates : {
+  const delegates = (_c = config.delegates) != null ? _c : {
     authenticate: makeAuthDelegateForRoom(
       config.roomId,
       config.authentication,
@@ -4189,7 +4199,10 @@ function createRoom(options, config, mockedDelegates) {
       (_b = config.polyfills) == null ? void 0 : _b.WebSocket
     )
   };
-  const managedSocket = new ManagedSocket(delegates);
+  const managedSocket = new ManagedSocket(
+    delegates,
+    config.enableDebugLogging
+  );
   const context = {
     lastConnectionId: null,
     buffer: {
@@ -4224,11 +4237,9 @@ function createRoom(options, config, mockedDelegates) {
     opStackTraces: process.env.NODE_ENV !== "production" ? /* @__PURE__ */ new Map() : void 0
   };
   const doNotBatchUpdates = (cb) => cb();
-  const batchUpdates = (_c = config.unstable_batchedUpdates) != null ? _c : doNotBatchUpdates;
+  const batchUpdates = (_d = config.unstable_batchedUpdates) != null ? _d : doNotBatchUpdates;
   function onStatusDidChange(newStatus) {
-    if (newStatus !== "open" && newStatus !== "connecting") {
-      context.connection.set({ status: newStatus });
-    } else {
+    if (newStatus === "open" || newStatus === "connecting") {
       context.connection.set({
         status: newStatus,
         id: managedSocket.token.parsed.actor,
@@ -4236,6 +4247,8 @@ function createRoom(options, config, mockedDelegates) {
         userId: managedSocket.token.parsed.id,
         isReadOnly: isStorageReadOnly(managedSocket.token.parsed.scopes)
       });
+    } else {
+      context.connection.set({ status: newStatus });
     }
     batchUpdates(() => {
       eventHub.connection.notify(newStatus);
@@ -4345,31 +4358,29 @@ function createRoom(options, config, mockedDelegates) {
     storageDidLoad: makeEventSource(),
     storageStatus: makeEventSource()
   };
-  const effects = config.mockedEffects || {
-    send(messageOrMessages) {
-      var _a2;
-      const message = JSON.stringify(messageOrMessages);
-      if (config.unstable_fallbackToHTTP) {
-        const size = new TextEncoder().encode(message).length;
-        if (size > MAX_MESSAGE_SIZE && managedSocket.token.raw && config.httpSendEndpoint) {
-          if (isTokenExpired(managedSocket.token.parsed)) {
-            return managedSocket.reconnect();
-          }
-          void httpSend(
-            message,
-            managedSocket.token.raw,
-            config.httpSendEndpoint,
-            (_a2 = config.polyfills) == null ? void 0 : _a2.fetch
-          );
-          warn(
-            "Message was too large for websockets and sent over HTTP instead"
-          );
-          return;
+  function sendMessages(messageOrMessages) {
+    var _a2;
+    const message = JSON.stringify(messageOrMessages);
+    if (config.unstable_fallbackToHTTP) {
+      const size = new TextEncoder().encode(message).length;
+      if (size > MAX_MESSAGE_SIZE && managedSocket.token.raw && config.httpSendEndpoint) {
+        if (isTokenExpired(managedSocket.token.parsed)) {
+          return managedSocket.reconnect();
         }
+        void httpSend(
+          message,
+          managedSocket.token.raw,
+          config.httpSendEndpoint,
+          (_a2 = config.polyfills) == null ? void 0 : _a2.fetch
+        );
+        warn(
+          "Message was too large for websockets and sent over HTTP instead"
+        );
+        return;
       }
-      managedSocket.send(message);
     }
-  };
+    managedSocket.send(message);
+  }
   const self = new DerivedRef(
     context.connection,
     context.me,
@@ -4720,7 +4731,7 @@ function createRoom(options, config, mockedDelegates) {
       ops: result.ops
     });
     notify(result.updates, batchedUpdatesWrapper);
-    effects.send(messages);
+    sendMessages(messages);
   }
   function handleServerMessage(event) {
     if (typeof event.data !== "string") {
@@ -4842,7 +4853,7 @@ ${Array.from(traces).join("\n\n")}`
       if (messagesToFlush.length === 0) {
         return;
       }
-      effects.send(messagesToFlush);
+      sendMessages(messagesToFlush);
       context.buffer = {
         flushTimerID: void 0,
         lastFlushedAt: now,
@@ -5078,20 +5089,9 @@ ${Array.from(traces).join("\n\n")}`
       getOthers_forDevTools: () => others_forDevTools.current,
       // prettier-ignore
       send: {
-        simulateAuthSuccess() {
-          throw new Error("\u{1F64F} Rewrite this test to no longer depend on authSuccess, please! \u{1F64F}");
-        },
         // These exist only for our E2E testing app
         explicitClose: (event) => managedSocket._privateSendMachineEvent({ type: "EXPLICIT_SOCKET_CLOSE", event }),
-        implicitClose: () => managedSocket._privateSendMachineEvent({ type: "PONG_TIMEOUT" }),
-        /**
-         * 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
+        implicitClose: () => managedSocket._privateSendMachineEvent({ type: "PONG_TIMEOUT" })
       }
     },
     id: config.roomId,
@@ -5099,7 +5099,6 @@ ${Array.from(traces).join("\n\n")}`
     connect: () => managedSocket.connect(),
     reconnect: () => managedSocket.reconnect(),
     disconnect: () => managedSocket.disconnect(),
-    // XXX Do we really need disconnect() now that we have destroy()? Seems still useful to reset the machine, but also... YAGNI?
     destroy: () => managedSocket.destroy(),
     // Presence
     updatePresence,
@@ -5209,9 +5208,9 @@ function isRoomEventName(value) {
 }
 function makeCreateSocketDelegateForRoom(liveblocksServer, WebSocketPolyfill) {
   return (richToken) => {
-    const ws = WebSocketPolyfill || WebSocket;
-    if (typeof WebSocket === "undefined" && WebSocketPolyfill === void 0) {
-      throw new Error(
+    const ws = WebSocketPolyfill != null ? WebSocketPolyfill : typeof WebSocket === "undefined" ? void 0 : WebSocket;
+    if (ws === void 0) {
+      throw new StopRetrying(
         "To use Liveblocks client in a non-dom environment, you need to provide a WebSocket polyfill."
       );
     }
@@ -5222,7 +5221,7 @@ function makeCreateSocketDelegateForRoom(liveblocksServer, WebSocketPolyfill) {
       // @ts-ignore (__PACKAGE_VERSION__ will be injected by the build script)
       true ? (
         /* istanbul ignore next */
-        "1.1.0-fsm4"
+        "1.1.0-test1"
       ) : "dev"}`
     );
   };
@@ -5242,48 +5241,43 @@ function httpSend(message, token, endpoint, fetchPolyfill) {
   });
 }
 function makeAuthDelegateForRoom(roomId, authentication, fetchPolyfill) {
+  const fetcher = fetchPolyfill != null ? fetchPolyfill : typeof window === "undefined" ? void 0 : window.fetch;
   if (authentication.type === "public") {
     return () => __async(this, null, function* () {
-      if (typeof window === "undefined" && fetchPolyfill === void 0) {
-        throw new Error(
+      if (fetcher === void 0) {
+        throw new StopRetrying(
           "To use Liveblocks client in a non-dom environment with a publicApiKey, you need to provide a fetch polyfill."
         );
       }
-      return fetchAuthEndpoint(
-        fetchPolyfill || /* istanbul ignore next */
-        fetch,
-        authentication.url,
-        {
-          room: roomId,
-          publicApiKey: authentication.publicApiKey
-        }
-      ).then(({ token }) => parseRoomAuthToken(token));
+      return fetchAuthEndpoint(fetcher, authentication.url, {
+        room: roomId,
+        publicApiKey: authentication.publicApiKey
+      }).then(({ token }) => parseRoomAuthToken(token));
     });
-  }
-  if (authentication.type === "private") {
+  } else if (authentication.type === "private") {
     return () => __async(this, null, function* () {
-      if (typeof window === "undefined" && fetchPolyfill === void 0) {
-        throw new Error(
+      if (fetcher === void 0) {
+        throw new StopRetrying(
           "To use Liveblocks client in a non-dom environment with a url as auth endpoint, you need to provide a fetch polyfill."
         );
       }
-      return fetchAuthEndpoint(fetchPolyfill || fetch, authentication.url, {
+      return fetchAuthEndpoint(fetcher, authentication.url, {
         room: roomId
       }).then(({ token }) => parseRoomAuthToken(token));
     });
-  }
-  if (authentication.type === "custom") {
+  } else if (authentication.type === "custom") {
     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: "..." }'
+          'We expect the authentication callback to return a token, but it does not. Hint: the return value should look like: { token: "..." }'
         );
       }
       return parseRoomAuthToken(response.token);
     });
+  } else {
+    throw new Error("Internal error. Unexpected authentication type");
   }
-  throw new Error("Internal error. Unexpected authentication type");
 }
 function fetchAuthEndpoint(fetch2, endpoint, body) {
   return __async(this, null, function* () {
@@ -5297,26 +5291,25 @@ function fetchAuthEndpoint(fetch2, endpoint, body) {
       body: JSON.stringify(body)
     });
     if (!res.ok) {
+      const reason = `${(yield res.text()).trim() || "reason not provided in auth response"} (${res.status} returned by POST ${endpoint})`;
       if (res.status === 401 || res.status === 403) {
-        throw new UnauthorizedError(yield res.text());
+        throw new StopRetrying(`Unauthorized: ${reason}`);
       } else {
-        throw new AuthenticationError(
-          `Expected a status 200 but got ${res.status} when doing a POST request on "${endpoint}"`
-        );
+        throw new Error(`Failed to authenticate: ${reason}`);
       }
     }
     let data;
     try {
       data = yield res.json();
     } catch (er) {
-      throw new AuthenticationError(
+      throw new Error(
         `Expected a JSON response when doing a POST request on "${endpoint}". ${String(
           er
         )}`
       );
     }
     if (!isPlainObject(data) || typeof data.token !== "string") {
-      throw new AuthenticationError(
+      throw new Error(
         `Expected a JSON response of the form \`{ token: "..." }\` when doing a POST request on "${endpoint}", but got ${JSON.stringify(
           data
         )}`
@@ -5326,11 +5319,6 @@ function fetchAuthEndpoint(fetch2, endpoint, body) {
     return { token };
   });
 }
-var AuthenticationError = class extends Error {
-  constructor(message) {
-    super(message);
-  }
-};
 
 // src/client.ts
 var MIN_THROTTLE = 16;
@@ -5367,6 +5355,8 @@ function createClient(options) {
         roomId,
         throttleDelay,
         polyfills: clientOptions.polyfills,
+        delegates: clientOptions.mockedDelegates,
+        enableDebugLogging: clientOptions.enableDebugLogging,
         unstable_batchedUpdates: options2 == null ? void 0 : options2.unstable_batchedUpdates,
         liveblocksServer: getServerFromClientOptions(clientOptions),
         authentication: prepareAuthentication(clientOptions, roomId),
@@ -5375,8 +5365,7 @@ function createClient(options) {
           roomId
         ),
         unstable_fallbackToHTTP: !!clientOptions.unstable_fallbackToHTTP
-      },
-      void 0
+      }
     );
     rooms.set(roomId, newRoom);
     setupDevTools(() => Array.from(rooms.keys()));
@@ -5869,4 +5858,5 @@ var WebsocketCloseCodes = /* @__PURE__ */ ((WebsocketCloseCodes2) => {
 
 
 
-exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.OpCode = OpCode; exports.ServerMsgCode = ServerMsgCode; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.asArrayWithLegacyMethods = asArrayWithLegacyMethods; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.b64decode = b64decode; exports.createClient = createClient; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.errorIf = errorIf; exports.freeze = freeze; exports.isAppOnlyAuthToken = isAppOnlyAuthToken; exports.isAuthToken = isAuthToken; exports.isChildCrdt = isChildCrdt; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isPlainObject = isPlainObject; exports.isRoomAuthToken = isRoomAuthToken; exports.isRootCrdt = isRootCrdt; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makePosition = makePosition; exports.nn = nn; exports.patchLiveObjectKey = patchLiveObjectKey; exports.shallow = shallow; exports.throwUsageError = throwUsageError; exports.tryParseJson = tryParseJson;
+
+exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.OpCode = OpCode; exports.ServerMsgCode = ServerMsgCode; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.asArrayWithLegacyMethods = asArrayWithLegacyMethods; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.b64decode = b64decode; exports.createClient = createClient; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.errorIf = errorIf; exports.freeze = freeze; exports.isAppOnlyAuthToken = isAppOnlyAuthToken; exports.isAuthToken = isAuthToken; exports.isChildCrdt = isChildCrdt; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isPlainObject = isPlainObject; exports.isRoomAuthToken = isRoomAuthToken; exports.isRootCrdt = isRootCrdt; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makePosition = makePosition; exports.nn = nn; exports.patchLiveObjectKey = patchLiveObjectKey; exports.shallow = shallow; exports.throwUsageError = throwUsageError; exports.tryParseJson = tryParseJson; exports.withTimeout = withTimeout;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/core",
-  "version": "1.1.0-fsm4",
+  "version": "1.1.0-test1",
   "description": "Shared code and foundational internals for Liveblocks",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",