ChronosXYZ/JGUN
1
0
Fork 0
mirror of https://github.com/ChronosX88/JGUN.git synced 2024-11-21 14:02:19 +00:00
Code Issues Projects Releases Wiki Activity

Make nodes ignoring their own requests, fix putting data to the graph

Browse Source
This commit is contained in:
ChronosX88 2023-11-17 20:00:00 +03:00
parent a551581a99
commit bcda85a8b1
14 changed files with 118 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/io/github/chronosx88/JGUN/api/Gun.java
View File

@ -9,8 +9,8 @@ public class Gun {
private final StorageManager storageManager;
private final NetworkManager networkManager;
public Gun(Storage storage, Peer peer) {
this.networkManager = new NetworkManager(peer);
public Gun(Storage storage, Peer peer) throws InterruptedException {
this.networkManager = new NetworkManager(peer, peer.getNetworkHandler());
this.storageManager = new StorageManager(storage, this.networkManager);
this.networkManager.start();
}

53
src/main/java/io/github/chronosx88/JGUN/api/PathReference.java
View File

@ -12,10 +12,7 @@ import io.github.chronosx88.JGUN.network.NetworkManager;
import io.github.chronosx88.JGUN.storage.StorageManager;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.*;
import java.util.stream.Stream;
public class PathReference {
@ -23,6 +20,7 @@ public class PathReference {
private final NetworkManager networkManager;
private final StorageManager storageManager;
private final Executor executorService = Executors.newCachedThreadPool();
public PathReference(NetworkManager networkManager, StorageManager storageManager) {
this.networkManager = networkManager;
@ -85,36 +83,41 @@ public class PathReference {
.build());
nodeId = newNodeId;
}
graph.nodes.get(NodeBuilder.ROOT_NODE).getMetadata().setNodeID(newNodeId);
graph.nodes.put(newNodeId, graph.nodes.get(NodeBuilder.ROOT_NODE));
graph.nodes.remove(NodeBuilder.ROOT_NODE);
} else {
newNodeId = UUID.randomUUID().toString();
if (pathData.size() > 1) {
String parentNodeId = pathData.get(pathData.size()-2);
graph.putNodes(parentNodeId, Node.builder()
.metadata(NodeMetadata.builder()
.nodeID(parentNodeId)
.states(Map.of(path.get(path.size()-1), System.currentTimeMillis()))
.build())
.values(Map.of(path.get(path.size()-1), NodeLinkValue.builder()
.link(newNodeId)
.build()))
.build());
} else {
newNodeId = pathData.get(0);
}
// merge updated node under parent ID
String parentNodeId = pathData.get(pathData.size()-1);
graph.nodes.get(NodeBuilder.ROOT_NODE).getMetadata().setNodeID(parentNodeId);
graph.nodes.put(parentNodeId, graph.nodes.get(NodeBuilder.ROOT_NODE));
}
graph.nodes.get(NodeBuilder.ROOT_NODE).getMetadata().setNodeID(newNodeId);
graph.nodes.put(newNodeId, graph.nodes.get(NodeBuilder.ROOT_NODE));
graph.nodes.remove(NodeBuilder.ROOT_NODE);
return this.storageManager.putData(graph);
});
}
public void on(NodeChangeListener changeListener) {
storageManager.addChangeListener(String.join("/", path), changeListener);
executorService.execute(() -> {
List<String> pathData;
try {
pathData = storageManager.getPathData(path.toArray(new String[0]));
} catch (TimeoutException | ExecutionException | InterruptedException e) {
throw new RuntimeException(e);
}
storageManager.addChangeListener(pathData.get(pathData.size()-1), changeListener);
});
}
public void map(NodeChangeListener.Map forEachListener) {
storageManager.addMapChangeListener(String.join("/", path), forEachListener);
public void map(NodeChangeListener.Map mapListener) {
executorService.execute(() -> {
List<String> pathData;
try {
pathData = storageManager.getPathData(path.toArray(new String[0]));
} catch (TimeoutException | ExecutionException | InterruptedException e) {
throw new RuntimeException(e);
}
storageManager.addMapChangeListener(pathData.get(pathData.size()-1), mapListener);
});
}
}

