@dao42/d42paas-front 0.6.4 → 0.6.5

package/dist/DaoPaaS.es.js

@@ -14713,20 +14713,29 @@ const daopaasDB = openDB("daopaas", 1, {
 });
 async function setReplaySource(val) {
   const {
-    CRDTInfo,
+    CRDTInfo: CRDTInfo2,
     appStatus,
     globalData
   } = oTStore.getState();
   if (appStatus === "replay")
     return;
+  if (val.event === "editor") {
+    val.editor.revision++;
+  }
   return (await daopaasDB).put("crdts", __spreadProps(__spreadValues({}, val), {
     userInfo: lodash$2.exports.pick(val.userInfo, ["uuid", "role"]),
     file: lodash$2.exports.omit(val.file, "value")
   }), val.timestamp + "." + v4$1().split("-")[0]);
 }
+async function getLocalFile(key) {
+  return (await daopaasDB).get("files", key);
+}
 async function getLocalReplayFile(key) {
   return (await daopaasDB).get("replayFiles", key);
 }
+async function getAllLocalReplayFile() {
+  return (await daopaasDB).getAll("replayFiles");
+}
 async function setLocalFile(key, val) {
   return (await daopaasDB).put("files", val, key);
 }
@@ -28355,7 +28364,7 @@ const PlaygroundInit = (arg) => {
     playgroundId,
     io
   } = arg;
