engage-engine 1.250.90900018 → 1.251.90910019

package/include/ConfigurationObjects.h

@@ -2827,9 +2827,9 @@ namespace AppConfigurationObjects
             certificateKey.clear();
             caCertificates.clear();
             verifyPeer = false;
-            transactionTimeoutMs = 5000;
+            transactionTimeoutMs = 0;
             disableMessageSigning = false;
-            connectionTimeoutSecs = 5;
+            connectionTimeoutSecs = 0;
             tcpTxOptions.clear();
         }
 
@@ -2923,9 +2923,9 @@ namespace AppConfigurationObjects
         getOptional<bool>("verifyPeer", p.verifyPeer, j, true);
         getOptional<bool>("allowSelfSignedCertificate", p.allowSelfSignedCertificate, j, false);
         getOptional<std::vector<std::string>>("caCertificates", p.caCertificates, j);
-        getOptional<int>("transactionTimeoutMs", p.transactionTimeoutMs, j, 5000);
+        getOptional<int>("transactionTimeoutMs", p.transactionTimeoutMs, j, 0);
         getOptional<bool>("disableMessageSigning", p.disableMessageSigning, j, false);
-        getOptional<int>("connectionTimeoutSecs", p.connectionTimeoutSecs, j, 5);
+        getOptional<int>("connectionTimeoutSecs", p.connectionTimeoutSecs, j, 0);
         getOptional<TcpNetworkTxOptions>("tcpTxOptions", p.tcpTxOptions, j);
     }
 
@@ -2973,6 +2973,9 @@ namespace AppConfigurationObjects
         /** @brief [Optional, Default: 0] Default connection timeout in seconds to any RP in the cluster */
         int                                 connectionTimeoutSecs;
 
+        /** @brief [Optional, Default: 0] Default transaction time in milliseconds to any RP in the cluster */
+        int                                 transactionTimeoutMs;
+
         RallypointCluster()
         {
             clear();
@@ -2983,7 +2986,8 @@ namespace AppConfigurationObjects
             connectionStrategy = csRoundRobin;
             rallypoints.clear();
             rolloverSecs = 10;
-            connectionTimeoutSecs = 5;
+            connectionTimeoutSecs = 0;
+            transactionTimeoutMs = 0;
         }
     };
 
@@ -2993,7 +2997,8 @@ namespace AppConfigurationObjects
             TOJSON_IMPL(connectionStrategy),
             TOJSON_IMPL(rallypoints),
             TOJSON_IMPL(rolloverSecs),
-            TOJSON_IMPL(connectionTimeoutSecs)
+            TOJSON_IMPL(connectionTimeoutSecs),
+            TOJSON_IMPL(transactionTimeoutMs)            
         };
     }
     static void from_json(const nlohmann::json& j, RallypointCluster& p)
@@ -3002,7 +3007,8 @@ namespace AppConfigurationObjects
         getOptional<RallypointCluster::ConnectionStrategy_t>("connectionStrategy", p.connectionStrategy, RallypointCluster::ConnectionStrategy_t::csRoundRobin);
         getOptional<std::vector<Rallypoint>>("rallypoints", p.rallypoints, j);
         getOptional<int>("rolloverSecs", p.rolloverSecs, j, 10);
-        getOptional<int>("connectionTimeoutSecs", p.connectionTimeoutSecs, j, 5);
+        getOptional<int>("connectionTimeoutSecs", p.connectionTimeoutSecs, j, 0);
+        getOptional<int>("transactionTimeoutMs", p.connectionTimeoutSecs, j, 0);        
     }
 
 
@@ -6896,6 +6902,9 @@ namespace AppConfigurationObjects
         /** @brief [Optional, Default: 5] Connection timeout in seconds to RP */
         int                                     rpConnectionTimeoutSecs;
 
+        /** @brief [Optional, Default: 5] Transaction timeout with RP */
+        int                                     rpTransactionTimeoutMs;        
+
         /** @brief [Optional, Default: 10] The number of seconds after which "sticky" transmission IDs expire. */
         int                                     stickyTidHangSecs;
 
@@ -6921,7 +6930,8 @@ namespace AppConfigurationObjects
             rpClusterStrategy = RallypointCluster::ConnectionStrategy_t::csRoundRobin;
             rpClusterRolloverSecs = 10;
             rtpExpirationCheckIntervalMs = 250;
-            rpConnectionTimeoutSecs = 5;
+            rpConnectionTimeoutSecs = 0;
+            rpTransactionTimeoutMs = 0;
             stickyTidHangSecs = 10;
             uriStreamingIntervalMs = 60;
             delayedMicrophoneClosureSecs = 15;
@@ -6942,6 +6952,7 @@ namespace AppConfigurationObjects
             TOJSON_IMPL(rpClusterRolloverSecs),
             TOJSON_IMPL(rtpExpirationCheckIntervalMs),
             TOJSON_IMPL(rpConnectionTimeoutSecs),
