diff --git a/package-lock.json b/package-lock.json index 3e4ad8d..a9cc4d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -158,6 +158,26 @@ } } }, + "@pushrocks/smarthash": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@pushrocks/smarthash/-/smarthash-2.0.0.tgz", + "integrity": "sha512-+nxpmemy7Tn5tTRlJKR68HJzFDLVMJQSM/GRzb7wgYPVkjs+zeME4oTV6pn8x3//qFio8C3RdrvsQ1iz+xO/jw==", + "requires": { + "@pushrocks/smartpromise": "^2.0.5", + "@types/through2": "^2.0.33", + "through2": "^2.0.3" + }, + "dependencies": { + "@types/through2": { + "version": "2.0.33", + "resolved": "https://registry.npmjs.org/@types/through2/-/through2-2.0.33.tgz", + "integrity": "sha1-H/LoihAN+1sUDnu5h5HxGUQA0TE=", + "requires": { + "@types/node": "*" + } + } + } + }, "@pushrocks/smartlog": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@pushrocks/smartlog/-/smartlog-2.0.1.tgz", @@ -216,9 +236,9 @@ } }, "@pushrocks/tapbundle": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@pushrocks/tapbundle/-/tapbundle-3.0.5.tgz", - "integrity": "sha512-7K1y4pyJ5O8XRmnW/ADryEoniGKOW0Un6VZpxMcYTndS5AjwKhjRkAAaSQf4g/a8Ei+uk/q8csI9Twjb9KISLQ==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@pushrocks/tapbundle/-/tapbundle-3.0.7.tgz", + "integrity": "sha512-ZI4fhXPy8XMfiy/QofP0ZDuFdv3cErm+FP/+AXaNKdgCCx01MXNTYSUdER1GPUXW3ZbiXdurkLJlxlhIzD1ZJw==", "dev": true, "requires": { "@pushrocks/early": "^3.0.3", @@ -268,22 +288,9 @@ } }, "@types/node": { - "version": "10.7.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.7.1.tgz", - "integrity": "sha512-EGoI4ylB/lPOaqXqtzAyL8HcgOuCtH2hkEaLmkueOYufsTFWBn4VCvlCDC2HW8Q+9iF+QVC3sxjDKQYjHQeZ9w==" - }, - "@types/q": { - "version": "0.0.37", - "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.37.tgz", - "integrity": "sha512-vjFGX1zMTMz/kUp3xgfJcxMVLkMWVMrdlyc0RwVyve1y9jxwqNaT8wTcv6M51ylq2a/zn5lm8g7qPSoIS4uvZQ==" - }, - "@types/through2": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@types/through2/-/through2-0.4.1.tgz", - "integrity": "sha1-DwCOF0wdxfHMfgDrLRMrLLZ/e9I=", - "requires": { - "@types/node": "*" - } + "version": "10.9.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.9.4.tgz", + "integrity": "sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==" }, "@types/vinyl": { "version": "2.0.2", @@ -385,9 +392,9 @@ } }, "chai-string": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/chai-string/-/chai-string-1.4.0.tgz", - "integrity": "sha1-NZFAwFHTak5LGl/GuRAVL0OKjUk=", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/chai-string/-/chai-string-1.5.0.tgz", + "integrity": "sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw==", "dev": true }, "check-error": { @@ -686,23 +693,11 @@ "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=" }, "nan": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz", + "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==", "dev": true }, - "nodehash": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/nodehash/-/nodehash-1.0.4.tgz", - "integrity": "sha1-/XMzl6CSW5tLwZcm88DmiFAgbn8=", - "requires": { - "@types/q": "0.x.x", - "@types/through2": "0.x.x", - "q": "^1.4.1", - "through2": "^2.0.1", - "typings-global": "^1.0.6" - } - }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -741,11 +736,6 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" }, - "q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" - }, "readable-stream": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", @@ -886,11 +876,6 @@ "integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==", "dev": true }, - "typings-global": { - "version": "1.0.28", - "resolved": "https://registry.npmjs.org/typings-global/-/typings-global-1.0.28.tgz", - "integrity": "sha512-6VOwJWEY2971HOMHu/7sURzUXiD4/LiMJPsMAOqkHHAtS3MVpLFE5gzTiHilsH9KY5VE1mBQirWIgWFsDuo90A==" - }, "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", diff --git a/package.json b/package.json index 91da559..c759c42 100644 --- a/package.json +++ b/package.json @@ -15,14 +15,14 @@ "@gitzone/tsbuild": "^2.0.22", "@gitzone/tsrun": "^1.1.12", "@gitzone/tstest": "^1.0.15", - "@pushrocks/tapbundle": "^3.0.5", - "@types/node": "^10.7.1" + "@pushrocks/tapbundle": "^3.0.7", + "@types/node": "^10.9.4" }, "dependencies": { "@pushrocks/smartdelay": "^2.0.2", "@pushrocks/smarterror": "^2.0.1", + "@pushrocks/smarthash": "^2.0.0", "@pushrocks/smartpromise": "^2.0.5", - "@pushrocks/smarttime": "^2.0.2", - "nodehash": "^1.0.4" + "@pushrocks/smarttime": "^2.0.2" } } diff --git a/ts/smartcache.classes.smartcache.ts b/ts/smartcache.classes.smartcache.ts index 50d6c04..f9e326f 100644 --- a/ts/smartcache.classes.smartcache.ts +++ b/ts/smartcache.classes.smartcache.ts @@ -6,7 +6,7 @@ export class SmartCache { async cacheReturn(asyncCachedFuncArg: () => Promise, cacheDuration: number = 5000) { let callStack: string = new plugins.smarterror.SmartError('').cleanFullStack; - let callHash = plugins.nodehash.sha256FromStringSync(callStack); + let callHash = plugins.smarthash.sha256FromStringSync(callStack); // console.log(callHash); if ( diff --git a/ts/smartcache.plugins.ts b/ts/smartcache.plugins.ts index 12fa124..322a4da 100644 --- a/ts/smartcache.plugins.ts +++ b/ts/smartcache.plugins.ts @@ -2,6 +2,6 @@ import * as smartdelay from '@pushrocks/smartdelay'; import * as smarterror from '@pushrocks/smarterror'; import * as smartpromise from '@pushrocks/smartpromise'; import * as smarttime from '@pushrocks/smarttime'; -import * as nodehash from 'nodehash'; +import * as smarthash from '@pushrocks/smarthash'; -export { smarterror, smartdelay, smartpromise, smarttime, nodehash }; +export { smarterror, smartdelay, smartpromise, smarttime, smarthash };