@dao42/d42paas-front 0.5.27 → 0.5.28

package/dist/DaoPaaS.es.js

@@ -31647,13 +31647,13 @@ var Tree = react.exports.forwardRef(function(props, ref) {
   }
   return react.exports.createElement(TreeContext.Provider, { value: treeContextProps }, react.exports.createElement(TreeActionsProvider, { ref }, react.exports.createElement(TreeManager, null)));
 });
-function IoClient(revision) {
+const IoClient = function(revision) {
   this.revision = revision;
   this.state = synchronized_;
   this.operation = [];
   this.receiveOperation = [];
   this.io = useOT.getState().socket;
-}
+};
 IoClient.prototype.setState = function(state) {
   this.state = state;
 };
@@ -31734,10 +31734,15 @@ AwaitingWithBuffer.prototype.applyClient = function(client2, operation) {
   return new AwaitingWithBuffer(this.outstanding, newBuffer);
 };
 AwaitingWithBuffer.prototype.applyServer = function(client2, operation) {
+  let pair2, pair1;
   const transform = operation.constructor.transform;
-  const pair1 = transform(this.outstanding, operation);
-  const pair2 = transform(this.buffer, pair1[1]);
-  client2.applyOperation(pair2[1]);
+  if (this.outstanding.baseLength === operation.baseLength) {
+    pair1 = transform(this.outstanding, operation);
+    if (this.buffer.baseLength === pair1[1].baseLength) {
+      pair2 = transform(this.buffer, pair1[1]);
+      client2.applyOperation(pair2[1]);
+    }
+  }
   return new AwaitingWithBuffer(pair1[0], pair2[0]);
 };
 AwaitingWithBuffer.prototype.serverAck = function(client2) {
@@ -157517,6 +157522,24 @@ class ToggleHighContrast extends EditorAction {
   }
 }
 registerEditorAction(ToggleHighContrast);
