@liveblocks/core 1.1.0-beta1 → 1.1.0-beta3

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-beta1"
+  "1.1.0-beta3"
 ) : "dev";
 var _devtoolsSetupHasRun = false;
 function setupDevTools(getAllRooms) {
@@ -901,10 +901,39 @@ function log(level, message) {
     logger(message);
   };
 }
+function logPrematureErrorOrCloseEvent(e) {
+  const conn = "Connection to Liveblocks websocket server";
+  return (ctx) => {
+    if (e instanceof Error) {
+      warn(`${conn} could not be established. ${String(e)}`);
+    } else {
+      warn(
+        isCloseEvent(e) ? `${conn} closed prematurely (code: ${e.code}). Retrying in ${ctx.backoffDelay}ms.` : `${conn} could not be established.`
+      );
+    }
+  };
+}
+function logCloseEvent(event) {
+  return (ctx) => {
+    warn(
+      `Connection to Liveblocks websocket server closed (code: ${event.code}). Retrying in ${ctx.backoffDelay}ms.`
+    );
+  };
+}
+var logPermanentClose = log(
+  1 /* WARN */,
+  "Connection to WebSocket closed permanently. Won't retry."
+);
 function sendHeartbeat(ctx) {
   var _a;
   (_a = ctx.socket) == null ? void 0 : _a.send("ping");
 }
+function isCloseEvent(error2) {
+  return !(error2 instanceof Error) && error2.type === "close";
+}
+function isCustomCloseEvent(error2) {
+  return isCloseEvent(error2) && error2.code >= 4e3 && error2.code < 4100;
+}
 function enableTracing(machine) {
   const start = (/* @__PURE__ */ new Date()).getTime();
   function log2(...args) {
@@ -1118,23 +1147,24 @@ function createConnectionStateMachine(delegates, enableDebugLogging) {
           effect: log(2 /* ERROR */, err.message)
         };
       }
+      if (isCloseEvent(err) && err.code === 4999) {
+        return {
+          target: "@idle.failed",
+          effect: log(2 /* ERROR */, err.reason)
+        };
+      }
+      if (isCustomCloseEvent(err) && err.code !== 4001) {
+        return {
+          target: "@connecting.backoff",
+          effect: [
+            increaseBackoffDelayAggressively,
+            logPrematureErrorOrCloseEvent(err)
+          ]
+        };
+      }
       return {
         target: "@auth.backoff",
-        effect: [
-          // Increase the backoff delay conditionally
-          // TODO: This is ugly. DRY this up with the other code 40xx checks elsewhere.
-          !(err instanceof Error) && err.type === "close" && err.code >= 4e3 && err.code <= 4100 ? increaseBackoffDelayAggressively : increaseBackoffDelay,
-          // Produce a useful log message
-          (ctx) => {
-            if (err instanceof Error) {
-              warn(String(err));
-            } else {
-              warn(
-                err.type === "close" ? `Connection to Liveblocks websocket server closed prematurely (code: ${err.code}). Retrying in ${ctx.backoffDelay}ms.` : "Connection to Liveblocks websocket server could not be established."
-              );
-            }
-          }
-        ]
+        effect: [increaseBackoffDelay, logPrematureErrorOrCloseEvent(err)]
       };
     }
   );
