pinokiod 7.1.74 → 7.1.75

package/kernel/shells.js

@@ -301,6 +301,7 @@ class Shells {
     let liveEventBuffer = ""
     let liveEventOffset = 0
     let liveEventAnsiCarry = ""
+    let liveEventHandlersClosed = false
 
     // Keep cross-chunk event matching, but normalize terminal styling away first.
     // Preserve line boundaries so later shell banners cannot fuse onto prior matches.
@@ -428,7 +429,7 @@ class Shells {
           liveEventOffset += normalizedChunk.length
         }
         const liveEventBufferStart = Math.max(0, liveEventOffset - liveEventBuffer.length)
-        if (params.on && Array.isArray(params.on)) {
+        if (!liveEventHandlersClosed && params.on && Array.isArray(params.on)) {
           for(let i=0; i<params.on.length; i++) {
             let handler = params.on[i]
             if (handler.once && onceHandlers.has(i)) {
@@ -476,11 +477,18 @@ class Shells {
                     }
                     const lastMatch = rendered_event[rendered_event.length - 1]
                     handlerLastMatchEnd.set(i, liveEventBufferStart + lastMatch.index + lastMatch[0].length)
-                    stream.matches = rendered_event
-                    m = rendered_event[0]
-                    matched_index = i
-                    if (typeof handler.trigger === "string" && handler.trigger.trim()) {
-                      const triggerAction = handler.trigger.trim()
+                    const triggerAction = typeof handler.trigger === "string" ? handler.trigger.trim() : ""
+                    const shouldCaptureEvent =
+                      handler.break !== false
+                      || handler.done
+                      || handler.kill
+                      || !!triggerAction
+                    if (shouldCaptureEvent) {
+                      stream.matches = rendered_event
+                      m = rendered_event[0]
+                      matched_index = i
+                    }
+                    if (triggerAction) {
                       queueTriggerAction(triggerAction, rendered_event[0]).catch((e) => {
                         console.log("Trigger error", e)
                         if (ondata) {
@@ -490,9 +498,13 @@ class Shells {
                     }
                     if (handler.kill) {
                       sh.kill()
+                      liveEventHandlersClosed = true
+                      break
                     }
                     if (handler.done) {
                       sh.continue()
+                      liveEventHandlersClosed = true
+                      break
                     }
                   }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "7.1.74",
+  "version": "7.1.75",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/views/app.ejs

@@ -5266,7 +5266,7 @@ header.navheader .mode-selector .community-mode-toggle {
             <% if (config.menu) { %>
               <%- include('./partials/menu', { menu: config.menu, }) %>
             <% } %>
-            <a id='settings-tab' data-mode="refresh" target="env-settings" href="/env/api/<%=name%>" class="btn header-item frame-link" data-index="settings" data-static="retain">
+            <a id='settings-tab' data-mode="refresh" target="env-settings" href="/env/api/<%=name%>?host=app" class="btn header-item frame-link" data-index="settings" data-static="retain">
               <div class='tab'>
                 <i class="fa-solid fa-gear"></i>
                 <div class='display'>Settings</div>

package/server/views/env_editor.ejs

@@ -363,6 +363,16 @@ body.dark .toggle-slider {
 <script>
 document.addEventListener("DOMContentLoaded", async () => {
   const n = new N()
+  const navigateHome = () => {
+    const isAppHost = new URLSearchParams(window.location.search || "").get("host") === "app"
+    if (isAppHost && window.parent && window.parent !== window) {
+      try {
+        window.parent.location.assign("/home")
+        return
+      } catch (_) {}
+    }
+    window.location.assign("/home")
+  }
   const protectionInput = document.querySelector("#protection-enabled")
   const protectionState = document.querySelector("[data-protection-state]")
   const syncProtectionState = () => {
@@ -446,7 +456,7 @@ document.addEventListener("DOMContentLoaded", async () => {
           }).then((response) => response.json())
           Swal.close()
           if (res && res.success) {
-            location.href = "/home"
+            navigateHome()
           } else if (res && res.error) {
             alert(res.error)
           } else {