Merge pull request #5 from AlessandroFlati/develop

Develop

Author: AlessandroFlati

BlueStacksAgent/actuators/__init__.py

@@ -1,2 +1,3 @@
 # Expose actuator base class for easy import
-from .base import BaseActuator
+from .base import *
+from .adb_actuator import AdbActuator, AntiDetectionAdbActuator

BlueStacksAgent/actuators/adb_actuator.py

@@ -0,0 +1,160 @@
+import abc
+
+import numpy as np
+from adbutils import AdbDevice
+
+from BlueStacksAgent import BaseActuator
+
+
+class AdbActuator(BaseActuator, abc.ABC):
+    def __init__(self, adb_device: AdbDevice, adb_serial: str):
+        super().__init__()
+        self.adb_device: AdbDevice = adb_device
+        self.adb_serial: str = adb_serial
+
+    def tap(self, x, y):
+        self.adb_device.shell(f"input tap {x} {y}")
+
+    def swipe(self, x1, y1, x2, y2, duration):
+        self.adb_device.shell(f"input swipe {x1} {y1} {x2} {y2} {duration}")
+
+    def keyevent(self, key):
+        self.adb_device.shell(f"input keyevent {key}")
+
+    def text(self, text):
+        self.adb_device.shell(f"input text {text}")
+
+    def press(self, key):
+        self.adb_device.shell(f"input press {key}")
+
+    def longpress(self, key):
+        self.adb_device.shell(f"input longpress {key}")
+
+
+class AntiDetectionModifier:
+    """
+    This class is used to modify the behavior of the AdbActuator to avoid detection.
+    """
+
+    @staticmethod
+    def randomize(x, y, width, height, margin=0.05) -> (int, int):
+        """
+        Changes the coordinates to avoid detection, making a normal distribution around the center of the tap area
+        In order to avoid overflow, the coordinates are clipped to the allowed area minus a small margin
+        :param x: center x-coordinate of the tap
+        :param y: center y-coordinate of the tap
+        :param width: width of the allowed area to tap
+        :param height: height of the allowed area to tap
+        :return: the modified coordinates
+        """
+
+        x = max(int(np.random.normal(x, width * (1 - margin) // 4)), x - width * (1 - margin) // 2)
+        x = min(x, x + width * (1 - margin) // 2)
+
+        y = max(int(np.random.normal(y, height * (1 - margin) // 4)), y - height * (1 - margin) // 2)
+        y = min(y, y + height * (1 - margin) // 2)
+
+        return x, y
+
+    @staticmethod
+    def tap(x, y, width, height) -> (int, int):
+        """
+        Modify the tap coordinates to avoid detection.
+        :param x: center x-coordinate of the tap
+        :param y: center y-coordinate of the tap
+        :param width: width of the allowed area to tap
+        :param height: height of the allowed area to tap
+        :return: the modified coordinates
+        """
+
+        return AntiDetectionModifier.randomize(x, y, width, height)
+
+    @staticmethod
+    def swipe(x1, y1, x2, y2, width1, height1, width2, height2) -> (int, int, int, int):
+        """
+        Modify the swipe coordinates to avoid detection.
+        :param x1: start x-coordinate of the swipe
+        :param y1: start y-coordinate of the swipe
+        :param x2: end x-coordinate of the swipe
+        :param y2: end y-coordinate of the swipe
+        :param width1: width of the allowed area to start the swipe
+        :param height1: height of the allowed area to start the swipe
+        :param width2: width of the allowed area to end the swipe
+        :param height2: height of the allowed area to end the swipe
+        :return: the modified coordinates
+        """
+
+        x1, y1 = AntiDetectionModifier.randomize(x1, y1, width1, height1)
+        x2, y2 = AntiDetectionModifier.randomize(x2, y2, width2, height2)
+
+        return x1, y1, x2, y2
+
+    @staticmethod
+    def keyevent(key) -> int:
+        """
+        Modify the keyevent to avoid detection.
+        :param key: the key to press
+        :return: the modified key
+        """
+
+        return key
+
+    @staticmethod
+    def text(text) -> str:
+        """
+        Modify the text to avoid detection.
+        :param text: the text to input
+        :return: the modified text
+        """
+
+        return text
+
+    @staticmethod
+    def press(key) -> int:
+        """
+        Modify the press to avoid detection.
+        :param key: the key to press
+        :return: the modified key
+        """
+
+        return key
+
+    @staticmethod
+    def longpress(key) -> int:
+        """
+        Modify the longpress to avoid detection.
+        :param key: the key to press
+        :return: the modified key
+        """
+
+        return key
+
+
+class AntiDetectionAdbActuator(BaseActuator, abc.ABC):
+    def __init__(self, adb_device: AdbDevice, adb_serial: str):
+        super().__init__()
+        self.adb_actuator = AdbActuator(adb_device, adb_serial)
+
+    def tap(self, x, y, width, height):
+        x, y = AntiDetectionModifier.tap(x, y, width, height)
+        self.adb_actuator.tap(x, y)
+
+    def swipe(self, x1, y1, x2, y2, width1, height1, width2, height2, duration):
+        x1, y1, x2, y2 = AntiDetectionModifier.swipe(x1, y1, x2, y2, width1, height1, width2, height2)
+        self.adb_actuator.swipe(x1, y1, x2, y2, duration)
+
+    def keyevent(self, key):
+        key = AntiDetectionModifier.keyevent(key)
+        self.adb_actuator.keyevent(key)
+
+    def text(self, text):
+        text = AntiDetectionModifier.text(text)
+        self.adb_actuator.text(text)
+
+    def press(self, key):
+        key = AntiDetectionModifier.press(key)
+        self.adb_actuator.press(key)
+
+    def longpress(self, key):
+        key = AntiDetectionModifier.longpress(key)
+        self.adb_actuator.longpress(key)

BlueStacksAgent/agents/__init__.py

@@ -1,3 +1,3 @@
 # Expose agents for easy import
-from .base import BaseAgent
-from .scrcpy_agent import ScrcpyAgent
+from .base import *
+from .scrcpy_agent import *

pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "BlueStacksAgent"
-version = "0.1.0"
+version = "0.2.0"
 description = "A Python library for real-time interaction with BlueStacks using scrcpy, minicap, and MediaProjection."
 readme = "README.md"
-requires-python = ">=3.7"
+requires-python = ">=3.7, <3.11"
 license = { file = "LICENSE" }
 dependencies = [
     "scrcpy-client",

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="BlueStacksAgent",
-    version="0.1.0",
+    version="0.2.0",
     description="A Python library for real-time interaction with BlueStacks using scrcpy, minicap, and MediaProjection.",
     long_description=open("README.md", encoding="utf8").read(),
     long_description_content_type="text/markdown",