pinokiod 3.8.149 → 3.8.151

package/kernel/peer2.js

@@ -1,83 +0,0 @@
-const dgram = require('dgram');
-const axios = require('axios');
-const os = require('os')
-class PeerDiscovery {
-  constructor(port = 41234, message = 'ping', interval = 1000) {
-    this.port = port;
-    this.message = Buffer.from(message);
-    this.interval = interval;
-    this.socket = dgram.createSocket('udp4');
-    this.peers = new Set();
-    this.current_account = os.userInfo()
-    this.current_ip = this._getLocalIPAddress()
-//    this.start();
-  }
-  account(ip) {
-    return this.data[ip].account.username
-  }
-  homedir(ip) {
-    return this.data[ip].homedir
-  }
-  caddy(ip) {
-    return this.data[ip].proxy
-  }
-  local(ip) {
-    return this.data[ip].memory.local
-  }
-  global(ip) {
-    return this.data[ip].memory.global
-  }
-  start() {
-    // Listen for incoming pings
-    this.data = {}
-    this.socket.on('message', (msg, rinfo) => {
-      const ip = rinfo.address;
-      if (msg.toString() === this.message.toString() && this._isLocalLAN(ip)) {
-        if (!this.peers.has(ip)) {
-          console.log(`Discovered peer: ${ip}`);
-          this.peers.add(ip);
-          let interval = setInterval(() => {
-            axios.get(`http://${ip}:42000/pinokio/mem`).then((res) => {
-              this.data[ip] = res.data
-              console.log("this.data", { ip, data: this.data[ip] })
-              if (res.data.proxy) {
-//                clearInterval(interval)
-              }
-            })
-          }, 1000)
-        }
-      }
-    });
-
-    // Enable broadcast
-    this.socket.bind(this.port, () => {
-      this.socket.setBroadcast(true);
-
-      // Send broadcast pings every interval
-      setInterval(() => {
-        this.socket.send(this.message, 0, this.message.length, this.port, '255.255.255.255');
-      }, this.interval);
-    });
-  }
-
-  get() {
-    return Array.from(this.peers);
-  }
-
-  _isLocalLAN(ip) {
-    return ip.startsWith('192.168.');
-  }
-  _getLocalIPAddress() {
-    const interfaces = os.networkInterfaces();
-    for (const ifaceList of Object.values(interfaces)) {
-      for (const iface of ifaceList) {
-        if (iface.family === 'IPv4' && !iface.internal && iface.address.startsWith('192.168.')) {
-          return iface.address;
-        }
-      }
-    }
-    return null;
-  }
-}
-
-module.exports = PeerDiscovery;

package/kernel/router/root.js

@@ -1,54 +0,0 @@
-module.exports = (payload, { match, dial }) => {
-  // create a root level reverse proxy for
-  //  - peer with ip,
-  //  - at port
-  // The ip is only used for ensuring uniqueness
-  // But the only thing that will be exposed is the port
-  let name = match.ip + ":" + match.port
-  payload.apps.http.servers[name] = {
-    // 0.0.0.0:<new_port>
-    "listen": ["0.0.0.0:PORT_PLACEHOLDER_" + name],
-    "routes": [{
-      "handle": [
-        {
-          "handler": "reverse_proxy",
-          // create a route from <new_port> to dial
-          "upstreams": [{ "dial": dial }]
-          "headers": {
-            "request": {
-              "set": {
-                "X-Forwarded-Proto": ["https"],
-                "X-Forwarded-Host": ["{http.request.host}"]
-              }
-            },
-            "response": {
-              "set": {
-                "Access-Control-Allow-Origin": ["*"],
-                "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
-                "Access-Control-Allow-Headers": ["*"],
-                "Vary": ["Origin"]
-              }
-            }
-          }
-        },
-        //{
-        //  "handler": "headers",
-        //  "request": {
-        //    "set": {
-        //      "X-Forwarded-Proto": ["https"],
-        //      "X-Forwarded-Host": ["{http.request.host}"]
-        //    }
-        //  },
-        //  "response": {
-        //    "set": {
-        //      "Access-Control-Allow-Origin": ["*"],
-        //      "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
-        //      "Access-Control-Allow-Headers": ["*"],
-        //      "Vary": ["Origin"]
-        //    }
-        //  }
-        //}
-      ]
-    }]
-  }
-}

package/kernel/tree-kill.js

