expo-app-blocker 0.1.68 → 0.1.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-app-blocker",
-  "version": "0.1.68",
+  "version": "0.1.69",
   "description": "Expo module for cross-platform app blocking. Android: UsageStatsManager + Overlay. iOS: Screen Time API (FamilyControls + ManagedSettings + DeviceActivity).",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/targets/ShieldAction/ShieldActionExtension.swift

@@ -6,6 +6,11 @@ import UserNotifications
 class ShieldActionExtension: ShieldActionDelegate {
   private let appGroupIdentifier = "APP_GROUP_PLACEHOLDER"
   private let pendingUnlockKey = "appBlocker.pendingUnlock.v1"
+  private let pendingInterceptsKey = "appBlocker.pendingIntercepts.v1"
+  private let lastInterceptTsKey = "appBlocker.lastInterceptTs.v1"
+  private let shieldInvokeCountKey = "appBlocker.shieldInvokeCount.v1"
+  private let interceptDebounceMs: Double = 2_000
+  private let maxPendingIntercepts = 200
   private let pendingUnlockNotificationIdentifier = "expo.appblocker.pendingUnlock.local"
   // Notification copy + behavior — configurable via plugin options so apps
   // can localize without forking. Defaults preserve the original English
@@ -27,6 +32,11 @@ class ShieldActionExtension: ShieldActionDelegate {
   }
 
   private func handleAction(_ action: ShieldAction, completionHandler: @escaping (ShieldActionResponse) -> Void) {
+    // Any interaction with the shield is a confirmed block event. The
+    // ShieldConfiguration data source is cached by the system and not
+    // re-invoked per open, so this — the action handler, which fires every
+    // time — is the reliable place to record the block.
+    recordIntercept()
     switch action {
     case .primaryButtonPressed:
       setPendingUnlockFlag()
@@ -54,6 +64,41 @@ class ShieldActionExtension: ShieldActionDelegate {
     }
   }
 
+  /// Queue a block event (JSON-string queue in the App Group), debounced,
+  /// for the app to drain into `blocker_intercepts`.
+  private func recordIntercept() {
+    guard let defaults = UserDefaults(suiteName: appGroupIdentifier) else { return }
+    defaults.synchronize()
+
+    let invokes = defaults.integer(forKey: shieldInvokeCountKey) + 1
+    defaults.set(invokes, forKey: shieldInvokeCountKey)
+
+    let nowMs = Date().timeIntervalSince1970 * 1000.0
+    let lastMs = defaults.double(forKey: lastInterceptTsKey)
+    if lastMs > 0, (nowMs - lastMs) < interceptDebounceMs {
+      defaults.synchronize()
+      return
+    }
+
+    var queue: [[String: Any]] = []
+    if let json = defaults.string(forKey: pendingInterceptsKey),
+       let data = json.data(using: .utf8),
+       let parsed = try? JSONSerialization.jsonObject(with: data) as? [[String: Any]] {
+      queue = parsed
+    }
+    queue.append(["appName": NSNull(), "interceptedAt": nowMs])
+    if queue.count > maxPendingIntercepts {
+      queue = Array(queue.suffix(maxPendingIntercepts))
+    }
+    if let data = try? JSONSerialization.data(withJSONObject: queue),
+       let json = String(data: data, encoding: .utf8) {
+      defaults.set(json, forKey: pendingInterceptsKey)
+    }
+    defaults.set(nowMs, forKey: lastInterceptTsKey)
+    defaults.synchronize()
+    NSLog("[appblocker] ShieldAction recordIntercept queued depth=\(queue.count) invokes=\(invokes)")
+  }
+
   private func setPendingUnlockFlag() {
     guard let sharedDefaults = UserDefaults(suiteName: appGroupIdentifier) else { return }
     sharedDefaults.set(true, forKey: pendingUnlockKey)