Merge db87c4c into db0148b

moribvndvs · Sep 10, 2019 · 237e7c3 · 237e7c3
2 parents db0148b + db87c4c
commit 237e7c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 36 deletions.
diff --git a/projects/core/src/lib/idle.spec.ts b/projects/core/src/lib/idle.spec.ts
@@ -277,15 +277,10 @@ describe('core/Idle', () => {
 
         instance.setTimeout(3);
         instance.setInterrupts([source]);
-
-        expiry.mockNow = new Date();
         instance.watch();
 
         expect(source.isAttached).toBe(true);
 
-        expiry.mockNow = new Date(
-          expiry.now().getTime() + instance.getIdle() * 1000
-        );
         tick(30000);
         tick(1000);
         tick(1000);
@@ -411,12 +406,9 @@ describe('core/Idle', () => {
         spyOn(instance.onTimeout, 'emit').and.callThrough();
 
         instance.setTimeout(3);
-        expiry.mockNow = new Date();
         instance.watch();
 
-        expiry.mockNow = new Date(
-          expiry.now().getTime() + instance.getIdle() * 1000
-        );
+
         tick(3000);
         expect(instance.isIdling()).toBe(true);
 
@@ -434,12 +426,8 @@ describe('core/Idle', () => {
         spyOn(instance.onTimeout, 'emit').and.callThrough();
 
         instance.setTimeout(3);
-        expiry.mockNow = new Date();
         instance.watch();
 
-        expiry.mockNow = new Date(
-          expiry.now().getTime() + instance.getIdle() * 1000
-        );
         tick(3000);
         expect(instance.isIdling()).toBe(true);
 
@@ -456,12 +444,8 @@ describe('core/Idle', () => {
         spyOn(instance.onInterrupt, 'emit').and.callThrough();
 
         instance.setTimeout(3);
-        expiry.mockNow = new Date();
         instance.watch();
 
-        expiry.mockNow = new Date(
-          expiry.now().getTime() + instance.getIdle() * 1000
-        );
         tick(3000);
         expect(instance.isIdling()).toBe(true);
 
@@ -499,12 +483,8 @@ describe('core/Idle', () => {
         spyOn(instance.onTimeoutWarning, 'emit').and.callThrough();
 
         instance.setTimeout(3);
-        expiry.mockNow = new Date();
         instance.watch();
 
-        expiry.mockNow = new Date(
-          expiry.now().getTime() + instance.getIdle() * 1000
-        );
         tick(3000);
         // we're going to check that it's idling, then force it to not be
         expect(instance.isIdling()).toBe(true);
@@ -653,14 +633,9 @@ describe('core/Idle', () => {
         instance.setAutoResume(AutoResume.notIdle);
         instance.setIdle(3);
 
-        const now = new Date();
-        expiry.mockNow = now;
         instance.watch();
         spyOn(instance, 'watch').and.callThrough();
 
-        expiry.mockNow = new Date(
-          expiry.now().getTime() + instance.getIdle() * 1000
-        );
         tick(2000);
 
         expect(instance.isIdling()).toBe(false);
@@ -827,13 +802,8 @@ describe('core/Idle', () => {
       }));
 
       it('should stop keepalive when timed out', fakeAsync(() => {
-        expiry.mockNow = new Date();
         instance.watch();
         expect(svc.isRunning).toBe(true);
-
-        expiry.mockNow = new Date(
-          expiry.now().getTime() + instance.getIdle() * 1000
-        );
         tick(3000);
         tick(1000);
         tick(1000);

diff --git a/projects/core/src/lib/idle.ts b/projects/core/src/lib/idle.ts
@@ -252,14 +252,14 @@ export class Idle implements OnDestroy {
         const diff = this.getExpiryDiff(timeout);
         if (diff > 0) {
           this.safeClearInterval('idleHandle');
-          this.setIdleIntervalOutsideOfZone(watchFn, diff);
+          this.setIdleIntervalOutsideOfZone(watchFn, 1000);
         } else {
           this.toggleState();
         }
       });
     };
 
-    this.setIdleIntervalOutsideOfZone(watchFn, this.idle * 1000);
+    this.setIdleIntervalOutsideOfZone(watchFn, 1000);
   }
 
   /*
@@ -346,7 +346,7 @@ export class Idle implements OnDestroy {
       if (this.timeoutVal > 0) {
         this.countdown = this.timeoutVal;
         this.doCountdown();
-        this.setTimoutIntervalOutsideZone(() => {
+        this.setTimeoutIntervalOutsideZone(() => {
           this.doCountdownInZone();
         }, 1000);
       }
@@ -359,7 +359,7 @@ export class Idle implements OnDestroy {
     this.safeClearInterval('idleHandle');
   }
 
-  private setTimoutIntervalOutsideZone(
+  private setTimeoutIntervalOutsideZone(
     intervalFn: () => void,
     frequency: number
   ) {
@@ -410,7 +410,9 @@ export class Idle implements OnDestroy {
     }
 
     this.onTimeoutWarning.emit(this.countdown);
-    this.countdown--;
+
+    const countdownMs = ((this.timeoutVal - 1) * 1000) + diff;
+    this.countdown = Math.round(countdownMs / 1000);
   }
 
   private safeClearInterval(handleName: string): void {