pinokiod 1.2.48 → 1.2.50

package/kernel/api/fs/index.js

@@ -128,7 +128,6 @@ class FS {
         [p],
         ondata
       )
-      console.log("RES", res)
       // symlink:
       //  from => :package_path
       //  to => /drives/packages/pip/:package_name/:package_version
@@ -171,8 +170,6 @@ class FS {
         const move = res[name].move
         const version = res[name].version
 
-        console.log({ name, copy, move, version })
-
         if (version) {
           let site_packages_root;
           if (kernel.platform === "win32") {
@@ -191,7 +188,6 @@ class FS {
           for(let relpath of move) {
             d.move[relpath] = kernel.path("drive", p, relpath)
           }
-          console.log("D", name, d)
           ondata({
             raw: "\r\nLINKING DRIVES:\r\n" + JSON.stringify(d, null, 2).replace(/\n/g, "\r\n")
           })
@@ -243,7 +239,6 @@ class FS {
 
         req.params.drive[route] = linkPath
       }
-      console.log("call drive.create")
       await drive.create({
         uri: req.parent.git,
         drive: req.params.drive,
@@ -389,11 +384,9 @@ class FS {
     let userAgent = randomUseragent.getRandom((ua) => {
       return ua.browserName === 'Chrome';
     });
-    console.log("userAgent", userAgent)
 
     if (params.dir) {
       folder = kernel.api.filePath(params.dir, req.cwd)
-      console.log("folder", folder)
       await fs.promises.mkdir(folder, { recursive: true }).catch((e) => { })
       dl = new DownloaderHelper(url, folder, {
         headers: {
@@ -414,7 +407,6 @@ class FS {
     } else if (params.path) {
       let filepath = kernel.api.filePath(params.path, req.cwd)
       folder = path.dirname(filepath)
-      console.log("folder", folder)
       await fs.promises.mkdir(folder, { recursive: true }).catch((e) => { })
       let filename = path.basename(filepath)
       dl = new DownloaderHelper(url, folder, {
@@ -460,12 +452,10 @@ class FS {
       })
       dl.on('download', (downloadInfo) => {
         const msg = `\r\n[Download Started] ${JSON.stringify({ name: downloadInfo.fileName, total: downloadInfo.totalSize })}\r\n`
-        console.log(msg)
         ondata({ raw: msg })
       })
       dl.on('skip', (skipInfo) => {
         const msg = `\r\n[Download Skipped] File already exists: ${JSON.stringify(skipInfo)}\r\n`
-        console.log(msg)
         ondata({ raw: msg })
         resolve()
       })
@@ -475,22 +465,18 @@ class FS {
           StartsOn: `${opts.delay / 1000} secs`,
           Reason: err ? err.message : 'unknown'
         }) + "\r\n";
-        console.log(msg)
         ondata({ raw: msg })
       })
       dl.on('stateChanged', (state) => {
         const msg = "\r\n[State changed] " + state + "\r\n"
-        console.log(msg)
         ondata({ raw: msg })
       })
       dl.on('redirected', (newUrl, oldUrl) => {
         const msg = `\r\n[Redirected] '${oldUrl}' => '${newUrl}'\r\n`
-        console.log(msg)
         ondata({ raw: msg })
       })
 
       dl.start().catch((err) => {
-        console.log('Download Failed', err)
         ondata({ raw: `\r\n[Download Failed] ${err.stack}!\r\n` })
         reject(err)
       })
@@ -499,9 +485,7 @@ class FS {
   async downloadOne(req, ondata, kernel) {
     await retry(async (bail, number) => {
       ondata({ raw: `\r\n[Attempt ${number}]` })
-      console.log("trying", number)
       await this._download(req, ondata, kernel)
-      console.log("success")
       ondata({ raw: "\r\nDone\r\n" })
     }, {
       retries: 10,

package/kernel/api/import/index.js

@@ -9,6 +9,5 @@ module.exports = async (req, ondata, kernel) => {
     }
   */
   let imported = kernel.import(req.params, req.cwd)
-  console.log("IMPORTED", imported)
   return imported
 }

package/kernel/api/input/index.js

@@ -1,5 +1,4 @@
 module.exports = async (req, ondata, kernel) => {
-  console.log("INPUT", req)
   ondata(req.params, "input")
   let response = await kernel.api.wait(req.parent.path)
   return response

package/kernel/api/local/index.js

@@ -12,17 +12,12 @@ class Local {
       }
     */
     let imported = kernel.import("local", req.params, req.cwd)
-    console.log("IMPORTED", imported)
-
     let converted = Object.assign({}, req, {
       params: {
         local: imported
       }
     })
-    console.log("converted", converted)
     let res = await set(converted, ondata, kernel)
-
-    console.log("memory", JSON.stringify(kernel.memory, null, 2))
     return res
   }
   async set(req, ondata, kernel) {

package/kernel/api/log/index.js

@@ -9,7 +9,6 @@ module.exports = async (req, ondata, kernel) => {
       }
     }
   */
-  console.log("LLOG", req)
   if (req.params) {
     if (typeof req.params.raw !== "undefined") {
       ondata({

package/kernel/api/net/index.js

@@ -2,7 +2,6 @@ const axios = require('axios')
 const fakeUa = require('fake-useragent');
 axios.defaults.headers.common['User-Agent'] = fakeUa()
 module.exports = async (req, ondata, kernel) => {
-  console.log("net req", req)
   const response = await axios(req.params)
   return response.data
 }

package/kernel/api/script/index.js

@@ -5,7 +5,6 @@ class Script {
     return res
   }
   async stop(req, ondata, kernel) {
-    console.log("script.stop", req)
     /*
       {
         "method": "script.run",
@@ -47,7 +46,6 @@ class Script {
       uri = req.params.uri
       let modpath = kernel.api.resolveGitURI(uri)
       const repo_uri = kernel.api.getGitURI(uri)
-      console.log("repo_uri", repo_uri)
       const urlWithoutProtocol = repo_uri.replace(/^(https?:\/\/)/, '');
       const folderName = urlWithoutProtocol.replace(/[^a-zA-Z0-9_\-]/g, '_');
       if (modpath) {
@@ -106,7 +104,6 @@ class Script {
         resolve(r.input)
       })
     })
-    console.log("** RESPONSE", res)
     // need to call api.linkGit() so the git repositories list is up to date
     return res
   }

package/kernel/api/self/index.js

@@ -40,7 +40,6 @@ class Self {
         self: req.params
       }
     })
-    console.log({ req, converted })
     let res = await set(converted, ondata, kernel)
     return res
   }

package/kernel/index.js

@@ -28,7 +28,7 @@ const VARS = {
 //const memwatch = require('@airbnb/node-memwatch');
 class Kernel {
   //schema = ">=1.0.0"
-  schema = "<=1.4.0"
+  schema = "<=1.5.0"
   constructor(store) {
     this.fetch = fetch
     this.store = store
@@ -167,14 +167,11 @@ class Kernel {
 
     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()
     }
@@ -196,7 +193,6 @@ class Kernel {
         }
       }
     }
-    console.log("this.vars", this.vars)
 
 //    let keyfile = path.resolve(this.homedir, "keys.json")
 //    await this.key.init(keyfile)

package/package.json

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

package/server/index.js

@@ -336,10 +336,6 @@ class Server {
         install_required = true
       }
 
-      console.log({ install_required, requirements, requirements_pending })
-
-      console.log("ERROR", error)
-
       res.render("download", {
         error,
         current: req.originalUrl,
@@ -367,8 +363,6 @@ class Server {
         val: this.theme,
         options: ["light", "dark"]
       }]
-      console.log("agent", this.agent)
-      console.log({ configArray })
       let folders = {}
       if (this.kernel.homedir) {
         folders = {
@@ -388,7 +382,6 @@ class Server {
         ...folders
       })
     } else if (stat.isFile()) {
-      console.log("isfile")
 
       if (req.query && req.query.raw) {
         try {
@@ -681,10 +674,6 @@ class Server {
           return r.relevant
         })
 
-        console.log("#filepath", filepath)
-
-
-        console.log({ filepath, })
         let mem = this.getMemory(filepath)
 //        let localMem = this.kernel.memory.local[filepath]
 //        let globalMem = this.kernel.memory.global[filepath]
@@ -734,16 +723,9 @@ class Server {
 //            localhost,
 //          })
 //        }
-        console.log("mem", mem)
-        console.log("originalUrl", req.originalUrl)
         let edu = new URL("http://localhost" + req.originalUrl)
         edu.searchParams.set("mode", "source")
         let editorUrl = edu.pathname + edu.search
-        console.log("editorUrl", editorUrl)
-        console.log("req.query", req.query)
-
-
-
 
         const result = {
           error,
@@ -779,8 +761,6 @@ class Server {
           execUrl: "~" + req.originalUrl.replace(/^\/_api/, "\/api"),
           proxies: this.kernel.api.proxies[filepath],
         }
-        console.log("RESULT", result)
-
 
         res.render(template, result)
       } else {
@@ -1004,7 +984,6 @@ class Server {
             let p = this.kernel.path("api", items[i].name) + path.sep
             //let re = new RegExp(items[i].name)
             //if (re.test(key)) {
-            console.log({ p , key })
             //if (p === key) {
             if (key.includes(p)) {
               items[i].running = true
@@ -1040,15 +1019,12 @@ class Server {
 
       let pinokio_proxy = this.kernel.api.proxies["/"]
 
-      console.log("pinokio_proxy", pinokio_proxy)
       let qr = null
       if (pinokio_proxy && pinokio_proxy.length > 0) {
         qr = await QRCode.toDataURL(pinokio_proxy[0].proxy)
       }
 
 
-      console.log("#display", display)
-
 
       res.render("index", {
         proxy: pinokio_proxy[0],
@@ -1100,7 +1076,6 @@ class Server {
             name = x.name
             description = ""
           }
-          console.log("X", x)
           return {
             icon,
             menu: x.menu,
@@ -1120,7 +1095,6 @@ class Server {
     }
   }
   async renderShortcuts(uri, name, config, pathComponents) {
-    console.log("config.shortcuts", config.shortcuts)
     if (config.shortcuts) {
       for(let i=0; i<config.shortcuts.length; i++) {
         let shortcut = config.shortcuts[i]
@@ -1133,7 +1107,6 @@ class Server {
               let link = p.split(/[\/\\]/).filter((x) => { return x }).join("/")
               let uri = "~/api/" + name + "/" + link
 
-              console.log("*uri", uri)
               config.shortcuts[i].action.uri = uri
 
 
@@ -1544,18 +1517,13 @@ class Server {
     //    - remove NEW_HOME
     let existing_home = this.kernel.store.get("home")
     let new_home = this.kernel.store.get("new_home")
-    console.log("syncConfig", { existing_home, new_home })
 
     if (existing_home) {
       let exists = await fse.pathExists(existing_home)
-      console.log("#A", { exists })
       if (exists) {
-        console.log("#B", { new_home })
         if (new_home) {
           let new_home_exists = await fse.pathExists(new_home)
-          console.log("#C", { new_home_exists })
           if (new_home_exists) {
-            console.log("#D")
             // - existing home is set
             // - existing home exists
             // - new home is set
@@ -1563,7 +1531,6 @@ class Server {
             //    => delete store.new_home ==> will load at store.home
             this.kernel.store.delete("new_home")
           } else {
-            console.log("#E")
             // - existing home is set
             // - existing home exists
             // - new home is set
@@ -1576,16 +1543,13 @@ class Server {
             this.kernel.store.delete("new_home")
           }
         } else {
-          console.log("#F")
           // - existing home is set
           // - existing home exists
           // - new home is not set
           //    => This is most typical scenario => don't touch anything => the homedir will be the existing home
         }
       } else {
-        console.log("#G", { new_home })
         if (new_home) {
-          console.log("#H")
           // - existing home is set
           // - but the existing home path DOES NOT exist
           // - new home is set
@@ -1594,7 +1558,6 @@ class Server {
           this.kernel.store.delete("home")
           this.kernel.store.delete("new_home")
         } else {
-          console.log("#I")
           // - existing home is set
           // - but the existing home path DOES NOT exist
           // - new home is NOT set
@@ -1604,9 +1567,7 @@ class Server {
         }
       }
     } else {
-      console.log("#J", { new_home })
       if (new_home) {
-        console.log("#K")
         // - existing home is NOT set
         // - new home is set
         //    => update store.home
@@ -1614,7 +1575,6 @@ class Server {
         this.kernel.store.set("home", new_home)
         this.kernel.store.delete("new_home")
       } else {
-        console.log("#L")
         // - existing home is NOT set
         // - new home is NOT set
         //    => don't touch anything => will load at ~/pinokio
@@ -1622,10 +1582,8 @@ class Server {
     }
   }
   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) {
@@ -1651,8 +1609,6 @@ class Server {
           throw new Error(`The path ${config.home} already exists. Please remove the folder and retry`)
         }
 
-        console.log("set new home", config.home)
-
         this.kernel.store.set("new_home", config.home)
       }
 
@@ -1661,7 +1617,6 @@ class Server {
     home = this.kernel.store.get("home")
     theme = this.kernel.store.get("theme")
     let new_home = this.kernel.store.get("new_home")
-    console.log("after setting config", { home, theme, new_home })
   }
   async startLogging() {
     if (!this.debug) {
@@ -1698,24 +1653,16 @@ class Server {
     }
   }
   async start(debug) {
-
-
     this.debug = debug
 
-    console.log("start called", this.listening, debug)
-
     if (this.listening) {
       // stop proxies
       for(let scriptPath in this.kernel.api.proxies) {
-        console.log("# Stop proxy", scriptPath)
         await this.kernel.api.stopProxy({
           script: scriptPath
         })
       }
-      console.log("close server")
-      console.log("terminate start")
       await this.httpTerminator.terminate();
-      console.log("terminate end")
     }
 
     // configure from kernel.store
@@ -1724,8 +1671,6 @@ class Server {
     // initialize kernel
     await this.kernel.init()
 
-    console.log("homedir", this.kernel.homedir)
-
     // start proxy for Pinokio itself
     await this.kernel.api.startProxy("/", `http://127.0.0.1:${this.port}`, "/")
 
@@ -1766,15 +1711,9 @@ class Server {
     //let home = this.kernel.homedir
     let home = this.kernel.store.get("home")
     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 = [{
@@ -1790,8 +1729,6 @@ class Server {
           val: this.theme,
           options: ["light", "dark"]
         }]
-        console.log("agent", this.agent)
-
         let folders = {}
         if (this.kernel.homedir) {
           folders = {
@@ -1813,7 +1750,6 @@ class Server {
 
         return
       }
-      console.log("abc")
 
       let apipath = this.kernel.path("api")
       let files = await fs.promises.readdir(apipath, { withFileTypes: true })
@@ -2001,11 +1937,9 @@ class Server {
       res.json({ success: true })
     })
     this.app.get("/pinokio/browser", async (req, res) => {
-      console.log("req.query", req.query)
       if (req.query && req.query.uri) {
         let uri = req.query.uri
         let p = this.kernel.api.resolveBrowserPath(uri)
-        console.log({ uri, p})
         res.redirect(p)
       } else {
         res.redirect("/")
@@ -2028,16 +1962,8 @@ class Server {
         let uri = this.kernel.path("api")
         await this.renderMenu(uri, name, config, [])
 
-
-        console.log({ config })
-
       }
       let platform = os.platform()
-
-
-
-
-      console.log("MEMORY", this.kernel.memory)
       res.render("browser", {
         platform,
         running:this.kernel.api.running,
@@ -2059,24 +1985,20 @@ class Server {
       try {
         if (req.body.type === 'bin') {
           let folderPath = this.kernel.path("bin")
-          console.log("del folderPath", folderPath)
           await fse.remove(folderPath)
           res.json({ success: true })
         } else if (req.body.type === 'cache') {
           let folderPath = this.kernel.path("cache")
-          console.log("del folderPath", folderPath)
           await fse.remove(folderPath)
           res.json({ success: true })
         } else if (req.body.name) {
           let folderPath = this.kernel.path("api", req.body.name)
-          console.log("delete", folderPath)
           await fse.remove(folderPath)
           await new Promise((resolve, reject) => {
             setTimeout(() => {
               resolve()
             }, 5000)
           })
-          console.log("deleted")
           res.json({ success: true })
         }
       } catch(err) {
@@ -2117,8 +2039,6 @@ class Server {
     this.app.post("/pinokio/log", async (req, res) => {
 
 
-      console.log("#1")
-
       let states = this.kernel.shell.shells.map((s) => {
         return {
           state: s.state,
@@ -2145,28 +2065,20 @@ class Server {
         version: this.version,
         ...this.kernel.sysinfo
       }
-      console.log("# info", info)
-
-      console.log("#2")
       await fs.promises.writeFile(this.kernel.path("logs/system.json"), JSON.stringify(info, null, 2))
-      console.log("#3")
       await fs.promises.writeFile(this.kernel.path("logs/state.json"), JSON.stringify(states, null, 2))
 
 
-      console.log("#4")
       await fs.promises.cp(
         this.kernel.path("logs"),
         this.kernel.path("exported_logs")
       , { recursive: true })
-      console.log("#5")
       await this.kernel.shell.logs()
-      console.log("#6")
 
 
       let folder = this.kernel.path("exported_logs")
       let zipPath = this.kernel.path("logs.zip")
       await compressing.zip.compressDir(folder, zipPath)
-      console.log("#7")
       res.json({ success: true })
     })
     this.app.get("/pinokio/port", async (req, res) => {

package/server/public/Socket.js

@@ -84,7 +84,6 @@ class Socket {
         this.ws.addEventListener('message', (message) => {
 //          console.log("message", message)
           const packet = JSON.parse(message.data);
-          console.log("PACKET", packet)
           ondata(packet)
         });
         this.ws.addEventListener('close', () => {

package/server/socket.js

@@ -17,7 +17,6 @@ class Socket {
       });
       ws.on('message', async (message) => {
         const req = JSON.parse(message);
-        console.log("MESSAGE", req)
         if (req.response) {
           this.parent.kernel.api.respond(req)
         } else {
@@ -39,8 +38,6 @@ class Socket {
             // req.uri is always http or absolute path
             let id = this.parent.kernel.api.filePath(req.uri)
 
-            console.log("socket ID", { id, req })
-
             if (req.status) {
               ws.send(JSON.stringify({
                 data: this.parent.kernel.api.running[id] ? true : false

package/server/views/browser.ejs

@@ -539,8 +539,8 @@ body.dark .loader-container {
         <i class="fa-solid fa-arrow-right-to-bracket fa-rotate-180"></i>
       </button>
       <% if (agent === "electron") { %>
-        <button class='btn2' id='back'><i class="fa-solid fa-arrow-left"></i></button>
-        <button class='btn2' id='forward'><i class="fa-solid fa-arrow-right"></i></button>
+        <button class='btn2' id='back'><i class="fa-solid fa-chevron-left"></i></button>
+        <button class='btn2' id='forward'><i class="fa-solid fa-chevron-right"></i></button>
       <% } %>
       <button class='btn2' id='clone-tab'><i class='fa-regular fa-copy'></i> Clone</button>
       <a class='btn2' id='open-browser' target="_blank" href=""><i class="fa-solid fa-square-arrow-up-right"></i> Popout</a>

package/server/views/editor.ejs

@@ -191,9 +191,6 @@ document.addEventListener("DOMContentLoaded", async () => {
       this.socket.run({
         method: "kernel.api.stop",
         params: {
-          //uri: "<%-uri%>",
-          //uri: location.pathname.slice(1).replace("api/", ""),
-          //uri: "~" + location.pathname
           uri: "<%=execUrl%>",
         }
       }, (stream) => {
@@ -201,9 +198,7 @@ document.addEventListener("DOMContentLoaded", async () => {
     }
     save() {
       return new Promise((resolve, reject) => {
-        //let cwd = "~" + location.pathname
         let cwd = "<%=execUrl%>"
-
         this.socket.close()
         this.socket.run({
           method: "fs.write",
@@ -232,7 +227,6 @@ document.addEventListener("DOMContentLoaded", async () => {
           //uri: location.pathname.slice(1).replace("api/", ""),
           //uri: "~" + location.pathname,
           uri: "<%=execUrl%>",
-          //uri: "<%-uri%>",
           mode,
           input: query,
           client: {
@@ -312,15 +306,22 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".run .starting").classList.add("hidden")
             document.querySelector(".run .stop").classList.remove("hidden")
           } else if (packet.type === 'wait.end') {
-            Swal.close()
-          } else if (packet.type === 'wait') {
-            await WaitModal(packet.data)
+            try {
+              Swal.close()
+            } catch (e) {
+            }
             this.socket.respond({
               response: {},
-              uri: "~" + location.pathname,
+              uri: packet.id
             })
+          } else if (packet.type === 'wait') {
+            await WaitModal(packet.data)
           } else if (packet.type === "modal") {
             await SimpleModal(packet.data)
+            this.socket.respond({
+              response: {},
+              uri: packet.id
+            })
           } else if (packet.type === "input") {
             let params = packet.data
             let type = (params.type ? params.type : "modal")
@@ -333,7 +334,8 @@ document.addEventListener("DOMContentLoaded", async () => {
             if (input) {
               this.socket.respond({
                 response: input,
-                uri: "<%=execUrl%>"
+                uri: packet.id
+                //uri: "<%=execUrl%>"
               })
             }
             /*

package/server/views/fullscreen_editor.ejs

@@ -120,7 +120,6 @@ document.addEventListener("DOMContentLoaded", async () => {
         fetch("/pinokio/requirements_ready").then((res) => {
           return res.json()
         }).then((res) => {
-          console.log(res)
           if (res.error) {
             alert(res.error)
             clearInterval(interval)
@@ -232,7 +231,6 @@ document.addEventListener("DOMContentLoaded", async () => {
 //              </div>`
             }
           } else if (packet.type === "stream") {
-            console.log("STREAM", packet)
             if (packet.data.raw) {
               this.term.write(packet.data.raw)
             } else if (packet.data.json) {
@@ -246,7 +244,6 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".run .starting").classList.add("hidden")
             document.querySelector(".run .stop").classList.remove("hidden")
           } else if (packet.type === 'disconnect') {
-            console.log("DISCONNECT", packet)
             refreshParent(packet)
             reloadMemory()
             this.term.write("\r\nDisconnected...\r\n")
@@ -301,7 +298,6 @@ document.addEventListener("DOMContentLoaded", async () => {
               response: {},
 //              uri: "~" + location.pathname,
               uri: packet.id
-//              uri: (packet.caller ? packet.caller : packet.id)
             })
           } else if (packet.type === 'wait') {
             await WaitModal(packet.data)
@@ -311,7 +307,6 @@ document.addEventListener("DOMContentLoaded", async () => {
               response: {},
               //uri: "~" + location.pathname,
               uri: packet.id
-//              uri: (packet.caller ? packet.caller : packet.id)
             })
           } else if (packet.type === "input") {
             let params = packet.data
@@ -451,7 +446,6 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".run .stop").classList.add("hidden")
 
           } else if (packet.type === "event") {
-            console.log("EVENT", packet)
             if (packet.data === "stop") {
               document.querySelector("footer").innerHTML = "<b>Ready</b>"
               setTimeout(() => {