+            TOJSON_IMPL(rpTransactionTimeoutMs),            
             TOJSON_IMPL(stickyTidHangSecs),
             TOJSON_IMPL(uriStreamingIntervalMs),
             TOJSON_IMPL(delayedMicrophoneClosureSecs),
@@ -6960,7 +6971,8 @@ namespace AppConfigurationObjects
         getOptional<RallypointCluster::ConnectionStrategy_t>("rpClusterStrategy", p.rpClusterStrategy, j, RallypointCluster::ConnectionStrategy_t::csRoundRobin);
         getOptional<int>("rpClusterRolloverSecs", p.rpClusterRolloverSecs, j, 10);
         getOptional<int>("rtpExpirationCheckIntervalMs", p.rtpExpirationCheckIntervalMs, j, 250);
-        getOptional<int>("rpConnectionTimeoutSecs", p.rpConnectionTimeoutSecs, j, 5);
+        getOptional<int>("rpConnectionTimeoutSecs", p.rpConnectionTimeoutSecs, j, 0);
+        getOptional<int>("rpTransactionTimeoutMs", p.rpTransactionTimeoutMs, j, 0);
         getOptional<int>("stickyTidHangSecs", p.stickyTidHangSecs, j, 10);
         getOptional<int>("uriStreamingIntervalMs", p.uriStreamingIntervalMs, j, 60);
         getOptional<int>("delayedMicrophoneClosureSecs", p.delayedMicrophoneClosureSecs, j, 15);      
@@ -7611,6 +7623,18 @@ namespace AppConfigurationObjects
         IMPLEMENT_JSON_DOCUMENTATION(RallypointPeer)
 
     public:
+        typedef enum
+        {
+            /** @brief Use the RP's configuration */
+            olpUseRpConfiguration      = 0,
+
+            /** @brief Mark as a domain leaf */
+            olpIsMeshLeaf   = 1,
+
+            /** @brief Do not mark as a domain leaf */
+            olpNotMeshLeaf   = 2
+        } OutboundLeafPolicy_t;
+
         /** @brief Internal ID. */
         std::string             id;
 
@@ -7629,6 +7653,8 @@ namespace AppConfigurationObjects
         /** @brief Internal enablement setting. */
         bool                    forceIsMeshLeaf;
 
+        OutboundLeafPolicy_t    outboundLeafPolicy;
+
         RallypointPeer()
         {
             clear();
@@ -7642,6 +7668,7 @@ namespace AppConfigurationObjects
             certificate.clear();
             connectionTimeoutSecs = 0;
             forceIsMeshLeaf = false;
+            outboundLeafPolicy = OutboundLeafPolicy_t::olpUseRpConfiguration;
         }
     };
 
@@ -7653,7 +7680,8 @@ namespace AppConfigurationObjects
             TOJSON_IMPL(host),
             TOJSON_IMPL(certificate),
             TOJSON_IMPL(connectionTimeoutSecs),
-            TOJSON_IMPL(forceIsMeshLeaf)
+            TOJSON_IMPL(forceIsMeshLeaf),
+            TOJSON_IMPL(outboundLeafPolicy)
         };
     }
     static void from_json(const nlohmann::json& j, RallypointPeer& p)
@@ -7665,6 +7693,7 @@ namespace AppConfigurationObjects
         getOptional<SecurityCertificate>("certificate", p.certificate, j);
         getOptional<int>("connectionTimeoutSecs", p.connectionTimeoutSecs, j, 0);
         getOptional<bool>("forceIsMeshLeaf", p.forceIsMeshLeaf, j, false);
+        getOptional<RallypointPeer::OutboundLeafPolicy_t>("outboundLeafPolicy", p.outboundLeafPolicy, j, RallypointPeer::OutboundLeafPolicy_t::olpUseRpConfiguration);
     }
 
     //-----------------------------------------------------------
@@ -8077,10 +8106,10 @@ namespace AppConfigurationObjects
 
     public:
 
-        /** @brief An identifier useful for organizations that track different mesh configurations by ID */
+        /** @brief An identifier useful for organizations that track different domain configurations by ID */
         std::string                     id;
 
-        /** @brief TODO: A version number for the mesh configuration.  Change this whenever you update your configuration */
+        /** @brief TODO: A version number for the domain configuration.  Change this whenever you update your configuration */
         int                             version;
 
         /** @brief Comments */
@@ -8746,7 +8775,7 @@ namespace AppConfigurationObjects
         /** @brief Internal - not serialized. */
         PeeringConfiguration                        peeringConfiguration;       // NOTE: This is NOT serialized
 