@@ -1185,37 +1215,31 @@ function createConnectionStateMachine(delegates, enableDebugLogging) {
       if (e.event.code === 4999) {
         return {
           target: "@idle.failed",
-          effect: log(
-            1 /* WARN */,
-            "Connection to WebSocket closed permanently. Won't retry."
-          )
+          effect: logPermanentClose
         };
       }
-      if (e.event.code >= 4e3 && e.event.code <= 4100) {
+      if (e.event.code === 4001) {
+        return {
+          target: "@auth.backoff",
+          effect: [increaseBackoffDelay, logCloseEvent(e.event)]
+        };
+      }
+      if (isCustomCloseEvent(e.event)) {
         return {
           target: "@connecting.backoff",
           effect: [
             increaseBackoffDelayAggressively,
-            (ctx) => warn(
-              `Connection to Liveblocks websocket server closed (code: ${e.event.code}). Retrying in ${ctx.backoffDelay}ms.`
-            ),
-            (_, { event }) => {
-              if (event.code >= 4e3 && event.code <= 4100) {
-                const err = new LiveblocksError(event.reason, event.code);
-                onLiveblocksError.notify(err);
-              }
+            logCloseEvent(e.event),
+            () => {
+              const err = new LiveblocksError(e.event.reason, e.event.code);
+              onLiveblocksError.notify(err);
             }
           ]
         };
       }
       return {
         target: "@connecting.backoff",
-        effect: [
-          increaseBackoffDelay,
-          (ctx) => warn(
-            `Connection to Liveblocks websocket server closed (code: ${e.event.code}). Retrying in ${ctx.backoffDelay}ms.`
-          )
-        ]
+        effect: [increaseBackoffDelay, logCloseEvent(e.event)]
       };
     }
   });
@@ -4316,10 +4340,10 @@ function createRoom(options, config) {
       )
     };
     context.idFactory = makeIdFactory(sessionInfo.id);
