pinokiod 7.3.1 → 7.3.4

package/server/views/editor.ejs

@@ -143,6 +143,7 @@ body.frozen {
 <script>
 let shell_id
 document.addEventListener("DOMContentLoaded", async () => {
+  const readOnly = <%= readonly ? "true" : "false" %>;
   <% if (error) { %>
     document.querySelector(".requirements .content").innerHTML = '<div class="loading"><i class="fa-solid fa-circle-exclamation"></i> <%=error%></div>'
   <% } %>
@@ -195,6 +196,7 @@ document.addEventListener("DOMContentLoaded", async () => {
 //      maxLines: Infinity, // set to a large number
       minLines: 1 // set to a small number
     });
+    editor.setReadOnly(readOnly);
     console.log("location.pathname", location.pathname)
     <% if (mod) { %>
       <% if (js) { %>
@@ -231,6 +233,9 @@ document.addEventListener("DOMContentLoaded", async () => {
     let str;
     let original = editor.getValue()
     editor.getSession().on("change", () => {
+      if (readOnly) {
+        return
+      }
       let v = editor.getValue()
       if (original === v) {
         dirty = false
@@ -243,6 +248,70 @@ document.addEventListener("DOMContentLoaded", async () => {
     });
   <% } %>
   const n = new N()
+  const postMessageToAncestors = (payload) => {
+    if (!payload || typeof payload !== "object") {
+      return false
+    }
+    if (typeof window !== "undefined" && typeof window.PinokioBroadcastMessage === "function") {
+      try {
+        if (window.PinokioBroadcastMessage(payload, "*", window)) {
+          return true
+        }
+      } catch (_) {}
+    }
+    const targets = new Set()
+    try {
+      if (window.parent && window.parent !== window && typeof window.parent.postMessage === "function") {
+        targets.add(window.parent)
+      }
+    } catch (_) {}
+    try {
+      if (window.top && window.top !== window && typeof window.top.postMessage === "function") {
+        targets.add(window.top)
+      }
+    } catch (_) {}
+    let dispatched = false
+    targets.forEach((target) => {
+      try {
+        target.postMessage(payload, "*")
+        dispatched = true
+      } catch (_) {}
+    })
+    return dispatched
+  }
+  const openAppLogsForError = (packet) => {
+    return postMessageToAncestors({
+      e: "pinokio:logs-new",
+      type: "pinokio:logs-new",
+      reason: "error",
+      frame: window.name || null,
+      source: "editor"
+    })
+  }
+  const showErrorScreen = (packet) => {
+    const errorScreen = document.querySelector("#error-screen")
+    const errorOutput = errorScreen ? errorScreen.querySelector("pre") : null
+    if (!errorScreen || !errorOutput) {
+      return
+    }
+    errorScreen.classList.remove("hidden")
+    errorOutput.textContent = packet && packet.data ? packet.data : ""
+    let instance = new Mark(errorOutput, {
+      separateWordSearch: false,
+      accuracy: "exactly"
+    })
+    if (packet && packet.event) {
+      instance.mark(packet.event)
+      let element = errorScreen.querySelector("mark")
+      if (element) {
+        element.scrollIntoView({ behavior: "smooth", block: "center" })
+      }
+    }
+  }
+  const activeProcessWait = <% if (typeof active_process_wait !== 'undefined' && active_process_wait) { %><%- JSON.stringify(active_process_wait) %><% } else { %>null<% } %>
+  if (activeProcessWait && (activeProcessWait.title || activeProcessWait.description || activeProcessWait.message) && window.PinokioWaitFooterStatus) {
+    window.PinokioWaitFooterStatus.show(activeProcessWait)
+  }
   class RPC {
     constructor() {
       this.socket = new Socket()
@@ -275,6 +344,10 @@ document.addEventListener("DOMContentLoaded", async () => {
     }
     save() {
       return new Promise((resolve, reject) => {
+        if (readOnly) {
+          resolve()
+          return
+        }
         let cwd = "<%-JSON.stringify(execUrl).slice(1, -1)%>"
         //let cwd = "<%=execUrl%>"
         //let cwd = "~" + location.pathname
@@ -432,6 +505,14 @@ document.addEventListener("DOMContentLoaded", async () => {
               response: {},
               uri: packet.id
             })
+          } else if (packet.type === "process.wait.start") {
+            if (window.PinokioWaitFooterStatus) {
+              window.PinokioWaitFooterStatus.show(packet.data)
+            }
+          } else if (packet.type === "process.wait.end") {
+            if (window.PinokioWaitFooterStatus) {
+              window.PinokioWaitFooterStatus.hide()
+            }
           } else if (packet.type === 'wait') {
             await WaitModal(packet.data)
           } else if (packet.type === "htmlmodal") {
@@ -603,23 +684,8 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".run .starting").classList.add("hidden")
             document.querySelector(".run .stop").classList.add("hidden")
 
-            document.querySelector("#error-screen").classList.remove("hidden")
-            document.querySelector("#error-screen pre").textContent = packet.data
-            let instance = new Mark(document.querySelector("#error-screen pre"), {
-              separateWordSearch: false,
-              accuracy: "exactly"
-            })
-            /*
-            document.querySelector("#error-screen").addEventListener("click", (e) => {
-              document.querySelector("#error-screen").classList.add("hidden")
-            })
-            */
-            if (packet.event) {
-              instance.mark(packet.event)
-              let element = document.querySelector("#error-screen mark")
-              if (element) {
-                element.scrollIntoView({ behavior: "smooth", block: "center" })
-              }
+            if (!openAppLogsForError(packet)) {
+              showErrorScreen(packet)
             }
 
           } else if (packet.type === "event") {
@@ -734,7 +800,7 @@ document.addEventListener("DOMContentLoaded", async () => {
         term.loadAddon(fitAddon);
         <% if (agent === "electron") { %>
           term.loadAddon(new WebLinksAddon.WebLinksAddon((event, uri) => {
-            window.open(uri, "_blank")
+            window.open(uri, "_blank", "browser")
           }))
         <% } else { %>
           term.loadAddon(new WebLinksAddon.WebLinksAddon());
@@ -959,7 +1025,7 @@ const reloadMemory = async () => {
       <!--
       <button class='btn' id='source' data-editor-url="<%=editorUrl%>">Navigate</button>
       -->
-      <div id='save' class='btn disabled'>
+      <div id='save' class='btn disabled <%= readonly ? "hidden" : "" %>'>
         <span class='save'><i class="fa-solid fa-check"></i> Save</span>
       </div>
     </div>