Delay not waiting for the remaining time (#99)

Author: lucas34

CHANGELOG.md

@@ -12,6 +12,7 @@
 - Change signature of Limit(Int) to Limit(Double)
 
 #### Fix 
+- Delay not waiting for the remaining time (#99)
 - Deadline now cancel the job properly (#98)
 - Fix calling `done` after termination will remove the lastError (#97)
 - Breaking support for Swift 3.2 (#75)

Sources/SwiftQueue/Constrains+Delay.swift

@@ -15,17 +15,24 @@ internal final class DelayConstraint: JobConstraint {
     }
 
     func run(operation: SqOperation) -> Bool {
-        if let delay = operation.info.delay {
-            if Date().timeIntervalSince(operation.info.createTime) < delay {
-                runInBackgroundAfter(delay, callback: { [weak operation] in
-                    // If the operation in already deInit, it may have been canceled
-                    // It's safe to ignore the nil check
-                    // This is mostly to prevent job retention when cancelling operation with delay
-                    operation?.run()
-                })
-                return false
-            }
+        guard let delay = operation.info.delay else {
+            // No delay run immediately
+            return true
         }
-        return true
+
+        let epoch = Date().timeIntervalSince(operation.info.createTime)
+        guard epoch < delay else {
+            // Epoch already greater than delay
+            return true
+        }
+
+        runInBackgroundAfter(abs(epoch - delay), callback: { [weak operation] in
+            // If the operation in already deInit, it may have been canceled
+            // It's safe to ignore the nil check
+            // This is mostly to prevent job retention when cancelling operation with delay
+            operation?.run()
+        })
+
+        return false
     }
 }

Sources/SwiftQueue/JobBuilder.swift

@@ -33,7 +33,9 @@ public final class JobBuilder {
     }
 
     /// Delay the execution of the job.
-    /// Only start the countdown when the job should run and not when scheduled
+    /// Base on the job creation, when the job is supposed to run,
+    /// If the delay is already pass (longer job before) it will run immediately
+    /// Otherwise it will wait for the remaining time
     public func delay(time: TimeInterval) -> Self {
         assert(time >= 0)
         info.delay = time

Sources/SwiftQueue/SqOperation.swift

@@ -159,17 +159,11 @@ extension SqOperation: JobResult {
             }
 
             // Retry after time in parameter
-            runInBackgroundAfter(after) { [weak self] in
-                self?.info.retries.decreaseValue(by: 1)
-                self?.run()
-            }
+            retryInBackgroundAfter(after)
         case .exponential(let initial):
             info.currentRepetition += 1
             let delay = info.currentRepetition == 1 ? initial : initial * pow(2, Double(info.currentRepetition - 1))
-            runInBackgroundAfter(delay) { [weak self] in
-                self?.info.retries.decreaseValue(by: 1)
-                self?.run()
-            }
+            retryInBackgroundAfter(delay)
         }
     }
 
@@ -247,3 +241,14 @@ extension SqOperation {
     }
 
 }
+
+extension SqOperation {
+
+    private func retryInBackgroundAfter(_ delay: TimeInterval) {
+        runInBackgroundAfter(delay) { [weak self] in
+            self?.info.retries.decreaseValue(by: 1)
+            self?.run()
+        }
+    }
+
+}