pinokiod 1.3.78 → 1.3.79

package/kernel/api/fs/index.js

@@ -13,7 +13,6 @@ const Environment = require("../../environment")
 const Util = require("../../util")
 
 const log = (msgs, ondata) => {
-  console.log("# LOG")
   for(let msg of msgs) {
     if (typeof msg === "object") {
       msg = JSON.stringify(msg, null, 2).replace(/\n/g, "\r\n")
@@ -131,10 +130,7 @@ class FS {
 
 
     // start with the proces.env => merge pinokio global ENVIRONMENT => merge app ENVIRONMENT
-    let default_env = await Environment.get(kernel.homedir)
-    let api_path = Util.api_path(req.parent.path, kernel)
-    let api_env = await Environment.get(api_path)
-    let current_env = Object.assign(process.env, default_env, api_env)
+    let current_env = await Environment.get2(req.parent.path)
 
     // if PINOKIO_DRIVE environment variable is specified, use this custom value for the drive path instead of ~/pinokio/drive
     let env_drive_path = current_env.PINOKIO_DRIVE
@@ -278,9 +274,6 @@ class FS {
             }
           }
 
-          console.log(" >> d before", d)
-          console.log(JSON.stringify({ copy, move }, null, 2))
-
           for(let relpath of copy) {
             if (drive_home) {
               d.copy[relpath] = path.resolve(drive_home, p, relpath)
@@ -295,7 +288,6 @@ class FS {
               d.move[relpath] = kernel.path("drive", p, relpath)
             }
           }
-          console.log(">> d after", d)
           ondata({
             raw: "\r\nLINKING DRIVES:\r\n" + JSON.stringify(d, null, 2).replace(/\n/g, "\r\n")
           })

package/kernel/api/local/index.js

@@ -63,10 +63,7 @@ class Local {
       }
     */
 
-    let api_path = Util.api_path(req.parent.path, kernel)
-    let current_env = await Environment.get(api_path)
-    let default_env = await Environment.get(kernel.homedir)
-    current_env = Object.assign(process.env, default_env, current_env)
+    current_env = await Environment.get2(req.parent.path)
 
     // if the key at current_env.PINOKIO_SHARE_VAR (by default it's 'url') is the variable being set, trigger the share logic
     if (current_env.PINOKIO_SHARE_VAR && current_env.PINOKIO_SHARE_VAR in req.params) {

package/kernel/bin/conda.js

@@ -95,7 +95,7 @@ create_default_packages:
     }
     ondata({ raw: `${cmd}\r\n` })
     ondata({ raw: `path: ${this.kernel.bin.path()}\r\n` })
-    await this.kernel.bin.exec({ message: cmd, conda: { skip: true } }, (stream) => {
+    await this.kernel.bin.exec({ sudo: true, message: cmd, conda: { skip: true } }, (stream) => {
       ondata(stream)
     })
 ////    await this.activate()

package/kernel/environment.js

@@ -259,15 +259,14 @@ const init_folders = async (homedir) => {
   for(let key in current_env) {
     let val = current_env[key]
 
-    console.log({ key, val })
-    // skip condarc and pipconfig => special case
-    if (["PIP_CONFIG_FILE", "CONDARC"].includes(key)) {
-      console.log("IGNORE", key)
-      continue
-    }
     let is_absolute = path.isAbsolute(val)
     let is_relative = val.startsWith("./")
     if (is_absolute || is_relative) {
+
+      // skip condarc and pipconfig => special case
+      if (["PIP_CONFIG_FILE", "CONDARC"].includes(key)) {
+        continue
+      }
       // it's a path
       let full_path = path.resolve(homedir, val)
       await fs.promises.mkdir(full_path, { recursive: true }).catch((e) => {})

package/kernel/index.js

@@ -57,10 +57,7 @@ class Kernel {
     } else {
       folderpath = this.homedir
     }
-    let api_path = Util.api_path(folderpath, this)
-    let current_env = await Environment.get(api_path)
-    let default_env = await Environment.get(this.homedir)
-    return Object.assign(process.env, default_env, current_env)
+    return Environment.get2(folderpath, this)
   }
   resumeprocess(uri) {
     let proc = this.procs[uri]

package/package.json

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

package/server/index.js

@@ -233,9 +233,22 @@ class Server {
     let current = this.kernel.path("api", name, "ENVIRONMENT")
       // if environment.json doesn't exist, 
     let exists = await this.exists(current)
-    if (!exists) {
+    if (exists) {
+      // if ENVIRONMENT already exists, don't do anything
+    } else {
+      // if ENVIRONMENT doesn't exist, need to create one
+      // 1. if _ENVIRONMENT exists, create ENVIRONMENT by appending _ENVIRONMENT to ENVIRONMENT
+      // 2. if _ENVIRONMENT doesn't exist, just write ENVIRONMENT
+      // if _ENVIRONMENT exists, 
+      let _environment = this.kernel.path("api", name, "_ENVIRONMENT")
+      let _exists = await this.exists(_environment)
       let content = await Environment.ENV("app")
-      await fs.promises.writeFile(current, content)
+      if (_exists) {
+        let _environmentStr = await fs.promises.readFile(_environment, "utf8")
+        await fs.promises.writeFile(current, content + "\n\n" + _environmentStr)
+      } else {
+        await fs.promises.writeFile(current, content)
+      }
     }
 
     let mode = "run"
@@ -2315,7 +2328,6 @@ class Server {
         await this.renderMenu(uri, name, config, [])
       }
 
-      console.log("this.kernel.shell.shells.length", this.kernel.shell.shells.length)
 
       ejs.renderFile(path.resolve(__dirname, "views/partials/menu.ejs"), { menu: config.menu }, (err, html) => {
         res.send(html)

package/server/views/browser-experimental.ejs

@@ -1274,7 +1274,8 @@ document.querySelector("aside").addEventListener("click", async (e) => {
     target.querySelector("i.fa-square").className = "fa-solid fa-check"
     n.Noty({
       text: `stopping ${src}`,
-      silent: true
+      silent: true,
+      timeout: 2000
     })
     console.log("src", src)
 
@@ -1289,6 +1290,7 @@ document.querySelector("aside").addEventListener("click", async (e) => {
       if (packet.type === "result") {
         socket.close()
         n.Noty({
+          timeout: 2000,
           text: `stopped`,
           silent: true
         })

package/server/views/fullscreen_editor.ejs

@@ -95,6 +95,9 @@ header {
 .navheader {
   background: var(--dark-bg);
 }
+.btn {
+  background: royalblue;
+}
 </style>
 <script>
 document.addEventListener("DOMContentLoaded", async () => {
@@ -466,6 +469,7 @@ document.addEventListener("DOMContentLoaded", async () => {
                 if (options && options.html) {
                   n.Noty({
                     text: options.html,
+                    timeout: 3000,
                     callbacks: {
                       onClose: () => {
                         let uri = options.uri || options.href
@@ -784,7 +788,7 @@ const reloadMemory = async () => {
   <% if (!install_required) { %>
     <div class='runner'>
       <div class='btn run <%= mod && runnable ? "" : "hidden" %>'>
-        <span class='play'><i class="fa-solid fa-play"></i> Run</span>
+        <span class='play'><i class="fa-solid fa-play"></i> Start</span>
         <span class='starting hidden'><i class="fa-solid fa-circle-notch fa-spin"></i> Starting...</span>
         <span class='stop hidden'><i class="fa-solid fa-stop"></i> Stop</span>
       </div>

package/server/views/index.ejs

@@ -287,6 +287,9 @@ body.dark .browser-options-row {
               <div class='title'><%=item.name%></div>
               <div class='description'><%=item.description%></div>
               <div>
+                <button class='btn browse' data-src="<%=item.browser_url%>/browse">
+                  <i class='fa-regular fa-folder-open'></i>
+                </button>
                 <% if (item.running_scripts) { %>
                   <% item.running_scripts.forEach((s) => { %>
                       <button class='btn shutdown' data-src="<%=s.path%>">
@@ -334,6 +337,9 @@ body.dark .browser-options-row {
               <div class='uri'><i class="fa-regular fa-folder"></i><%=item.url%></div>
               <div class='title'><%=item.name%></div>
               <div class='description'><%=item.description%></div>
+              <button class='btn browse' data-src="<%=item.browser_url%>/browse">
+                <i class='fa-regular fa-folder-open'></i>
+              </button>
               <% if (item.shortcuts && item.shortcuts.length > 0) { %>
                 <div class='btns'>
                   <% item.shortcuts.forEach((btn) => { %>