Komodo / komodo-center-xmpp-messaging

Browse Code »

Commit dcbdd261df3fddc30515a19c7c17be5489215791

Authored by Adhidarma Hadiwinoto 3 years ago

1 parent f0b4793fef

Exists in master

Create sender module

Showing 3 changed files with 55 additions and 11 deletions Inline Diff

lib/custom-ping.js
lib/sender.js
lib/transport.js

lib/custom-ping.js

Diff comments View file @ dcbdd26

 const MODULE_NAME = 'CUSTOM-PING';
 const uniqid = require('uniqid');
 const config = require('komodo-sdk/config');
 const logger = require('tektrans-logger');
+const sender = require('./sender');
 let bot;
 const allowedFromPartnerList = (
     (config.custom_ping && config.custom_ping.allowed_from_partners) || []
 )
     .filter((item) => typeof item === 'string')
     .map((item) => (item || '').trim().toUpperCase())
     .filter((item) => item);
 const isPingMessage = (msg) => {
     if (!msg) return false;
     if (typeof msg !== 'string') return false;
     return ((msg || '').trim().toUpperCase().search(/^PING($| )/) === 0);
 };
 exports.isPingMessage = isPingMessage;
 const isPongMessage = (msg) => {
     if (!msg) return false;
     if (typeof msg !== 'string') return false;
     return ((msg || '').trim().toUpperCase().search(/^PONG($| )/) === 0);
 };
 exports.isPongMessage = isPongMessage;
 const isAllowedPartner = (partner) => {
     if (!config.custom_ping) return false;
     if (config.custom_ping.disable_pong) return false;
     if (config.custom_ping.allowed_from_all) return true;
     return allowedFromPartnerList.indexOf((partner || '').trim().toUpperCase()) >= 0;
 };
 exports.isAllowedPartner = isAllowedPartner;
 const sendPong = (xid, partner, pingMessage) => {
     if (!bot) return;
     if (!partner || typeof partner !== 'string' || !partner.trim()) return;
     const tokens = pingMessage.trim().split(/ +/);
     const pongMessage = [
         'PONG',
         (tokens && tokens[1]) || null,
     ].filter((item) => item)
         .join(' ');
     if (config.custom_ping && config.custom_ping.verbose) {
         logger.verbose(`${MODULE_NAME} F0D18EF4: Responding PING message`, {
             xid, partner, pongMessage,
         });
     }
-    bot.send(partner.trim(), pongMessage);
+    sender.send(partner.trim(), pongMessage);
 };
 exports.sendPong = sendPong;
 const sleepMs = (ms) => new Promise((resolve) => {
     setTimeout(() => {
         resolve(true);
     }, ms);
 });
 const pingSender = async () => {
     const xid = uniqid();
     if (bot) {
         const msg = `PING ${xid}`;
-        bot.send(config.username, msg);
+        sender.send(config.username, msg);
         if (
             config.custom_ping
             && config.custom_ping.send_to
             && Array.isArray(config.custom_ping.send_to)
         ) {
             const partnerCount = config.custom_ping.send_to.length;
             for (let i = 0; i < partnerCount; i += 1) {
+                const additionalDelay = Math.random() * 1000;
                 // eslint-disable-next-line no-await-in-loop
-                await sleepMs(1000);
+                await sleepMs(1000 + additionalDelay);
                 const partner = config.custom_ping.send_to[i];
                 if (config.custom_ping.verbose) {
                     logger.verbose(`${MODULE_NAME} 21358F45: Sending custom ping`, {
                         xid,
                         partner,
                         msg,
                     });
                 }
-                bot.send(partner, msg);
+                sender.send(partner, msg, xid);
             }
         }
     }
     await sleepMs(3 * 1000);
     pingSender();
 };
 const setBot = (botFromCaller) => {
     logger.verbose(`${MODULE_NAME} A063F39F: Bot registered for custom ping`);
     bot = botFromCaller;
     pingSender();
 };
 exports.setBot = setBot;

lib/sender.js

Diff comments View file @ dcbdd26

File was created	1	const MODULE_NAME = 'SENDER';
	2
	3	const logger = require('tektrans-logger');
	4
	5	let bot;
	6
	7	const init = (botFromCaller) => {
	8	logger.verbose(`${MODULE_NAME} D74B30FF: Sender initialized`);
	9	bot = botFromCaller;
	10	};
	11	exports.init = init;
	12
	13	const send = (partner, msg, xid) => {
	14	if (!bot) {
	15	logger.verbose(`${MODULE_NAME} 78B04B3B: Not sending message because bot has not been initialized`, {
	16	xid,
	17	partner,
	18	msg,
	19	});
	20
	21	return;
	22	}
	23
	24	logger.verbose(`${MODULE_NAME} 648A5F17: Sending message`, {
	25	xid,
	26	partner,
	27	msg,
	28	});
	29
	30	try {
	31	bot.send(partner, msg);
	32	} catch (e) {
	33	logger.warn(`${MODULE_NAME} C50237D8: Exception on sending message`, {
	34	xid,
	35	eCode: e.code,
	36	eMessage: e.message \|\| e,
	37	});
	38	}
	39	};
	40	exports.send = send;
	41

