pinokiod 3.166.0 → 3.168.0
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/shell.js +10 -2
- package/package.json +1 -1
- package/server/views/app.ejs +9 -9
package/kernel/shell.js
CHANGED
|
@@ -1139,7 +1139,11 @@ class Shell {
|
|
|
1139
1139
|
// console.log("KILL PTY", this.id)
|
|
1140
1140
|
if (this.ptyProcess) {
|
|
1141
1141
|
if (cb) {
|
|
1142
|
-
|
|
1142
|
+
try {
|
|
1143
|
+
kill(this.ptyProcess.pid, "SIGKILL", true)
|
|
1144
|
+
} catch (e) {
|
|
1145
|
+
console.log("Kill Error", e)
|
|
1146
|
+
}
|
|
1143
1147
|
this.ptyProcess.kill()
|
|
1144
1148
|
this.ptyProcess = undefined
|
|
1145
1149
|
// automatically remove the shell from this.kernel.shells
|
|
@@ -1150,7 +1154,11 @@ class Shell {
|
|
|
1150
1154
|
}
|
|
1151
1155
|
cb()
|
|
1152
1156
|
} else {
|
|
1153
|
-
|
|
1157
|
+
try {
|
|
1158
|
+
kill(this.ptyProcess.pid, "SIGKILL", true)
|
|
1159
|
+
} catch (e) {
|
|
1160
|
+
console.log("Kill Error", e)
|
|
1161
|
+
}
|
|
1154
1162
|
this.ptyProcess.kill()
|
|
1155
1163
|
this.ptyProcess = undefined
|
|
1156
1164
|
// automatically remove the shell from this.kernel.shells
|
package/package.json
CHANGED
package/server/views/app.ejs
CHANGED
|
@@ -6288,10 +6288,17 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
|
|
|
6288
6288
|
rerenderMenuSection(submenu, dynamic)
|
|
6289
6289
|
restoreAllTabStates()
|
|
6290
6290
|
}
|
|
6291
|
+
const hasExistingSelection = Boolean(document.querySelector('.frame-link.selected'))
|
|
6291
6292
|
let default_selection = document.querySelector(".dynamic .submenu [data-default]")
|
|
6292
6293
|
if (default_selection) {
|
|
6293
|
-
|
|
6294
|
-
|
|
6294
|
+
const targetAttr = default_selection.getAttribute('target') || ''
|
|
6295
|
+
const isPeerDefault = typeof targetAttr === 'string' && targetAttr.startsWith('@http')
|
|
6296
|
+
if (isPeerDefault) {
|
|
6297
|
+
ignorePersistedSelection = true
|
|
6298
|
+
}
|
|
6299
|
+
if (!hasExistingSelection || isPeerDefault) {
|
|
6300
|
+
default_selection.click()
|
|
6301
|
+
}
|
|
6295
6302
|
}
|
|
6296
6303
|
rendered = true
|
|
6297
6304
|
} else {
|
|
@@ -6449,13 +6456,6 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
|
|
|
6449
6456
|
refresh_du()
|
|
6450
6457
|
refresh_du("logs")
|
|
6451
6458
|
} else {
|
|
6452
|
-
if (event.data.type === 'start') {
|
|
6453
|
-
const frameCandidate = (typeof event.data.frame === 'string' ? event.data.frame : null)
|
|
6454
|
-
const frameName = frameCandidate || resolveFrameName(frameCandidate, event.source) || resolveFrameName(null, event.source)
|
|
6455
|
-
if (typeof frameName === 'string' && frameName.startsWith('@http')) {
|
|
6456
|
-
ignorePersistedSelection = true
|
|
6457
|
-
}
|
|
6458
|
-
}
|
|
6459
6459
|
refresh()
|
|
6460
6460
|
}
|
|
6461
6461
|
}
|