lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-09-28 11:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework beacon exchanges

Browse Source
This commit is contained in:
Christopher Schnick
2022-02-04 01:04:08 +01:00
parent b2af324993
commit 40f9de1dc3
13 changed files with 229 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
beacon/src/main/java/io/xpipe/beacon/BeaconClient.java
+6 -4
View File
@@ -44,11 +44,13 @@ public class BeaconClient implements AutoCloseable {
void accept(T var1) throws E;
}
public static Optional<BeaconClient> tryConnect() {
if (BeaconConfig.debugEnabled()) {
System.out.println("Attempting connection to server at port " + BeaconConfig.getUsedPort());
}
@FunctionalInterface
public interface FailableRunnable<E extends Throwable> {
void run() throws E;
}
public static Optional<BeaconClient> tryConnect() {
try {
return Optional.of(new BeaconClient());
} catch (IOException ex) {
beacon/src/main/java/io/xpipe/beacon/BeaconHandler.java
+2 -8
View File
@@ -1,22 +1,16 @@
package io.xpipe.beacon;
import io.xpipe.beacon.message.ResponseMessage;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
public interface BeaconHandler {
void postResponse(BeaconClient.FailableRunnable<Exception> r);
void prepareBody() throws IOException;
InputStream startBodyRead() throws IOException;
public <T extends ResponseMessage> void sendResponse(T obj) throws Exception;
public void sendClientErrorResponse(String message) throws Exception;
public void sendServerErrorResponse(Throwable ex) throws Exception;
OutputStream getOutputStream() throws Exception;
}
beacon/src/main/java/io/xpipe/beacon/BeaconServer.java
+1 -1
View File
@@ -25,7 +25,7 @@ public class BeaconServer {
public static boolean tryStart() throws Exception {
var custom = BeaconConfig.getCustomExecCommand();
if (custom != null) {
new ProcessBuilder("cmd", "/c", "CALL", custom).inheritIO().start();
Runtime.getRuntime().exec(custom);
return true;
}
beacon/src/main/java/io/xpipe/beacon/exchange/InfoExchange.java
+7 -2
View File
@@ -3,10 +3,11 @@ package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage;
import io.xpipe.core.source.DataSourceConfigInstance;
import io.xpipe.core.source.DataSourceId;
import io.xpipe.core.source.DataSourceInfo;
import io.xpipe.core.source.DataSourceReference;
import io.xpipe.core.store.DataStore;
import lombok.Builder;
import lombok.NonNull;
import lombok.Value;
import lombok.extern.jackson.Jacksonized;
@@ -31,15 +32,19 @@ public class InfoExchange implements MessageExchange<InfoExchange.Request, InfoE
@Builder
@Value
public static class Request implements RequestMessage {
DataSourceId id;
@NonNull
DataSourceReference ref;
}
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
@NonNull
DataSourceInfo info;
@NonNull
DataStore store;
@NonNull
DataSourceConfigInstance config;
}
}
beacon/src/main/java/io/xpipe/beacon/exchange/ReadExecuteExchange.java
+2 -2
View File
@@ -3,7 +3,7 @@ package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage;
import io.xpipe.core.source.DataSourceConfigInstance;
import io.xpipe.core.source.DataSourceId;
import io.xpipe.core.source.DataSourceReference;
import io.xpipe.core.store.DataStore;
import lombok.Builder;
import lombok.NonNull;
@@ -36,7 +36,7 @@ public class ReadExecuteExchange implements MessageExchange<ReadExecuteExchange.
@NonNull
DataSourceConfigInstance config;
@NonNull
DataSourceId targetId;
DataSourceReference target;
}
@Jacksonized
beacon/src/main/java/io/xpipe/beacon/exchange/SelectExchange.java
+4 -2
View File
@@ -2,8 +2,9 @@ package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage;
import io.xpipe.core.source.DataSourceId;
import io.xpipe.core.source.DataSourceReference;
import lombok.Builder;
import lombok.NonNull;
import lombok.Value;
import lombok.extern.jackson.Jacksonized;
@@ -28,7 +29,8 @@ public class SelectExchange implements MessageExchange<SelectExchange.Request, S
@Builder
@Value
public static class Request implements RequestMessage {
DataSourceId id;
@NonNull
DataSourceReference ref;
}
@Jacksonized
beacon/src/main/java/io/xpipe/beacon/exchange/WriteExecuteExchange.java
+2 -2
View File
@@ -3,7 +3,7 @@ package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage;
import io.xpipe.core.source.DataSourceConfigInstance;
import io.xpipe.core.source.DataSourceId;
import io.xpipe.core.source.DataSourceReference;
import io.xpipe.core.store.DataStore;
import lombok.Builder;
import lombok.NonNull;
@@ -32,7 +32,7 @@ public class WriteExecuteExchange implements MessageExchange<WriteExecuteExchang
@Value
public static class Request implements RequestMessage {
@NonNull
DataSourceId sourceId;
DataSourceReference ref;
DataStore dataStore;
@NonNull
beacon/src/main/java/io/xpipe/beacon/exchange/WritePreparationExchange.java
+2 -2
View File
@@ -3,7 +3,7 @@ package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage;
import io.xpipe.core.source.DataSourceConfigInstance;
import io.xpipe.core.source.DataSourceId;
import io.xpipe.core.source.DataSourceReference;
import io.xpipe.core.store.DataStore;
import lombok.Builder;
import lombok.NonNull;
@@ -34,7 +34,7 @@ public class WritePreparationExchange implements MessageExchange<WritePreparatio
String providerType;
String output;
@NonNull
DataSourceId sourceId;
DataSourceReference ref;
}
@Jacksonized
beacon/src/main/java/io/xpipe/beacon/message/ResponseMessage.java
+5
View File
@@ -1,5 +1,10 @@
package io.xpipe.beacon.message;
import io.xpipe.beacon.BeaconHandler;
public interface ResponseMessage {
default void postSend(BeaconHandler handler) throws Exception {
}
}