pinokiod 5.3.3 → 5.3.5

package/package.json

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

package/server/index.js

@@ -1099,6 +1099,7 @@ class Server {
       git_fork_url: `/run/scripts/git/fork.json?cwd=${encodeURIComponent(this.kernel.path('api', name))}`
 //      rawpath,
     }
+    result.snapshotFooterEnabled = !!(options && options.snapshotFooterEnabled)
     result.hasSnapshots = !!(options && options.hasSnapshots)
     result.pendingSnapshotId = options && options.pendingSnapshotId ? String(options.pendingSnapshotId) : null
     const registryBetaEnabled = await this.isRegistryBetaEnabled().catch(() => false)
@@ -9162,20 +9163,30 @@ class Server {
       })
     }))
     this.app.get("/p/:name/dev", ex(async (req, res) => {
-      const { hasSnapshots, pendingSnapshotId } = await this.getSnapshotStatus(req.params.name)
-      await this.chrome(req, res, "browse", { hasSnapshots, pendingSnapshotId })
+      await this.chrome(req, res, "browse")
     }))
     this.app.get("/p/:name/files", ex(async (req, res) => {
-      const { hasSnapshots, pendingSnapshotId } = await this.getSnapshotStatus(req.params.name)
-      await this.chrome(req, res, "files", { hasSnapshots, pendingSnapshotId })
+      await this.chrome(req, res, "files")
     }))
     this.app.get("/p/:name/browse", ex(async (req, res) => {
+      await this.chrome(req, res, "browse")
+    }))
+    this.app.get("/p/:name/snapshot_status", ex(async (req, res) => {
+      let d = Date.now()
+      console.time("/snapshot/" + req.params.name + "/" + d)
       const { hasSnapshots, pendingSnapshotId } = await this.getSnapshotStatus(req.params.name)
-      await this.chrome(req, res, "browse", { hasSnapshots, pendingSnapshotId })
+      res.json({
+        ok: true,
+        hasSnapshots: !!hasSnapshots,
+        pendingSnapshotId: pendingSnapshotId ? String(pendingSnapshotId) : ""
+      })
+      console.timeEnd("/snapshot/" + req.params.name + "/" + d)
     }))
     this.app.get("/p/:name", ex(async (req, res) => {
-      const { hasSnapshots, pendingSnapshotId } = await this.getSnapshotStatus(req.params.name)
-      await this.chrome(req, res, "run", { hasSnapshots, pendingSnapshotId })
+      let d = Date.now()
+      console.time("/p/" + req.params.name + "/" + d)
+      await this.chrome(req, res, "run", { snapshotFooterEnabled: true })
+      console.timeEnd("/p/" + req.params.name + "/" + d)
     }))
     this.app.post("/pinokio/delete", ex(async (req, res) => {
       try {

package/server/views/app.ejs

@@ -3456,8 +3456,8 @@ body.dark .snapshot-footer-input input {
 (function() {
   try {
     var workspace = <%- JSON.stringify(name || "") %>
-    var pendingSnapshotId = <%- JSON.stringify(pendingSnapshotId ? String(pendingSnapshotId) : "") %>
-    if (!workspace || pendingSnapshotId) {
+    var snapshotFooterEnabled = <%- JSON.stringify(!!snapshotFooterEnabled) %>
+    if (!workspace || !snapshotFooterEnabled) {
       return
     }
     var key = "pinokio.snapshot-footer.dismissed:" + workspace
@@ -3703,9 +3703,9 @@ body.dark .snapshot-footer-input input {
       <% } %>
     </main>
     <% const registryEnabled = typeof registryBetaEnabled === "undefined" ? false : registryBetaEnabled; %>
-    <% const showSnapshotFooter = typeof hasSnapshots === "undefined" ? true : (!hasSnapshots || (registryEnabled && pendingSnapshotId)); %>
-    <% if (showSnapshotFooter) { %>
-      <div class='snapshot-footer' data-workspace="<%=name%>" data-pending-snapshot-id="<%= pendingSnapshotId ? pendingSnapshotId : '' %>" data-registry-beta-enabled="<%= registryEnabled ? '1' : '0' %>">
+    <% const snapshotFooterAllowed = typeof snapshotFooterEnabled === "undefined" ? false : snapshotFooterEnabled; %>
+    <% if (snapshotFooterAllowed) { %>
+      <div class='snapshot-footer hidden' data-workspace="<%=name%>" data-pending-snapshot-id="<%= pendingSnapshotId ? pendingSnapshotId : '' %>" data-registry-beta-enabled="<%= registryEnabled ? '1' : '0' %>">
         <div class="snapshot-footer-save <%= registryEnabled && pendingSnapshotId ? 'hidden' : '' %>">
           <div class='caption' title="<%= registryEnabled ? 'Saves a tiny JSON checkpoint of exact commit hashes (no files). You can publish it after saving.' : 'Saves a tiny JSON checkpoint of exact commit hashes (no files).' %>">
             Snapshot installed modules information and restore later
@@ -9737,7 +9737,8 @@ document.addEventListener("DOMContentLoaded", () => {
     footer.classList.add("hidden")
     return
   }
-  const pendingSnapshotId = footer.getAttribute("data-pending-snapshot-id")
+  footer.classList.add("hidden")
+  let pendingSnapshotId = footer.getAttribute("data-pending-snapshot-id") || ""
   const dismissStorageKey = `pinokio.snapshot-footer.dismissed:${workspace}`
   const getDismissedState = () => {
     try {
@@ -9755,9 +9756,12 @@ document.addEventListener("DOMContentLoaded", () => {
       }
     } catch (_) {}
   }
-  if (!pendingSnapshotId && getDismissedState()) {
-    footer.classList.add("hidden")
-    return
+  const setDismissedClass = (dismissed) => {
+    if (dismissed) {
+      document.documentElement.classList.add("snapshot-footer-dismissed")
+    } else {
+      document.documentElement.classList.remove("snapshot-footer-dismissed")
+    }
   }
   let savedSnapshotId = null
   const saveOriginal = saveBtn.innerHTML
@@ -9783,10 +9787,47 @@ document.addEventListener("DOMContentLoaded", () => {
     if (publishPanel) publishPanel.classList.remove("hidden")
     if (savePanel) savePanel.classList.add("hidden")
   }
-  if (pendingSnapshotId) {
-    savedSnapshotId = pendingSnapshotId
-    showPublishPanel()
+  const showSavePanel = () => {
+    if (savePanel) savePanel.classList.remove("hidden")
+    if (publishPanel) publishPanel.classList.add("hidden")
+  }
+  const applySnapshotStatus = (status) => {
+    const hasSnapshots = !!(status && status.hasSnapshots)
+    pendingSnapshotId = status && status.pendingSnapshotId ? String(status.pendingSnapshotId) : ""
+    footer.setAttribute("data-pending-snapshot-id", pendingSnapshotId)
+    const shouldShow = !hasSnapshots || (registryBetaEnabled && pendingSnapshotId)
+    if (!shouldShow) {
+      setDismissedClass(false)
+      footer.classList.add("hidden")
+      return
+    }
+    const dismissed = !pendingSnapshotId && getDismissedState()
+    setDismissedClass(dismissed)
+    if (dismissed) {
+      footer.classList.add("hidden")
+      return
+    }
+    footer.classList.remove("hidden")
+    if (pendingSnapshotId) {
+      savedSnapshotId = pendingSnapshotId
+      showPublishPanel()
+    } else {
+      showSavePanel()
+    }
+  }
+  const loadSnapshotStatus = async () => {
+    try {
+      const res = await fetch(`/p/${encodeURIComponent(workspace)}/snapshot_status`, {
+        method: "GET",
+        headers: { "Accept": "application/json" }
+      })
+      if (!res.ok) return
+      const payload = await res.json().catch(() => null)
+      if (!payload || !payload.ok) return
+      applySnapshotStatus(payload)
+    } catch (_) {}
   }
+  loadSnapshotStatus()
 
   const snapshotInfoJson = `{
   "version": 1,
@@ -10148,6 +10189,7 @@ document.addEventListener("DOMContentLoaded", () => {
   const handleDismiss = (event) => {
     event.preventDefault()
     setDismissedState(true)
+    setDismissedClass(true)
     footer.classList.add("hidden")
   }