fix(types): temporary paths for incorporating new types as known

noodlefrenzy · Feb 16, 2016 · 0b4a412 · 0b4a412
1 parent 9a87d09
commit 0b4a412
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 22 deletions.
diff --git a/lib/connection.js b/lib/connection.js
@@ -19,9 +19,7 @@ var EventEmitter = require('events').EventEmitter,
     CloseFrame = require('./frames/close_frame'),
     HeartbeatFrame = require('./frames/heartbeat_frame'),
     OpenFrame = require('./frames/open_frame'),
-    TransportProvider = require('./transport'),
-
-    OpenFrameV2 = require('./frames').Open;
+    TransportProvider = require('./transport');
 
 
 
@@ -407,18 +405,20 @@ Connection.prototype._tryReceiveHeader = function(header) {
 };
 
 Connection.prototype._tryReceiveFrame = function() {
-  try {
-    var frame = FrameReader.read(this._buffer);
-    if (frame === undefined) {
-    //debug('Not enough frame');
-    } else {
-      //debug('Matched frame: ' + frame.constructor.name + ': ' + JSON.stringify(frame));
-      //debug(this._buffer.length + ' bytes left');
-    }
-    return frame;
-  } catch (e) {
-    console.warn(e.message);
+  var frame = FrameReader.read(this._buffer);
+  if (frame === undefined) {
+  //debug('Not enough frame');
+  } else {
+    //debug('Matched frame: ' + frame.constructor.name + ': ' + JSON.stringify(frame));
+    //debug(this._buffer.length + ' bytes left');
   }
+  return frame;
+
+  // try {
+  //   var frame = FrameReader.read(this._buffer);
+  // } catch (e) {
+  //   console.warn(e.message);
+  // }
 };
 
 Connection.prototype._receiveAny = function() {
@@ -439,6 +439,7 @@ Connection.prototype._receiveAny = function() {
         more = this._tryReceiveHeader();
         continue;
       }
+
       frame = this._tryReceiveFrame();
       if (frame) {
         if (frame instanceof OpenFrame) {
@@ -459,7 +460,7 @@ Connection.prototype._ensureLocaleCompatibility = function(lhsLocales, rhsLocale
 };
 
 Connection.prototype._sendOpenFrame = function() {
-  this.sendFrame(new OpenFrameV2(this._params));
+  this.sendFrame(new OpenFrame(this._params));
 };
 
 Connection.prototype._processOpenFrame = function(frame) {

diff --git a/lib/frames.js b/lib/frames.js
@@ -101,7 +101,10 @@ frames.readFrame = function(buffer) {
   }
 
   var frame =  new framesByDescriptor[described.descriptor](described);
-  frame.channel = channel;
+  if (frameType === FrameType.AMQP) {
+    frame.channel = channel;
+  }
+
   return frame;
 };
 

diff --git a/lib/session.js b/lib/session.js
@@ -22,9 +22,7 @@ var EventEmitter = require('events').EventEmitter,
     Link = require('./link'),
     SenderLink = require('./sender_link'),
     ReceiverLink = require('./receiver_link'),
-    Connection = require('./connection'),
-
-    BeginFrameV2 = require('./frames').Begin;
+    Connection = require('./connection');
 
 
 

diff --git a/lib/types/known_type_converter.js b/lib/types/known_type_converter.js
@@ -18,9 +18,17 @@ function convertType(describedType) {
   var descriptorStr = describedType.descriptor.toString();
   var _len = knownTypes.length;
   for (var _i = 0; _i < _len; ++_i) {
-    if (knownTypes[_i].prototype.Descriptor.name.toString() === descriptorStr ||
-        knownTypes[_i].prototype.Descriptor.code.toString() === descriptorStr) {
-      return knownTypes[_i].fromDescribedType(describedType);
+    var Type = knownTypes[_i];
+    if (Type.prototype.Descriptor) {
+      if (Type.prototype.Descriptor.name.toString() === descriptorStr ||
+          Type.prototype.Descriptor.code.toString() === descriptorStr) {
+        return Type.fromDescribedType(describedType);
+      }
+    } else if (Type.prototype.descriptor) {
+      if (Type.prototype.descriptor.name === descriptorStr ||
+          Type.prototype.descriptor.code === describedType.descriptor) {
+        return new Type(describedType);
+      }
     }
   }