From 4aa731b531b778aca5c6cf0dbd252e375e1c118e Mon Sep 17 00:00:00 2001
From: Phil Kunz <gitlab@philkunz.com>
Date: Wed, 8 Jul 2020 00:59:55 +0000
Subject: [PATCH] fix(core): update

---
 package-lock.json           | 27 +++++++++++++++-----
 package.json                |  2 +-
 ts/tstest.classes.tstest.ts | 51 +++++++------------------------------
 3 files changed, 31 insertions(+), 49 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 716a344..b4aca2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1567,16 +1567,31 @@
       }
     },
     "@pushrocks/tapbundle": {
-      "version": "3.2.1",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2ftapbundle/-/tapbundle-3.2.1.tgz",
-      "integrity": "sha512-D3o205SE+Viu8sukm+6CvGkXEwOiQiEEcga9eWyvjWS4vDx6FWwrO0pNZkQq6GqsKQ9xRpCmBtI7F3KsJR0+PA==",
+      "version": "3.2.7",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2ftapbundle/-/tapbundle-3.2.7.tgz",
+      "integrity": "sha512-RBRjuJs3v/biKypc9rSecApn7IXRdmr/jbVH86+2mDxyzUQ8IcMhaKhUrIjKoNyvxvMAMS2j+OxPyiOCnK6RAw==",
       "dev": true,
       "requires": {
-        "@pushrocks/early": "^3.0.3",
-        "@pushrocks/smartdelay": "^2.0.3",
-        "@pushrocks/smartfile": "^7.0.9",
+        "@pushrocks/smartdelay": "^2.0.9",
+        "@pushrocks/smartenv": "^4.0.10",
         "@pushrocks/smartpromise": "^3.0.2",
+        "@pushrocks/smarttime": "^3.0.19",
         "smartchai": "^2.0.1"
+      },
+      "dependencies": {
+        "@pushrocks/smarttime": {
+          "version": "3.0.19",
+          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.19.tgz",
+          "integrity": "sha512-1iSkNJcF632Mikcd/EvcBPC1T5tLRZqTHjVkuZlXpaNY11eZIzYVMOn5/ZDfLp2GuEi6hhIbEx9zwsdoYqz5cA==",
+          "dev": true,
+          "requires": {
+            "@pushrocks/smartdelay": "^2.0.9",
+            "@pushrocks/smartpromise": "^3.0.2",
+            "croner": "^1.1.23",
+            "dayjs": "^1.8.27",
+            "is-nan": "^1.3.0"
+          }
+        }
       }
     },
     "@pushrocks/webrequest": {
diff --git a/package.json b/package.json
index 24e87c5..974f769 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.17",
-    "@pushrocks/tapbundle": "^3.0.13",
+    "@pushrocks/tapbundle": "^3.2.7",
     "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },
diff --git a/ts/tstest.classes.tstest.ts b/ts/tstest.classes.tstest.ts
index 7fa320d..b7eff8c 100644
--- a/ts/tstest.classes.tstest.ts
+++ b/ts/tstest.classes.tstest.ts
@@ -115,42 +115,6 @@ export class TsTest {
     const evaluation = await this.smartbrowserInstance.evaluateOnPage(
       `http://localhost:3007/test?bundleName=${bundleFileName}`,
       async () => {
-        let logStore = 'Starting log capture\n';
-        // tslint:disable-next-line: max-classes-per-file
-        class Deferred<T> {
-          public promise: Promise<T>;
-          public resolve;
-          public reject;
-          public status;
-
-          public startedAt: number;
-          public stoppedAt: number;
-          public get duration(): number {
-            if (this.stoppedAt) {
-              return this.stoppedAt - this.startedAt;
-            } else {
-              return Date.now() - this.startedAt;
-            }
-          }
-
-          constructor() {
-            this.promise = new Promise<T>((resolve, reject) => {
-              this.resolve = (valueArg: T | PromiseLike<T>) => {
-                this.status = 'fulfilled';
-                this.stoppedAt = Date.now();
-                resolve(valueArg);
-              };
-              this.reject = (reason: any) => {
-                this.status = 'rejected';
-                this.stoppedAt = Date.now();
-                reject(reason);
-              };
-              this.startedAt = Date.now();
-              this.status = 'pending';
-            });
-          }
-        }
-        const done = new Deferred();
         const convertToText = (obj) => {
           // create an array that will later be joined into a string.
           const stringArray = [];
@@ -181,6 +145,9 @@ export class TsTest {
 
           return stringArray.join('');
         };
+
+        let logStore = 'Starting log capture\n';
+        // tslint:disable-next-line: max-classes-per-file
         const log = console.log.bind(console);
         console.log = (...args) => {
           args = args.map((argument) => {
@@ -204,15 +171,15 @@ export class TsTest {
         } catch (err) {
           console.error(err);
         }
-        setTimeout(() => {
-          console.log(globalThis.testdom);
-          done.resolve();
-        }, 5000);
-        await done.promise;
+        
+        if (globalThis.tapbundleDeferred && globalThis.tapbundleDeferred.promise) {
+          await globalThis.tapbundleDeferred.promise;
+        } else {
+          console.log('Error: Could not find tapbundle Deferred');
+        }
         return logStore;
       }
     );
-    await plugins.smartdelay.delayFor(1000);
     await this.smartbrowserInstance.stop();
     console.log(`${cs('=> ', 'blue')} Stopped ${cs(fileNameArg, 'orange')} chromium instance.`);
     await server.stop();