pinokiod 3.2.212 → 3.2.214
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 +5 -3
- package/kernel/lproxy.js +2 -2
- package/package.json +1 -1
- package/server/index.js +2 -1
- package/server/views/proxy.ejs +1 -1
package/kernel/index.js
CHANGED
|
@@ -147,7 +147,7 @@ class Kernel {
|
|
|
147
147
|
if (port) {
|
|
148
148
|
return portfinder.isAvailablePromise({ host: "0.0.0.0", port })
|
|
149
149
|
} else {
|
|
150
|
-
return portfinder.getPortPromise({ port:
|
|
150
|
+
return portfinder.getPortPromise({ port: 42002 })
|
|
151
151
|
}
|
|
152
152
|
}
|
|
153
153
|
path(...args) {
|
|
@@ -232,8 +232,10 @@ class Kernel {
|
|
|
232
232
|
arch: this.arch,
|
|
233
233
|
home: this.homedir,
|
|
234
234
|
scripts: [],
|
|
235
|
-
shells: this.shell.shells.map(({ cols, rows, id, group, path, index, cmd, done }) => {
|
|
236
|
-
|
|
235
|
+
shells: this.shell.shells.map(({ vts, stripAnsi, cols, rows, id, group, path, index, cmd, done }) => {
|
|
236
|
+
let buf = vts.serialize()
|
|
237
|
+
let state = stripAnsi(buf)
|
|
238
|
+
return { cols, rows, id, group, path, index, cmd, done, state }
|
|
237
239
|
}),
|
|
238
240
|
proxies: [],
|
|
239
241
|
api: [],
|
package/kernel/lproxy.js
CHANGED
|
@@ -42,8 +42,9 @@ class Lproxy {
|
|
|
42
42
|
// get a new port
|
|
43
43
|
if (!port) {
|
|
44
44
|
port = await portfinder.getPortPromise({
|
|
45
|
+
port: 42002
|
|
45
46
|
//port: 42420
|
|
46
|
-
port: 50000
|
|
47
|
+
//port: 50000
|
|
47
48
|
//port: 44000
|
|
48
49
|
})
|
|
49
50
|
}
|
|
@@ -80,7 +81,6 @@ class Lproxy {
|
|
|
80
81
|
return `http://${this.ip}:${port}`
|
|
81
82
|
}
|
|
82
83
|
async stop (url) {
|
|
83
|
-
console.log("proxies", this.proxies, url)
|
|
84
84
|
let p = this.proxies[url]
|
|
85
85
|
if (p) {
|
|
86
86
|
p.close()
|
package/package.json
CHANGED
package/server/index.js
CHANGED
|
@@ -2525,7 +2525,8 @@ class Server {
|
|
|
2525
2525
|
await this.kernel.api.startProxy("/", `http://127.0.0.1:${this.port}`, "/")
|
|
2526
2526
|
}
|
|
2527
2527
|
} else {
|
|
2528
|
-
await this.kernel.api.startProxy("/", `http://127.0.0.1:${this.port}`, "/", { port: 44001 })
|
|
2528
|
+
//await this.kernel.api.startProxy("/", `http://127.0.0.1:${this.port}`, "/", { port: 44001 })
|
|
2529
|
+
await this.kernel.api.startProxy("/", `http://127.0.0.1:${this.port}`, "/", { port: 42001 })
|
|
2529
2530
|
}
|
|
2530
2531
|
console.log("started proxy")
|
|
2531
2532
|
} else if (req.body.type === "cloudflare") {
|
package/server/views/proxy.ejs
CHANGED
|
@@ -217,7 +217,7 @@ body.dark .browser-options-row {
|
|
|
217
217
|
<% if (proxy) { %>
|
|
218
218
|
<div id='wifi-stop' data-proxy="<%=proxy.proxy%>" class='btn'><div><i class="fa-solid fa-stop"></i> Stop</div></div>
|
|
219
219
|
<% } else { %>
|
|
220
|
-
<div id='wifi' class='btn'><div><i class="fa-solid fa-play"></i> Start
|
|
220
|
+
<div id='wifi' class='btn'><div><i class="fa-solid fa-play"></i> Start</div></div>
|
|
221
221
|
<div id='wifi-starting' class='btn disabled hidden'><div><i class="fa-solid fa-circle-notch fa-spin"></i> Starting</div></div>
|
|
222
222
|
<% } %>
|
|
223
223
|
</div>
|