Removed function constructors

johnnyman727 · johnnyman727 · commit 0c48c280ace8 · 2014-08-29T12:36:53.000-07:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -33,29 +33,28 @@ function Connection() {
   this.on("pipe", function(source) {
     that.stream = source;
   });
+
+  for (var k in protocol.types) {
+    var v = protocol.types[k];
+    this[v] = shim_generator.bind(this, v);
+}
 };
 util.inherits(Connection, Writable);
 
+function shim_generator(v, opts) {
+  var p = generate[v](opts);
+  if (p instanceof Error) { 
+    this.emit('error', p) 
+  } else { 
+    this.stream.write(p); 
+  } 
+}
+
 Connection.prototype.setPacketEncoding = function (encoding) {
   this._packetEncoding = encoding;
   return this;
 };
 
-for (var k in protocol.types) {
-  var v = protocol.types[k];
-
-  var fun = "" +
-  "   var p = this.generate." + v +"(opts); " +
-  "   if (p instanceof Error) { " +
-  "     this.emit('error', p) " +
-  "   } else { " +
-  "     this.stream.write(p); " +
-  "   } "
-  " } ";
-
-  Connection.prototype[v] = new Function("opts", fun);
-}
-
 Connection.prototype._newPacket = function() {
   this.packet = {};
   this.tmp = { pos: 1, mul: 1, length: 0};
@@ -138,26 +137,16 @@ Connection.prototype._readPayload = function() {
 };
 
 (function() {
-  var v = protocol.types[k];
-
-  var fun = "" +
-  "   'use strict'; \n" +
-  "   var buf = this.data.slice(this.index, this.index + this.packet.length); \n" +
-  "   var result = null; \n" +
-  "   this.index += this.packet.length; \n" +
-  "   switch(this.packet.cmd) { \n";
-
-  Object.keys(parse).forEach(function(key) {
-    fun = fun +
-    "   case '" + key + "': \n" +
-    "     result = parse." + key + "(buf, this.packet, this._packetEncoding); \n" +
-    "     break; \n ";
-  });
 
-  fun += "} \n";
-  fun += "return result; \n";
-
-  Connection.prototype._parsePayload = new Function("parse", fun);
+  Connection.prototype._parsePayload = function() {
+    var buf = this.data.slice(this.index, this.index + this.packet.length);
+    var result = null;
+    this.index += this.packet.length;
+    if (parse[this.packet.cmd]) {
+      result = parse[this.packet.cmd](buf, this.packet, this._packetEncoding);
+    }
+    return result;
+  }
 })();
 
 Connection.prototype._write = function(data, encoding, done) {
