Komodo / komodo-center-sms

Download as
Browse Code ยป

Commit ddce9d65dacfda722ef6cee8098d1500528b6c22

Authored by Adhidarma Hadiwinoto
1 parent bf4cb9aaaf
Exists in master

DEBUG

Showing 1 changed file with 16 additions and 17 deletions Side-by-side Diff

lib/modem-chooser.js
Diff comments   View file @ ddce9d6
... ... @@ -32,38 +32,37 @@ exports.chooser = async function chooser(destination, config) {
32 32  
33 33 if (logger) logger.verbose('MODEM-CHOOSER: Choosing suitable senders', { destination, prefixName });
34 34  
35   - let imsiSenders = [];
  35 + let sendersImsi = [];
36 36 if (config.senders_imsi && prefixName && config.senders_imsi.prefix_names && config.senders_imsi.prefix_names[prefixName]) {
37   - imsiSenders = filterOutCandidates(config.senders_imsi.prefix_names[prefixName]);
38   - if (logger) logger.verbose('MODEM-CHOOSER: Try to use imsi senders by prefix name', { destination, prefixName, imsiSenders });
  37 + sendersImsi = filterOutCandidates(config.senders_imsi.prefix_names[prefixName]);
  38 + if (logger) logger.verbose('MODEM-CHOOSER: Try to use imsi senders by prefix name', { destination, prefixName, sendersImsi, candidates: config.senders_imsi.prefix_names[prefixName] });
39 39 }
40 40  
41   - if (!imsiSenders.length && config.senders_imsi && config.senders_imsi.unknown_prefix) {
42   - imsiSenders = filterOutCandidates(config.senders_imsi.unknown_prefix);
43   - if (logger) logger.verbose('MODEM-CHOOSER: Try to use senders for unknown prefix', { destination, prefixName, imsiSenders });
  41 + if (!sendersImsi.length && config.senders_imsi && config.senders_imsi.unknown_prefix) {
  42 + sendersImsi = filterOutCandidates(config.senders_imsi.unknown_prefix);
  43 + if (logger) logger.verbose('MODEM-CHOOSER: Try to use senders for unknown prefix', { destination, prefixName, sendersImsi, candidates: config.senders_imsi.unknown_prefix });
44 44 }
45 45  
46   - if (!imsiSenders.length) {
47   - imsiSenders = filterOutCandidates([ await partnerLastSeen.get(destination) ]);
48   - if (logger) logger.verbose('MODEM-CHOOSER: Try to use sender by last seen', { destination, prefixName, imsiSenders });
  46 + if (!sendersImsi.length) {
  47 + sendersImsi = filterOutCandidates([ await partnerLastSeen.get(destination) ]);
  48 + if (logger) logger.verbose('MODEM-CHOOSER: Try to use sender by last seen', { destination, prefixName, sendersImsi });
49 49 }
50 50  
51   - if (!imsiSenders.length && config.senders_imsi && config.senders_imsi.default) {
52   - imsiSenders = filterOutCandidates(config.senders_imsi.default);
53   - if (logger) logger.verbose('MODEM-CHOOSER: Try to use default senders', { destination, prefixName, imsiSenders });
  51 + if (!sendersImsi.length && config.senders_imsi && config.senders_imsi.default) {
  52 + sendersImsi = filterOutCandidates(config.senders_imsi.default);
  53 + if (logger) logger.verbose('MODEM-CHOOSER: Try to use default senders', { destination, prefixName, sendersImsi, candidates: config.senders_imsi.default });
54 54 }
55 55  
56   -
57   - if (!imsiSenders.length) {
  56 + if (!sendersImsi.length) {
58 57 if (logger) logger.warn('MODEM-CHOOSER: No suitable sender found', { destination, prefixName });
59 58 return;
60 59 }
61 60  
62   - const count = imsiSenders.length;
  61 + const count = sendersImsi.length;
63 62 const idx = Math.round(Math.random() * (count - 1));
64   - const imsiChoosed = imsiSenders[idx];
  63 + const imsiChoosed = sendersImsi[idx];
65 64  
66   - if (logger) logger.verbose(`MODEM-CHOOSER: gonna use modem with IMSI ${imsiChoosed}`, { destination, prefixName, imsiSenders });
  65 + if (logger) logger.verbose(`MODEM-CHOOSER: gonna use modem with IMSI ${imsiChoosed}`, { destination, prefixName, imsiSenders: sendersImsi });
67 66  
68 67 return imsiChoosed;
69 68 }
70 69 \ No newline at end of file