@dao42/d42paas-front 0.9.7 → 0.9.8

package/dist/DaoPaaS.es.js

@@ -9114,18 +9114,19 @@ const mapValuesKey = (key, obj) => mapValues_1(obj, (value2) => value2[key]);
 const defaultDaoStoreData = {
   amDoing: "coding",
   _channel: null,
-  _channelConnected: false,
+  _channelAvailable: false,
   appStatus: "drafted",
+  currentAgentUserId: "",
   CRDTInfo: {
     agentUserId: ""
   },
   playgroundInfo: {
-    agentUserId: "",
     playgroundId: "",
     status: "EMPTY",
     dockerInfo: {},
     agentUsers: new Array(),
     playgroundIDEServerStatus: "NOT_SYNC",
+    playgroundIDEServerStatusReason: "",
     filePath: "",
     fileTree: null,
     fileTreeIgnore: "",
@@ -9147,24 +9148,20 @@ const defaultDaoStoreData = {
 };
 const DaoStore = createStore$1("dao")(defaultDaoStoreData).extendSelectors((state, get2, _api) => ({
   channel: () => {
-    if (!get2._channelConnected()) {
+    if (!get2._channelAvailable()) {
       return null;
     }
     return get2._channel();
   },
   currentAgentUser: () => {
-    const currentAgentUserId = get2.playgroundInfo().agentUserId;
-    if (!currentAgentUserId) {
+    const currentAgentUserId2 = get2.currentAgentUserId();
+    if (!currentAgentUserId2) {
       return null;
     }
-    return get2.playgroundInfo().agentUsers.find((item) => item.agentUserId === currentAgentUserId);
+    return get2.playgroundInfo().agentUsers.find((item) => item.agentUserId === currentAgentUserId2);
   },
   getAgentUserById: (agentUserId) => {
     return get2.playgroundInfo().agentUsers.find((item) => item.agentUserId === agentUserId);
-  },
-  getTenantPlaygroundInfo: () => {
-    const playgroundInfo = get2.playgroundInfo();
-    return __spreadValues({}, playgroundInfo);
   }
 })).extendSelectors((state, get2, _api) => ({
   getFollowingAgentUser: () => {
@@ -9192,20 +9189,11 @@ const DaoStore = createStore$1("dao")(defaultDaoStoreData).extendSelectors((stat
   setChannel: (channel) => {
     set._channel(channel);
   },
-  setChannelConnected: (connected) => {
-    set._channelConnected(connected);
-  },
   setCRDTInfo: (crdt) => {
     set.CRDTInfo(crdt);
   },
   setPlaygroundInfo: (playgroundInfo) => {
-    const agentUserId = playgroundInfo.agentUserId || sessionStorage.getItem("agentUserId") || "";
-    if (playgroundInfo.agentUserId && agentUserId && playgroundInfo.agentUserId !== agentUserId) {
-      throw new Error("setPlaygroundInfo with wrong agentUserId");
-    }
-    set.playgroundInfo(__spreadProps(__spreadValues({}, playgroundInfo), {
-      agentUserId
-    }));
+    set.playgroundInfo(playgroundInfo);
   }
 })).extendActions((set, get2, _api) => ({
   updateAgentUser: (agentUserId, data) => {
@@ -11439,7 +11427,7 @@ const Loading$1 = () => {
   });
 };
 const name$1 = "@dao42/d42paas-front";
-const version = "0.9.6";
+const version = "0.9.7";
 const description = "d42paas front";
 const author = "dao42 paas team";
 const homepage = "https://github.com/dao42/d42paas_frontend#readme";
@@ -11640,7 +11628,7 @@ const requestChannelPathFromTicket = async (paasDomainPath, ticket, sdkVersion)
   return channelPath;
 };
 var index$8 = "";
-const IsMe = (agentUserId) => sessionStorage.getItem("agentUserId") === agentUserId;
+const IsMe = (agentUserId) => store.dao.currentAgentUserId() === agentUserId;
 const getFileTreeItemByFilePath = (path) => {
   const filetree = store.dao.playgroundInfo().fileTree;
   let tree2 = null;
@@ -13808,6 +13796,108 @@ const ConnectionBroken = "connectionBroken";
 const AuthorizationFailed = "authorizationFailed";
 const ErrorFromServer = "errorFromServer";
 const Authorize = "auth";
+class TabsBroadcaster {
+  constructor(name2, timeout2 = 2e3) {
+    __publicField(this, "name");
+    __publicField(this, "channel");
+    __publicField(this, "_timeout");
+    __publicField(this, "_messageId");
+    __publicField(this, "_messages");
+    __publicField(this, "_filter");
+    this.name = name2;
+    this._messageId = 0;
+    this.channel = new BroadcastChannel(name2);
+    this.channel.onmessage = (event) => this.receive(event);
+    this._messages = [];
+    this._timeout = timeout2;
+  }
+  setFilter(filter) {
+    this._filter = filter;
+  }
+  send(content, timeout2) {
+    const task = new TaskItem(timeout2 || this._timeout);
+    const promise = new Promise((resolve2, reject) => {
+      task._reject = reject;
+      task._resolve = resolve2;
+    });
+    this._messages.push(task);
+    this.channel.postMessage({
+      id: this._messageId++,
+      type: "request",
+      payload: content
+    });
+    return promise;
+  }
+  answer(messageId, content) {
+    this.channel.postMessage({
+      id: messageId,
+      type: "response",
+      payload: content
+    });
+  }
+  receive(event) {
+    const data = event.data;
+    if (data.type === "request") {
+      if (!this._filter || this._filter(data.payload)) {
+        this.answer(data.id, { active: true });
+      }
+    } else if (data.type === "response") {
+      const task = this._messages[data.id];
+      task.reject(data.payload);
+    }
+  }
+}
+class TaskItem {
+  constructor(timeout2) {
+    __publicField(this, "_resolve");
+    __publicField(this, "_reject");
+    __publicField(this, "_interval");
+    this._interval = setTimeout(() => this.resolve({ active: false, reason: "timeout, no one uses it" }), timeout2);
+  }
+  resolve(value2) {
+    clearTimeout(this._interval);
+    this._resolve(value2);
+  }
+  reject(reason) {
+    this._reject(reason);
+  }
+}
+const broadcaster = new TabsBroadcaster("dao-paas", 500);
+let currentAgentUserId;
+async function findAvailableAgentUserId() {
+  let currentAgentUserId2 = "";
+  broadcaster.setFilter((item) => {
+    return item.id === currentAgentUserId2;
+  });
+  const agentUsers = JSON.parse(localStorage.getItem("agentUsers") || "[]") || [];
+  const requests = [];
+  for (const item of agentUsers) {
+    const response = broadcaster.send(item).then(() => {
+      if (currentAgentUserId2 === "") {
+        item.time = new Date().getTime();
+        currentAgentUserId2 = item.id;
+        localStorage.setItem("agentUsers", JSON.stringify(agentUsers));
+        return Promise.resolve(currentAgentUserId2);
+      }
+    });
+    requests.push(response);
+  }
+  return Promise.any(requests);
+}
+function storeAgentUserId(agentUserId) {
+  const agentUsers = JSON.parse(localStorage.getItem("agentUsers") || "[]") || [];
+  const item = agentUsers.find((value2) => value2.id == agentUserId);
+  if (item) {
+    item.time = new Date().getTime();
+  } else {
+    agentUsers.push({ id: agentUserId, time: new Date().getTime() });
+  }
+  localStorage.setItem("agentUsers", JSON.stringify(agentUsers));
+  currentAgentUserId = agentUserId;
+}
+function verifyAgentUserId(agentUserId) {
+  return agentUserId === currentAgentUserId;
+}
 class DaoChannel {
   constructor(ioPath, authOptions, maxReconnectionAttemps = 10) {
     __publicField(this, "socket");
@@ -13845,14 +13935,13 @@ class DaoChannel {
     });
     this.registerEventsOnSocket();
     this.socket.on("connect", () => {
-      actions.dao._channelConnected(true);
       this.authorize();
       if (store.dao.isReadyOffline()) {
         this.transitionOnline();
       }
     });
     this.socket.on("disconnect", () => {
-      actions.dao._channelConnected(false);
+      actions.dao._channelAvailable(false);
       this.clearHeartbeatInterval();
       if (store.dao.isReady()) {
         this.transitionOffline();
@@ -13869,14 +13958,14 @@ class DaoChannel {
         return;
       }
       const { agentUserId } = data;
-      const sessionAgentUserId = sessionStorage.getItem("agentUserId");
-      if (sessionAgentUserId && sessionAgentUserId !== agentUserId) {
-        throw new Error(`Local sessionAgentUserId ${sessionAgentUserId} is not same with ${agentUserId}`);
+      storeAgentUserId(agentUserId);
+      if (!verifyAgentUserId(agentUserId)) {
+        throw new Error(`The agentUserId ${agentUserId} is inconsistent`);
       }
       this.setHeartbeatInterval();
-      sessionStorage.setItem("agentUserId", agentUserId || "");
       this.authOptions.agentUserId = agentUserId;
-      this.updatePlaygroundInfoPartial({ agentUserId });
+      this.updateCurrentAgentUserId(agentUserId);
+      actions.dao._channelAvailable(true);
     });
   }
   authorize() {
@@ -13887,6 +13976,10 @@ class DaoChannel {
       throw new Error("The connection has not been established yet.");
     }
     this.socket.on("syncPlaygroundInfo", (playgroundInfo) => {
+      if (playgroundInfo.playgroundIDEServerStatus === "ERROR") {
+        this.transitionError(ErrorFromServer, playgroundInfo.playgroundIDEServerStatusReason);
+        return;
+      }
       if (store.dao.appStatus() === "loading") {
         this.initAppStatusLoadingPlaygroundInfo(playgroundInfo);
         return;
@@ -13897,6 +13990,20 @@ class DaoChannel {
       }
       console.warn("syncPlaygroundInfo event happened at a wrong appStatus");
     });
+    this.socket.on("active", (message) => {
+      const { success, reason } = message;
+      const errorInfoMap = {
+        SUCCESS: "\u6210\u529F",
+        PLAYGROUND_NOT_EXISTED: "playground\u4E0D\u5B58\u5728",
+        DOCKER_NOT_BIND: "playground\u672A\u7ED1\u5B9A\u5BB9\u5668",
+        DOCKER_START_FAIL: "\u5BB9\u5668\u542F\u52A8\u5931\u8D25",
+        RESOURCE_NOT_ENOUG: "\u670D\u52A1\u5668\u8D44\u6E90\u4E0D\u8DB3",
+        BUSY: "\u670D\u52A1\u5668\u7E41\u5FD9"
+      };
+      if (!success) {
+        this.transitionError(ErrorFromServer, `\u542F\u52A8\u5931\u8D25: ${errorInfoMap[reason] || reason}`);
+      }
+    });
     this.socket.on("following", (user) => {
       const { agentUsers } = store.dao.playgroundInfo();
       const index2 = agentUsers.findIndex((agentUser) => agentUser.userId === user.agentUserId);
@@ -13954,7 +14061,7 @@ class DaoChannel {
       this.updateCRDTInfo(data);
     });
     this.socket.on("fileContent", (data) => {
-      const { agentUsers, agentUserId } = store.dao.playgroundInfo();
+      const agentUserId = store.dao.currentAgentUserId();
       const switchDoc = actions.currentDoc.switchDoc;
       const currentAgentUser = store.dao.currentAgentUser();
       const updateAgentUser = actions.dao.updateAgentUser;
@@ -14024,8 +14131,8 @@ class DaoChannel {
     this.socket.onAny((eventName, _data2) => {
       console.debug(`<< ${eventName}`);
     });
-    this.socket.on("errorHandler", (message) => {
-      this.transitionError(ErrorFromServer, message.content);
+    this.socket.on("errorHandler", (data) => {
+      this.transitionError(ErrorFromServer, `${data.name}: ${data.message}`);
     });
   }
   initAppStatusLoadingPlaygroundInfo(playgroundInfo) {
@@ -14075,6 +14182,9 @@ class DaoChannel {
   updatePlaygroundInfoPartial(data) {
     actions.dao.setPlaygroundInfo(__spreadValues(__spreadValues({}, store.dao.playgroundInfo()), data));
   }
+  updateCurrentAgentUserId(agentUserId) {
+    actions.dao.currentAgentUserId(agentUserId);
+  }
   updateCRDTInfo(data) {
     actions.dao.setCRDTInfo(data);
   }
@@ -14298,9 +14408,13 @@ class DaoPaaS {
   async init() {
     console.debug(`sdk: init with ${this.paasDomainPath} passDomain`);
     const channelPath = await requestChannelPathFromTicket(this.paasDomainPath, this.paasOptions.ticket, this.sdkVersion);
-    const sessionAgentId = sessionStorage.getItem("agentUserId") || "";
+    let agentUserId;
+    try {
+      agentUserId = await findAvailableAgentUserId();
+    } catch (e2) {
+    }
     const channel = new DaoChannel(channelPath, __spreadProps(__spreadValues({}, this.paasOptions), {
-      agentUserId: sessionAgentId
+      agentUserId
     }));
     this._onMessage && channel.setOnMessage(this._onMessage);
     this._onError && channel.setOnError(this._onError);
@@ -158462,7 +158576,7 @@ const Skeleton = ({
 };
 function useFileTree() {
   const playgroundInfo = useStore$1().dao.playgroundInfo();
-  const { agentUserId, agentUsers } = playgroundInfo;
+  const { agentUsers } = playgroundInfo;
   const getAgentUserById = store.dao.getAgentUserById;
   const once3 = react.exports.useRef(false);
   const user = useStore$1().dao.currentAgentUser();
@@ -158476,7 +158590,7 @@ function useFileTree() {
     if (fileOpened) {
       const crdt = {
         timestamp: Date.now(),
-        agentUserId,
+        agentUserId: store.dao.currentAgentUserId(),
         file: {
           action: "Get",
           path: fileOpened
@@ -158485,7 +158599,7 @@ function useFileTree() {
       (_a2 = store.dao.channel()) == null ? void 0 : _a2.send("fileContent", crdt);
       once3.current = true;
     }
-  }, [agentUserId, fileOpened]);
+  }, [fileOpened]);
   const getAgentUsers = react.exports.useCallback((path) => {
     return agentUsers.filter((u2) => {
       if (u2.followingAgentUserId) {
@@ -179406,7 +179520,6 @@ const FileTree = ({
   const moduleLoading = useStore$1().loading.moduleLoading();
   const setModuleLoading = actions.loading.setModuleLoading;
   const {
-    agentUserId,
     fileTree,
     fileTreeIgnore = ""
   } = useStore$1().dao.playgroundInfo();
@@ -179502,7 +179615,7 @@ const FileTree = ({
       if (amDoing === "coding") {
         const crdt = {
           timestamp: Date.now(),
-          agentUserId,
+          agentUserId: store.dao.currentAgentUserId(),
           file: {
             action: "Get",
             path: items[0]
@@ -183075,8 +183188,6 @@ function AwaitingWithBuffer(outstanding, buffer) {
 }
 IoClient.AwaitingWithBuffer = AwaitingWithBuffer;
 AwaitingWithBuffer.prototype.applyClient = function(client2, operation) {
-  console.log("operation", operation);
-  console.log("buffer", this.buffer);
   const newBuffer = this.buffer.compose(operation);
   return new AwaitingWithBuffer(this.outstanding, newBuffer);
 };
@@ -206926,19 +207037,6 @@ function useTerminal(terminal, terminalRef, onData) {
       }
       onData == null ? void 0 : onData(character2);
     });
-    term.attachCustomKeyEventHandler((e2) => {
-      var _a2, _b2;
-      const ctrlOrCmd = e2.metaKey || e2.ctrlKey;
-      if (e2.type === "keyup")
-        return false;
-      if (e2.key === "v" && ctrlOrCmd) {
-        if ((_a2 = e2.view) == null ? void 0 : _a2.navigator.clipboard) {
-          (_b2 = e2.view) == null ? void 0 : _b2.navigator.clipboard.readText().then((res) => onData == null ? void 0 : onData(res));
-        }
-        return false;
-      }
-      return true;
-    });
     term.onResize(({
       cols,
       rows
@@ -207010,7 +207108,6 @@ function Console(_c2, ref) {
     }
   }), [options]);
   const {
-    agentUserId,
     dockerInfo
   } = useStore$1().dao.playgroundInfo();
   const amDoing = useStore$1().dao.amDoing();
@@ -207041,7 +207138,11 @@ function Console(_c2, ref) {
     terminal.reset();
   });
   const consoleHistorySetter = (consoleHistory, terminal2) => {
-    terminal2.write(consoleHistory);
+    terminalWrite(consoleHistory);
+  };
+  const terminalWrite = (value2) => {
+    const trimValue = value2.replace(/\r\n/g, "\n").replace(/\r|\n/g, "\r\n");
+    terminal.write(trimValue);
   };
   const onData = (char2) => {
     var _a2;
@@ -207050,7 +207151,7 @@ function Console(_c2, ref) {
     }
     const crdt = {
       timestamp: Date.now(),
-      agentUserId,
+      agentUserId: store.dao.currentAgentUserId(),
       console: {
         action: "Edit",
         value: char2
@@ -207071,8 +207172,10 @@ function Console(_c2, ref) {
       terminal.reset();
       return;
     }
-    if (terminalValueContent) {
-      terminal.write((terminalValueContent == null ? void 0 : terminalValueContent.value) || "");
+    if (terminalValueContent && terminalValueContent.value) {
+      terminalWrite(terminalValueContent.value);
+    } else {
+      terminalWrite("");
     }
   }, [CRDTInfo, terminal]);
   react.exports.useEffect(() => {
@@ -207084,7 +207187,7 @@ function Console(_c2, ref) {
   }, [dockerInfo, hasInit, terminal]);
   react.exports.useEffect(() => {
     if (terminal) {
-      consoleHistorySetter(consoleValue, terminal);
+      consoleHistorySetter(consoleValue);
     }
   }, [consoleValue, terminal]);
   return /* @__PURE__ */ jsx(FollowLayout, {
@@ -207308,7 +207411,6 @@ const TerminalComponent = (_g2, ref) => {
   const userLabel = document.createElement("div");
   userLabel.classList.add("xterm-helper-user-label");
   const {
-    agentUserId,
     dockerInfo
   } = useStore$1().dao.playgroundInfo();
   const amDoing = useStore$1().dao.amDoing();
@@ -207340,7 +207442,7 @@ const TerminalComponent = (_g2, ref) => {
     }
     const crdt = {
       timestamp: Date.now(),
-      agentUserId,
+      agentUserId: store.dao.currentAgentUserId(),
       terminal: {
         action: "Edit",
         value: char2