lib/transport.js

Diff comments View file @ dcbdd26

 const MODULE_NAME = 'TRANSPORT';
 const SLEEP_BEFORE_TERMINATE_ON_ERROR_MS = 5 * 1000;
 const bot = require('simple-xmpp');
 const config = require('komodo-sdk/config');
 const logger = require('tektrans-logger');
 const messagingService = require('komodo-center-messaging-client-lib');
 const uniqid = require('uniqid');
 const customPing = require('./custom-ping');
 const killOnIdle = require('./kill-on-idle');
+const sender = require('./sender');
 let isReady;
 bot.on('online', (data) => {
     logger.info(`XMPP transport connected, JID: ${data.jid.user}`);
+    sender.init(bot);
     if (config.custom_ping) {
         customPing.setBot(bot);
     }
     bot.getRoster();
     setTimeout(
         () => {
             isReady = true;
             logger.verbose('Transport is ready');
             if (messagingService.onOnline) {
                 messagingService.onOnline({
                     me: config.username,
                 });
             }
         },
         config.warming_up_ms || (30 * 1000),
     );
 });
 bot.on('chat', (partner, msg) => {
     if (!msg || !msg.trim()) {
         return;
     }
-    if (partner === config.username.replace(/\/.*$/, '')) {
+    if ((partner || '').toLowerCase() === config.username.toLowerCase().replace(/\/.*$/, '')) {
         return;
     }
     killOnIdle.touch();
     const xid = uniqid();
     if (!isReady) {
         if (!customPing.isPingMessage(msg) && !customPing.isPongMessage(msg)) {
             logger.warn('Warming up is not finished yet, ignoring message', {
                 xid, me: config.username, partner, msg,
             });
         }
         return;
     }
     if (msg.toLowerCase().indexOf('error') === 0) {
         return;
     }
     if (msg.toLowerCase().indexOf('perintah salah') === 0) {
         return;
     }
     if (msg.toLowerCase().indexOf('pembelian ') === 0) {
         return;
     }
     if (customPing.isPongMessage(msg)) {
         if (config.custom_ping && config.custom_ping.verbose) {
             logger.verbose(`${MODULE_NAME} 70CDD087: Got PONG message`, {
                 xid,
                 partner,
                 msg,
             });
         }
         return;
     }
     if (customPing.isPingMessage(msg)) {
         if (customPing.isAllowedPartner(partner)) {
             if (config.custom_ping && config.custom_ping.verbose) {
                 logger.verbose(`${MODULE_NAME} ED8C8786: Processing PING message`, {
                     xid,
                     partner,
                     msg,
                 });
             }
             customPing.sendPong(xid, partner, msg);
         }
         return;
     }
     logger.info('Incoming message via XMPP transport', {
         xid, me: config.username, partner, msg,
     });
     if (messagingService && messagingService.onIncomingMessage) {
         messagingService.onIncomingMessage(
             {
                 me: config.username,
                 partner,
                 msg: msg.trim(),
                 xid,
             },
         );
     }
 });
 bot.on('error', (err) => {
     const xid = uniqid();
     logger.warn(`${MODULE_NAME} F2E53C12: Error detected.`, {
         xid,
         eCode: err.code,
         eMessage: err.message,
     });
     if (!config.do_not_terminate_on_error) {
         logger.warn(`${MODULE_NAME} BA6C0C55: Terminating on error`, {
             xid,
             millisecondSleepBeforeTerminate: SLEEP_BEFORE_TERMINATE_ON_ERROR_MS,
         });
         setTimeout(() => {
             process.exit(1);
         }, SLEEP_BEFORE_TERMINATE_ON_ERROR_MS);
     }
 });
-function send(partner, msg) {
+function send(partner, msg, xid) {
-    logger.verbose('Sending message via XMPP transport', {
+    sender.send(partner, msg, xid);
-        transport: 'xmpp', me: config.username, partner, msg,
-    });
-    bot.send(partner, msg);
 }
 bot.on('subscribe', (from) => {
     logger.verbose(`Incoming subscribe request from ${from}`);
     bot.acceptSubscription(from);
     bot.subscribe(from);
 });
 function ping() {
-    if (isReady) bot.send(config.username, 'PING!');
+    if (isReady) send(config.username, `PING ${uniqid()}`);
 }
 function init() {
     messagingService.setTransport(exports);
     if (!killOnIdle.getDisabled()) {
         killOnIdle.init();
     }
     bot.connect({
         jid: config.username,
         password: config.password,
         host: config.xmpp_host,
     });
     setInterval(
         ping,
         config.ping_interval_ms || 25000,
     );
 }
 init();