fixed caching error in StateGossipAgent (a state was cached while a sync agent was not active, and was not being passed when it became active)

Author: sbazerque

src/data/model/immutable/HashedObject.ts

@@ -74,7 +74,8 @@ abstract class HashedObject {
 
     setId(id: string) {
         this.id = id;
-
+        this._lastHash = undefined;
+        
         for (const fieldName of this._derivedFields) {
             const obj = (this as any)[fieldName];
             obj?.setId(this.getDerivedFieldId(fieldName));

src/mesh/agents/peer/PeerGroupAgent.ts

@@ -196,15 +196,15 @@ class PeerGroupAgent implements Agent {
             peerConnectionTimeout: params.peerConnectionTimeout || 20,
             peerConnectionAttemptInterval: params.peerConnectionAttemptInterval || 10,
             peerDiscoveryAttemptInterval: params.peerDiscoveryAttemptInterval || 15,
-            tickInterval: params.tickInterval || 10
+            tickInterval: params.tickInterval || 30
         };
 
         this.tick = async () => {
 
             if (this.tickLock.acquire()) {
                 try {
 
-                    console.log(this.peerGroupId + ' has ' + this.getPeers().length + ' peers')
+                    //console.log(this.peerGroupId + ' has ' + this.getPeers().length + ' peers')
 
                     this.cleanUp();
                     this.queryForOnlinePeers();
@@ -333,15 +333,15 @@ class PeerGroupAgent implements Agent {
                     peerMsg
                 );
 
-                this.controlLog.trace(this.peerGroupId + '/' + this.localPeer.endpoint + ': sending peer message to ' + ep);
+                this.controlLog.trace(this.peerGroupId + '/' + this.localPeer.endpoint + ': sending peer message to ' + ep + ' for agent ' + agentId + ' over connection ' + connId);
                 return true;    
             } catch (e) {
 
-                this.controlLog.warning(this.peerGroupId + '/' + this.localPeer.endpoint + ': Could not send message', e);
+                this.controlLog.warning(this.peerGroupId + '/' + this.localPeer.endpoint + ' (for agent ' + agentId + '): Could not send message to ' + ep + ': error', e);
                 return false;
             }
         } else {
-            this.controlLog.trace(this.peerGroupId + '/' + this.localPeer.endpoint + ': could not send peer message to ' + ep);
+            this.controlLog.trace(this.peerGroupId + '/' + this.localPeer.endpoint  + ' (for agent ' + agentId + '): could not send peer message to ' + ep);
             return false;
         }
     }

src/mesh/agents/state/HeaderBasedSyncAgent.ts

@@ -109,7 +109,8 @@ class HeaderBasedSyncAgent extends PeeringAgentBase implements StateSyncAgent {
 
         this.emitSyncState();
 
-        this.controlLog.debug('Started agent for ' + this.mutableObjHash);
+        this.controlLog.debug('Started sync agent for ' + this.mutableObjHash);
+
     }
 
     shutdown(): void {
@@ -134,7 +135,9 @@ class HeaderBasedSyncAgent extends PeeringAgentBase implements StateSyncAgent {
 
     async receiveRemoteState(sender: string, stateHash: string, state: HashedObject): Promise<boolean> {
 
-        if (this.terminated) return false;
+        if (this.terminated) {
+            return false;
+        }
 
         let isNew = false;
 

src/mesh/agents/state/StateGossipAgent.ts

@@ -529,22 +529,19 @@ class StateGossipAgent extends PeeringAgentBase {
 
         if (stateHash !== this.getRemoteState(sender, agentId)) {
             if (await stateObj.validate(new Map())) {
-            
-
-                this.setRemoteState(sender, agentId, stateHash, stateObj);
-                this.cachePreviousState(agentId, stateHash, stateObj);
 
                 let receivedOldState = false;
 
                 try {
                     receivedOldState = ! (await this.notifyAgentOfStateArrival(sender, agentId, stateHash, stateObj));
+                    this.setRemoteState(sender, agentId, stateHash, stateObj);
+                    this.cachePreviousState(agentId, stateHash, stateObj);
+                    StateGossipAgent.controlLog.trace('Received state for ' + agentId + ': (' + stateHash + '-' + (receivedOldState? 'old' : 'new') + ')');
                 } catch (e) {
                     // maybe cache erroneous states so we don't process them over and over?
                     StateGossipAgent.controlLog.warning('Received erroneous state from ' + sender + ' for ' + agentId, e);
                 }
 
-                StateGossipAgent.controlLog.trace('Received state for ' + agentId + ': (' + stateHash + '-' + (receivedOldState? 'old' : 'new') + ')');
-    
                 if (receivedOldState && this.localState.get(agentId) !== stateHash && this.localStateObjects.get(agentId) !== undefined) {
                     this.peerMessageLog.trace('Received old state for ' + agentId + ' from ' + sender + ', sending our own state over there.');
                     this.sendStateObject(sender, agentId);
@@ -643,7 +640,7 @@ class StateGossipAgent extends PeeringAgentBase {
 
                     this.sentStateCache.set(lastSentKey, {timestamp: newTimestamp, stateHash: stateLiteral.hash, repeats: newRepeats});
                 } else {
-                    this.controlLog.debug('Sending state failed!');
+                    this.controlLog.debug('Sending state failed for ' + agentId + '!');
                 }
             } else {
                 this.controlLog.warning('not gossiping: repeats = ' + lastSent?.repeats + ' for agent ' + agentId);

src/mesh/agents/state/history/HistorySynchronizer.ts

@@ -129,7 +129,7 @@ class HistorySynchronizer {
 
         this.lastCancelledRequests = [];
 
-        this.logPrefix = 'On peer ' + this.syncAgent.peerGroupAgent.localPeer.identity?.hash() as Hash + ':';
+        this.logPrefix = 'On peer ' + this.syncAgent.peerGroupAgent.localPeer.identity?.hash() as Hash + ' for mut ' + this.syncAgent.mutableObj.getLastHash() + ':';
 
         this.controlLog  = HistorySynchronizer.controlLog;
         this.sourcesLog  = HistorySynchronizer.sourcesLog;

src/net/transport/remoting/WebRTCConnectionsHost.ts

@@ -147,8 +147,6 @@ class WebRTCConnectionsHost {
                 remoteInstanceId: conn.remoteInstanceId 
             };
 
-            console.log('SENDING CONN STATUS CHANGE:', ev);
-
             this.eventCallback(ev);
         };