Merge pull request #152 from OpenElements/configure-request-timeout

requestTimeout for connect can be configured

Author: hendrikebbers

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/config/HieroConfig.java

@@ -4,6 +4,7 @@
 import com.hedera.hashgraph.sdk.Client;
 import com.openelements.hiero.base.HieroContext;
 import com.openelements.hiero.base.data.Account;
+import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -64,6 +65,10 @@ public interface HieroConfig {
     @NonNull
     Optional<String> relayUrl();
 
+    default Optional<Duration> getRequestTimeout() {
+        return Optional.empty();
+    }
+
     /**
      * Creates a Hiero context. Calling this method multiple times will return a new instance each time.
      *
@@ -100,6 +105,7 @@ default Client createClient() {
             final List<String> mirrorNodeAddresses = getMirrorNodeAddresses().stream().collect(Collectors.toList());
             client.setMirrorNetwork(mirrorNodeAddresses);
             client.setOperator(getOperatorAccount().accountId(), getOperatorAccount().privateKey());
+            getRequestTimeout().ifPresent(client::setRequestTimeout);
             return client;
         } catch (final Exception e) {
             throw new IllegalArgumentException("Can not create client for custom network", e);

hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/config/HieroTestContext.java

@@ -49,7 +49,7 @@ public HieroTestContext() {
         final PrivateKey privateKey = PrivateKey.fromString(hieroPrivateKeyByEnv);
         final PublicKey publicKey = privateKey.getPublicKey();
         operationalAccount = new Account(accountId, publicKey, privateKey);
-
+        
         final NetworkSettings networkSettings = NetworkSettings.forIdentifier(hieroNetwork)
                 .orElseThrow(() -> new IllegalStateException("ENV 'HEDERA_NETWORK' is set to '" + hieroNetwork
                         + "' but no network settings are available for this network."));

hiero-enterprise-microprofile/src/main/java/com/openelements/hiero/microprofile/HieroNetworkConfiguration.java

@@ -14,6 +14,7 @@
 @Dependent
 public class HieroNetworkConfiguration {
 
+    @ConfigProperty(name = "name")
     private Optional<String> name;
 
     @Inject
@@ -23,6 +24,12 @@ public class HieroNetworkConfiguration {
     @ConfigProperty(name = "mirrornode")
     private Optional<String> mirrornode;
 
+    private Optional<Long> requestTimeoutInMs;
+
+    public Optional<Long> getRequestTimeoutInMs() {
+        return requestTimeoutInMs;
+    }
+
     public Optional<String> getName() {
         return name;
     }

hiero-enterprise-microprofile/src/main/java/com/openelements/hiero/microprofile/HieroOperatorConfiguration.java

@@ -10,7 +10,7 @@ public class HieroOperatorConfiguration {
     private String accountId;
 
     private String privateKey;
-
+    
     public String getAccountId() {
         return accountId;
     }

hiero-enterprise-microprofile/src/main/java/com/openelements/hiero/microprofile/implementation/HieroConfigImpl.java

@@ -8,6 +8,7 @@
 import com.openelements.hiero.base.data.Account;
 import com.openelements.hiero.microprofile.HieroNetworkConfiguration;
 import com.openelements.hiero.microprofile.HieroOperatorConfiguration;
+import java.time.Duration;
 import java.util.Collections;
 import java.util.Objects;
 import java.util.Optional;
@@ -32,6 +33,8 @@ public class HieroConfigImpl implements HieroConfig {
 
     private final String relayUrl;
 
+    private final Long requestTimeoutInMs;
+
     public HieroConfigImpl(@NonNull final HieroOperatorConfiguration configuration,
             @NonNull final HieroNetworkConfiguration networkConfiguration) {
         Objects.requireNonNull(configuration, "configuration must not be null");
@@ -40,7 +43,7 @@ public HieroConfigImpl(@NonNull final HieroOperatorConfiguration configuration,
         final AccountId operatorAccountId = AccountId.fromString(configuration.getAccountId());
         final PrivateKey operatorPrivateKey = PrivateKey.fromString(configuration.getPrivateKey());
         operatorAccount = Account.of(operatorAccountId, operatorPrivateKey);
-
+        requestTimeoutInMs = networkConfiguration.getRequestTimeoutInMs().orElse(null);
         final Optional<NetworkSettings> networkSettings = networkConfiguration.getName()
                 .map(name -> NetworkSettings.forIdentifier(name))
                 .map(settings -> settings.orElse(null));
@@ -60,6 +63,11 @@ public HieroConfigImpl(@NonNull final HieroOperatorConfiguration configuration,
         }
     }
 
+    @Override
+    public Optional<Duration> getRequestTimeout() {
+        return Optional.ofNullable(requestTimeoutInMs).map(Duration::ofMillis);
+    }
+
     @Override
     public @NonNull Account getOperatorAccount() {
         return operatorAccount;

hiero-enterprise-microprofile/src/test/java/com/openelements/hiero/microprofile/test/TestConfigSource.java

@@ -42,6 +42,12 @@ public TestConfigSource() {
             properties.put("hiero.network.name", dotenv.get("hiero.network.name"));
         }
 
+        dotenv.entries().stream()
+                .filter(e -> !e.getKey().equals("hiero.accountId"))
+                .filter(e -> !e.getKey().equals("hiero.privateKey"))
+                .filter(e -> !e.getKey().equals("hiero.network.name"))
+                .forEach(e -> properties.put(e.getKey(), e.getValue()));
+
         properties.forEach((k, v) -> log.info("CONFIG: '" + k + "'->'" + v + "'"));
     }
 

hiero-enterprise-spring/src/main/java/com/openelements/hiero/spring/implementation/HieroConfigImpl.java

@@ -6,6 +6,7 @@
 import com.openelements.hiero.base.config.HieroConfig;
 import com.openelements.hiero.base.config.NetworkSettings;
 import com.openelements.hiero.base.data.Account;
+import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -28,6 +29,8 @@ public class HieroConfigImpl implements HieroConfig {
 
     private final String relayUrl;
 
+    private final Duration requestTimeout;
+
     public HieroConfigImpl(@NonNull final HieroProperties properties) {
         Objects.requireNonNull(properties, "properties must not be null");
 
@@ -38,6 +41,8 @@ public HieroConfigImpl(@NonNull final HieroProperties properties) {
         final PrivateKey operatorPrivateKey = parsePrivateKey(properties.getPrivateKey());
 
         operatorAccount = Account.of(operatorAccountId, operatorPrivateKey);
+        requestTimeout = Optional.ofNullable(properties.getNetwork().getRequestTimeoutInMs())
+                .map(timeout -> Duration.ofMillis(timeout)).orElse(null);
 
         final Optional<NetworkSettings> networkSettings = NetworkSettings.forIdentifier(
                 properties.getNetwork().getName());
@@ -115,4 +120,9 @@ public Set<ConsensusNode> getConsensusNodes() {
     public @NonNull Optional<String> relayUrl() {
         return Optional.ofNullable(relayUrl);
     }
+
+    @Override
+    public Optional<Duration> getRequestTimeout() {
+        return Optional.ofNullable(requestTimeout);
+    }
 }

hiero-enterprise-spring/src/main/java/com/openelements/hiero/spring/implementation/HieroNetworkProperties.java

@@ -25,6 +25,8 @@ public class HieroNetworkProperties {
      */
     private String mirrorNode;
 
+    private Long requestTimeoutInMs;
+
     public String getName() {
         return name;
     }
@@ -48,4 +50,12 @@ public List<HieroNode> getNodes() {
     public void setNodes(List<HieroNode> nodes) {
         this.nodes = nodes;
     }
+
+    public Long getRequestTimeoutInMs() {
+        return requestTimeoutInMs;
+    }
+
+    public void setRequestTimeoutInMs(Long requestTimeoutInMs) {
+        this.requestTimeoutInMs = requestTimeoutInMs;
+    }
 }