pinokiod 7.1.71 → 7.1.72
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 +20 -6
package/package.json
CHANGED
package/server/index.js
CHANGED
|
@@ -12682,7 +12682,7 @@ class Server {
|
|
|
12682
12682
|
|
|
12683
12683
|
await this.kernel.peer.check_peers()
|
|
12684
12684
|
|
|
12685
|
-
let list = this.getPeers()
|
|
12685
|
+
let list = this.kernel.peer.info ? this.getPeers() : []
|
|
12686
12686
|
|
|
12687
12687
|
// let list = this.getPeerInfo()
|
|
12688
12688
|
let processes = []
|
|
@@ -12695,8 +12695,22 @@ class Server {
|
|
|
12695
12695
|
peer = item
|
|
12696
12696
|
}
|
|
12697
12697
|
}
|
|
12698
|
+
let peer_info = host && this.kernel.peer.info ? this.kernel.peer.info[host] : null
|
|
12699
|
+
if (!peer_info && req.params.name === this.kernel.peer.name) {
|
|
12700
|
+
try {
|
|
12701
|
+
await this.kernel.peer.refresh_host(this.kernel.peer.host)
|
|
12702
|
+
} catch (e) {
|
|
12703
|
+
}
|
|
12704
|
+
host = this.kernel.peer.host
|
|
12705
|
+
peer_info = this.kernel.peer.info && this.kernel.peer.info[host] ? this.kernel.peer.info[host] : null
|
|
12706
|
+
if (peer_info) {
|
|
12707
|
+
peer = peer_info
|
|
12708
|
+
}
|
|
12709
|
+
}
|
|
12698
12710
|
try {
|
|
12699
|
-
|
|
12711
|
+
if (peer_info) {
|
|
12712
|
+
processes = peer_info.router_info
|
|
12713
|
+
}
|
|
12700
12714
|
for(let i=0; i<processes.length; i++) {
|
|
12701
12715
|
if (!processes[i].icon) {
|
|
12702
12716
|
if (protocol === "https") {
|
|
@@ -12709,8 +12723,8 @@ class Server {
|
|
|
12709
12723
|
}
|
|
12710
12724
|
} catch (e) {
|
|
12711
12725
|
}
|
|
12712
|
-
let installed =
|
|
12713
|
-
let serverless_mapping =
|
|
12726
|
+
let installed = peer_info ? peer_info.installed : []
|
|
12727
|
+
let serverless_mapping = peer_info ? peer_info.rewrite_mapping : {}
|
|
12714
12728
|
let serverless = Object.keys(serverless_mapping).map((name) => {
|
|
12715
12729
|
return serverless_mapping[name]
|
|
12716
12730
|
})
|
|
@@ -12719,7 +12733,7 @@ class Server {
|
|
|
12719
12733
|
return this.kernel.router.rewrite_mapping[key]
|
|
12720
12734
|
})
|
|
12721
12735
|
const peerAccess = await this.composePeerAccessPayload()
|
|
12722
|
-
const allow_dns_creation = req.params.name === this.kernel.peer.name
|
|
12736
|
+
const allow_dns_creation = !!peer_info && req.params.name === this.kernel.peer.name
|
|
12723
12737
|
res.render("net", {
|
|
12724
12738
|
static_routes,
|
|
12725
12739
|
selected_name: req.params.name,
|
|
@@ -12732,7 +12746,7 @@ class Server {
|
|
|
12732
12746
|
processes,
|
|
12733
12747
|
installed,
|
|
12734
12748
|
serverless,
|
|
12735
|
-
error: null
|
|
12749
|
+
error: peer_info ? null : `Peer "${req.params.name}" is not ready yet. Try again in a moment.`,
|
|
12736
12750
|
list,
|
|
12737
12751
|
host,
|
|
12738
12752
|
peer,
|