pinokiod 0.1.5 → 0.1.7

package/kernel/index.js

@@ -239,5 +239,14 @@ class Kernel {
       console.log("### ERROR", e)
     }
   }
+  async exec(params, ondata) {
+//    params.path = this.path()
+//    if (this.client) {
+//      params.cols = this.client.cols
+//      params.rows = this.client.rows
+//    }
+    let response = await this.shell.run(params, null, ondata)
+    return response
+  }
 }
 module.exports = Kernel

package/package.json

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

package/script/index.js

@@ -22,6 +22,15 @@ class Store {
       return null
     }
   }
+  delete(key) {
+    try {
+      let str = fs.readFileSync(path.resolve(__dirname, "pinokio.json"), "utf8")
+      let o = JSON.parse(str)
+      delete o[key]
+      fs.writeFileSync(path.resolve(__dirname, "pinokio.json"), JSON.stringify(o, null, 2))
+    } catch (e) {
+    }
+  }
 }
 const server = new Server({
   port: 42000,

package/server/index.js

@@ -1,4 +1,5 @@
 const express = require('express');
+const sudo = require("sudo-prompt-programfiles-x86");
 const compressing = require('compressing');
 const { rimraf } = require('rimraf')
 const { createHttpTerminator } = require('http-terminator')
@@ -327,10 +328,9 @@ class Server {
         query: req.query
       })
     } else if (pathComponents.length === 0 && req.query.mode === "settings") {
-      let home = this.kernel.homedir
       let configArray = [{
         key: "home",
-        val: home, //this.kernel.store.get("home"),
+        val: this.kernel.homedir,
         placeholder: "Enter the absolute path to use as your Pinokio home folder (D:\\pinokio, /Users/alice/pinokiofs, etc.)"
       }, {
         key: "theme",
@@ -1223,33 +1223,27 @@ class Server {
       return installed
     }
   }
-  async configure(newConfig) {
-
-//    if (newConfig && newConfig.home) {
-//      this.kernel.store.set("home", newConfig.home)
-//    }
-    if (newConfig && newConfig.theme) {
-      this.kernel.store.set("theme", newConfig.theme)
-      this.theme = newConfig.theme
-    } else {
-      this.theme = this.kernel.store.get("theme") || "light"
-    }
-
-//    // write theme
-//    const p = path.resolve(this.kernel.homedir, "config.json")
-//    let config = (await this.kernel.loader.load(p)).resolved
-//    if (!config) {
-//      await fs.promises.writeFile(p, JSON.stringify({
-//        theme: "light"
-//      }))
-//      config = (await this.kernel.loader.load(p)).resolved
-//    }
-//
-//    if (newConfig) {
-//      await fs.promises.writeFile(p, JSON.stringify(newConfig))
-//      config = (await this.kernel.loader.load(p)).resolved
-//    }
-//    this.theme = config.theme
+  async sudo_exec(message, homedir) {
+    console.log("sudo_exec", { message, homedir })
+    // sudo-prompt uses TEMP
+    let TEMP = path.resolve(homedir, "cache", "TEMP")
+    await fs.promises.mkdir(TEMP, { recursive: true }).catch((e) => { })
+    let response = await new Promise((resolve, reject) => {
+      sudo.exec(message, { name: "Pinokio" }, (err, stdout, stderr) => {
+        if (err) {
+          reject(err)
+        } else if (stderr) {
+          reject(stderr)
+        } else {
+          resolve(stdout)
+        }
+      });
+    })
+    return response
+  }
+  async syncConfig() {
+    // 1. THEME
+    this.theme = this.kernel.store.get("theme") || "light"
     if (this.theme === "dark") {
       this.colors = {
         color: "rgb(31, 29, 39)",
@@ -1263,6 +1257,86 @@ class Server {
     }
     //this.logo = (this.theme === 'dark' ?  "<img class='icon' src='/pinokio-white.png'>" : "<img class='icon' src='/pinokio-black.png'>")
     this.logo = '<i class="fa-solid fa-house"></i>'
+
+    // 2. HOME
+    // 2.1. Check if the config includes NEW_HOME => if so,
+    //    - move the HOME folder to NEW_HOME
+    //    - set HOME=NEW_HOME
+    //    - remove NEW_HOME
+    let new_home = this.kernel.store.get("new_home")
+    console.log("new_home", new_home)
+    if (new_home) {
+      // move the home folder to new_home
+
+      let existing_home = this.kernel.store.get("home")
+
+      console.log({ existing_home, new_home })
+
+      if (existing_home) {
+        // if the home is already set, move
+        console.log("RUNNING MV")
+        const mv_cmd = `${(this.kernel.platform === "win32" ? "move" : "mv")} ${existing_home} ${new_home}`
+        await this.sudo_exec(mv_cmd, existing_home)
+        console.log("FINISHED MV")
+
+        //// Next, empty the bin folder => need to reinitialize because of symlinks, etc. with the package managers
+        console.log("RUNNING RM BIN")
+        const path_to_delete = path.resolve(new_home, "bin")
+        let del_cmd
+        if (this.kernel.platform === "win32") {
+          del_cmd = `rd /s /q ${path_to_delete}`
+        } else {
+          del_cmd = `rm -rf ${path_to_delete}`
+        }
+        console.log("del_cmd", del_cmd)
+
+        await this.sudo_exec(del_cmd, new_home)
+        console.log("FINISHED RM BIN")
+
+        // set home=new_home
+        this.kernel.store.set("home", new_home)
+        // delete new_home
+        console.log("STORE", this.kernel.store)
+        this.kernel.store.delete("new_home")
+      } else {
+        // if the home is not already set, don't need to do anything
+      }
+    }
+  }
+  async setConfig(config) {
+    console.log("setConfig", config)
+    let home = this.kernel.store.get("home")
+    let theme = this.kernel.store.get("theme")
+    console.log("before setting config", { home, theme })
+
+    // 1. Handle THEME
+    if (config.theme) {
+      this.kernel.store.set("theme", config.theme)
+      //this.theme = config.theme
+    }
+    // 2. Handle HOME
+    if (config.home) {
+      // set "new_home"
+      const basename = path.basename(config.home)
+
+      // check for invalid path
+      let isValidPath = (basename !== '' && basename !== config.home)
+      if (isValidPath) {
+        this.kernel.store.set("new_home", config.home)
+      } else {
+        throw new Error("Invalid path: " + config.home)
+      }
+
+      // check if the destination already exists => throw error
+      let exists = await fse.pathExists(config.home)
+      if (exists) {
+        throw new Error(`The path ${config.home} already exists. Please remove the folder and retry`)
+      }
+    }
+
+    home = this.kernel.store.get("home")
+    theme = this.kernel.store.get("theme")
+    console.log("after setting config", { home, theme })
   }
   async start(debug) {
 
@@ -1277,6 +1351,11 @@ class Server {
       await this.httpTerminator.terminate();
       console.log("terminate end")
     }
+
+    // configure from kernel.store
+    this.syncConfig()
+
+    // initialize kernel
     await this.kernel.init()
 
 
@@ -1315,7 +1394,7 @@ class Server {
 
     
 
-    await this.configure()
+    //await this.configure()
 
 
     this.started = false
@@ -1334,7 +1413,7 @@ class Server {
     this.app.use(cookieParser());
     this.app.use(session({secret: "secret" }))
 
-    let home = this.kernel.store.get("home")
+    let home = this.kernel.homedir
     this.app.get("/", async (req, res) => {
       console.log("### req.headers", req.headers)
 
@@ -1866,99 +1945,14 @@ class Server {
       this.start(this.debug)
     })
     this.app.post("/config", async (req, res) => {
-      await this.configure(req.body)
-
-      // get the existing homedir
-      let existingHome = this.kernel.homedir
-
-      // update the pinokio.json file
-      if (req.body.home && req.body.home.length > 0) {
-        if (req.body.home === existingHome) {
-          res.json({ success: true })
-        } else {
-          const basename = path.basename(req.body.home)
-          let isValidPath = (basename !== '' && basename !== req.body.home);
-          if (isValidPath) {
-            // move the existing home directory to the new home directory
-
-
-            try {
-              // First move the home
-              //await fse.move(existingHome, req.body.home)
-              console.log({ home: req.body.home, existingHome })
-
-              // check if the dest exists
-              // if it exists, display an error
-//              console.log("REMOVE DEST IF EXISTS")
-//              await fse.remove(req.body.home)
-              let exists = await fse.pathExists(req.body.home)
-              if (exists) {
-                res.json({ error: `The path ${req.body.home} already exists. Please remove the folder and retry` })
-                return
-              }
-
-              console.log("RUNNING MV")
-              await this.kernel.bin.exec({
-                message: `${(this.kernel.platform === "win32" ? "move" : "mv")} ${existingHome} ${req.body.home}`,
-                sudo: true
-              }, (stream) => {
-                console.log(stream)
-              })
-              console.log("FINISHED MV")
-
-              //// Next, empty the bin folder => need to reinitialize because of symlinks, etc. with the package managers
-              let defaultBin = path.resolve(req.body.home, "bin")
-              await rimraf(defaultBin)
-
-              // set the home variable
-              this.kernel.store.set("home", req.body.home)
-
-              res.json({ success: true })
-            } catch (e) {
-              console.log("ERROR", e)
-              res.json({ error: e.stack })
-            }
-
-          } else {
-            res.json({ error: "invalid filepath" })
-          }
-        }
-      } else {
-        // if the home directory is empty, remove the home attribute, and move the existing home to the homedir
-        let defaultHome = path.resolve(os.homedir(), "pinokio")
-        try {
-          // First, move the home
-          //await fse.move(existingHome, defaultHome)
-          console.log({ defaultHome, existingHome })
-
-//          console.log("REMOVE DEST IF EXISTS")
-//          await fse.remove(defaultHome)
-          let exists = await fse.pathExists(defaultHome)
-          if (exists) {
-            res.json({ error: `The path ${defaultHome} already exists. Please remove the folder and retry` })
-            return
-          }
-
-          console.log("RUNNING MV")
-          await this.kernel.bin.exec({
-            message: `${(this.kernel.platform === "win32" ? "move" : "mv")} ${existingHome} ${defaultHome}`,
-            sudo: true
-          }, (stream) => {
-            console.log(stream)
-          })
-          console.log("FINISHED MV")
-
-          //// Next, empty the bin folder => need to reinitialize because of symlinks, etc. with the package managers
-          let defaultBin = path.resolve(defaultHome, "bin")
-          await rimraf(defaultBin)
-
-          this.kernel.store.set("home", null)
-
-          res.json({ success: true })
-        } catch (e) {
-          res.json({ error: e.stack })
-        }
+      console.log("/config", { body: req.body })
+      try {
+        await this.setConfig(req.body)
+        res.json({ success: true })
+      } catch (e) {
+        res.json({ error: e.stack })
       }
+
       // update homedir
     })
     // install