@liveblocks/server 1.6.2 → 1.8.0-pre1

package/dist/index.cjs

@@ -165,7 +165,21 @@ var jsonObjectYolo = jsonYolo.refine(
 
 
 
+
+
+
+
+
+
 var intent = _decoders.oneOf.call(void 0, ["set", "push"]);
+var storageFileId = _decoders.sized.call(void 0, _decoders.startsWith.call(void 0, "fl_"), { size: 24 });
+var fileSize = _decoders.number.refine(
+  (value) => Number.isSafeInteger(value) && value >= 0,
+  "Must be a valid file size"
+);
+var liveTextVersion = _decoders.number.reject(
+  (value) => Number.isSafeInteger(value) && value >= 0 ? null : "Must be a non-negative safe integer"
+);
 var updateObjectOp = _decoders.object.call(void 0, {
   type: _decoders.constant.call(void 0, _core.OpCode.UPDATE_OBJECT),
   opId: _decoders.string,
@@ -210,6 +224,64 @@ var createRegisterOp = _decoders.object.call(void 0, {
   intent: _decoders.optional.call(void 0, intent),
   deletedId: _decoders.optional.call(void 0, _decoders.string)
 });
+var liveTextSegment = _decoders.either.call(void 0, 
+  _decoders.tuple.call(void 0, _decoders.string),
+  _decoders.tuple.call(void 0, _decoders.string, jsonObjectYolo)
+);
+var liveTextData = _decoders.array.call(void 0, liveTextSegment);
+var textOperation = _decoders.taggedUnion.call(void 0, "type", {
+  insert: _decoders.object.call(void 0, {
+    type: _decoders.constant.call(void 0, "insert"),
+    index: _decoders.number,
+    text: _decoders.string,
+    attributes: _decoders.optional.call(void 0, jsonObjectYolo)
+  }),
+  delete: _decoders.object.call(void 0, {
+    type: _decoders.constant.call(void 0, "delete"),
+    index: _decoders.number,
+    length: _decoders.number
+  }),
+  format: _decoders.object.call(void 0, {
+    type: _decoders.constant.call(void 0, "format"),
+    index: _decoders.number,
+    length: _decoders.number,
+    attributes: jsonObjectYolo
+  })
+});
+var createTextOp = _decoders.object.call(void 0, {
+  type: _decoders.constant.call(void 0, _core.OpCode.CREATE_TEXT),
+  opId: _decoders.string,
+  id: _decoders.string,
+  parentId: _decoders.string,
+  parentKey: _decoders.string,
+  data: liveTextData,
+  version: liveTextVersion,
+  intent: _decoders.optional.call(void 0, intent),
+  deletedId: _decoders.optional.call(void 0, _decoders.string)
+});
+var createFileOp = _decoders.object.call(void 0, {
+  type: _decoders.constant.call(void 0, _core.OpCode.CREATE_FILE),
+  opId: _decoders.string,
+  id: _decoders.string,
+  parentId: _decoders.string,
+  parentKey: _decoders.string,
+  data: _decoders.object.call(void 0, {
+    id: storageFileId,
+    name: _decoders.string,
+    size: fileSize,
+    mimeType: _decoders.string
+  }),
+  intent: _decoders.optional.call(void 0, intent),
+  deletedId: _decoders.optional.call(void 0, _decoders.string)
+});
+var updateTextOp = _decoders.object.call(void 0, {
+  type: _decoders.constant.call(void 0, _core.OpCode.UPDATE_TEXT),
+  opId: _decoders.string,
+  id: _decoders.string,
+  baseVersion: liveTextVersion,
+  version: _decoders.optional.call(void 0, liveTextVersion),
+  ops: _decoders.array.call(void 0, textOperation)
+});
 var deleteCrdtOp = _decoders.object.call(void 0, {
   type: _decoders.constant.call(void 0, _core.OpCode.DELETE_CRDT),
   opId: _decoders.string,
@@ -233,6 +305,9 @@ var op = _decoders.taggedUnion.call(void 0, "type", {
   [_core.OpCode.CREATE_LIST]: createListOp,
   [_core.OpCode.CREATE_MAP]: createMapOp,
   [_core.OpCode.CREATE_REGISTER]: createRegisterOp,
+  [_core.OpCode.CREATE_TEXT]: createTextOp,
+  [_core.OpCode.UPDATE_TEXT]: updateTextOp,
+  [_core.OpCode.CREATE_FILE]: createFileOp,
   [_core.OpCode.DELETE_CRDT]: deleteCrdtOp,
   [_core.OpCode.SET_PARENT_KEY]: setParentKeyOp,
   [_core.OpCode.DELETE_OBJECT_KEY]: deleteObjectKeyOp
@@ -372,6 +447,10 @@ function buildNode(snapshot2, id) {
     return buildList(snapshot2, id);
   } else if (node.type === _core.CrdtType.MAP) {
     return buildMap(snapshot2, id);
+  } else if (node.type === _core.CrdtType.TEXT) {
+    return node.data;
+  } else if (node.type === _core.CrdtType.FILE) {
+    return node.data;
   } else {
     return node.data;
   }
@@ -415,6 +494,10 @@ function* emit(snapshot2, id) {
     yield* emitMap(snapshot2, id);
   } else if (node.type === _core.CrdtType.REGISTER) {
     yield JSON.stringify(node.data);
+  } else if (node.type === _core.CrdtType.TEXT) {
+    yield JSON.stringify(node.data);
+  } else if (node.type === _core.CrdtType.FILE) {
+    yield JSON.stringify(node.data);
   }
 }
 function* emitObject(snapshot2, id, staticJson) {
@@ -486,6 +569,29 @@ function* iterJson(key, data, parent, state) {
       case "LiveMap":
         yield* iterMap(key, data.data, parent, state);
         return;
+      case "LiveText":
+        yield [
+          generateId(state),
+          {
+            type: _core.CrdtType.TEXT,
+            data: data.data,
+            version: _nullishCoalesce(data.version, () => ( 0)),
+            parentId: parent[0],
+            parentKey: key
+          }
+        ];
+        return;
+      case "LiveFile":
+        yield [
+          generateId(state),
+          {
+            type: _core.CrdtType.FILE,
+            data: data.data,
+            parentId: parent[0],
+            parentKey: key
+          }
+        ];
+        return;
       // istanbul ignore next
       default:
         _core.assertNever.call(void 0, data, "Unknown `liveblocksType` field");
@@ -570,6 +676,13 @@ function buildNode2(snapshot2, id) {
     return buildList2(snapshot2, id);
   } else if (node.type === _core.CrdtType.MAP) {
     return buildMap2(snapshot2, id);
+  } else if (node.type === _core.CrdtType.TEXT) {
+    return {
+      liveblocksType: "LiveText",
+      data: node.data
+    };
+  } else if (node.type === _core.CrdtType.FILE) {
+    return { liveblocksType: "LiveFile", data: node.data };
   } else {
     return _nullishCoalesce(node.data, () => ( null));
   }
@@ -616,6 +729,15 @@ function* emit2(snapshot2, id) {
     yield* emitMap2(snapshot2, id);
   } else if (node.type === _core.CrdtType.REGISTER) {
     yield JSON.stringify(_nullishCoalesce(node.data, () => ( null)));
+  } else if (node.type === _core.CrdtType.TEXT) {
+    yield JSON.stringify({
+      liveblocksType: "LiveText",
+      data: node.data
+    });
+  } else if (node.type === _core.CrdtType.FILE) {
+    yield '{"liveblocksType":"LiveFile","data":';
+    yield JSON.stringify(node.data);
+    yield "}";
   }
 }
 function* emitObject2(snapshot2, id, staticJson) {
@@ -1012,9 +1134,10 @@ function buildReverseLookup(nodes) {
         delete node.data[key];
       }
     }
-    if (node.type !== _core.CrdtType.REGISTER) {
+    const isLeafNode = node.type === _core.CrdtType.REGISTER || node.type === _core.CrdtType.FILE || node.type === _core.CrdtType.TEXT;
+    if (!isLeafNode) {
       queue.push(...revNodes.valuesAt(nodeId));
-    } else {
+    } else if (node.type === _core.CrdtType.REGISTER) {
       const parent = nodes.get(node.parentId);
       if (_optionalChain([parent, 'optionalAccess', _34 => _34.type]) === _core.CrdtType.OBJECT) {
         continue;
@@ -1035,7 +1158,6 @@ function hasStaticDataAt(node, key) {
   return node.type === _core.CrdtType.OBJECT && Object.prototype.hasOwnProperty.call(node.data, key) && node.data[key] !== void 0;
 }
 var InMemoryDriver = class {
-  // Key: `${feedId}:${messageId}`
   constructor(options) {
     __publicField(this, "_nextActor");
     __publicField(this, "_nodes");
@@ -1045,12 +1167,15 @@ var InMemoryDriver = class {
     __publicField(this, "_leasedSessions");
     __publicField(this, "_feeds");
     __publicField(this, "_feedMessages");
+    // Key: `${feedId}:${messageId}`
+    __publicField(this, "_liveTextHistory");
     this._nodes = /* @__PURE__ */ new Map();
     this._metadb = /* @__PURE__ */ new Map();
     this._ydb = /* @__PURE__ */ new Map();
     this._leasedSessions = /* @__PURE__ */ new Map();
     this._feeds = /* @__PURE__ */ new Map();
     this._feedMessages = /* @__PURE__ */ new Map();
+    this._liveTextHistory = /* @__PURE__ */ new Map();
     this._nextActor = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _35 => _35.initialActor]), () => ( -1));
     for (const [key, value] of _nullishCoalesce(_optionalChain([options, 'optionalAccess', _36 => _36.initialNodes]), () => ( []))) {
       this._nodes.set(key, value);
@@ -1066,10 +1191,40 @@ var InMemoryDriver = class {
   DANGEROUSLY_reset_nodes(doc) {
     this.reinitialize();
     this._nodes.clear();
+    this._liveTextHistory.clear();
     for (const [id, node] of plainLsonToNodeStream(doc)) {
       this._nodes.set(id, node);
     }
   }
+  get_live_text_history_since(nodeId, version) {
+    return (_nullishCoalesce(this._liveTextHistory.get(nodeId), () => ( []))).filter((entry) => entry.version > version).sort((left, right) => left.version - right.version).map((entry) => ({ ...entry, ops: [...entry.ops] }));
+  }
+  get_live_text_history_by_op_id(nodeId, opId) {
+    const entry = (_nullishCoalesce(this._liveTextHistory.get(nodeId), () => ( []))).find(
+      (item) => item.opId === opId
+    );
+    return entry === void 0 ? void 0 : { ...entry, ops: [...entry.ops] };
+  }
+  append_live_text_history(entry) {
+    const history = _nullishCoalesce(this._liveTextHistory.get(entry.nodeId), () => ( []));
+    history.push({ ...entry, ops: [...entry.ops] });
+    history.sort((left, right) => left.version - right.version);
+    this._liveTextHistory.set(entry.nodeId, history);
+  }
+  purge_live_text_history_before(nodeId, minVersionToKeep) {
+    const history = this._liveTextHistory.get(nodeId);
+    if (history === void 0) {
+      return;
+    }
+    const retained = history.filter(
+      (entry) => entry.version >= minVersionToKeep
+    );
+    if (retained.length === 0) {
+      this._liveTextHistory.delete(nodeId);
+    } else {
+      this._liveTextHistory.set(nodeId, retained);
+    }
+  }
   get_meta(key) {
     return this._metadb.get(key);
   }
@@ -1345,6 +1500,7 @@ var InMemoryDriver = class {
   }
   _loadNodesApi() {
     const nodes = this._nodes;
+    const liveTextHistory = this._liveTextHistory;
     if (!nodes.has("root")) {
       nodes.set("root", { type: _core.CrdtType.OBJECT, data: {} });
     }
@@ -1377,6 +1533,9 @@ var InMemoryDriver = class {
       if (node.type === _core.CrdtType.REGISTER && parentNode.type === _core.CrdtType.OBJECT) {
         throw new Error("Cannot add register under object");
       }
+      if (parentNode.type === _core.CrdtType.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);
@@ -1432,6 +1591,7 @@ var InMemoryDriver = class {
         const currid = queue.pop();
         queue.push(...revNodes.valuesAt(currid));
         nodes.delete(currid);
+        liveTextHistory.delete(currid);
         revNodes.deleteAll(currid);
       }
     }
@@ -1557,18 +1717,21 @@ function makeNewInMemoryDriver(options) {
 
 
 
+
+
+var LIVE_TEXT_HISTORY_LIMIT = 1e3;
+var LIVE_TEXT_HISTORY_TOO_OLD_REASON = "LiveText operation is older than retained history";
 function accept(op2, fix) {
   return { action: "accepted", op: op2, fix };
 }
 function ignore(ignoredOp) {
   return { action: "ignored", ignoredOpId: ignoredOp.opId };
 }
-function rectify(op2, parentKey) {
-  return {
-    action: "rectified",
-    ackOp: { ...op2, parentKey },
-    fix: { type: _core.OpCode.SET_PARENT_KEY, id: op2.id, parentKey }
-  };
+function reject(op2, reason) {
+  return { action: "rejected", opIds: [op2.opId], reason };
+}
+function rectify(ackOp, fix) {
+  return { action: "rectified", ackOp, fix };
 }
 function nodeFromCreateChildOp(op2) {
   switch (op2.type) {
@@ -1598,6 +1761,21 @@ function nodeFromCreateChildOp(op2) {
         parentKey: op2.parentKey,
         data: op2.data
       };
+    case _core.OpCode.CREATE_TEXT:
+      return {
+        type: _core.CrdtType.TEXT,
+        parentId: op2.parentId,
+        parentKey: op2.parentKey,
+        data: op2.data,
+        version: op2.version
+      };
+    case _core.OpCode.CREATE_FILE:
+      return {
+        type: _core.CrdtType.FILE,
+        parentId: op2.parentId,
+        parentKey: op2.parentKey,
+        data: op2.data
+      };
     // istanbul ignore next
     default:
       return _core.assertNever.call(void 0, op2, "Unknown op code");
@@ -1639,9 +1817,13 @@ var Storage = class {
       case _core.OpCode.CREATE_MAP:
       case _core.OpCode.CREATE_REGISTER:
       case _core.OpCode.CREATE_OBJECT:
+      case _core.OpCode.CREATE_TEXT:
+      case _core.OpCode.CREATE_FILE:
         return this.applyCreateOp(op2);
       case _core.OpCode.UPDATE_OBJECT:
         return this.applyUpdateObjectOp(op2);
+      case _core.OpCode.UPDATE_TEXT:
+        return this.applyUpdateTextOp(op2);
       case _core.OpCode.SET_PARENT_KEY:
         return this.applySetParentKeyOp(op2);
       case _core.OpCode.DELETE_OBJECT_KEY:
@@ -1662,7 +1844,14 @@ var Storage = class {
       if (op2.intent === "push") {
         const stored = this.driver.get_node(op2.id);
         if (_optionalChain([stored, 'optionalAccess', _47 => _47.parentId]) !== void 0 && _optionalChain([this, 'access', _48 => _48.driver, 'access', _49 => _49.get_node, 'call', _50 => _50(stored.parentId), 'optionalAccess', _51 => _51.type]) === _core.CrdtType.LIST) {
-          return rectify(op2, stored.parentKey);
+          return rectify(
+            { ...op2, parentKey: stored.parentKey },
+            {
+              type: _core.OpCode.SET_PARENT_KEY,
+              id: op2.id,
+              parentKey: stored.parentKey
+            }
+          );
         }
       }
       return ignore(op2);
@@ -1684,6 +1873,8 @@ var Storage = class {
       case _core.CrdtType.LIST:
         return this.createChildAsListItem(op2, node);
       case _core.CrdtType.REGISTER:
+      case _core.CrdtType.TEXT:
+      case _core.CrdtType.FILE:
         return ignore(op2);
       // istanbul ignore next
       default:
@@ -1740,6 +1931,59 @@ var Storage = class {
     this.driver.set_object_data(op2.id, op2.data, true);
     return accept(op2);
   }
+  applyUpdateTextOp(op2) {
+    const node = this.driver.get_node(op2.id);
+    if (_optionalChain([node, 'optionalAccess', _56 => _56.type]) !== _core.CrdtType.TEXT) {
+      return ignore(op2);
+    }
+    const duplicate = this.driver.get_live_text_history_by_op_id(
+      op2.id,
+      op2.opId
+    );
+    if (duplicate !== void 0) {
+      return rectify({
+        ...op2,
+        baseVersion: duplicate.baseVersion,
+        version: duplicate.version,
+        ops: [...duplicate.ops]
+      });
+    }
+    if (op2.ops.length === 0) {
+      return ignore(op2);
+    }
+    if (op2.baseVersion > node.version) {
+      return reject(op2, "LiveText operation base version is ahead of storage");
+    }
+    const history = op2.baseVersion < node.version ? this.driver.get_live_text_history_since(op2.id, op2.baseVersion) : [];
+    if (op2.baseVersion < node.version && history.length !== node.version - op2.baseVersion) {
+      return reject(op2, LIVE_TEXT_HISTORY_TOO_OLD_REASON);
+    }
+    const acceptedOps = history.flatMap((entry) => entry.ops);
+    const ops = acceptedOps.length > 0 ? _core.transformTextOperations.call(void 0, op2.ops, acceptedOps, "after") : op2.ops;
+    const version = node.version + 1;
+    const data = _core.applyLiveTextOperations.call(void 0, node.data, ops);
+    this.driver.set_child(
+      op2.id,
+      {
+        ...node,
+        data,
+        version
+      },
+      true
+    );
+    this.driver.append_live_text_history({
+      nodeId: op2.id,
+      baseVersion: node.version,
+      version,
+      opId: op2.opId,
+      ops: [...ops]
+    });
+    this.driver.purge_live_text_history_before(
+      op2.id,
+      Math.max(0, version - LIVE_TEXT_HISTORY_LIMIT + 1)
+    );
+    return accept({ ...op2, baseVersion: node.version, version, ops: [...ops] });
+  }
   applyDeleteCrdtOp(op2) {
     this.driver.delete_node(op2.id);
     return accept(op2);
@@ -1811,10 +2055,10 @@ var Storage = class {
    */
   moveToPosInList(id, targetKey) {
     const node = this.driver.get_node(id);
-    if (_optionalChain([node, 'optionalAccess', _56 => _56.parentId]) === void 0) {
+    if (_optionalChain([node, 'optionalAccess', _57 => _57.parentId]) === void 0) {
       return;
     }
-    if (_optionalChain([this, 'access', _57 => _57.driver, 'access', _58 => _58.get_node, 'call', _59 => _59(node.parentId), 'optionalAccess', _60 => _60.type]) !== _core.CrdtType.LIST) {
+    if (_optionalChain([this, 'access', _58 => _58.driver, 'access', _59 => _59.get_node, 'call', _60 => _60(node.parentId), 'optionalAccess', _61 => _61.type]) !== _core.CrdtType.LIST) {
       return;
     }
     if (node.parentKey === targetKey) {
@@ -2225,13 +2469,13 @@ var BrowserSession = class {
     this.publicMeta = ticket.publicMeta;
     __privateSet(this, __socket, socket);
     __privateSet(this, __debug, debug);
-    const now = _nullishCoalesce(_optionalChain([createdAt, 'optionalAccess', _61 => _61.getTime, 'call', _62 => _62()]), () => ( Date.now()));
+    const now = _nullishCoalesce(_optionalChain([createdAt, 'optionalAccess', _62 => _62.getTime, 'call', _63 => _63()]), () => ( Date.now()));
     this.createdAt = now;
     __privateSet(this, __lastActiveAt, now);
     __privateSet(this, __hasNotifiedClientStorageUpdateError, false);
   }
   get lastActiveAt() {
-    const lastPing = _optionalChain([__privateGet, 'call', _63 => _63(this, __socket), 'access', _64 => _64.getLastPongTimestamp, 'optionalCall', _65 => _65()]);
+    const lastPing = _optionalChain([__privateGet, 'call', _64 => _64(this, __socket), 'access', _65 => _65.getLastPongTimestamp, 'optionalCall', _66 => _66()]);
     if (lastPing && lastPing.getTime() > __privateGet(this, __lastActiveAt)) {
       return lastPing.getTime();
     } else {
@@ -2332,25 +2576,25 @@ var Room = class {
     __publicField(this, "sessions", new UniqueMap((s) => s.actor));
     __publicField(this, "hooks");
     __privateAdd(this, __debug2);
-    const driver = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _66 => _66.storage]), () => ( makeNewInMemoryDriver()));
+    const driver = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _67 => _67.storage]), () => ( makeNewInMemoryDriver()));
     this.meta = meta;
     this.driver = driver;
     this._storage = new Storage(this.driver);
     this._yjsStorage = new YjsStorage(this.driver);
-    __privateSet(this, _logger, _nullishCoalesce(_optionalChain([options, 'optionalAccess', _67 => _67.logger]), () => ( BLACK_HOLE)));
+    __privateSet(this, _logger, _nullishCoalesce(_optionalChain([options, 'optionalAccess', _68 => _68.logger]), () => ( BLACK_HOLE)));
     this.hooks = {
-      isClientMsgAllowed: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _68 => _68.hooks, 'optionalAccess', _69 => _69.isClientMsgAllowed]), () => ( (() => {
+      isClientMsgAllowed: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _69 => _69.hooks, 'optionalAccess', _70 => _70.isClientMsgAllowed]), () => ( (() => {
         return {
           allowed: true
         };
       }))),
-      onRoomWillUnload: _optionalChain([options, 'optionalAccess', _70 => _70.hooks, 'optionalAccess', _71 => _71.onRoomWillUnload]),
-      onSessionDidStart: _optionalChain([options, 'optionalAccess', _72 => _72.hooks, 'optionalAccess', _73 => _73.onSessionDidStart]),
-      onSessionDidEnd: _optionalChain([options, 'optionalAccess', _74 => _74.hooks, 'optionalAccess', _75 => _75.onSessionDidEnd]),
-      postClientMsgStorageDidUpdate: _optionalChain([options, 'optionalAccess', _76 => _76.hooks, 'optionalAccess', _77 => _77.postClientMsgStorageDidUpdate]),
-      postClientMsgYdocDidUpdate: _optionalChain([options, 'optionalAccess', _78 => _78.hooks, 'optionalAccess', _79 => _79.postClientMsgYdocDidUpdate])
+      onRoomWillUnload: _optionalChain([options, 'optionalAccess', _71 => _71.hooks, 'optionalAccess', _72 => _72.onRoomWillUnload]),
+      onSessionDidStart: _optionalChain([options, 'optionalAccess', _73 => _73.hooks, 'optionalAccess', _74 => _74.onSessionDidStart]),
+      onSessionDidEnd: _optionalChain([options, 'optionalAccess', _75 => _75.hooks, 'optionalAccess', _76 => _76.onSessionDidEnd]),
+      postClientMsgStorageDidUpdate: _optionalChain([options, 'optionalAccess', _77 => _77.hooks, 'optionalAccess', _78 => _78.postClientMsgStorageDidUpdate]),
+      postClientMsgYdocDidUpdate: _optionalChain([options, 'optionalAccess', _79 => _79.hooks, 'optionalAccess', _80 => _80.postClientMsgYdocDidUpdate])
     };
-    __privateSet(this, __debug2, _nullishCoalesce(_optionalChain([options, 'optionalAccess', _80 => _80.enableDebugLogging]), () => ( false)));
+    __privateSet(this, __debug2, _nullishCoalesce(_optionalChain([options, 'optionalAccess', _81 => _81.enableDebugLogging]), () => ( false)));
   }
   get storage() {
     return this._storage;
@@ -2396,7 +2640,7 @@ var Room = class {
    * is used, fresh instances will lazily be created.
    */
   unload(ctx) {
-    _optionalChain([this, 'access', _81 => _81.hooks, 'access', _82 => _82.onRoomWillUnload, 'optionalCall', _83 => _83(ctx)]);
+    _optionalChain([this, 'access', _82 => _82.hooks, 'access', _83 => _83.onRoomWillUnload, 'optionalCall', _84 => _84(ctx)]);
     this.driver.reinitialize();
     this._storage = new Storage(this.driver);
     this._yjsStorage = new YjsStorage(this.driver);
@@ -2413,17 +2657,17 @@ var Room = class {
    * unused Ticket will simply get garbage collected.
    */
   createTicket(options) {
-    const actor = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _84 => _84.actor]), () => ( this.getNextActor()));
+    const actor = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _85 => _85.actor]), () => ( this.getNextActor()));
     const sessionKey = _nanoid.nanoid.call(void 0, );
-    const info = _optionalChain([options, 'optionalAccess', _85 => _85.info]);
+    const info = _optionalChain([options, 'optionalAccess', _86 => _86.info]);
     const ticket = {
-      version: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _86 => _86.version]), () => ( HIGHEST_PROTOCOL_VERSION)),
+      version: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _87 => _87.version]), () => ( HIGHEST_PROTOCOL_VERSION)),
       actor,
       sessionKey,
-      meta: _optionalChain([options, 'optionalAccess', _87 => _87.meta]),
-      publicMeta: _optionalChain([options, 'optionalAccess', _88 => _88.publicMeta]),
-      user: _optionalChain([options, 'optionalAccess', _89 => _89.id]) ? { id: options.id, info } : { anonymousId: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _90 => _90.anonymousId]), () => ( _nanoid.nanoid.call(void 0, ))), info },
-      scopes: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _91 => _91.scopes]), () => ( ["room:write"]))
+      meta: _optionalChain([options, 'optionalAccess', _88 => _88.meta]),
+      publicMeta: _optionalChain([options, 'optionalAccess', _89 => _89.publicMeta]),
+      user: _optionalChain([options, 'optionalAccess', _90 => _90.id]) ? { id: options.id, info } : { anonymousId: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _91 => _91.anonymousId]), () => ( _nanoid.nanoid.call(void 0, ))), info },
+      scopes: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _92 => _92.scopes]), () => ( ["room:write"]))
     };
     if (__privateGet(this, __debug2)) {
       console.log(`new ticket created: ${JSON.stringify(ticket)}`);
@@ -2554,7 +2798,7 @@ var Room = class {
       ctx,
       defer
     );
-    const p$ = _optionalChain([this, 'access', _92 => _92.hooks, 'access', _93 => _93.onSessionDidStart, 'optionalCall', _94 => _94(newSession, ctx)]);
+    const p$ = _optionalChain([this, 'access', _93 => _93.hooks, 'access', _94 => _94.onSessionDidStart, 'optionalCall', _95 => _95(newSession, ctx)]);
     if (p$) defer(p$);
   }
   /**
@@ -2578,7 +2822,7 @@ var Room = class {
       for (const other of this.otherSessions(key)) {
         other.send({ type: ServerMsgCode2.USER_LEFT, actor: session.actor });
       }
-      const p$ = _optionalChain([this, 'access', _95 => _95.hooks, 'access', _96 => _96.onSessionDidEnd, 'optionalCall', _97 => _97(session, ctx)]);
+      const p$ = _optionalChain([this, 'access', _96 => _96.hooks, 'access', _97 => _97.onSessionDidEnd, 'optionalCall', _98 => _98(session, ctx)]);
       if (p$) defer(p$);
     }
   }
@@ -2609,7 +2853,7 @@ var Room = class {
     );
   }) {
     const text = typeof data === "string" ? data : _core.raise.call(void 0, "Unsupported message format");
-    _optionalChain([this, 'access', _98 => _98.sessions, 'access', _99 => _99.get, 'call', _100 => _100(key), 'optionalAccess', _101 => _101.markActive, 'call', _102 => _102()]);
+    _optionalChain([this, 'access', _99 => _99.sessions, 'access', _100 => _100.get, 'call', _101 => _101(key), 'optionalAccess', _102 => _102.markActive, 'call', _103 => _103()]);
     if (text === "ping") {
       await this.handlePing(key, ctx);
     } else {
@@ -2986,7 +3230,7 @@ var Room = class {
     }
     const sent = session.sendPong();
     if (sent !== 0) {
-      await _optionalChain([this, 'access', _103 => _103.hooks, 'access', _104 => _104.onDidPong, 'optionalCall', _105 => _105(ctx)]);
+      await _optionalChain([this, 'access', _104 => _104.hooks, 'access', _105 => _105.onDidPong, 'optionalCall', _106 => _106(ctx)]);
     }
   }
   _processClientMsg_withExclusiveAccess(sessionKey, messages, ctx, defer) {
@@ -3117,7 +3361,7 @@ var Room = class {
         break;
       }
       case _core.ClientMsgCode.UPDATE_STORAGE: {
-        _optionalChain([this, 'access', _106 => _106.driver, 'access', _107 => _107.bump_storage_version, 'optionalCall', _108 => _108()]);
+        _optionalChain([this, 'access', _107 => _107.driver, 'access', _108 => _108.bump_storage_version, 'optionalCall', _109 => _109()]);
         const result = this.storage.applyOps(msg.ops);
         const opsToForward = result.flatMap(
           (r) => r.action === "accepted" ? [r.op] : []
@@ -3128,9 +3372,11 @@ var Room = class {
               case "ignored":
                 return r.ignoredOpId !== void 0 ? [ackIgnoredOp(r.ignoredOpId)] : [];
               case "rectified":
-                return [r.ackOp, r.fix];
+                return r.fix !== void 0 ? [r.ackOp, r.fix] : [r.ackOp];
               case "accepted":
                 return r.fix !== void 0 ? [r.fix] : [];
+              case "rejected":
+                return [];
               // istanbul ignore next
               default:
                 return _core.assertNever.call(void 0, r, "Unhandled case");
@@ -3153,8 +3399,15 @@ var Room = class {
             ops: opsToSendBack
           });
         }
+        for (const rejected of result.filter((r) => r.action === "rejected")) {
+          replyImmediately({
+            type: ServerMsgCode2.REJECT_STORAGE_OP,
+            opIds: rejected.opIds,
+            reason: rejected.reason
+          });
+        }
         if (opsToForward.length > 0) {
-          const p$ = _optionalChain([this, 'access', _109 => _109.hooks, 'access', _110 => _110.postClientMsgStorageDidUpdate, 'optionalCall', _111 => _111(ctx, session)]);
+          const p$ = _optionalChain([this, 'access', _110 => _110.hooks, 'access', _111 => _111.postClientMsgStorageDidUpdate, 'optionalCall', _112 => _112(ctx, session)]);
           if (p$) defer(p$);
         }
         break;
@@ -3211,7 +3464,7 @@ var Room = class {
           defer
         );
         if (result.isUpdated) {
-          const p$ = _optionalChain([this, 'access', _112 => _112.hooks, 'access', _113 => _113.postClientMsgYdocDidUpdate, 'optionalCall', _114 => _114(ctx, session)]);
+          const p$ = _optionalChain([this, 'access', _113 => _113.hooks, 'access', _114 => _114.postClientMsgYdocDidUpdate, 'optionalCall', _115 => _115(ctx, session)]);
           if (p$) defer(p$);
         }
         break;