pinokiod 3.8.91 → 3.8.92
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/kernel/index.js +8 -5
- package/kernel/peer.js +33 -33
- package/package.json +1 -1
- package/server/index.js +2 -1
package/kernel/index.js
CHANGED
|
@@ -258,20 +258,23 @@ class Kernel {
|
|
|
258
258
|
log(data, group, info) {
|
|
259
259
|
this.log_queue.push({ data, group, info })
|
|
260
260
|
}
|
|
261
|
-
async refresh(
|
|
262
|
-
console.log("kernel.refresh", {
|
|
261
|
+
async refresh(notify_peers) {
|
|
262
|
+
console.log("kernel.refresh", { notify_peers })
|
|
263
263
|
await Promise.all([
|
|
264
264
|
// refresh proc info
|
|
265
265
|
this.processes.refresh(),
|
|
266
266
|
// refresh peer info
|
|
267
267
|
this.peer.refresh()
|
|
268
268
|
])
|
|
269
|
+
console.log("proc info", this.processes.info)
|
|
270
|
+
console.log("peer info", this.peer.info)
|
|
269
271
|
// refresh router info
|
|
270
272
|
await this.router.refresh()
|
|
273
|
+
console.log("router info", this.router.published())
|
|
271
274
|
|
|
272
|
-
if (
|
|
273
|
-
// broadcast to peers
|
|
274
|
-
await this.peer.
|
|
275
|
+
if (notify_peers) {
|
|
276
|
+
// broadcast to peers to refresh
|
|
277
|
+
await this.peer.notify_peers()
|
|
275
278
|
}
|
|
276
279
|
}
|
|
277
280
|
async clearLog(group) {
|
package/kernel/peer.js
CHANGED
|
@@ -41,38 +41,38 @@ class PeerDiscovery {
|
|
|
41
41
|
this.socket.send(this.message, 0, this.message.length, this.port, '255.255.255.255');
|
|
42
42
|
|
|
43
43
|
// if peer exists but info doesn't exist, refresh
|
|
44
|
-
for(let peer of this.peers) {
|
|
45
|
-
let refresh_needed = false;
|
|
46
|
-
let refresh_code;
|
|
47
|
-
if (this.info[peer]) {
|
|
48
|
-
if (this.info[peer].router && Object.keys(this.info[peer].router).length > 0) {
|
|
49
|
-
// router initialized
|
|
50
|
-
refresh_needed = false;
|
|
51
|
-
} else {
|
|
52
|
-
// router not initialized. try again
|
|
53
|
-
refresh_needed = true;
|
|
54
|
-
refresh_code = 1
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
if (this.info[peer].proc && this.info[peer].proc.length > 0) {
|
|
58
|
-
// router initialized
|
|
59
|
-
refresh_needed = false;
|
|
60
|
-
} else {
|
|
61
|
-
// router not initialized. try again
|
|
62
|
-
refresh_needed = true;
|
|
63
|
-
refresh_code = 2
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
} else {
|
|
67
|
-
// try again
|
|
68
|
-
refresh_needed = true;
|
|
69
|
-
refresh_code = 3
|
|
70
|
-
}
|
|
71
|
-
if (refresh_needed) {
|
|
72
|
-
console.log("refresh needed", refresh_code)
|
|
73
|
-
this.refresh([peer])
|
|
74
|
-
}
|
|
75
|
-
}
|
|
44
|
+
// for(let peer of this.peers) {
|
|
45
|
+
// let refresh_needed = false;
|
|
46
|
+
// let refresh_code;
|
|
47
|
+
// if (this.info[peer]) {
|
|
48
|
+
// if (this.info[peer].router && Object.keys(this.info[peer].router).length > 0) {
|
|
49
|
+
// // router initialized
|
|
50
|
+
// refresh_needed = false;
|
|
51
|
+
// } else {
|
|
52
|
+
// // router not initialized. try again
|
|
53
|
+
// refresh_needed = true;
|
|
54
|
+
// refresh_code = 1
|
|
55
|
+
// }
|
|
56
|
+
//
|
|
57
|
+
// if (this.info[peer].proc && this.info[peer].proc.length > 0) {
|
|
58
|
+
// // router initialized
|
|
59
|
+
// refresh_needed = false;
|
|
60
|
+
// } else {
|
|
61
|
+
// // router not initialized. try again
|
|
62
|
+
// refresh_needed = true;
|
|
63
|
+
// refresh_code = 2
|
|
64
|
+
// }
|
|
65
|
+
//
|
|
66
|
+
// } else {
|
|
67
|
+
// // try again
|
|
68
|
+
// refresh_needed = true;
|
|
69
|
+
// refresh_code = 3
|
|
70
|
+
// }
|
|
71
|
+
// if (refresh_needed) {
|
|
72
|
+
// console.log("refresh needed", refresh_code)
|
|
73
|
+
// this.refresh([peer])
|
|
74
|
+
// }
|
|
75
|
+
// }
|
|
76
76
|
}, this.interval);
|
|
77
77
|
});
|
|
78
78
|
}
|
|
@@ -98,7 +98,7 @@ class PeerDiscovery {
|
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
100
|
// notify peers to refresh my info
|
|
101
|
-
async
|
|
101
|
+
async notify_peers() {
|
|
102
102
|
let res = await Promise.all(Array.from(this.peers).map((host) => {
|
|
103
103
|
return this._broadcast(host)
|
|
104
104
|
}))
|
package/package.json
CHANGED
package/server/index.js
CHANGED
|
@@ -2623,6 +2623,7 @@ class Server {
|
|
|
2623
2623
|
}))
|
|
2624
2624
|
this.app.get("/network", ex(async (req, res) => {
|
|
2625
2625
|
let list = []
|
|
2626
|
+
|
|
2626
2627
|
// let peers_info = await this.kernel.peer.refresh()
|
|
2627
2628
|
let peers_info = {}
|
|
2628
2629
|
if (this.kernel.peer.info) {
|
|
@@ -3336,7 +3337,7 @@ class Server {
|
|
|
3336
3337
|
}))
|
|
3337
3338
|
this.app.get("/pinokio/peer", ex(async (req, res) => {
|
|
3338
3339
|
console.log("/pinokio/peer", { proc: this.kernel.processes.info })
|
|
3339
|
-
await this.kernel.refresh()
|
|
3340
|
+
// await this.kernel.refresh()
|
|
3340
3341
|
res.json({
|
|
3341
3342
|
home: this.kernel.homedir,
|
|
3342
3343
|
arch: this.kernel.arch,
|