pinokiod 3.18.6 → 3.19.0

package/kernel/api/index.js

@@ -50,8 +50,17 @@ class Api {
       p3 = this.kernel.path("api", name, "pinokio.json")
     }
     let pinokio = (await this.kernel.loader.load(p1)).resolved
+    if (pinokio && pinokio.menu && !(Array.isArray(pinokio.menu) || typeof pinokio.menu === "function")) {
+      delete pinokio.menu
+    }
     let pinokio2 = (await this.kernel.loader.load(p2)).resolved
+    if (pinokio2 && pinokio2.menu && !(Array.isArray(pinokio2.menu) || typeof pinokio2.menu === "function")) {
+      delete pinokio2.menu
+    }
     let pinokio3 = (await this.kernel.loader.load(p3)).resolved
+    if (pinokio3 && pinokio3.menu && !(Array.isArray(pinokio3.menu) || typeof pinokio3.menu === "function")) {
+      delete pinokio3.menu
+    }
     let meta = Object.assign({}, pinokio, pinokio2, pinokio3)
 
     // create pinokio.json if it doesn't exist
@@ -929,9 +938,9 @@ class Api {
             // write to current app folder's ENVIRONMENT
             let api_path = Util.api_path(request.path, this.kernel)
             let env_path = path.resolve(api_path, "ENVIRONMENT")
-            await Util.update_env(env_path, {
-              PINOKIO_SCRIPT_DEFAULT: "false"
-            })
+//            await Util.update_env(env_path, {
+//              PINOKIO_SCRIPT_DEFAULT: "false"
+//            })
             return
           }
 

package/kernel/bin/index.js

@@ -4,6 +4,7 @@ const _ = require('lodash')
 const path = require('path')
 const { rimraf } = require('rimraf')
 const { DownloaderHelper } = require('node-downloader-helper');
+const { spawn } = require('child_process')
 const { ProxyAgent } = require('proxy-agent');
 
 //const Cmake = require("./cmake")
@@ -77,7 +78,6 @@ class Bin {
         "User-Agent": userAgent
       }
     }
-    console.log("Download", opts)
     if (process.env.HTTP_PROXY && process.env.HTTP_PROXY.length > 0) {
       opts.httpRequestOptions = { agent }
       opts.httpsRequestOptions = { agent }
@@ -628,6 +628,63 @@ class Bin {
       return res
     }
   }
