@liveblocks/server 1.6.2 → 1.7.0

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { Json, asPos, IUserInfo, SerializedCrdt, JsonObject, DistributiveOmit, SetParentKeyOp, DeleteCrdtOp, ClientMsg as ClientMsg$1, Brand, SerializedRootObject, SerializedChild, StorageNode, CompactNode, PlainLsonObject, NodeMap as NodeMap$1, NodeStream as NodeStream$1, ClientWireOp, CreateOp, HasOpId, ServerMsg as ServerMsg$1, BaseUserMeta, IgnoredOp } from '@liveblocks/core';
-export { BroadcastEventClientMsg, ClientMsg, ClientWireOp, CreateListOp, CreateMapOp, CreateObjectOp, CreateOp, CreateRegisterOp, DeleteCrdtOp, DeleteObjectKeyOp, FetchStorageClientMsg, FetchYDocClientMsg, HasOpId, IgnoredOp, Op, RoomStateServerMsg, ServerMsg, ServerWireOp, SetParentKeyOp, UpdateObjectOp, UpdatePresenceClientMsg, UpdateStorageClientMsg, UpdateYDocClientMsg } from '@liveblocks/core';
+export { BroadcastEventClientMsg, ClientMsg, ClientWireOp, CreateFileOp, CreateListOp, CreateMapOp, CreateObjectOp, CreateOp, CreateRegisterOp, DeleteCrdtOp, DeleteObjectKeyOp, FetchStorageClientMsg, FetchYDocClientMsg, HasOpId, IgnoredOp, Op, RoomStateServerMsg, ServerMsg, ServerWireOp, SetParentKeyOp, UpdateObjectOp, UpdatePresenceClientMsg, UpdateStorageClientMsg, UpdateYDocClientMsg } from '@liveblocks/core';
 import * as decoders from 'decoders';
 import { Decoder } from 'decoders';
 import { Mutex } from 'async-mutex';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Json, asPos, IUserInfo, SerializedCrdt, JsonObject, DistributiveOmit, SetParentKeyOp, DeleteCrdtOp, ClientMsg as ClientMsg$1, Brand, SerializedRootObject, SerializedChild, StorageNode, CompactNode, PlainLsonObject, NodeMap as NodeMap$1, NodeStream as NodeStream$1, ClientWireOp, CreateOp, HasOpId, ServerMsg as ServerMsg$1, BaseUserMeta, IgnoredOp } from '@liveblocks/core';
-export { BroadcastEventClientMsg, ClientMsg, ClientWireOp, CreateListOp, CreateMapOp, CreateObjectOp, CreateOp, CreateRegisterOp, DeleteCrdtOp, DeleteObjectKeyOp, FetchStorageClientMsg, FetchYDocClientMsg, HasOpId, IgnoredOp, Op, RoomStateServerMsg, ServerMsg, ServerWireOp, SetParentKeyOp, UpdateObjectOp, UpdatePresenceClientMsg, UpdateStorageClientMsg, UpdateYDocClientMsg } from '@liveblocks/core';
+export { BroadcastEventClientMsg, ClientMsg, ClientWireOp, CreateFileOp, CreateListOp, CreateMapOp, CreateObjectOp, CreateOp, CreateRegisterOp, DeleteCrdtOp, DeleteObjectKeyOp, FetchStorageClientMsg, FetchYDocClientMsg, HasOpId, IgnoredOp, Op, RoomStateServerMsg, ServerMsg, ServerWireOp, SetParentKeyOp, UpdateObjectOp, UpdatePresenceClientMsg, UpdateStorageClientMsg, UpdateYDocClientMsg } from '@liveblocks/core';
 import * as decoders from 'decoders';
 import { Decoder } from 'decoders';
 import { Mutex } from 'async-mutex';

package/dist/index.js

