Komodo / komodo-center-sms

Commit 9b38a77f17ba6bae85858487ae4473dbf59f8e33

Authored by Adhidarma Hadiwinoto 6 years ago

Exists in master

MODEM-CHOOSER new orders.

- by prefix
- unknown prefix
- last seen
- default

Showing 2 changed files with 11 additions and 6 deletions Inline Diff

config.sample.json
lib/modem-chooser.js

config.sample.json

Diff comments View file @ 9b38a77

 {
     "name": "SMS",
     "# messaging_url": "messaging service url",
     "messaging_url": "http://localhost:32979/",
     "# listen_port": "HTTP port untuk mendapat perintah dari CORE",
     "listen_port": 16480,
     "apiserver": {
         "# listen_port": "HTTP port untuk mendapat pesan masuk dari modem handler",
         "listen_port": 16481,
         "apikey": "PLEASE_CHANGE_ME"
     },
     "number_suffix": "@phonenumber",
     "modems": {
         "SMS0": {
             "url": "http://localhost:2110/sms",
             "apikey": "PLEASE_CHANGE_ME"
         }
     },
     "do_not_trim_long_sms": false,
     "default_modem": "SMS0",
     "# handler_chooser_algorithm": "algoritma untuk memilih modem dalam mengirim SMS. Pilihan: LAST-SEEN, FORCED. Default: LAST-SEEN",
     "handler_chooser_algorithm": "LAST-SEEN",
     "# sending handler": "list modem yang dipakai untuk mengirim jika handler_chooser_algorithm === 'FORCED'",
     "sending_handler": [
         "SMS0",
         "SMS1"
     ],
     "imsi_senders": {
         "prefix_names": {
             "TELKOMSEL": [
-                "510890944235402"
             ],
             "XL": [
-                "510890944262917"
             ]
         },
+        "unknown_prefix": [
+        ],
         "default": [
-            "510890944235513"
         ]
     },
     "redis": {
         "host": "127.0.0.1"

lib/modem-chooser.js

Diff comments View file @ 9b38a77

 'use strict';
 const prefixes = require('./prefixes');
 const modems = require('./modems2');
 const partnerLastSeen = require('./partner-last-seen');
 function filterOutCandidates(candidates) {
     if (!Array.isArray(candidates)) {
         return [];
     }
     return candidates.filter((item) => {
         if (item.indexOf('#') >= 0) return false;
         const modem = modems.get('by_imsi', item);
         if (!modem) return false;
         return true;
     });
 }
 exports.chooser = async function chooser(destination, config) {
     const logger = global.KOMODO_LOGGER;
     let prefixName = await prefixes.lookup(destination);
     if (typeof prefixName === 'string') {
         prefixName = prefixName.toUpperCase();
     }
     if (logger) logger.verbose('MODEM-CHOOSER: Choosing suitable senders', { destination, prefixName });
     let imsiSenders = [];
     if (config.imsi_senders && prefixName && config.imsi_senders.prefix_names && config.imsi_senders.prefix_names[prefixName]) {
         imsiSenders = filterOutCandidates(config.imsi_senders.prefix_names[prefixName]);
         if (logger) logger.verbose('MODEM-CHOOSER: Try to use imsi senders by prefix name', { destination, prefixName, imsiSenders });
     }
-    if (!imsiSenders.length && config.imsi_senders && config.imsi_senders.default && Array.isArray(config.imsi_senders.default) && config.imsi_senders.default.length) {
+    if (!imsiSenders.length && config.imsi_senders && config.imsi_senders.unknown_prefix) {
-        imsiSenders = filterOutCandidates(config.imsi_senders.default);
+        imsiSenders = filterOutCandidates(config.imsi_senders.unknown_prefix);
-        if (logger) logger.verbose('MODEM-CHOOSER: Try to use default senders', { destination, prefixName, imsiSenders });
+        if (logger) logger.verbose('MODEM-CHOOSER: Try to use senders for unknown prfix', { destination, prefixName, imsiSenders });
     }
     if (!imsiSenders.length) {
         imsiSenders = filterOutCandidates([ await partnerLastSeen.get(destination) ]);
         if (logger) logger.verbose('MODEM-CHOOSER: Try to use sender by last seen', { destination, prefixName, imsiSenders });
     }
+    if (!imsiSenders.length && config.imsi_senders && config.imsi_senders.default) {
+        imsiSenders = filterOutCandidates(config.imsi_senders.default);
+        if (logger) logger.verbose('MODEM-CHOOSER: Try to use default senders', { destination, prefixName, imsiSenders });
+    }
     if (!imsiSenders.length) {
         if (logger) logger.warn('MODEM-CHOOSER: No suitable sender found', { destination, prefixName });
         return;
     }
     const count = imsiSenders.length;
     const idx = Math.round(Math.random() * (count - 1));
     const imsiChoosed = imsiSenders[idx];
     if (logger) logger.verbose(`MODEM-CHOOSER: gonna use modem with IMSI ${imsiChoosed}`, { destination, prefixName, imsiSenders });
     return imsiChoosed;
 }