Added optional wait variance

inputremapper/injection/macros/macro.py

@@ -40,6 +40,7 @@
 import copy
 import math
 import re
+import random
 from typing import List, Callable, Awaitable, Tuple, Optional, Union, Any
 
 from evdev.ecodes import (
@@ -540,12 +541,21 @@ async def task(handler: Callable):
 
         self.tasks.append(task)
 
-    def add_wait(self, time: Union[int, float]):
+    def add_wait(self, time: Union[str, int], max_time=None):
         """Wait time in milliseconds."""
-        time = _type_check(time, [int, float], "wait", 1)
+        time = _type_check(time, [int], "wait", 1)
+        max_time = _type_check(max_time, [int,None], "wait", 2)
 
         async def task(_):
-            await asyncio.sleep(_resolve(time, [int, float]) / 1000)
+            resolved_min_time = _resolve(time, [int])
+            resolved_max_time = _resolve(max_time, [int])
+
+            if resolved_max_time is not None and resolved_max_time > resolved_min_time:
+                variabletime = random.randint(resolved_min_time, resolved_max_time)
+            else:
+                variabletime = resolved_min_time
+
+            await asyncio.sleep(variabletime / 1000)
 
         self.tasks.append(task)
 

tests/unit/test_macros.py

@@ -915,6 +915,39 @@ async def test_6(self):
         self.assertIsInstance(macro, Macro)
         self.assertListEqual(self.result, [])
 
+    async def test_wait_1(self):
+        macro = parse("wait(10).key(1)", self.context, DummyMapping, True)
+        one_code = system_mapping.get("1")
+
+        await macro.run(self.handler)
+        self.assertListEqual(
+            self.result,
+            [(EV_KEY, one_code, 1), (EV_KEY, one_code, 0)],
+        )
+        self.assertEqual(len(macro.child_macros), 0)
+
+    async def test_wait_2(self):
+        macro = parse("wait(10,100).key(1)", self.context, DummyMapping, True)
+        one_code = system_mapping.get("1")
+
+        await macro.run(self.handler)
+        self.assertListEqual(
+            self.result,
+            [(EV_KEY, one_code, 1), (EV_KEY, one_code, 0)],
+        )
+        self.assertEqual(len(macro.child_macros), 0)
+
+    async def test_wait_3(self):
+        macro = parse("set(a,100).wait(10, $a).key(1)", self.context, DummyMapping, True)
+        one_code = system_mapping.get("1")
+
+        await macro.run(self.handler)
+        self.assertListEqual(
+            self.result,
+            [(EV_KEY, one_code, 1), (EV_KEY, one_code, 0)],
+        )
+        self.assertEqual(len(macro.child_macros), 0)
+
     async def test_duplicate_run(self):
         # it won't restart the macro, because that may screw up the
         # internal state (in particular the _trigger_release_event).