computer-use-ootb-internal 0.0.134__tar.gz → 0.0.136__tar.gz

{computer_use_ootb_internal-0.0.134 → computer_use_ootb_internal-0.0.136}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: computer-use-ootb-internal
-Version: 0.0.134
+Version: 0.0.136
 Summary: Computer Use OOTB
 Author-email: Siyuan Hu <siyuan.hu.sg@gmail.com>
 Requires-Python: >=3.11

{computer_use_ootb_internal-0.0.134 → computer_use_ootb_internal-0.0.136}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "computer-use-ootb-internal"
-version = "0.0.134"
+version = "0.0.136"
 description = "Computer Use OOTB"
 authors = [{ name = "Siyuan Hu", email = "siyuan.hu.sg@gmail.com" }]
 requires-python = ">=3.11"

{computer_use_ootb_internal-0.0.134 → computer_use_ootb_internal-0.0.136}/src/computer_use_ootb_internal/guard_service.py

@@ -703,13 +703,14 @@ class GuardService(win32serviceutil.ServiceFramework):
              return "failed_exception"
 
     def create_or_update_logon_task(self, username):
-        """Creates/updates task to run OOTB app via cmd /K on session connect (RDP/Console)."""
+        """Creates/updates task to run OOTB app via cmd /K on session connect/reconnect."""
         if not self.target_executable_path:
             self.log_error(f"Cannot create task for {username}: Target executable path is not set.")
             return False
 
-        task_name = f"OOTB_UserConnect_{username}" # Renamed task slightly
-        action_executable = "cmd.exe"
+        task_name = f"OOTB_UserConnect_{username}"
+        # Action: Revert to running the actual executable via cmd /K
+        action_executable = 'cmd.exe'
         action_arguments = f'/K "{self.target_executable_path}"'
         safe_action_executable = action_executable.replace("'", "''")
         safe_action_arguments = action_arguments.replace("'", "''")
@@ -717,55 +718,43 @@ class GuardService(win32serviceutil.ServiceFramework):
         # Explicitly set the working directory to the executable's location
         try:
             executable_dir = os.path.dirname(self.target_executable_path.strip('"'))
-            if not executable_dir: # Handle case where path might be just the exe name
-                 executable_dir = "." # Use current directory as fallback?
-                 self.log_warning(f"Could not determine directory for {self.target_executable_path}, task WorkingDirectory might be incorrect.")
+            if not executable_dir: executable_dir = "."
             safe_working_directory = executable_dir.replace("'", "''")
             working_directory_setting = f"$action.WorkingDirectory = '{safe_working_directory}'"
         except Exception as e:
-             self.log_error(f"Error determining working directory for task: {e}. WorkingDirectory will not be set.")
-             working_directory_setting = "# Could not set WorkingDirectory" # Comment out in PS script
+             self.log_error(f"Error determining working directory for task: {e}. WD will not be set.")
+             working_directory_setting = "# Could not set WorkingDirectory"
 
         # PowerShell command construction
         ps_command = f"""
         $taskName = "{task_name}"
         $principal = New-ScheduledTaskPrincipal -UserId "{username}" -LogonType Interactive
         
-        # Action: Run cmd.exe with /K, setting the working directory
+        # Action: Run the OOTB executable via cmd /K
         $action = New-ScheduledTaskAction -Execute '{safe_action_executable}' -Argument '{safe_action_arguments}'
-        {working_directory_setting}
+        {working_directory_setting} # Set the working directory
 
-        # Trigger: On session connect/reconnect events for Terminal Services
+        # Triggers: On session connect (21) AND reconnect (25)
         $logName = 'Microsoft-Windows-TerminalServices-LocalSessionManager/Operational'
         $source = 'Microsoft-Windows-TerminalServices-LocalSessionManager'
-        $eventIDs = @(21, 25) # 21=SessionLogon, 25=SessionReconnect
-        # The Principal -UserId should ensure this only runs for the target user when they connect
-        $trigger = New-ScheduledTaskTrigger -AtLogOn # Keep AtLogOn as a fallback?
-        # --- Let's stick to ONE trigger type first. Replacing AtLogOn with Event --- 
-        # $trigger = New-ScheduledTaskTrigger -AtLogOn -User "{username}" 
-        # Add a 15 second delay to allow the session to potentially settle
-        $trigger = New-ScheduledTaskTrigger -Event -LogName $logName -Source $source -EventId $eventIDs[0] -Delay 'PT15S' # Primary trigger with delay
-        # Register additional triggers if needed, or handle logic differently.
-        # For simplicity, let's try one event trigger first (ID 21). If reconnect (25) is needed, we can add it.
-        # Consider adding delay: -Delay 'PT15S' # Delay 15 seconds after event?
+        # Define multiple triggers
+        $trigger1 = New-ScheduledTaskTrigger -Event -LogName $logName -Source $source -EventId 21
+        $trigger2 = New-ScheduledTaskTrigger -Event -LogName $logName -Source $source -EventId 25
+        # Optional Delay - Apply to both triggers if desired?
+        # $trigger1.Delay = 'PT15S' 
+        # $trigger2.Delay = 'PT15S'
         
         $settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -ExecutionTimeLimit (New-TimeSpan -Days 9999) -RestartCount 3 -RestartInterval (New-TimeSpan -Minutes 1)
-        $description = "Runs OOTB Application (via cmd) for user {username} upon session connect (Event Trigger, 15s Delay)." # Updated description
+        $description = "Runs OOTB Application (via cmd) for user {username} upon session connect/reconnect." # Updated description
 
         # Unregister existing task first (force) - Use the NEW task name
         Unregister-ScheduledTask -TaskName $taskName -Confirm:$false -ErrorAction SilentlyContinue
 
-        # Register the new task
-        Register-ScheduledTask -TaskName $taskName -Principal $principal -Action $action -Trigger $trigger -Settings $settings -Description $description -Force
-        
-        # Optional: Add second trigger for event ID 25 (Reconnect)
-        # Requires creating a separate trigger object and adding it.
-        # $trigger2 = New-ScheduledTaskTrigger -Event -LogName $logName -Source $source -EventId $eventIDs[1]
-        # Set-ScheduledTask -TaskName $taskName -Trigger $trigger, $trigger2 # This replaces existing triggers
-        # Append trigger is more complex via PowerShell cmdlets, often easier via XML or COM
+        # Register the new task with MULTIPLE triggers
+        Register-ScheduledTask -TaskName $taskName -Principal $principal -Action $action -Trigger $trigger1, $trigger2 -Settings $settings -Description $description -Force
 
         """
