Don’t trigger timeouts for ignored keystrokes

Author: joshheald

WooCommerce/Classes/POS/Presentation/Barcode Scanning/HIDBarcodeParser.swift

@@ -30,15 +30,12 @@ final class HIDBarcodeParser {
             return
         }
 
-        // If characters are entered too slowly, it's probably typing and we should ignore the old input.
-        // The key we just recieved is still considered for adding to the buffer – we may simply reset the buffer first.
-        checkForTimeoutBetweenKeystrokes()
-
         let character = key.characters
         if configuration.terminatingStrings.contains(character) {
             processScan()
         } else {
             guard !excludedKeys.contains(key.keyCode) else { return }
+            checkForTimeoutBetweenKeystrokes()
             buffer.append(character)
         }
     }
@@ -61,6 +58,8 @@ final class HIDBarcodeParser {
     }
 
     private func checkForTimeoutBetweenKeystrokes() {
+        // If characters are entered too slowly, it's probably typing and we should ignore the old input.
+        // The key we just recieved is still considered for adding to the buffer – we may simply reset the buffer first.
         let currentTime = timeProvider.now()
 
         if let lastTime = lastKeyPressTime,
@@ -164,6 +163,7 @@ final class HIDBarcodeParser {
     }
 
     private func processScan() {
+        checkForTimeoutBetweenKeystrokes()
         if buffer.count >= configuration.minimumBarcodeLength {
             onScan(.success(buffer))
         } else {

WooCommerce/WooCommerceTests/POS/Presentation/Barcode Scanning/HIDBarcodeParserTests.swift

@@ -334,6 +334,65 @@ struct HIDBarcodeParserTests {
             Issue.record("Expected failure result")
         }
     }
+
+    @Test("Parser does not show an error row for empty scan")
+    func testEmptyScanDoesntError() {
+        var results: [Result<String, Error>] = []
+        let parser = HIDBarcodeParser(
+            configuration: testConfiguration,
+            onScan: { result in
+                results.append(result)
+            }
+        )
+
+        // Just send the terminator, no scan input
+        parser.processKeyPress(MockUIKey(character: "\r"))
+
+        #expect(results.isEmpty)
+    }
+
+    @Test("Parser does not start a timeout for an ignored character")
+    func testEmptyScanDoesntStartTimeoutForIgnoredCharacter() {
+        var results: [Result<String, Error>] = []
+        let mockTimeProvider = MockTimeProvider()
+        let parser = HIDBarcodeParser(
+            configuration: testConfiguration,
+            onScan: { result in
+                results.append(result)
+            },
+            timeProvider: mockTimeProvider
+        )
+
+        // Scan a barcode with two terminators, then scan another barcode – only the two codes should be parsed
+        parser.processKeyPress(MockUIKey(character: "1"))
+        parser.processKeyPress(MockUIKey(character: "2"))
+        parser.processKeyPress(MockUIKey(character: "3"))
+        parser.processKeyPress(MockUIKey(character: "\r")) // Scan is recognised here
+        parser.processKeyPress(MockUIKey(character: "\n", keyCode: .keyboardDownArrow)) // This is ignored
+
+        // Time between scans
+        mockTimeProvider.advance(by: 1.5)
+
+        // Scan the second barcode
+        parser.processKeyPress(MockUIKey(character: "4")) // Risk of an error row here if `\n` isn't ignored
+        parser.processKeyPress(MockUIKey(character: "5"))
+        parser.processKeyPress(MockUIKey(character: "6"))
+        parser.processKeyPress(MockUIKey(character: "\r"))
+        parser.processKeyPress(MockUIKey(character: "\n", keyCode: .keyboardDownArrow))
+
+
+        #expect(results.count == 2)
+        if case .success(let barcode1) = results[0] {
+            #expect(barcode1 == "123")
+        } else {
+            Issue.record("Expected success result for first scan")
+        }
+        if case .success(let barcode2) = results[1] {
+            #expect(barcode2 == "456")
+        } else {
+            Issue.record("Expected success result for second scan")
+        }
+    }
 }
 
 // MARK: - Test Helpers