@liveblocks/core 3.13.0-ack1 → 3.13.0-metadata2

package/dist/index.cjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.13.0-ack1";
+var PKG_VERSION = "3.13.0-metadata2";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -1606,6 +1606,7 @@ function createApiClient({
         comment: {
           id: commentId,
           body: options.body,
+          metadata: options.commentMetadata,
           attachmentIds: options.attachmentIds
         },
         metadata: options.metadata
@@ -1659,6 +1660,16 @@ function createApiClient({
       options.metadata
     );
   }
+  async function editCommentMetadata(options) {
+    return await httpClient.post(
+      url`/v2/c/rooms/${options.roomId}/threads/${options.threadId}/comments/${options.commentId}/metadata`,
+      await authManager.getAuthValue({
+        requestedScope: "comments:read",
+        roomId: options.roomId
+      }),
+      options.metadata
+    );
+  }
   async function createComment(options) {
     const commentId = _nullishCoalesce(options.commentId, () => ( createCommentId()));
     const comment = await httpClient.post(
@@ -1670,6 +1681,7 @@ function createApiClient({
       {
         id: commentId,
         body: options.body,
+        metadata: options.metadata,
         attachmentIds: options.attachmentIds
       }
     );
@@ -1684,7 +1696,8 @@ function createApiClient({
       }),
       {
         body: options.body,
-        attachmentIds: options.attachmentIds
+        attachmentIds: options.attachmentIds,
+        metadata: options.metadata
       }
     );
     return convertToCommentData(comment);
@@ -2426,6 +2439,7 @@ function createApiClient({
     editThreadMetadata,
     createComment,
     editComment,
+    editCommentMetadata,
     deleteComment,
     addReaction,
     removeReaction,
@@ -3090,9 +3104,8 @@ var ServerMsgCode = Object.freeze({
   BROADCASTED_EVENT: 103,
   ROOM_STATE: 104,
   // For Storage
-  INITIAL_STORAGE_STATE: 200,
+  STORAGE_STATE: 200,
   UPDATE_STORAGE: 201,
-  STORAGE_ACK: 202,
   // For Yjs Docs
   UPDATE_YDOC: 300,
   // For Comments
@@ -3105,6 +3118,7 @@ var ServerMsgCode = Object.freeze({
   COMMENT_DELETED: 404,
   COMMENT_REACTION_ADDED: 405,
   COMMENT_REACTION_REMOVED: 406,
+  COMMENT_METADATA_UPDATED: 409,
   // Error codes
   REJECT_STORAGE_OP: 299
   // Sent if a mutation was not allowed on the server (i.e. due to permissions, limit exceeded, etc)
@@ -5927,6 +5941,9 @@ var OpCode = Object.freeze({
   ACK: 9
   // Will only appear in v8+
 });
+function isAckOp(op) {
+  return op.type === OpCode.DELETE_CRDT && op.id === "ACK";
+}
 
 // src/crdts/AbstractCrdt.ts
 function createManagedPool(roomId, options) {
@@ -6381,7 +6398,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       };
     }
   }
-  #applySetFixop(op) {
+  #applySetAck(op) {
     if (this._pool === void 0) {
       throw new Error("Can't attach child if managed pool is not present");
     }
@@ -6491,7 +6508,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       reverse: []
     };
   }
-  #applyInsertFixop(op) {
+  #applyInsertAck(op) {
     const existingItem = this.#items.find((item) => item._id === op.id);
     const key = asPos(op.parentKey);
     const itemIndexAtPosition = this._indexOfPosition(key);
@@ -6611,18 +6628,18 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
     let result;
     if (op.intent === "set") {
-      if (source === 1 /* REMOTE */) {
+      if (source === 1 /* THEIRS */) {
         result = this.#applySetRemote(op);
-      } else if (source === 2 /* FIXOP */) {
-        result = this.#applySetFixop(op);
+      } else if (source === 2 /* OURS */) {
+        result = this.#applySetAck(op);
       } else {
         result = this.#applySetUndoRedo(op);
       }
     } else {
-      if (source === 1 /* REMOTE */) {
+      if (source === 1 /* THEIRS */) {
         result = this.#applyRemoteInsert(op);
-      } else if (source === 2 /* FIXOP */) {
-        result = this.#applyInsertFixop(op);
+      } else if (source === 2 /* OURS */) {
+        result = this.#applyInsertAck(op);
       } else {
         result = this.#applyInsertUndoRedo(op);
       }
@@ -6705,7 +6722,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       };
     }
   }
-  #applySetChildKeyFixop(newKey, child) {
+  #applySetChildKeyAck(newKey, child) {
     const previousKey = nn(child._parentKey);
     if (this.#implicitlyDeletedItems.has(child)) {
       const existingItemIndex = this._indexOfPosition(newKey);
@@ -6784,10 +6801,10 @@ var LiveList = class _LiveList extends AbstractCrdt {
   }
   /** @internal */
   _setChildKey(newKey, child, source) {
-    if (source === 1 /* REMOTE */) {
+    if (source === 1 /* THEIRS */) {
       return this.#applySetChildKeyRemote(newKey, child);
-    } else if (source === 2 /* FIXOP */) {
-      return this.#applySetChildKeyFixop(newKey, child);
+    } else if (source === 2 /* OURS */) {
+      return this.#applySetChildKeyAck(newKey, child);
     } else {
       return this.#applySetChildKeyUndoRedo(newKey, child);
     }
@@ -7300,7 +7317,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
     if (this._pool.getNode(id) !== void 0) {
       return { modified: false };
     }
-    if (source === 2 /* FIXOP */) {
+    if (source === 2 /* OURS */) {
       const lastUpdateOpId = this.#unacknowledgedSet.get(key);
       if (lastUpdateOpId === opId) {
         this.#unacknowledgedSet.delete(key);
@@ -7308,7 +7325,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
       } else if (lastUpdateOpId !== void 0) {
         return { modified: false };
       }
-    } else if (source === 1 /* REMOTE */) {
+    } else if (source === 1 /* THEIRS */) {
       this.#unacknowledgedSet.delete(key);
     }
     const previousValue = this.#map.get(key);
@@ -8660,6 +8677,8 @@ function defaultMessageFromContext(context) {
       return "Could not delete thread";
     case "EDIT_THREAD_METADATA_ERROR":
       return "Could not edit thread metadata";
+    case "EDIT_COMMENT_METADATA_ERROR":
+      return "Could not edit comment metadata";
     case "MARK_THREAD_AS_RESOLVED_ERROR":
       return "Could not mark thread as resolved";
     case "MARK_THREAD_AS_UNRESOLVED_ERROR":
@@ -9193,11 +9212,10 @@ function createRoom(options, config) {
         let source;
         if (isLocal) {
           source = 0 /* LOCAL */;
-        } else if (op.opId) {
-          context.unacknowledgedOps.delete(op.opId);
-          source = 2 /* FIXOP */;
         } else {
-          source = 1 /* REMOTE */;
+          const opId = nn(op.opId);
+          const deleted = context.unacknowledgedOps.delete(opId);
+          source = deleted ? 2 /* OURS */ : 1 /* THEIRS */;
         }
         const applyOpResult = applyOp(op, source);
         if (applyOpResult.modified) {
@@ -9228,6 +9246,9 @@ function createRoom(options, config) {
     };
   }
   function applyOp(op, source) {
+    if (isAckOp(op)) {
+      return { modified: false };
+    }
     switch (op.type) {
       case OpCode.DELETE_OBJECT_KEY:
       case OpCode.UPDATE_OBJECT:
@@ -9471,7 +9492,7 @@ function createRoom(options, config) {
           updates.others.push(onRoomStateMessage(message));
           break;
         }
-        case ServerMsgCode.INITIAL_STORAGE_STATE: {
+        case ServerMsgCode.STORAGE_STATE: {
           processInitialStorage(message);
           break;
         }
@@ -9489,14 +9510,6 @@ function createRoom(options, config) {
           }
           break;
         }
-        // Since V8. On V7, acks were sent disguised as an Ops in UPDATE_STORAGE messages.
-        case ServerMsgCode.STORAGE_ACK: {
-          for (const opId of message.opIds) {
-            context.unacknowledgedOps.delete(opId);
-          }
-          notifyStorageStatus();
-          break;
-        }
         // Receiving a RejectedOps message in the client means that the server is no
         // longer in sync with the client. Trying to synchronize the client again by
         // rolling back particular Ops may be hard/impossible. It's fine to not try and
@@ -9521,7 +9534,8 @@ function createRoom(options, config) {
         case ServerMsgCode.COMMENT_REACTION_REMOVED:
         case ServerMsgCode.COMMENT_CREATED:
         case ServerMsgCode.COMMENT_EDITED:
-        case ServerMsgCode.COMMENT_DELETED: {
+        case ServerMsgCode.COMMENT_DELETED:
+        case ServerMsgCode.COMMENT_METADATA_UPDATED: {
           eventHub.comments.notify(message);
           break;
         }
@@ -9637,7 +9651,7 @@ function createRoom(options, config) {
   async function streamStorage() {
     if (!managedSocket.authValue) return;
     const items = await httpClient.streamStorage({ roomId });
-    processInitialStorage({ type: ServerMsgCode.INITIAL_STORAGE_STATE, items });
+    processInitialStorage({ type: ServerMsgCode.STORAGE_STATE, items });
   }
   function refreshStorage(options2) {
     const messages = context.buffer.messages;
@@ -9873,6 +9887,7 @@ function createRoom(options, config) {
       commentId: options2.commentId,
       metadata: options2.metadata,
       body: options2.body,
+      commentMetadata: options2.commentMetadata,
       attachmentIds: options2.attachmentIds
     });
   }
@@ -9885,6 +9900,18 @@ function createRoom(options, config) {
   }) {
     return httpClient.editThreadMetadata({ roomId, threadId, metadata });
   }
+  async function editCommentMetadata({
+    threadId,
+    commentId,
+    metadata
+  }) {
+    return httpClient.editCommentMetadata({
+      roomId,
+      threadId,
+      commentId,
+      metadata
+    });
+  }
   async function markThreadAsResolved(threadId) {
     return httpClient.markThreadAsResolved({ roomId, threadId });
   }
@@ -9906,6 +9933,7 @@ function createRoom(options, config) {
       threadId: options2.threadId,
       commentId: options2.commentId,
       body: options2.body,
+      metadata: options2.metadata,
       attachmentIds: options2.attachmentIds
     });
   }
@@ -9915,6 +9943,7 @@ function createRoom(options, config) {
       threadId: options2.threadId,
       commentId: options2.commentId,
       body: options2.body,
+      metadata: options2.metadata,
       attachmentIds: options2.attachmentIds
     });
   }
@@ -10102,6 +10131,7 @@ function createRoom(options, config) {
       unsubscribeFromThread,
       createComment,
       editComment,
+      editCommentMetadata,
       deleteComment,
       addReaction,
       removeReaction,
@@ -10224,7 +10254,7 @@ function makeAuthDelegateForRoom(roomId, authManager) {
     return authManager.getAuthValue({ requestedScope: "room:read", roomId });
   };
 }
-function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill) {
+function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill, engine) {
   return (authValue) => {
     const ws = _nullishCoalesce(WebSocketPolyfill, () => ( (typeof WebSocket === "undefined" ? void 0 : WebSocket)));
     if (ws === void 0) {
@@ -10234,7 +10264,7 @@ function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill) {
     }
     const url2 = new URL(baseUrl);
     url2.protocol = url2.protocol === "http:" ? "ws" : "wss";
-    url2.pathname = "/v8";
+    url2.pathname = "/v7";
     url2.searchParams.set("roomId", roomId);
     if (authValue.type === "secret") {
       url2.searchParams.set("tok", authValue.token.raw);
@@ -10244,6 +10274,9 @@ function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill) {
       return assertNever(authValue, "Unhandled case");
     }
     url2.searchParams.set("version", PKG_VERSION || "dev");
+    if (engine !== void 0) {
+      url2.searchParams.set("e", String(engine));
+    }
     return new ws(url2.toString());
   };
 }
@@ -10363,7 +10396,8 @@ function createClient(options) {
           createSocket: makeCreateSocketDelegateForRoom(
             roomId,
             baseUrl,
-            _optionalChain([clientOptions, 'access', _224 => _224.polyfills, 'optionalAccess', _225 => _225.WebSocket])
+            _optionalChain([clientOptions, 'access', _224 => _224.polyfills, 'optionalAccess', _225 => _225.WebSocket]),
+            options2.engine
           ),
           authenticate: makeAuthDelegateForRoom(roomId, authManager)
         })),