KlapProtocol immediate relogin if protocol invalid v1.1

In case of HTTP403 response to a request, the binding now executes repeat login and then retries the request, avoiding unnecessary device-offline report.
This situation typically occurs if a Tapo Hub or Tapo-App is also polling the Tapo device.
(Copilot issues addressed 1.1)
Closes #20316

Signed-off-by: David Henshaw <david@henshaws.me>

Author: dghenshaw

bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/api/protocol/klap/KlapCipher.java

@@ -102,7 +102,7 @@ public byte[] encrypt(String str) throws TapoErrorHandler {
             Cipher encodeCipher = getCipher(Cipher.ENCRYPT_MODE, ivSeq);
             byte[] msg = str.getBytes(CIPHER_CHARSET);
             byte[] cipherText = encodeCipher.doFinal(msg);
-            byte[] signature = sha256Encode(concatBytes(sig, BigInteger.valueOf(ivSeq).toByteArray(), cipherText));
+            byte[] signature = sha256Encode(concatBytes(sig, getIv(ivSeq), cipherText));
             return concatBytes(signature, cipherText);
         } catch (Exception e) {
             throw new TapoErrorHandler(ERR_DATA_ENCRYPTING, e.getMessage());
@@ -129,13 +129,13 @@ public String decrypt(byte[] byteArr, int ivSeq) throws TapoErrorHandler {
      * @param ivSeq ivSequence-Number
      */
     private byte[] getIv(int ivSeq) throws TapoErrorHandler {
-        /* seq must be 4 bytes long */
+        /* return Iv, must be 4 bytes long */
         byte[] seq = new byte[4];
         seq[0] = (byte) (ivSeq >>> 24);
         seq[1] = (byte) (ivSeq >>> 16);
         seq[2] = (byte) (ivSeq >>> 8);
         seq[3] = (byte) ivSeq;
-        return concatBytes(iv, seq);
+        return seq;
     }
 
     /************************
@@ -202,4 +202,5 @@ private Cipher getCipher(int opMode, int ivSeq) throws TapoErrorHandler {
             throw new TapoErrorHandler(e);
         }
     }
+
 }

bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/api/protocol/klap/KlapProtocol.java

@@ -51,7 +51,7 @@ public class KlapProtocol implements org.openhab.binding.tapocontrol.internal.ap
     protected final TapoConnectorInterface httpDelegator;
     private KlapSession session;
     private String uid;
-    private ExecutorService executor = Executors.newSingleThreadExecutor();
+    private ExecutorService executor = Executors.newVirtualThreadPerTaskExecutor();
 
     /***********************
      * Init Class
@@ -137,7 +137,7 @@ public void sendAsyncRequest(TapoBaseRequestInterface tapoRequest) throws TapoEr
      * pushes (decrypted) TapoResponse to [httpDelegator.handleResponse()]-function
      * retries login+command if Http 403 response indicates klap protocol no longer valid
      */
-    private void sendRequestRetryable(TapoBaseRequestInterface tapoRequest) throws TapoErrorHandler {
+    private synchronized void sendRequestRetryable(TapoBaseRequestInterface tapoRequest) throws TapoErrorHandler {
         /*
          * send request, and retry with re-login if protocol rejected
          * (Protocol can be rejected due to polling from another device e.g. Tapo App, or Tapo H100 Hub)
@@ -231,6 +231,7 @@ private void sendRequestRetryable(TapoBaseRequestInterface tapoRequest) throws T
                 httpDelegator.handleError(new TapoErrorHandler(ERR_BINDING_CONNECT_TIMEOUT, errorMessage));
                 return;
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 throw new TapoErrorHandler(e, "error sending content");
             } catch (Exception e) {
                 String errorMessage = e.getMessage();