+var monaco = /* @__PURE__ */ Object.freeze({
+  __proto__: null,
+  [Symbol.toStringTag]: "Module",
+  CancellationTokenSource,
+  Emitter,
+  KeyCode,
+  KeyMod,
+  Position: Position$4,
+  Range: Range$4,
+  Selection: Selection$2,
+  SelectionDirection,
+  MarkerSeverity,
+  MarkerTag,
+  Uri,
+  Token,
+  editor: editor$1,
+  languages
+});
 var lib$2 = {};
 var textOperation = { exports: {} };
 (function(module2) {
@@ -162761,8 +162784,8 @@ var DEFAULT = {
   startClosed: false,
   debug: false
 };
-(function() {
-  function ReconnectingWebSocket(url2, protocols, options) {
+var ReconnectingWebSocket = function() {
+  function ReconnectingWebSocket2(url2, protocols, options) {
     var _this = this;
     if (options === void 0) {
       options = {};
@@ -162844,63 +162867,63 @@ var DEFAULT = {
     }
     this._connect();
   }
-  Object.defineProperty(ReconnectingWebSocket, "CONNECTING", {
+  Object.defineProperty(ReconnectingWebSocket2, "CONNECTING", {
     get: function() {
       return 0;
     },
     enumerable: true,
     configurable: true
   });
-  Object.defineProperty(ReconnectingWebSocket, "OPEN", {
+  Object.defineProperty(ReconnectingWebSocket2, "OPEN", {
     get: function() {
       return 1;
     },
     enumerable: true,
     configurable: true
   });
-  Object.defineProperty(ReconnectingWebSocket, "CLOSING", {
+  Object.defineProperty(ReconnectingWebSocket2, "CLOSING", {
     get: function() {
       return 2;
     },
     enumerable: true,
     configurable: true
   });
-  Object.defineProperty(ReconnectingWebSocket, "CLOSED", {
+  Object.defineProperty(ReconnectingWebSocket2, "CLOSED", {
     get: function() {
       return 3;
     },
     enumerable: true,
     configurable: true
   });
-  Object.defineProperty(ReconnectingWebSocket.prototype, "CONNECTING", {
+  Object.defineProperty(ReconnectingWebSocket2.prototype, "CONNECTING", {
     get: function() {
-      return ReconnectingWebSocket.CONNECTING;
+      return ReconnectingWebSocket2.CONNECTING;
     },
     enumerable: true,
     configurable: true
   });
-  Object.defineProperty(ReconnectingWebSocket.prototype, "OPEN", {
+  Object.defineProperty(ReconnectingWebSocket2.prototype, "OPEN", {
     get: function() {
-      return ReconnectingWebSocket.OPEN;
+      return ReconnectingWebSocket2.OPEN;
     },
     enumerable: true,
     configurable: true
   });
-  Object.defineProperty(ReconnectingWebSocket.prototype, "CLOSING", {
+  Object.defineProperty(ReconnectingWebSocket2.prototype, "CLOSING", {
     get: function() {
-      return ReconnectingWebSocket.CLOSING;
+      return ReconnectingWebSocket2.CLOSING;
     },
     enumerable: true,
     configurable: true
   });
-  Object.defineProperty(ReconnectingWebSocket.prototype, "CLOSED", {
+  Object.defineProperty(ReconnectingWebSocket2.prototype, "CLOSED", {
     get: function() {
-      return ReconnectingWebSocket.CLOSED;
+      return ReconnectingWebSocket2.CLOSED;
     },
     enumerable: true,
     configurable: true
   });
-  Object.defineProperty(ReconnectingWebSocket.prototype, "binaryType", {
+  Object.defineProperty(ReconnectingWebSocket2.prototype, "binaryType", {
     get: function() {
       return this._ws ? this._ws.binaryType : this._binaryType;
     },
@@ -162913,14 +162936,14 @@ var DEFAULT = {
     enumerable: true,
     configurable: true
   });
-  Object.defineProperty(ReconnectingWebSocket.prototype, "retryCount", {
+  Object.defineProperty(ReconnectingWebSocket2.prototype, "retryCount", {
     get: function() {
       return Math.max(this._retryCount, 0);
     },
     enumerable: true,
     configurable: true
   });
-  Object.defineProperty(ReconnectingWebSocket.prototype, "bufferedAmount", {
+  Object.defineProperty(ReconnectingWebSocket2.prototype, "bufferedAmount", {
     get: function() {
       var bytes = this._messageQueue.reduce(function(acc, message) {
         if (typeof message === "string") {
@@ -162937,38 +162960,38 @@ var DEFAULT = {
     enumerable: true,
     configurable: true
   });
-  Object.defineProperty(ReconnectingWebSocket.prototype, "extensions", {
+  Object.defineProperty(ReconnectingWebSocket2.prototype, "extensions", {
     get: function() {
       return this._ws ? this._ws.extensions : "";
     },
     enumerable: true,
     configurable: true
   });
-  Object.defineProperty(ReconnectingWebSocket.prototype, "protocol", {
+  Object.defineProperty(ReconnectingWebSocket2.prototype, "protocol", {
     get: function() {
       return this._ws ? this._ws.protocol : "";
     },
     enumerable: true,
     configurable: true
   });
-  Object.defineProperty(ReconnectingWebSocket.prototype, "readyState", {
+  Object.defineProperty(ReconnectingWebSocket2.prototype, "readyState", {
     get: function() {
       if (this._ws) {
         return this._ws.readyState;
       }
-      return this._options.startClosed ? ReconnectingWebSocket.CLOSED : ReconnectingWebSocket.CONNECTING;
+      return this._options.startClosed ? ReconnectingWebSocket2.CLOSED : ReconnectingWebSocket2.CONNECTING;
     },
     enumerable: true,
     configurable: true
   });
-  Object.defineProperty(ReconnectingWebSocket.prototype, "url", {
+  Object.defineProperty(ReconnectingWebSocket2.prototype, "url", {
     get: function() {
       return this._ws ? this._ws.url : "";
     },
     enumerable: true,
     configurable: true
   });
-  ReconnectingWebSocket.prototype.close = function(code2, reason) {
+  ReconnectingWebSocket2.prototype.close = function(code2, reason) {
     if (code2 === void 0) {
       code2 = 1e3;
     }
@@ -162985,7 +163008,7 @@ var DEFAULT = {
     }
     this._ws.close(code2, reason);
   };
-  ReconnectingWebSocket.prototype.reconnect = function(code2, reason) {
+  ReconnectingWebSocket2.prototype.reconnect = function(code2, reason) {
     this._shouldReconnect = true;
     this._closeCalled = false;
     this._retryCount = -1;
@@ -162996,7 +163019,7 @@ var DEFAULT = {
       this._connect();
     }
   };
-  ReconnectingWebSocket.prototype.send = function(data) {
+  ReconnectingWebSocket2.prototype.send = function(data) {
     if (this._ws && this._ws.readyState === this.OPEN) {
       this._debug("send", data);
       this._ws.send(data);
@@ -163008,12 +163031,12 @@ var DEFAULT = {
       }
     }
   };
-  ReconnectingWebSocket.prototype.addEventListener = function(type, listener) {
+  ReconnectingWebSocket2.prototype.addEventListener = function(type, listener) {
     if (this._listeners[type]) {
       this._listeners[type].push(listener);
     }
   };
-  ReconnectingWebSocket.prototype.dispatchEvent = function(event) {
+  ReconnectingWebSocket2.prototype.dispatchEvent = function(event) {
     var e_1, _a2;
     var listeners2 = this._listeners[event.type];
     if (listeners2) {
@@ -163036,14 +163059,14 @@ var DEFAULT = {
     }
     return true;
   };
-  ReconnectingWebSocket.prototype.removeEventListener = function(type, listener) {
+  ReconnectingWebSocket2.prototype.removeEventListener = function(type, listener) {
     if (this._listeners[type]) {
       this._listeners[type] = this._listeners[type].filter(function(l2) {
         return l2 !== listener;
       });
     }
   };
-  ReconnectingWebSocket.prototype._debug = function() {
+  ReconnectingWebSocket2.prototype._debug = function() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
       args[_i] = arguments[_i];
@@ -163052,7 +163075,7 @@ var DEFAULT = {
       console.log.apply(console, __spread(["RWS>"], args));
     }
   };
-  ReconnectingWebSocket.prototype._getNextDelay = function() {
+  ReconnectingWebSocket2.prototype._getNextDelay = function() {
     var _a2 = this._options, _b2 = _a2.reconnectionDelayGrowFactor, reconnectionDelayGrowFactor = _b2 === void 0 ? DEFAULT.reconnectionDelayGrowFactor : _b2, _c2 = _a2.minReconnectionDelay, minReconnectionDelay = _c2 === void 0 ? DEFAULT.minReconnectionDelay : _c2, _d2 = _a2.maxReconnectionDelay, maxReconnectionDelay = _d2 === void 0 ? DEFAULT.maxReconnectionDelay : _d2;
     var delay = 0;
     if (this._retryCount > 0) {
@@ -163064,13 +163087,13 @@ var DEFAULT = {
     this._debug("next delay", delay);
     return delay;
   };
-  ReconnectingWebSocket.prototype._wait = function() {
+  ReconnectingWebSocket2.prototype._wait = function() {
     var _this = this;
     return new Promise(function(resolve2) {
       setTimeout(resolve2, _this._getNextDelay());
     });
   };
-  ReconnectingWebSocket.prototype._getNextUrl = function(urlProvider) {
+  ReconnectingWebSocket2.prototype._getNextUrl = function(urlProvider) {
     if (typeof urlProvider === "string") {
       return Promise.resolve(urlProvider);
     }
@@ -163085,7 +163108,7 @@ var DEFAULT = {
     }
     throw Error("Invalid URL");
   };
-  ReconnectingWebSocket.prototype._connect = function() {
+  ReconnectingWebSocket2.prototype._connect = function() {
     var _this = this;
     if (this._connectLock || !this._shouldReconnect) {
       return;
@@ -163118,11 +163141,11 @@ var DEFAULT = {
       }, connectionTimeout);
     });
   };
-  ReconnectingWebSocket.prototype._handleTimeout = function() {
+  ReconnectingWebSocket2.prototype._handleTimeout = function() {
     this._debug("timeout event");
     this._handleError(new ErrorEvent$1(Error("TIMEOUT"), this));
   };
-  ReconnectingWebSocket.prototype._disconnect = function(code2, reason) {
+  ReconnectingWebSocket2.prototype._disconnect = function(code2, reason) {
     if (code2 === void 0) {
       code2 = 1e3;
     }
@@ -163137,18 +163160,18 @@ var DEFAULT = {
     } catch (error2) {
     }
   };
-  ReconnectingWebSocket.prototype._acceptOpen = function() {
+  ReconnectingWebSocket2.prototype._acceptOpen = function() {
     this._debug("accept open");
     this._retryCount = 0;
   };
-  ReconnectingWebSocket.prototype._callEventListener = function(event, listener) {
+  ReconnectingWebSocket2.prototype._callEventListener = function(event, listener) {
     if ("handleEvent" in listener) {
       listener.handleEvent(event);
     } else {
       listener(event);
     }
   };
-  ReconnectingWebSocket.prototype._removeListeners = function() {
+  ReconnectingWebSocket2.prototype._removeListeners = function() {
     if (!this._ws) {
       return;
     }
@@ -163158,7 +163181,7 @@ var DEFAULT = {
     this._ws.removeEventListener("message", this._handleMessage);
     this._ws.removeEventListener("error", this._handleError);
   };
-  ReconnectingWebSocket.prototype._addListeners = function() {
+  ReconnectingWebSocket2.prototype._addListeners = function() {
     if (!this._ws) {
       return;
     }
@@ -163168,12 +163191,12 @@ var DEFAULT = {
     this._ws.addEventListener("message", this._handleMessage);
     this._ws.addEventListener("error", this._handleError);
   };
-  ReconnectingWebSocket.prototype._clearTimeouts = function() {
+  ReconnectingWebSocket2.prototype._clearTimeouts = function() {
     clearTimeout(this._connectTimeout);
     clearTimeout(this._uptimeTimeout);
   };
-  return ReconnectingWebSocket;
-})();
+  return ReconnectingWebSocket2;
+}();
 var lib = {};
 var disposable = {};
 var services = {};
@@ -174725,7 +174748,10 @@ const ContentLayout = newStyled.div`
 `;
 const Editor = ({
   doc,
-  docType
+  docType,
+  containerStyle,
+  menuStyle,
+  editorStyle
 }) => {
   const divEl = react.exports.useRef(null);
   react.exports.useState(doc ? doc : "");
@@ -174798,12 +174824,20 @@ const Editor = ({
         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 = changes.sort((c1, c2) => c1.rangeOffset - c2.rangeOffset).map((change, i2) => {
-          rangeLengthamount += i2 === 0 ? 0 : change.rangeLength;
-          keepString += i2 === 0 ? 0 : change.text.length;
-          return new TextOperation().retain(i2 === 0 ? change.rangeOffset : change.rangeOffset - rangeLengthamount + keepString).delete(change.rangeLength).insert(change.text).retain(valuelength - change.rangeOffset - change.rangeLength);
-        }).reduce((a2, b2) => a2.compose(b2));
+        const operation = new TextOperation();
+        changes.sort((change1, change2) => change1.rangeOffset - change2.rangeOffset).forEach((change, index2, _array) => {
+          operation.retain(index2 === 0 ? change.rangeOffset : change.rangeOffset - preOffset).delete(change.rangeLength).insert(change.text);
+          if (index2 + 1 === _array.length) {
+            operation.retain(valuelength - change.rangeLength - change.rangeOffset);
+          }
+          preOffset = change.rangeOffset + change.rangeLength;
+          rangeLengthamount += change.rangeLength;
+          keepString += change.text.length;
+          rangeOffsetthamount += change.rangeOffset;
+        });
         client2.applyClient(operation);
       } else {
         setValue(changes[0].text);
@@ -174892,7 +174926,45 @@ const Editor = ({
       extensions: [".ts"],
       aliases: ["TypeScript", "ts", "TS", "typescript"]
     });
-    return;
+    if (disable)
+      return;
+    lib.MonacoServices.install(monaco);
+    const {
+      lspUrl,
+      ticket
+    } = oTStore.getState().dockerInfo;
+    if (!lspUrl)
+      return;
+    const webSocket = new ReconnectingWebSocket(`wss://${lspUrl}/${ticket}`, [], {
+      maxReconnectionDelay: 1e4,
+      minReconnectionDelay: 1e3,
+      reconnectionDelayGrowFactor: 1.3,
+      connectionTimeout: 1e4,
+      maxRetries: Infinity,
+      debug: false
+    });
+    lib$1.listen({
+      webSocket,
+      onConnection: (connection2) => {
+        const languageClient = new lib.MonacoLanguageClient({
+          name: "Language Client",
+          clientOptions: {
+            documentSelector: ["java", "ruby"],
+            errorHandler: {
+              error: () => lib.ErrorAction.Continue,
+              closed: () => lib.CloseAction.DoNotRestart
+            }
+          },
+          connectionProvider: {
+            get: (errorHandler2, closeHandler) => {
+              return Promise.resolve(lib.createConnection(connection2, errorHandler2, closeHandler));
+            }
+          }
+        });
+        const disposable2 = languageClient.start();
+        connection2.onClose(() => disposable2.dispose());
+      }
+    });
   };
   const switchModel = (model) => {
     const {
@@ -174933,13 +175005,14 @@ const Editor = ({
       });
       editor = editor$1.create(divEl.current, {
         theme: "vs-dark",
+        automaticLayout: true,
         glyphMargin: true,
         lightbulb: {
           enabled: true
         }
       });
-      lspServerInject(INIT_LANGUAGE, oTStore.getState().lspServerDisabled);
       editorEventBinder();
+      lspServerInject(INIT_LANGUAGE, oTStore.getState().lspServerDisabled);
       const editorService = editor._codeEditorService;
       const openEditorBase = editorService.openCodeEditor.bind(editorService);
       editorService.openCodeEditor = async (input, source, workspacePath) => {
@@ -174985,7 +175058,7 @@ const Editor = ({
           index2 += op;
         }
         if (TextOperation.isInsert(op)) {
-          const insert = model.getPositionAt(index2);
+          const insert = model == null ? void 0 : model.getPositionAt(index2);
           const originResult = {
             forceMoveMarkers: true,
             range: new Range$4(insert.lineNumber, insert.column, insert.lineNumber, insert.column),
@@ -174994,8 +175067,8 @@ const Editor = ({
           results.push(originResult);
         }
         if (TextOperation.isDelete(op)) {
-          const start = model.getPositionAt(index2);
-          const end = model.getPositionAt(index2 - op);
+          const start = model == null ? void 0 : model.getPositionAt(index2);
+          const end = model == null ? void 0 : model.getPositionAt(index2 - op);
           results.push({
             forceMoveMarkers: false,
             range: new Range$4(start.lineNumber, start.column, end.lineNumber, end.column),
@@ -175005,7 +175078,7 @@ const Editor = ({
         }
       });
       {
-        model.pushEditOperations([], results, null);
+        model == null ? void 0 : model.pushEditOperations([], results, null);
       }
     }
   }, [OTSTATE.CRDTInfo]);
@@ -175049,10 +175122,9 @@ const Editor = ({
           }));
         });
         setUsersDelta(usersDelta.map((deltaInfo) => {
-          var _a3;
           if (deltaInfo.uuid === CRDTInfo.userInfo.uuid) {
             return __spreadProps(__spreadValues({}, deltaInfo), {
-              delta: editor.deltaDecorations(deltaInfo.delta ? deltaInfo.delta : "", (_a3 = CRDTInfo == null ? void 0 : CRDTInfo.selection) == null ? void 0 : _a3.map((s2) => ({
+              delta: editor.deltaDecorations(deltaInfo.delta ? deltaInfo.delta : "", (CRDTInfo == null ? void 0 : CRDTInfo.selection).map((s2) => ({
                 range: new Range$4(s2[0], s2[1], s2[2], s2[3]),
                 options: {
                   isWholeLine: false,
@@ -175147,8 +175219,10 @@ const Editor = ({
     });
   }, [USERLISTSTORE.userList, file == null ? void 0 : file.path]);
   return /* @__PURE__ */ jsxs(EditorLayout, {
+    style: containerStyle,
     className: "editor-layout flex flex-col",
     children: [FileTreeStack.length > 0 ? /* @__PURE__ */ jsx("ul", {
+      style: menuStyle,
       className: "bg-codezone-black stack-list flex flex-row items-center flex-shrink-0",
       children: FileTreeStack.map((f2, index2) => /* @__PURE__ */ jsx("li", {
         className: `flex flex-row justify-center items-center cursor-pointer ${f2.path === (file == null ? void 0 : file.path) ? "active" : ""}`,
@@ -175160,7 +175234,8 @@ const Editor = ({
     }) : null, /* @__PURE__ */ jsx(ContentLayout, {
       ref: divEl,
       userList: userListStore.getState().userList,
-      className: "edito-content flex-1"
+      className: "edito-content flex-1",
+      style: editorStyle
     })]
   });
 };
@@ -182459,24 +182534,27 @@ const OutputBrowser = (_e2) => {
   react.exports.useEffect(() => {
   }, [iframeRef]);
   const onEnterKey = (e2) => {
+    var _a2, _b2;
     if (e2.keyCode !== 13)
       return;
     const url22 = urlWithProtocol(e2.target.value);
     setIframeSrc(url22);
-    iframeRef.current.contentWindow.location.replace(url22);
+    (_b2 = (_a2 = iframeRef == null ? void 0 : iframeRef.current) == null ? void 0 : _a2.contentWindow) == null ? void 0 : _b2.location.replace(url22);
   };
   const onRefresh = () => {
-    iframeRef.current.contentWindow.location.replace(iframeSrc);
+    var _a2, _b2;
+    (_b2 = (_a2 = iframeRef == null ? void 0 : iframeRef.current) == null ? void 0 : _a2.contentWindow) == null ? void 0 : _b2.location.replace(iframeSrc);
   };
   const onOpenInNewTab = () => {
     window.open(iframeSrc);
   };
   react.exports.useEffect(() => {
+    var _a2, _b2;
     if (playgroundStatus === "EMPTY")
       return;
     if (playgroundStatus === "ACTIVE" && dockerStatus === "RUNNING") {
       if (iframeSrc !== "http://" && iframeSrc !== "https://") {
-        iframeRef.current.contentWindow.location.replace(iframeSrc);
+        (_b2 = (_a2 = iframeRef == null ? void 0 : iframeRef.current) == null ? void 0 : _a2.contentWindow) == null ? void 0 : _b2.location.replace(iframeSrc);
       }
     }
   }, [playgroundStatus, dockerStatus]);
@@ -232587,6 +232665,7 @@ const Index = (props) => {
   };
   const isFolded = useIndexState.getState().isFolded;
   const playgroundInfo = oTStore((state) => state.playgroundInfo);
+  const dockerInfo = oTStore((state) => state.dockerInfo);
   const [active, setActive] = react.exports.useState("shell");
   const [url2, setUrl] = react.exports.useState(playgroundInfo.url);
   const {
@@ -232625,7 +232704,7 @@ const Index = (props) => {
           children: [/* @__PURE__ */ jsx(SliderComponent, {}), /* @__PURE__ */ jsx(TreeComponent, {})]
         }), /* @__PURE__ */ jsx("section", {
           className: "bg-codezone-black rounded-sm mx-3.5 flex-1 flex flex-col",
-          children: playgroundInfo.dockerId ? /* @__PURE__ */ jsx(react.exports.Suspense, {
+          children: dockerInfo.dockerId ? /* @__PURE__ */ jsx(react.exports.Suspense, {
             fallback: /* @__PURE__ */ jsx(Skeleton, {
               count: 10
             }),