2.0.11

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pushrocks/smartdelay",
   "private": false,
-  "version": "2.0.8",
+  "version": "2.0.11",
   "description": "timeouts for the async/await era, written in TypeScript",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -28,7 +28,7 @@
     "@gitzone/tsrun": "^1.2.8",
     "@gitzone/tstest": "^1.0.28",
     "@pushrocks/tapbundle": "^3.2.1",
-    "@types/node": "^14.0.5",
+    "@types/node": "^15.12.0",
     "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },

ts/index.ts

@@ -2,41 +2,39 @@ import * as smartpromise from '@pushrocks/smartpromise';
 
 /**
  * delay something, works like setTimeout
- * @param timeInMillisecond
+ * @param timeInMillisecondArg
- * @param passOn
+ * @param passOnArg
  */
-export let delayFor = async <T>(timeInMillisecond: number, passOn?: T) => {
+export let delayFor = async <T>(timeInMillisecondArg: number, passOnArg?: T, unrefedArg = false) => {
-  await new Promise((resolve, reject) => {
+  const timeout = new Timeout(timeInMillisecondArg, null, unrefedArg);
-    setTimeout(() => {
+  await timeout.promise;
-      resolve();
+  return passOnArg;
-    }, timeInMillisecond);
-  });
-  return passOn;
 };
 
 /**
  * delay for a random time
  */
 export let delayForRandom = async <T>(
-  timeMinInMillisecond: number,
+  timeMinInMillisecondArg: number,
-  timeMaxInMillisecond: number,
+  timeMaxInMillisecondArg: number,
-  passOn?: T
+  passOnArg?: T,
+  unrefedArg = false
 ) => {
-  await new Promise((resolve, reject) => {
+  await delayFor(Math.random() * (timeMaxInMillisecondArg - timeMinInMillisecondArg) + timeMinInMillisecondArg, null, unrefedArg)
-    setTimeout(() => {
+  return passOnArg;
-      resolve();
-    }, Math.random() * (timeMaxInMillisecond - timeMinInMillisecond) + timeMinInMillisecond);
-  });
-  return passOn;
 };
 
 export class Timeout<T> {
   promise: Promise<T>;
   private _deferred: smartpromise.Deferred<T>;
-  private _timeout: any;
+  private _timeout;
   private _cancelled: boolean = false;
 
-  constructor(timeInMillisecondArg, passOn?: T) {
+  private timeoutInMillis: number;
+  private started: number;
+
+  constructor(timeInMillisecondArg, passOn?: T, unrefedArg = false) {
+    this.timeoutInMillis = timeInMillisecondArg;
     this._deferred = smartpromise.defer<T>();
     this.promise = this._deferred.promise;
     this._timeout = setTimeout(() => {
@@ -44,6 +42,10 @@ export class Timeout<T> {
         this._deferred.resolve(passOn);
       }
     }, timeInMillisecondArg);
+    this.started = Date.now();
+    if (unrefedArg) {
+      this.makeUnrefed();
+    }
   }
 
   /**
@@ -58,6 +60,11 @@ export class Timeout<T> {
    */
   public cancel() {
     this._cancelled = true;
-    this.makeUnrefed();
+    clearTimeout(this._timeout);
+  }
+  
+  public getTimeLeft() {
+    const result = this.started + this.timeoutInMillis - Date.now();
+    return result > 0 ? result : 0;
   }
 }