diff --git a/README.md b/README.md
index 6652da96b49b5b709517799650aec5ad3b58649c..18606e495302ce918518f618d55d3a641d2128fb 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,9 @@ duniter4j has four main components :
- duniter4j-core-client: a Client API to access to a Duniter network.
- - duniter4j-elasticsearch: a ES plugin, to store blockchain, registry, market and more.
-
+ - duniter4j-es-*: ElasticSearch plugins, to store blockchain, user profiles (Cesium+), registry, market and more.
+
+ - duniter4j-es-assembly: a standalone assembly with ElasticSearch and embedded plugins
## Install as ES plugin
@@ -97,8 +98,8 @@ network.host: 192.168.0.28
http.port: 9203
# Duniter node to connect with
-duniter.host: cgeek.fr
-duniter.port: 9330
+duniter.host: gtest.duniter.org
+duniter.port: 10900
# Should synchronize node blockchain ?
duniter.blockchain.sync.enable: true
@@ -113,7 +114,7 @@ cd duniter4j-elasticsearch-X.Y/bin
./elasticsearch
```
-Output example (on [test_net](https://en.duniter.org/try/) currency):
+Output example (on [GTest](https://fr.duniter.org/monnaie-gtest/) currency):
```bash
$ ./elasticsearch
@@ -131,13 +132,13 @@ $ ./elasticsearch
[2016-09-24 00:16:53,570][INFO ][node ] [ES-NODE-1] started
[2016-09-24 00:16:57,850][INFO ][node ] Checking Duniter indices...
[2016-09-24 00:16:57,859][INFO ][node ] Checking Duniter indices... [OK]
-[2016-09-24 00:17:08,026][INFO ][duniter.blockchain ] [test_net] [cgeek.fr:9330] Indexing last blocks...
-[2016-09-24 00:17:08,026][INFO ][duniter.blockchain ] [test_net] [cgeek.fr:9330] Indexing block #999 / 41282 (2%)...
-[2016-09-24 00:17:08,045][INFO ][duniter.blockchain ] [test_net] [cgeek.fr:9330] Indexing block #1998 / 41282 (4%)...
-[2016-09-24 00:17:09,026][INFO ][duniter.blockchain ] [test_net] [cgeek.fr:9330] Indexing block #2997 / 41282 (6%)...
-[2016-09-24 00:17:10,057][INFO ][duniter.blockchain ] [test_net] [cgeek.fr:9330] Indexing block #3996 / 41282 (8%)...
+[2016-09-24 00:17:08,026][INFO ][duniter.blockchain ] [gtest] [gtest.duniter.org:10900] Indexing last blocks...
+[2016-09-24 00:17:08,026][INFO ][duniter.blockchain ] [gtest] [gtest.duniter.org:10900] Indexing block #999 / 41282 (2%)...
+[2016-09-24 00:17:08,045][INFO ][duniter.blockchain ] [gtest] [gtest.duniter.org:10900] Indexing block #1998 / 41282 (4%)...
+[2016-09-24 00:17:09,026][INFO ][duniter.blockchain ] [gtest] [gtest.duniter.org:10900] Indexing block #2997 / 41282 (6%)...
+[2016-09-24 00:17:10,057][INFO ][duniter.blockchain ] [gtest] [gtest.duniter.org:10900] Indexing block #3996 / 41282 (8%)...
...
-[2016-09-24 00:17:11,026][INFO ][duniter.blockchain ] [test_net] [cgeek.fr:9330] Indexing block #41282 - hash [00000AAD73B0E76B870E6779CD7ACCCE175802D7867C13B5C8ED077F380548C5]
+[2016-09-24 00:17:11,026][INFO ][duniter.blockchain ] [gtest] [gtest.duniter.org:10900] Indexing block #41282 - hash [00000AAD73B0E76B870E6779CD7ACCCE175802D7867C13B5C8ED077F380548C5]
```
@@ -147,23 +148,23 @@ When a blockchain currency has been indexed, you can test some fun queries :
- get a block by number (e.g the block #0):
- http://localhost:9200/test_net/block/0 -> with some additional metadata given by ES
+ http://localhost:9200/gtest/block/0 -> with some additional metadata given by ES
- http://localhost:9200/test_net/block/0/_source -> the original JSON block
+ http://localhost:9200/gtest/block/0/_source -> the original JSON block
- Block #125 with only hash, dividend and memberCount:
- http://localhost:9200/test_net/block/125/_source?_source=number,hash,dividend,membersCount
+ http://localhost:9200/gtest/block/125/_source?_source=number,hash,dividend,membersCount
- All blocks using a pubkey (or whatever):
- http://localhost:9200/test_net/block/_search?q=9sbUKBMvJVxtEVhC4N9zV1GFTdaempezehAmtwA8zjKQ1
+ http://localhost:9200/gtest/block/_search?q=9sbUKBMvJVxtEVhC4N9zV1GFTdaempezehAmtwA8zjKQ1
- All blocks with a dividend, with only some selected fields (like dividend, number, hahs).
Note : Query executed in command line, using CURL:
```bash
-curl -XGET 'http://localhost:9200/test_net/block/_search' -d '{
+curl -XGET 'http://localhost:9200/gtest/block/_search' -d '{
"query": {
"filtered" : {
"filter": {
@@ -221,11 +222,11 @@ $ mvn install -DskipTests -DperformRelease
## Roadmap
- - Allow to store data in embedded database (SQLLite or HsqlDB)
+ - Maintain a updated list of peers
- - Add an embedded [Cesium](https://www.github.com/duniter/cesium) inside the ElasticSearch plugin
-
- - Detect blockchain rollback
+ - Add a new index for TX, with validation percentage
+
+ - Enable P2P synchronisation between Duniter4j ES nodes
## Troubleshooting
diff --git a/duniter4j-core-client/src/main/java/org/duniter/core/client/model/local/Peer.java b/duniter4j-core-client/src/main/java/org/duniter/core/client/model/local/Peer.java
index f9f7d044f1aa155f89481b306ecb1a0ec1c7960a..5b292b8731a4e8ef782fee97d7e2eb1bbc269d5f 100644
--- a/duniter4j-core-client/src/main/java/org/duniter/core/client/model/local/Peer.java
+++ b/duniter4j-core-client/src/main/java/org/duniter/core/client/model/local/Peer.java
@@ -23,8 +23,6 @@ package org.duniter.core.client.model.local;
*/
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
import java.io.Serializable;
public class Peer implements LocalEntity, Serializable {
@@ -33,7 +31,8 @@ public class Peer implements LocalEntity, Serializable {
private Long currencyId;
private String host;
private int port;
- private String url;
+ private boolean useSsl;
+ private String url; // computed
public Peer() {
// default constructor, need for de-serialization
@@ -42,7 +41,15 @@ public class Peer implements LocalEntity, Serializable {
public Peer(String host, int port) {
this.host = host;
this.port = port;
- this.url = initUrl(host, port);
+ this.useSsl = (port == 443);
+ this.url = computeUrl(this.host, this.port, this.useSsl);
+ }
+
+ public Peer(String host, int port, boolean useSsl) {
+ this.host = host;
+ this.port = port;
+ this.useSsl = useSsl;
+ this.url = computeUrl(this.host, this.port, this.useSsl);
}
public String getHost() {
@@ -75,24 +82,31 @@ public class Peer implements LocalEntity, Serializable {
public void setPort(int port) {
this.port = port;
- this.url = initUrl(host, port);
+ if (port == 443) {
+ this.useSsl = true;
+ }
+ this.url = computeUrl(this.host, this.port, this.useSsl);
}
public void setHost(String host) {
this.host = host;
- this.url = initUrl(host, port);
+ this.url = computeUrl(this.host, this.port, this.useSsl);
+ }
+
+ public boolean isUseSsl() {
+ return this.useSsl;
+ }
+
+ public void setUseSsl(boolean useSsl) {
+ this.useSsl = useSsl;
+ this.url = computeUrl(this.host, this.port, this.useSsl);
}
public String toString() {
-/*
- return new StringBuilder().append("url=").append(url).append(",")
- .append("host=").append(host).append(",")
- .append("port=").append(port)
- .toString();
-*/
return new StringBuilder().append(host)
.append(":")
.append(port)
+ .append(useSsl ? "[+SSL]" : "")
.toString();
}
@@ -109,7 +123,7 @@ public class Peer implements LocalEntity, Serializable {
/* -- Internal methods -- */
- protected String initUrl(String host, int port) {
- return String.format("http://%s:%s", host, port);
+ protected String computeUrl(String host, int port, boolean useSsl) {
+ return String.format("%s://%s:%s", (useSsl ? "https" : "http"), host, port);
}
}
diff --git a/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/BlockchainRemoteServiceImpl.java b/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/BlockchainRemoteServiceImpl.java
index a59aa55acb253351b7f4cf036b7721c1937c9f0e..d431342e9ac914f8a0c32ff271fac385428b52d8 100644
--- a/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/BlockchainRemoteServiceImpl.java
+++ b/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/BlockchainRemoteServiceImpl.java
@@ -800,7 +800,8 @@ public class BlockchainRemoteServiceImpl extends BaseRemoteServiceImpl implement
public WebsocketClientEndpoint getWebsocketClientEndpoint(Peer peer, String path) {
try {
- URI wsBlockURI = new URI(String.format("ws://%s:%s%s",
+ URI wsBlockURI = new URI(String.format("%s://%s:%s%s",
+ peer.isUseSsl() ? "wss" : "ws",
peer.getHost(),
peer.getPort(),
path));
diff --git a/duniter4j-core-client/src/test/resources/duniter4j-core-client-test.properties b/duniter4j-core-client/src/test/resources/duniter4j-core-client-test.properties
index da5b4a30ed1b3f340ceef9df9e2b2b6b4ac1e641..9e0174256782c42e59993c031833112967a47301 100644
--- a/duniter4j-core-client/src/test/resources/duniter4j-core-client-test.properties
+++ b/duniter4j-core-client/src/test/resources/duniter4j-core-client-test.properties
@@ -1,4 +1,4 @@
-duniter4j.node.host=gtest.duniter.fr
+duniter4j.node.host=gtest.duniter.org
duniter4j.node.port=10900
duniter4j.node.elasticsearch.host=localhost
diff --git a/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml b/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml
index 27017c6229360439171cd59c5112a5a04fda8b70..b11292099d8346807434f4f1d4a26ff04de2ebe1 100644
--- a/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml
+++ b/duniter4j-es-assembly/src/test/es-home/config/elasticsearch.yml
@@ -126,9 +126,9 @@ duniter.blockchain.sync.enable: true
#
# Duniter node to synchronize
#
-
duniter.host: g1.duniter.org
-duniter.port: 10901
+duniter.port: 443
+duniter.useSsl: true
#
# ---------------------------------- Duniter4j security -------------------------
diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/PluginSettings.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/PluginSettings.java
index 7b1cd3290c2a1c0771a85ad00688f4428215b389..50cb48e4bd5290f549d2eec62b2db6ed2d04e57f 100644
--- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/PluginSettings.java
+++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/PluginSettings.java
@@ -105,7 +105,7 @@ public class PluginSettings extends AbstractLifecycleComponent<PluginSettings> {
applicationConfig.setDefaultOption(ConfigurationOption.BASEDIR.getKey(), baseDir);
applicationConfig.setDefaultOption(ConfigurationOption.NODE_HOST.getKey(), getNodeBmaHost());
applicationConfig.setDefaultOption(ConfigurationOption.NODE_PORT.getKey(), String.valueOf(getNodeBmaPort()));
- applicationConfig.setDefaultOption(ConfigurationOption.NODE_PROTOCOL.getKey(), getNodeBmaPort() == 443 ? "https" : "http");
+ applicationConfig.setDefaultOption(ConfigurationOption.NODE_PROTOCOL.getKey(), getNodeBmaUseSsl() ? "https" : "http");
applicationConfig.setDefaultOption(ConfigurationOption.NETWORK_TIMEOUT.getKey(), String.valueOf(getNetworkTimeout()));
try {
@@ -160,11 +160,15 @@ public class PluginSettings extends AbstractLifecycleComponent<PluginSettings> {
}
public String getNodeBmaHost() {
- return settings.get("duniter.host", "cgeek.fr");
+ return settings.get("duniter.host", "g1.duniter.org");
}
public int getNodeBmaPort() {
- return settings.getAsInt("duniter.port", 9330);
+ return settings.getAsInt("duniter.port", 10901);
+ }
+
+ public boolean getNodeBmaUseSsl() {
+ return settings.getAsBoolean("duniter.useSsl", getNodeBmaPort() == 443);
}
public boolean isIndexBulkEnable() {
@@ -223,7 +227,7 @@ public class PluginSettings extends AbstractLifecycleComponent<PluginSettings> {
return null;
}
- Peer peer = new Peer(getNodeBmaHost(), getNodeBmaPort());
+ Peer peer = new Peer(getNodeBmaHost(), getNodeBmaPort(), getNodeBmaUseSsl());
return peer;
}
@@ -264,7 +268,7 @@ public class PluginSettings extends AbstractLifecycleComponent<PluginSettings> {
}
public int getWebSocketPort() {
- return settings.getAsInt("duniter.ws.port", 9200);
+ return settings.getAsInt("duniter.ws.port", 81);
}
public boolean getWebSocketEnable() {
diff --git a/duniter4j-es-core/src/test/resources/duniter4j-elasticsearch-localhost-node.properties b/duniter4j-es-core/src/test/resources/duniter4j-elasticsearch-localhost-node.properties
index 38d7a5d9655c9a5bb5babc7487d246139417a8ff..a7974bcf8a4a70cc95c3504514407d8612e1e258 100644
--- a/duniter4j-es-core/src/test/resources/duniter4j-elasticsearch-localhost-node.properties
+++ b/duniter4j-es-core/src/test/resources/duniter4j-elasticsearch-localhost-node.properties
@@ -1,8 +1,8 @@
-duniter4j.node.host=metab.ucoin.fr
-duniter4j.node.port=9201
+duniter4j.node.host=g1.duniter.fr
+duniter4j.node.port=10901
duniter4j.elasticsearch.embedded.enable=false
-duniter4j.elasticsearch.local=fals
+duniter4j.elasticsearch.local=false
duniter4j.elasticsearch.http.enable=false
duniter4j.elasticsearch.cluster.name=duniter4j-elacticsearch-test
diff --git a/duniter4j-es-core/src/test/resources/duniter4j-elasticsearch-test.properties b/duniter4j-es-core/src/test/resources/duniter4j-elasticsearch-test.properties
index 27e326f1e7a5e4a4ee67c86df9ca03e8c5b6d2df..301e47352113728eb7614b69e672b6bcfe4c92b7 100644
--- a/duniter4j-es-core/src/test/resources/duniter4j-elasticsearch-test.properties
+++ b/duniter4j-es-core/src/test/resources/duniter4j-elasticsearch-test.properties
@@ -1,5 +1,5 @@
-duniter4j.node.host=metab.ucoin.fr
-duniter4j.node.port=9201
+duniter4j.node.host=g1.duniter.org
+duniter4j.node.port=10901
duniter4j.basedir=target/es-home