pinokiod 3.10.2 → 3.10.4
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 +4 -0
- package/kernel/procs.js +11 -1
- package/package.json +1 -1
package/kernel/index.js
CHANGED
|
@@ -263,6 +263,7 @@ class Kernel {
|
|
|
263
263
|
this.log_queue.push({ data, group, info })
|
|
264
264
|
}
|
|
265
265
|
async refresh(notify_peers) {
|
|
266
|
+
console.log("kernel.refresh", { notify_peers })
|
|
266
267
|
let env = await Environment.get(this.homedir)
|
|
267
268
|
let peer_active = false
|
|
268
269
|
// if PINOKIO_NETWORK_SHARE is 0 or false, turn it off
|
|
@@ -273,10 +274,13 @@ class Kernel {
|
|
|
273
274
|
if (env && env.PINOKIO_HTTPS_ACTIVE && (env.PINOKIO_HTTPS_ACTIVE==="1" || env.PINOKIO_HTTPS_ACTIVE.toLowerCase()==="true")) {
|
|
274
275
|
https_active = true
|
|
275
276
|
}
|
|
277
|
+
console.log({ https_active, peer_active })
|
|
276
278
|
// console.log("kernel.refresh", { active, notify_peers })
|
|
277
279
|
|
|
278
280
|
let caddy_installed = await this.bin.check_installed({ name: "caddy" })
|
|
279
281
|
|
|
282
|
+
console.log({ caddy_installed, https_active })
|
|
283
|
+
|
|
280
284
|
// 1. https
|
|
281
285
|
// 2. https + local share
|
|
282
286
|
// console.log("caddy installed?", caddy_installed)
|
package/kernel/procs.js
CHANGED
|
@@ -14,16 +14,21 @@ class Procs {
|
|
|
14
14
|
|
|
15
15
|
const results = [];
|
|
16
16
|
let pids = new Set()
|
|
17
|
-
|
|
17
|
+
let s = stdout.trim()
|
|
18
|
+
cosnole.log(">>>>>>>>>>", s)
|
|
19
|
+
const lines = s.split('\n');
|
|
18
20
|
|
|
19
21
|
lines.forEach(line => {
|
|
22
|
+
console.log({ line, isWin })
|
|
20
23
|
if (isWin) {
|
|
21
24
|
// Skip headers
|
|
22
25
|
if (!line.startsWith(' TCP')) return;
|
|
23
26
|
const parts = line.trim().split(/\s+/);
|
|
24
27
|
const [ , localAddress, , state, pid ] = parts;
|
|
28
|
+
console.log({ parts, localAddress, state, pid })
|
|
25
29
|
if (state !== 'LISTENING') return;
|
|
26
30
|
const chunks = localAddress.split(":")
|
|
31
|
+
console.log({ chunks })
|
|
27
32
|
const port = chunks.pop()
|
|
28
33
|
let ip = chunks.pop()
|
|
29
34
|
if (!ip || ip === "*") {
|
|
@@ -31,6 +36,7 @@ class Procs {
|
|
|
31
36
|
} else {
|
|
32
37
|
ip = localAddress
|
|
33
38
|
}
|
|
39
|
+
console.log({ port, ip })
|
|
34
40
|
if (pids.has(pid+"/"+port)) return;
|
|
35
41
|
pids.add(pid+"/"+port)
|
|
36
42
|
results.push({ port, pid, ip });
|
|
@@ -83,13 +89,16 @@ class Procs {
|
|
|
83
89
|
let map = {}
|
|
84
90
|
let list = await new Promise((resolve, reject) => {
|
|
85
91
|
this.getPortPidList((err, portPidList) => {
|
|
92
|
+
console.log({ portPidList })
|
|
86
93
|
if (err) {
|
|
94
|
+
console.log("getPortPidList Error", err)
|
|
87
95
|
reject(err)
|
|
88
96
|
return
|
|
89
97
|
}
|
|
90
98
|
|
|
91
99
|
this.getPidToNameMap((err, pidToName) => {
|
|
92
100
|
if (err) {
|
|
101
|
+
console.log("getPidToNameMap Error", err)
|
|
93
102
|
reject(err)
|
|
94
103
|
return
|
|
95
104
|
}
|
|
@@ -105,6 +114,7 @@ class Procs {
|
|
|
105
114
|
return { port, pid , name, fullname, ip }
|
|
106
115
|
}
|
|
107
116
|
}).filter((x) => { return x })
|
|
117
|
+
console.log({ list })
|
|
108
118
|
resolve(list)
|
|
109
119
|
});
|
|
110
120
|
});
|