@@ -1,167 +0,0 @@
-'use strict';
-
-var childProcess = require('child_process');
-var spawn = childProcess.spawn;
-var exec = childProcess.exec;
-var execSync = childProcess.execSync;
-
-module.exports = function (pid, map, signal, callback) {
-    if (typeof signal === 'function' && callback === undefined) {
-        callback = signal;
-        signal = undefined;
-    }
-
-    pid = parseInt(pid);
-    if (Number.isNaN(pid)) {
-        if (callback) {
-            return callback(new Error("pid must be a number"));
-        } else {
-            throw new Error("pid must be a number");
-        }
-    }
-
-    var tree = {};
-    var pidsToProcess = {};
-    tree[pid] = [];
-    pidsToProcess[pid] = 1;
-
-    switch (process.platform) {
-    case 'win32':
-        exec('taskkill /pid ' + pid + ' /T /F', callback);
-        break;
-    case 'darwin':
-        buildProcessTreeMacOS(pid, tree, pidsToProcess, function () {
-          killAll(tree, map, signal, callback);
-        });
-        break;
-    // case 'sunos':
-    //     buildProcessTreeSunOS(pid, tree, pidsToProcess, function () {
-    //         killAll(tree, signal, callback);
-    //     });
-    //     break;
-    default: // Linux
-        buildProcessTree(pid, tree, pidsToProcess, function (parentPid) {
-          return spawn('ps', ['-o', 'pid', '--no-headers', '--ppid', parentPid]);
-        }, function () {
-            killAll(tree, map, signal, callback);
-        });
-        break;
-    }
-};
-
-function killAll (tree, map, signal, callback) {
-    console.log("KillAll", tree)
-    var killed = {};
-    try {
-        Object.keys(tree).forEach(function (pid) {
-            tree[pid].forEach(function (pidpid) {
-                if (!killed[pidpid]) {
-                    killPid(pidpid, map, signal);
-                    killed[pidpid] = 1;
-                }
-            });
-//            // exception: if the pid is the current process,
-//            // kill all subprocesses, but do NOT kill the current process
-//            if (String(pid) === String(process.pid)) {
-//              return
-//            }
-            if (!killed[pid]) {
-                killPid(pid, map, signal);
-                killed[pid] = 1;
-            }
-        });
-    } catch (err) {
-        if (callback) {
-            return callback(err);
-        } else {
-            throw err;
-        }
-    }
-    if (callback) {
-        return callback();
-    }
-}
-
-function killPid(pid, map, signal) {
-    try {
-        console.log("kill", pid, map[pid])
-        process.kill(parseInt(pid, 10), signal);
-    }
-    catch (err) {
-        if (err.code !== 'ESRCH') throw err;
-    }
-}
-
-function buildProcessTree (parentPid, tree, pidsToProcess, spawnChildProcessesList, cb) {
-    var ps = spawnChildProcessesList(parentPid);
-    var allData = '';
-    ps.stdout.on('data', function (data) {
-        var data = data.toString('ascii');
-        allData += data;
-    });
-
-    var onClose = function (code) {
-        delete pidsToProcess[parentPid];
-
-        if (code != 0) {
-            // no more parent processes
-            if (Object.keys(pidsToProcess).length == 0) {
-                cb();
-            }
-            return;
-        }
-
-        allData.match(/\d+/g).forEach(function (pid) {
-          pid = parseInt(pid, 10);
-          tree[parentPid].push(pid);
-          tree[pid] = [];
-          pidsToProcess[pid] = 1;
-          buildProcessTree(pid, tree, pidsToProcess, spawnChildProcessesList, cb);
-        });
-    };
-
-    ps.on('close', onClose);
-}
-
-function buildProcessTreeMacOS(parentPid, tree, pidsToProcess, cb) {
-    try {
-        let stdout = '';
-        try {
-            stdout = execSync('pgrep -P ' + parentPid, {
-                encoding: 'utf8',
-                timeout: 2000,
-                maxBuffer: 1024 * 1024
-            });
-        } catch (execError) {
-            if (execError.status !== 1) {
-                throw execError;
-            }
-        }
-
-        delete pidsToProcess[parentPid];
-
-        const childPids = stdout.trim().split('\n').filter(Boolean);
-        
-        if (childPids.length === 0) {
-            if (Object.keys(pidsToProcess).length === 0) {
-                cb();
-            }
-            return;
-        }
-
-        childPids.forEach(function(pidStr) {
-            const pid = parseInt(pidStr, 10);
-            if (!isNaN(pid)) {
-                tree[parentPid].push(pid);
-                tree[pid] = [];
-                pidsToProcess[pid] = 1;
-                buildProcessTreeMacOS(pid, tree, pidsToProcess, cb);
-            }
-        });
-    } catch (err) {
-        delete pidsToProcess[parentPid];
-        if (Object.keys(pidsToProcess).length === 0) {
-            cb();
-        }
-    }
-}