pinokiod 3.18.6 → 3.18.9

package/kernel/api/index.js

@@ -50,9 +50,19 @@ 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)
+    console.log("meta", meta)
 
     // create pinokio.json if it doesn't exist
 //    if (!pinokio3) {
@@ -929,9 +939,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