refactor to es-class (#712)

Author: jimmywarting

lib/channel.js

@@ -264,7 +264,7 @@ Channel.prototype.prefetch = Channel.prototype.qos
 class ConfirmChannel extends Channel {
   publish(exchange, routingKey, content, options, cb) {
     this.pushConfirmCallback(cb);
-    return Channel.prototype.publish.call(this, exchange, routingKey, content, options);
+    return super.publish(exchange, routingKey, content, options);
   }
 
   sendToQueue(queue, content, options, cb) {

lib/channel_model.js

@@ -8,7 +8,6 @@
 
 var defs = require('./defs');
 var format = require('util').format;
-var inherits = require('util').inherits;
 var HEARTBEAT = require('./frame').HEARTBEAT;
 
 module.exports.closeMessage = function(close) {

lib/connection.js

@@ -47,43 +47,46 @@
 
 'use strict';
 
-var inherits = require('util').inherits;
 var EventEmitter = require('events').EventEmitter;
 
 // Exported so that we can mess with it in tests
 module.exports.UNITS_TO_MS = 1000;
 
-function Heart(interval, checkSend, checkRecv) {
-  EventEmitter.call(this);
-  this.interval = interval;
+class Heart extends EventEmitter {
+  constructor (interval, checkSend, checkRecv) {
+    super();
 
-  var intervalMs = interval * module.exports.UNITS_TO_MS;
-  // Function#bind is my new best friend
-  var beat = this.emit.bind(this, 'beat');
-  var timeout = this.emit.bind(this, 'timeout');
+    this.interval = interval;
 
-  this.sendTimer = setInterval(
-    this.runHeartbeat.bind(this, checkSend, beat), intervalMs / 2);
+    var intervalMs = interval * module.exports.UNITS_TO_MS;
+    // Function#bind is my new best friend
+    var beat = this.emit.bind(this, 'beat');
+    var timeout = this.emit.bind(this, 'timeout');
 
-  // A timeout occurs if I see nothing for *two consecutive* intervals
-  var recvMissed = 0;
-  function missedTwo() {
-    if (!checkRecv()) return (++recvMissed < 2);
-    else { recvMissed = 0; return true; }
+    this.sendTimer = setInterval(
+      this.runHeartbeat.bind(this, checkSend, beat), intervalMs / 2);
+
+    // A timeout occurs if I see nothing for *two consecutive* intervals
+    var recvMissed = 0;
+    function missedTwo () {
+      if (!checkRecv())
+        return (++recvMissed < 2);
+      else { recvMissed = 0; return true; }
+    }
+    this.recvTimer = setInterval(
+      this.runHeartbeat.bind(this, missedTwo, timeout), intervalMs);
   }
-  this.recvTimer = setInterval(
-    this.runHeartbeat.bind(this, missedTwo, timeout), intervalMs);
-}
-inherits(Heart, EventEmitter);
 
-module.exports.Heart = Heart;
+  clear () {
+    clearInterval(this.sendTimer);
+    clearInterval(this.recvTimer);
+  }
 
-Heart.prototype.clear = function() {
-  clearInterval(this.sendTimer);
-  clearInterval(this.recvTimer);
-};
+  runHeartbeat (check, fail) {
+    // Have we seen activity?
+    if (!check())
+      fail();
+  }
+}
 
-Heart.prototype.runHeartbeat = function(check, fail) {
-  // Have we seen activity?
-  if (!check()) fail();
-};
+module.exports.Heart = Heart;