pinokiod 3.8.53 → 3.8.54

package/kernel/router/localhost_variable_router.js

@@ -15,7 +15,7 @@ class LocalhostVariableRouter extends Processor {
         let val = local_variables_for_script[key]
         if (val.startsWith("http")) {
           let dial = val.replace(/https?:\/\//, '')
-          let name = this.api_name(script_path)
+          let name = this.api_name(this.kernel.homedir, script_path)
           console.log({ dial, name, has_port: this.has_port(dial), parsed_dial: this.parse_ip(dial) })
           if (this.has_port(dial)) {
             if (key === "url") {

package/kernel/router/peer_variable_router.js

@@ -8,14 +8,15 @@ class PeerVariableRouter extends Processor {
     this.connector = new Connector(router)
   }
   handle(peer) {
-    for(let script_path in peer.local) {
-      let local_variables = peer.local[script_path]
+    console.log("PeerVariableRouter", peer)
+    for(let script_path in peer.memory.local) {
+      let local_variables = peer.memory.local[script_path]
       for(let key in local_variables) {
         let val = local_variables[key]
         console.log({ key, val })
         if (val.startsWith("http")) {
           let dial = val.replace(/https?:\/\//, '')
-          let name = this.api_name(script_path)
+          let name = this.api_name(peer.platform, peer.home, script_path)
           console.log({ dial, name, has_port: this.has_port(dial), parsed_dial: this.parse_ip(dial) })
           if (this.has_port(dial)) {
             let parsed_dial = this.parse_ip(dial)
@@ -30,7 +31,7 @@ class PeerVariableRouter extends Processor {
                 host: peer.host,
               })
             }
-            connector({
+            this.connector.handle({
               match:`${key}.${name}.${peer.name}.localhost`.toLowerCase(),
               connector: {
                 host: peer.host,

package/kernel/router/processor.js

@@ -4,11 +4,19 @@ class Processor {
     let chunks = str.split(":")
     return chunks.length === 2
   }
-  api_name(str) {
-    let api_path = this.router.kernel.path("api")
-    let rel_path = path.relative(api_path, str)
+  api_name(platform, home, str) {
+    let _path = path[platform]
+    let api_path
+    let rel_path
+    if (platform === 'win32') {
+      api_path = _path.resolve(home, "api")
+      rel_path = _path.relative(api_path, str)
+    } else {
+      api_path = _path.resolve(home, "api")
+      rel_path = _path.relative(api_path, str)
+    }
     console.log({ api_path, rel_path, })
-    return rel_path.split(path.sep)[0]
+    return rel_path.split(_path.sep)[0]
   }
   parse_ip(str) {
     let chunks = str.split(":")

package/package.json

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

package/server/index.js

@@ -3260,6 +3260,8 @@ class Server {
     this.app.get("/pinokio/peer", ex((req, res) => {
       res.json({
         home: this.kernel.homedir,
+        arch: this.kernel.arch,
+        platform: this.kernel.platform,
         name: this.kernel.peer.name,
         host: this.kernel.peer.host,
         router: this.kernel.router.info(),