@liveblocks/client 0.15.0-alpha.4 → 0.15.0

package/lib/esm/index.js

@@ -285,9 +285,6 @@ const _LiveRegister = class extends AbstractCrdt {
   _apply(op, isLocal) {
     return super._apply(op, isLocal);
   }
-  _getType() {
-    return "LiveRegister";
-  }
 };
 let LiveRegister = _LiveRegister;
 _data = new WeakMap();
@@ -469,9 +466,6 @@ const _LiveList = class extends AbstractCrdt {
   _apply(op, isLocal) {
     return super._apply(op, isLocal);
   }
-  _getType() {
-    return "LiveList";
-  }
   _toSerializedCrdt() {
     var _a;
     return {
@@ -830,9 +824,6 @@ const _LiveMap = class extends AbstractCrdt {
     };
     return { modified: storageUpdate, reverse };
   }
-  _getType() {
-    return "LiveMap";
-  }
   _toSerializedCrdt() {
     var _a;
     return {
@@ -1361,9 +1352,6 @@ const _LiveObject = class extends AbstractCrdt {
       data: this.toObject()
     };
   }
-  _getType() {
-    return "LiveObject";
-  }
   toObject() {
     return Object.fromEntries(__privateGet(this, _map));
   }
@@ -1625,15 +1613,12 @@ function makeOthers(presenceMap) {
 }
 function makeStateMachine(state, context, mockedEffects) {
   const effects = mockedEffects || {
-    async authenticate(auth, createWebSocket) {
-      try {
-        const { token } = await auth(context.room);
+    authenticate(auth, createWebSocket) {
+      return auth(context.room).then(({ token }) => {
         const parsedToken = parseToken(token);
         const socket = createWebSocket(token);
         authenticationSuccess(parsedToken, socket);
-      } catch (er) {
-        authenticationFailure(er);
-      }
+      }).catch((er) => authenticationFailure(er));
     },
     send(messageOrMessages) {
       if (state.socket == null) {
@@ -2332,21 +2317,22 @@ See v0.13 release notes for more information.
   }
   let _getInitialStatePromise = null;
   let _getInitialStateResolver = null;
-  async function getStorage() {
+  function getStorage() {
     if (state.root) {
-      return {
+      return new Promise((resolve) => resolve({
         root: state.root
-      };
+      }));
     }
     if (_getInitialStatePromise == null) {
       state.buffer.messages.push({ type: ClientMessageType.FetchStorage });
       tryFlushing();
       _getInitialStatePromise = new Promise((resolve) => _getInitialStateResolver = resolve);
     }
-    await _getInitialStatePromise;
-    return {
-      root: state.root
-    };
+    return _getInitialStatePromise.then(() => {
+      return {
+        root: state.root
+      };
+    });
   }
   function undo() {
     if (state.isBatching) {
@@ -2606,27 +2592,26 @@ function prepareAuthEndpoint(authentication, fetchPolyfill) {
   }
   throw new Error("Internal error. Unexpected authentication type");
 }
-async function fetchAuthEndpoint(fetch2, endpoint, body) {
-  const res = await fetch2(endpoint, {
+function fetchAuthEndpoint(fetch2, endpoint, body) {
+  return fetch2(endpoint, {
     method: "POST",
     headers: {
       "Content-Type": "application/json"
     },
     body: JSON.stringify(body)
+  }).then((res) => {
+    if (!res.ok) {
+      throw new AuthenticationError(`Expected a status 200 but got ${res.status} when doing a POST request on "${endpoint}"`);
+    }
+    return res.json().catch((er) => {
+      throw new AuthenticationError(`Expected a json when doing a POST request on "${endpoint}". ${er}`);
+    });
+  }).then((authResponse) => {
+    if (typeof authResponse.token !== "string") {
+      throw new AuthenticationError(`Expected a json with a string token when doing a POST request on "${endpoint}", but got ${JSON.stringify(authResponse)}`);
+    }
+    return authResponse;
   });
-  if (!res.ok) {
-    throw new AuthenticationError(`Authentication error. Liveblocks could not parse the response of your authentication "${endpoint}"`);
-  }
-  let authResponse = null;
-  try {
-    authResponse = await res.json();
-  } catch (er) {
-    throw new AuthenticationError(`Authentication error. Liveblocks could not parse the response of your authentication "${endpoint}"`);
-  }
-  if (typeof authResponse.token !== "string") {
-    throw new AuthenticationError(`Authentication error. Liveblocks could not parse the response of your authentication "${endpoint}"`);
-  }
-  return authResponse;
 }
 class AuthenticationError extends Error {
   constructor(message) {

package/lib/esm/index.mjs

@@ -285,9 +285,6 @@ const _LiveRegister = class extends AbstractCrdt {
   _apply(op, isLocal) {
     return super._apply(op, isLocal);
   }
-  _getType() {
-    return "LiveRegister";
-  }
 };
 let LiveRegister = _LiveRegister;
 _data = new WeakMap();
@@ -469,9 +466,6 @@ const _LiveList = class extends AbstractCrdt {
   _apply(op, isLocal) {
     return super._apply(op, isLocal);
   }
-  _getType() {
-    return "LiveList";
-  }
   _toSerializedCrdt() {
     var _a;
     return {
@@ -830,9 +824,6 @@ const _LiveMap = class extends AbstractCrdt {
     };
     return { modified: storageUpdate, reverse };
   }
-  _getType() {
-    return "LiveMap";
-  }
   _toSerializedCrdt() {
     var _a;
     return {
@@ -1361,9 +1352,6 @@ const _LiveObject = class extends AbstractCrdt {
       data: this.toObject()
     };
   }
-  _getType() {
-    return "LiveObject";
-  }
   toObject() {
     return Object.fromEntries(__privateGet(this, _map));
   }
@@ -1625,15 +1613,12 @@ function makeOthers(presenceMap) {
 }
 function makeStateMachine(state, context, mockedEffects) {
   const effects = mockedEffects || {
-    async authenticate(auth, createWebSocket) {
-      try {
-        const { token } = await auth(context.room);
+    authenticate(auth, createWebSocket) {
+      return auth(context.room).then(({ token }) => {
         const parsedToken = parseToken(token);
         const socket = createWebSocket(token);
         authenticationSuccess(parsedToken, socket);
-      } catch (er) {
-        authenticationFailure(er);
-      }
+      }).catch((er) => authenticationFailure(er));
     },
     send(messageOrMessages) {
       if (state.socket == null) {
@@ -2332,21 +2317,22 @@ See v0.13 release notes for more information.
   }
   let _getInitialStatePromise = null;
   let _getInitialStateResolver = null;
-  async function getStorage() {
+  function getStorage() {
     if (state.root) {
-      return {
+      return new Promise((resolve) => resolve({
         root: state.root
-      };
+      }));
     }
     if (_getInitialStatePromise == null) {
       state.buffer.messages.push({ type: ClientMessageType.FetchStorage });
       tryFlushing();
       _getInitialStatePromise = new Promise((resolve) => _getInitialStateResolver = resolve);
     }
-    await _getInitialStatePromise;
-    return {
-      root: state.root
-    };
+    return _getInitialStatePromise.then(() => {
+      return {
+        root: state.root
+      };
+    });
   }
   function undo() {
     if (state.isBatching) {
@@ -2606,27 +2592,26 @@ function prepareAuthEndpoint(authentication, fetchPolyfill) {
   }
   throw new Error("Internal error. Unexpected authentication type");
 }
-async function fetchAuthEndpoint(fetch2, endpoint, body) {
-  const res = await fetch2(endpoint, {
+function fetchAuthEndpoint(fetch2, endpoint, body) {
+  return fetch2(endpoint, {
     method: "POST",
     headers: {
       "Content-Type": "application/json"
     },
     body: JSON.stringify(body)
+  }).then((res) => {
+    if (!res.ok) {
+      throw new AuthenticationError(`Expected a status 200 but got ${res.status} when doing a POST request on "${endpoint}"`);
+    }
+    return res.json().catch((er) => {
+      throw new AuthenticationError(`Expected a json when doing a POST request on "${endpoint}". ${er}`);
+    });
+  }).then((authResponse) => {
+    if (typeof authResponse.token !== "string") {
+      throw new AuthenticationError(`Expected a json with a string token when doing a POST request on "${endpoint}", but got ${JSON.stringify(authResponse)}`);
+    }
+    return authResponse;
   });
-  if (!res.ok) {
-    throw new AuthenticationError(`Authentication error. Liveblocks could not parse the response of your authentication "${endpoint}"`);
-  }
-  let authResponse = null;
-  try {
-    authResponse = await res.json();
-  } catch (er) {
-    throw new AuthenticationError(`Authentication error. Liveblocks could not parse the response of your authentication "${endpoint}"`);
-  }
-  if (typeof authResponse.token !== "string") {
-    throw new AuthenticationError(`Authentication error. Liveblocks could not parse the response of your authentication "${endpoint}"`);
-  }
-  return authResponse;
 }
 class AuthenticationError extends Error {
   constructor(message) {

package/lib/index.js

@@ -2,42 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
-  }
-}
-
-function _asyncToGenerator(fn) {
-  return function () {
-    var self = this,
-        args = arguments;
-    return new Promise(function (resolve, reject) {
-      var gen = fn.apply(self, args);
-
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-
-      _next(undefined);
-    });
-  };
-}
-
 function _defineProperties(target, props) {
   for (var i = 0; i < props.length; i++) {
     var descriptor = props[i];
@@ -627,10 +591,6 @@ var LiveRegister = function (_AbstractCrdt) {
     return _AbstractCrdt.prototype._apply.call(this, op, isLocal);
   };
 
-  _proto._getType = function _getType() {
-    return "LiveRegister";
-  };
-
   _createClass(LiveRegister, [{
     key: "data",
     get: function get() {
@@ -917,10 +877,6 @@ var LiveList = function (_AbstractCrdt) {
     return _AbstractCrdt.prototype._apply.call(this, op, isLocal);
   };
 
-  _proto._getType = function _getType() {
-    return "LiveList";
-  };
-
   _proto._toSerializedCrdt = function _toSerializedCrdt() {
     var _this$_parent;
 
@@ -1445,10 +1401,6 @@ var LiveMap = function (_AbstractCrdt) {
     };
   };
 
-  _proto._getType = function _getType() {
-    return "LiveMap";
-  };
-
   _proto._toSerializedCrdt = function _toSerializedCrdt() {
     var _this$_parent;
 
@@ -2143,10 +2095,6 @@ var LiveObject = function (_AbstractCrdt) {
     };
   };
 
-  _proto._getType = function _getType() {
-    return "LiveObject";
-  };
-
   _proto.toObject = function toObject() {
     return Object.fromEntries(_classPrivateFieldGet(this, _map));
   };
@@ -2485,38 +2433,14 @@ function makeOthers(presenceMap) {
 function makeStateMachine(state, context, mockedEffects) {
   var effects = mockedEffects || {
     authenticate: function authenticate(auth, createWebSocket) {
-      return _asyncToGenerator(regeneratorRuntime.mark(function _callee() {
-        var _yield$auth, _token, parsedToken, socket;
-
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.prev = 0;
-                _context.next = 3;
-                return auth(context.room);
-
-              case 3:
-                _yield$auth = _context.sent;
-                _token = _yield$auth.token;
-                parsedToken = parseToken(_token);
-                socket = createWebSocket(_token);
-                authenticationSuccess(parsedToken, socket);
-                _context.next = 13;
-                break;
-
-              case 10:
-                _context.prev = 10;
-                _context.t0 = _context["catch"](0);
-                authenticationFailure(_context.t0);
-
-              case 13:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, null, [[0, 10]]);
-      }))();
+      return auth(context.room).then(function (_ref2) {
+        var token = _ref2.token;
+        var parsedToken = parseToken(token);
+        var socket = createWebSocket(token);
+        authenticationSuccess(parsedToken, socket);
+      }).catch(function (er) {
+        return authenticationFailure(er);
+      });
     },
     send: function send(messageOrMessages) {
       if (state.socket == null) {
@@ -2691,13 +2615,13 @@ function makeStateMachine(state, context, mockedEffects) {
     }
   }
 
-  function notify(_ref2) {
-    var _ref2$storageUpdates = _ref2.storageUpdates,
-        storageUpdates = _ref2$storageUpdates === void 0 ? new Map() : _ref2$storageUpdates,
-        _ref2$presence = _ref2.presence,
-        presence = _ref2$presence === void 0 ? false : _ref2$presence,
-        _ref2$others = _ref2.others,
-        others = _ref2$others === void 0 ? [] : _ref2$others;
+  function notify(_ref3) {
+    var _ref3$storageUpdates = _ref3.storageUpdates,
+        storageUpdates = _ref3$storageUpdates === void 0 ? new Map() : _ref3$storageUpdates,
+        _ref3$presence = _ref3.presence,
+        presence = _ref3$presence === void 0 ? false : _ref3$presence,
+        _ref3$others = _ref3.others,
+        others = _ref3$others === void 0 ? [] : _ref3$others;
 
     if (others.length > 0) {
       state.others = makeOthers(state.users);
@@ -3502,51 +3426,29 @@ function makeStateMachine(state, context, mockedEffects) {
   var _getInitialStateResolver = null;
 
   function getStorage() {
-    return _getStorage.apply(this, arguments);
-  }
-
-  function _getStorage() {
-    _getStorage = _asyncToGenerator(regeneratorRuntime.mark(function _callee2() {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!state.root) {
-                _context2.next = 2;
-                break;
-              }
-
-              return _context2.abrupt("return", {
-                root: state.root
-              });
-
-            case 2:
-              if (_getInitialStatePromise == null) {
-                state.buffer.messages.push({
-                  type: ClientMessageType.FetchStorage
-                });
-                tryFlushing();
-                _getInitialStatePromise = new Promise(function (resolve) {
-                  return _getInitialStateResolver = resolve;
-                });
-              }
-
-              _context2.next = 5;
-              return _getInitialStatePromise;
+    if (state.root) {
+      return new Promise(function (resolve) {
+        return resolve({
+          root: state.root
+        });
+      });
+    }
 
-            case 5:
-              return _context2.abrupt("return", {
-                root: state.root
-              });
+    if (_getInitialStatePromise == null) {
+      state.buffer.messages.push({
+        type: ClientMessageType.FetchStorage
+      });
+      tryFlushing();
+      _getInitialStatePromise = new Promise(function (resolve) {
+        return _getInitialStateResolver = resolve;
+      });
+    }
 
-            case 6:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2);
-    }));
-    return _getStorage.apply(this, arguments);
+    return _getInitialStatePromise.then(function () {
+      return {
+        root: state.root
+      };
+    });
   }
 
   function undo() {
@@ -3868,71 +3770,28 @@ function prepareAuthEndpoint(authentication, fetchPolyfill) {
   throw new Error("Internal error. Unexpected authentication type");
 }
 
-function fetchAuthEndpoint(_x, _x2, _x3) {
-  return _fetchAuthEndpoint.apply(this, arguments);
-}
-
-function _fetchAuthEndpoint() {
-  _fetchAuthEndpoint = _asyncToGenerator(regeneratorRuntime.mark(function _callee3(fetch, endpoint, body) {
-    var res, authResponse;
-    return regeneratorRuntime.wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            _context3.next = 2;
-            return fetch(endpoint, {
-              method: "POST",
-              headers: {
-                "Content-Type": "application/json"
-              },
-              body: JSON.stringify(body)
-            });
-
-          case 2:
-            res = _context3.sent;
-
-            if (res.ok) {
-              _context3.next = 5;
-              break;
-            }
-
-            throw new AuthenticationError("Authentication error. Liveblocks could not parse the response of your authentication \"" + endpoint + "\"");
-
-          case 5:
-            authResponse = null;
-            _context3.prev = 6;
-            _context3.next = 9;
-            return res.json();
-
-          case 9:
-            authResponse = _context3.sent;
-            _context3.next = 15;
-            break;
-
-          case 12:
-            _context3.prev = 12;
-            _context3.t0 = _context3["catch"](6);
-            throw new AuthenticationError("Authentication error. Liveblocks could not parse the response of your authentication \"" + endpoint + "\"");
-
-          case 15:
-            if (!(typeof authResponse.token !== "string")) {
-              _context3.next = 17;
-              break;
-            }
-
-            throw new AuthenticationError("Authentication error. Liveblocks could not parse the response of your authentication \"" + endpoint + "\"");
+function fetchAuthEndpoint(fetch, endpoint, body) {
+  return fetch(endpoint, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(body)
+  }).then(function (res) {
+    if (!res.ok) {
+      throw new AuthenticationError("Expected a status 200 but got " + res.status + " when doing a POST request on \"" + endpoint + "\"");
+    }
 
-          case 17:
-            return _context3.abrupt("return", authResponse);
+    return res.json().catch(function (er) {
+      throw new AuthenticationError("Expected a json when doing a POST request on \"" + endpoint + "\". " + er);
+    });
+  }).then(function (authResponse) {
+    if (typeof authResponse.token !== "string") {
+      throw new AuthenticationError("Expected a json with a string token when doing a POST request on \"" + endpoint + "\", but got " + JSON.stringify(authResponse));
+    }
 
-          case 18:
-          case "end":
-            return _context3.stop();
-        }
-      }
-    }, _callee3, null, [[6, 12]]);
-  }));
-  return _fetchAuthEndpoint.apply(this, arguments);
+    return authResponse;
+  });
 }
 
 var AuthenticationError = function (_Error2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/client",
-  "version": "0.15.0-alpha.4",
+  "version": "0.15.0",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -51,11 +51,13 @@
     "babel-jest": "^26.6.3",
     "jest": "^26.6.3",
     "jest-each": "^27.5.1",
+    "msw": "^0.39.1",
     "node-fetch": "2.6.7",
     "rollup": "^2.68.0",
     "rollup-plugin-dts": "^4.1.0",
     "rollup-plugin-esbuild": "^4.8.2",
     "typescript": "^4.4.0",
+    "whatwg-fetch": "^3.6.2",
     "ws": "^8.5.0"
   },
   "repository": {