Prevent retriggering of event actions

.swiftlint.yml

@@ -8,6 +8,7 @@ disabled_rules:
   - type_body_length
   - cyclomatic_complexity
   - file_length
+  - function_parameter_count
 
 included:
 - ios

example/ios/Tests/SharedTests.swift

@@ -76,3 +76,46 @@ class SharedTests: XCTestCase {
     XCTAssertEqual(result["score"] as? String, "{asNumber:missingValue}")
   }
 }
+
+class SharedTests2: XCTestCase {
+  func isHigherEventNumTest() {
+    let isLower = isHigherEvent(eventName: "5", higherThan: "10")
+    let isEqual = isHigherEvent(eventName: "10", higherThan: "10")
+    let isHigher = isHigherEvent(eventName: "15", higherThan: "10")
+
+    XCTAssertTrue(isHigher)
+    XCTAssertFalse(isEqual)
+    XCTAssertFalse(isLower)
+  }
+
+  func isHigherEventStringTest() {
+    let isHigherBecauseString = isHigherEvent(eventName: "prefix_5", higherThan: "prefix_10")
+    let isEqual = isHigherEvent(eventName: "prefix_10", higherThan: "prefix_10")
+    let isHigher = isHigherEvent(eventName: "prefix_15", higherThan: "prefix_10")
+
+    XCTAssertTrue(isHigher)
+    XCTAssertFalse(isEqual)
+    XCTAssertFalse(isHigherBecauseString)
+  }
+
+  func replaceTest() {
+    let five = replace(
+      key: "event_with_prefix_5",
+      prefix: "event_with_prefix_"
+    )
+
+    let empty = replace(
+      key: "event_with_prefix_",
+      prefix: "event_with_prefix_"
+    )
+
+    let nonmatching = replace(
+      key: "dfgsfgsdfgsdfg",
+      prefix: "event_with_prefix_"
+    )
+
+    XCTAssertEqual(five, "5")
+    XCTAssertEqual(empty, "")
+    XCTAssertEqual(nonmatching, "dfgsfgsdfgsdfg")
+  }
+}

ios/Shared.swift

@@ -541,13 +541,93 @@ func getColor(color: [String: Double]?) -> UIColor? {
   return nil
 }
 
