larvit/smpp-js
3
0
Fork 0
Code Issues Pull Requests Actions Activity

var to let or const, better lints, code style and more

Browse Source
This commit is contained in:
Lilleman auf Larv
2017-06-25 02:10:26 +02:00
parent a3d253994f
commit 7cc0f4f94d
16 changed files with 2887 additions and 2682 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/client.js
+60 -56
View File
@@ -1,55 +1,56 @@
'use strict';
var log = require('winston'),
merge = require('utils-merge'),
net = require('net'),
tls = require('tls'),
session = require('./session');
const topLogPrefix = 'larvitsmpp: lib/client.js: ',
session = require(__dirname + '/session'),
merge = require('utils-merge'),
log = require('winston'),
net = require('net'),
tls = require('tls');
function login() {
var that = this,
loginPdu;
const logPrefix = topLogPrefix + 'login() - ',
that = this;
let loginPdu;
loginPdu = {
'cmdName': 'bind_transceiver',
'seqNr': this.ourSeqNr,
'cmdName': 'bind_transceiver',
'seqNr': that.ourSeqNr,
'params': {
'system_id': this.options.username,
'password': this.options.password
'system_id': that.options.username,
'password': that.options.password
}
};
this.send(loginPdu, function(err, retPduObj) {
if (err) {
that.emit('loginFailed');
return;
}
that.send(loginPdu, function (err, retPduObj) {
if (err) return that.emit('loginFailed');
if (retPduObj.cmdStatus === 'ESME_ROK') {
log.info('larvitsmpp: lib/client.js: login() - Successful login system_id: "' + loginPdu.params.system_id + '"');
log.info(logPrefix + 'Successful login system_id: "' + loginPdu.params.system_id + '"');
that.loggedIn = true;
that.emit('loggedIn');
} else {
log.info('larvitsmpp: lib/client.js: login() - Login failed system_id: "' + loginPdu.params.system_id + '". Status msg: ' + retPduObj.cmdStatus);
log.info(logPrefix + 'Login failed system_id: "' + loginPdu.params.system_id + '". Status msg: ' + retPduObj.cmdStatus);
that.emit('loginFailed');
}
});
}
function resetEnqLinkTimer() {
var that = this;
const logPrefix = topLogPrefix + 'resetEnqLinkTimer() - ',
that = this;
log.silly('larvitsmpp: lib/client.js: resetEnqLinkTimer() - Resetting the kill timer');
if (this.enqLinkTimer) {
clearTimeout(this.enqLinkTimer);
log.silly(logPrefix + 'Resetting the kill timer');
if (that.enqLinkTimer) {
clearTimeout(that.enqLinkTimer);
}
this.enqLinkTimer = setTimeout(function() {
that.enqLinkTimer = setTimeout(function () {
that.send({
cmdName: 'enquire_link',
seqNr: that.ourSeqNr
cmdName: 'enquire_link',
seqNr: that.ourSeqNr
});
}, this.options.enqLinkTiming);
}, that.options.enqLinkTiming);
}
/**
@@ -60,26 +61,27 @@ function resetEnqLinkTimer() {
* @return {object} (returnObj)
*/
function clientSession(sock, options) {
var returnObj = session(sock);
const returnObj = session(sock),
logPrefix = topLogPrefix + 'clientSession() - ';
returnObj.options = options;
returnObj.login = login;
returnObj.resetEnqLinkTimer = resetEnqLinkTimer;
returnObj.options = options;
returnObj.login = login;
returnObj.resetEnqLinkTimer = resetEnqLinkTimer;
returnObj.login();
returnObj.resetEnqLinkTimer();
// Handle incoming Pdu Objects
returnObj.on('incomingPduObj', function(pduObj) {
returnObj.on('incomingPduObj', function (pduObj) {
// Call the appropriate handleCmd function
if (typeof returnObj.handleCmd[pduObj.cmdName] === 'function') {
log.debug('larvitsmpp: lib/client.js: clientSession() - returnObj.on(incomingPduObj) - Running cmd handling function returnObj.handleCmd.' + pduObj.cmdName + '()');
log.debug(logPrefix + 'returnObj.on(incomingPduObj) - Running cmd handling function returnObj.handleCmd.' + pduObj.cmdName + '()');
returnObj.handleCmd[pduObj.cmdName](pduObj);
} else {
// No command handling function is registered, return error "invalid command"
log.info('larvitsmpp: lib/client.js: clientSession() - returnObj.on(incomingPduObj) - No handling function found for command: "' + pduObj.cmdName + '"');
log.info(logPrefix + 'returnObj.on(incomingPduObj) - No handling function found for command: "' + pduObj.cmdName + '"');
returnObj.sendReturn(pduObj, 'ESME_RINVCMDID');
}
@@ -92,46 +94,48 @@ function clientSession(sock, options) {
* Setup a client.
*
* @param {object} options - host, port, username, password, tls, enqLinkTiming
* @param {function} callback(err, session)
* @param {function} cb(err, session)
*/
function client(options, callback) {
var sock;
function client(options, cb) {
const logPrefix = topLogPrefix + 'client() - ';
let sock;
if (typeof options === 'function') {
callback = options;
options = {};
cb = options;
options = {};
}
// Set default options
options = merge({
'host': 'localhost',
'port': 2775,
'username': 'user',
'password': 'pass',
'tls': false,
'enqLinkTiming': 20000 // 20 sec
'host': 'localhost',
'port': 2775,
'username': 'user',
'password': 'pass',
'tls': false,
'enqLinkTiming': 20000 // 20 sec
}, options || {});
if (options && options.tls && options.tls === true) {
sock = new tls.Socket();
sock = new tls.Socket();
} else {
sock = new net.Socket();
sock = new net.Socket();
}
log.debug('larvitsmpp: lib/client.js: client() - Connecting to ' + options.host + ':' + options.port);
sock.connect(options, function() {
var session = clientSession(sock, options);
log.debug(logPrefix + 'Connecting to ' + options.host + ':' + options.port);
sock.connect(options, function () {
const session = clientSession(sock, options);
log.info('larvitsmpp: lib/client.js: client() - Connected to ' + sock.remoteAddress + ':' + sock.remotePort);
log.info(logPrefix + 'Connected to ' + sock.remoteAddress + ':' + sock.remotePort);
session.on('loggedIn', function() {
callback(null, session);
session.on('loggedIn', function () {
cb(null, session);
});
session.on('loginFailed', function() {
var err = new Error('Remote host refused login.');
log.warn('larvitsmpp: lib/client.js: client() - ' + err.message);
callback(err);
session.on('loginFailed', function () {
const err = new Error('Remote host refused login.');
log.warn(logPrefix + err.message);
cb(err);
});
});
}