@liveblocks/client 0.16.11 → 0.16.14

package/index.js

@@ -324,7 +324,7 @@ function makeStateMachine(state, context, mockedEffects) {
  }
  function onMessage(event) {
   if ("pong" !== event.data) {
-   var text, data, messages = (text = event.data, void 0 === (data = LiveObject.parseJson(text)) ? null : LiveObject.isJsonArray(data) ? LiveObject.compact(data.map((function(item) {
+   var text, data, messages = (text = event.data, void 0 === (data = LiveObject.tryParseJson(text)) ? null : LiveObject.isJsonArray(data) ? LiveObject.compact(data.map((function(item) {
     return parseServerMessage(item);
    }))) : LiveObject.compact([ parseServerMessage(data) ]));
    if (null !== messages && 0 !== messages.length) {
@@ -758,7 +758,7 @@ var LiveblocksError = function(_Error) {
 function parseToken(token) {
  var tokenParts = token.split(".");
  if (3 !== tokenParts.length) throw new Error("Authentication error. Liveblocks could not parse the response of your authentication endpoint");
- var data = LiveObject.parseJson(atob(tokenParts[1]));
+ var data = LiveObject.tryParseJson(LiveObject.b64decode(tokenParts[1]));
  if (void 0 !== data && LiveObject.isJsonObject(data) && "number" == typeof data.actor && (void 0 === data.id || "string" == typeof data.id)) return {
   actor: data.actor,
   id: data.id,

package/index.mjs

@@ -1,6 +1,6 @@
-import { A as AbstractCrdt, r as remove, S as ServerMsgCode, m as mergeStorageUpdates, W as WebsocketCloseCodes, C as ClientMsgCode, i as isTokenValid, a as isSameNodeOrChildOf, L as LiveObject, g as getTreesDiffOperations, O as OpCode, b as LiveList, p as parseJson, c as isJsonArray, d as compact, e as isJsonObject, f as isRootCrdt, h as deprecateIf } from "./shared.mjs";
+import { A as AbstractCrdt, r as remove, S as ServerMsgCode, m as mergeStorageUpdates, W as WebsocketCloseCodes, C as ClientMsgCode, i as isTokenValid, a as isSameNodeOrChildOf, L as LiveObject, g as getTreesDiffOperations, O as OpCode, b as LiveList, t as tryParseJson, c as isJsonArray, d as compact, e as b64decode, f as isJsonObject, h as isRootCrdt, j as deprecateIf } from "./shared.mjs";
 
-export { b as LiveList, j as LiveMap, L as LiveObject } from "./shared.mjs";
+export { b as LiveList, k as LiveMap, L as LiveObject } from "./shared.mjs";
 
 const BACKOFF_RETRY_DELAYS = [ 250, 500, 1e3, 2e3, 4e3, 8e3, 1e4 ], BACKOFF_RETRY_DELAYS_SLOW = [ 2e3, 3e4, 6e4, 3e5 ];
 
@@ -302,7 +302,7 @@ function makeStateMachine(state, context, mockedEffects) {
  function onMessage(event) {
   if ("pong" === event.data) return void clearTimeout(state.timeoutHandles.pongTimeout);
   const messages = function(text) {
-   const data = parseJson(text);
+   const data = tryParseJson(text);
    return void 0 === data ? null : isJsonArray(data) ? compact(data.map((item => parseServerMessage(item)))) : compact([ parseServerMessage(data) ]);
   }(event.data);
   if (null === messages || 0 === messages.length) return;
@@ -710,7 +710,7 @@ class LiveblocksError extends Error {
 function parseToken(token) {
  const tokenParts = token.split(".");
  if (3 !== tokenParts.length) throw new Error("Authentication error. Liveblocks could not parse the response of your authentication endpoint");
- const data = parseJson(atob(tokenParts[1]));
+ const data = tryParseJson(b64decode(tokenParts[1]));
  if (void 0 !== data && isJsonObject(data) && "number" == typeof data.actor && (void 0 === data.id || "string" == typeof data.id)) return {
   actor: data.actor,
   id: data.id,

package/internal.d.ts

@@ -1,5 +1,5 @@
 import { d as JsonObject, J as Json, g as Resolve, e as Lson, A as AbstractCrdt, f as LsonObject, L as LiveObject, S as StorageUpdate } from './shared';
-export { g as Resolve, h as RoomInitializers, p as parseJson } from './shared';
+export { g as Resolve, h as RoomInitializers } from './shared';
 
 declare type IdTuple<T> = [id: string, value: T];
 /**
@@ -132,12 +132,29 @@ declare type UpdateStorageServerMsg = {
     type: ServerMsgCode.UPDATE_STORAGE;
     ops: Op[];
 };
+/**
+ * Messages that can be sent from the client to the server.
+ */
+declare type ClientMsg<TPresence extends JsonObject> = BroadcastEventClientMsg | UpdatePresenceClientMsg<TPresence> | UpdateStorageClientMsg | FetchStorageClientMsg;
 declare enum ClientMsgCode {
     UPDATE_PRESENCE = 100,
     BROADCAST_EVENT = 103,
     FETCH_STORAGE = 200,
     UPDATE_STORAGE = 201
 }
+declare type BroadcastEventClientMsg = {
+    type: ClientMsgCode.BROADCAST_EVENT;
+    event: Json;
+};
+declare type UpdatePresenceClientMsg<TPresence extends JsonObject> = {
+    type: ClientMsgCode.UPDATE_PRESENCE;
+    data: TPresence;
+    targetActor?: number;
+};
+declare type UpdateStorageClientMsg = {
+    type: ClientMsgCode.UPDATE_STORAGE;
+    ops: Op[];
+};
 declare type FetchStorageClientMsg = {
     type: ClientMsgCode.FETCH_STORAGE;
 };
@@ -327,5 +344,14 @@ declare function comparePosition(posA: string, posB: string): number;
  * 🍒 case.
  */
 declare function assertNever(_value: never, errmsg: string): never;
+/**
+ * Alternative to JSON.parse() that will not throw in production. If the passed
+ * string cannot be parsed, this will return `undefined`.
+ */
+declare function tryParseJson(rawMessage: string): Json | undefined;
+/**
+ * Decode base64 string.
+ */
+declare function b64decode(b64value: string): string;
 
-export { ClientMsgCode, CrdtType, CreateChildOp, CreateListOp, CreateMapOp, CreateObjectOp, CreateRegisterOp, CreateRootObjectOp, DeleteCrdtOp, DeleteObjectKeyOp, FetchStorageClientMsg, IdTuple, InitialDocumentStateServerMsg, NodeMap, Op, OpCode, ParentToChildNodeMap, RoomStateServerMsg, SerializedChild, SerializedCrdt, SerializedList, SerializedMap, SerializedObject, SerializedRegister, SerializedRootObject, ServerMsg, ServerMsgCode, SetParentKeyOp, UpdateObjectOp, UserJoinServerMsg, WebsocketCloseCodes, assertNever, comparePosition, deprecate, deprecateIf, errorIf, isChildCrdt, isRootCrdt, lsonToJson, makePosition, patchImmutableObject, patchLiveObjectKey, throwUsageError };
+export { BroadcastEventClientMsg, ClientMsg, ClientMsgCode, CrdtType, CreateChildOp, CreateListOp, CreateMapOp, CreateObjectOp, CreateRegisterOp, CreateRootObjectOp, DeleteCrdtOp, DeleteObjectKeyOp, FetchStorageClientMsg, IdTuple, InitialDocumentStateServerMsg, NodeMap, Op, OpCode, ParentToChildNodeMap, RoomStateServerMsg, SerializedChild, SerializedCrdt, SerializedList, SerializedMap, SerializedObject, SerializedRegister, SerializedRootObject, ServerMsg, ServerMsgCode, SetParentKeyOp, UpdateObjectOp, UpdatePresenceClientMsg, UpdateStorageClientMsg, UserJoinServerMsg, WebsocketCloseCodes, assertNever, b64decode, comparePosition, deprecate, deprecateIf, errorIf, isChildCrdt, isRootCrdt, lsonToJson, makePosition, patchImmutableObject, patchLiveObjectKey, throwUsageError, tryParseJson };

package/internal.js

@@ -165,12 +165,13 @@ Object.defineProperty(exports, "ClientMsgCode", {
  get: function() {
   return LiveObject.WebsocketCloseCodes;
  }
-}), exports.assertNever = LiveObject.assertNever, exports.comparePosition = LiveObject.comparePosition, 
-exports.deprecate = LiveObject.deprecate, exports.deprecateIf = LiveObject.deprecateIf, 
-exports.errorIf = LiveObject.errorIf, exports.isChildCrdt = LiveObject.isChildCrdt, 
-exports.isRootCrdt = LiveObject.isRootCrdt, exports.makePosition = LiveObject.makePosition, 
-exports.parseJson = LiveObject.parseJson, exports.throwUsageError = LiveObject.throwUsageError, 
-exports.lsonToJson = lsonToJson, exports.patchImmutableObject = function(state, updates) {
+}), exports.assertNever = LiveObject.assertNever, exports.b64decode = LiveObject.b64decode, 
+exports.comparePosition = LiveObject.comparePosition, exports.deprecate = LiveObject.deprecate, 
+exports.deprecateIf = LiveObject.deprecateIf, exports.errorIf = LiveObject.errorIf, 
+exports.isChildCrdt = LiveObject.isChildCrdt, exports.isRootCrdt = LiveObject.isRootCrdt, 
+exports.makePosition = LiveObject.makePosition, exports.throwUsageError = LiveObject.throwUsageError, 
+exports.tryParseJson = LiveObject.tryParseJson, exports.lsonToJson = lsonToJson, 
+exports.patchImmutableObject = function(state, updates) {
  return updates.reduce((function(state, update) {
   return function(state, update) {
    var path = function(node) {

package/internal.mjs

@@ -1,6 +1,6 @@
-import { L as LiveObject, b as LiveList, j as LiveMap, k as LiveRegister, A as AbstractCrdt, l as findNonSerializableValue } from "./shared.mjs";
+import { L as LiveObject, b as LiveList, k as LiveMap, l as LiveRegister, A as AbstractCrdt, n as findNonSerializableValue } from "./shared.mjs";
 
-export { C as ClientMsgCode, q as CrdtType, O as OpCode, S as ServerMsgCode, W as WebsocketCloseCodes, w as assertNever, s as comparePosition, n as deprecate, h as deprecateIf, o as errorIf, v as isChildCrdt, f as isRootCrdt, u as makePosition, p as parseJson, t as throwUsageError } from "./shared.mjs";
+export { C as ClientMsgCode, s as CrdtType, O as OpCode, S as ServerMsgCode, W as WebsocketCloseCodes, x as assertNever, e as b64decode, u as comparePosition, o as deprecate, j as deprecateIf, p as errorIf, w as isChildCrdt, h as isRootCrdt, v as makePosition, q as throwUsageError, t as tryParseJson } from "./shared.mjs";
 
 function lsonObjectToJson(obj) {
  const result = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/client",
-  "version": "0.16.11",
+  "version": "0.16.14",
   "description": "A client that lets you interact with Liveblocks servers.",
   "main": "./index.js",
   "module": "./index.mjs",

package/shared.d.ts

@@ -14,11 +14,6 @@ declare type JsonArray = Json[];
 declare type JsonObject = {
     [key: string]: Json | undefined;
 };
-/**
- * Alternative to JSON.parse() that will not throw in production. If the passed
- * string cannot be parsed, this will return `undefined`.
- */
-declare function parseJson(rawMessage: string): Json | undefined;
 
 /**
  * The LiveMap class is similar to a JavaScript Map that is synchronized on all clients.
@@ -785,4 +780,4 @@ declare class LiveObject<O extends LsonObject = LsonObject> extends AbstractCrdt
     update(overrides: Partial<O>): void;
 }
 
-export { AbstractCrdt as A, BroadcastOptions as B, ClientOptions as C, History as H, Json as J, LiveObject as L, Others as O, Presence as P, Room as R, StorageUpdate as S, User as U, Client as a, LiveMap as b, LiveList as c, JsonObject as d, Lson as e, LsonObject as f, Resolve as g, RoomInitializers as h, parseJson as p };
+export { AbstractCrdt as A, BroadcastOptions as B, ClientOptions as C, History as H, Json as J, LiveObject as L, Others as O, Presence as P, Room as R, StorageUpdate as S, User as U, Client as a, LiveMap as b, LiveList as c, JsonObject as d, Lson as e, LsonObject as f, Resolve as g, RoomInitializers as h };

package/shared.js

@@ -197,14 +197,6 @@ var AbstractCrdt = function() {
  } ]), AbstractCrdt;
 }();
 
-function parseJson(rawMessage) {
- try {
-  return JSON.parse(rawMessage);
- } catch (e) {
-  return;
- }
-}
-
 function isJsonArray(data) {
  return Array.isArray(data);
 }
@@ -962,6 +954,14 @@ function entries(obj) {
  return Object.entries(obj);
 }
 
+function tryParseJson(rawMessage) {
+ try {
+  return JSON.parse(rawMessage);
+ } catch (e) {
+  return;
+ }
+}
+
 var LiveObject = function(_AbstractCrdt) {
  function LiveObject(obj) {
   var _this;
@@ -1271,6 +1271,15 @@ exports._extends = _extends, exports._inheritsLoose = _inheritsLoose, exports._o
  return target;
 }, exports._wrapNativeSuper = _wrapNativeSuper, exports.assertNever = function(_value, errmsg) {
  throw new Error(errmsg);
+}, exports.b64decode = function(b64value) {
+ try {
+  var formattedValue = b64value.replace(/-/g, "+").replace(/_/g, "/");
+  return decodeURIComponent(atob(formattedValue).split("").map((function(c) {
+   return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
+  })).join(""));
+ } catch (err) {
+  return atob(b64value);
+ }
 }, exports.compact = function(items) {
  return items.filter((function(item) {
   return null != item;
@@ -1364,7 +1373,7 @@ exports.isRootCrdt = function(crdt) {
 }, exports.isTokenValid = function(token) {
  var tokenParts = token.split(".");
  if (3 !== tokenParts.length) return !1;
- var data = parseJson(atob(tokenParts[1]));
+ var data = tryParseJson(atob(tokenParts[1]));
  return !(void 0 === data || !isJsonObject(data) || "number" != typeof data.exp) && !(Date.now() / 1e3 > data.exp - 300);
 }, exports.makePosition = makePosition, exports.mergeStorageUpdates = function(first, second) {
  return first ? "LiveObject" === first.type && "LiveObject" === second.type ? function(first, second) {
@@ -1388,9 +1397,9 @@ exports.isRootCrdt = function(crdt) {
    updates: first.updates.concat(second.updates)
   });
  }(first, second) : second : second;
-}, exports.parseJson = parseJson, exports.remove = function(array, item) {
+}, exports.remove = function(array, item) {
  for (var i = 0; i < array.length; i++) if (array[i] === item) {
   array.splice(i, 1);
   break;
  }
-}, exports.throwUsageError = throwUsageError;
+}, exports.throwUsageError = throwUsageError, exports.tryParseJson = tryParseJson;

package/shared.mjs

@@ -70,14 +70,6 @@ class AbstractCrdt {
  }
 }
 
-function parseJson(rawMessage) {
- try {
-  return JSON.parse(rawMessage);
- } catch (e) {
-  return;
- }
-}
-
 function isJsonArray(data) {
  return Array.isArray(data);
 }
@@ -950,7 +942,7 @@ function findNonSerializableValue(value, path = "") {
 function isTokenValid(token) {
  const tokenParts = token.split(".");
  if (3 !== tokenParts.length) return !1;
- const data = parseJson(atob(tokenParts[1]));
+ const data = tryParseJson(atob(tokenParts[1]));
  if (void 0 === data || !isJsonObject(data) || "number" != typeof data.exp) return !1;
  return !(Date.now() / 1e3 > data.exp - 300);
 }
@@ -959,6 +951,25 @@ function entries(obj) {
  return Object.entries(obj);
 }
 
+function tryParseJson(rawMessage) {
+ try {
+  return JSON.parse(rawMessage);
+ } catch (e) {
+  return;
+ }
+}
+
+function b64decode(b64value) {
+ try {
+  const formattedValue = b64value.replace(/-/g, "+").replace(/_/g, "/");
+  return decodeURIComponent(atob(formattedValue).split("").map((function(c) {
+   return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
+  })).join(""));
+ } catch (err) {
+  return atob(b64value);
+ }
+}
+
 class LiveObject extends AbstractCrdt {
  constructor(obj = {}) {
   super(), this._propToLastUpdate = new Map;
@@ -1262,4 +1273,4 @@ class LiveObject extends AbstractCrdt {
  }
 }
 
-export { AbstractCrdt as A, ClientMsgCode as C, LiveObject as L, OpCode as O, ServerMsgCode as S, WebsocketCloseCodes as W, isSameNodeOrChildOf as a, LiveList as b, isJsonArray as c, compact as d, isJsonObject as e, isRootCrdt as f, getTreesDiffOperations as g, deprecateIf as h, isTokenValid as i, LiveMap as j, LiveRegister as k, findNonSerializableValue as l, mergeStorageUpdates as m, deprecate as n, errorIf as o, parseJson as p, CrdtType as q, remove as r, comparePosition as s, throwUsageError as t, makePosition as u, isChildCrdt as v, assertNever as w };
+export { AbstractCrdt as A, ClientMsgCode as C, LiveObject as L, OpCode as O, ServerMsgCode as S, WebsocketCloseCodes as W, isSameNodeOrChildOf as a, LiveList as b, isJsonArray as c, compact as d, b64decode as e, isJsonObject as f, getTreesDiffOperations as g, isRootCrdt as h, isTokenValid as i, deprecateIf as j, LiveMap as k, LiveRegister as l, mergeStorageUpdates as m, findNonSerializableValue as n, deprecate as o, errorIf as p, throwUsageError as q, remove as r, CrdtType as s, tryParseJson as t, comparePosition as u, makePosition as v, isChildCrdt as w, assertNever as x };