pinokiod 0.2.0 → 1.0.1

package/kernel/api/index.js

@@ -13,7 +13,6 @@ class Api {
   constructor(kernel) {
     this.kernel = kernel
     this.gitPath = {}
-    this.userdir = path.resolve(kernel.homedir, "api")
     this.loader = new Loader()
     this.queues = {}
     this.listeners = {}
@@ -23,8 +22,12 @@ class Api {
     this.waiter = {}
   }
   async init() {
-    await fs.promises.mkdir(this.userdir, { recusrive: true, }).catch((e) => { })
-    await this.linkGit()
+    console.log("api.init", { homedir: this.kernel.homedir })
+    if (this.kernel.homedir) {
+      this.userdir = path.resolve(this.kernel.homedir, "api")
+      await fs.promises.mkdir(this.userdir, { recusrive: true, }).catch((e) => { })
+      await this.linkGit()
+    }
   }
   respond(req) {
     let requestPath = this.filePath(req.uri)

package/kernel/bin/index.js

@@ -155,8 +155,10 @@ class Bin {
     return e
   }
   async init() {
-    const bin_folder = this.path()
-    await fs.promises.mkdir(bin_folder, { recursive: true }).catch((e) => { })
+    if (this.kernel.homedir) {
+      const bin_folder = this.path()
+      await fs.promises.mkdir(bin_folder, { recursive: true }).catch((e) => { })
+    }
     // ORDERING MATTERS.
     // General purpose package managers like conda, conda needs to come at the end
 
@@ -190,24 +192,26 @@ class Bin {
       this.mod[mod.name] = mod.mod
     }
 
-    this.refreshInstalled().catch((e) => {
-      console.log("RefreshInstalled Error", e)
-    })
 
 
     // write to pipconfig if it doesn't exist
-    let pipconfig_path = path.resolve(this.kernel.homedir, "pipconfig")
-    let pipconfig_exists = await this.kernel.api.exists(pipconfig_path)
-    console.log("pipconfig exists?", { pipconfig_path, pipconfig_exists })
-    // if not, create one
-    if (!pipconfig_exists) {
-      const pipconfigStr = `[global]
-timeout = 1000`
-      await fs.promises.writeFile(pipconfig_path, pipconfigStr) 
-//      await fs.promises.copyFile(
-//        path.resolve(__dirname, "..", "pipconfig_template"),
-//        pipconfig_path
-//      )
+    if (this.kernel.homedir) {
+      this.refreshInstalled().catch((e) => {
+        console.log("RefreshInstalled Error", e)
+      })
+      let pipconfig_path = path.resolve(this.kernel.homedir, "pipconfig")
+      let pipconfig_exists = await this.kernel.api.exists(pipconfig_path)
+      console.log("pipconfig exists?", { pipconfig_path, pipconfig_exists })
+      // if not, create one
+      if (!pipconfig_exists) {
+        const pipconfigStr = `[global]
+  timeout = 1000`
+        await fs.promises.writeFile(pipconfig_path, pipconfigStr) 
+  //      await fs.promises.copyFile(
+  //        path.resolve(__dirname, "..", "pipconfig_template"),
+  //        pipconfig_path
+  //      )
+      }
     }
 
 

package/kernel/index.js

@@ -135,22 +135,16 @@ class Kernel {
 
   async init() {
     let home = this.store.get("home")
-    if (home) {
-      this.homedir = home
 
-//      // check if the path exists
-//      let exists = fs.existsSync(home)
-//      if (exists) {
-//        this.homedir = home
-//      } else {
-//        // if it doesn't exist, means there was some error, so just delete this entry from the store, and set the default home as the home
-//        this.store.delete("home")
-//        this.homedir = path.resolve(os.homedir(), "pinokio")
-//      }
-    } else {
-//      this.homedir = null
-      this.homedir = path.resolve(os.homedir(), "pinokio")
-    }
+    this.homedir = home
+
+    console.log("kernel.init", { homedir: this.homedir })
+
+//    if (home) {
+//      this.homedir = home
+//    } else {
+//      this.homedir = path.resolve(os.homedir(), "pinokio")
+//    }
     console.log("homedir", this.homedir)
     if (this.log_queue) {
       this.log_queue.killAndDrain()
@@ -201,33 +195,29 @@ class Kernel {
     this.procs = {}
     this.template = new Template(this)
     try {
-      await fs.promises.mkdir(this.homedir, { recursive: true }).catch((e) => {})
-//      await fs.promises.mkdir(path.resolve(this.homedir, "cache", "TMPDIR"), { recursive: true }).catch((e) => {})
-//      await fs.promises.mkdir(path.resolve(this.homedir, "cache", "TMP"), { recursive: true }).catch((e) => {})
-//      await fs.promises.mkdir(path.resolve(this.homedir, "cache", "TEMP"), { recursive: true }).catch((e) => {})
-//
-//
-      
-      const cache_folders = [
-        "HF_HOME",
-        "TORCH_HOME",
-        "HOMEBREW_CACHE",
-        "XDG_CACHE_HOME",
-        "PIP_CACHE_DIR",
-        "PIP_TMPDIR",
-        "TEMP",
-        "TMP",
-        "XDG_DATA_HOME",
-        "XDG_CONFIG_HOME",
-        "XDG_STATE_HOME",
-        "GRADIO_TEMP_DIR"
-      ]
-      for(let folder of cache_folders) {
-        await fs.promises.mkdir(path.resolve(this.homedir, "cache", folder), { recursive: true }).catch((e) => {})
-      }
+      if (this.homedir) {
+        await fs.promises.mkdir(this.homedir, { recursive: true }).catch((e) => {})
+        const cache_folders = [
+          "HF_HOME",
+          "TORCH_HOME",
+          "HOMEBREW_CACHE",
+          "XDG_CACHE_HOME",
+          "PIP_CACHE_DIR",
+          "PIP_TMPDIR",
+          "TEMP",
+          "TMP",
+          "XDG_DATA_HOME",
+          "XDG_CONFIG_HOME",
+          "XDG_STATE_HOME",
+          "GRADIO_TEMP_DIR"
+        ]
+        for(let folder of cache_folders) {
+          await fs.promises.mkdir(path.resolve(this.homedir, "cache", folder), { recursive: true }).catch((e) => {})
+        }
 
+      }
 
-      let contents = await fs.promises.readdir(this.homedir)
+//      let contents = await fs.promises.readdir(this.homedir)
       await this.bin.init()
       await this.api.init()
       await this.template.init()

package/package.json

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

package/server/index.js

@@ -1482,6 +1482,36 @@ class Server {
     let new_home = this.kernel.store.get("new_home")
     console.log("after setting config", { home, theme, new_home })
   }
+  async startLogging() {
+    if (!this.debug) {
+      if (this.logInterval) {
+        clearInterval(this.logInterval)
+      }
+      if (this.kernel.homedir) {
+        let exists = await this.exists(this.kernel.homedir)
+        if (exists) {
+          let logsdir = path.resolve(this.kernel.homedir, "logs")
+          await fs.promises.mkdir(logsdir, { recursive: true }).catch((e) => { })
+          if (!this.log) {
+            this.log = fs.createWriteStream(path.resolve(this.kernel.homedir, "logs/stdout.txt"))
+            process.stdout.write = process.stderr.write = this.log.write.bind(this.log)
+            process.on('uncaughtException', (err) => {
+              console.error((err && err.stack) ? err.stack : err);
+            });
+            this.logInterval = setInterval(async () => {
+              let file = path.resolve(this.kernel.homedir, "logs/stdout.txt")
+              let data = await fs.promises.readFile(file, 'utf8')
+              let lines = data.split('\n')
+              if (lines.length > 100000) {
+                let str = lines.slice(-100000).join("\n")
+                await fs.promises.writeFile(file, str)
+              }
+            }, 1000 * 60 * 10)  // 10 minutes
+          }
+        }
+      }
+    }
+  }
   async start(debug) {
 
 
@@ -1502,6 +1532,8 @@ class Server {
     // initialize kernel
     await this.kernel.init()
 
+    console.log("homedir", this.kernel.homedir)
+
 
 //    if (!debug) {
 //      let logsdir = path.resolve(this.kernel.homedir, "logs")
@@ -1514,27 +1546,7 @@ class Server {
 //        });
 //      }
 //    }
-
-    if (!debug) {
-      let logsdir = path.resolve(this.kernel.homedir, "logs")
-      await fs.promises.mkdir(logsdir, { recursive: true }).catch((e) => { })
-      if (!this.log) {
-        this.log = fs.createWriteStream(path.resolve(this.kernel.homedir, "logs/stdout.txt"))
-        process.stdout.write = process.stderr.write = this.log.write.bind(this.log)
-        process.on('uncaughtException', (err) => {
-          console.error((err && err.stack) ? err.stack : err);
-        });
-        setInterval(async () => {
-          let file = path.resolve(this.kernel.homedir, "logs/stdout.txt")
-          let data = await fs.promises.readFile(file, 'utf8')
-          let lines = data.split('\n')
-          if (lines.length > 100000) {
-            let str = lines.slice(-100000).join("\n")
-            await fs.promises.writeFile(file, str)
-          }
-        }, 1000 * 60 * 10)  // 10 minutes
-      }
-    }
+    await this.startLogging()
 
     
 
@@ -1562,10 +1574,38 @@ class Server {
     this.app.get("/", async (req, res) => {
       console.log("### req.headers", req.headers)
 
+      console.log({ mode: req.query.mode, home, homeempty: !home })
       if (req.query.mode !== "settings" && !home) {
+        console.log("settings")
         res.redirect("/?mode=settings")
         return
+
+
+      }
+      if (req.query.mode === 'settings') {
+        let configArray = [{
+          key: "home",
+          val: this.kernel.homedir ? this.kernel.homedir : path.resolve(os.homedir(), "pinokio"),
+          placeholder: "Enter the absolute path to use as your Pinokio home folder (D:\\pinokio, /Users/alice/pinokiofs, etc.)"
+        }, {
+          key: "theme",
+          val: this.theme,
+          options: ["light", "dark"]
+        }]
+        console.log("agent", this.agent)
+        res.render("settings", {
+          version: this.version,
+          logo: this.logo,
+          theme: this.theme,
+          agent: this.agent,
+          paths: [],
+          config: configArray,
+          query: req.query
+        })
+
+        return
       }
+      console.log("abc")
 
       let apipath = this.kernel.path("api")
       let files = await fs.promises.readdir(apipath, { withFileTypes: true })