pinokiod 3.8.77 → 3.8.79
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/server/index.js +49 -45
package/package.json
CHANGED
package/server/index.js
CHANGED
|
@@ -2623,56 +2623,60 @@ class Server {
|
|
|
2623
2623
|
}))
|
|
2624
2624
|
this.app.get("/network", ex(async (req, res) => {
|
|
2625
2625
|
let list = []
|
|
2626
|
-
let peers_info = this.kernel.peer.info
|
|
2627
2626
|
// let peers_info = await this.kernel.peer.refresh()
|
|
2628
|
-
|
|
2629
|
-
|
|
2630
|
-
|
|
2631
|
-
|
|
2632
|
-
|
|
2633
|
-
|
|
2634
|
-
let
|
|
2635
|
-
|
|
2636
|
-
let
|
|
2637
|
-
|
|
2638
|
-
|
|
2639
|
-
|
|
2640
|
-
|
|
2641
|
-
let
|
|
2642
|
-
let
|
|
2643
|
-
|
|
2644
|
-
let
|
|
2645
|
-
|
|
2646
|
-
|
|
2647
|
-
|
|
2648
|
-
|
|
2649
|
-
|
|
2650
|
-
|
|
2651
|
-
|
|
2652
|
-
|
|
2653
|
-
|
|
2654
|
-
|
|
2655
|
-
|
|
2656
|
-
|
|
2657
|
-
|
|
2658
|
-
|
|
2659
|
-
|
|
2660
|
-
|
|
2627
|
+
let peers_info = {}
|
|
2628
|
+
if (this.kernel.peer.info) {
|
|
2629
|
+
peers_info = this.kernel.peer.info
|
|
2630
|
+
// let info = this.kernel.router.info()
|
|
2631
|
+
// console.log("33 info", info)
|
|
2632
|
+
let remote_peers = Object.keys(this.kernel.peer.info).filter(x => x !== this.kernel.peer.host)
|
|
2633
|
+
let nodes = [this.kernel.peer.host].concat(remote_peers)
|
|
2634
|
+
for(let host of nodes) {
|
|
2635
|
+
let processes = []
|
|
2636
|
+
try {
|
|
2637
|
+
let procs = this.kernel.peer.info[host].proc
|
|
2638
|
+
let router = this.kernel.peer.info[host].router
|
|
2639
|
+
console.log({ router })
|
|
2640
|
+
let port_mapping = this.kernel.peer.info[host].port_mapping
|
|
2641
|
+
for(let proc of procs) {
|
|
2642
|
+
let internal_port = proc.ip.split(":")[1]
|
|
2643
|
+
let external_port = port_mapping[internal_port]
|
|
2644
|
+
if (external_port) {
|
|
2645
|
+
let external_ip = `${host}:${external_port}`
|
|
2646
|
+
console.log({ internal_port, external_port, external_ip })
|
|
2647
|
+
processes.push({
|
|
2648
|
+
//proxy: this.kernel.caddy.mapping[item.ip] || [],
|
|
2649
|
+
router: router[external_ip] || [],
|
|
2650
|
+
external_ip,
|
|
2651
|
+
external_port: parseInt(external_port),
|
|
2652
|
+
internal_port: parseInt(internal_port),
|
|
2653
|
+
...proc
|
|
2654
|
+
})
|
|
2655
|
+
} else {
|
|
2656
|
+
processes.push({
|
|
2657
|
+
router: [],
|
|
2658
|
+
external_port: parseInt(external_port),
|
|
2659
|
+
internal_port: parseInt(internal_port),
|
|
2660
|
+
...proc
|
|
2661
|
+
})
|
|
2662
|
+
}
|
|
2661
2663
|
}
|
|
2664
|
+
processes.sort((a, b) => {
|
|
2665
|
+
return b.external_port-a.external_port
|
|
2666
|
+
})
|
|
2667
|
+
list.push({
|
|
2668
|
+
host,
|
|
2669
|
+
name: this.kernel.peer.info[host].name,
|
|
2670
|
+
platform: this.kernel.peer.info[host].platform,
|
|
2671
|
+
processes
|
|
2672
|
+
})
|
|
2673
|
+
} catch (e) {
|
|
2674
|
+
console.log(">>e", e)
|
|
2675
|
+
console.log({ host, info: this.kernel.peer.info })
|
|
2662
2676
|
}
|
|
2663
|
-
} catch (e) {
|
|
2664
|
-
console.log(">>e", e)
|
|
2665
2677
|
}
|
|
2666
|
-
processes.sort((a, b) => {
|
|
2667
|
-
return b.external_port-a.external_port
|
|
2668
|
-
})
|
|
2669
|
-
list.push({
|
|
2670
|
-
host,
|
|
2671
|
-
name: this.kernel.peer.info[host].name,
|
|
2672
|
-
platform: this.kernel.peer.info[host].platform,
|
|
2673
|
-
processes
|
|
2674
|
-
})
|
|
2675
2678
|
}
|
|
2679
|
+
console.log({ peers_info })
|
|
2676
2680
|
|
|
2677
2681
|
// if (this.kernel.processes.info) {
|
|
2678
2682
|
// console.log("proc info", this.kernel.processes.info)
|