Commit 9f1ae94c23ce96ba5657bad6d6bbb9cc5da66734
1 parent
a966890fca
Exists in
master
DEBUG
Showing 1 changed file with 4 additions and 1 deletions Inline Diff
lib/modem-commands.js
1 | const MUTEX_COMMAND = 'COMMAND'; | 1 | const MUTEX_COMMAND = 'COMMAND'; |
2 | // const MUTEX_SUBCOMMAND = 'SUBCOMMAND'; | 2 | // const MUTEX_SUBCOMMAND = 'SUBCOMMAND'; |
3 | 3 | ||
4 | const ParserReadline = require('@serialport/parser-readline'); | 4 | const ParserReadline = require('@serialport/parser-readline'); |
5 | const ParserRegex = require('@serialport/parser-regex'); | 5 | const ParserRegex = require('@serialport/parser-regex'); |
6 | 6 | ||
7 | const logger = require('komodo-sdk/logger'); | 7 | const logger = require('komodo-sdk/logger'); |
8 | const mutex = require('./mutex-common'); | 8 | const mutex = require('./mutex-common'); |
9 | const parsers = require('./serialport-parsers'); | 9 | const parsers = require('./serialport-parsers'); |
10 | const modemInfo = require('./modem-info'); | 10 | const modemInfo = require('./modem-info'); |
11 | 11 | ||
12 | let port; | 12 | let port; |
13 | 13 | ||
14 | function writeToPort(data) { | 14 | function writeToPort(data) { |
15 | return new Promise((resolve) => { | 15 | return new Promise((resolve) => { |
16 | port.write(data, (err, bytesWritten) => { | 16 | port.write(data, (err, bytesWritten) => { |
17 | if (err) logger.warn(`ERROR: ${err.toString()}`); | 17 | if (err) logger.warn(`ERROR: ${err.toString()}`); |
18 | 18 | ||
19 | logger.verbose('OUTGOING', { bytesWritten, data: data.toString() }); | 19 | logger.verbose('OUTGOING', { bytesWritten, data: data.toString() }); |
20 | resolve(bytesWritten); | 20 | resolve(bytesWritten); |
21 | }); | 21 | }); |
22 | }); | 22 | }); |
23 | } | 23 | } |
24 | 24 | ||
25 | exports.writeToPortAndWaitForReadline = function writeToPortAndWaitForReadline(cmd, lockName) { | 25 | exports.writeToPortAndWaitForReadline = function writeToPortAndWaitForReadline(cmd, lockName) { |
26 | return new Promise(async (resolve) => { | 26 | return new Promise(async (resolve) => { |
27 | const parser = new ParserReadline({ delimiter: parsers.PARSER_READLINE_DELIMITER }); | 27 | const parser = new ParserReadline({ delimiter: parsers.PARSER_READLINE_DELIMITER }); |
28 | parser.on('data', (data) => { | 28 | parser.on('data', (data) => { |
29 | port.unpipe(parser); | 29 | port.unpipe(parser); |
30 | mutex.unlock(lockName || MUTEX_COMMAND, cmd.trim()); | 30 | mutex.unlock(lockName || MUTEX_COMMAND, cmd.trim()); |
31 | resolve(data); | 31 | resolve(data); |
32 | }); | 32 | }); |
33 | 33 | ||
34 | await mutex.lock(lockName || MUTEX_COMMAND, cmd.trim()); | 34 | await mutex.lock(lockName || MUTEX_COMMAND, cmd.trim()); |
35 | port.pipe(parser); | 35 | port.pipe(parser); |
36 | await writeToPort(cmd); | 36 | await writeToPort(cmd); |
37 | }); | 37 | }); |
38 | }; | 38 | }; |
39 | 39 | ||
40 | exports.writeToPortAndWaitForOkOrError = function writeToPortAndWaitForOkOrError(cmd, lockName) { | 40 | exports.writeToPortAndWaitForOkOrError = function writeToPortAndWaitForOkOrError(cmd, lockName) { |
41 | const parserName = 'customParserWaitForOkOrError'; | ||
41 | return new Promise(async (resolve) => { | 42 | return new Promise(async (resolve) => { |
42 | const parser = new ParserRegex({ regex: parsers.PARSER_WAIT_FOR_OK_OR_ERROR_REGEX }); | 43 | const parser = new ParserRegex({ regex: parsers.PARSER_WAIT_FOR_OK_OR_ERROR_REGEX }); |
43 | parser.on('data', (data) => { | 44 | parser.on('data', (data) => { |
44 | logger.verbose('INCOMING', { parser: 'customParserWaitForOkOrError', data: data.toString() }); | 45 | logger.verbose('INCOMING', { parser: parserName, data: data.toString() }); |
46 | logger.verbose(`Unpiping ${parserName}`); | ||
45 | port.unpipe(parser); | 47 | port.unpipe(parser); |
46 | mutex.unlock(lockName || MUTEX_COMMAND, cmd.trim()); | 48 | mutex.unlock(lockName || MUTEX_COMMAND, cmd.trim()); |
47 | resolve(data); | 49 | resolve(data); |
48 | }); | 50 | }); |
49 | 51 | ||
50 | await mutex.lock(lockName || MUTEX_COMMAND, cmd.trim()); | 52 | await mutex.lock(lockName || MUTEX_COMMAND, cmd.trim()); |
53 | logger.verbose(`Piping ${parserName}`); | ||
51 | port.pipe(parser); | 54 | port.pipe(parser); |
52 | await writeToPort(cmd); | 55 | await writeToPort(cmd); |
53 | }); | 56 | }); |
54 | }; | 57 | }; |
55 | 58 | ||
56 | exports.sleep = function sleep(ms) { | 59 | exports.sleep = function sleep(ms) { |
57 | return new Promise((resolve) => { | 60 | return new Promise((resolve) => { |
58 | setTimeout(() => { | 61 | setTimeout(() => { |
59 | resolve(); | 62 | resolve(); |
60 | }, ms || 0); | 63 | }, ms || 0); |
61 | }); | 64 | }); |
62 | }; | 65 | }; |
63 | 66 | ||
64 | 67 | ||
65 | exports.setPort = function setPort(val) { | 68 | exports.setPort = function setPort(val) { |
66 | port = val; | 69 | port = val; |
67 | }; | 70 | }; |
68 | 71 | ||
69 | exports.querySignalQuality = function querySignalQuality() { | 72 | exports.querySignalQuality = function querySignalQuality() { |
70 | return new Promise(async (resolve) => { | 73 | return new Promise(async (resolve) => { |
71 | if (!mutex.tryLock(MUTEX_COMMAND, 'querySignalQuality')) { | 74 | if (!mutex.tryLock(MUTEX_COMMAND, 'querySignalQuality')) { |
72 | resolve(false); | 75 | resolve(false); |
73 | return; | 76 | return; |
74 | } | 77 | } |
75 | 78 | ||
76 | await writeToPort('AT+CSQ\r'); | 79 | await writeToPort('AT+CSQ\r'); |
77 | mutex.unlock(MUTEX_COMMAND, 'querySignalQuality'); | 80 | mutex.unlock(MUTEX_COMMAND, 'querySignalQuality'); |
78 | resolve(true); | 81 | resolve(true); |
79 | }); | 82 | }); |
80 | }; | 83 | }; |
81 | 84 | ||
82 | exports.queryCOPS = function querySignalQuality() { | 85 | exports.queryCOPS = function querySignalQuality() { |
83 | return new Promise(async (resolve) => { | 86 | return new Promise(async (resolve) => { |
84 | await mutex.lock(MUTEX_COMMAND, 'queryCOPS'); | 87 | await mutex.lock(MUTEX_COMMAND, 'queryCOPS'); |
85 | await writeToPort('AT+COPS?\r'); | 88 | await writeToPort('AT+COPS?\r'); |
86 | mutex.unlock(MUTEX_COMMAND, 'queryCOPS'); | 89 | mutex.unlock(MUTEX_COMMAND, 'queryCOPS'); |
87 | resolve(true); | 90 | resolve(true); |
88 | }); | 91 | }); |
89 | }; | 92 | }; |
90 | 93 | ||
91 | exports.queryIMEI = function queryIMEI() { | 94 | exports.queryIMEI = function queryIMEI() { |
92 | return new Promise(async (resolve) => { | 95 | return new Promise(async (resolve) => { |
93 | const parser = new ParserRegex({ regex: parsers.PARSER_WAIT_FOR_OK_OR_ERROR_REGEX }); | 96 | const parser = new ParserRegex({ regex: parsers.PARSER_WAIT_FOR_OK_OR_ERROR_REGEX }); |
94 | parser.on('data', (data) => { | 97 | parser.on('data', (data) => { |
95 | logger.verbose('INCOMING', { parser: 'parserIMEI', data: data.toString() }); | 98 | logger.verbose('INCOMING', { parser: 'parserIMEI', data: data.toString() }); |
96 | port.unpipe(parser); | 99 | port.unpipe(parser); |
97 | mutex.unlock(MUTEX_COMMAND, 'queryIMEI'); | 100 | mutex.unlock(MUTEX_COMMAND, 'queryIMEI'); |
98 | modemInfo.imei = data.toString().trim(); | 101 | modemInfo.imei = data.toString().trim(); |
99 | resolve(modemInfo.imei); | 102 | resolve(modemInfo.imei); |
100 | }); | 103 | }); |
101 | 104 | ||
102 | await mutex.lock(MUTEX_COMMAND, 'queryIMEI'); | 105 | await mutex.lock(MUTEX_COMMAND, 'queryIMEI'); |
103 | 106 | ||
104 | port.pipe(parser); | 107 | port.pipe(parser); |
105 | await writeToPort('AT+CGSN\r'); | 108 | await writeToPort('AT+CGSN\r'); |
106 | }); | 109 | }); |
107 | }; | 110 | }; |
108 | 111 | ||
109 | exports.queryIMSI = function queryIMSI() { | 112 | exports.queryIMSI = function queryIMSI() { |
110 | return new Promise(async (resolve) => { | 113 | return new Promise(async (resolve) => { |
111 | const parser = new ParserRegex({ regex: parsers.PARSER_WAIT_FOR_OK_OR_ERROR_REGEX }); | 114 | const parser = new ParserRegex({ regex: parsers.PARSER_WAIT_FOR_OK_OR_ERROR_REGEX }); |
112 | parser.on('data', (data) => { | 115 | parser.on('data', (data) => { |
113 | logger.verbose('INCOMING', { parser: 'parserIMSI', data: data.toString() }); | 116 | logger.verbose('INCOMING', { parser: 'parserIMSI', data: data.toString() }); |
114 | port.unpipe(parser); | 117 | port.unpipe(parser); |
115 | mutex.unlock(MUTEX_COMMAND, 'queryIMSI'); | 118 | mutex.unlock(MUTEX_COMMAND, 'queryIMSI'); |
116 | modemInfo.imsi = data.toString().trim(); | 119 | modemInfo.imsi = data.toString().trim(); |
117 | resolve(modemInfo.imsi); | 120 | resolve(modemInfo.imsi); |
118 | }); | 121 | }); |
119 | 122 | ||
120 | await mutex.lock(MUTEX_COMMAND, 'queryIMSI'); | 123 | await mutex.lock(MUTEX_COMMAND, 'queryIMSI'); |
121 | 124 | ||
122 | port.pipe(parser); | 125 | port.pipe(parser); |
123 | await writeToPort('AT+CIMI\r'); | 126 | await writeToPort('AT+CIMI\r'); |
124 | }); | 127 | }); |
125 | }; | 128 | }; |
126 | 129 |