pinokiod 3.2.220 → 3.2.222

package/kernel/api/index.js

@@ -24,6 +24,7 @@ class Api {
     this.done = {}
     this.waiter = {}
     this.proxies = {}
+    this.mods = {}
     this.lproxy = new Lproxy()
   }
   get_proxy_url(root, port) {
@@ -411,6 +412,16 @@ class Api {
     if (req.uri) {
       modpath = this.resolvePath(cwd, req.uri)
       let m = (await this.loader.load(modpath))
+      if (this.mods[modpath]) {
+        console.log("Same, used the cached object")
+        // use the cached module if unchanged
+        m = this.mods[modpath]
+      } else {
+        m = (await this.loader.load(modpath))
+        // cache the mods so the module can be stateful
+        // the modules can set attributes on itself
+        this.mods[modpath] = m
+      }
       mod = m.resolved
       dirname = m.dirname
       method = mod[req.method].bind(mod)
@@ -670,7 +681,16 @@ class Api {
           } else {
             should_run = false
           }
+
           if (!should_run) {
+            // the current step is skipped, therefore the next value should be ignored as well
+            if (i < script.run.length-1) {
+              rpc.next = i+1
+            } else {
+              rpc.next = null
+            }
+
+
           //if (!rpc.when) {
             if (typeof rpc.next === "undefined" || rpc.next === null) {
               // last call

package/kernel/api/script/index.js

@@ -41,19 +41,28 @@ class Script {
         - absolute path
         - http path
     */
-    let uri = await this.download(req, ondata, kernel)
-    let res = await new Promise((resolve, reject) => {
-      kernel.api.process({
-        uri,
-        input: req.params.params,
-        client: req.client,
-        caller: req.parent.path,
-      }, (r) => {
-        resolve(r.input)
+    // if already running, print that it's already running
+    let id = kernel.api.filePath(req.params.uri, req.cwd)
+    if (kernel.api.running[id]) {
+      let msg = `${req.params.uri} already running. Continuing...\r\n`
+      ondata({ raw: msg })
+    } else {
+      // if not already running, start.
+      let uri = await this.download(req, ondata, kernel)
+      let res = await new Promise((resolve, reject) => {
+        kernel.api.process({
+          uri,
+          input: req.params.params,
+          client: req.client,
+          caller: req.parent.path,
+        }, (r) => {
+          resolve(r.input)
+        })
       })
-    })
-    // need to call api.linkGit() so the git repositories list is up to date
-    return res
+      // need to call api.linkGit() so the git repositories list is up to date
+      return res
+    }
+
   }
   async return(req, ondata, kernel) {
     /*

package/kernel/index.js

@@ -1,6 +1,7 @@
 const fs = require('fs')
 const os = require("os")
 const jsdom = require("jsdom");
+const randomUseragent = require('random-useragent');
 const path = require('path')
 const fastq = require('fastq')
 const fetch = require('cross-fetch');
@@ -88,6 +89,15 @@ class Kernel {
     }
     return Environment.get2(folderpath, this)
   }
+  async userAgent(browser) {
+    if (browser) {
+      return randomUseragent.getRandom((ua) => {
+        return ua.browserName === browser;
+      });
+    } else {
+      return randomUseragent.getRandom()
+    }
+  }
   resumeprocess(uri) {
     let proc = this.procs[uri]
     if (proc && proc.resolve) {
@@ -100,6 +110,7 @@ class Kernel {
       type := "local" | "global"
     */
     let o = {}
+    console.log("IMPORT", params)
     for(let key in params) {
       // get memory for each uri
       let uri = params[key]
@@ -312,6 +323,14 @@ class Kernel {
           path: folder,
         })
       }
+
+
+      // get env
+      let env_path = path.resolve(this.api.userdir, folder)
+      let e = await Util.get(env_path)
+      if (e.PINOKIO_SCRIPT_AUTOLAUNCH) {
+        
+      }
     }
     for(let key in this.bin.installed) {
       let s = this.bin.installed[key]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.2.220",
+  "version": "3.2.222",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -55,7 +55,7 @@
     "sanitize-filename": "^1.6.3",
     "semver": "^7.5.4",
     "shell-path": "^2.0.0",
-    "sudo-prompt-programfiles-x86": "^9.2.8",
+    "sudo-prompt-programfiles-x86": "^9.2.9",
     "symlink-dir": "^5.2.1",
     "systeminformation": "^5.18.4",
     "uuid": "^9.0.0",