From 3c6f46217517fca9da2bdbd5ca48bd2ab80eee4a Mon Sep 17 00:00:00 2001 From: lilleman Date: Thu, 23 Jun 2016 11:42:10 +0200 Subject: [PATCH] Indent and minor linting tweaks to the latest merge --- lib/client.js | 11 +-- lib/server.js | 228 +++++++++++++++++++++++++------------------------- 2 files changed, 121 insertions(+), 118 deletions(-) diff --git a/lib/client.js b/lib/client.js index 00d2b76..1112488 100644 --- a/lib/client.js +++ b/lib/client.js @@ -12,10 +12,10 @@ function login() { loginPdu = { 'cmdName': 'bind_transceiver', - 'seqNr': this.ourSeqNr, + 'seqNr': this.ourSeqNr, 'params': { 'system_id': this.options.username, - 'password': this.options.password + 'password': this.options.password } }; @@ -95,6 +95,7 @@ function clientSession(sock, options) { * @param func callback(err, session) */ function client(options, callback) { + var sock; if (typeof options === 'function') { callback = options; @@ -111,10 +112,10 @@ function client(options, callback) { 'enqLinkTiming': 20000 // 20 sec }, options || {}); - if(options && options.tls && option.tls === true){ - var sock = new tls.Socket(); + if (options && options.tls && option.tls === true) { + sock = new tls.Socket(); } else { - var sock = new net.Socket(); + sock = new net.Socket(); } log.debug('larvitsmpp: lib/client.js: client() - Connecting to ' + options.host + ':' + options.port); diff --git a/lib/server.js b/lib/server.js index df513d6..df63b8c 100644 --- a/lib/server.js +++ b/lib/server.js @@ -1,7 +1,7 @@ 'use strict'; var log = require('winston'), - merge = require('utils-merge'), + merge = require('utils-merge'), net = require('net'), tls = require('tls'), session = require('./session'), @@ -13,67 +13,67 @@ var log = require('winston'), * @param obj pduObj */ function login(pduObj) { - var that = this; + var that = this; - log.debug('larvitsmpp: lib/server.js: login() - Data received and session is not loggedIn'); + log.debug('larvitsmpp: lib/server.js: login() - Data received and session is not loggedIn'); - // Pause socket so we do not receive any other commands until we have processed the login - this.sock.pause(); + // Pause socket so we do not receive any other commands until we have processed the login + this.sock.pause(); - // Only bind_* is accepted when the client is not logged in - if (pduObj.cmdName !== 'bind_transceiver' && pduObj.cmdName !== 'bind_receiver' && pduObj.cmdName !== 'bind_transmitter') { - log.debug('larvitsmpp: lib/server.js: login() - Session is not loggedIn and no bind_* command is given. Return error "ESME_RINVBNDSTS'); + // Only bind_* is accepted when the client is not logged in + if (pduObj.cmdName !== 'bind_transceiver' && pduObj.cmdName !== 'bind_receiver' && pduObj.cmdName !== 'bind_transmitter') { + log.debug('larvitsmpp: lib/server.js: login() - Session is not loggedIn and no bind_* command is given. Return error "ESME_RINVBNDSTS'); - smppUtils.pduReturn(pduObj, 'ESME_RINVBNDSTS', function(err, retPdu) { - if (err) { - that.closeSocket(); - return; - } + smppUtils.pduReturn(pduObj, 'ESME_RINVBNDSTS', function(err, retPdu) { + if (err) { + that.closeSocket(); + return; + } - that.sock.resume(); - that.sockWrite(retPdu); - }); + that.sock.resume(); + that.sockWrite(retPdu); + }); - return; - } + return; + } - // If there is a checkuserpass(), use it to check system_id and password from the PDU - if (typeof this.options.checkuserpass === 'function') { - this.options.checkuserpass(pduObj.params.system_id, pduObj.params.password, function(err, res, userData) { - if (err) { - that.closeSocket(); - return; - } + // If there is a checkuserpass(), use it to check system_id and password from the PDU + if (typeof this.options.checkuserpass === 'function') { + this.options.checkuserpass(pduObj.params.system_id, pduObj.params.password, function(err, res, userData) { + if (err) { + that.closeSocket(); + return; + } - if ( ! res) { - log.info('larvitsmpp: lib/server.js: serverSession() - login() - Login failed! Connected host: ' + that.sock.remoteAddress + ':' + that.sock.remotePort + ' system_id: "' + pduObj.params.system_id + '"'); + if ( ! res) { + log.info('larvitsmpp: lib/server.js: serverSession() - login() - Login failed! Connected host: ' + that.sock.remoteAddress + ':' + that.sock.remotePort + ' system_id: "' + pduObj.params.system_id + '"'); - that.sock.resume(); - that.sendReturn(pduObj, 'ESME_RBINDFAIL'); - return; - } + that.sock.resume(); + that.sendReturn(pduObj, 'ESME_RBINDFAIL'); + return; + } - log.verbose('larvitsmpp: lib/server.js: serverSession() - login() - Login successful! Connected host: ' + that.sock.remoteAddress + ':' + that.sock.remotePort + ' system_id: "' + pduObj.params.system_id + '"'); - that.loggedIn = true; + log.verbose('larvitsmpp: lib/server.js: serverSession() - login() - Login successful! Connected host: ' + that.sock.remoteAddress + ':' + that.sock.remotePort + ' system_id: "' + pduObj.params.system_id + '"'); + that.loggedIn = true; - // Set additional user data to the session - if (userData !== undefined) { - that.userData = userData; - } + // Set additional user data to the session + if (userData !== undefined) { + that.userData = userData; + } - that.sock.resume(); - that.emit('login'); - that.sendReturn(pduObj); - }); + that.sock.resume(); + that.emit('login'); + that.sendReturn(pduObj); + }); - return; - } + return; + } - // If we arrived here it means we are not logged in and that a bind_* event happened and no checkuserpass() method exists. Lets login! - this.loggedIn = true; - this.sock.resume(); - this.emit('login'); - this.sendReturn(pduObj); + // If we arrived here it means we are not logged in and that a bind_* event happened and no checkuserpass() method exists. Lets login! + this.loggedIn = true; + this.sock.resume(); + this.emit('login'); + this.sendReturn(pduObj); } /** @@ -81,17 +81,17 @@ function login(pduObj) { * If this is not ran within options.timeout milliseconds, this session will self terminate */ function resetEnqLinkTimer() { - var that = this; + var that = this; - log.silly('larvitsmpp: lib/server.js: resetEnqLinkTimer() - Resetting the kill timer'); - if (that.enqLinkTimer) { - clearTimeout(that.enqLinkTimer); - } + log.silly('larvitsmpp: lib/server.js: resetEnqLinkTimer() - Resetting the kill timer'); + if (that.enqLinkTimer) { + clearTimeout(that.enqLinkTimer); + } - that.enqLinkTimer = setTimeout(function() { - log.info('larvitsmpp: lib/server.js: resetEnqLinkTimer() - Closing session from ' + that.sock.remoteAddress + ':' + that.sock.remotePort + ' due to timeout'); - that.closeSocket(); - }, that.options.timeout); + that.enqLinkTimer = setTimeout(function() { + log.info('larvitsmpp: lib/server.js: resetEnqLinkTimer() - Closing session from ' + that.sock.remoteAddress + ':' + that.sock.remotePort + ' due to timeout'); + that.closeSocket(); + }, that.options.timeout); } /** @@ -102,42 +102,42 @@ function resetEnqLinkTimer() { * @return obj (returnObj) */ function serverSession(sock, options) { - var returnObj = session(sock); + var returnObj = session(sock); - returnObj.options = options; - returnObj.login = login; - returnObj.resetEnqLinkTimer = resetEnqLinkTimer; + returnObj.options = options; + returnObj.login = login; + returnObj.resetEnqLinkTimer = resetEnqLinkTimer; - returnObj.resetEnqLinkTimer(); + returnObj.resetEnqLinkTimer(); - // Handle incoming Pdu Objects - returnObj.on('incomingPduObj', function(pduObj) { - // Call the appropriate handleCmd function + // Handle incoming Pdu Objects + returnObj.on('incomingPduObj', function(pduObj) { + // Call the appropriate handleCmd function - // Unbind is always ok - if (pduObj.cmdName === 'unbind') { - returnObj.sendReturn(pduObj, 'ESME_ROK', undefined, true); + // Unbind is always ok + if (pduObj.cmdName === 'unbind') { + returnObj.sendReturn(pduObj, 'ESME_ROK', undefined, true); - // If client is not logged in, always run the login function - } else if (returnObj.loggedIn === false) { - log.debug('larvitsmpp: lib/server.js: serverSession() - returnObj.handleIncomingPdu() - Not logged in, running login function'); - returnObj.login(pduObj); + // If client is not logged in, always run the login function + } else if (returnObj.loggedIn === false) { + log.debug('larvitsmpp: lib/server.js: serverSession() - returnObj.handleIncomingPdu() - Not logged in, running login function'); + returnObj.login(pduObj); - // Client is logged in, try to match a handling function - } else if (typeof returnObj.handleCmd[pduObj.cmdName] === 'function') { - log.debug('larvitsmpp: lib/server.js: serverSession() - returnObj.on(incomingPduObj) - Running cmd handling function returnObj.handleCmd.' + pduObj.cmdName + '()'); + // Client is logged in, try to match a handling function + } else if (typeof returnObj.handleCmd[pduObj.cmdName] === 'function') { + log.debug('larvitsmpp: lib/server.js: serverSession() - returnObj.on(incomingPduObj) - Running cmd handling function returnObj.handleCmd.' + pduObj.cmdName + '()'); - returnObj.handleCmd[pduObj.cmdName](pduObj); + returnObj.handleCmd[pduObj.cmdName](pduObj); - // No command handling function is registered, return error "invalid command" - } else { - log.info('larvitsmpp: lib/server.js: serverSession() - returnObj.on(incomingPduObj) - No handling function found for command: "' + pduObj.cmdName + '"'); + // No command handling function is registered, return error "invalid command" + } else { + log.info('larvitsmpp: lib/server.js: serverSession() - returnObj.on(incomingPduObj) - No handling function found for command: "' + pduObj.cmdName + '"'); - returnObj.sendReturn(pduObj, 'ESME_RINVCMDID'); - } - }); + returnObj.sendReturn(pduObj, 'ESME_RINVCMDID'); + } + }); - return returnObj; + return returnObj; } /** @@ -147,42 +147,44 @@ function serverSession(sock, options) { * @param func callback(err, session) */ function server(options, callback) { - if (typeof options === 'function') { - callback = options; - options = {}; - } + var tlsOrNet; - // Set default options - options = merge({ - 'port': 2775, - 'tls': false, - 'timeout': 40000 // 40 sec - }, options || {}); + if (typeof options === 'function') { + callback = options; + options = {}; + } - if(options && options.tls && option.tls === true){ - var tls_or_net = tls; - } else { - var tls_or_net = net; - } + // Set default options + options = merge({ + 'port': 2775, + 'tls': false, + 'timeout': 40000 // 40 sec + }, options || {}); - // Create a server instance, and chain the listen function to it - // The function passed to net.createServer() becomes the event handler for the 'connection' event - // The sock object the callback function receives UNIQUE for each connection - tls_or_net.createServer(options, function(sock) { - var returnObj = serverSession(sock, options); + if (options && options.tls && option.tls === true) { + tlsOrNet = tls; + } else { + tlsOrNet = net; + } - // We have a connection - a socket object is assigned to the connection automatically - log.verbose('larvitsmpp: lib/server.js: server() - Incomming connection! From: ' + sock.remoteAddress + ':' + sock.remotePort); + // Create a server instance, and chain the listen function to it + // The function passed to net.createServer() becomes the event handler for the 'connection' event + // The sock object the callback function receives UNIQUE for each connection + tlsOrNet.createServer(options, function(sock) { + var returnObj = serverSession(sock, options); - callback(null, returnObj); - }).listen(options.port, options.host); + // We have a connection - a socket object is assigned to the connection automatically + log.verbose('larvitsmpp: lib/server.js: server() - Incomming connection! From: ' + sock.remoteAddress + ':' + sock.remotePort); - if (options.host !== undefined) { - log.info('larvitsmpp: lib/server.js: server() - Up and listening at ' + options.host + ':' + options.port); - } else { - log.info('larvitsmpp: lib/server.js: server() - Up and listening at *:' + options.port); - } + callback(null, returnObj); + }).listen(options.port, options.host); + + if (options.host !== undefined) { + log.info('larvitsmpp: lib/server.js: server() - Up and listening at ' + options.host + ':' + options.port); + } else { + log.info('larvitsmpp: lib/server.js: server() - Up and listening at *:' + options.port); + } } // Expose some functions -exports = module.exports = server; \ No newline at end of file +exports = module.exports = server;