pinokiod 3.19.58 → 3.19.59

package/kernel/api/clipboard/index.js

@@ -0,0 +1,43 @@
+const Util = require("../../util")
+/*
+{
+  "run": [
+    {
+      "method": "clipboard.copy",
+      "params": {
+        "text": "hello world"
+      }
+    },
+    {
+      "method": "clipboard.paste"
+    },
+    {
+      "method": "log",
+      "params": {
+        "raw": "{{input}}"
+      }
+    }
+  ]
+}
+*/
+class Clipboard {
+  /*
+    method: "clipboard.copy",
+    params: {
+      text: <text>
+    }
+  */
+  async copy(req, ondata, kernel) {
+    await Util.clipboard({
+      type: "copy",
+      text: req.params.text
+    })
+  }
+  async paste(req, ondata, kernel) {
+    let text = await Util.clipboard({
+      type: "paste",
+    })
+    return text
+  }
+}
+module.exports = Clipboard

package/kernel/bin/cli.js

@@ -26,7 +26,7 @@ class CLI {
         let res = await this.kernel.exec({
           message: "pinokio version terminal"
         }, ondata)
-        if (res.stdout && /.*pterm@0\.0\.6.*/.test(res.stdout)) {
+        if (res.stdout && /.*pterm@0\.0\.7.*/.test(res.stdout)) {
           console.log("Installed")
           return true
         } else {

package/kernel/environment.js

@@ -336,33 +336,31 @@ const ENV = async (type, homedir) => {
     if (type === 'app') {
       system_env = await get_raw(homedir)
       if (e.key in system_env) {
-        console.log(`original ${e.key}=${val}`)
+//        console.log(`original ${e.key}=${val}`)
         val = system_env[e.key]
-        console.log(`inherited from system_env: ${e.key}=${val}`)
+//        console.log(`inherited from system_env: ${e.key}=${val}`)
         keys.add(e.key)
       }
     }
 
     let kv = `${e.key}=${val}`
-    console.log("kv", kv)
     lines.push(comment+kv)
   }
 
   // In case of type: app, inherit any other custom ENVIRONMENT variable not yet included
-  console.log({ irrelevant_keys })
   if (type === "app" && system_env) {
     for(let key in system_env) {
       if (!keys.has(key)) {
         // the key has not been processed, need to add to the lines
         if (irrelevant_keys.includes(key)) {
           // if the key was explicitly stated to be not included, skip
-          console.log("irrelevant key", key)
+//          console.log("irrelevant key", key)
         } else {
-          console.log("relevant key", key)
+//          console.log("relevant key", key)
           let val = system_env[key]
           let kv = `${key}=${val}`
           lines.push(kv)
-          console.log(`inherited custom environment key from system_env: ${kv}`)
+//          console.log(`inherited custom environment key from system_env: ${kv}`)
         }
       }
     }

package/kernel/shell.js

@@ -253,9 +253,6 @@ class Shell {
 
     this.ondata({ raw: `\r\n████\r\n██ Starting Shell ${this.id}\r\n` })
 
-    console.log("SHELL PARAMS", params)
-
-
     this.start_time = Date.now()
     this.params = params
     this.EOL = os.EOL
@@ -289,7 +286,6 @@ class Shell {
         //}
       }
     }
-    console.log({ shell: this.shell, args: this.args, eol: this.EOL })
 
     // 3. path => path can be http, relative, absolute
     this.path = params.path

package/kernel/util.js

@@ -1,5 +1,6 @@
 const fs = require('fs')
 const { spawn } = require('child_process')
+const Clipboard = require('copy-paste/promises');
 const http = require('http');
 const notifier = require('node-notifier');
 const os = require('os')
@@ -38,6 +39,21 @@ const du = async (folderpath) => {
   return totalSize;
 }
 
+const clipboard = async (req, ondata, kernel) => {
+/*
+  req := {
+    type: "copy"|"paste",
+    text: <text (only when copy)>
+  }
+*/
+  if (req.type === "copy") {
+    await Clipboard.copy(req.text)
+  } else if (req.type === "paste") {
+    let content = await Clipboard.paste()
+    return content
+  }
+}
+
 const filepicker = async(req, ondata, kernel) => {
   if (req.params.filetype) {
     /*
@@ -631,5 +647,5 @@ function diffLinesWithContext(diffs, context = 3) {
   return summarized;
 }
 module.exports = {
-  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_available, find_python, find_venv, fill_object, run, openURL, u2p, p2u, log, diffLinesWithContext, classifyChange, push, filepicker, exists
+  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_available, find_python, find_venv, fill_object, run, openURL, u2p, p2u, log, diffLinesWithContext, classifyChange, push, filepicker, exists, clipboard
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.19.58",
+  "version": "3.19.59",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,6 +17,7 @@
     "clear-module": "^4.1.2",
     "compressing": "^1.10.0",
     "cookie-parser": "^1.4.6",
+    "copy-paste": "^2.2.0",
     "cors": "^2.8.5",
     "cross-fetch": "^3.1.5",
     "csv-parse": "^5.3.10",

package/server/index.js

@@ -1501,7 +1501,6 @@ class Server {
 
       if (meta) {
         items = running.concat(notRunning)
-        console.log("INDEX2")
         res.render("index", {
           current_urls,
           portal: this.portal,
@@ -3159,6 +3158,18 @@ class Server {
         res.json({ error: e.message })
       }
     }))
+    this.app.post("/clipboard", ex(async (req, res) => {
+      try {
+        let r = await Util.clipboard(req.body)
+        if (r) {
+          res.json({ text: r })
+        } else {
+          res.json({ success: true })
+        }
+      } catch (e) {
+        res.json({ error: e.stack })
+      }
+    }))
     this.app.post("/push", ex(async (req, res) => {
       try {
         Util.push(req.body)

package/server/socket.js

@@ -228,14 +228,19 @@ class Socket {
               await Util.log(logpath, buf, session)
             }
           } else {
-            // SHELL
+            // Only log SHELL
             /*
             SHELL Changed { cwd: '/Users/x/pinokio/api/kernel.api.stop', key: 'kernel.api.stop' }
             */
-            let cwd = this.parent.kernel.path("api", key.split("_")[0])
-            let session = this.sessions[key]
-            let logpath = path.resolve(cwd, "logs/shell")
-            await Util.log(logpath, buf, session)
+            if (key.startsWith("kernel.")) {
+              // do not log since these are not shell operations
+              // need to refactor later to make this logic cleaner
+            } else {
+              let cwd = this.parent.kernel.path("api", key.split("_")[0])
+              let session = this.sessions[key]
+              let logpath = path.resolve(cwd, "logs/shell")
+              await Util.log(logpath, buf, session)
+            }
 
 
           }