pinokiod 3.17.5 → 3.17.7

package/kernel/bin/setup.js

@@ -198,5 +198,20 @@ module.exports = {
         "caddy"
       ]
     }
+  },
+  git: (kernel) => {
+    let requirements = [
+      { name: "conda", },
+      { name: "git", },
+    ]
+    return {
+      icon: "fa-solid fa-wifi",
+      title: "Git",
+      description: "Self-contained git installation",
+      requirements,
+      conda_requirements: [
+        "git",
+      ]
+    }
   }
 }

package/package.json

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

package/server/index.js

@@ -334,17 +334,26 @@ class Server {
     }
   }
   async chrome(req, res, type) {
+
+    let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
+      bin: this.kernel.bin.preset("dev"),
+    })
+    if (!requirements_pending && install_required) {
+      res.redirect(`/setup/dev?callback=${req.originalUrl}`)
+      return
+    }
+
     let name = req.params.name
     let config = await this.kernel.api.meta(name)
 
-    let error = null
+    let err = null
     if (config && config.version) {
       let coerced = semver.coerce(config.version)
       if (semver.satisfies(coerced, this.kernel.schema)) {
         console.log("semver satisfied", config.version, this.kernel.schema)
       } else {
         console.log("semver NOT satisfied", config.version, this.kernel.schema)
-        error = `Please update to the latest Pinokio (current script version: ${config.version}, supported: ${this.kernel.schema})`
+        err = `Please update to the latest Pinokio (current script version: ${config.version}, supported: ${this.kernel.schema})`
       }
     }
 
@@ -490,7 +499,7 @@ class Server {
       plugin_menu,
       portal: this.portal,
       install: this.install,
-      error,
+      error: err,
       env,
       mode,
       port: this.port,
@@ -1556,6 +1565,7 @@ class Server {
     if (!config) {
       return { menu: [] }
     }
+    console.log("renderMenu2 Before", JSON.stringify(config, null, 2))
 
     if (config.menu) {
       for(let i=0; i<config.menu.length; i++) {
@@ -1594,6 +1604,7 @@ class Server {
       //config.script_id = this.kernel.path(keypath) + "?cwd=" + base.cwd
       config.script_id = path.resolve(base.path, config.href) + "?cwd=" + base.cwd
     }
+    console.log("renderMenu2 After", JSON.stringify(config, null, 2))
     return config
   }
 
@@ -2357,6 +2368,8 @@ class Server {
     }
   }
   async getPlugin(name) {
+    console.log("getPlugin", name)
+    console.log("plugin config", this.kernel.plugin.config)
     if (this.kernel.plugin.config) {
       try {
         let info = new Info(this.kernel)
@@ -2369,6 +2382,7 @@ class Server {
         await this.renderMenu(uri, name, plugin, [])
         return plugin
       } catch (e) {
+        console.log("getPlugin ERROR", e)
         return {
           menu: []
         }