Komodo / komodo-modem-sms

Download as
Browse Code ยป

Commit 9883a918f3b35125a4a3fd583bd6a7b76b6469f1

Authored by Adhidarma Hadiwinoto
1 parent 5b0551633c
Exists in master

Urutan log

Showing 2 changed files with 5 additions and 9 deletions Side-by-side Diff

lib/modem-commands.js
Diff comments   View file @ 9883a91
... ... @@ -16,7 +16,7 @@ function writeToPort(data) {
16 16 port.write(data, (err, bytesWritten) => {
17 17 if (err) logger.warn(`ERROR: ${err.toString()}`);
18 18  
19   - logger.verbose('OUTGOING', { bytesWritten, data: data.toString() });
  19 + logger.verbose('OUTGOING', { data: data.toString(), bytesWritten, err });
20 20 resolve(bytesWritten);
21 21 });
22 22 });
... ... @@ -38,19 +38,15 @@ exports.writeToPortAndWaitForReadline = function writeToPortAndWaitForReadline(c
38 38 };
39 39  
40 40 exports.writeToPortAndWaitForOkOrError = function writeToPortAndWaitForOkOrError(cmd, lockName) {
41   - const parserName = 'customParserWaitForOkOrError';
42 41 return new Promise(async (resolve) => {
43 42 const parser = new ParserRegex({ regex: /(?:OK|ERROR)\r\n/ });
44 43 parser.on('data', (data) => {
45   - logger.verbose('INCOMING', { parser: parserName, data: data.toString() });
46   - logger.verbose(`Unpiping ${parserName}`);
47 44 port.unpipe(parser);
48 45 mutex.unlock(lockName || MUTEX_COMMAND, cmd.trim());
49 46 resolve(data);
50 47 });
51 48  
52 49 await mutex.lock(lockName || MUTEX_COMMAND, cmd.trim());
53   - logger.verbose(`Piping ${parserName}`);
54 50 port.pipe(parser);
55 51 await writeToPort(cmd);
56 52 });
... ... @@ -95,7 +91,7 @@ exports.queryIMEI = function queryIMEI() {
95 91 return new Promise(async (resolve) => {
96 92 const parser = new ParserRegex({ regex: parsers.PARSER_WAIT_FOR_OK_OR_ERROR_REGEX });
97 93 parser.on('data', (data) => {
98   - logger.verbose('INCOMING', { parser: 'parserIMEI', data: data.toString() });
  94 + logger.verbose('INCOMING', { data: data.toString(), parser: 'parserIMEI' });
99 95 port.unpipe(parser);
100 96 mutex.unlock(MUTEX_COMMAND, 'queryIMEI');
101 97 modemInfo.imei = data.toString().trim();
... ... @@ -113,7 +109,7 @@ exports.queryIMSI = function queryIMSI() {
113 109 return new Promise(async (resolve) => {
114 110 const parser = new ParserRegex({ regex: parsers.PARSER_WAIT_FOR_OK_OR_ERROR_REGEX });
115 111 parser.on('data', (data) => {
116   - logger.verbose('INCOMING', { parser: 'parserIMSI', data: data.toString() });
  112 + logger.verbose('INCOMING', { data: data.toString(), parser: 'parserIMSI' });
117 113 port.unpipe(parser);
118 114 mutex.unlock(MUTEX_COMMAND, 'queryIMSI');
119 115 modemInfo.imsi = data.toString().trim();
lib/serialport-parsers.js
Diff comments   View file @ 9883a91
... ... @@ -90,7 +90,7 @@ function isResultCodeIs(data, resultCode) {
90 90  
91 91 const parserReadline = new ParserReadline({ delimiter: PARSER_READLINE_DELIMITER });
92 92 parserReadline.on('data', (data) => {
93   - logger.verbose('INCOMING', { parser: 'parserReadLine', data: `${data.toString()}${PARSER_READLINE_DELIMITER}` });
  93 + logger.verbose('INCOMING', { data: `${data.toString()}${PARSER_READLINE_DELIMITER}`, parser: 'parserReadLine' });
94 94  
95 95 if (!data) return;
96 96  
... ... @@ -121,7 +121,7 @@ parserReadline.on('data', (data) => {
121 121  
122 122 const parserWaitForOkOrError = new ParserRegex({ regex: PARSER_WAIT_FOR_OK_OR_ERROR_REGEX });
123 123 parserWaitForOkOrError.on('data', (data) => {
124   - logger.verbose('INCOMING', { parser: 'parserWaitForOkOrError', data: data.toString() });
  124 + logger.verbose('INCOMING', { data: data.toString(), parser: 'parserWaitForOkOrError' });
125 125 });
126 126  
127 127