Commit 9b38a77f17ba6bae85858487ae4473dbf59f8e33

Authored by Adhidarma Hadiwinoto
1 parent 5157ab43c3
Exists in master

MODEM-CHOOSER new orders.

- by prefix
- unknown prefix
- last seen
- default

Showing 2 changed files with 11 additions and 6 deletions Side-by-side Diff

... ... @@ -38,14 +38,13 @@
38 38 "imsi_senders": {
39 39 "prefix_names": {
40 40 "TELKOMSEL": [
41   - "510890944235402"
42 41 ],
43 42 "XL": [
44   - "510890944262917"
45 43 ]
46 44 },
  45 + "unknown_prefix": [
  46 + ],
47 47 "default": [
48   - "510890944235513"
49 48 ]
50 49 },
51 50  
lib/modem-chooser.js
... ... @@ -35,9 +35,9 @@ exports.chooser = async function chooser(destination, config) {
35 35 if (logger) logger.verbose('MODEM-CHOOSER: Try to use imsi senders by prefix name', { destination, prefixName, imsiSenders });
36 36 }
37 37  
38   - if (!imsiSenders.length && config.imsi_senders && config.imsi_senders.default && Array.isArray(config.imsi_senders.default) && config.imsi_senders.default.length) {
39   - imsiSenders = filterOutCandidates(config.imsi_senders.default);
40   - if (logger) logger.verbose('MODEM-CHOOSER: Try to use default senders', { destination, prefixName, imsiSenders });
  38 + if (!imsiSenders.length && config.imsi_senders && config.imsi_senders.unknown_prefix) {
  39 + imsiSenders = filterOutCandidates(config.imsi_senders.unknown_prefix);
  40 + if (logger) logger.verbose('MODEM-CHOOSER: Try to use senders for unknown prfix', { destination, prefixName, imsiSenders });
41 41 }
42 42  
43 43 if (!imsiSenders.length) {
... ... @@ -45,6 +45,12 @@ exports.chooser = async function chooser(destination, config) {
45 45 if (logger) logger.verbose('MODEM-CHOOSER: Try to use sender by last seen', { destination, prefixName, imsiSenders });
46 46 }
47 47  
  48 + if (!imsiSenders.length && config.imsi_senders && config.imsi_senders.default) {
  49 + imsiSenders = filterOutCandidates(config.imsi_senders.default);
  50 + if (logger) logger.verbose('MODEM-CHOOSER: Try to use default senders', { destination, prefixName, imsiSenders });
  51 + }
  52 +
  53 +
48 54 if (!imsiSenders.length) {
49 55 if (logger) logger.warn('MODEM-CHOOSER: No suitable sender found', { destination, prefixName });
50 56 return;