Implement SIP9

lib/models/contact.js

@@ -142,9 +142,20 @@ ContactSchema.methods.recordPoints = function(points) {
   return this;
 };
 
+/**
+ * Will reset the timeout rate after 72 hours without a timeout.
+ */
+ContactSchema.methods.resetTimeoutRate = function() {
+  const now = Date.now();
+  const window = 259200000; // 72 hours
+  if (this.lastTimeout < now - window) {
+    this.timeoutRate = 0;
+  }
+};
+
 /**
  * Will update the lastTimeout and calculate the timeoutRate based
- * on a 24 hour window of activity.
+ * on a 72 hour window of activity.
  */
 ContactSchema.methods.recordTimeoutFailure = function() {
   const now = Date.now();
@@ -191,6 +202,9 @@ ContactSchema.methods.recordResponseTime = function(responseTime) {
 
   this.responseTime = newResponseTime;
 
+  // Make sure to reset timeout rate if possible
+  this.resetTimeoutRate();
+
   return this;
 };
 

test/contact.unit.js

@@ -189,6 +189,31 @@ describe('Storage/models/Contact', function() {
     });
   });
 
+  describe('#resetTimeoutRate', function() {
+    it('will reset the timeoutRate after 72 hour window', function() {
+      const past = new Date(new Date().getTime() - 259200000 - 1);
+      const contact = new Contact({
+        lastSeen: Date.now(),
+        lastTimeout: past,
+        timeoutRate: 1
+      });
+      expect(contact.timeoutRate).to.equal(1);
+      contact.resetTimeoutRate();
+      expect(contact.timeoutRate).to.equal(0);
+    });
+    it('will not reset the timeoutRate before 72 hour window', function() {
+      const past = new Date(new Date().getTime() - 259200000 + 1);
+      const contact = new Contact({
+        lastSeen: Date.now(),
+        lastTimeout: past,
+        timeoutRate: 1
+      });
+      expect(contact.timeoutRate).to.equal(1);
+      contact.resetTimeoutRate();
+      expect(contact.timeoutRate).to.equal(1);
+    });
+  });
+
   describe('#recordTimeoutFailure', function() {
     const sandbox = sinon.sandbox.create();
     afterEach(() => sandbox.restore());
@@ -355,6 +380,14 @@ describe('Storage/models/Contact', function() {
       expect(contact.responseTime).to.be.above(10000);
     });
 
+    it('will reset timeout rate', function() {
+      const contact = new Contact({});
+      contact.resetTimeoutRate = sinon.stub();
+      contact.recordResponseTime(15000);
+      expect(contact.responseTime).to.be.above(10000);
+      expect(contact.resetTimeoutRate.callCount).to.equal(1);
+    });
+
     it('will improve response times with a fast response', function() {
       const contact = new Contact({});
       contact.recordResponseTime(100);