diff --git a/index.js b/index.js index 72d0a38..09ea46c 100644 --- a/index.js +++ b/index.js @@ -48,18 +48,22 @@ function onLoginSuccessful(data) { logger.info('Login successful as ' + data.firstname + ' ' + data.lastname + ' (' + data.user_id + ')', {data: data}); } +function sendMessage(destination, message) { + logger.info('Sending YM message', {from: config.globals.username, to: destination, message: message}); + ym.sendPM(destination, message); +} + function sendIgnoreResponse(destination, message) { - ym.sendPM(destination, "Pesan anda diabaikan, silahkan diulang beberapa saat lagi jika diperlukan: " + message); + sendMessage(destination, "Pesan anda diabaikan, silahkan diulang beberapa saat lagi jika diperlukan: " + message); } function onPm(data) { - logger.info('onPM()', {data: data}); - + logger.info('Incoming message via YM', {data: data}); var message = striptags(data.message); var message_hash = data.sender + ': ' + data.message; if (message_hash == last_message_hash) { - logger.info('Ignoring duplicate message', {data: data}); + logger.warn('Ignoring duplicate message', {data: data}); return; } last_message_hash = message_hash; @@ -75,7 +79,7 @@ function onPm(data) { } function onOfflinePM(data) { - logger.verbose('onOfflinePM()', {data: data}); + logger.info('Offline YM message', {data: data}); sendIgnoreResponse(data.sender, data.message); } @@ -87,7 +91,7 @@ function onBuddyAddRequest(data) { function onHttpIncomingMessage(request, response) { var qs = url.parse(request.url, true).query; - logger.info("onHttpIncomingMessage()", {qs: qs}); + logger.verbose("onHttpIncomingMessage()", {qs: qs}); // abaikan balikan ping if (qs.to == config.globals.ping_ym_id) { @@ -95,8 +99,8 @@ function onHttpIncomingMessage(request, response) { } var destination = qs.to.replace(config.globals.msisdn_suffix, ''); - logger.info('Sending message to ' + destination + ': ' + qs.msg); - ym.sendPM(destination, qs.msg); + logger.info('Sending YM message from ' + config.globals.username + ' to ' + destination + ': ' + qs.msg); + sendMessage(destination, qs.msg); response.end('OK'); } @@ -117,7 +121,7 @@ function forwardMessageToEvo(sender, message, ts) { } }; - logger.info("Forwarding message to evo", {request_opts: opts}); + logger.verbose("Forwarding message to evo", {request_opts: opts}); request(opts, function(err, response, body) { if (err) { logger.warn('Error forwarding to evo: ' + err); @@ -140,7 +144,7 @@ function forwardMessageToEvo(sender, message, ts) { } }; - logger.info('Sending ping message', {opts: pingOpts}); + logger.verbose('Sending ping message', {opts: pingOpts}); request(pingOpts, function(err, response, body) { if (err) { @@ -168,6 +172,6 @@ ym.on('pm', onPm); ym.on('buddyAddRequest', onBuddyAddRequest); setInterval(function() { - logger.info('Sending keepalive packet'); + logger.verbose('Sending keepalive packet'); ym.keepAlive(); }, keepalive_interval);