@dao42/d42paas-front 0.5.52 → 0.5.53

package/dist/DaoPaaS.es.js

@@ -28433,16 +28433,16 @@ const PlaygroundInit = (arg) => {
         crdt,
         dockerInfo: dockerInfo2
       } = JSON.parse(data);
+      setCRDTInfo2(crdt);
       const otPlaygroundInfo = oTStore.getState().playgroundInfo;
       setPlaygroundInfo(__spreadProps(__spreadValues(__spreadValues({}, playgroundInfo), otPlaygroundInfo), {
-        activeDocker: dockerInfo2.dockerId
+        activeDockerId: 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
       });
-      setCRDTInfo2(crdt);
     });
     io.on("playgroundStatus", (data) => {
       setPlaygroundStatus(data);
@@ -42443,7 +42443,10 @@ class DaoPaaS {
     };
   }
   replay(arg) {
-    replay(arg);
+    replay({
+      userId: arg.userInfo.uuid,
+      timestamp: arg.timestamp
+    });
   }
   setIgnoreReplayers(arg) {
     ignoreReplayerStore.getState().setIgnoreReplayer(arg);
@@ -44604,9 +44607,11 @@ AwaitingConfirm.prototype.applyClient = function(client2, operation) {
   return new AwaitingWithBuffer(this.outstanding, operation);
 };
 AwaitingConfirm.prototype.applyServer = function(client2, operation) {
-  const pair = operation.constructor.transform(this.outstanding, operation);
-  client2.applyOperation(pair[1]);
-  return new AwaitingConfirm(pair[0]);
+  if (this.outstanding.baseLength === operation.baseLength) {
+    const pair = operation.constructor.transform(this.outstanding, operation);
+    client2.applyOperation(pair[1]);
+    return new AwaitingConfirm(pair[0]);
+  }
 };
 AwaitingConfirm.prototype.serverAck = function(client2) {
   return synchronized_;
@@ -187771,9 +187776,6 @@ const Editor = ({
       } = evt;
       if (!isFlush) {
         setPosition(editor.getPosition());
-        let keepString = 0;
-        let rangeLengthamount = 0;
-        let rangeOffsetthamount = 0;
         let preOffset = 0;
         const valuelength = editorValue.length - changes.reduce((change, nextChange, i2) => change - nextChange.rangeLength + nextChange.text.length, 0);
         const operation = new TextOperation();
@@ -187783,12 +187785,9 @@ const Editor = ({
             operation.retain(valuelength - change.rangeLength - change.rangeOffset);
           }
           preOffset = change.rangeOffset + change.rangeLength;
-          rangeLengthamount += change.rangeLength;
-          keepString += change.text.length;
-          rangeOffsetthamount += change.rangeOffset;
         });
-        setLocalFile((doc22 == null ? void 0 : doc22.path) ? doc22 == null ? void 0 : doc22.path : "singleFile", editor.getValue());
         client2.applyClient(operation);
+        setLocalFile((doc22 == null ? void 0 : doc22.path) ? doc22 == null ? void 0 : doc22.path : "singleFile", editor.getValue());
       } else {
         setValue2(changes[0].text);
       }
@@ -187830,6 +187829,7 @@ const Editor = ({
       });
     }, "save");
     client2.sendOperation = function(revision, operation) {
+      var _a2, _b2;
       if (oTStore.getState().appStatus === "replay")
         return;
       const {
@@ -187851,10 +187851,7 @@ const Editor = ({
           path: doc22 == null ? void 0 : doc22.path
         }
       };
-      throttled(() => {
-        var _a2, _b2;
-        (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("editFile", JSON.stringify(crdt));
-      });
+      (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("editFile", JSON.stringify(crdt));
     };
   };
   const updateLspOps = ({
@@ -188143,8 +188140,10 @@ const Editor = ({
   react.exports.useEffect(() => {
     if (!editor)
       return;
-    editor$1.getModels().forEach((model) => model.dispose());
-    setFileTreeStack([]);
+    if (IsMe(OTSTATE.CRDTInfo.userInfo)) {
+      editor$1.getModels().forEach((model) => model.dispose());
+      setFileTreeStack([]);
+    }
   }, [OTSTATE.dockerInfo]);
   react.exports.useEffect(() => {
     if (!editor || !file)