pinokiod 8.0.21 → 8.0.23

package/package.json

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

package/server/index.js

@@ -3606,7 +3606,6 @@ class Server {
 
       let error
       let items
-      let readme
 //      if (pathComponents.length === 0) {
 //        let files = await fs.promises.readdir(filepath, { withFileTypes: true })
 //        items = files
@@ -3629,18 +3628,8 @@ class Server {
           }
         }
 
-        // look for README.md
-
         let config
         for(let file of f.files) {
-          if (file.name.toLowerCase() === "readme.md") {
-            let p = path.resolve(filepath, file.name)
-            let md = await fs.promises.readFile(p, "utf8")
-            readme = marked.parse(md, {
-              baseUrl: req._parsedUrl.pathname.replace(/^\/_api/, "/raw/") + "/"
-              //baseUrl: req.originalUrl + "/"
-            })
-          }
           if (file.name === "pinokio.js") {
             let p = path.resolve(filepath, file.name)
             config  = (await this.kernel.loader.load(p)).resolved
@@ -4297,7 +4286,6 @@ class Server {
           home_sort: homeSortMode,
           running,
           notRunning,
-          readme,
           filepath,
           mode: null,
           kernel: this.kernel,
@@ -4329,7 +4317,6 @@ class Server {
           ishome: meta,
           running,
           notRunning,
-          readme,
           filepath,
           mode: null,
           kernel: this.kernel,

package/server/public/common.js

@@ -3013,15 +3013,19 @@ if (typeof window !== 'undefined' && !window.__pinokioNavigateListenerInstalled)
         return;
       }
     }
+    // Only the registry iframe rendered by the Explore page uses this stable name.
+    const exploreFrame = document.querySelector('iframe[name="pinokio-explore"]');
+    // Trust the message only when it comes from that exact iframe and its configured origin.
+    const fromExplore = Boolean(
+      exploreFrame &&
+      event.source === exploreFrame.contentWindow &&
+      event.origin === new URL(exploreFrame.src).origin
+    );
     let frame = document.activeElement;
-    if (
-      (!frame || frame.tagName !== 'IFRAME') &&
-      new URLSearchParams(window.location.search).get('mode') === 'explore' &&
-      event.origin === 'https://pinokio.co'
-    ) {
-      const exploreFrame = document.querySelector('main > iframe');
-      if (exploreFrame && event.source === exploreFrame.contentWindow) frame = exploreFrame;
-    }
+    // Mobile Safari can leave the parent body focused after a tap inside the registry iframe.
+    const exploreFallback = (!frame || frame.tagName !== 'IFRAME') && fromExplore;
+    if (exploreFallback) frame = exploreFrame;
+    // Preserve the existing generic behavior when there is no identifiable sending iframe.
     if (!frame || frame.tagName !== 'IFRAME') {
       try {
         console.warn('[pinokio:navigate] no active iframe');
@@ -3037,23 +3041,31 @@ if (typeof window !== 'undefined' && !window.__pinokioNavigateListenerInstalled)
       } catch (_) {}
       return;
     }
+    // Only translate the two local Pinokio actions emitted by the registry.
     const localInstall =
       target.origin === 'http://localhost:42000' &&
       (
+        // A normal launcher install must include the repository URI.
         (target.pathname === '/pinokio/download' && Boolean(target.searchParams.get('uri'))) ||
         (
+          // A snapshot restore must include its registry and a canonical SHA-256 hash.
           target.pathname === '/checkpoints' &&
           Boolean(target.searchParams.get('registry')) &&
           /^(?:sha256:)?[0-9a-f]{64}$/i.test(target.searchParams.get('hash') || '')
         )
       );
-    const lanExplore =
-      new URLSearchParams(window.location.search).get('mode') === 'explore' &&
-      !['localhost', '127.0.0.1', '::1', '[::1]'].includes(window.location.hostname) &&
-      event.origin === 'https://pinokio.co' && event.source === frame.contentWindow;
-    if (lanExplore && localInstall) {
-      target = new URL(`${target.pathname}${target.search}${target.hash}`, window.location.origin);
+    // Handle trusted Explore installs here so Pinokio replaces the parent page, not the iframe.
+    if (fromExplore && localInstall) {
+      // LAN/Home Server clients must use the Pinokio origin they can actually reach.
+      if (target.origin !== window.location.origin) {
+        target = new URL(`${target.pathname}${target.search}${target.hash}`, window.location.origin);
+      }
+      window.location.href = target.toString();
+      return;
     }
+    // If focus was recovered through the Explore fallback, reject every non-allowlisted action.
+    if (exploreFallback) return;
+    // Keep the existing generic iframe navigation restricted to the current Pinokio origin.
     if (target.origin !== window.location.origin) {
       try {
         console.warn('[pinokio:navigate] blocked origin', target.origin);

package/server/public/style.css

@@ -2637,13 +2637,6 @@ pre {
 pre:empty {
   display: none;
 }
-body.dark .readme {
-  background: none;
-  color: var(--dark-color);
-}
-.readme .content {
-  padding: 0 20px 20px;
-}
 body.dark .empty {
   background: var(--dark-bg);
 }
@@ -2653,21 +2646,6 @@ body.dark .empty {
   opacity: 0.5;
   background: var(--light-bg);
 }
-.readme {
-  max-width: var(--content-width);
-  box-sizing: border-box;
-  margin: 0 auto;
-}
-body.dark .readme a {
-  color: var(--dark-link-color);
-}
-.readme a {
-  color: var(--light-link-color);
-  text-decoration: none;
-}
-.readme ol, .readme ul {
-  padding-inline-start: 20px;
-}
 .runnables .row {
   display: flex;
   padding: 10px;

package/server/views/file_explorer.ejs

@@ -8,7 +8,6 @@
 <link href="/css/solid.min.css" rel="stylesheet">
 <link href="/css/regular.min.css" rel="stylesheet">
 <link href="/css/brands.min.css" rel="stylesheet">
-<link href="/markdown.css" rel="stylesheet"/>
 <link href="/noty.css" rel="stylesheet"/>
 <link href="/style.css" rel="stylesheet"/>
 <% if (agent === "electron") { %>
@@ -230,11 +229,6 @@ body.dark .browser-options-row {
     <div class='description'><%=item.description%></div>
   </a>
 <% }) %>
-<% if (readme) { %>
-<div class='readme markdown-body'>
-  <div class='content'><%-readme%></div>
-</div>
-<% } %>
 </div>
 </main>
 <script>

package/server/views/index.ejs

@@ -8,7 +8,6 @@
 <link href="/css/solid.min.css" rel="stylesheet">
 <link href="/css/regular.min.css" rel="stylesheet">
 <link href="/css/brands.min.css" rel="stylesheet">
-<link href="/markdown.css" rel="stylesheet"/>
 <link href="/noty.css" rel="stylesheet"/>
 <link href="/filepond.min.css" rel="stylesheet" />
 <link href="/filepond-plugin-image-preview.min.css" rel="stylesheet" />
@@ -2000,11 +1999,6 @@ body.dark aside .current.selected {
     </a>
   <% }) %>
 <% } %>
-<% if (readme) { %>
-<div class='readme markdown-body'>
-  <div class='content'><%-readme%></div>
-</div>
-<% } %>
 </div>
 <%- include('partials/main_sidebar', { selected: 'home' }) %>
 </main>

package/server/views/index2.ejs

@@ -8,7 +8,6 @@
 <link href="/css/solid.min.css" rel="stylesheet">
 <link href="/css/regular.min.css" rel="stylesheet">
 <link href="/css/brands.min.css" rel="stylesheet">
-<link href="/markdown.css" rel="stylesheet"/>
 <link href="/noty.css" rel="stylesheet"/>
 <link href="/filepond.min.css" rel="stylesheet" />
 <link href="/filepond-plugin-image-preview.min.css" rel="stylesheet" />
@@ -500,11 +499,6 @@ body.dark .open-menu, body.dark .browse {
     </a>
   <% }) %>
 <% } %>
-<% if (readme) { %>
-<div class='readme markdown-body'>
-  <div class='content'><%-readme%></div>
-</div>
-<% } %>
 <% if (display.includes("onboarding")) { %>
 <!--
 <div class='container'>

package/test/directory-readme-rendering.test.js

@@ -0,0 +1,125 @@
+const assert = require('node:assert/strict')
+const fs = require('node:fs')
+const http = require('node:http')
+const os = require('node:os')
+const path = require('node:path')
+const test = require('node:test')
+const express = require('express')
+const Server = require('../server')
+
+const viewsPath = path.resolve(__dirname, '..', 'server', 'views')
+
+async function createDirectoryRendererFixture() {
+  const homedir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'pinokio-directory-readme-'))
+  const apiRoot = path.resolve(homedir, 'api')
+  const appRoot = path.resolve(apiRoot, 'demo')
+  await fs.promises.mkdir(appRoot, { recursive: true })
+  await fs.promises.writeFile(path.resolve(apiRoot, 'README.md'), '# ROOT README SENTINEL\n')
+  await fs.promises.writeFile(path.resolve(appRoot, 'README.md'), '# APP README SENTINEL\n')
+  await fs.promises.writeFile(path.resolve(appRoot, 'keep.txt'), 'keep\n')
+
+  const renderer = Object.create(Server.prototype)
+  renderer.kernel = {
+    homedir,
+    path: (...segments) => path.resolve(homedir, ...segments),
+    api: {
+      userdir: apiRoot,
+      proxies: {},
+      running: {},
+      launcher: async (name) => ({
+        script: null,
+        launcher_root: ''
+      })
+    },
+    dns: async ({ name }) => {
+      renderer.kernel.pinokio_configs[name] = { dns: { '@': [] } }
+    },
+    peer: {
+      host: '127.0.0.1',
+      check_peers: async () => {}
+    },
+    launch_complete: true,
+    pinokio_configs: {}
+  }
+  renderer.autolaunch = {
+    applyHomeStartingState: async () => false
+  }
+  renderer.portal = ''
+  renderer.install = ''
+  renderer.port = 0
+  renderer.theme = 'light'
+  renderer.logo = ''
+  renderer.cloudflare_pub = null
+  renderer.composePeerAccessPayload = async () => ({
+    peer_access_points: [],
+    peer_url: 'http://127.0.0.1:42000',
+    peer_qr: null,
+    peer_access_router_installed: false
+  })
+  renderer.current_urls = async () => ({})
+  renderer.getPeers = () => []
+
+  const app = express()
+  app.set('views', viewsPath)
+  app.set('view engine', 'ejs')
+  app.get('/home', (req, res, next) => {
+    renderer.render(req, res, [], {}).catch(next)
+  })
+  app.get('/_api/demo', (req, res, next) => {
+    req.query.mode = 'source'
+    renderer.render(req, res, ['demo']).catch(next)
+  })
+  app.get('/api/demo', (req, res, next) => {
+    renderer.render(req, res, ['demo']).catch(next)
+  })
+  app.use((error, req, res, next) => {
+    res.status(500).send(error.stack || error.message)
+  })
+
+  const httpServer = http.createServer(app)
+  await new Promise((resolve, reject) => {
+    httpServer.once('error', reject)
+    httpServer.listen(0, '127.0.0.1', resolve)
+  })
+  const address = httpServer.address()
+
+  return {
+    baseUrl: `http://127.0.0.1:${address.port}`,
+    close: async () => {
+      await new Promise((resolve, reject) => {
+        httpServer.close((error) => error ? reject(error) : resolve())
+      })
+      await fs.promises.rm(homedir, { recursive: true, force: true })
+    }
+  }
+}
+
+test('directory pages list README files without auto-rendering their contents', async () => {
+  const fixture = await createDirectoryRendererFixture()
+  try {
+    const [homeResponse, sourceResponse, runResponse] = await Promise.all([
+      fetch(`${fixture.baseUrl}/home`),
+      fetch(`${fixture.baseUrl}/_api/demo`),
+      fetch(`${fixture.baseUrl}/api/demo`)
+    ])
+    const [homeHtml, sourceHtml, runHtml] = await Promise.all([
+      homeResponse.text(),
+      sourceResponse.text(),
+      runResponse.text()
+    ])
+
+    assert.equal(homeResponse.status, 200, homeHtml)
+    assert.equal(sourceResponse.status, 200, sourceHtml)
+    assert.equal(runResponse.status, 200, runHtml)
+
+    assert.doesNotMatch(homeHtml, /ROOT README SENTINEL/)
+    for (const html of [sourceHtml, runHtml]) {
+      assert.doesNotMatch(html, /APP README SENTINEL/)
+      assert.match(html, /data-name="README\.md"/)
+      assert.match(html, /data-name="keep\.txt"/)
+      assert.doesNotMatch(html, /class=['"]readme markdown-body['"]/)
+    }
+  } finally {
+    await fixture.close()
+  }
+})

package/test/explore-lan-install-navigation.test.js

@@ -7,18 +7,34 @@ const { JSDOM, VirtualConsole } = require("jsdom")
 const commonScriptPath = path.resolve(__dirname, "../server/public/common.js")
 const exploreTemplatePath = path.resolve(__dirname, "../server/views/explore.ejs")
 
-async function createHarness(url = "http://192.168.1.50:42000/home?mode=explore") {
+async function createHarness(
+  url = "http://192.168.1.50:42000/home?mode=explore",
+  frameUrl = "https://pinokio.co/?embed=1&theme=dark",
+) {
   const source = await fs.readFile(commonScriptPath, "utf8")
   const virtualConsole = new VirtualConsole()
+  const navigationErrors = []
   virtualConsole.on("jsdomError", (error) => {
+    if (error && /Not implemented: navigation/.test(error.message || "")) {
+      navigationErrors.push(error)
+      return
+    }
     throw error
   })
-  const dom = new JSDOM("<!doctype html><body><main><iframe></iframe></main></body>", {
+  const dom = new JSDOM('<!doctype html><body><main><iframe name="pinokio-explore"></iframe></main></body>', {
     runScripts: "dangerously",
     pretendToBeVisual: true,
     url,
     virtualConsole,
     beforeParse(window) {
+      const NativeURL = window.URL
+      window.__pinokioConstructedUrls = []
+      window.URL = class extends NativeURL {
+        constructor(value, base) {
+          super(value, base)
+          window.__pinokioConstructedUrls.push(this.toString())
+        }
+      }
       window.fetch = async () => ({ ok: true, json: async () => ({}) })
       window.matchMedia = () => ({
         matches: false,
@@ -35,13 +51,14 @@ async function createHarness(url = "http://192.168.1.50:42000/home?mode=explore"
   script.textContent = source
   dom.window.document.body.appendChild(script)
   const frame = dom.window.document.querySelector("iframe")
-  frame.src = "https://pinokio.co/?embed=1&theme=dark"
+  frame.src = frameUrl
   frame.focus()
   assert.equal(dom.window.document.activeElement, frame)
-  return { dom, frame }
+  return { dom, frame, navigationErrors }
 }
 
 function navigate(dom, frame, target, options = {}) {
+  dom.window.__pinokioConstructedUrls.length = 0
   dom.window.dispatchEvent(new dom.window.MessageEvent("message", {
     data: { e: "pinokio:navigate", url: target },
     origin: options.origin || "https://pinokio.co",
@@ -49,6 +66,12 @@ function navigate(dom, frame, target, options = {}) {
   }))
 }
 
+function assertParentNavigation(dom, frame, navigationErrors, originalFrameUrl, expectedUrl) {
+  assert.ok(dom.window.__pinokioConstructedUrls.includes(expectedUrl))
+  assert.equal(navigationErrors.length, 1)
+  assert.equal(frame.src, originalFrameUrl)
+}
+
 test("Explore uses a stable frame identity instead of the launcher schema", async () => {
   const source = await fs.readFile(exploreTemplatePath, "utf8")
 
@@ -56,46 +79,77 @@ test("Explore uses a stable frame identity instead of the launcher schema", asyn
   assert.doesNotMatch(source, /name="<%=schema%>"/)
 })
 
-test("LAN Explore rebases registry download installs onto the Home Server origin", async (t) => {
-  const { dom, frame } = await createHarness()
+test("LAN Explore trusts the configured registry origin", async (t) => {
+  const { dom, frame, navigationErrors } = await createHarness(
+    undefined,
+    "https://beta.pinokio.co/?embed=1&theme=dark",
+  )
   t.after(() => dom.window.close())
+  const originalFrameUrl = frame.src
 
-  navigate(dom, frame, "http://localhost:42000/pinokio/download?uri=https%3A%2F%2Fgithub.com%2Facme%2Fdemo&path=api&branch=dev")
+  navigate(
+    dom,
+    frame,
+    "http://localhost:42000/pinokio/download?uri=https%3A%2F%2Fgithub.com%2Facme%2Fdemo&path=api&branch=dev",
+    { origin: "https://beta.pinokio.co" },
+  )
 
-  assert.equal(
-    frame.src,
+  assertParentNavigation(
+    dom,
+    frame,
+    navigationErrors,
+    originalFrameUrl,
     "http://192.168.1.50:42000/pinokio/download?uri=https%3A%2F%2Fgithub.com%2Facme%2Fdemo&path=api&branch=dev",
   )
 })
 
 test("LAN Explore handles registry installs when mobile Safari leaves the parent body focused", async (t) => {
-  const { dom, frame } = await createHarness()
+  const { dom, frame, navigationErrors } = await createHarness()
   t.after(() => dom.window.close())
+  const originalFrameUrl = frame.src
   dom.window.document.body.tabIndex = -1
   dom.window.document.body.focus()
   assert.equal(dom.window.document.activeElement, dom.window.document.body)
 
   navigate(dom, frame, "http://localhost:42000/pinokio/download?uri=https%3A%2F%2Fgithub.com%2Facme%2Fdemo&path=api")
 
-  assert.equal(
-    frame.src,
+  assertParentNavigation(
+    dom,
+    frame,
+    navigationErrors,
+    originalFrameUrl,
     "http://192.168.1.50:42000/pinokio/download?uri=https%3A%2F%2Fgithub.com%2Facme%2Fdemo&path=api",
   )
 })
 
 test("LAN Explore rebases valid checkpoint installs onto the Home Server origin", async (t) => {
-  const { dom, frame } = await createHarness()
+  const { dom, frame, navigationErrors } = await createHarness()
   t.after(() => dom.window.close())
+  const originalFrameUrl = frame.src
   const hash = `sha256%3A${"a".repeat(64)}`
 
   navigate(dom, frame, `http://localhost:42000/checkpoints?registry=https%3A%2F%2Fapi.pinokio.co&hash=${hash}&path=api`)
 
-  assert.equal(
-    frame.src,
+  assertParentNavigation(
+    dom,
+    frame,
+    navigationErrors,
+    originalFrameUrl,
     `http://192.168.1.50:42000/checkpoints?registry=https%3A%2F%2Fapi.pinokio.co&hash=${hash}&path=api`,
   )
 })
 
+test("localhost Explore replaces itself for registry installs instead of nesting Pinokio", async (t) => {
+  const { dom, frame, navigationErrors } = await createHarness("http://localhost:42000/home?mode=explore")
+  t.after(() => dom.window.close())
+  const originalFrameUrl = frame.src
+  const target = "http://localhost:42000/pinokio/download?uri=https%3A%2F%2Fgithub.com%2Facme%2Fdemo&path=api"
+
+  navigate(dom, frame, target)
+
+  assertParentNavigation(dom, frame, navigationErrors, originalFrameUrl, target)
+})
+
 const blockedCases = [
   ["unrelated local route", "http://localhost:42000/tasker?vars=url", {}],
   ["download without a URI", "http://localhost:42000/pinokio/download", {}],