lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-05-03 03:10:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Terminal launch adjustments

Browse Source
This commit is contained in:
crschnick
2026-04-18 11:09:52 +00:00
parent b18dcf21f3
commit 68761d6b64
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java
+8 -5
View File
@@ -181,15 +181,18 @@ public class TerminalLauncher {
}
if (effectivePreferTabs) {
// There will be timing issues when launching multiple tabs in a short time span
TerminalMultiplexerManager.waitForMultiplexerStartup();
// Synchronize between multiple existing tab launches as some terminals and multiplexers might break there
var elapsed = Duration.between(lastLaunch, Instant.now()).toMillis();
long elapsed;
synchronized (TerminalLauncher.class) {
elapsed = Duration.between(lastLaunch, Instant.now()).toMillis();
lastLaunch = Instant.now();
}
if (elapsed < 1000) {
ThreadHelper.sleep(1000 - elapsed);
}
lastLaunch = Instant.now();
// There will be timing issues when launching multiple tabs in a short time span
TerminalMultiplexerManager.synchronizeMultiplexerLaunchTiming();
// Track sessions that are used for the multiplexer
// Used to figure out when it dies
app/src/main/java/io/xpipe/app/terminal/TerminalMultiplexerManager.java
+6 -5
View File
@@ -4,8 +4,6 @@ import io.xpipe.app.prefs.AppPrefs;
import io.xpipe.app.util.ThreadHelper;
import io.xpipe.core.OsType;
import java.time.Duration;
import java.time.Instant;
import java.util.*;
public class TerminalMultiplexerManager {
@@ -65,7 +63,7 @@ public class TerminalMultiplexerManager {
return Optional.of(multiplexer);
}
public static void synchronizeMultiplexerLaunchTiming() {
public static void waitForMultiplexerStartup() {
var mult = getEffectiveMultiplexer();
if (mult.isEmpty()) {
return;
@@ -73,9 +71,12 @@ public class TerminalMultiplexerManager {
// Wait if we are currently opening a new multiplexer
if (pendingMultiplexerLaunch != null) {
// Wait for max 10s
for (int i = 0; i < 100; i++) {
// 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);
break;
}
app/src/main/java/io/xpipe/app/terminal/TerminalPrompt.java
+5 -1
View File
@@ -5,6 +5,8 @@ import io.xpipe.app.process.ShellControl;
import io.xpipe.app.process.ShellDialect;
import io.xpipe.app.process.ShellTemp;
import io.xpipe.app.process.ShellTerminalInitCommand;
import io.xpipe.app.storage.DataStorage;
import io.xpipe.app.storage.DataStoreEntry;
import io.xpipe.core.FilePath;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -45,9 +47,11 @@ public interface TerminalPrompt {
checkCanInstall(sc);
install(sc);
} catch (Exception e) {
var name = sc.getSourceStoreId().flatMap(uuid -> DataStorage.get().getStoreEntryIfPresent(uuid))
.map(DataStoreEntry::getName).orElse(null);
ErrorEventFactory.fromThrowable(e)
.omit()
.description("Prompt installation for " + getId() + " failed on remote system")
.description("Prompt installation for " + getId() + " failed on remote system" + (name != null ? " " + name : ""))
.expected()
.handle();
return false;