pinokiod 3.234.0 → 3.236.0

package/kernel/bin/git.js

@@ -6,11 +6,11 @@ const path = require("path")
 class Git {
   cmd() {
     if (this.kernel.platform === "darwin") {
-      return "git git-lfs"
+      return "git git-lfs gh=2.82.1"
     } else if (this.kernel.platform === "win32") {
-      return "git git-lfs gh git-bash"
+      return "git git-lfs gh=2.82.1 git-bash"
     } else {
-      return "git git-lfs gh"
+      return "git git-lfs gh=2.82.1"
     }
   }
   async install(req, ondata) {
@@ -21,20 +21,6 @@ class Git {
         `conda install -y -c conda-forge ${this.cmd()}`
       ]
     }, ondata)
-    if (this.kernel.platform === "darwin") {
-      console.log("brew install gh")
-      await this.kernel.bin.exec({
-//        conda: { skip: true },
-        message: [
-          "echo $PATH",
-          "which brew",
-          "brew install gh",
-        ],
-      }, (e) => {
-        process.stdout.write(e.raw)
-        ondata(e)
-      })
-    }
     await fs.promises.mkdir(this.kernel.path("config/gh"), { recursive: true }).catch((e) => { })
 
     let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
@@ -121,7 +107,7 @@ class Git {
 
     if (this.kernel.platform === "darwin") {
       let gh_config_exists = await this.kernel.exists("config/gh")
-      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.brew.has("gh") && gh_config_exists
+      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh") && gh_config_exists
     } else if (this.kernel.platform === "win32") {
       let gh_config_exists = await this.kernel.exists("config/gh")
       return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh") && gh_config_exists && this.kernel.bin.installed.conda.has("git-bash")
@@ -131,15 +117,7 @@ class Git {
     }
   }
   async uninstall(req, ondata) {
-    if (this.kernel.platform === "darwin") {
-      await this.kernel.bin.exec({ message: "conda remove git" }, ondata)
-      await this.kernel.bin.exec({
-        conda: { skip: true },
-        message: "brew uninstall gh",
-      })
-    } else {
-      await this.kernel.bin.exec({ message: "conda remove git gh" }, ondata)
-    }
+    await this.kernel.bin.exec({ message: "conda remove git gh" }, ondata)
   }
   env() {
     let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")

package/package.json

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

package/server/index.js

@@ -178,6 +178,13 @@ class Server {
   }
   running_dynamic (name, menu, selected_query) {
     let cwd = this.kernel.path("api", name)
+    const projectSlug = typeof name === 'string' ? name : ''
+    const assignProjectSlug = (entry) => {
+      if (!entry || !projectSlug) {
+        return
+      }
+      entry.project_slug = projectSlug
+    }
     let running_dynamic = []
     const traverse = (obj, indexPath) => {
       if (Array.isArray(obj)) {
@@ -212,6 +219,7 @@ class Server {
                     }
                   }
                 }
+                assignProjectSlug(obj)
                 running_dynamic.push(obj)
               }
             } else if (href.startsWith("/run")) {
@@ -230,6 +238,7 @@ class Server {
                     obj.href = obj.href + "&" + key + "=" + encodeURIComponent(selected_query[key])
                   }
                 }
+                assignProjectSlug(obj)
                 running_dynamic.push(obj)
               } else {
                 const normalizedFilepath = path.normalize(filepath)
@@ -284,6 +293,7 @@ class Server {
                   obj2.target = "@" + obj2.href
                   obj2.target_full = obj2.href
 
+                  assignProjectSlug(obj2)
                   running_dynamic.push(obj2)
                   }
                 }
@@ -334,6 +344,7 @@ class Server {
               }
 
               if (activeShells.length === 0) {
+                assignProjectSlug(obj)
                 running_dynamic.push(obj)
               } else {
                 activeShells.forEach((shellEntry) => {
@@ -353,6 +364,7 @@ class Server {
                     clone.target = originalTarget ? originalTarget : `@${clone.href}`
                     clone.target_full = clone.href
                   }
+                  assignProjectSlug(clone)
                   running_dynamic.push(clone)
                 })
               }
@@ -5268,7 +5280,7 @@ class Server {
       }
       let message = [
         "gh auth setup-git --hostname github.com --force",
-        "gh auth login --web --git-protocol https"
+        "gh auth login --web --clipboard --git-protocol https"
       ].join(delimiter)
       params.set("message", encodeURIComponent(message))
       params.set("input", true)

