lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-08-24 02:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
crschnick
2026-08-17 05:08:43 +00:00
parent 92ab269f63
commit 4a8bbdffbe
2 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java
+1 -1
View File
@@ -252,7 +252,7 @@ public class TerminalLauncher {
// Throw if not supported
multiplexer.get().checkSupported(control);
var session = TerminalMultiplexerManager.getActiveMultiplexerSession(true);
var session = TerminalMultiplexerManager.getActiveMultiplexerSession();
if (session.isEmpty()) {
return false;
}
app/src/main/java/io/xpipe/app/terminal/TerminalMultiplexerManager.java
+15 -26
View File
@@ -99,24 +99,12 @@ public class TerminalMultiplexerManager {
return;
}
// Wait if we are currently opening a new multiplexer
// Step 1: Wait for currently opening multiplexer container shell
if (pendingMultiplexerLaunch != null) {
// Wait for max 30s
// Multiplexer launches in WSL may take a while
for (int i = 0; i < 300; i++) {
if (pendingMultiplexerLaunch == null) {
// Give it a bit more time if it just started
ThreadHelper.sleep(1000);
// Wait for max 10s
for (int j = 0; j < 100; j++) {
if (getActiveMultiplexerSession(false).isPresent()) {
break;
}
ThreadHelper.sleep(100);
}
break;
}
@@ -126,6 +114,19 @@ public class TerminalMultiplexerManager {
// We timed out
pendingMultiplexerLaunch = null;
}
// Step 2: Wait for first tab to open in multiplexer container to make sure that the session is started
if (runningMultiplexerContainer != null) {
// Wait for max 10s
for (int j = 0; j < 100; j++) {
if (getActiveMultiplexerSession().isPresent()) {
break;
}
ThreadHelper.sleep(100);
}
}
}
public static void registerSessionLaunch(TerminalLaunchConfiguration configuration) {
@@ -159,24 +160,12 @@ public class TerminalMultiplexerManager {
return Optional.ofNullable(runningMultiplexerContainer);
}
public static Optional<TerminalView.TerminalSession> getActiveMultiplexerSession(boolean includeStarting) {
public static Optional<TerminalView.TerminalSession> getActiveMultiplexerSession() {
var mult = getEffectiveMultiplexer();
if (mult.isEmpty()) {
return Optional.empty();
}
var noSessions = TerminalView.get().getSessions().stream()
.noneMatch(shellSession -> shellSession.getTerminal().isRunning()
&& (mult.get() == connectionHubRequests.get(shellSession.getRequest())));
if (includeStarting && noSessions) {
var starting = TerminalView.get().getSessions().stream()
.filter(shellSession -> shellSession.getTerminal().isRunning()
&& runningMultiplexerContainerType == mult.get()
&& shellSession.getRequest().equals(runningMultiplexerContainer))
.findFirst();
return starting.map(shellSession -> shellSession.getTerminal());
}
var session = TerminalView.get().getSessions().stream()
.filter(shellSession -> shellSession.getTerminal().isRunning()
&& (mult.get() == connectionHubRequests.get(shellSession.getRequest())))