-        /** @brief Indicates whether this Rallypoint is part of a core mesh or hangs off the periphery as a leaf node. */
+        /** @brief Indicates whether this Rallypoint is part of a core domain or hangs off the periphery as a leaf node. */
         bool                                        isMeshLeaf;
 
         /** @brief Set to true to forgo DSA signing of messages.  Doing so is is a security risk but can be useful on CPU-constrained systems on already-secure environments. */
@@ -8800,7 +8829,7 @@ namespace AppConfigurationObjects
         /** @brief [Optional, Default 0] Sets the queue's normal task bias */
         uint32_t                                    normalTaskQueueBias;
 
-        /** @brief If enabled, causes a mesh leaf to reverse-subscribe to a core node upon the core subscribing and a reflector having been setup */
+        /** @brief If enabled, causes a domain leaf to reverse-subscribe to a core node upon the core subscribing and a reflector having been setup */
         bool                                        enableLeafReflectionReverseSubscription;
 
         /** @brief If true, turns off loop detection. */
@@ -8836,11 +8865,17 @@ namespace AppConfigurationObjects
         /** @brief Details for capture of transmitted packets  */
         PacketCapturer                          txCapture;
 
-        /** @brief [Optional] This Rallypoint's mesh name */
-        std::string                             meshName;
+        /** @brief [Optional] This Rallypoint's domain name */
+        std::string                             domainName;
+
+        /** @brief [Optional] List of domains that explicitly MAY connect to this RP */
+        std::vector<std::string>                allowedDomains;
+
+        /** @brief [Optional] List of domains that explictly MAY NOT connect to this RP */
+        std::vector<std::string>                blockedDomains;
 
-        /** @brief [Optional] List of additional meshes that can be reached via this RP */
-        std::vector<std::string>                extraMeshes;
+        /** @brief [Optional] List of additional domains that can be reached via this RP */
+        std::vector<std::string>                extraDomains;
 
         /** @brief [Optional] Low-level tuning */
         TuningSettings                          tuning; 
@@ -8902,11 +8937,13 @@ namespace AppConfigurationObjects
             advertising.clear();
             extendedGroupRestrictions.clear();
             groupRestrictionAccessPolicyType = GroupRestrictionAccessPolicyType_t::graptPermissive;
-            ipFamily = IpFamilyType_t::ifIpUnspec;
+            ipFamily = IpFamilyType_t::ifIp4;
             rxCapture.clear();
             txCapture.clear();
-            meshName.clear();
-            extraMeshes.clear();
+            domainName.clear();
+            allowedDomains.clear();
+            blockedDomains.clear();
+            extraDomains.clear();
             tuning.clear();
         }
     };
@@ -8967,8 +9004,10 @@ namespace AppConfigurationObjects
             TOJSON_IMPL(ipFamily),
             TOJSON_IMPL(rxCapture),
             TOJSON_IMPL(txCapture),
-            TOJSON_IMPL(meshName),
-            TOJSON_IMPL(extraMeshes),
+            TOJSON_IMPL(domainName),
+            TOJSON_IMPL(allowedDomains),
+            TOJSON_IMPL(blockedDomains),
+            TOJSON_IMPL(extraDomains),
             TOJSON_IMPL(tuning)
         };
     }
@@ -9025,11 +9064,13 @@ namespace AppConfigurationObjects
         getOptional<RallypointAdvertisingSettings>("advertising", p.advertising, j);
         getOptional<std::vector<RallypointExtendedGroupRestriction>>("extendedGroupRestrictions", p.extendedGroupRestrictions, j);        
         getOptional<GroupRestrictionAccessPolicyType_t>("groupRestrictionAccessPolicyType", p.groupRestrictionAccessPolicyType, j, GroupRestrictionAccessPolicyType_t::graptPermissive);
-        getOptional<IpFamilyType_t>("ipFamily", p.ipFamily, j, IpFamilyType_t::ifIpUnspec);
+        getOptional<IpFamilyType_t>("ipFamily", p.ipFamily, j, IpFamilyType_t::ifIp4);
         getOptional<PacketCapturer>("rxCapture", p.rxCapture, j);
         getOptional<PacketCapturer>("txCapture", p.txCapture, j);
-        getOptional<std::string>("meshName", p.meshName, j);
-        getOptional<std::vector<std::string>>("extraMeshes", p.extraMeshes, j);
+        getOptional<std::string>("domainName", p.domainName, j);
+        getOptional<std::vector<std::string>>("allowedDomains", p.allowedDomains, j);
+        getOptional<std::vector<std::string>>("blockedDomains", p.blockedDomains, j);
+        getOptional<std::vector<std::string>>("extraDomains", p.extraDomains, j);
         getOptional<TuningSettings>("tuning", p.tuning, j);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "engage-engine",
-  "version": "1.250.90900018",
+  "version": "1.251.90910019",
   "description": "Use Engage to communicate with everyone, everywhere, from any device",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"