diff --git a/package-lock.json b/package-lock.json index 23739de..11c846c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "@pushrocks/smartdelay": "^2.0.13", "@pushrocks/smartnetwork": "^2.0.14", + "@pushrocks/smartpromise": "^3.1.7", "@pushrocks/smartrequest": "^1.1.56", "@pushrocks/taskbuffer": "^2.1.17" }, @@ -2794,10 +2795,9 @@ } }, "node_modules/@pushrocks/smartpromise": { - "version": "3.1.6", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-3.1.6.tgz", - "integrity": "sha512-v+RyVpspzYuBcV/aWXqwC03TWYeFLj7aWMG3IBDFmH2ssgug+82KLW/gw2WB2aVOEvmSkfI9OVvOQz2OsLbYlA==", - "license": "MIT" + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/@pushrocks/smartpromise/-/smartpromise-3.1.7.tgz", + "integrity": "sha512-2gLQCeviEJwZ+cHHtK2Ks98brZatGC6dPXKIs1tVgJsiNgRFjnp90fESuJ1Pmoe7RrS+7J3mO4NtsFHAJJ/y5w==" }, "node_modules/@pushrocks/smartpuppeteer": { "version": "1.0.36", @@ -17854,9 +17854,9 @@ } }, "@pushrocks/smartpromise": { - "version": "3.1.6", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-3.1.6.tgz", - "integrity": "sha512-v+RyVpspzYuBcV/aWXqwC03TWYeFLj7aWMG3IBDFmH2ssgug+82KLW/gw2WB2aVOEvmSkfI9OVvOQz2OsLbYlA==" + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/@pushrocks/smartpromise/-/smartpromise-3.1.7.tgz", + "integrity": "sha512-2gLQCeviEJwZ+cHHtK2Ks98brZatGC6dPXKIs1tVgJsiNgRFjnp90fESuJ1Pmoe7RrS+7J3mO4NtsFHAJJ/y5w==" }, "@pushrocks/smartpuppeteer": { "version": "1.0.36", diff --git a/package.json b/package.json index e0bb2cf..74021ae 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "dependencies": { "@pushrocks/smartdelay": "^2.0.13", "@pushrocks/smartnetwork": "^2.0.14", + "@pushrocks/smartpromise": "^3.1.7", "@pushrocks/smartrequest": "^1.1.56", "@pushrocks/taskbuffer": "^2.1.17" } diff --git a/test/test.nonci.ts b/test/test.ts similarity index 100% rename from test/test.nonci.ts rename to test/test.ts diff --git a/ts/bobcat.classes.bobcat.ts b/ts/bobcat.classes.bobcat.ts index afbd894..6d1e6fa 100644 --- a/ts/bobcat.classes.bobcat.ts +++ b/ts/bobcat.classes.bobcat.ts @@ -15,8 +15,8 @@ export class Bobcat { public static async createFromNetworkAddress (networkAddressArg: string) { const newBobcat = new Bobcat(networkAddressArg); try { - await newBobcat.checkMinerStatus(); - await newBobcat.gatherMinerDetails(); + await plugins.smartpromise.timeoutAndContinue(newBobcat.checkMinerStatus()); + await plugins.smartpromise.timeoutAndContinue(newBobcat.gatherMinerDetails()); } catch (err) { console.log('initial adding completed with errors'); } diff --git a/ts/bobcat.classes.bobcatmanager.ts b/ts/bobcat.classes.bobcatmanager.ts index bb2c116..e5b2b94 100644 --- a/ts/bobcat.classes.bobcatmanager.ts +++ b/ts/bobcat.classes.bobcatmanager.ts @@ -45,7 +45,7 @@ export class BobcatManager { await plugins.smartdelay.delayFor(10000); for (const bobcat of this.bobcats) { console.log(`now running maintenance on ${bobcat.latestMinerDetails.animal} at ${bobcat.networkAddress}`); - await bobcat.runMaintenance(); + await plugins.smartpromise.timeoutAndContinue(bobcat.runMaintenance()); } }; diff --git a/ts/bobcat.plugins.ts b/ts/bobcat.plugins.ts index 4ea2649..11334f3 100644 --- a/ts/bobcat.plugins.ts +++ b/ts/bobcat.plugins.ts @@ -1,11 +1,13 @@ import * as smartdelay from '@pushrocks/smartdelay'; import * as smartnetwork from '@pushrocks/smartnetwork'; +import * as smartpromise from '@pushrocks/smartpromise'; import * as smartrequest from '@pushrocks/smartrequest'; import * as taskbuffer from '@pushrocks/taskbuffer'; export { smartdelay, smartnetwork, + smartpromise, smartrequest, taskbuffer, }