@dao42/d42paas-front 0.5.50 → 0.5.55

package/dist/DaoPaaS.es.js

@@ -14724,6 +14724,9 @@ async function setReplaySource(val) {
     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);
 }
@@ -14942,14 +14945,15 @@ const oTStore = create$3((set2) => ({
     },
     messageId: "",
     playgroundId: "",
-    result: ""
+    result: "",
+    dockerInfos: new Map([])
   },
   playgroundStatus: "EMPTY",
   dockerStatus: "STOP",
   queryObject: {},
   globalData: {
     isRecording: false,
-    syncCursor: true,
+    syncCursor: false,
     useLsp: true
   },
   fileSaved: true,
@@ -28413,6 +28417,9 @@ const PlaygroundInit = (arg) => {
           avatar: avatarGenerator(lodash$2.exports.random(0, 6), userData.uuid)
         }), "coUsers");
         setUserInfo(originUser);
+        if (oTStore.getState().playgroundStatus === "INACTIVE") {
+          io == null ? void 0 : io.emit("active");
+        }
       }
       const userInfoList = [originUser, ...userData.coUsers.filter((f2) => f2.uuid !== originUser.uuid).map((user) => {
         return __spreadProps(__spreadValues({}, user), {
@@ -28423,17 +28430,22 @@ const PlaygroundInit = (arg) => {
       setUserList(userInfoList);
     });
     io.on("playgroundInfo", (data) => {
+      var _a2;
       const {
         playgroundInfo,
         crdt,
         dockerInfo: dockerInfo2
       } = JSON.parse(data);
-      setPlaygroundInfo(playgroundInfo);
+      setCRDTInfo2(crdt);
+      const otPlaygroundInfo = oTStore.getState().playgroundInfo;
+      setPlaygroundInfo(__spreadProps(__spreadValues(__spreadValues({}, playgroundInfo), otPlaygroundInfo), {
+        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);
@@ -28499,10 +28511,14 @@ const PlaygroundInit = (arg) => {
       }
     });
     io.on("serverAck", (d2) => {
+      var _a2;
       const _d2 = JSON.parse(d2);
       setAsyncType("editor");
       setReplaySource(__spreadProps(__spreadValues({}, _d2), {
-        event: "editor"
+        event: "editor",
+        editor: __spreadProps(__spreadValues({}, _d2.editor), {
+          revision: ((_a2 = _d2.editor) == null ? void 0 : _a2.revision) + 1
+        })
       }));
       setServerAck();
     });
@@ -30582,11 +30598,11 @@ const replay = async (item) => {
   const filterReplayList = replayList.filter((replayItem) => replayItem.userInfo.uuid === item.userId);
   const filterReplaySource = filterReplayList.find((f2) => f2.timestamp === item.timestamp);
   if (filterReplaySource.file) {
-    const file = await getLocalReplayFile(filterReplaySource.file.path);
-    filterReplaySource.file.value = file;
-    if ((doc == null ? void 0 : doc.path) !== filterReplaySource.file.path) {
+    const doc2 = await getLocalFile(filterReplaySource.file.path);
+    filterReplaySource.file.value = doc2;
+    if ((doc2 == null ? void 0 : doc2.path) !== filterReplaySource.file.path) {
       switchDoc == null ? void 0 : switchDoc({
-        value: file,
+        value: doc2.value,
         path: filterReplaySource.file.path
       });
     }
@@ -42240,7 +42256,7 @@ const GuiComponent = () => {
   };
   useControls({
     lsp: {
-      value: true,
+      value: oTStore.getState().globalData.useLsp,
       onChange: (v2) => {
         oTStore.getState().setGlobalData({
           useLsp: v2
@@ -42253,7 +42269,7 @@ const GuiComponent = () => {
     },
     syncCursor: {
       label: "\u5149\u6807\u540C\u6B65",
-      value: true,
+      value: oTStore.getState().globalData.syncCursor,
       onChange: (v2) => {
         oTStore.getState().setGlobalData({
           syncCursor: v2
@@ -42434,7 +42450,10 @@ class DaoPaaS {
     };
   }
   replay(arg) {
-    replay(arg);
+    replay({
+      userId: arg.userInfo.uuid,
+      timestamp: arg.timestamp
+    });
   }
   setIgnoreReplayers(arg) {
     ignoreReplayerStore.getState().setIgnoreReplayer(arg);
@@ -44595,9 +44614,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_;
@@ -187608,6 +187629,51 @@ function WorkerWrapper() {
     "type": "module"
   });
 }
+const EditorLayout = newStyled.div`
+  width: 100%;
+  .contentWidgets {
+    visibility: hidden;
+  }
+  .monaco-label {
+    font-size: 12px;
+    border-radius: 2px;
+    padding: 2px 10px;
+    transform: scale(0.8);
+    visibility: hidden;
+  }
+  .label-visible {
+    visibility: visible !important;
+  }
+
+  .stack-list {
+    width: 100%;
+    height: 40px;
+    transform: translate(0, -1px);
+    overflow-x: auto;
+    flex-wrap: nowrap;
+    li {
+      /* width: 100px; */
+      height: 100%;
+      padding: 15px;
+      color: #fff;
+      font-size: 12px;
+      flex: 0 0 auto;
+    }
+
+    .active {
+      background: #1e1e1e;
+      box-shadow: 0px 1px 0px 0 #333;
+      /* border-left: 1px solid rgb(42 96 231);
+    border-right: 1px solid rgb(42 96 231); */
+      /* background: red; */
+    }
+  }
+`;
+const ContentLayout = newStyled.div`
+  flex: 1;
+  ${(props2) => props2.userList.map((u2) => "." + u2.role + "{background:" + u2.color + ";width: 2px !important;}")}
+  ${(props2) => props2.userList.map((u2) => "." + u2.role + "-selection{background:" + u2.color + "a6;color: #fff;width: 2px !important;}")}
+`;
 self.MonacoEnvironment = {
   getWorker(_2, label) {
     if (label === "json") {
@@ -187664,51 +187730,6 @@ const useValue = create$3((set2) => ({
   }))
 }));
 let editor;
-const EditorLayout = newStyled.div`
-  width: 100%;
-  .contentWidgets {
-    visibility: hidden;
-  }
-  .monaco-label {
-    font-size: 12px;
-    border-radius: 2px;
-    padding: 2px 10px;
-    transform: scale(0.8);
-    visibility: hidden;
-  }
-  .label-visible {
-    visibility: visible !important;
-  }
-
-  .stack-list {
-    width: 100%;
-    height: 40px;
-    transform: translate(0, -1px);
-    overflow-x: auto;
-    flex-wrap: nowrap;
-    li {
-      /* width: 100px; */
-      height: 100%;
-      padding: 15px;
-      color: #fff;
-      font-size: 12px;
-      flex: 0 0 auto;
-    }
-
-    .active {
-      background: #1e1e1e;
-      box-shadow: 0px 1px 0px 0 #333;
-      /* border-left: 1px solid rgb(42 96 231);
-      border-right: 1px solid rgb(42 96 231); */
-      /* background: red; */
-    }
-  }
-`;
-const ContentLayout = newStyled.div`
-  flex: 1;
-  ${(props2) => props2.userList.map((u2) => "." + u2.role + "{background:" + u2.color + ";width: 2px !important;}")}
-  ${(props2) => props2.userList.map((u2) => "." + u2.role + "-selection{background:" + u2.color + "a6;color: #fff;width: 2px !important;}")}
-`;
 const Editor = ({
   doc: doc2,
   containerStyle,
@@ -187725,26 +187746,9 @@ const Editor = ({
   const setValue2 = useValue((state) => state.setValue);
   useValue((state) => state.setDelta);
   const [FileTreeStack, setFileTreeStack] = react.exports.useState([]);
-  const throttled = lodash$2.exports.throttle((callback) => {
+  const debounced = lodash$2.exports.debounce((callback) => {
     callback();
   }, 300);
-  const cursorTool = (evt) => {
-    var _a2, _b2, _c2, _d2;
-    const {
-      userInfo
-    } = userStore.getState();
-    const selection2 = [[evt.selection.startLineNumber, evt.selection.startColumn, evt.selection.endLineNumber, evt.selection.endColumn, evt.selection.selectionStartLineNumber, evt.selection.selectionStartColumn, evt.selection.positionColumn, evt.selection.positionLineNumber], ...evt.secondarySelections.map((s2) => [s2.startLineNumber, s2.startColumn, s2.endLineNumber, s2.endColumn, s2.selectionStartLineNumber, s2.selectionStartColumn, s2.positionColumn, s2.positionLineNumber])];
-    const crdt = {
-      timestamp: Date.now().toString(),
-      selection: selection2,
-      file: {
-        action: "Update",
-        path: (_b2 = (_a2 = oTStore.getState()) == null ? void 0 : _a2.doc) == null ? void 0 : _b2.path
-      },
-      userInfo: lodash$2.exports.pick(userInfo, "uuid", "role")
-    };
-    (_d2 = (_c2 = useOT.getState()) == null ? void 0 : _c2.socket) == null ? void 0 : _d2.emit("selection", JSON.stringify(crdt));
-  };
   const receiveOperation = (revision, operation, _path) => {
     client2.receiveOperation = operation;
     return {
@@ -187759,18 +187763,8 @@ const Editor = ({
       }
     });
     editor.onDidChangeCursorSelection((evt) => {
-      if (oTStore.getState().appStatus === "replay")
-        return;
-      if (evt.source === "api") {
-        throttled(() => {
-          cursorTool(evt);
-        });
-      }
-      if (evt.reason === 0 || evt.source === "model")
-        return;
-      throttled(() => {
-        cursorTool(evt);
-      });
+      oTStore.getState();
+      return;
     });
     editor.onDidChangeModelContent((evt) => {
       const {
@@ -187789,9 +187783,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();
@@ -187801,17 +187792,18 @@ 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", {
+          value: editor.getValue(),
+          revision: client2.revision + 1
+        });
       } else {
         setValue2(changes[0].text);
       }
     });
     editor.onDidScrollChange((evt) => {
+      var _a2, _b2;
       if (!evt.scrollLeftChanged && !evt.scrollTopChanged)
         return;
       const {
@@ -187828,10 +187820,7 @@ const Editor = ({
           leftPercent
         }
       };
-      throttled(() => {
-        var _a2, _b2;
-        (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("extraSync", JSON.stringify(crdt));
-      });
+      (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("extraSync", JSON.stringify(crdt));
     });
     editor.createContextKey("save", true);
     editor.addCommand(KeyMod.CtrlCmd | KeyCode.KeyS, () => {
@@ -187869,7 +187858,7 @@ const Editor = ({
           path: doc22 == null ? void 0 : doc22.path
         }
       };
-      throttled(() => {
+      debounced(() => {
         var _a2, _b2;
         (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("editFile", JSON.stringify(crdt));
       });
@@ -187900,7 +187889,10 @@ const Editor = ({
         revision: client2.revision,
         value: file.value
       });
-      oTStore.getState().appStatus !== "replay" && setLocalFile(doc22 == null ? void 0 : doc22.path, file.value);
+      oTStore.getState().appStatus !== "replay" && setLocalFile(doc22 == null ? void 0 : doc22.path, {
+        value: file.value,
+        revision: client2.revision
+      });
     }
   };
   const lspServerInject = (_lan, useLsp) => {
@@ -187909,6 +187901,11 @@ const Editor = ({
       extensions: [".rb"],
       aliases: ["ruby", "RUBY"]
     });
+    languages.register({
+      id: "python",
+      extensions: [".py"],
+      aliases: ["python", "PYTHON"]
+    });
     languages.register({
       id: "java",
       extensions: [".java"],
@@ -187942,7 +187939,7 @@ const Editor = ({
         const languageClient = new lib.MonacoLanguageClient({
           name: "Language Client",
           clientOptions: {
-            documentSelector: ["java", "ruby"],
+            documentSelector: ["java", "ruby", "python"],
             errorHandler: {
               error: () => lib.ErrorAction.Continue,
               closed: () => lib.CloseAction.DoNotRestart
@@ -188019,8 +188016,11 @@ const Editor = ({
         }
         return result;
       };
+      window.ot = __spreadProps(__spreadValues({}, ot), {
+        oTStore,
+        editor
+      });
     }
-    window.ot = ot;
   };
   react.exports.useEffect(() => {
     editorInit();
@@ -188158,6 +188158,14 @@ const Editor = ({
     if (!editor)
       return;
   }, [OTSTATE.fileSaved]);
+  react.exports.useEffect(() => {
+    if (!editor)
+      return;
+    if (IsMe(OTSTATE.CRDTInfo.userInfo)) {
+      editor$1.getModels().forEach((model) => model.dispose());
+      setFileTreeStack([]);
+    }
+  }, [OTSTATE.dockerInfo]);
   react.exports.useEffect(() => {
     if (!editor || !file)
       return;
@@ -195692,7 +195700,7 @@ const TerminalComponent = (_i) => {
       if (postUser && !IsMe(CRDTInfo.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.name;
+        userLabel.innerText = postUser.username;
         userLabel.style.backgroundColor = postUser.color;
         userLabel.style.top = childNode.style.top;
         userLabel.style.left = childNode.style.left;
@@ -196323,6 +196331,11 @@ const MultiPlayerCursor = () => {
       userInfo
     } = userStore.getState();
     window.addEventListener("mousemove", (evt) => {
+      const {
+        globalData
+      } = oTStore.getState();
+      if (!globalData.syncCursor)
+        return;
       const crdt = {
         timestamp: Date.now().toString(),
         userInfo: lodash$2.exports.pick(userInfo, "uuid", "role"),