-    if (context.root) {
-      context.buffer.messages.push({ type: 200 /* FETCH_STORAGE */ });
+    if (_getStorage$ !== null) {
+      refreshStorage({ flush: false });
     }
-    tryFlushing();
+    flushNowOrSoon();
   }
   function onDidDisconnect() {
     clearTimeout(context.buffer.flushTimerID);
@@ -4447,7 +4471,7 @@ function createRoom(options, config) {
     if (message.items.length === 0) {
       throw new Error("Internal error: cannot load storage without items");
     }
-    if (context.root) {
+    if (context.root !== void 0) {
       updateRoot(message.items, batchedUpdatesWrapper);
     } else {
       context.root = LiveObject._fromItems(message.items, pool);
@@ -4459,7 +4483,7 @@ function createRoom(options, config) {
     }
   }
   function updateRoot(items, batchedUpdatesWrapper) {
-    if (!context.root) {
+    if (context.root === void 0) {
       return;
     }
     const currentItems = /* @__PURE__ */ new Map();
@@ -4657,7 +4681,7 @@ function createRoom(options, config) {
       }
       context.activeBatch.updates.presence = true;
     } else {
-      tryFlushing();
+      flushNowOrSoon();
       batchUpdates(() => {
         if (options2 == null ? void 0 : options2.addToHistory) {
           addToUndoStack(
@@ -4744,7 +4768,7 @@ function createRoom(options, config) {
       data: context.me.current,
       targetActor: message.actor
     });
-    tryFlushing();
+    flushNowOrSoon();
     const user = context.others.getUser(message.actor);
     return user ? { type: "enter", user } : void 0;
   }
@@ -4830,9 +4854,7 @@ function createRoom(options, config) {
             const unacknowledgedOps = new Map(context.unacknowledgedOps);
             createOrUpdateRootFromMessage(message, doNotBatchUpdates);
             applyAndSendOps(unacknowledgedOps, doNotBatchUpdates);
-            if (_resolveInitialStatePromise !== null) {
-              _resolveInitialStatePromise();
-            }
+            _resolveStoragePromise == null ? void 0 : _resolveStoragePromise();
             notifyStorageStatus();
             eventHub.storageDidLoad.notify();
             break;
@@ -4879,7 +4901,7 @@ ${Array.from(traces).join("\n\n")}`
       notify(updates, doNotBatchUpdates);
     });
   }
-  function tryFlushing() {
+  function flushNowOrSoon() {
     const storageOps = context.buffer.storageOperations;
     if (storageOps.length > 0) {
       for (const op of storageOps) {
@@ -4909,7 +4931,7 @@ ${Array.from(traces).join("\n\n")}`
     } else {
       clearTimeout(context.buffer.flushTimerID);
       context.buffer.flushTimerID = setTimeout(
-        tryFlushing,
+        flushNowOrSoon,
         config.throttleDelay - elapsedMillis
       );
     }
@@ -4952,24 +4974,32 @@ ${Array.from(traces).join("\n\n")}`
       type: 103 /* BROADCAST_EVENT */,
       event
     });
-    tryFlushing();
+    flushNowOrSoon();
   }
   function dispatchOps(ops) {
     context.buffer.storageOperations.push(...ops);
-    tryFlushing();
+    flushNowOrSoon();
+  }
+  let _getStorage$ = null;
+  let _resolveStoragePromise = null;
+  function refreshStorage(options2) {
+    const messages = context.buffer.messages;
+    if (!messages.some((msg) => msg.type === 200 /* FETCH_STORAGE */)) {
+      messages.push({ type: 200 /* FETCH_STORAGE */ });
+    }
+    if (options2.flush) {
+      flushNowOrSoon();
+    }
   }
-  let _getInitialStatePromise = null;
-  let _resolveInitialStatePromise = null;
   function startLoadingStorage() {
-    if (_getInitialStatePromise === null) {
-      context.buffer.messages.push({ type: 200 /* FETCH_STORAGE */ });
-      tryFlushing();
-      _getInitialStatePromise = new Promise(
-        (resolve) => _resolveInitialStatePromise = resolve
-      );
+    if (_getStorage$ === null) {
+      refreshStorage({ flush: true });
+      _getStorage$ = new Promise((resolve) => {
+        _resolveStoragePromise = resolve;
+      });
       notifyStorageStatus();
     }
-    return _getInitialStatePromise;
+    return _getStorage$;
   }
   function getStorageSnapshot() {
     const root = context.root;
@@ -4982,7 +5012,7 @@ ${Array.from(traces).join("\n\n")}`
   }
   function getStorage() {
     return __async(this, null, function* () {
-      if (context.root) {
+      if (context.root !== void 0) {
         return Promise.resolve({
           root: context.root
         });
@@ -5013,7 +5043,7 @@ ${Array.from(traces).join("\n\n")}`
         context.buffer.storageOperations.push(op);
       }
     }
-    tryFlushing();
+    flushNowOrSoon();
   }
   function redo() {
     if (context.activeBatch) {
@@ -5035,7 +5065,7 @@ ${Array.from(traces).join("\n\n")}`
         context.buffer.storageOperations.push(op);
       }
     }
-    tryFlushing();
+    flushNowOrSoon();
   }
   function batch(callback) {
     if (context.activeBatch) {
@@ -5067,7 +5097,7 @@ ${Array.from(traces).join("\n\n")}`
           dispatchOps(currentBatch.ops);
         }
         notify(currentBatch.updates, doNotBatchUpdates);
-        tryFlushing();
+        flushNowOrSoon();
       }
     });
     return returnValue;
@@ -5083,13 +5113,11 @@ ${Array.from(traces).join("\n\n")}`
     }
   }
   function getStorageStatus() {
-    if (_getInitialStatePromise === null) {
-      return "not-loaded";
-    }
     if (context.root === void 0) {
-      return "loading";
+      return _getStorage$ === null ? "not-loaded" : "loading";
+    } else {
+      return context.unacknowledgedOps.size === 0 ? "synchronized" : "synchronizing";
     }
-    return context.unacknowledgedOps.size === 0 ? "synchronized" : "synchronizing";
   }
   let _lastStorageStatus = getStorageStatus();
   function notifyStorageStatus() {
@@ -5277,7 +5305,7 @@ function makeCreateSocketDelegateForRoom(liveblocksServer, WebSocketPolyfill) {
       // @ts-ignore (__PACKAGE_VERSION__ will be injected by the build script)
       true ? (
         /* istanbul ignore next */
-        "1.1.0-beta1"
+        "1.1.0-beta3"
       ) : "dev"}`
     );
   };

package/package.json

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