package/server/public/tab-link-popover.js

@@ -38,7 +38,18 @@
           if (targetMode === "_self") {
             window.location.assign(url)
           } else {
-            window.open(url, "_blank", "noopener")
+//            window.open(url, "_blank", "noopener")
+            fetch("/go", {
+              method: "POST",
+              headers: {
+                "Content-Type": "application/json"
+              },
+              body: JSON.stringify({ url })
+            }).then((res) => {
+              return res.json()
+            }).then((res) => {
+              console.log(res)
+            })
           }
         }
         hideTabLinkPopover({ immediate: true })
@@ -142,6 +153,10 @@
     if (!node) {
       return ""
     }
+    const explicit = node.getAttribute("data-project-slug")
+    if (typeof explicit === "string" && explicit.trim().length > 0) {
+      return explicit.trim().toLowerCase()
+    }
     const candidates = []
     const targetFull = node.getAttribute("data-target-full")
     if (typeof targetFull === "string" && targetFull.length > 0) {
@@ -1327,7 +1342,7 @@
       if (!link || !container.contains(link)) {
         return
       }
-      renderTabLinkPopover(link)
+      renderTabLinkPopover(link, { requireAlternate: false })
     })
 
     container.addEventListener("mouseout", (event) => {

package/server/views/app.ejs

@@ -5916,6 +5916,7 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
         const remoteUrl = repo && repo.url ? repo.url : ''
         const pushUri = resolvePushUri(repo)
         const hasRemote = hasRemoteConfigured(repo)
+        const canPublish = hasRemote && Boolean(pushUri)
 
         const item = document.createElement('button')
         item.type = 'button'
@@ -5923,19 +5924,31 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
         item.dataset.repo = key
         item.dataset.name = name
 
-        const remoteClass = remoteUrl
-          ? 'pinokio-publish-dropdown-remote'
-          : 'pinokio-publish-dropdown-remote empty'
-        const remoteDisplay = remoteUrl ? escapeHtml(remoteUrl) : 'No remote detected'
+        let remoteClass
+        let remoteDisplay
+        if (!canPublish) {
+          remoteClass = 'pinokio-publish-dropdown-remote'
+          remoteDisplay = 'Create on GitHub'
+        } else if (remoteUrl) {
+          remoteClass = 'pinokio-publish-dropdown-remote'
+          remoteDisplay = escapeHtml(remoteUrl)
+        } else {
+          remoteClass = 'pinokio-publish-dropdown-remote empty'
+          remoteDisplay = 'No remote detected'
+        }
 
         item.innerHTML = `
           <div class="pinokio-publish-dropdown-title">${escapeHtml(name)}</div>
           <div class="${remoteClass}">${remoteDisplay}</div>
         `
 
-        if (!hasRemote || !pushUri) {
-          item.disabled = true
-          item.classList.add('fs-dropdown-item--disabled')
+        if (!canPublish) {
+          item.addEventListener('click', (event) => {
+            event.preventDefault()
+            event.stopPropagation()
+            closeStatusDropdowns()
+            showCreateModal()
+          })
         } else {
           item.addEventListener('click', (event) => {
             event.preventDefault()

package/server/views/network.ejs

@@ -1220,7 +1220,7 @@ document.querySelector("#reset-label").addEventListener("click", async (e) => {
         method: "post"
       }, () => {
       })
-      setInterval(async () => {
+      let i2 = setInterval(async () => {
         try {
           let res = await fetch("/check_peer").then((res) => {
             return res.json()
@@ -1228,6 +1228,7 @@ document.querySelector("#reset-label").addEventListener("click", async (e) => {
           console.log("RES", res)
           if (res.success) {
             document.querySelector(".loading").classList.add("hidden")
+            clearInterval(i2)
             if (res.peer_name) {
               console.log("> 1")
               location.href = "/net/" + res.peer_name
@@ -1385,13 +1386,14 @@ document.querySelector("main").addEventListener("click", async (e) => {
         method: "post"
       }, () => {
       })
-      setInterval(async () => {
+      let i3 = setInterval(async () => {
         try {
           let res = await fetch("/check_peer").then((res) => {
             return res.json()
           })
           if (res.success) {
             document.querySelector(".loading").classList.add("hidden")
+            clearInterval(i3)
             if (res.peer_name) {
               console.log("> 1")
               location.href = "/net/" + res.peer_name
@@ -1535,12 +1537,13 @@ if (document.querySelector("#wifi")) {
 }
 <% } %>
 <% if (requirements_pending) { %>
-setInterval(() => {
+let i1 = setInterval(() => {
   fetch("/requirements_check/network").then((res) => {
     return res.json()
   }).then((res) => {
     console.log(res)
     if (!res.requirements_pending) {
+      clearInterval(i1)
       if (res.install_required) {
         location.href = "/setup/network?callback=/network"
       } else {
@@ -1556,6 +1559,7 @@ interval = setInterval(() => {
     return res.json()
   }).then((res) => {
     if (res.updated) {
+      clearInterval(interval)
       location.reload()
     }
   })

package/server/views/partials/dynamic.ejs

@@ -28,14 +28,14 @@
           <div class='tab'><%-item.btn%></div>
         </div>
       <% } else if (item.target === "_blank") { %>
-        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index+4%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'<%= item.target_full ? ` data-target-full="${item.target_full}"` : '' %>>
+        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index+4%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'<%= item.target_full ? ` data-target-full="${item.target_full}"` : '' %><%= item.project_slug ? ` data-project-slug="${item.project_slug}"` : '' %>>
           <div class='tab'><%-item.btn%></div>
           <div class='loader'>
             <i class="fa-solid fa-up-right-from-square"></i>
           </div>
         </a>
       <% } else { %>
-        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index+4%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'<%= item.target_full ? ` data-target-full="${item.target_full}"` : '' %> <%=item.shell_id ? `data-shell=${item.shell_id}` : ""%> <%=item.script_id ? `data-script=${item.script_id}` : ''%>>
+        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index+4%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'<%= item.target_full ? ` data-target-full="${item.target_full}"` : '' %> <%=item.shell_id ? `data-shell=${item.shell_id}` : ""%> <%=item.script_id ? `data-script=${item.script_id}` : ''%><%= item.project_slug ? ` data-project-slug="${item.project_slug}"` : '' %>>
           <% if (item.running) { %>
             <i class="fa-solid fa-circle"></i>
           <% } %>

package/server/views/partials/menu.ejs

@@ -40,7 +40,7 @@
           <% } %>
         </div>
       <% } else if (item.target === "_blank") { %>
-        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'<%= item.target_full ? ` data-target-full="${item.target_full}"` : '' %>>
+        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'<%= item.target_full ? ` data-target-full="${item.target_full}"` : '' %><%= item.project_slug ? ` data-project-slug="${item.project_slug}"` : '' %>>
           <div class='tab'><%-item.btn%></div>
           <% if (item.arrow) { %>
             <i class="fa-solid fa-angle-right"></i>
@@ -50,7 +50,7 @@
           </div>
         </a>
       <% } else { %>
-        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'<%= item.target_full ? ` data-target-full="${item.target_full}"` : '' %> <%=item.shell_id ? `data-shell=${item.shell_id}` : ""%> <%=item.script_id ? `data-script=${item.script_id}` : ''%>>
+        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'<%= item.target_full ? ` data-target-full="${item.target_full}"` : '' %> <%=item.shell_id ? `data-shell=${item.shell_id}` : ""%> <%=item.script_id ? `data-script=${item.script_id}` : ''%><%= item.project_slug ? ` data-project-slug="${item.project_slug}"` : '' %>>
           <% if (item.running) { %>
             <i class="fa-solid fa-circle"></i>
           <% } %>

package/server/views/partials/running.ejs

@@ -1,5 +1,5 @@
 <% dynamic.forEach((item, index) => { %>
-  <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index+4%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'<%= item.target_full ? ` data-target-full="${item.target_full}"` : '' %> <%=item.shell_id ? `data-shell=${item.shell_id}` : ""%> <%=item.script_id ? `data-script=${item.script_id}` : ''%>>
+  <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index+4%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'<%= item.target_full ? ` data-target-full="${item.target_full}"` : '' %> <%=item.shell_id ? `data-shell=${item.shell_id}` : ""%> <%=item.script_id ? `data-script=${item.script_id}` : ''%><%= item.project_slug ? ` data-project-slug="${item.project_slug}"` : '' %>>
     <% if (item.running) { %>
       <i class="fa-solid fa-circle"></i>
     <% } %>