22
src/main/java/io/github/chronosx88/JGUN/examples/MainClient.java
View File

@ -19,21 +19,13 @@ public class MainClient {
NetworkNode peer = new NetworkNode(Inet4Address.getByAddress(new byte[]{127, 0, 0, 1}), 5054, storage);
Gun gun = new Gun(storage, peer);
Result result = gun.get("person").put(new NodeBuilder()
.add("firstName", "John")
.add("lastName", "Smith")
.add("age", 25)
.add("address", new NodeBuilder()
.add("streetAddress", "21 2nd Street")
.add("city", "New York")
.add("state", "NY")
.add("postalCode", "10021"))
.add("phoneNumber", new ArrayBuilder()
.add(new NodeBuilder()
.add("type", "home")
.add("number", "212 555-1234"))
.add(new NodeBuilder()
.add("type", "fax")
.add("number", "646 555-4567")))
.add("firstName", "ABCD")
.build()).get();
System.out.println(result);
result = gun.get("person").get("address").put(new NodeBuilder()
.add("city", "HUY")
.add("ZIP", new NodeBuilder()
.add("post", "pochta rossii"))
.build()).get();
System.out.println(result);
}

23
src/main/java/io/github/chronosx88/JGUN/examples/MainServer.java
View File

@ -1,9 +1,14 @@
package io.github.chronosx88.JGUN.examples;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import io.github.chronosx88.JGUN.api.Gun;
import io.github.chronosx88.JGUN.api.NodeChangeListener;
import io.github.chronosx88.JGUN.api.graph.ArrayBuilder;
import io.github.chronosx88.JGUN.api.graph.NodeBuilder;
import io.github.chronosx88.JGUN.models.Result;
import io.github.chronosx88.JGUN.models.graph.Node;
import io.github.chronosx88.JGUN.network.GatewayNetworkNode;
import io.github.chronosx88.JGUN.network.NetworkNode;
import io.github.chronosx88.JGUN.storage.MemoryStorage;
@ -14,8 +19,8 @@ import java.util.concurrent.ExecutionException;
public class MainServer {
public static void main(String[] args) throws ExecutionException, InterruptedException {
GatewayNetworkNode peer = new GatewayNetworkNode(5054, new MemoryStorage());
Storage storage = new MemoryStorage();
GatewayNetworkNode peer = new GatewayNetworkNode(5054, storage);
Gun gun = new Gun(storage, peer);
Result result = gun.get("person").put(new NodeBuilder()
.add("firstName", "John")
@ -34,6 +39,22 @@ public class MainServer {
.add("type", "fax")
.add("number", "646 555-4567")))
.build()).get();
ObjectMapper mapper = new ObjectMapper();
mapper.registerModule(new Jdk8Module());
gun.get("person").on(node -> {
try {
System.out.println(mapper.writeValueAsString(node));
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
});
gun.get("person").get("address").on(node -> {
try {
System.out.println(mapper.writeValueAsString(node));
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
});
System.out.println(result.isOk());
}
}

4
src/main/java/io/github/chronosx88/JGUN/models/requests/Request.java
View File

@ -1,3 +1,5 @@
package io.github.chronosx88.JGUN.models.requests;
public interface Request {}
public interface Request {
String getId();
}

4
src/main/java/io/github/chronosx88/JGUN/network/Dup.java
View File

@ -16,11 +16,11 @@ public class Dup {
.build();
}
private void track(String id) {
public void track(String id) {
cache.put(id, System.currentTimeMillis());
}
public boolean isDuplicated(String id) {
public boolean checkDuplicated(String id) {
Long timestamp = null;
try {
timestamp = cache.getIfPresent(id);

5
src/main/java/io/github/chronosx88/JGUN/network/GatewayNetworkNode.java
View File

@ -74,4 +74,9 @@ public class GatewayNetworkNode extends WebSocketServer implements Peer {
public int connectedPeerCount() {
return this.getConnections().size();
}
@Override
public NetworkHandler getNetworkHandler() {
return handler;
}
}

6
src/main/java/io/github/chronosx88/JGUN/network/NetworkHandler.java
View File

@ -17,6 +17,7 @@ import io.github.chronosx88.JGUN.models.graph.NodeValue;
import io.github.chronosx88.JGUN.models.requests.GetRequest;
import io.github.chronosx88.JGUN.models.requests.PutRequest;
import io.github.chronosx88.JGUN.storage.Storage;
import lombok.Getter;
import java.util.Map;
import java.util.Objects;
@ -30,6 +31,8 @@ public class NetworkHandler {
private final Peer peer;
private final Storage storage;
@Getter
private final Dup dup;
private final Executor executorService = Executors.newCachedThreadPool();
private final ObjectMapper objectMapper;
@ -59,7 +62,7 @@ public class NetworkHandler {
throw new RuntimeException(e);
}
if (dup.isDuplicated(parsedMessage.getId())) {
if (dup.checkDuplicated(parsedMessage.getId())) {
// TODO log
return;
}
@ -78,6 +81,7 @@ public class NetworkHandler {
handleGetAck(ack.getData(), ack);
}
if (Objects.nonNull(response)) {
this.dup.track(response.getId());
String respString;
try {
respString = objectMapper.writeValueAsString(response);

9
src/main/java/io/github/chronosx88/JGUN/network/NetworkManager.java
View File

@ -21,6 +21,7 @@ public class NetworkManager {
private final ObjectMapper objectMapper;
private final Peer peer;
private final NetworkHandler networkHandler;
private final Executor executorService = Executors.newCachedThreadPool();
@ -30,15 +31,16 @@ public class NetworkManager {
@Getter
private final int timeout;
public NetworkManager(Peer peer) {
public NetworkManager(Peer peer, NetworkHandler networkHandler) {
this.networkHandler = networkHandler;
objectMapper = new ObjectMapper();
objectMapper.registerModule(new Jdk8Module());
this.peer = peer;
this.timeout = peer.getTimeout();
}
public void start() {
executorService.execute(this.peer::start);
public void start() throws InterruptedException {
this.peer.start();
}
private <T extends Request> void sendRequest(T request) {
@ -48,6 +50,7 @@ public class NetworkManager {
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
this.networkHandler.getDup().track(request.getId());
peer.emit(encodedRequest);
}

11
src/main/java/io/github/chronosx88/JGUN/network/NetworkNode.java
View File

@ -21,7 +21,7 @@ public class NetworkNode extends WebSocketClient implements Peer {
@Override
public void onOpen(ServerHandshake handshakeData) {
System.out.println("# Connection with SuperNode open. Status: " + handshakeData.getHttpStatus());
System.out.println("# Connection with gateway node is open. Status: " + handshakeData.getHttpStatus());
}
@Override
@ -56,8 +56,8 @@ public class NetworkNode extends WebSocketClient implements Peer {
}
@Override
public void start() {
this.connect();
public void start() throws InterruptedException {
this.connectBlocking();
}
@Override
@ -70,4 +70,9 @@ public class NetworkNode extends WebSocketClient implements Peer {
if (this.isOpen()) return 1;
return 0;
}
@Override
public NetworkHandler getNetworkHandler() {
return handler;
}
}

3
src/main/java/io/github/chronosx88/JGUN/network/Peer.java
View File

@ -7,7 +7,8 @@ public interface Peer {
void emit(String data);
void addPendingPutRequest(FuturePut futurePut);
void addPendingGetRequest(FutureGet futureGet);
void start();
void start() throws InterruptedException;
int getTimeout();
int connectedPeerCount();
NetworkHandler getNetworkHandler();
}

21
src/main/java/io/github/chronosx88/JGUN/storage/MemoryStorage.java
View File

@ -5,6 +5,7 @@ import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.Expiry;
import io.github.chronosx88.JGUN.models.graph.DeferredNode;
import io.github.chronosx88.JGUN.models.graph.Node;
import io.github.chronosx88.JGUN.models.graph.NodeMetadata;
import io.github.chronosx88.JGUN.models.graph.NodeValue;
import org.checkerframework.checker.index.qual.NonNegative;
@ -46,21 +47,23 @@ public class MemoryStorage extends Storage {
if (node != null && field != null) {
NodeValue requestedField = node.getValues().get(field);
if (requestedField != null) {
Long requestedFieldState = node.getMetadata().getStates().get(field);
node.getValues().clear();
node.getMetadata().getStates().clear();
node.getValues().put(field, requestedField);
node.getMetadata().getStates().put(field, requestedFieldState);
node = Node.builder()
.metadata(NodeMetadata.builder()
.nodeID(node.getMetadata().getNodeID())
.states(Map.of(field, node.getMetadata().getStates().get(field)))
.build())
.values(Map.of(field, requestedField))
.build();
}
}
return node;
}
@Override
protected void updateNode(Node node) {
Node currentNode = nodes.get(node.getMetadata().getNodeID());
currentNode.values.putAll(node.values);
currentNode.getMetadata().getStates().putAll(node.getMetadata().getStates());
protected void updateNode(Node newNode) {
Node currentNode = nodes.get(newNode.getMetadata().getNodeID());
currentNode.values.putAll(newNode.values);
currentNode.getMetadata().getStates().putAll(newNode.getMetadata().getStates());
}
public void addNode(String id, Node incomingNode) {

2
src/main/java/io/github/chronosx88/JGUN/storage/Storage.java
View File

@ -95,7 +95,7 @@ public abstract class Storage {
continue;
}
if (Objects.isNull(changedNode)) {
if (changedNode == null) {
changedNode = Node.builder()
.metadata(NodeMetadata.builder()
.nodeID(incomingNode.getMetadata().getNodeID())

35
src/main/java/io/github/chronosx88/JGUN/storage/StorageManager.java
View File

@ -40,7 +40,7 @@ public class StorageManager {
}
public List<String> getPathData(String[] path) throws TimeoutException, ExecutionException, InterruptedException {
List<String> nodeIds = new ArrayList<>(List.of(path[0]));
List<String> nodeIds = new ArrayList<>();
String nodeId = path[0];
for (int i = 0; i < path.length; i++) {
String field = null;
@ -49,35 +49,30 @@ public class StorageManager {
}
Node node = storage.getNode(nodeId, field);
if (node != null) {
if (field != null) {
if (node.values.containsKey(field) && node.values.get(field).getValueType() == NodeValue.ValueType.LINK) {
nodeId = ((NodeLinkValue) node.values.get(field)).getLink();
nodeIds.add(nodeId);
continue;
}
} else {
if (field == null) {
nodeIds.add(nodeId);
break;
}
if (node.values.containsKey(field) && node.values.get(field).getValueType() == NodeValue.ValueType.LINK) {
nodeId = ((NodeLinkValue) node.values.get(field)).getLink();
nodeIds.add(nodeId);
continue;
}
}
// proceeds to request from the network
var future = this.networkManager.sendGetRequest(GetRequestParams.builder()
.nodeId(nodeId)
.field(field)
.build());
var result = future.get(networkManager.getTimeout(), TimeUnit.SECONDS);
if (result.getData() != null) {
nodeIds.add(result.getData().getMetadata().getNodeID());
if (field != null) {
if (result.getData().values.containsKey(field) && result.getData().values.get(field).getValueType() == NodeValue.ValueType.LINK) {
nodeId = ((NodeLinkValue) result.getData().values.get(field)).getLink();
nodeIds.add(nodeId);
}
} else {
break;
}
} else {
if (result.getData() == null || field == null) {
nodeIds.add(nodeId);
break;
}
if (result.getData().values.containsKey(field) && result.getData().values.get(field).getValueType() == NodeValue.ValueType.LINK) {
nodeId = ((NodeLinkValue) result.getData().values.get(field)).getLink();
nodeIds.add(nodeId);
}
}
return nodeIds;
}