refactor(Session): add _handleDisposition, pass decision to links

noodlefrenzy · Jun 26, 2015 · 7fd6ab3 · 7fd6ab3
1 parent 21fd06f
commit 7fd6ab3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 31 deletions.
diff --git a/lib/receiver_link.js b/lib/receiver_link.js
@@ -122,4 +122,8 @@ ReceiverLink.prototype._messageReceived = function(transferFrame) {
   this._checkCredit();
 };
 
+ReceiverLink.prototype._dispositionReceived = function(details) {
+  debug('not yet processing "receiver" disposition frames');
+};
+
 module.exports = ReceiverLink;
diff --git a/lib/session.js b/lib/session.js
@@ -1,6 +1,7 @@
 'use strict';
 
-var EventEmitter = require('events').EventEmitter,
+var _ = require('lodash'),
+    EventEmitter = require('events').EventEmitter,
     util = require('util'),
 
     StateMachine = require('stately.js'),
@@ -330,36 +331,7 @@ Session.prototype._processFrame = function(frame) {
       console.warn('received Transfer frame for unknown link(' + frame.handle + '): ' + JSON.stringify(frame));
     }
   } else if (frame instanceof DispositionFrame) {
-    //DispositionFrame: {"frameType":0,"channel":0,"role":true,"first":10000,"last":null,
-    // "settled":true,"state":{"descriptor":{"buffer":[0,0,0,0,0,0,0,36],"offset":0}},"batchable":null}
-    if (frame.role !== constants.linkRole.receiver) {
-      debug('not yet processing "sender" Disposition frames');
-    } else {
-      var first = frame.first;
-      var last = frame.last || first;
-      var settled = frame.settled;
-
-      if (settled) {
-        for (var messageId = first; messageId <= last; ++messageId) {
-          if (this._transfersInFlight[messageId]) {
-            var delta = Date.now() - this._transfersInFlight[messageId].sent;
-            delete this._transfersInFlight[messageId];
-            debug('message ' + messageId + ' settled in ' + delta + ' ms');
-          } else {
-            debug('invalid messageId: ' + messageId);
-          }
-        }
-      } else {
-        debug('not settled, first: ' + first + ', last: ' + last);
-      }
-
-      this.emit(Session.DispositionReceived, {
-        first: first,
-        last: last,
-        settled: settled,
-        state: frame.state
-      });
-    }
+    this._handleDisposition(frame);
   } else {
     debug('not yet processing frames of type: ' + frame.constructor.name);
   }
@@ -433,4 +405,19 @@ Session.prototype._unmap = function() {
   }
 };
 
+Session.prototype._handleDisposition = function(frame) {
+  var disposition = {
+    first: frame.first,
+    last: frame.last || frame.first,
+    settled: frame.settled,
+    state: frame.state
+  };
+
+  _.values(this._linksByName).forEach(function(link) {
+    link._dispositionReceived(disposition);
+  });
+
+  this.emit(Session.DispositionReceived, disposition);
+};
+
 module.exports = Session;