Merge pull request #24 from LinusU/prefer-const

Prefer const over let

Author: zensh

benchmark/cluster.js

@@ -8,21 +8,21 @@ const IoRedis = require('ioredis')
 thunk(function * () {
   let timeT = 0
   let timeI = 0
-  let testLen = 100000
-  let titleT = 'redis(T):'
-  let titleI = 'redis(I):'
-  let clientT = redis.createClient(7000)
-  let clientI = new IoRedis.Cluster([
+  const testLen = 100000
+  const titleT = 'redis(T):'
+  const titleI = 'redis(I):'
+  const clientT = redis.createClient(7000)
+  const clientI = new IoRedis.Cluster([
     {port: 7000, host: '127.0.0.1'},
     {port: 7001, host: '127.0.0.1'},
     {port: 7002, host: '127.0.0.1'}
   ])
 
-  let queue = []
+  const queue = []
   while (queue.length < testLen) queue.push(queue.length)
 
-  let smallStr = 'teambition'
-  let longStr = (new Array(4097).join('-'))
+  const smallStr = 'teambition'
+  const longStr = (new Array(4097).join('-'))
 
   function printResult (title, timeT, timeI) {
     console.log(titleT, title, Math.floor(testLen * 1000 / timeT) + ' ops/sec', '100%')

benchmark/index.js

@@ -18,19 +18,19 @@ function * bench () {
   let timeN = 0
   let timeT = 0
   let timeI = 0
-  let testLen = 100000
-  let titleN = 'redis(N):'
-  let titleT = 'redis(T):'
-  let titleI = 'redis(I):'
-  let clientN = nodeRedis.createClient(6380)
-  let clientT = redis.createClient(6381)
-  let clientI = new IoRedis(6382)
-
-  let queue = []
+  const testLen = 100000
+  const titleN = 'redis(N):'
+  const titleT = 'redis(T):'
+  const titleI = 'redis(I):'
+  const clientN = nodeRedis.createClient(6380)
+  const clientT = redis.createClient(6381)
+  const clientI = new IoRedis(6382)
+
+  const queue = []
   while (queue.length < testLen) queue.push(queue.length)
 
-  let smallStr = 'teambition'
-  let longStr = (new Array(4097).join('-'))
+  const smallStr = 'teambition'
+  const longStr = (new Array(4097).join('-'))
 
   function printResult (title, timeN, timeT, timeI) {
     console.log(`\n${title}:`)

examples/demo-generator.js

@@ -12,7 +12,7 @@ client.select(1)(function * (error, res) {
   console.log('foo -> %s', yield this.get('foo'))
   console.log('bar -> %s', yield this.get('bar'))
 
-  let user = {
+  const user = {
     id: 'u001',
     name: 'jay',
     age: 24

lib/client.js

@@ -67,7 +67,7 @@ RedisState.prototype.resetConnection = function () {
   if (this.connection && this.connection.connected) return
 
   let connection = null
-  let keys = Object.keys(this.pool)
+  const keys = Object.keys(this.pool)
   for (let i = 0; i < keys.length; i++) {
     connection = this.pool[keys[i]]
     if (connection.connected) break
@@ -79,7 +79,7 @@ function RedisClient (addressArray, options) {
   EventEmitter.call(this)
   tool.setPrivate(this, '_redisState', new RedisState(options, addressArray))
 
-  let ctx = this
+  const ctx = this
   this._redisState.thunkE = thunks(function (error) {
     ctx.emit('error', error)
   })
@@ -95,8 +95,8 @@ util.inherits(RedisClient, EventEmitter)
 initCommands(RedisClient.prototype)
 
 RedisClient.prototype.clientConnect = function () {
-  let ctx = this
-  let redisState = this._redisState
+  const ctx = this
+  const redisState = this._redisState
   redisState.ended = false
   createConnections(this, redisState.addressArray)
 
@@ -111,7 +111,7 @@ RedisClient.prototype.clientConnect = function () {
 // deprecate!
 RedisClient.prototype.clientSwitch = function (id) {
   console.warn('clientSwitch is deprecated, It will be removed in next version!')
-  let redisState = this._redisState
+  const redisState = this._redisState
   id = redisState.slots[id] || id
   if (!redisState.pool[id]) throw new Error(id + ' is not exist')
   redisState.slots[-1] = id
@@ -120,8 +120,8 @@ RedisClient.prototype.clientSwitch = function (id) {
 
 RedisClient.prototype.clientUnref = function () {
   if (this._redisState.ended) return
-  for (let key of Object.keys(this._redisState.pool)) {
-    let connection = this._redisState.pool[key]
+  for (const key of Object.keys(this._redisState.pool)) {
+    const connection = this._redisState.pool[key]
     if (connection.connected) connection.socket.unref()
     else {
       connection.socket.once('connect', function () {
@@ -132,28 +132,28 @@ RedisClient.prototype.clientUnref = function () {
 }
 
 RedisClient.prototype.clientEnd = function (hadError) {
-  let redisState = this._redisState
+  const redisState = this._redisState
   if (redisState.ended) return
   redisState.ended = true
   redisState.connected = false
 
   clearInterval(redisState.pingInterval)
   redisState.pingInterval = null
 
-  for (let key of Object.keys(redisState.pool)) {
-    let connection = redisState.pool[key]
+  for (const key of Object.keys(redisState.pool)) {
+    const connection = redisState.pool[key]
     if (connection) connection.disconnect()
   }
-  let commandQueue = redisState.commandQueue
-  let message = (hadError && hadError.toString()) || 'The redis connection was ended'
+  const commandQueue = redisState.commandQueue
+  const message = (hadError && hadError.toString()) || 'The redis connection was ended'
   while (commandQueue.length) commandQueue.shift().callback(new Error(message))
 
   this.emit('close', hadError)
 }
 
 RedisClient.prototype.clientState = function () {
-  let redisState = this._redisState
-  let state = {
+  const redisState = this._redisState
+  const state = {
     pool: {},
     ended: redisState.ended,
     clientId: redisState.clientId,
@@ -165,8 +165,8 @@ RedisClient.prototype.clientState = function () {
     commandQueueLength: redisState.commandQueue.length
   }
 
-  for (let key of Object.keys(redisState.pool)) {
-    let connection = redisState.pool[key]
+  for (const key of Object.keys(redisState.pool)) {
+    const connection = redisState.pool[key]
     state.pool[connection.id] = connection.replicationIds ? connection.replicationIds.slice() : []
   }
   return state

lib/commands.js

@@ -229,18 +229,18 @@ exports.initCommands = function (proto) {
   proto.clientCommands = commands
 
   proto.clientCalcSlot = function (reqArray) {
-    let info = commandsInfo[reqArray[0]]
+    const info = commandsInfo[reqArray[0]]
     if (!info || reqArray.length === 1 || (info[2] === 0 && info[0] !== 1)) return null
     // if command have no argument but user provide one, use the argument to calcSlot
     // it is useful in cluster for `multi`, `exec`, `discard`, `unwatch` and so on
-    let keyIndex = info[2] || 1
+    const keyIndex = info[2] || 1
     // Only calc first key, user should ensure that all keys are in a same node.
-    let slot = calcSlot(reqArray[keyIndex])
+    const slot = calcSlot(reqArray[keyIndex])
     if (info[0] === 1) reqArray.length = 1
     return slot
   }
 
-  for (let command of commands) {
+  for (const command of commands) {
     proto[command] = function () {
       return sendCommand(this, command, adjustArgs(arguments))
     }
@@ -282,23 +282,23 @@ exports.initCommands = function (proto) {
   }
 
   proto.pubsub = function () {
-    let args = adjustArgs(arguments)
+    const args = adjustArgs(arguments)
     return sendCommand(this, 'pubsub', args, 0, function (res) {
       if (args[0].toLowerCase() === 'numsub') res = toHash(res)
       return res
     })
   }
 
   proto.monitor = function (hashKey) {
-    let args = adjustArgs(arguments)
+    const args = adjustArgs(arguments)
     if (hashKey || !this._redisState.clusterMode) {
       return sendCommand(this, 'monitor', args)
     }
 
     // monit all nodes in cluster mode
-    let tasks = []
-    for (let key of Object.keys(this._redisState.pool)) {
-      let connection = this._redisState.pool[key]
+    const tasks = []
+    for (const key of Object.keys(this._redisState.pool)) {
+      const connection = this._redisState.pool[key]
       if (connection.monitorMode) return
       tasks.push(connection.sendCommand('monitor', args))
     }
@@ -316,13 +316,13 @@ exports.initCommands = function (proto) {
    */
 
   proto.evalauto = function (script, numkeys, key) {
-    let args = tool.slice(adjustArgs(arguments))
+    const args = tool.slice(adjustArgs(arguments))
     script = String(args[0]).trim()
 
     return thunk.call(this, function * () {
       yield this.clientReady
 
-      let slot = args.length < 3 ? null : calcSlot(args[2])
+      const slot = args.length < 3 ? null : calcSlot(args[2])
       let connection = this._redisState.getConnection(slot)
       if (connection instanceof Error) throw connection
 
@@ -337,7 +337,7 @@ exports.initCommands = function (proto) {
         }
       }
 
-      let res = yield connection.sendCommand('eval', args)
+      const res = yield connection.sendCommand('eval', args)
       // connection maybe change with MOVED response
       connection = this._redisState.getConnection(slot)
       if (connection instanceof Error) throw connection
@@ -346,14 +346,14 @@ exports.initCommands = function (proto) {
     })
   }
 
-  for (let command of ['psubscribe', 'punsubscribe', 'subscribe', 'unsubscribe']) {
+  for (const command of ['psubscribe', 'punsubscribe', 'subscribe', 'unsubscribe']) {
     proto[command] = function () {
-      let args = adjustArgs(arguments)
+      const args = adjustArgs(arguments)
       return sendCommand(this, command, args, args.length ? (args.length - 1) : 0)
     }
   }
 
-  for (let command of commands) {
+  for (const command of commands) {
     proto[command.toUpperCase()] = proto[command]
   }
 }
@@ -367,14 +367,14 @@ function adjustArgs (args) {
 }
 
 function toArray (hash, array) {
-  for (let key of Object.keys(hash)) {
+  for (const key of Object.keys(hash)) {
     array.push(key, hash[key])
   }
   return array
 }
 
 function toHash (array) {
-  let hash = {}
+  const hash = {}
 
   for (let i = 0, len = array.length; i < len; i += 2) {
     hash[array[i]] = array[i + 1]
@@ -384,13 +384,13 @@ function toHash (array) {
 }
 
 function formatInfo (info) {
-  let hash = {}
+  const hash = {}
 
-  for (let line of info.toString().split('\r\n')) {
-    let index = line.indexOf(':')
+  for (const line of info.toString().split('\r\n')) {
+    const index = line.indexOf(':')
 
     if (index === -1) continue
-    let name = line.slice(0, index)
+    const name = line.slice(0, index)
     hash[name] = line.slice(index + 1)
   }