+  async init_launcher(req, ondata) {
+    console.log("init_launcher", req)
+    try {
+      let projectType = req.params.projectType
+      let startType = req.params.cliType || req.params.startType
+      console.log({ projectType, startType })
+
+      let cwd = req.cwd
+      let name = req.name
+      let payload = {}
+      payload.cwd = path.resolve(cwd, name)
+      payload.input = req.params
+
+      let mod_path = path.resolve(__dirname, "../proto", projectType, startType)
+      let mod = await this.kernel.require(mod_path)
+
+      await mod(payload, ondata, this.kernel)
+
+      // copy readme
+      let readme_path = path.resolve(__dirname, "../proto/PINOKIO.md")
+      console.log("copy to", readme_path, path.resolve(cwd, name, "PINOKIO.md"))
+      await fs.promises.cp(readme_path, path.resolve(cwd, name, "PINOKIO.md"))
+
+      return { success: "/p/" + name }
+    } catch (e) {
+      console.log("ERROR", e)
+      return { error: e.stack }
+    }
+  }
+  async filepicker(req, ondata) {
+    /*
+      req.params := {
+        cwd: cwd
+      }
+    */
+    let response = await new Promise((resolve, reject) => {
+      let picker_path = this.kernel.path("bin/py/picker.py")
+      const proc = spawn("python", [picker_path])
+
+      let output = "";
+      proc.stdout.on("data", (chunk) => output += chunk);
+      proc.stderr.on("data", (err) => console.error("Python error:", err.toString()));
+      proc.on("close", () => {
+        try {
+          const result = JSON.parse(output);
+          if (result.error) return reject(result.error);
+          resolve(result.paths); // Always an array
+        } catch (e) {
+          reject("Failed to parse Python output: " + output);
+        }
+      });
+
+      proc.stdin.write(JSON.stringify(req.params));
+      proc.stdin.end();
+    });
+    return { paths: response }
+  }
   async install(req, ondata) {
     /*
       req.params := {

package/kernel/gitconfig_template

@@ -12,3 +12,5 @@
 [user]
   name = pinokio
   email = pinokio
+[init]
+	defaultBranch = main

package/kernel/peer.js

@@ -9,14 +9,12 @@ class PeerDiscovery {
     this.interval = interval;
     this.peers = new Set();
     this.host = this._getLocalIPAddress()
-    console.log("THIS>HOST", this.host)
     this.default_port = 42000
     this.peers.add(this.host)
 //    this.start();
   }
   stop() {
     if (this.socket) {
-      console.log("peer stop")
       clearInterval(this.interval_handle)
       this.socket.close()
     }
@@ -60,7 +58,6 @@ class PeerDiscovery {
     // if PINOKIO_NETWORK_SHARE is 0 or false, turn it off
 //    if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="0" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="false")) {
     await this.check(kernel)
-    console.log({ active: this.active, name: this.name })
 //    if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="1" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="true")) {
 ////      this.active = false
 //      this.active = true

package/kernel/prototype.js

@@ -18,52 +18,51 @@ class Proto {
         await fs.promises.mkdir(this.kernel.path("prototype"), { recursive: true }).catch((e) => { })
         await this.kernel.exec({
           //message: "git clone https://github.com/peanutcocktail/prototype system",
-          message: "git clone https://github.com/pinokiocomputer/prototype system",
+          //message: "git clone https://github.com/pinokiocomputer/prototype system",
+          message: "git clone https://github.com/pinokiocomputer/proto system",
           path: this.kernel.path("prototype")
         }, (e) => {
           process.stdout.write(e.raw)
         })
-      }
-
-      let pinokiojs_path = this.kernel.path("prototype/system/pinokio.js")
-      let config = await this.kernel.require(pinokiojs_path)
-      this.config = config
-
-      if (this.config && this.config.menu) {
-        this.config.menu.push({
-          icon: "fa-solid fa-rotate",
-          text: "Update",
-          shell: {
-            message: "git pull",
-            path: this.kernel.path("prototype/system")
-          }
+        await this.kernel.download({
+          uri: "https://raw.githubusercontent.com/pinokiocomputer/home/refs/heads/main/docs/README.md",
+          path: this.kernel.path("prototype"),
+          filename: "PINOKIO.md"
+        }, (e) => {
+          process.stdout.write(e.raw)
         })
       }
+    }
+  }
+  async reset() {
+    await fs.promises.rm(this.kernel.path("prototype"), { recursive: true })
+  }
+  async create(req, ondata) {
+    console.log("proto.create", req)
+    try {
+      let projectType = req.params.projectType
+      let startType = req.params.cliType || req.params.startType
+      console.log({ projectType, startType })
 
+      let cwd = req.cwd
+      let name = req.name
+      let payload = {}
+      payload.cwd = path.resolve(cwd, name)
+      payload.input = req.params
 
+      let mod_path = this.kernel.path("prototype/system", projectType, startType)
+      let mod = await this.kernel.require(mod_path)
 
+      await mod(payload, ondata, this.kernel)
 
+      // copy readme
+      let readme_path = this.kernel.path("prototype/PINOKIO.md")
+      await fs.promises.cp(readme_path, path.resolve(cwd, name, "PINOKIO.md"))
 
-////      let prototype_paths = (await glob('**/pinokio.js', { cwd }))
-//      let prototype_dir = path.resolve(this.kernel.homedir, "prototype")
-//      for(let prototype_path of prototype_paths) {
-//        let proto = path.dirname(prototype_path)
-//        let pinokiojs = path.resolve(prototype_dir, prototype_path)
-//        let config = await this.kernel.require(pinokiojs)
-//        if (config && config.run) {
-//          if (config.icon) {
-//            config.icon = "/prototype/" + proto + "/" + config.icon
-//          } else {
-//            config.icon === "/pinokio-black.png"
-//          }
-//          let c = {
-//            id: proto,
-//            ...config
-//          }
-//          this.items.push(c)
-//          this.kv[proto] = c
-//        }
-//      }
+      return { success: "/p/" + name }
+    } catch (e) {
+      console.log("ERROR", e)
+      return { error: e.stack }
     }
   }
   async readme(proto) {

package/kernel/shell.js

@@ -546,9 +546,37 @@ class Shell {
         //let delimiter = " && "
         let delimiter
         if (this.platform === "win32") {
-          delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
+          if (params.chain) {
+            if (params.chain === "&") {
+              delimiter = " && ";   // stop if one command in the chain fails
+            } else if (params.chain === "|") {
+              delimiter = " || ";   // only run the rest of the chain if a command fails
+            } else if (params.chain === "*") {
+              delimiter = " & ";   // always run all commands regardless of whether a command fails
+            } else {
+              // exception => use the safe option (stop when command fails)
+              delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
+            }
+          } else {
+            // default
+            delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
+          }
         } else {
-          delimiter = " ; ";
+          if (params.chain) {
+            if (params.chain === "&") {
+              delimiter = " && ";   // stop if one command in the chain fails
+            } else if (params.chain === "|") {
+              delimiter = " || ";   // only run the rest of the chain if a command fails
+            } else if (params.chain === "*") {
+              delimiter = " ; ";   // always run all commands regardless of whether a command fails
+            } else {
+              // exception => use the safe option (stop when command fails)
+              delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
+            }
+          } else {
+            // default
+            delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
+          }
         }
         return params.message.filter((m) => {
           return m && !/^\s+$/.test(m)

package/kernel/shells.js

@@ -52,20 +52,29 @@ class Shells {
   async launch(params, options, ondata) {
     // if array, duplicate the action
     if (Array.isArray(params.message)) {
-      let res
-      for(let i=0; i<params.message.length; i++) {
-        let message = params.message[i]
-        if (message) {
-          let params_dup = Object.assign({}, params) 
-          params_dup.message = message
-          res = await this._launch(params_dup, options, ondata)
-          // if there's an error, immediately return with the error
-          if (res.error) {
-            return res
+      if (params.chain) {
+        // if "chain" attribute exists,
+        // run commands in the same session
+        let res = await this._launch(params, options, ondata)
+        return res
+      } else {
+        // if "chain" attribute Does not exist (Default),
+        // launch separate shells
+        let res
+        for(let i=0; i<params.message.length; i++) {
+          let message = params.message[i]
+          if (message) {
+            let params_dup = Object.assign({}, params) 
+            params_dup.message = message
+            res = await this._launch(params_dup, options, ondata)
+            // if there's an error, immediately return with the error
+            if (res.error) {
+              return res
+            }
           }
         }
+        return res
       }
-      return res
     } else {
       let res = await this._launch(params, options, ondata)
       return res

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "pinokiod",
-  "version": "3.18.6",
+  "version": "3.19.0",
   "description": "",
   "main": "index.js",
   "scripts": {
+    "download_readme": "wget -O kernel/proto/PINOKIO.md https://raw.githubusercontent.com/pinokiocomputer/home/refs/heads/main/docs/README.md",
     "start": "node script/index"
   },
   "author": "",

package/server/index.js

@@ -172,7 +172,6 @@ class Server {
               //if (this.kernel.api.running[filepath]) {
               if (this.kernel.api.running[id]) {
                 obj.display = "indent"
-                console.log("OBJ", obj)
                 running_dynamic.push(obj)
               }
             }
@@ -409,28 +408,31 @@ class Server {
 
 
     if (config.init_required) {
-      // none of the pinokio.js, pinokio.json, pinokio_meta.json exists => need to initialize
-      // if there is no menu, display all files
-      let p = this.kernel.path("api", name)
-      let files = await fs.promises.readdir(p, { withFileTypes: true })
-      files = files.filter((file) => {
-        return file.name.endsWith(".json") || file.name.endsWith(".js")
-      }).filter((file) => {
-        return file.name !== "pinokio.js" && file.name !== "pinokio.json" && file.name !== "pinokio_meta.json"
-      })
-      config = {
-        init_required: true,
-        icon: config.icon,
-        title: name, 
-        menu: files.map((file) => {
-          return {
-            text: file.name,
-            href: file.name
-          }
-        })
-      }
-      let uri = this.kernel.path("api")
-      await this.renderMenu(uri, name, config, [])
+      res.redirect("/init/" + name)
+      return
+        
+//      // none of the pinokio.js, pinokio.json, pinokio_meta.json exists => need to initialize
+//      // if there is no menu, display all files
+//      let p = this.kernel.path("api", name)
+//      let files = await fs.promises.readdir(p, { withFileTypes: true })
+//      files = files.filter((file) => {
+//        return file.name.endsWith(".json") || file.name.endsWith(".js")
+//      }).filter((file) => {
+//        return file.name !== "pinokio.js" && file.name !== "pinokio.json" && file.name !== "pinokio_meta.json"
+//      })
+//      config = {
+//        init_required: true,
+//        icon: config.icon,
+//        title: name, 
+//        menu: files.map((file) => {
+//          return {
+//            text: file.name,
+//            href: file.name
+//          }
+//        })
+//      }
+//      let uri = this.kernel.path("api")
+//      await this.renderMenu(uri, name, config, [])
     } else {
       let menu = config.menu || []
       if (typeof config.menu === "function") {
@@ -560,9 +562,6 @@ class Server {
     if (!this.kernel.proto.config) {
       await this.kernel.proto.init()
     }
-//    if (!this.kernel.plugin.config) {
-//      await this.kernel.plugin.init()
-//    }
     res.render("app", result)
   }
   getVariationUrls(req) {
@@ -2579,6 +2578,13 @@ class Server {
 
         let gitconfig = path.resolve(home, "gitconfig")
         await fse.remove(gitconfig)
+        await fs.promises.copyFile(
+          path.resolve(__dirname, "..", "kernel", "gitconfig_template"),
+          gitconfig
+        )
+
+        let prototype_path = path.resolve(home, "prototype")
+        await fse.remove(prototype_path)
         
 
         console.log("[TRY] Updating to the new version")
@@ -2731,9 +2737,9 @@ class Server {
 //        return
 //      }
       
-      if (!this.kernel.proto.config) {
-        await this.kernel.proto.init()
-      }
+//      if (!this.kernel.proto.config) {
+//        await this.kernel.proto.init()
+//      }
       if (!this.kernel.plugin.config) {
         await this.kernel.plugin.init()
       }
@@ -2906,6 +2912,57 @@ class Server {
 //      }
     }))
 
+    this.app.get("/init/:name", ex(async (req, res) => {
+      /*
+        option 1: new vs. clone
+        - new|clone
+        
+        option 2: type
+          - empty
+          - cli app
+          - documentation
+          - nodejs project
+          - python project
+            - gradio + torch
+
+        option 3: ai vs. empty
+          - prompt
+
+      */
+      res.render("prototype/init", {
+        cwd: this.kernel.path("api"),
+        name: req.params.name,
+        portal: this.portal,
+//        items,
+        logo: this.logo,
+        platform: this.kernel.platform,
+        theme: this.theme,
+        agent: this.agent,
+        kernel: this.kernel,
+      })
+      /*
+      let config = structuredClone(this.kernel.proto.config)
+      console.log(config)
+      config = this.renderMenu2(config, {
+        cwd: req.query.path,
+        href: "/prototype/show",
+        path: this.kernel.path("prototype/system"),
+        web_path: "/asset/prototype/system"
+      })
+      res.render("prototype/index", {
+        config,
+        path: req.query.path,
+        portal: this.portal,
+//        items,
+        logo: this.logo,
+        platform: this.kernel.platform,
+        theme: this.theme,
+        agent: this.agent,
+        kernel: this.kernel,
+      })
+      */
+    }))
+
     this.app.get("/check_router_up", ex(async (req, res) => {
       let response = await this.check_router_up()
       res.json(response)
@@ -3656,7 +3713,8 @@ class Server {
 
         res.json({
           //success: "/pinokio/browser/"+folder
-          success: "/p/"+folder
+          //success: "/p/"+folder
+          success: "/init/"+folder
         })
       } catch (e) {
         res.json({

package/server/public/style.css

@@ -147,8 +147,7 @@ body.dark .dynamic.selected {
 
 .url-bar {
   font-family: verdana;
-  font-size: 13px;
-  line-height: 15px;
+  font-size: 12px;
   padding: 0 10px;
   font-weight: normal;
   flex-grow: 1;

package/server/views/index.ejs

@@ -304,7 +304,10 @@ body.dark .open-menu, body.dark .browse {
 <% if (ishome) { %>
   <form class='search'>
   <div class='app-btns'>
-    <a class='btn create-new' id='create-new-folder'><i class="fa-solid fa-folder-plus"></i> Create</a>
+    <a class='btn create-new' id='create-new-folder'><i class="fa-solid fa-plus"></i> New</a>
+    <!--
+    <a class='btn create-new' href="/create"><i class="fa-solid fa-folder-plus"></i> Create</a>
+    -->
     <a class='btn' id='explore' href="/?mode=explore"><i class="fa-solid fa-magnifying-glass"></i> Discover</a>
   </div>
     <% if (display.includes("form")) { %>