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

Various fixes [stage]

Browse Source
This commit is contained in:
crschnick
2026-01-30 10:45:31 +00:00
parent 65fcedb94f
commit e7860df9cb
13 changed files with 65 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/comp/base/SideMenuBarComp.java
+1 -15
View File
@@ -108,21 +108,7 @@ public class SideMenuBarComp extends RegionBuilder<VBox> {
b.apply(struc -> {
struc.setOnAction(e -> {
struc.setDisable(true);
ThreadHelper.runAsync(() -> {
try {
var r = item.getAction().get();
if (r) {
Platform.runLater(() -> {
queueEntries.remove(item);
});
}
} catch (Throwable t) {
Platform.runLater(() -> {
queueEntries.remove(item);
});
throw t;
}
});
item.execute();
struc.setDisable(false);
e.consume();
});
app/src/main/java/io/xpipe/app/core/AppLayoutModel.java
+17 -9
View File
@@ -196,18 +196,26 @@ public class AppLayoutModel {
public void execute() {
ThreadHelper.runAsync(() -> {
try {
var r = getAction().get();
if (r) {
AppLayoutModel.get().getQueueEntries().remove(this);
}
} catch (Throwable t) {
AppLayoutModel.get().getQueueEntries().remove(this);
throw t;
}
executeSync();
});
}
public void executeSync() {
try {
var r = getAction().get();
if (r) {
PlatformThread.runLaterIfNeeded(() -> {
AppLayoutModel.get().getQueueEntries().remove(this);
});
}
} catch (Throwable t) {
PlatformThread.runLaterIfNeeded(() -> {
AppLayoutModel.get().getQueueEntries().remove(this);
});
throw t;
}
}
public void hide() {
AppLayoutModel.get().getQueueEntries().remove(this);
}
app/src/main/java/io/xpipe/app/pwman/KeePassXcPasswordManager.java
+1 -1
View File
@@ -146,7 +146,7 @@ public class KeePassXcPasswordManager implements PasswordManager {
if (!valid) {
ErrorEventFactory.preconfigure(ErrorEventFactory.fromThrowable(first)
.description("KeePassXC association for "
+ available.getFirst().getKey() + " failed")
+ available.getFirst().getId() + " failed")
.expected());
throw first;
}
app/src/main/java/io/xpipe/app/pwman/KeeperPasswordManager.java
+11 -3
View File
@@ -82,6 +82,10 @@ public class KeeperPasswordManager implements PasswordManager {
@Override
public synchronized CredentialResult retrieveCredentials(String rawKey) {
return retrieveCredentials(rawKey, 0);
}
private CredentialResult retrieveCredentials(String rawKey, int retries) {
// The copy UID button copies the whole URL in the Keeper UI. Why? ...
rawKey = rawKey.replaceFirst("https://\\w+\\.\\w+/vault/#detail/", "");
@@ -173,7 +177,7 @@ public class KeeperPasswordManager implements PasswordManager {
.add(b);
var queryCommand = sc.command(fullB);
queryCommand.sensitive();
queryCommand.killOnTimeout(CountDown.of().start(15_000));
queryCommand.killOnTimeout(CountDown.of().start(25_000));
var result = queryCommand.readStdoutAndStderr();
var exitCode = queryCommand.getExitCode();
@@ -208,7 +212,11 @@ public class KeeperPasswordManager implements PasswordManager {
if (exitCode != 0 || (outLines.size() > 0 && outLines.getLast().contains("Invalid entry"))) {
// Another password prompt was made
var wrongPw = out.contains("Enter password for") || exitCode == CommandControl.EXIT_TIMEOUT_EXIT_CODE;
if (wrongPw) {
if (wrongPw && hasCompletedRequestInSession) {
if (retries == 0) {
return retrieveCredentials(rawKey, retries + 1);
}
SecretManager.clearAll(KEEPER_PASSWORD_ID);
ErrorEventFactory.fromMessage("Master password was not accepted by Keeper. Is it correct?")
.expected()
@@ -257,6 +265,6 @@ public class KeeperPasswordManager implements PasswordManager {
@Override
public Duration getCacheDuration() {
return (mfa != null && mfa && getTotpDurationIndex() < 1) ? Duration.ofDays(10) : Duration.ofSeconds(3);
return (mfa != null && mfa && getTotpDurationIndex() < 1) ? Duration.ofDays(10) : Duration.ofSeconds(30);
}
}
app/src/main/java/io/xpipe/app/secret/SecretPasswordManagerStrategy.java
+3 -2
View File
@@ -103,8 +103,9 @@ public class SecretPasswordManagerStrategy implements SecretRetrievalStrategy {
@Override
public Duration cacheDuration() {
// To reduce password manager access, cache it for a few seconds
return Duration.ofSeconds(15);
// To reduce password manager access, cache it
var pm = AppPrefs.get().passwordManager().getValue();
return pm != null ? pm.getCacheDuration() : Duration.ofSeconds(15);
}
@Override
app/src/main/java/io/xpipe/app/terminal/TerminalDockHubComp.java
+9
View File
@@ -9,9 +9,13 @@ import javafx.beans.value.ObservableValue;
import javafx.event.EventHandler;
import javafx.geometry.Bounds;
import javafx.scene.Parent;
import javafx.scene.control.Button;
import javafx.scene.layout.Background;
import javafx.scene.layout.Region;
import javafx.scene.layout.StackPane;
import javafx.scene.paint.Color;
import javafx.stage.WindowEvent;
import org.kordamp.ikonli.javafx.FontIcon;
import java.util.concurrent.atomic.AtomicReference;
@@ -68,6 +72,11 @@ public class TerminalDockHubComp extends SimpleRegionBuilder {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
if (newValue) {
var selected = s.getScene().getRoot().lookup(".icon-button-comp:hover");
if (selected instanceof Button b && b.getGraphic() instanceof FontIcon fi && fi.getIconLiteral().equals("mdi2c-console")) {
return;
}
model.onFocusGain();
} else {
Platform.runLater(() -> {
app/src/main/java/io/xpipe/app/terminal/TerminalDockHubManager.java
+6 -1
View File
@@ -4,6 +4,7 @@ import io.xpipe.app.comp.base.ModalOverlay;
import io.xpipe.app.core.AppI18n;
import io.xpipe.app.core.AppLayoutModel;
import io.xpipe.app.core.window.AppDialog;
import io.xpipe.app.core.window.AppMainWindow;
import io.xpipe.app.platform.LabelGraphic;
import io.xpipe.app.platform.NativeWinWindowControl;
import io.xpipe.app.platform.PlatformThread;
@@ -14,7 +15,9 @@ import io.xpipe.core.OsType;
import javafx.application.Platform;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.Property;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.collections.ListChangeListener;
import lombok.Getter;
@@ -204,6 +207,8 @@ public class TerminalDockHubManager {
}
public void refreshDockStatus() {
dockModel.clearDeadTerminals();
var running = dockModel.isRunning();
if (!running) {
minimized.set(false);
@@ -212,7 +217,7 @@ public class TerminalDockHubManager {
}
minimized.set(dockModel.isMinimized());
detached.set(dockModel.isCustomBounds());
detached.set(dockModel.isCustomBounds() || dockModel.isMinimized());
}
public void openTerminal(UUID request) {
app/src/main/java/io/xpipe/app/terminal/TerminalDockView.java
+5 -1
View File
@@ -28,6 +28,10 @@ public class TerminalDockView {
this.windowBoundsFunction = windowBoundsFunction;
}
public synchronized void clearDeadTerminals() {
terminalInstances.removeIf(controllableTerminalSession -> !controllableTerminalSession.getTerminalProcess().isAlive());
}
public synchronized boolean isRunning() {
return terminalInstances.stream().anyMatch(terminal -> terminal.isRunning());
}
@@ -215,7 +219,7 @@ public class TerminalDockView {
}
public void attach() {
TrackEvent.withTrace("Terminal view clicked").handle();
TrackEvent.withTrace("Terminal view attached").handle();
terminalInstances.forEach(terminalInstance -> {
terminalInstance.show();
dist/changelog/21.0.md
Vendored
+1
View File
@@ -64,3 +64,4 @@ The scripting system has been completely reworked with the goal of becoming simp
- Fix hetzner cloud integration sometimes not stripping away subnet mask from determined IP address
- Fix predefined categories being able to be moved
- Fix terminal sessions not applying for Konsole
- Fix rbash shell detection not working
ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStore.java
+3 -1
View File
@@ -40,7 +40,9 @@ public class PasswordManagerIdentityStore extends IdentityStore
var instant = getCache("lastQueried", Instant.class, null);
if (instant != null) {
var now = Instant.now();
if (Duration.between(instant, now).toSeconds() < 15) {
var pm = AppPrefs.get().passwordManager().getValue();
var cacheDuration = pm != null ? pm.getCacheDuration().toSeconds() : 15;
if (Duration.between(instant, now).toSeconds() < cacheDuration) {
return false;
}
}
ext/base/src/main/java/io/xpipe/ext/base/identity/ssh/SshIdentityStateManager.java
-1
View File
@@ -233,7 +233,6 @@ public class SshIdentityStateManager {
}
if (sc.getOsType() == OsType.WINDOWS) {
stopWindowsAgents(true, true, true);
checkLocalAgentIdentities(null);
} else {
checkLocalAgentIdentities(
ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceStore.java
+7 -1
View File
@@ -16,7 +16,7 @@ import lombok.extern.jackson.Jacksonized;
import java.util.OptionalInt;
@SuperBuilder
@SuperBuilder(toBuilder = true)
@Getter
@Jacksonized
@JsonTypeName("fixedService")
@@ -48,6 +48,12 @@ public class FixedServiceStore extends AbstractServiceStore implements FixedChil
return false;
}
@Override
public FixedChildStore merge(FixedChildStore other) {
var o = (FixedServiceStore) other;
return toBuilder().tunnelToLocalhost(o.tunnelToLocalhost).build();
}
@Override
public void checkComplete() throws Throwable {
super.checkComplete();
version
+1 -1
View File
@@ -1 +1 @@
21.0-1
21.0-2