@liveblocks/core 1.1.0-beta1 → 1.1.0-beta2

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-beta2"
 ) : "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)]
       };
     }
   });
@@ -5277,7 +5301,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-beta2"
       ) : "dev"}`
     );
   };

package/package.json

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