@@ -17,7 +17,7 @@ import {
   constant as constant2,
   jsonObject,
   nonEmptyString,
-  number,
+  number as number2,
   object as object2,
   optional as optional3,
   string as string3,
@@ -159,13 +159,21 @@ var jsonObjectYolo = jsonYolo.refine(
 import { OpCode } from "@liveblocks/core";
 import {
   constant,
+  number,
   object,
   oneOf,
   optional as optional2,
+  sized as sized2,
+  startsWith,
   string as string2,
   taggedUnion
 } from "decoders";
 var intent = oneOf(["set", "push"]);
+var storageFileId = sized2(startsWith("fl_"), { size: 24 });
+var fileSize = number.refine(
+  (value) => Number.isSafeInteger(value) && value >= 0,
+  "Must be a valid file size"
+);
 var updateObjectOp = object({
   type: constant(OpCode.UPDATE_OBJECT),
   opId: string2,
@@ -210,6 +218,21 @@ var createRegisterOp = object({
   intent: optional2(intent),
   deletedId: optional2(string2)
 });
+var createFileOp = object({
+  type: constant(OpCode.CREATE_FILE),
+  opId: string2,
+  id: string2,
+  parentId: string2,
+  parentKey: string2,
+  data: object({
+    id: storageFileId,
+    name: string2,
+    size: fileSize,
+    mimeType: string2
+  }),
+  intent: optional2(intent),
+  deletedId: optional2(string2)
+});
 var deleteCrdtOp = object({
   type: constant(OpCode.DELETE_CRDT),
   opId: string2,
@@ -233,6 +256,7 @@ var op = taggedUnion("type", {
   [OpCode.CREATE_LIST]: createListOp,
   [OpCode.CREATE_MAP]: createMapOp,
   [OpCode.CREATE_REGISTER]: createRegisterOp,
+  [OpCode.CREATE_FILE]: createFileOp,
   [OpCode.DELETE_CRDT]: deleteCrdtOp,
   [OpCode.SET_PARENT_KEY]: setParentKeyOp,
   [OpCode.DELETE_OBJECT_KEY]: deleteObjectKeyOp
@@ -247,7 +271,7 @@ var ROOT_YDOC_ID = "root";
 var updatePresenceClientMsg = object2({
   type: constant2(ClientMsgCode.UPDATE_PRESENCE),
   data: jsonObjectYolo,
-  targetActor: optional3(number)
+  targetActor: optional3(number2)
 });
 var broadcastEventClientMsg = object2({
   type: constant2(ClientMsgCode.BROADCAST_EVENT),
@@ -278,8 +302,8 @@ var fetchFeedsClientMsg = object2({
   type: constant2(FeedMsgCode.FETCH_FEEDS),
   requestId: string3,
   cursor: optional3(string3),
-  since: optional3(number),
-  limit: optional3(number),
+  since: optional3(number2),
+  limit: optional3(number2),
   metadata: fetchFeedsMetadataFilterDecoder
 });
 var fetchFeedMessagesClientMsg = object2({
@@ -287,14 +311,14 @@ var fetchFeedMessagesClientMsg = object2({
   requestId: string3,
   feedId: nonEmptyString,
   cursor: optional3(string3),
-  since: optional3(number),
-  limit: optional3(number)
+  since: optional3(number2),
+  limit: optional3(number2)
 });
 var addFeedClientMsg = object2({
   type: constant2(FeedMsgCode.ADD_FEED),
   feedId: string3,
   metadata: optionalFeedMetadataDecoder,
-  timestamp: optional3(number),
+  timestamp: optional3(number2),
   requestId: optional3(string3)
 });
 var updateFeedClientMsg = object2({
@@ -313,7 +337,7 @@ var addFeedMessageClientMsg = object2({
   feedId: string3,
   data: jsonObject,
   id: optional3(string3),
-  timestamp: optional3(number),
+  timestamp: optional3(number2),
   requestId: optional3(string3)
 });
 var updateFeedMessageClientMsg = object2({
@@ -321,7 +345,7 @@ var updateFeedMessageClientMsg = object2({
   feedId: string3,
   messageId: string3,
   data: jsonObject,
-  timestamp: optional3(number),
+  timestamp: optional3(number2),
   requestId: optional3(string3)
 });
 var deleteFeedMessageClientMsg = object2({
@@ -372,6 +396,8 @@ function buildNode(snapshot2, id) {
     return buildList(snapshot2, id);
   } else if (node.type === CrdtType.MAP) {
     return buildMap(snapshot2, id);
+  } else if (node.type === CrdtType.FILE) {
+    return node.data;
   } else {
     return node.data;
   }
@@ -415,6 +441,8 @@ function* emit(snapshot2, id) {
     yield* emitMap(snapshot2, id);
   } else if (node.type === CrdtType.REGISTER) {
     yield JSON.stringify(node.data);
+  } else if (node.type === CrdtType.FILE) {
+    yield JSON.stringify(node.data);
   }
 }
 function* emitObject(snapshot2, id, staticJson) {
@@ -486,6 +514,17 @@ function* iterJson(key, data, parent, state) {
       case "LiveMap":
         yield* iterMap(key, data.data, parent, state);
         return;
+      case "LiveFile":
+        yield [
+          generateId(state),
+          {
+            type: CrdtType2.FILE,
+            data: data.data,
+            parentId: parent[0],
+            parentKey: key
+          }
+        ];
+        return;
       // istanbul ignore next
       default:
         assertNever(data, "Unknown `liveblocksType` field");
@@ -570,6 +609,8 @@ function buildNode2(snapshot2, id) {
     return buildList2(snapshot2, id);
   } else if (node.type === CrdtType2.MAP) {
     return buildMap2(snapshot2, id);
+  } else if (node.type === CrdtType2.FILE) {
+    return { liveblocksType: "LiveFile", data: node.data };
   } else {
     return node.data ?? null;
   }
@@ -616,6 +657,10 @@ function* emit2(snapshot2, id) {
     yield* emitMap2(snapshot2, id);
   } else if (node.type === CrdtType2.REGISTER) {
     yield JSON.stringify(node.data ?? null);
+  } else if (node.type === CrdtType2.FILE) {
+    yield '{"liveblocksType":"LiveFile","data":';
+    yield JSON.stringify(node.data);
+    yield "}";
   }
 }
 function* emitObject2(snapshot2, id, staticJson) {
@@ -1012,9 +1057,10 @@ function buildReverseLookup(nodes) {
         delete node.data[key];
       }
     }
-    if (node.type !== CrdtType4.REGISTER) {
+    const isLeafNode = node.type === CrdtType4.REGISTER || node.type === CrdtType4.FILE;
+    if (!isLeafNode) {
       queue.push(...revNodes.valuesAt(nodeId));
-    } else {
+    } else if (node.type === CrdtType4.REGISTER) {
       const parent = nodes.get(node.parentId);
       if (parent?.type === CrdtType4.OBJECT) {
         continue;
@@ -1377,6 +1423,9 @@ var InMemoryDriver = class {
       if (node.type === CrdtType4.REGISTER && parentNode.type === CrdtType4.OBJECT) {
         throw new Error("Cannot add register under object");
       }
+      if (parentNode.type === CrdtType4.FILE) {
+        throw new Error("Cannot add child under file");
+      }
       const conflictingSiblingId = revNodes.get(node.parentId, node.parentKey);
       if (conflictingSiblingId !== id) {
         const parentNode2 = nodes.get(node.parentId);
@@ -1598,6 +1647,13 @@ function nodeFromCreateChildOp(op2) {
         parentKey: op2.parentKey,
         data: op2.data
       };
+    case OpCode2.CREATE_FILE:
+      return {
+        type: CrdtType5.FILE,
+        parentId: op2.parentId,
+        parentKey: op2.parentKey,
+        data: op2.data
+      };
     // istanbul ignore next
     default:
       return assertNever2(op2, "Unknown op code");
@@ -1639,6 +1695,7 @@ var Storage = class {
       case OpCode2.CREATE_MAP:
       case OpCode2.CREATE_REGISTER:
       case OpCode2.CREATE_OBJECT:
+      case OpCode2.CREATE_FILE:
         return this.applyCreateOp(op2);
       case OpCode2.UPDATE_OBJECT:
         return this.applyUpdateObjectOp(op2);
@@ -1684,6 +1741,7 @@ var Storage = class {
       case CrdtType5.LIST:
         return this.createChildAsListItem(op2, node);
       case CrdtType5.REGISTER:
+      case CrdtType5.FILE:
         return ignore(op2);
       // istanbul ignore next
       default: