@anionex/dsh-computer-use 0.2.1 → 0.3.1

package/native/macos/Sources/Fixture/main.swift

@@ -70,6 +70,9 @@ private final class FixtureDelegate: NSObject, NSApplicationDelegate {
     private var insertedHarmlessSibling = false
     private var keyMonitor: Any?
     private var reorderTimer: Timer?
+    private var activationTimer: Timer?
+    private var activationReleaseTimer: Timer?
+    private var activationHoldUntil: Date?
     private var pointerClickCount = 0
     private var pointerScrollCount = 0
     private var pointerDragCount = 0
@@ -80,6 +83,9 @@ private final class FixtureDelegate: NSObject, NSApplicationDelegate {
     private var activationCount = 0
     private let transcriptPath: String?
     private let reorderTriggerPath: String?
+    private let activationTriggerPath: String?
+    private let activationReleaseTriggerPath: String?
+    private let activationOnly: Bool
     private let launchInBackground: Bool
 
     override init() {
@@ -94,6 +100,17 @@ private final class FixtureDelegate: NSObject, NSApplicationDelegate {
         } else {
             reorderTriggerPath = nil
         }
+        if let index = arguments.firstIndex(of: "--activation-trigger"), arguments.indices.contains(index + 1) {
+            activationTriggerPath = arguments[index + 1]
+        } else {
+            activationTriggerPath = nil
+        }
+        if let index = arguments.firstIndex(of: "--activation-release-trigger"), arguments.indices.contains(index + 1) {
+            activationReleaseTriggerPath = arguments[index + 1]
+        } else {
+            activationReleaseTriggerPath = nil
+        }
+        activationOnly = arguments.contains("--activation-only")
         launchInBackground = arguments.contains("--background")
         super.init()
     }
@@ -113,6 +130,9 @@ private final class FixtureDelegate: NSObject, NSApplicationDelegate {
             window.makeKeyAndOrderFront(nil)
         }
         writeTranscript(event: "ready")
+        if activationOnly {
+            activationHoldUntil = Date().addingTimeInterval(5)
+        }
         if let reorderTriggerPath {
             reorderTimer = Timer.scheduledTimer(withTimeInterval: 0.05, repeats: true) { [weak self] timer in
                 guard FileManager.default.fileExists(atPath: reorderTriggerPath) else { return }
@@ -120,6 +140,30 @@ private final class FixtureDelegate: NSObject, NSApplicationDelegate {
                 self?.insertHarmlessSibling()
             }
         }
+        if activationTriggerPath != nil || activationOnly {
+            activationTimer = Timer.scheduledTimer(withTimeInterval: 0.05, repeats: true) { [weak self] _ in
+                guard let self else { return }
+                if let activationTriggerPath,
+                   FileManager.default.fileExists(atPath: activationTriggerPath) {
+                    try? FileManager.default.removeItem(atPath: activationTriggerPath)
+                    self.activationHoldUntil = Date().addingTimeInterval(5)
+                }
+                guard let holdUntil = self.activationHoldUntil else { return }
+                guard Date() < holdUntil else {
+                    self.activationHoldUntil = nil
+                    return
+                }
+                NSApplication.shared.activate(ignoringOtherApps: true)
+                self.window.makeKeyAndOrderFront(nil)
+            }
+        }
+        if let activationReleaseTriggerPath {
+            activationReleaseTimer = Timer.scheduledTimer(withTimeInterval: 0.05, repeats: true) { [weak self] _ in
+                guard FileManager.default.fileExists(atPath: activationReleaseTriggerPath) else { return }
+                try? FileManager.default.removeItem(atPath: activationReleaseTriggerPath)
+                self?.activationHoldUntil = nil
+            }
+        }
     }
 
     func applicationDidBecomeActive(_ notification: Notification) {
@@ -130,6 +174,8 @@ private final class FixtureDelegate: NSObject, NSApplicationDelegate {
     func applicationWillTerminate(_ notification: Notification) {
         if let keyMonitor { NSEvent.removeMonitor(keyMonitor) }
         reorderTimer?.invalidate()
+        activationTimer?.invalidate()
+        activationReleaseTimer?.invalidate()
     }
 
     func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {

package/native/macos/Sources/Helper/CursorMotion.swift

@@ -0,0 +1,67 @@
+import CoreGraphics
+import Foundation
+
+private func rawCursorMotionDuration(distance: Double, speed: Double, acceleration: Double) -> Double {
+    let accelerationDistance = speed * speed / acceleration
+    if distance <= accelerationDistance {
+        return 2 * sqrt(distance / acceleration)
+    }
+    return 2 * speed / acceleration + (distance - accelerationDistance) / speed
+}
+
+func cursorMotionDuration(distance: Double, speed: Double, acceleration: Double) -> Double {
+    min(2, max(0.048, rawCursorMotionDuration(distance: distance, speed: speed, acceleration: acceleration)))
+}
+
+func cursorMotionFraction(
+    progress: Double,
+    distance: Double,
+    speed: Double,
+    acceleration: Double
+) -> Double {
+    guard distance > 0 else { return 1 }
+    let rawDuration = rawCursorMotionDuration(distance: distance, speed: speed, acceleration: acceleration)
+    let elapsed = min(1, max(0, progress)) * rawDuration
+    let accelerationTime = min(speed / acceleration, rawDuration / 2)
+    let peakSpeed = acceleration * accelerationTime
+    let cruiseTime = max(0, rawDuration - 2 * accelerationTime)
+    let accelerationDistance = 0.5 * acceleration * accelerationTime * accelerationTime
+    let traveled: Double
+    if elapsed <= accelerationTime {
+        traveled = 0.5 * acceleration * elapsed * elapsed
+    } else if elapsed <= accelerationTime + cruiseTime {
+        traveled = accelerationDistance + peakSpeed * (elapsed - accelerationTime)
+    } else {
+        let remaining = rawDuration - elapsed
+        traveled = distance - 0.5 * acceleration * remaining * remaining
+    }
+    return min(1, max(0, traveled / distance))
+}
+
+func cursorMotionPoint(from origin: CGPoint, to target: CGPoint, fraction: Double) -> CGPoint {
+    let distance = hypot(target.x - origin.x, target.y - origin.y)
+    guard distance > 0 else { return target }
+    let delta = CGPoint(x: target.x - origin.x, y: target.y - origin.y)
+    let directionSign: CGFloat = Int(abs(origin.x + origin.y + target.x + target.y)) % 2 == 0 ? 1 : -1
+    let bend = min(18, distance * 0.06) * directionSign
+    let normal = CGPoint(x: -delta.y / distance, y: delta.x / distance)
+    let control1 = CGPoint(
+        x: origin.x + delta.x * 0.32 + normal.x * bend,
+        y: origin.y + delta.y * 0.32 + normal.y * bend
+    )
+    let control2 = CGPoint(
+        x: origin.x + delta.x * 0.72 + normal.x * bend * 0.45,
+        y: origin.y + delta.y * 0.72 + normal.y * bend * 0.45
+    )
+    let inverse = 1 - fraction
+    return CGPoint(
+        x: inverse * inverse * inverse * origin.x
+            + 3 * inverse * inverse * fraction * control1.x
+            + 3 * inverse * fraction * fraction * control2.x
+            + fraction * fraction * fraction * target.x,
+        y: inverse * inverse * inverse * origin.y
+            + 3 * inverse * inverse * fraction * control1.y
+            + 3 * inverse * fraction * fraction * control2.y
+            + fraction * fraction * fraction * target.y
+    )
+}