@liveblocks/client 0.12.0-beta.8 → 0.12.2

package/lib/esm/live.d.ts

@@ -114,6 +114,7 @@ export declare enum OpType {
 }
 export declare type Op = CreateObjectOp | UpdateObjectOp | DeleteCrdtOp | CreateListOp | SetParentKeyOp | DeleteObjectKeyOp | CreateMapOp | CreateRegisterOp;
 export declare type UpdateObjectOp = {
+    opId?: string;
     id: string;
     type: OpType.UpdateObject;
     data: {

package/lib/esm/position.d.ts

@@ -3,8 +3,4 @@ export declare const max = 126;
 export declare function makePosition(before?: string, after?: string): string;
 export declare function posCodes(str: string): number[];
 export declare function pos(codes: number[]): string;
-export declare function compare(itemA: {
-    position: string;
-}, itemB: {
-    position: string;
-}): number;
+export declare function compare(posA: string, posB: string): number;

package/lib/esm/position.js

@@ -88,9 +88,9 @@ export function posCodes(str) {
 export function pos(codes) {
     return String.fromCharCode(...codes);
 }
-export function compare(itemA, itemB) {
-    const aCodes = posCodes(itemA.position);
-    const bCodes = posCodes(itemB.position);
+export function compare(posA, posB) {
+    const aCodes = posCodes(posA);
+    const bCodes = posCodes(posB);
     const maxLength = Math.max(aCodes.length, bCodes.length);
     for (let i = 0; i < maxLength; i++) {
         const a = aCodes[i] == null ? min : aCodes[i];
@@ -102,5 +102,5 @@ export function compare(itemA, itemB) {
             return a - b;
         }
     }
-    throw new Error(`Impossible to compare similar position "${itemA.position}" and "${itemB.position}"`);
+    throw new Error(`Impossible to compare similar position "${posA}" and "${posB}"`);
 }

package/lib/esm/room.d.ts

@@ -49,6 +49,7 @@ declare type Context = {
     authEndpoint: AuthEndpoint;
     liveblocksServer: string;
     throttleDelay: number;
+    publicApiKey?: string;
 };
 export declare function makeStateMachine(state: State, context: Context, mockedEffects?: Effects): {
     onOpen: () => void;
@@ -80,6 +81,8 @@ export declare function makeStateMachine(state: State, context: Context, mockedE
     };
     updatePresence: <T_4 extends Presence>(overrides: Partial<T_4>) => void;
     broadcastEvent: (event: any) => void;
+    undo: () => void;
+    redo: () => void;
     getStorage: <TRoot>() => Promise<{
         root: import("./doc").LiveObject<TRoot>;
     }>;

package/lib/esm/room.js

@@ -49,7 +49,7 @@ export function makeStateMachine(state, context, mockedEffects) {
         authenticate() {
             return __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const token = yield auth(context.authEndpoint, context.room);
+                    const token = yield auth(context.authEndpoint, context.room, context.publicApiKey);
                     const parsedToken = parseToken(token);
                     const socket = new WebSocket(`${context.liveblocksServer}/?token=${token}`);
                     socket.addEventListener("message", onMessage);
@@ -475,6 +475,12 @@ export function makeStateMachine(state, context, mockedEffects) {
             };
         });
     }
+    function undo() {
+        storage.undo();
+    }
+    function redo() {
+        storage.redo();
+    }
     return {
         // Internal
         onOpen,
@@ -493,6 +499,8 @@ export function makeStateMachine(state, context, mockedEffects) {
         // Presence
         updatePresence,
         broadcastEvent,
+        undo,
+        redo,
         getStorage,
         selectors: {
             // Core
@@ -539,14 +547,23 @@ export function defaultState(me, defaultStorageRoot) {
 }
 export function createRoom(name, options) {
     const throttleDelay = options.throttle || 100;
-    const liveblocksServer = options.liveblocksServer || "wss://liveblocks.net/v2";
-    const authEndpoint = options.authEndpoint;
+    const liveblocksServer = options.liveblocksServer || "wss://liveblocks.net/v4";
+    let authEndpoint;
+    if (options.authEndpoint) {
+        authEndpoint = options.authEndpoint;
+    }
+    else {
+        const publicAuthorizeEndpoint = options.publicAuthorizeEndpoint ||
+            "https://liveblocks.io/api/public/authorize";
+        authEndpoint = publicAuthorizeEndpoint;
+    }
     const state = defaultState(options.defaultPresence, options.defaultStorageRoot);
     const machine = makeStateMachine(state, {
         throttleDelay,
         liveblocksServer,
         authEndpoint,
         room: name,
+        publicApiKey: options.publicApiKey,
     });
     const room = {
         /////////////
@@ -564,6 +581,8 @@ export function createRoom(name, options) {
         getOthers: machine.selectors.getOthers,
         broadcastEvent: machine.broadcastEvent,
         getStorage: machine.getStorage,
+        undo: machine.undo,
+        redo: machine.redo,
     };
     return {
         connect: machine.connect,

package/lib/esm/storage.d.ts

@@ -16,4 +16,6 @@ export default class Storage {
     private createDocFromMessage;
     getDocument<TRoot>(): Promise<Doc<TRoot>>;
     onMessage(message: ServerMessage): Promise<void>;
+    undo(): void;
+    redo(): void;
 }

package/lib/esm/storage.js

@@ -18,11 +18,11 @@ export default class Storage {
         this._getInitialStateResolver = null;
     }
     createDocFromMessage(message) {
-        if (message.items.length === 0) {
-            this._doc = Doc.from(this.options.defaultRoot, this.options.getConnectionId(), this.options.dispatch);
-        }
-        else {
-            this._doc = Doc.load(message.items, this.options.getConnectionId(), this.options.dispatch);
+        this._doc = Doc.load(message.items, this.options.getConnectionId(), this.options.dispatch);
+        for (const key in this.options.defaultRoot) {
+            if (this._doc.root.get(key) == null) {
+                this._doc.root.set(key, this.options.defaultRoot[key]);
+            }
         }
     }
     getDocument() {
@@ -48,12 +48,18 @@ export default class Storage {
                     break;
                 }
                 case ServerMessageType.UpdateStorage: {
-                    for (const op of message.ops) {
-                        (_b = this._doc) === null || _b === void 0 ? void 0 : _b.apply(op);
-                    }
+                    (_b = this._doc) === null || _b === void 0 ? void 0 : _b.apply(message.ops);
                     break;
                 }
             }
         });
     }
+    undo() {
+        var _a;
+        (_a = this._doc) === null || _a === void 0 ? void 0 : _a.undo();
+    }
+    redo() {
+        var _a;
+        (_a = this._doc) === null || _a === void 0 ? void 0 : _a.redo();
+    }
 }

package/lib/esm/types.d.ts

@@ -87,14 +87,19 @@ declare type AuthEndpointCallback = (room: string) => Promise<{
     token: string;
 }>;
 export declare type AuthEndpoint = string | AuthEndpointCallback;
+/**
+ * The authentication endpoint that is called to ensure that the current user has access to a room.
+ * Can be an url or a callback if you need to add additional headers.
+ */
 export declare type ClientOptions = {
-    /**
-     * The authentication endpoint that is called to ensure that the current user has access to a room.
-     * Can be an url or a callback if you need to add additional headers.
-     */
-    authEndpoint: AuthEndpoint;
     throttle?: number;
-};
+} & ({
+    publicApiKey: string;
+    authEndpoint?: never;
+} | {
+    publicApiKey?: never;
+    authEndpoint: AuthEndpoint;
+});
 export declare type AuthorizeResponse = {
     token: string;
 };
@@ -261,5 +266,7 @@ export declare type Room = {
     getStorage: <TRoot>() => Promise<{
         root: LiveObject<TRoot>;
     }>;
+    undo: () => void;
+    redo: () => void;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/client",
-  "version": "0.12.0-beta.8",
+  "version": "0.12.2",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",