workaround for write command

Author: maxd-nordic

src/nrfcredstore/command_interface.py

@@ -113,9 +113,13 @@ def enable_error_codes(self):
     def at_command(self, at_command, wait_for_result=False, suppress_errors=False):
         """Write an AT command to the command interface. Optionally wait for OK"""
 
-        # AT commands are written directly as-is with the ATCommandInterface:
-        at_cmd_prefix = 'at ' if self.shell else ''
-        self.write_raw(f'{at_cmd_prefix}{at_command}')
+        if self.shell:
+            # transform line endings to match shell expectations
+            at_command = at_command.replace("\r", "")
+            at_command = at_command.replace("\n", "\\n")
+            self.write_raw("at '" + at_command + "'")
+        else:
+            self.write_raw(at_command)
 
         if wait_for_result:
             result, _ = self.comms.expect_response("OK", "ERROR", suppress_errors=suppress_errors)

src/nrfcredstore/comms.py

@@ -344,9 +344,10 @@ def expect_response(self, ok_str=None, error_str=None, store_str=None, timeout=1
             line = self.read_line()
             if line:
                 line = line.strip()
-                if ok_str and ok_str == ansi_escape.sub('', line):
+                line = ansi_escape.sub('', line)  # remove ANSI escape codes
+                if ok_str and ok_str == line:
                     return (True, output)
-                if error_str and error_str == ansi_escape.sub('', line):
+                if error_str and error_str == line:
                     return (False, output)
                 if line.startswith('+CME ERROR'):
                     code = int(line.replace('+CME ERROR: ', ''))

src/nrfcredstore/credstore.py

@@ -58,7 +58,7 @@ def list(self, tag = None, type: CredType = CredType.ANY) -> List[Credential]:
                 cmd = f'{cmd},{CredType(type).value}'
 
         self.command_interface.at_command(cmd, wait_for_result=False)
-        result, response = self.command_interface.comms.expect_response("OK", "ERROR", "%CMNG")
+        result, response = self.command_interface.comms.expect_response("OK", "ERROR", "%CMNG: ")
         if not result:
             raise RuntimeError("Failed to list credentials")
         response_lines = response.splitlines()
@@ -101,12 +101,14 @@ def keygen(self, tag: int, file: io.BufferedIOBase, attributes: str = ''):
             cmd = f'{cmd},"{attributes}"'
 
         self.command_interface.at_command(cmd, wait_for_result=False)
-        result, response = self.command_interface.comms.expect_response("OK", "ERROR", "%KEYGEN")
+        result, response = self.command_interface.comms.expect_response("OK", "ERROR", "%KEYGEN: ")
 
-        if result:
-            keygen_output = response.replace('%KEYGEN: "', '')
-            csr_der_b64 = keygen_output.split('.')[0]
-            csr_der_bytes = base64.urlsafe_b64decode(csr_der_b64 + '===')
-            file.write(csr_der_bytes)
+        if not result:
+            raise RuntimeError("Failed to generate key")
+
+        keygen_output = response.replace('%KEYGEN: "', '')
+        csr_der_b64 = keygen_output.split('.')[0]
+        csr_der_bytes = base64.urlsafe_b64decode(csr_der_b64 + '===')
+        file.write(csr_der_bytes)
 
         file.close()