Merge branch 'hoytech:master' into master

CHANGES

@@ -1,3 +1,13 @@
+1.0.4
+  * New config: maxReqFilterSize. This allows REQs with many more filters (jb55)
+  * Default maxReqFilterSize was increased to 200
+  * Update nix build file (jb55)
+  * Reduces log spam by not dumping full invalid events (Kroese)
+  * In sync and stream commands, provide the connected URL to write policy
+    plugins (Kroese)
+  * Bugfix in router: The configured connection timeout was not applied on
+    the first connection, forcing a retry.
+
 1.0.3
   * Use negentropy error message format specified in NIP-77
 

src/WriterPipeline.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include<string.h>
 #include <hoytech/protected_queue.h>
 
 #include "golpe.h"

src/apps/mesh/cmd_router.cpp

@@ -297,6 +297,21 @@ struct Router {
         try {
             auto routerConfig = loadRawTaoConfig(routerConfigFile);
 
+            // connectionTimeout
+
+            uint64_t newTimeoutUs = defaultConnectionTimeoutUs;
+            if (routerConfig.get_object().contains("connectionTimeout")) {
+                newTimeoutUs = routerConfig.at("connectionTimeout").get_unsigned() * 1'000'000;
+            }
+
+            if (connectionTimeoutUs != newTimeoutUs) {
+                connectionTimeoutUs = newTimeoutUs;
+                LI << "Using connection timeout: " << (connectionTimeoutUs / 1'000'000) << " seconds";
+                // FIXME: this won't actually update the cron.repeat() frequency, so no hot reconfigs
+            }
+
+            // load streamGroups
+
             for (const auto &[groupName, spec] : routerConfig.at("streams").get_object()) {
                 if (!streamGroups.contains(groupName)) {
                     LI << "New stream group [" << groupName << "]";
@@ -314,18 +329,6 @@ struct Router {
                 for (const auto &[groupName, spec] : routerConfig.at("streams").get_object()) unneededGroups.erase(groupName);
                 for (const auto &groupName : unneededGroups) streamGroups.erase(groupName);
             }
-
-            // connectionTimeout
-
-            uint64_t newTimeoutUs = defaultConnectionTimeoutUs;
-            if (routerConfig.get_object().contains("connectionTimeout")) {
-                newTimeoutUs = routerConfig.at("connectionTimeout").get_unsigned() * 1'000'000;
-            }
-
-            if (connectionTimeoutUs != newTimeoutUs) {
-                connectionTimeoutUs = newTimeoutUs;
-                LI << "Using connection timeout: " << (connectionTimeoutUs / 1'000'000) << " seconds";
-            }
         } catch (std::exception &e) {
             LE << "Failed to parse router config: " << e.what();
             if (!firstConfigLoadSuccess) ::exit(1);

src/apps/relay/golpe.yaml

@@ -40,8 +40,7 @@ config:
     noReload: true
   - name: relay__maxReqFilterSize
     desc: "Maximum number of filters allowed in a REQ"
-    default: 20
-    noReload: true
+    default: 200
   - name: relay__autoPingSeconds
     desc: "Websocket-level PING message frequency (should be less than any reverse proxy idle timeouts)"
     default: 55

strfry.conf

@@ -76,7 +76,7 @@ relay {
     maxWebsocketPayloadSize = 131072
 
     # Maximum number of filters allowed in a REQ
-    maxReqFilterSize = 20
+    maxReqFilterSize = 200
 
     # Websocket-level PING message frequency (should be less than any reverse proxy idle timeouts) (restart required)
     autoPingSeconds = 55