Refactored validationTopics into utils (#447)

* Refactored validationTopics & noop into utils * Leave noop in same files
moscajs · Feb 23, 2020 · 323d535 · 323d535
1 parent c5ee57e
commit 323d535
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -135,7 +135,7 @@ function Client (broker, conn, req) {
         }
       })
     } else if (that.clean === false) {
-      that.broker.persistence.outgoingClearMessageId(that, _packet, nop)
+      that.broker.persistence.outgoingClearMessageId(that, _packet, noop)
       // we consider this to be an error, since the packet is undefined
       // so there's nothing to send
       setImmediate(cb)
@@ -178,7 +178,7 @@ function writeQoS (err, client, packet) {
 function onError (err) {
   this.errored = true
   this.conn.removeAllListeners('error')
-  this.conn.on('error', nop)
+  this.conn.on('error', noop)
   this.broker.emit(this.id ? 'clientError' : 'connectionError', this, err)
   this.close()
 }
@@ -263,7 +263,7 @@ Client.prototype.close = function (done) {
   }
 
   this._eos()
-  this._eos = nop
+  this._eos = noop
 
   handleUnsubscribe(
     this,
@@ -288,7 +288,7 @@ Client.prototype.close = function (done) {
             that.broker.persistence.delWill({
               id: that.id,
               brokerId: that.broker.id
-            }, nop)
+            }, noop)
           }
         }
       })
@@ -300,7 +300,7 @@ Client.prototype.close = function (done) {
     that.connecting = false
 
     conn.removeAllListeners('error')
-    conn.on('error', nop)
+    conn.on('error', noop)
 
     if (that.broker.clients[that.id] && that._authorized) {
       that.broker.unregisterClient(that)
@@ -353,4 +353,4 @@ function dequeue () {
   }
 }
 
-function nop () { }
+function noop () {}
diff --git a/lib/handlers/subscribe.js b/lib/handlers/subscribe.js
@@ -3,7 +3,7 @@
 const fastfall = require('fastfall')
 const Packet = require('aedes-packet')
 const through = require('through2')
-const validateTopic = require('./validations')
+const { validateTopic } = require('../utils')
 const write = require('../write')
 
 const subscribeTopicActions = fastfall([

diff --git a/lib/handlers/unsubscribe.js b/lib/handlers/unsubscribe.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const write = require('../write')
-const validateTopic = require('./validations')
+const { validateTopic } = require('../utils')
 
 function UnsubscribeState (client, packet, finish) {
   this.client = client

diff --git a/lib/qos-packet.js b/lib/qos-packet.js
@@ -6,7 +6,7 @@ const util = require('util')
 function QoSPacket (original, client) {
   Packet.call(this, original, client.broker)
 
-  this.writeCallback = nop
+  this.writeCallback = noop
 
   if (!original.messageId) {
     this.messageId = client._nextId
@@ -22,6 +22,6 @@ function QoSPacket (original, client) {
 
 util.inherits(QoSPacket, Packet)
 
-function nop () {}
+function noop () {}
 
 module.exports = QoSPacket
diff --git a/lib/handlers/validations.js → lib/utils.js b/lib/handlers/validations.js → lib/utils.js
@@ -26,4 +26,6 @@ function validateTopic (topic, message) {
   }
 }
 
-module.exports = validateTopic
+module.exports = {
+  validateTopic
+}