-func persistToUserDefaults(activityName: String, callbackName: String, eventName: String? = nil) {
-  let now = (Date().timeIntervalSince1970 * 1000).rounded()
+func userDefaultKeyForEvent(activityName: String, callbackName: String, eventName: String? = nil)
+  -> String {
+
   let fullEventName =
     eventName == nil
     ? "events_\(activityName)_\(callbackName)"
     : "events_\(activityName)_\(callbackName)_\(eventName!)"
+
+  return fullEventName
+}
+
+func persistToUserDefaults(activityName: String, callbackName: String, eventName: String? = nil) {
+  let now = (Date().timeIntervalSince1970 * 1000).rounded()
+
+  let fullEventName = userDefaultKeyForEvent(
+    activityName: activityName,
+    callbackName: callbackName,
+    eventName: eventName
+  )
+
   userDefaults?.set(now, forKey: fullEventName)
+
+  CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication)
+}
+
+func isHigherEvent(eventName: String, higherThan: String) -> Bool {
+  if let eventNameNum = Double(eventName), let higherThanNum = Double(higherThan) {
+    return eventNameNum > higherThanNum
+  } else {
+    return eventName > higherThan
+  }
+}
+
+func replace(key: String, prefix: String) -> String {
+  if key.hasPrefix(prefix) {
+    return String(key.dropFirst(prefix.count))
+  }
+
+  return key
+}
+
+func hasHigherTriggeredEvent(
+  activityName: String,
+  callbackName: String,
+  eventName: String?,
+  afterDate: Double
+) -> Bool {
+  let prefix = "events_\(activityName)_"
+
+  if let actualDict = userDefaults?.dictionaryRepresentation() {
+    let higherEvent = actualDict.first(where: { (key: String, value: Any) in
+      if let triggeredAt = value as? Double {
+        return
+          key
+          .starts(
+            with: prefix
+          )
+          && triggeredAt > afterDate
+          && (eventName != nil
+            ? isHigherEvent(
+              eventName: replace(key: key, prefix: prefix),
+              higherThan: eventName!
+            ) : true)
+      }
+      return false
+
+    })
+
+    if higherEvent != nil {
+      return true
+    }
+  }
+
+  return false
+}
+
+func getLastTriggeredTimeFromUserDefaults(
+  activityName: String, callbackName: String, eventName: String? = nil
+) -> Double? {
+
+  let fullEventName = userDefaultKeyForEvent(
+    activityName: activityName,
+    callbackName: callbackName,
+    eventName: eventName
+  )
+
+  return userDefaults?.double(forKey: fullEventName)
 }
 
 func traverseDirectory(at path: String) {

src/ReactNativeDeviceActivity.types.ts

@@ -176,33 +176,57 @@ export type Action =
       shieldId?: string;
       sleepBefore?: number;
       sleepAfter?: number;
+      skipIfAlreadyTriggeredAfter?: Date;
+      skipIfLargerEventRecordedAfter?: Date;
+      skipIfAlreadyTriggeredWithinMS?: number;
+      skipIfLargerEventRecordedWithinMS?: number;
     }
   | {
       type: "unblockAllApps";
       sleepBefore?: number;
       sleepAfter?: number;
+      skipIfAlreadyTriggeredAfter?: Date;
+      skipIfLargerEventRecordedAfter?: Date;
+      skipIfAlreadyTriggeredWithinMS?: number;
+      skipIfLargerEventRecordedWithinMS?: number;
     }
   | {
       type: "resetUnblockedSelection";
       sleepBefore?: number;
       sleepAfter?: number;
+      skipIfAlreadyTriggeredAfter?: Date;
+      skipIfLargerEventRecordedAfter?: Date;
+      skipIfAlreadyTriggeredWithinMS?: number;
+      skipIfLargerEventRecordedWithinMS?: number;
     }
   | {
       type: "blockAllApps";
       shieldId?: string;
       sleepBefore?: number;
       sleepAfter?: number;
+      skipIfAlreadyTriggeredAfter?: Date;
+      skipIfLargerEventRecordedAfter?: Date;
+      skipIfAlreadyTriggeredWithinMS?: number;
+      skipIfLargerEventRecordedWithinMS?: number;
     }
   | {
       type: "sendNotification";
       payload: NotificationPayload;
       sleepBefore?: number;
       sleepAfter?: number;
+      skipIfAlreadyTriggeredAfter?: Date;
+      skipIfLargerEventRecordedAfter?: Date;
+      skipIfAlreadyTriggeredWithinMS?: number;
+      skipIfLargerEventRecordedWithinMS?: number;
     }
   | {
       type: "openApp";
       sleepBefore?: number;
       sleepAfter?: number;
+      skipIfAlreadyTriggeredAfter?: Date;
+      skipIfLargerEventRecordedAfter?: Date;
+      skipIfAlreadyTriggeredWithinMS?: number;
+      skipIfLargerEventRecordedWithinMS?: number;
     }
   | {
       type: "sendHttpRequest";
@@ -214,6 +238,10 @@ export type Action =
       };
       sleepBefore?: number;
       sleepAfter?: number;
+      skipIfAlreadyTriggeredAfter?: Date;
+      skipIfLargerEventRecordedAfter?: Date;
+      skipIfAlreadyTriggeredWithinMS?: number;
+      skipIfLargerEventRecordedWithinMS?: number;
     };
 
 export type DeviceActivityEventRaw = Omit<

src/index.ts

@@ -148,7 +148,18 @@ export const configureActions = ({
     ? `actions_for_${activityName}_${callbackName}_${eventName}`
     : `actions_for_${activityName}_${callbackName}`;
 
-  userDefaultsSet(key, actions);
+  userDefaultsSet(
+    key,
+    actions.map((action) => ({
+      ...action,
+      skipIfLargerEventRecordedAfter: action.skipIfLargerEventRecordedAfter
+        ? action.skipIfLargerEventRecordedAfter.getTime()
+        : undefined,
+      skipIfAlreadyTriggeredAfter: action.skipIfAlreadyTriggeredAfter
+        ? action.skipIfAlreadyTriggeredAfter.getTime()
+        : undefined,
+    })),
+  );
 };
 
 export const cleanUpAfterActivity = (activityName: string) => {