* Enhance checks for getSimNumber, fixes zabsalahid#121

Apollon77 · Dec 10, 2022 · a3fea7c · a3fea7c
1 parent da3a733
commit a3fea7c
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/lib/functions/modem.js b/lib/functions/modem.js
@@ -1289,20 +1289,28 @@ module.exports = function(SerialPort) {
       if (newpart.startsWith('+CNUM')) {
         let splitResult = newpart.split(',')
         if (splitResult.length > 0 && splitResult[1]) {
+          const nameMatch = /"(.*?)"/g.exec(splitResult[0]);
+          const numberMatch = /"(.*?)"/g.exec(splitResult[1]);
           return {
             resultData: {
               status: 'success',
               request: 'getOwnNumber',
               data: {
-                name: /"(.*?)"/g.exec(splitResult[0])[1],
-                number: /"(.*?)"/g.exec(splitResult[1])[1]
+                name: nameMatch ? nameMatch[1] : '',
+                number: numberMatch ? numberMatch[1] : ''
               }
             },
             returnResult: true
           }
         } else {
-          // TODO what will happen here?
-          newpart === 'ERROR'
+          return {
+            resultData: {
+              status: 'ERROR',
+              request: 'getOwnNumber',
+              data: `Cannot Parse Sim Number response "${newpart}"`
+            },
+            returnResult: true
+          }
         }
       } else if (newpart.includes('ERROR')) {
         return {