-  reactDom.exports.unstable_batchedUpdates(() => {
+  reactDom.exports.unstable_batchedUpdates(async () => {
     const setUserInfo = userStore.getState().setUserInfo;
     const setUserList = userListStore.getState().setUserList;
     const {
@@ -28379,6 +28388,12 @@ const PlaygroundInit = (arg) => {
       setGlobalData
     } = oTStore.getState();
     shadowUserStore.getState();
+    const allFiles = await getAllLocalReplayFile();
+    allFiles.forEach((f2) => {
+      setLocalReplayFile(f2.path, __spreadProps(__spreadValues({}, f2), {
+        revision: 0
+      }));
+    });
     window.clearCache = () => {
       localStorage.clear();
       indexedDB.deleteDatabase("daopaas").onsuccess = () => {
@@ -28436,13 +28451,15 @@ const PlaygroundInit = (arg) => {
       setCRDTInfo2(crdt);
       const otPlaygroundInfo = oTStore.getState().playgroundInfo;
       setPlaygroundInfo(__spreadProps(__spreadValues(__spreadValues({}, playgroundInfo), otPlaygroundInfo), {
-        activeDockerId: dockerInfo2.dockerId
+        activeDockerId: dockerInfo2 == null ? void 0 : dockerInfo2.dockerId
       }));
-      (_a2 = otPlaygroundInfo == null ? void 0 : otPlaygroundInfo.dockerInfos) == null ? void 0 : _a2.set(dockerInfo2.dockerId, dockerInfo2);
-      setDockerInfo(__spreadValues(__spreadValues({}, oTStore.getState().dockerInfo), dockerInfo2));
-      dockerInfo2.fileTree && switchFileTree({
-        data: dockerInfo2.fileTree
-      });
+      if (dockerInfo2) {
+        (_a2 = otPlaygroundInfo == null ? void 0 : otPlaygroundInfo.dockerInfos) == null ? void 0 : _a2.set(dockerInfo2.dockerId, dockerInfo2);
+        setDockerInfo(__spreadValues(__spreadValues({}, oTStore.getState().dockerInfo), dockerInfo2));
+        dockerInfo2.fileTree && switchFileTree({
+          data: dockerInfo2.fileTree
+        });
+      }
     });
     io.on("playgroundStatus", (data) => {
       setPlaygroundStatus(data);
@@ -28451,7 +28468,7 @@ const PlaygroundInit = (arg) => {
       setDockerStatus(data || "STOP");
     });
     io.on("fileContent", async (d2) => {
-      var _a2, _b2, _c2, _d3;
+      var _a2, _b2, _c2;
       const _d2 = JSON.parse(d2);
       setCRDTInfo2(_d2);
       setAsyncType("file");
@@ -28462,7 +28479,11 @@ const PlaygroundInit = (arg) => {
         switchDoc2(_d2.file);
         (await daopaasDB).put("files", (_a2 = _d2 == null ? void 0 : _d2.file) == null ? void 0 : _a2.value, (_b2 = _d2 == null ? void 0 : _d2.file) == null ? void 0 : _b2.path);
         if (!await getLocalReplayFile(_d2.file.path)) {
-          setLocalReplayFile((_c2 = _d2 == null ? void 0 : _d2.file) == null ? void 0 : _c2.path, (_d3 = _d2 == null ? void 0 : _d2.file) == null ? void 0 : _d3.value);
+          setLocalReplayFile((_c2 = _d2 == null ? void 0 : _d2.file) == null ? void 0 : _c2.path, {
+            value: _d2.file.value,
+            revision: 0,
+            path: _d2.file.path
+          });
         }
       }
     });
@@ -28484,7 +28505,7 @@ const PlaygroundInit = (arg) => {
     io.on("saveFile", (d2) => {
       JSON.parse(d2);
     });
-    io.on("customAck", (d2) => {
+    io.on("customAck", async (d2) => {
       const _d2 = JSON.parse(d2);
       setCRDTInfo2(_d2);
       setAsyncType("editor");
@@ -28507,14 +28528,20 @@ const PlaygroundInit = (arg) => {
           return;
       }
     });
-    io.on("serverAck", (d2) => {
-      var _a2;
+    io.on("serverAck", async (d2) => {
+      var _a2, _b2;
       const _d2 = JSON.parse(d2);
       setAsyncType("editor");
+      const file = await getLocalReplayFile(_d2.file.path);
+      setLocalReplayFile((_a2 = _d2 == null ? void 0 : _d2.file) == null ? void 0 : _a2.path, {
+        value: file.value,
+        revision: file.revision + 1,
+        path: _d2.file.path
+      });
       setReplaySource(__spreadProps(__spreadValues({}, _d2), {
         event: "editor",
         editor: __spreadProps(__spreadValues({}, _d2.editor), {
-          revision: (_a2 = _d2.editor) == null ? void 0 : _a2.revision
+          revision: (_b2 = _d2.editor) == null ? void 0 : _b2.revision
         })
       }));
       setServerAck();
@@ -32704,42 +32731,65 @@ const {
   switchDoc,
   setCRDTInfo,
   dockerInfo,
-  doc
+  doc,
+  CRDTInfo
 } = oTStore.getState();
 const replay = async (passInData) => {
+  var _a2, _b2, _c2;
   setAppStatus("replay");
+  let operation;
   const replayList = await getLocalCRDTs();
   const filterReplayList = replayList.filter((replayItem) => replayItem.userInfo.uuid === passInData.userId);
-  let filterReplaySource = null;
-  filterReplayList.some((nowTimeData, index2, array3) => {
-    if (dayjs$1(passInData.timestamp).isSame(nowTimeData.timestamp) || dayjs$1(passInData.timestamp).isBefore(nowTimeData.timestamp)) {
-      filterReplaySource = nowTimeData;
-      return true;
-    }
-  });
+  const currentFilter = filterReplayList.filter((f2) => dayjs$1(passInData.timestamp).isSame(f2.timestamp) || dayjs$1(passInData.timestamp).isBefore(f2.timestamp));
+  const filterReplaySource = currentFilter[0];
+  const replayFile = await getLocalReplayFile(filterReplaySource.file.path);
+  const localFile = await getLocalFile(filterReplaySource.file.path);
   if (filterReplaySource.event === "editor") {
-    const tempFilter = filterReplayList.filter((x2) => x2.event === "editor");
-    let composeOperation = new TextOperation();
-    let i2 = 0;
-    while (filterReplaySource.editor.revision > tempFilter[i2].editor.revision) {
-      composeOperation = composeOperation.compose(TextOperation.fromJSON(tempFilter[i2].editor.operation));
-      filterReplaySource.editor.operation = composeOperation.toJSON();
-      i2++;
+    const tempFilter = filterReplayList.filter((x2) => x2.event === "editor").filter((x2) => {
+      var _a3;
+      return ((_a3 = x2.file) == null ? void 0 : _a3.path) === replayFile.path;
+    });
+    const operationFilter = filterReplaySource.editor.revision > replayFile.revision ? tempFilter.filter((x2) => x2.editor.revision <= filterReplaySource.editor.revision).filter((x2) => x2.editor.revision > replayFile.revision) : tempFilter.filter((x2) => x2.editor.revision > filterReplaySource.editor.revision).filter((x2) => x2.editor.revision <= replayFile.revision);
+    if (filterReplaySource.editor.revision > replayFile.revision) {
+      operation = operationFilter.reduce((currentOp, nextOp, _index) => {
+        const NextOP = TextOperation.fromJSON(nextOp.editor.operation);
+        if (currentOp.targetLength === NextOP.baseLength) {
+          return currentOp.compose(NextOP);
+        } else {
+          return NextOP.compose(currentOp);
+        }
+      }, new TextOperation().retain(replayFile.revision === 0 ? replayFile.value.length : localFile.value.length));
+    } else {
+      operation = operationFilter.length === 1 ? TextOperation.fromJSON(operationFilter[0].editor.operation).invert(localFile.value) : operationFilter.reduce((currentOp, nextOp, _index) => {
+        const NextOP = TextOperation.fromJSON(nextOp.editor.operation);
+        if (currentOp.editor) {
+          return TextOperation.fromJSON(currentOp.editor.operation).compose(NextOP);
+        } else {
+          return currentOp.compose(NextOP);
+        }
+      }).invert(localFile.value);
     }
+    filterReplaySource.editor.operation = operation.toJSON();
   }
   if (filterReplaySource.file) {
     if (!filterReplaySource.file)
       return;
-    const doc2 = await getLocalReplayFile(filterReplaySource.file.path);
+    setLocalFile(filterReplaySource.file.path, __spreadProps(__spreadValues({}, localFile), {
+      value: replayFile.revision === 0 ? operation == null ? void 0 : operation.apply(replayFile.value) : operation == null ? void 0 : operation.apply(localFile.value)
+    }));
     switchDoc == null ? void 0 : switchDoc({
-      value: doc2,
+      value: replayFile.value,
       path: filterReplaySource.file.path
     });
   }
+  console.log(oTStore.getState().appStatus);
+  setLocalReplayFile((_a2 = filterReplaySource == null ? void 0 : filterReplaySource.file) == null ? void 0 : _a2.path, __spreadProps(__spreadValues({}, replayFile), {
+    revision: (_b2 = filterReplaySource == null ? void 0 : filterReplaySource.editor) == null ? void 0 : _b2.revision,
+    path: (_c2 = filterReplaySource == null ? void 0 : filterReplaySource.file) == null ? void 0 : _c2.path
+  }));
   setTimeout(() => {
     setCRDTInfo(__spreadValues({}, filterReplaySource));
   }, 0);
-  setAppStatus("code");
 };
 var index$6 = "";
 const ignoreReplayerStore = create$3((set2) => ({
@@ -46753,7 +46803,7 @@ const FileTree = ({
   const [remoteUserList, setRemoteUserList] = react.exports.useState({});
   const treeRef = react.exports.useRef(null);
   const {
-    CRDTInfo,
+    CRDTInfo: CRDTInfo2,
     dockerInfo: dockerInfo2
   } = oTStore((state) => state);
   const {
@@ -46856,8 +46906,11 @@ const FileTree = ({
     const items = event.dataTransfer.items;
     if (items.length === 0)
       return;
-    for (let i2 = 0; i2 < items.length; i2++) {
-      const item = items[i2].webkitGetAsEntry();
+    const itemsIterate = [];
+    for (const i2 of items) {
+      itemsIterate.push(i2.webkitGetAsEntry());
+    }
+    for (const item of itemsIterate) {
       if (item) {
         addedFolder.files = addedFolder.files.concat(await traverseFileTree(item));
       }
@@ -46906,14 +46959,14 @@ const FileTree = ({
     }
   }, [treeRef]);
   const onUploadFile = (payload) => {
-    io.emit("upload", payload);
+    io == null ? void 0 : io.emit("upload", payload);
   };
   react.exports.useEffect(() => {
     var _a2, _b2;
-    const user = userListStore.getState().userList.find((item) => item.uuid === CRDTInfo.userInfo.uuid);
-    if (((_a2 = CRDTInfo == null ? void 0 : CRDTInfo.editor) == null ? void 0 : _a2.evtType) === "File" && user) {
-      const path = (_b2 = CRDTInfo == null ? void 0 : CRDTInfo.file) == null ? void 0 : _b2.path;
-      if (!IsMe(CRDTInfo.userInfo)) {
+    const user = userListStore.getState().userList.find((item) => item.uuid === CRDTInfo2.userInfo.uuid);
+    if (((_a2 = CRDTInfo2 == null ? void 0 : CRDTInfo2.editor) == null ? void 0 : _a2.evtType) === "File" && user) {
+      const path = (_b2 = CRDTInfo2 == null ? void 0 : CRDTInfo2.file) == null ? void 0 : _b2.path;
+      if (!IsMe(CRDTInfo2.userInfo)) {
         setRemoteUserList((oldUserListItem) => {
           const userListItem = __spreadValues({}, oldUserListItem);
           const remoteUserListObj = Object.entries(userListItem);
@@ -46963,7 +47016,7 @@ const FileTree = ({
         }
       }
     }
-  }, [CRDTInfo]);
+  }, [CRDTInfo2]);
   return /* @__PURE__ */ jsx(FollowLayout, {
     name: "file",
     children: /* @__PURE__ */ jsx("div", {
@@ -187895,7 +187948,7 @@ const Editor = ({
     value,
     path,
     language: language2,
-    CRDTInfo,
+    CRDTInfo: CRDTInfo2,
     doc: doc22
   }) => {
     var _a2;
@@ -187908,7 +187961,7 @@ const Editor = ({
         model: gotModel
       }]);
     }
-    client2.revision = ((_a2 = CRDTInfo.editor) == null ? void 0 : _a2.revision) ? CRDTInfo.editor.revision : 0;
+    client2.revision = ((_a2 = CRDTInfo2.editor) == null ? void 0 : _a2.revision) ? CRDTInfo2.editor.revision : 0;
     editor.setModel(gotModel);
     if (file) {
       docServer.set(file.path, {
@@ -187928,6 +187981,11 @@ const Editor = ({
       extensions: [".rb"],
       aliases: ["ruby", "RUBY"]
     });
+    languages.register({
+      id: "go",
+      extensions: [".go"],
+      aliases: ["go", "GO"]
+    });
     languages.register({
       id: "python",
       extensions: [".py"],
@@ -187966,7 +188024,7 @@ const Editor = ({
         const languageClient = new lib.MonacoLanguageClient({
           name: "Language Client",
           clientOptions: {
-            documentSelector: ["java", "ruby", "python"],
+            documentSelector: ["java", "ruby", "python", "go"],
             errorHandler: {
               error: () => lib.ErrorAction.Continue,
               closed: () => lib.CloseAction.DoNotRestart
@@ -187985,10 +188043,10 @@ const Editor = ({
   };
   const switchModel = (model) => {
     const {
-      CRDTInfo,
+      CRDTInfo: CRDTInfo2,
       setCRDTInfo: setCRDTInfo2
     } = oTStore.getState();
-    setCRDTInfo2(__spreadProps(__spreadValues({}, CRDTInfo), {
+    setCRDTInfo2(__spreadProps(__spreadValues({}, CRDTInfo2), {
       file: {
         action: "Get",
         value: model.getValue(),
@@ -188098,20 +188156,20 @@ const Editor = ({
   react.exports.useEffect(() => {
     var _a2, _b2, _c2;
     const {
-      CRDTInfo,
+      CRDTInfo: CRDTInfo2,
       doc: doc22,
       serverAck,
       appStatus
     } = oTStore.getState();
     useValue.getState();
-    if (!CRDTInfo.editor || CRDTInfo.editor.evtType !== "Editor")
+    if (!CRDTInfo2.editor || CRDTInfo2.editor.evtType !== "Editor")
       return;
     if (oTStore.getState().appStatus === "replay" && ignoreReplayerStore.getState().ignoreReplayers.some((d2) => d2 === "editor")) {
       return;
     }
-    if (editor && ((doc22 == null ? void 0 : doc22.path) === ((_a2 = CRDTInfo == null ? void 0 : CRDTInfo.file) == null ? void 0 : _a2.path) || ((_b2 = CRDTInfo == null ? void 0 : CRDTInfo.file) == null ? void 0 : _b2.path) === "singleFile")) {
-      const server_operation = CRDTInfo.editor.operation;
-      const CLIENT_OPERATION = receiveOperation(CRDTInfo.editor.revision, TextOperation.fromJSON(server_operation), (_c2 = CRDTInfo == null ? void 0 : CRDTInfo.file) == null ? void 0 : _c2.path);
+    if (editor && ((doc22 == null ? void 0 : doc22.path) === ((_a2 = CRDTInfo2 == null ? void 0 : CRDTInfo2.file) == null ? void 0 : _a2.path) || ((_b2 = CRDTInfo2 == null ? void 0 : CRDTInfo2.file) == null ? void 0 : _b2.path) === "singleFile")) {
+      const server_operation = CRDTInfo2.editor.operation;
+      const CLIENT_OPERATION = receiveOperation(CRDTInfo2.editor.revision, TextOperation.fromJSON(server_operation), (_c2 = CRDTInfo2 == null ? void 0 : CRDTInfo2.file) == null ? void 0 : _c2.path);
       client2.applyServer(CLIENT_OPERATION.operation);
       const {
         ops
@@ -188151,14 +188209,14 @@ const Editor = ({
   react.exports.useEffect(() => {
     var _a2;
     const {
-      CRDTInfo
+      CRDTInfo: CRDTInfo2
     } = oTStore.getState();
     const {
       shadowUser
     } = shadowUserStore.getState();
-    if (((_a2 = CRDTInfo == null ? void 0 : CRDTInfo.extend) == null ? void 0 : _a2.type) === "editor-scroll" && editor && shadowUser.uuid) {
-      editor.setScrollTop(editor.getScrollHeight() * Number(CRDTInfo.extend.topPercent));
-      editor.setScrollLeft(-(editor.getScrollWidth() * Number(CRDTInfo.extend.leftPercent)));
+    if (((_a2 = CRDTInfo2 == null ? void 0 : CRDTInfo2.extend) == null ? void 0 : _a2.type) === "editor-scroll" && editor && shadowUser.uuid) {
+      editor.setScrollTop(editor.getScrollHeight() * Number(CRDTInfo2.extend.topPercent));
+      editor.setScrollLeft(-(editor.getScrollWidth() * Number(CRDTInfo2.extend.leftPercent)));
     }
   }, [OTSTATE.CRDTInfo.extend]);
   react.exports.useEffect(() => {
@@ -188166,7 +188224,7 @@ const Editor = ({
     if (!editor)
       return;
     const {
-      CRDTInfo,
+      CRDTInfo: CRDTInfo2,
       doc: doc22,
       serverAck,
       appStatus
@@ -188176,8 +188234,8 @@ const Editor = ({
       setUsersDelta
     } = useValue.getState();
     editor.getModel();
-    if ((doc22 == null ? void 0 : doc22.path) === ((_a2 = CRDTInfo == null ? void 0 : CRDTInfo.file) == null ? void 0 : _a2.path)) {
-      if (CRDTInfo.selection) {
+    if ((doc22 == null ? void 0 : doc22.path) === ((_a2 = CRDTInfo2 == null ? void 0 : CRDTInfo2.file) == null ? void 0 : _a2.path)) {
+      if (CRDTInfo2.selection) {
         usersDelta.forEach((u2) => {
           let timer;
           const _label = document.querySelector(`.${u2.role}-label`);
@@ -188192,8 +188250,8 @@ const Editor = ({
             getPosition: function() {
               return {
                 position: {
-                  lineNumber: CRDTInfo.selection[0][7],
-                  column: CRDTInfo.selection[0][6]
+                  lineNumber: CRDTInfo2.selection[0][7],
+                  column: CRDTInfo2.selection[0][6]
                 },
                 preference: [editor$1.ContentWidgetPositionPreference.ABOVE, editor$1.ContentWidgetPositionPreference.BELOW]
               };
@@ -188201,9 +188259,9 @@ const Editor = ({
           }));
         });
         setUsersDelta(usersDelta.map((deltaInfo) => {
-          if (deltaInfo.uuid === CRDTInfo.userInfo.uuid) {
+          if (deltaInfo.uuid === CRDTInfo2.userInfo.uuid) {
             return __spreadProps(__spreadValues({}, deltaInfo), {
-              delta: editor.deltaDecorations(deltaInfo.delta ? deltaInfo.delta : "", (CRDTInfo == null ? void 0 : CRDTInfo.selection).map((s2) => ({
+              delta: editor.deltaDecorations(deltaInfo.delta ? deltaInfo.delta : "", (CRDTInfo2 == null ? void 0 : CRDTInfo2.selection).map((s2) => ({
                 range: new Range$4(s2[0], s2[1], s2[2], s2[3]),
                 options: {
                   isWholeLine: false,
@@ -188217,7 +188275,7 @@ const Editor = ({
           }
         }));
       }
-      if (((_b2 = CRDTInfo == null ? void 0 : CRDTInfo.editor) == null ? void 0 : _b2.evtType) === "Editor")
+      if (((_b2 = CRDTInfo2 == null ? void 0 : CRDTInfo2.editor) == null ? void 0 : _b2.evtType) === "Editor")
         ;
     }
   }, [OTSTATE.CRDTInfo.selection]);
@@ -188248,28 +188306,30 @@ const Editor = ({
       let egt = /\.(\w+$)/gim.exec(file.path);
       egt = egt ? egt : ["", file.path.substring(1)];
       const {
-        CRDTInfo,
-        doc: doc22
+        CRDTInfo: CRDTInfo2,
+        doc: doc22,
+        appStatus,
+        setAppStatus: setAppStatus2
       } = oTStore.getState();
       const {
         shadowUser
       } = shadowUserStore.getState();
-      if (file.path && egt && oTStore.getState().appStatus === "replay" && !ignoreReplayerStore.getState().ignoreReplayers.some((d2) => d2 === "editor")) {
+      if (file.path && egt && appStatus === "replay" && !ignoreReplayerStore.getState().ignoreReplayers.some((d2) => d2 === "editor")) {
         updateLspOps({
           value: file.value,
           path: file.path,
           language: FExtension[egt[1]],
-          CRDTInfo,
+          CRDTInfo: CRDTInfo2,
           doc: doc22
         });
         return;
       }
-      if (oTStore.getState().appStatus !== "replay" && (shadowUser.uuid || file.path && egt && IsMe(CRDTInfo.userInfo))) {
+      if (appStatus !== "replay" && (shadowUser.uuid || file.path && egt && IsMe(CRDTInfo2.userInfo))) {
         updateLspOps({
           value: file.value,
           path: file.path,
           language: FExtension[egt[1]],
-          CRDTInfo,
+          CRDTInfo: CRDTInfo2,
           doc: doc22
         });
       }
@@ -195489,9 +195549,7 @@ const Console = (_e2) => {
     }
   }, options);
   const [terminal, setTerminal] = react.exports.useState(null);
-  const {
-    CRDTInfo
-  } = oTStore((state) => state);
+  const OTSTATE = oTStore((state) => state);
   const {
     dockerStatus
   } = oTStore((state) => state);
@@ -195522,11 +195580,11 @@ const Console = (_e2) => {
     var _a2;
     if (!terminal)
       return;
-    const crdt = CRDTInfo.console;
+    const crdt = OTSTATE.CRDTInfo.console;
     if (crdt) {
       writeText(terminal, ((_a2 = crdt == null ? void 0 : crdt.doc) == null ? void 0 : _a2.value) || "");
     }
-  }, [CRDTInfo.console]);
+  }, [OTSTATE.CRDTInfo]);
   react.exports.useEffect(() => {
     if (!terminal)
       return;
@@ -195709,7 +195767,7 @@ const TerminalComponent = (_i) => {
   userLabel.classList.add("xterm-helper-user-label");
   const [terminal, setTerminal] = react.exports.useState(null);
   const {
-    CRDTInfo
+    CRDTInfo: CRDTInfo2
   } = oTStore((state) => state);
   const initTerminalText = (terminal2, text2) => {
     terminal2.write("\r\n");
@@ -195746,25 +195804,25 @@ const TerminalComponent = (_i) => {
     var _a2, _b2, _c2, _d2;
     if (!terminal)
       return;
-    if (CRDTInfo.terminal) {
+    if (CRDTInfo2.terminal) {
       initTerminalText(terminal, ((_d2 = (_c2 = (_b2 = (_a2 = oTStore.getState()) == null ? void 0 : _a2.CRDTInfo) == null ? void 0 : _b2.terminal) == null ? void 0 : _c2.doc) == null ? void 0 : _d2.value) || "");
     }
   }, [terminal]);
   react.exports.useEffect(() => {
     var _a2, _b2, _c2;
-    const crdt = CRDTInfo.terminal;
+    const crdt = CRDTInfo2.terminal;
     if (terminal && crdt) {
       if (((_a2 = crdt == null ? void 0 : crdt.doc) == null ? void 0 : _a2.action) === "Get") {
         initTerminalText(terminal, crdt.doc.value);
         return;
       }
       writeText(terminal, ((_b2 = crdt == null ? void 0 : crdt.doc) == null ? void 0 : _b2.value) || "");
-      if (!CRDTInfo.userInfo.uuid)
+      if (!CRDTInfo2.userInfo.uuid)
         return;
       const postUser = userListStore.getState().userList.find(({
         uuid: uuid2
-      }) => uuid2 === CRDTInfo.userInfo.uuid);
-      if (postUser && !IsMe(CRDTInfo.userInfo)) {
+      }) => uuid2 === CRDTInfo2.userInfo.uuid);
+      if (postUser && !IsMe(CRDTInfo2.userInfo)) {
         const helperContainer = (_c2 = terminal == null ? void 0 : terminal._core) == null ? void 0 : _c2._helperContainer;
         const childNode = helperContainer == null ? void 0 : helperContainer.firstChild;
         userLabel.innerText = postUser.username;
@@ -195793,7 +195851,7 @@ const TerminalComponent = (_i) => {
         };
       }
     }
-  }, [CRDTInfo.terminal]);
+  }, [CRDTInfo2.terminal]);
   return /* @__PURE__ */ jsx(FollowLayout, {
     name: "terminal",
     children: /* @__PURE__ */ jsx("div", {
@@ -196377,7 +196435,7 @@ const MultiPlayerCursorLayout = newStyled.svg`
 `;
 const MultiPlayerCursor = () => {
   const [users, setUsers] = react.exports.useState(null);
-  const CRDTInfo = oTStore((state) => state.CRDTInfo);
+  const CRDTInfo2 = oTStore((state) => state.CRDTInfo);
   const throttled = lodash$2.exports.throttle((a) => {
     var _a2, _b2;
     (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("extraSync", JSON.stringify(a));
@@ -196387,12 +196445,12 @@ const MultiPlayerCursor = () => {
       userList
     } = userListStore.getState();
     setUsers(userList.map((_user) => {
-      if (_user.uuid === CRDTInfo.userInfo.uuid) {
-        _user.cursor = CRDTInfo.extend;
+      if (_user.uuid === CRDTInfo2.userInfo.uuid) {
+        _user.cursor = CRDTInfo2.extend;
       }
       return _user;
     }));
-  }, [CRDTInfo]);
+  }, [CRDTInfo2]);
   react.exports.useEffect(() => {
     const {
       userInfo