-        self.log_info(f"Attempting to create/update task '{task_name}' for user '{username}' to run '{action_executable} {action_arguments}' on session connect.")
+        self.log_info(f"Attempting to create/update task '{task_name}' for user '{username}' to run OOTB on session connect/reconnect.")
         try:
             # Need to actually run the powershell command here!
             success = self.run_powershell_command(ps_command)

{computer_use_ootb_internal-0.0.134 → computer_use_ootb_internal-0.0.136}/src/computer_use_ootb_internal/preparation/star_rail_prepare.py

@@ -1,6 +1,7 @@
 # src/computer_use_ootb_internal/preparation/star_rail_prepare.py
 import time
 import platform
+import subprocess # Added for taskkill
 import pyautogui
 import webbrowser
 import logging # Use logging instead of print for better practice
@@ -11,7 +12,8 @@ log = logging.getLogger(__name__)
 def run_preparation(state):
     """
     Performs environment preparation specific to Star Rail on Windows.
-    Opens the specified URL in Edge and performs initial clicks.
+    Closes existing Edge browsers, opens the specified URL in a new Edge instance,
+    and performs initial clicks.
     """
     if platform.system() != "Windows":
         log.info("Star Rail preparation skipped: Not running on Windows.")
@@ -21,11 +23,31 @@ def run_preparation(state):
     url = "https://sr.mihoyo.com/cloud/#/" # Consider making this configurable later
     browser_opened = False
     try:
+        # Attempt to close existing Microsoft Edge processes
+        log.info("Attempting to close existing Microsoft Edge processes...")
+        try:
+            # /F forces termination, /IM specifies image name
+            result = subprocess.run(['taskkill', '/F', '/IM', 'msedge.exe'],
+                                    capture_output=True, text=True, check=False)
+            if result.returncode == 0:
+                log.info("Successfully sent termination signal to msedge.exe processes.")
+            elif "not found" in result.stderr.lower() or "not found" in result.stdout.lower():
+                 log.info("No running msedge.exe processes found to close.")
+            else:
+                 log.warning(f"taskkill command finished with return code {result.returncode}. Output: {result.stdout} Stderr: {result.stderr}")
+            time.sleep(2) # Give processes time to close
+        except FileNotFoundError:
+            log.error("Error: 'taskkill' command not found. Make sure it's in the system PATH.")
+        except Exception as e:
+            log.error(f"Error occurred while trying to close Edge: {e}", exc_info=True)
+
         # Use only webbrowser.open
         log.info(f"Attempting to open {url} using webbrowser.open()...")
         if webbrowser.open(url):
             log.info(f"Successfully requested browser to open {url} via webbrowser.open().")
             browser_opened = True
+            # Keep original sleep time for browser load before clicks
+            time.sleep(5) 
         else:
             log.warning("webbrowser.open() returned False, indicating potential failure.")