fetch-json-cache 1.2.4 → 1.2.6

package/dist/cjs/{get.js → get.cjs}

@@ -11,7 +11,7 @@ Object.defineProperty(exports, "default", {
 var _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
 var _path = /*#__PURE__*/ _interop_require_default(require("path"));
 var _getremote = /*#__PURE__*/ _interop_require_default(require("get-remote"));
-var _update = /*#__PURE__*/ _interop_require_default(require("./update.js"));
+var _update = /*#__PURE__*/ _interop_require_default(require("./update.cjs"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -19,7 +19,7 @@ function _interop_require_default(obj) {
 }
 function getCache(endpoint, callback) {
     var _this = this;
-    var fullPath = _path.default.join(this.cacheDirectory, "".concat(this.options.hash(endpoint), ".json"));
+    var fullPath = _path.default.join(this.cachePath, "".concat(this.options.hash(endpoint), ".json"));
     _fs.default.readFile(fullPath, function(err, contents) {
         // doesn't exist so create
         if (err) {

package/dist/cjs/get.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/get.ts"],"sourcesContent":["import fs from 'fs';\nimport path from 'path';\nimport get from 'get-remote';\n\nimport update from './update';\n\ninterface GetError {\n  code?: string;\n}\n\ninterface GetHeaders {\n  etag?: string;\n}\n\nexport default function getCache(endpoint, callback) {\n  const fullPath = path.join(this.cachePath, `${this.options.hash(endpoint)}.json`);\n  fs.readFile(fullPath, (err, contents) => {\n    // doesn't exist so create\n    if (err) {\n      update.call(this, endpoint, (err, json) => {\n        err ? callback(err) : callback(null, json);\n      });\n    }\n    // check existing if etag changed and if so, recache\n    else {\n      const record = JSON.parse(contents.toString());\n      get(endpoint).head((err, res) => {\n        // not accessible\n        if (err) {\n          if ((err as GetError).code === 'ENOTFOUND' || err.message.indexOf('routines:SSL23_GET_SERVER_HELLO') >= 0) return callback(null, record.body);\n          return callback(err);\n        }\n        if ((res.headers as GetHeaders).etag === record.headers.etag) return callback(null, record.body);\n        update.call(this, endpoint, (err, json) => {\n          err ? callback(err) : callback(null, json);\n        });\n      });\n    }\n  });\n}\n"],"names":["getCache","endpoint","callback","fullPath","path","join","cachePath","options","hash","fs","readFile","err","contents","update","call","json","record","JSON","parse","toString","get","head","res","code","message","indexOf","body","headers","etag"],"mappings":";;;;+BAcA;;;eAAwBA;;;yDAdT;2DACE;gEACD;6DAEG;;;;;;AAUJ,SAASA,SAASC,QAAQ,EAAEC,QAAQ;;IACjD,IAAMC,WAAWC,aAAI,CAACC,IAAI,CAAC,IAAI,CAACC,SAAS,EAAE,AAAC,GAA8B,OAA5B,IAAI,CAACC,OAAO,CAACC,IAAI,CAACP,WAAU;IAC1EQ,WAAE,CAACC,QAAQ,CAACP,UAAU,SAACQ,KAAKC;QAC1B,0BAA0B;QAC1B,IAAID,KAAK;YACPE,eAAM,CAACC,IAAI,QAAOb,UAAU,SAACU,KAAKI;gBAChCJ,MAAMT,SAASS,OAAOT,SAAS,MAAMa;YACvC;QACF,OAEK;YACH,IAAMC,SAASC,KAAKC,KAAK,CAACN,SAASO,QAAQ;YAC3CC,IAAAA,kBAAG,EAACnB,UAAUoB,IAAI,CAAC,SAACV,KAAKW;gBACvB,iBAAiB;gBACjB,IAAIX,KAAK;oBACP,IAAI,AAACA,IAAiBY,IAAI,KAAK,eAAeZ,IAAIa,OAAO,CAACC,OAAO,CAAC,sCAAsC,GAAG,OAAOvB,SAAS,MAAMc,OAAOU,IAAI;oBAC5I,OAAOxB,SAASS;gBAClB;gBACA,IAAI,AAACW,IAAIK,OAAO,CAAgBC,IAAI,KAAKZ,OAAOW,OAAO,CAACC,IAAI,EAAE,OAAO1B,SAAS,MAAMc,OAAOU,IAAI;gBAC/Fb,eAAM,CAACC,IAAI,QAAOb,UAAU,SAACU,KAAKI;oBAChCJ,MAAMT,SAASS,OAAOT,SAAS,MAAMa;gBACvC;YACF;QACF;IACF;AACF"}

package/dist/cjs/{getSync.js → getSync.cjs}

@@ -16,7 +16,7 @@ function _interop_require_default(obj) {
     };
 }
 function getCacheAsync(endpoint) {
-    var fullPath = _path.default.join(this.cacheDirectory, "".concat(this.options.hash(endpoint), ".json"));
+    var fullPath = _path.default.join(this.cachePath, "".concat(this.options.hash(endpoint), ".json"));
     try {
         var contents = _fs.default.readFileSync(fullPath, 'utf8');
         var record = JSON.parse(contents.toString());

package/dist/cjs/getSync.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/getSync.ts"],"sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\nexport default function getCacheAsync(endpoint) {\n  const fullPath = path.join(this.cachePath, `${this.options.hash(endpoint)}.json`);\n  try {\n    const contents = fs.readFileSync(fullPath, 'utf8');\n    const record = JSON.parse(contents.toString());\n    return record.body;\n  } catch (_err) {\n    return null;\n  }\n}\n"],"names":["getCacheAsync","endpoint","fullPath","path","join","cachePath","options","hash","contents","fs","readFileSync","record","JSON","parse","toString","body","_err"],"mappings":";;;;+BAGA;;;eAAwBA;;;yDAHT;2DACE;;;;;;AAEF,SAASA,cAAcC,QAAQ;IAC5C,IAAMC,WAAWC,aAAI,CAACC,IAAI,CAAC,IAAI,CAACC,SAAS,EAAE,AAAC,GAA8B,OAA5B,IAAI,CAACC,OAAO,CAACC,IAAI,CAACN,WAAU;IAC1E,IAAI;QACF,IAAMO,WAAWC,WAAE,CAACC,YAAY,CAACR,UAAU;QAC3C,IAAMS,SAASC,KAAKC,KAAK,CAACL,SAASM,QAAQ;QAC3C,OAAOH,OAAOI,IAAI;IACpB,EAAE,OAAOC,MAAM;QACb,OAAO;IACT;AACF"}

package/dist/cjs/{index.js → index.cjs}

@@ -9,10 +9,10 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _rimraf2 = /*#__PURE__*/ _interop_require_default(require("rimraf2"));
-var _get = /*#__PURE__*/ _interop_require_default(require("./get.js"));
-var _getSync = /*#__PURE__*/ _interop_require_default(require("./getSync.js"));
-var _hash = /*#__PURE__*/ _interop_require_default(require("./hash.js"));
-var _update = /*#__PURE__*/ _interop_require_default(require("./update.js"));
+var _get = /*#__PURE__*/ _interop_require_default(require("./get.cjs"));
+var _getSync = /*#__PURE__*/ _interop_require_default(require("./getSync.cjs"));
+var _hash = /*#__PURE__*/ _interop_require_default(require("./hash.cjs"));
+var _update = /*#__PURE__*/ _interop_require_default(require("./update.cjs"));
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -32,12 +32,12 @@ function _interop_require_default(obj) {
 }
 var Cache = /*#__PURE__*/ function() {
     "use strict";
-    function Cache(cacheDirectory) {
+    function Cache(cachePath) {
         var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
         _class_call_check(this, Cache);
         if (!_instanceof(this, Cache)) throw new Error('Cache needs to be called with new');
-        if (!cacheDirectory) throw new Error('Cache needs cacheDirectory');
-        this.cacheDirectory = cacheDirectory;
+        if (!cachePath) throw new Error('Cache needs cachePath');
+        this.cachePath = cachePath;
         this.options = options;
         if (!this.options.hash) this.options.hash = _hash.default;
     }
@@ -49,10 +49,13 @@ var Cache = /*#__PURE__*/ function() {
             options = null;
         }
         options = options || {};
-        if (typeof callback === 'function') return options.force ? _update.default.call(this, endpoint, callback) : _get.default.call(this, endpoint, callback);
+        function worker(endpoint, options, callback) {
+            options.force ? _update.default.call(this, endpoint, callback) : _get.default.call(this, endpoint, callback);
+        }
+        if (typeof callback === 'function') return worker.call(this, endpoint, options, callback);
         return new Promise(function(resolve, reject) {
-            _this.get(endpoint, options, function(err, json) {
-                err ? reject(err) : resolve(json);
+            return worker.call(_this, endpoint, options, function(err, json) {
+                return err ? reject(err) : resolve(json);
             });
         });
     };
@@ -62,14 +65,15 @@ var Cache = /*#__PURE__*/ function() {
     };
     _proto.clear = function clear(callback) {
         var _this = this;
-        if (typeof callback === 'function') return (0, _rimraf2.default)(this.cacheDirectory, {
-            disableGlob: true
-        }, function(_err) {
-            _err = null; // ignore errors since it is fine to delete a directory that doesn't exist from a cache standpoint
-            callback();
-        });
+        function worker(callback) {
+            // ignore errors since it is fine to delete a directory that doesn't exist from a cache standpoint
+            (0, _rimraf2.default)(this.cachePath, {
+                disableGlob: true
+            }, callback.bind(null, null));
+        }
+        if (typeof callback === 'function') return worker.call(this, callback);
         return new Promise(function(resolve, reject) {
-            _this.clear(function(err) {
+            return worker.call(_this, function(err) {
                 err ? reject(err) : resolve(undefined);
             });
         });

package/dist/cjs/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/index.ts"],"sourcesContent":["import rimraf2 from 'rimraf2';\n\nimport get from './get';\nimport getSync from './getSync';\nimport hash from './hash';\nimport update from './update';\n\nexport interface CacheOptions {\n  hash?: (string: string) => string;\n}\n\nexport interface GetOptions {\n  force?: boolean;\n}\nexport type GetCallback = (error?: Error, json?: object) => void;\nexport type ClearCallback = (error?: Error) => void;\n\nexport default class Cache {\n  cachePath: string;\n  options: CacheOptions;\n\n  constructor(cachePath: string, options: CacheOptions = {}) {\n    if (!(this instanceof Cache)) throw new Error('Cache needs to be called with new');\n    if (!cachePath) throw new Error('Cache needs cachePath');\n    this.cachePath = cachePath;\n    this.options = options;\n    if (!this.options.hash) this.options.hash = hash;\n  }\n\n  get(endpoint: string, options?: GetOptions | GetCallback, callback?: GetCallback): undefined | Promise<object | null> {\n    if (typeof options === 'function') {\n      callback = options as GetCallback;\n      options = null;\n    }\n    options = options || {};\n\n    function worker(endpoint, options, callback) {\n      (options as GetOptions).force ? update.call(this, endpoint, callback) : get.call(this, endpoint, callback);\n    }\n\n    if (typeof callback === 'function') return worker.call(this, endpoint, options, callback) as undefined;\n    return new Promise((resolve, reject) => worker.call(this, endpoint, options, (err, json) => (err ? reject(err) : resolve(json))));\n  }\n\n  getSync(endpoint: string): object | null {\n    // TODO: add async fetching\n    return getSync.call(this, endpoint);\n  }\n\n  clear(callback?: ClearCallback): undefined | Promise<undefined> {\n    function worker(callback) {\n      // ignore errors since it is fine to delete a directory that doesn't exist from a cache standpoint\n      rimraf2(this.cachePath, { disableGlob: true }, callback.bind(null, null));\n    }\n\n    if (typeof callback === 'function') return worker.call(this, callback);\n    return new Promise((resolve, reject) =>\n      worker.call(this, (err) => {\n        err ? reject(err) : resolve(undefined);\n      })\n    );\n  }\n}\n"],"names":["Cache","cachePath","options","Error","hash","get","endpoint","callback","worker","force","update","call","Promise","resolve","reject","err","json","getSync","clear","rimraf2","disableGlob","bind","undefined"],"mappings":";;;;;;;eAiBqBA;;;8DAjBD;0DAEJ;8DACI;2DACH;6DACE;;;;;;;;;;;;;;;;;;AAYJ,IAAA,AAAMA,sBAAN;;aAAMA,MAIPC,SAAiB;YAAEC,UAAAA,iEAAwB,CAAC;gCAJrCF;QAKjB,IAAI,CAAE,AAAI,YAAJ,IAAI,EALOA,QAKa,MAAM,IAAIG,MAAM;QAC9C,IAAI,CAACF,WAAW,MAAM,IAAIE,MAAM;QAChC,IAAI,CAACF,SAAS,GAAGA;QACjB,IAAI,CAACC,OAAO,GAAGA;QACf,IAAI,CAAC,IAAI,CAACA,OAAO,CAACE,IAAI,EAAE,IAAI,CAACF,OAAO,CAACE,IAAI,GAAGA,aAAI;;iBAT/BJ;IAYnBK,OAAAA,GAaC,GAbDA,SAAAA,IAAIC,QAAgB,EAAEJ,OAAkC,EAAEK,QAAsB;;QAC9E,IAAI,OAAOL,YAAY,YAAY;YACjCK,WAAWL;YACXA,UAAU;QACZ;QACAA,UAAUA,WAAW,CAAC;QAEtB,SAASM,OAAOF,QAAQ,EAAEJ,OAAO,EAAEK,QAAQ;YACxCL,QAAuBO,KAAK,GAAGC,eAAM,CAACC,IAAI,CAAC,IAAI,EAAEL,UAAUC,YAAYF,YAAG,CAACM,IAAI,CAAC,IAAI,EAAEL,UAAUC;QACnG;QAEA,IAAI,OAAOA,aAAa,YAAY,OAAOC,OAAOG,IAAI,CAAC,IAAI,EAAEL,UAAUJ,SAASK;QAChF,OAAO,IAAIK,QAAQ,SAACC,SAASC;mBAAWN,OAAOG,IAAI,QAAOL,UAAUJ,SAAS,SAACa,KAAKC;uBAAUD,MAAMD,OAAOC,OAAOF,QAAQG;;;IAC3H;IAEAC,OAAAA,OAGC,GAHDA,SAAAA,QAAQX,QAAgB;QACtB,2BAA2B;QAC3B,OAAOW,gBAAO,CAACN,IAAI,CAAC,IAAI,EAAEL;IAC5B;IAEAY,OAAAA,KAYC,GAZDA,SAAAA,MAAMX,QAAwB;;QAC5B,SAASC,OAAOD,QAAQ;YACtB,kGAAkG;YAClGY,IAAAA,gBAAO,EAAC,IAAI,CAAClB,SAAS,EAAE;gBAAEmB,aAAa;YAAK,GAAGb,SAASc,IAAI,CAAC,MAAM;QACrE;QAEA,IAAI,OAAOd,aAAa,YAAY,OAAOC,OAAOG,IAAI,CAAC,IAAI,EAAEJ;QAC7D,OAAO,IAAIK,QAAQ,SAACC,SAASC;mBAC3BN,OAAOG,IAAI,QAAO,SAACI;gBACjBA,MAAMD,OAAOC,OAAOF,QAAQS;YAC9B;;IAEJ;WA5CmBtB"}

package/dist/cjs/{update.js → update.cjs}

@@ -21,8 +21,8 @@ function _interop_require_default(obj) {
     };
 }
 function update(endpoint, callback) {
-    var fullPath = _path.default.join(this.cacheDirectory, "".concat(this.options.hash(endpoint), ".json"));
-    (0, _mkdirpclassic.default)(this.cacheDirectory, function(err) {
+    var fullPath = _path.default.join(this.cachePath, "".concat(this.options.hash(endpoint), ".json"));
+    (0, _mkdirpclassic.default)(this.cachePath, function(err) {
         if (err && err.code !== 'EEXIST') return callback(err);
         (0, _getremote.default)(endpoint).json(function(err, res) {
             if (err) return callback(err);

package/dist/cjs/update.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/update.ts"],"sourcesContent":["import fs from 'fs';\nimport path from 'path';\nimport get from 'get-remote';\nimport mkdirp from 'mkdirp-classic';\nimport Queue from 'queue-cb';\nimport rimraf2 from 'rimraf2';\nimport tempSuffix from 'temp-suffix';\n\nexport default function update(endpoint, callback) {\n  const fullPath = path.join(this.cachePath, `${this.options.hash(endpoint)}.json`);\n\n  mkdirp(this.cachePath, (err) => {\n    if (err && err.code !== 'EEXIST') return callback(err);\n\n    get(endpoint).json((err, res) => {\n      if (err) return callback(err);\n      const record = { headers: res.headers, body: res.body };\n      const tempFile = `${fullPath}-${tempSuffix()}`;\n\n      const queue = new Queue(1);\n      queue.defer(fs.writeFile.bind(null, tempFile, JSON.stringify(record), 'utf8'));\n      queue.defer((cb) => rimraf2(fullPath, { disableGlob: true }, cb.bind(null, null)));\n      queue.defer(fs.rename.bind(null, tempFile, fullPath));\n      queue.await((err) => {\n        if (!err) return callback(null, record.body);\n        // cleanup the temp file if the operation failed\n        rimraf2(tempFile, { disableGlob: true }, callback.bind(err));\n      });\n    });\n  });\n}\n"],"names":["update","endpoint","callback","fullPath","path","join","cachePath","options","hash","mkdirp","err","code","get","json","res","record","headers","body","tempFile","tempSuffix","queue","Queue","defer","fs","writeFile","bind","JSON","stringify","cb","rimraf2","disableGlob","rename","await"],"mappings":";;;;+BAQA;;;eAAwBA;;;yDART;2DACE;gEACD;oEACG;8DACD;8DACE;iEACG;;;;;;AAER,SAASA,OAAOC,QAAQ,EAAEC,QAAQ;IAC/C,IAAMC,WAAWC,aAAI,CAACC,IAAI,CAAC,IAAI,CAACC,SAAS,EAAE,AAAC,GAA8B,OAA5B,IAAI,CAACC,OAAO,CAACC,IAAI,CAACP,WAAU;IAE1EQ,IAAAA,sBAAM,EAAC,IAAI,CAACH,SAAS,EAAE,SAACI;QACtB,IAAIA,OAAOA,IAAIC,IAAI,KAAK,UAAU,OAAOT,SAASQ;QAElDE,IAAAA,kBAAG,EAACX,UAAUY,IAAI,CAAC,SAACH,KAAKI;YACvB,IAAIJ,KAAK,OAAOR,SAASQ;YACzB,IAAMK,SAAS;gBAAEC,SAASF,IAAIE,OAAO;gBAAEC,MAAMH,IAAIG,IAAI;YAAC;YACtD,IAAMC,WAAW,AAAC,GAAcC,OAAZhB,UAAS,KAAgB,OAAbgB,IAAAA,mBAAU;YAE1C,IAAMC,QAAQ,IAAIC,gBAAK,CAAC;YACxBD,MAAME,KAAK,CAACC,WAAE,CAACC,SAAS,CAACC,IAAI,CAAC,MAAMP,UAAUQ,KAAKC,SAAS,CAACZ,SAAS;YACtEK,MAAME,KAAK,CAAC,SAACM;uBAAOC,IAAAA,gBAAO,EAAC1B,UAAU;oBAAE2B,aAAa;gBAAK,GAAGF,GAAGH,IAAI,CAAC,MAAM;;YAC3EL,MAAME,KAAK,CAACC,WAAE,CAACQ,MAAM,CAACN,IAAI,CAAC,MAAMP,UAAUf;YAC3CiB,MAAMY,KAAK,CAAC,SAACtB;gBACX,IAAI,CAACA,KAAK,OAAOR,SAAS,MAAMa,OAAOE,IAAI;gBAC3C,gDAAgD;gBAChDY,IAAAA,gBAAO,EAACX,UAAU;oBAAEY,aAAa;gBAAK,GAAG5B,SAASuB,IAAI,CAACf;YACzD;QACF;IACF;AACF"}

package/dist/esm/get.mjs

@@ -3,7 +3,7 @@ import path from 'path';
 import get from 'get-remote';
 import update from './update.mjs';
 export default function getCache(endpoint, callback) {
-    const fullPath = path.join(this.cacheDirectory, `${this.options.hash(endpoint)}.json`);
+    const fullPath = path.join(this.cachePath, `${this.options.hash(endpoint)}.json`);
     fs.readFile(fullPath, (err, contents)=>{
         // doesn't exist so create
         if (err) {

package/dist/esm/get.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/get.ts"],"sourcesContent":["import fs from 'fs';\nimport path from 'path';\nimport get from 'get-remote';\n\nimport update from './update.js';\n\ninterface GetError {\n  code?: string;\n}\n\ninterface GetHeaders {\n  etag?: string;\n}\n\nexport default function getCache(endpoint, callback) {\n  const fullPath = path.join(this.cacheDirectory, `${this.options.hash(endpoint)}.json`);\n  fs.readFile(fullPath, (err, contents) => {\n    // doesn't exist so create\n    if (err) {\n      update.call(this, endpoint, (err, json) => {\n        err ? callback(err) : callback(null, json);\n      });\n    }\n    // check existing if etag changed and if so, recache\n    else {\n      const record = JSON.parse(contents.toString());\n      get(endpoint).head((err, res) => {\n        // not accessible\n        if (err) {\n          if ((err as GetError).code === 'ENOTFOUND' || err.message.indexOf('routines:SSL23_GET_SERVER_HELLO') >= 0) return callback(null, record.body);\n          return callback(err);\n        }\n        if ((res.headers as GetHeaders).etag === record.headers.etag) return callback(null, record.body);\n        update.call(this, endpoint, (err, json) => {\n          err ? callback(err) : callback(null, json);\n        });\n      });\n    }\n  });\n}\n"],"names":["fs","path","get","update","getCache","endpoint","callback","fullPath","join","cacheDirectory","options","hash","readFile","err","contents","call","json","record","JSON","parse","toString","head","res","code","message","indexOf","body","headers","etag"],"mappings":"AAAA,OAAOA,QAAQ,KAAK;AACpB,OAAOC,UAAU,OAAO;AACxB,OAAOC,SAAS,aAAa;AAE7B,OAAOC,YAAY,cAAc;AAUjC,eAAe,SAASC,SAASC,QAAQ,EAAEC,QAAQ;IACjD,MAAMC,WAAWN,KAAKO,IAAI,CAAC,IAAI,CAACC,cAAc,EAAE,GAAG,IAAI,CAACC,OAAO,CAACC,IAAI,CAACN,UAAU,KAAK,CAAC;IACrFL,GAAGY,QAAQ,CAACL,UAAU,CAACM,KAAKC;QAC1B,0BAA0B;QAC1B,IAAID,KAAK;YACPV,OAAOY,IAAI,CAAC,IAAI,EAAEV,UAAU,CAACQ,KAAKG;gBAChCH,MAAMP,SAASO,OAAOP,SAAS,MAAMU;YACvC;QACF,OAEK;YACH,MAAMC,SAASC,KAAKC,KAAK,CAACL,SAASM,QAAQ;YAC3ClB,IAAIG,UAAUgB,IAAI,CAAC,CAACR,KAAKS;gBACvB,iBAAiB;gBACjB,IAAIT,KAAK;oBACP,IAAI,AAACA,IAAiBU,IAAI,KAAK,eAAeV,IAAIW,OAAO,CAACC,OAAO,CAAC,sCAAsC,GAAG,OAAOnB,SAAS,MAAMW,OAAOS,IAAI;oBAC5I,OAAOpB,SAASO;gBAClB;gBACA,IAAI,AAACS,IAAIK,OAAO,CAAgBC,IAAI,KAAKX,OAAOU,OAAO,CAACC,IAAI,EAAE,OAAOtB,SAAS,MAAMW,OAAOS,IAAI;gBAC/FvB,OAAOY,IAAI,CAAC,IAAI,EAAEV,UAAU,CAACQ,KAAKG;oBAChCH,MAAMP,SAASO,OAAOP,SAAS,MAAMU;gBACvC;YACF;QACF;IACF;AACF"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/get.ts"],"sourcesContent":["import fs from 'fs';\nimport path from 'path';\nimport get from 'get-remote';\n\nimport update from './update';\n\ninterface GetError {\n  code?: string;\n}\n\ninterface GetHeaders {\n  etag?: string;\n}\n\nexport default function getCache(endpoint, callback) {\n  const fullPath = path.join(this.cachePath, `${this.options.hash(endpoint)}.json`);\n  fs.readFile(fullPath, (err, contents) => {\n    // doesn't exist so create\n    if (err) {\n      update.call(this, endpoint, (err, json) => {\n        err ? callback(err) : callback(null, json);\n      });\n    }\n    // check existing if etag changed and if so, recache\n    else {\n      const record = JSON.parse(contents.toString());\n      get(endpoint).head((err, res) => {\n        // not accessible\n        if (err) {\n          if ((err as GetError).code === 'ENOTFOUND' || err.message.indexOf('routines:SSL23_GET_SERVER_HELLO') >= 0) return callback(null, record.body);\n          return callback(err);\n        }\n        if ((res.headers as GetHeaders).etag === record.headers.etag) return callback(null, record.body);\n        update.call(this, endpoint, (err, json) => {\n          err ? callback(err) : callback(null, json);\n        });\n      });\n    }\n  });\n}\n"],"names":["fs","path","get","update","getCache","endpoint","callback","fullPath","join","cachePath","options","hash","readFile","err","contents","call","json","record","JSON","parse","toString","head","res","code","message","indexOf","body","headers","etag"],"mappings":"AAAA,OAAOA,QAAQ,KAAK;AACpB,OAAOC,UAAU,OAAO;AACxB,OAAOC,SAAS,aAAa;AAE7B,OAAOC,YAAY,WAAW;AAU9B,eAAe,SAASC,SAASC,QAAQ,EAAEC,QAAQ;IACjD,MAAMC,WAAWN,KAAKO,IAAI,CAAC,IAAI,CAACC,SAAS,EAAE,GAAG,IAAI,CAACC,OAAO,CAACC,IAAI,CAACN,UAAU,KAAK,CAAC;IAChFL,GAAGY,QAAQ,CAACL,UAAU,CAACM,KAAKC;QAC1B,0BAA0B;QAC1B,IAAID,KAAK;YACPV,OAAOY,IAAI,CAAC,IAAI,EAAEV,UAAU,CAACQ,KAAKG;gBAChCH,MAAMP,SAASO,OAAOP,SAAS,MAAMU;YACvC;QACF,OAEK;YACH,MAAMC,SAASC,KAAKC,KAAK,CAACL,SAASM,QAAQ;YAC3ClB,IAAIG,UAAUgB,IAAI,CAAC,CAACR,KAAKS;gBACvB,iBAAiB;gBACjB,IAAIT,KAAK;oBACP,IAAI,AAACA,IAAiBU,IAAI,KAAK,eAAeV,IAAIW,OAAO,CAACC,OAAO,CAAC,sCAAsC,GAAG,OAAOnB,SAAS,MAAMW,OAAOS,IAAI;oBAC5I,OAAOpB,SAASO;gBAClB;gBACA,IAAI,AAACS,IAAIK,OAAO,CAAgBC,IAAI,KAAKX,OAAOU,OAAO,CAACC,IAAI,EAAE,OAAOtB,SAAS,MAAMW,OAAOS,IAAI;gBAC/FvB,OAAOY,IAAI,CAAC,IAAI,EAAEV,UAAU,CAACQ,KAAKG;oBAChCH,MAAMP,SAASO,OAAOP,SAAS,MAAMU;gBACvC;YACF;QACF;IACF;AACF"}

package/dist/esm/getSync.mjs

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 export default function getCacheAsync(endpoint) {
-    const fullPath = path.join(this.cacheDirectory, `${this.options.hash(endpoint)}.json`);
+    const fullPath = path.join(this.cachePath, `${this.options.hash(endpoint)}.json`);
     try {
         const contents = fs.readFileSync(fullPath, 'utf8');
         const record = JSON.parse(contents.toString());

package/dist/esm/getSync.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/getSync.ts"],"sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\nexport default function getCacheAsync(endpoint) {\n  const fullPath = path.join(this.cacheDirectory, `${this.options.hash(endpoint)}.json`);\n  try {\n    const contents = fs.readFileSync(fullPath, 'utf8');\n    const record = JSON.parse(contents.toString());\n    return record.body;\n  } catch (_err) {\n    return null;\n  }\n}\n"],"names":["fs","path","getCacheAsync","endpoint","fullPath","join","cacheDirectory","options","hash","contents","readFileSync","record","JSON","parse","toString","body","_err"],"mappings":"AAAA,OAAOA,QAAQ,KAAK;AACpB,OAAOC,UAAU,OAAO;AAExB,eAAe,SAASC,cAAcC,QAAQ;IAC5C,MAAMC,WAAWH,KAAKI,IAAI,CAAC,IAAI,CAACC,cAAc,EAAE,GAAG,IAAI,CAACC,OAAO,CAACC,IAAI,CAACL,UAAU,KAAK,CAAC;IACrF,IAAI;QACF,MAAMM,WAAWT,GAAGU,YAAY,CAACN,UAAU;QAC3C,MAAMO,SAASC,KAAKC,KAAK,CAACJ,SAASK,QAAQ;QAC3C,OAAOH,OAAOI,IAAI;IACpB,EAAE,OAAOC,MAAM;QACb,OAAO;IACT;AACF"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/getSync.ts"],"sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\nexport default function getCacheAsync(endpoint) {\n  const fullPath = path.join(this.cachePath, `${this.options.hash(endpoint)}.json`);\n  try {\n    const contents = fs.readFileSync(fullPath, 'utf8');\n    const record = JSON.parse(contents.toString());\n    return record.body;\n  } catch (_err) {\n    return null;\n  }\n}\n"],"names":["fs","path","getCacheAsync","endpoint","fullPath","join","cachePath","options","hash","contents","readFileSync","record","JSON","parse","toString","body","_err"],"mappings":"AAAA,OAAOA,QAAQ,KAAK;AACpB,OAAOC,UAAU,OAAO;AAExB,eAAe,SAASC,cAAcC,QAAQ;IAC5C,MAAMC,WAAWH,KAAKI,IAAI,CAAC,IAAI,CAACC,SAAS,EAAE,GAAG,IAAI,CAACC,OAAO,CAACC,IAAI,CAACL,UAAU,KAAK,CAAC;IAChF,IAAI;QACF,MAAMM,WAAWT,GAAGU,YAAY,CAACN,UAAU;QAC3C,MAAMO,SAASC,KAAKC,KAAK,CAACJ,SAASK,QAAQ;QAC3C,OAAOH,OAAOI,IAAI;IACpB,EAAE,OAAOC,MAAM;QACb,OAAO;IACT;AACF"}

package/dist/esm/index.mjs

@@ -10,34 +10,32 @@ let Cache = class Cache {
             options = null;
         }
         options = options || {};
-        if (typeof callback === 'function') return options.force ? update.call(this, endpoint, callback) : get.call(this, endpoint, callback);
-        return new Promise((resolve, reject)=>{
-            this.get(endpoint, options, (err, json)=>{
-                err ? reject(err) : resolve(json);
-            });
-        });
+        function worker(endpoint, options, callback) {
+            options.force ? update.call(this, endpoint, callback) : get.call(this, endpoint, callback);
+        }
+        if (typeof callback === 'function') return worker.call(this, endpoint, options, callback);
+        return new Promise((resolve, reject)=>worker.call(this, endpoint, options, (err, json)=>err ? reject(err) : resolve(json)));
     }
     getSync(endpoint) {
         // TODO: add async fetching
         return getSync.call(this, endpoint);
     }
     clear(callback) {
-        if (typeof callback === 'function') return rimraf2(this.cacheDirectory, {
-            disableGlob: true
-        }, (_err)=>{
-            _err = null; // ignore errors since it is fine to delete a directory that doesn't exist from a cache standpoint
-            callback();
-        });
-        return new Promise((resolve, reject)=>{
-            this.clear((err)=>{
+        function worker(callback) {
+            // ignore errors since it is fine to delete a directory that doesn't exist from a cache standpoint
+            rimraf2(this.cachePath, {
+                disableGlob: true
+            }, callback.bind(null, null));
+        }
+        if (typeof callback === 'function') return worker.call(this, callback);
+        return new Promise((resolve, reject)=>worker.call(this, (err)=>{
                 err ? reject(err) : resolve(undefined);
-            });
-        });
+            }));
     }
-    constructor(cacheDirectory, options = {}){
+    constructor(cachePath, options = {}){
         if (!(this instanceof Cache)) throw new Error('Cache needs to be called with new');
-        if (!cacheDirectory) throw new Error('Cache needs cacheDirectory');
-        this.cacheDirectory = cacheDirectory;
+        if (!cachePath) throw new Error('Cache needs cachePath');
+        this.cachePath = cachePath;
         this.options = options;
         if (!this.options.hash) this.options.hash = hash;
     }

package/dist/esm/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/index.ts"],"sourcesContent":["import rimraf2 from 'rimraf2';\n\nimport get from './get.js';\nimport getSync from './getSync.js';\nimport hash from './hash.js';\nimport update from './update.js';\n\nexport interface CacheOptions {\n  hash?: (string: string) => string;\n}\n\nexport interface GetOptions {\n  force?: boolean;\n}\nexport type GetCallback = (error?: Error, json?: object) => void;\nexport type ClearCallback = (error?: Error) => void;\n\nexport default class Cache {\n  cacheDirectory: string;\n  options: CacheOptions;\n\n  constructor(cacheDirectory: string, options: CacheOptions = {}) {\n    if (!(this instanceof Cache)) throw new Error('Cache needs to be called with new');\n    if (!cacheDirectory) throw new Error('Cache needs cacheDirectory');\n    this.cacheDirectory = cacheDirectory;\n    this.options = options;\n    if (!this.options.hash) this.options.hash = hash;\n  }\n\n  get(endpoint: string, options?: GetOptions | GetCallback, callback?: GetCallback): undefined | Promise<object | null> {\n    if (typeof options === 'function') {\n      callback = options as GetCallback;\n      options = null;\n    }\n    options = options || {};\n\n    if (typeof callback === 'function') return (options as GetOptions).force ? update.call(this, endpoint, callback) : get.call(this, endpoint, callback);\n    return new Promise((resolve, reject) => {\n      this.get(endpoint, options, (err, json) => {\n        err ? reject(err) : resolve(json);\n      });\n    });\n  }\n\n  getSync(endpoint: string): object | null {\n    // TODO: add async fetching\n    return getSync.call(this, endpoint);\n  }\n\n  clear(callback?: ClearCallback): undefined | Promise<undefined> {\n    if (typeof callback === 'function')\n      return rimraf2(this.cacheDirectory, { disableGlob: true }, (_err) => {\n        _err = null; // ignore errors since it is fine to delete a directory that doesn't exist from a cache standpoint\n        callback();\n      });\n    return new Promise((resolve, reject) => {\n      this.clear((err) => {\n        err ? reject(err) : resolve(undefined);\n      });\n    });\n  }\n}\n"],"names":["rimraf2","get","getSync","hash","update","Cache","endpoint","options","callback","force","call","Promise","resolve","reject","err","json","clear","cacheDirectory","disableGlob","_err","undefined","constructor","Error"],"mappings":"AAAA,OAAOA,aAAa,UAAU;AAE9B,OAAOC,SAAS,WAAW;AAC3B,OAAOC,aAAa,eAAe;AACnC,OAAOC,UAAU,YAAY;AAC7B,OAAOC,YAAY,cAAc;AAYlB,IAAA,AAAMC,QAAN,MAAMA;IAYnBJ,IAAIK,QAAgB,EAAEC,OAAkC,EAAEC,QAAsB,EAAsC;QACpH,IAAI,OAAOD,YAAY,YAAY;YACjCC,WAAWD;YACXA,UAAU;QACZ;QACAA,UAAUA,WAAW,CAAC;QAEtB,IAAI,OAAOC,aAAa,YAAY,OAAO,AAACD,QAAuBE,KAAK,GAAGL,OAAOM,IAAI,CAAC,IAAI,EAAEJ,UAAUE,YAAYP,IAAIS,IAAI,CAAC,IAAI,EAAEJ,UAAUE;QAC5I,OAAO,IAAIG,QAAQ,CAACC,SAASC;YAC3B,IAAI,CAACZ,GAAG,CAACK,UAAUC,SAAS,CAACO,KAAKC;gBAChCD,MAAMD,OAAOC,OAAOF,QAAQG;YAC9B;QACF;IACF;IAEAb,QAAQI,QAAgB,EAAiB;QACvC,2BAA2B;QAC3B,OAAOJ,QAAQQ,IAAI,CAAC,IAAI,EAAEJ;IAC5B;IAEAU,MAAMR,QAAwB,EAAkC;QAC9D,IAAI,OAAOA,aAAa,YACtB,OAAOR,QAAQ,IAAI,CAACiB,cAAc,EAAE;YAAEC,aAAa;QAAK,GAAG,CAACC;YAC1DA,OAAO,MAAM,kGAAkG;YAC/GX;QACF;QACF,OAAO,IAAIG,QAAQ,CAACC,SAASC;YAC3B,IAAI,CAACG,KAAK,CAAC,CAACF;gBACVA,MAAMD,OAAOC,OAAOF,QAAQQ;YAC9B;QACF;IACF;IAvCAC,YAAYJ,cAAsB,EAAEV,UAAwB,CAAC,CAAC,CAAE;QAC9D,IAAI,CAAE,CAAA,IAAI,YAAYF,KAAI,GAAI,MAAM,IAAIiB,MAAM;QAC9C,IAAI,CAACL,gBAAgB,MAAM,IAAIK,MAAM;QACrC,IAAI,CAACL,cAAc,GAAGA;QACtB,IAAI,CAACV,OAAO,GAAGA;QACf,IAAI,CAAC,IAAI,CAACA,OAAO,CAACJ,IAAI,EAAE,IAAI,CAACI,OAAO,CAACJ,IAAI,GAAGA;IAC9C;AAkCF;AA5CA,SAAqBE,mBA4CpB"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/index.ts"],"sourcesContent":["import rimraf2 from 'rimraf2';\n\nimport get from './get';\nimport getSync from './getSync';\nimport hash from './hash';\nimport update from './update';\n\nexport interface CacheOptions {\n  hash?: (string: string) => string;\n}\n\nexport interface GetOptions {\n  force?: boolean;\n}\nexport type GetCallback = (error?: Error, json?: object) => void;\nexport type ClearCallback = (error?: Error) => void;\n\nexport default class Cache {\n  cachePath: string;\n  options: CacheOptions;\n\n  constructor(cachePath: string, options: CacheOptions = {}) {\n    if (!(this instanceof Cache)) throw new Error('Cache needs to be called with new');\n    if (!cachePath) throw new Error('Cache needs cachePath');\n    this.cachePath = cachePath;\n    this.options = options;\n    if (!this.options.hash) this.options.hash = hash;\n  }\n\n  get(endpoint: string, options?: GetOptions | GetCallback, callback?: GetCallback): undefined | Promise<object | null> {\n    if (typeof options === 'function') {\n      callback = options as GetCallback;\n      options = null;\n    }\n    options = options || {};\n\n    function worker(endpoint, options, callback) {\n      (options as GetOptions).force ? update.call(this, endpoint, callback) : get.call(this, endpoint, callback);\n    }\n\n    if (typeof callback === 'function') return worker.call(this, endpoint, options, callback) as undefined;\n    return new Promise((resolve, reject) => worker.call(this, endpoint, options, (err, json) => (err ? reject(err) : resolve(json))));\n  }\n\n  getSync(endpoint: string): object | null {\n    // TODO: add async fetching\n    return getSync.call(this, endpoint);\n  }\n\n  clear(callback?: ClearCallback): undefined | Promise<undefined> {\n    function worker(callback) {\n      // ignore errors since it is fine to delete a directory that doesn't exist from a cache standpoint\n      rimraf2(this.cachePath, { disableGlob: true }, callback.bind(null, null));\n    }\n\n    if (typeof callback === 'function') return worker.call(this, callback);\n    return new Promise((resolve, reject) =>\n      worker.call(this, (err) => {\n        err ? reject(err) : resolve(undefined);\n      })\n    );\n  }\n}\n"],"names":["rimraf2","get","getSync","hash","update","Cache","endpoint","options","callback","worker","force","call","Promise","resolve","reject","err","json","clear","cachePath","disableGlob","bind","undefined","constructor","Error"],"mappings":"AAAA,OAAOA,aAAa,UAAU;AAE9B,OAAOC,SAAS,QAAQ;AACxB,OAAOC,aAAa,YAAY;AAChC,OAAOC,UAAU,SAAS;AAC1B,OAAOC,YAAY,WAAW;AAYf,IAAA,AAAMC,QAAN,MAAMA;IAYnBJ,IAAIK,QAAgB,EAAEC,OAAkC,EAAEC,QAAsB,EAAsC;QACpH,IAAI,OAAOD,YAAY,YAAY;YACjCC,WAAWD;YACXA,UAAU;QACZ;QACAA,UAAUA,WAAW,CAAC;QAEtB,SAASE,OAAOH,QAAQ,EAAEC,OAAO,EAAEC,QAAQ;YACxCD,QAAuBG,KAAK,GAAGN,OAAOO,IAAI,CAAC,IAAI,EAAEL,UAAUE,YAAYP,IAAIU,IAAI,CAAC,IAAI,EAAEL,UAAUE;QACnG;QAEA,IAAI,OAAOA,aAAa,YAAY,OAAOC,OAAOE,IAAI,CAAC,IAAI,EAAEL,UAAUC,SAASC;QAChF,OAAO,IAAII,QAAQ,CAACC,SAASC,SAAWL,OAAOE,IAAI,CAAC,IAAI,EAAEL,UAAUC,SAAS,CAACQ,KAAKC,OAAUD,MAAMD,OAAOC,OAAOF,QAAQG;IAC3H;IAEAd,QAAQI,QAAgB,EAAiB;QACvC,2BAA2B;QAC3B,OAAOJ,QAAQS,IAAI,CAAC,IAAI,EAAEL;IAC5B;IAEAW,MAAMT,QAAwB,EAAkC;QAC9D,SAASC,OAAOD,QAAQ;YACtB,kGAAkG;YAClGR,QAAQ,IAAI,CAACkB,SAAS,EAAE;gBAAEC,aAAa;YAAK,GAAGX,SAASY,IAAI,CAAC,MAAM;QACrE;QAEA,IAAI,OAAOZ,aAAa,YAAY,OAAOC,OAAOE,IAAI,CAAC,IAAI,EAAEH;QAC7D,OAAO,IAAII,QAAQ,CAACC,SAASC,SAC3BL,OAAOE,IAAI,CAAC,IAAI,EAAE,CAACI;gBACjBA,MAAMD,OAAOC,OAAOF,QAAQQ;YAC9B;IAEJ;IAxCAC,YAAYJ,SAAiB,EAAEX,UAAwB,CAAC,CAAC,CAAE;QACzD,IAAI,CAAE,CAAA,IAAI,YAAYF,KAAI,GAAI,MAAM,IAAIkB,MAAM;QAC9C,IAAI,CAACL,WAAW,MAAM,IAAIK,MAAM;QAChC,IAAI,CAACL,SAAS,GAAGA;QACjB,IAAI,CAACX,OAAO,GAAGA;QACf,IAAI,CAAC,IAAI,CAACA,OAAO,CAACJ,IAAI,EAAE,IAAI,CAACI,OAAO,CAACJ,IAAI,GAAGA;IAC9C;AAmCF;AA7CA,SAAqBE,mBA6CpB"}

package/dist/esm/update.mjs

@@ -6,8 +6,8 @@ import Queue from 'queue-cb';
 import rimraf2 from 'rimraf2';
 import tempSuffix from 'temp-suffix';
 export default function update(endpoint, callback) {
-    const fullPath = path.join(this.cacheDirectory, `${this.options.hash(endpoint)}.json`);
-    mkdirp(this.cacheDirectory, (err)=>{
+    const fullPath = path.join(this.cachePath, `${this.options.hash(endpoint)}.json`);
+    mkdirp(this.cachePath, (err)=>{
         if (err && err.code !== 'EEXIST') return callback(err);
         get(endpoint).json((err, res)=>{
             if (err) return callback(err);

package/dist/esm/update.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/update.ts"],"sourcesContent":["import fs from 'fs';\nimport path from 'path';\nimport get from 'get-remote';\nimport mkdirp from 'mkdirp-classic';\nimport Queue from 'queue-cb';\nimport rimraf2 from 'rimraf2';\nimport tempSuffix from 'temp-suffix';\n\nexport default function update(endpoint, callback) {\n  const fullPath = path.join(this.cacheDirectory, `${this.options.hash(endpoint)}.json`);\n\n  mkdirp(this.cacheDirectory, (err) => {\n    if (err && err.code !== 'EEXIST') return callback(err);\n\n    get(endpoint).json((err, res) => {\n      if (err) return callback(err);\n      const record = { headers: res.headers, body: res.body };\n      const tempFile = `${fullPath}-${tempSuffix()}`;\n\n      const queue = new Queue(1);\n      queue.defer(fs.writeFile.bind(null, tempFile, JSON.stringify(record), 'utf8'));\n      queue.defer((cb) => rimraf2(fullPath, { disableGlob: true }, cb.bind(null, null)));\n      queue.defer(fs.rename.bind(null, tempFile, fullPath));\n      queue.await((err) => {\n        if (!err) return callback(null, record.body);\n        // cleanup the temp file if the operation failed\n        rimraf2(tempFile, { disableGlob: true }, callback.bind(err));\n      });\n    });\n  });\n}\n"],"names":["fs","path","get","mkdirp","Queue","rimraf2","tempSuffix","update","endpoint","callback","fullPath","join","cacheDirectory","options","hash","err","code","json","res","record","headers","body","tempFile","queue","defer","writeFile","bind","JSON","stringify","cb","disableGlob","rename","await"],"mappings":"AAAA,OAAOA,QAAQ,KAAK;AACpB,OAAOC,UAAU,OAAO;AACxB,OAAOC,SAAS,aAAa;AAC7B,OAAOC,YAAY,iBAAiB;AACpC,OAAOC,WAAW,WAAW;AAC7B,OAAOC,aAAa,UAAU;AAC9B,OAAOC,gBAAgB,cAAc;AAErC,eAAe,SAASC,OAAOC,QAAQ,EAAEC,QAAQ;IAC/C,MAAMC,WAAWT,KAAKU,IAAI,CAAC,IAAI,CAACC,cAAc,EAAE,GAAG,IAAI,CAACC,OAAO,CAACC,IAAI,CAACN,UAAU,KAAK,CAAC;IAErFL,OAAO,IAAI,CAACS,cAAc,EAAE,CAACG;QAC3B,IAAIA,OAAOA,IAAIC,IAAI,KAAK,UAAU,OAAOP,SAASM;QAElDb,IAAIM,UAAUS,IAAI,CAAC,CAACF,KAAKG;YACvB,IAAIH,KAAK,OAAON,SAASM;YACzB,MAAMI,SAAS;gBAAEC,SAASF,IAAIE,OAAO;gBAAEC,MAAMH,IAAIG,IAAI;YAAC;YACtD,MAAMC,WAAW,GAAGZ,SAAS,CAAC,EAAEJ,cAAc;YAE9C,MAAMiB,QAAQ,IAAInB,MAAM;YACxBmB,MAAMC,KAAK,CAACxB,GAAGyB,SAAS,CAACC,IAAI,CAAC,MAAMJ,UAAUK,KAAKC,SAAS,CAACT,SAAS;YACtEI,MAAMC,KAAK,CAAC,CAACK,KAAOxB,QAAQK,UAAU;oBAAEoB,aAAa;gBAAK,GAAGD,GAAGH,IAAI,CAAC,MAAM;YAC3EH,MAAMC,KAAK,CAACxB,GAAG+B,MAAM,CAACL,IAAI,CAAC,MAAMJ,UAAUZ;YAC3Ca,MAAMS,KAAK,CAAC,CAACjB;gBACX,IAAI,CAACA,KAAK,OAAON,SAAS,MAAMU,OAAOE,IAAI;gBAC3C,gDAAgD;gBAChDhB,QAAQiB,UAAU;oBAAEQ,aAAa;gBAAK,GAAGrB,SAASiB,IAAI,CAACX;YACzD;QACF;IACF;AACF"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/update.ts"],"sourcesContent":["import fs from 'fs';\nimport path from 'path';\nimport get from 'get-remote';\nimport mkdirp from 'mkdirp-classic';\nimport Queue from 'queue-cb';\nimport rimraf2 from 'rimraf2';\nimport tempSuffix from 'temp-suffix';\n\nexport default function update(endpoint, callback) {\n  const fullPath = path.join(this.cachePath, `${this.options.hash(endpoint)}.json`);\n\n  mkdirp(this.cachePath, (err) => {\n    if (err && err.code !== 'EEXIST') return callback(err);\n\n    get(endpoint).json((err, res) => {\n      if (err) return callback(err);\n      const record = { headers: res.headers, body: res.body };\n      const tempFile = `${fullPath}-${tempSuffix()}`;\n\n      const queue = new Queue(1);\n      queue.defer(fs.writeFile.bind(null, tempFile, JSON.stringify(record), 'utf8'));\n      queue.defer((cb) => rimraf2(fullPath, { disableGlob: true }, cb.bind(null, null)));\n      queue.defer(fs.rename.bind(null, tempFile, fullPath));\n      queue.await((err) => {\n        if (!err) return callback(null, record.body);\n        // cleanup the temp file if the operation failed\n        rimraf2(tempFile, { disableGlob: true }, callback.bind(err));\n      });\n    });\n  });\n}\n"],"names":["fs","path","get","mkdirp","Queue","rimraf2","tempSuffix","update","endpoint","callback","fullPath","join","cachePath","options","hash","err","code","json","res","record","headers","body","tempFile","queue","defer","writeFile","bind","JSON","stringify","cb","disableGlob","rename","await"],"mappings":"AAAA,OAAOA,QAAQ,KAAK;AACpB,OAAOC,UAAU,OAAO;AACxB,OAAOC,SAAS,aAAa;AAC7B,OAAOC,YAAY,iBAAiB;AACpC,OAAOC,WAAW,WAAW;AAC7B,OAAOC,aAAa,UAAU;AAC9B,OAAOC,gBAAgB,cAAc;AAErC,eAAe,SAASC,OAAOC,QAAQ,EAAEC,QAAQ;IAC/C,MAAMC,WAAWT,KAAKU,IAAI,CAAC,IAAI,CAACC,SAAS,EAAE,GAAG,IAAI,CAACC,OAAO,CAACC,IAAI,CAACN,UAAU,KAAK,CAAC;IAEhFL,OAAO,IAAI,CAACS,SAAS,EAAE,CAACG;QACtB,IAAIA,OAAOA,IAAIC,IAAI,KAAK,UAAU,OAAOP,SAASM;QAElDb,IAAIM,UAAUS,IAAI,CAAC,CAACF,KAAKG;YACvB,IAAIH,KAAK,OAAON,SAASM;YACzB,MAAMI,SAAS;gBAAEC,SAASF,IAAIE,OAAO;gBAAEC,MAAMH,IAAIG,IAAI;YAAC;YACtD,MAAMC,WAAW,GAAGZ,SAAS,CAAC,EAAEJ,cAAc;YAE9C,MAAMiB,QAAQ,IAAInB,MAAM;YACxBmB,MAAMC,KAAK,CAACxB,GAAGyB,SAAS,CAACC,IAAI,CAAC,MAAMJ,UAAUK,KAAKC,SAAS,CAACT,SAAS;YACtEI,MAAMC,KAAK,CAAC,CAACK,KAAOxB,QAAQK,UAAU;oBAAEoB,aAAa;gBAAK,GAAGD,GAAGH,IAAI,CAAC,MAAM;YAC3EH,MAAMC,KAAK,CAACxB,GAAG+B,MAAM,CAACL,IAAI,CAAC,MAAMJ,UAAUZ;YAC3Ca,MAAMS,KAAK,CAAC,CAACjB;gBACX,IAAI,CAACA,KAAK,OAAON,SAAS,MAAMU,OAAOE,IAAI;gBAC3C,gDAAgD;gBAChDhB,QAAQiB,UAAU;oBAAEQ,aAAa;gBAAK,GAAGrB,SAASiB,IAAI,CAACX;YACzD;QACF;IACF;AACF"}

package/dist/types/hash.d.ts

@@ -1 +1 @@
-export default function hash(data: any): string;
+export default function hash(data: any): any;

package/dist/types/index.d.ts

@@ -7,9 +7,9 @@ export interface GetOptions {
 export type GetCallback = (error?: Error, json?: object) => void;
 export type ClearCallback = (error?: Error) => void;
 export default class Cache {
-    cacheDirectory: string;
+    cachePath: string;
     options: CacheOptions;
-    constructor(cacheDirectory: string, options?: CacheOptions);
+    constructor(cachePath: string, options?: CacheOptions);
     get(endpoint: string, options?: GetOptions | GetCallback, callback?: GetCallback): undefined | Promise<object | null>;
     getSync(endpoint: string): object | null;
     clear(callback?: ClearCallback): undefined | Promise<undefined>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fetch-json-cache",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "Caches fetched json. Updates when etag changes and is uses cache regardless if endpoint unreachable. Uses write-file-atomic for safe updates",
   "keywords": [
     "every",
@@ -19,12 +19,12 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.mjs",
-      "require": "./dist/cjs/index.js",
+      "require": "./dist/cjs/index.cjs",
       "types": "./dist/types/index.d.ts"
     },
     "./*": "./*"
   },
-  "main": "dist/cjs/index.js",
+  "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.mjs",
   "types": "dist/types/index.d.ts",
   "files": [
@@ -33,23 +33,23 @@
   "scripts": {
     "build": "tsds build",
     "deploy": "tsds deploy",
+    "docs": "tsds docs",
     "format": "biome check --write --unsafe src/ test/",
     "test": "tsds test:node --no-timeouts",
     "test:engines": "nvu engines npm test",
     "version": "tsds version"
   },
   "dependencies": {
-    "get-remote": "^1.3.1",
+    "get-remote": "^1.3.2",
     "mkdirp-classic": "^0.5.3",
-    "queue-cb": "^1.4.4",
+    "queue-cb": "^1.4.6",
     "rimraf2": "^2.8.2",
-    "temp-suffix": "^0.1.1"
+    "temp-suffix": "^0.1.4"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
     "@types/mocha": "^10.0.10",
     "@types/node": "^22.10.2",
-    "depcheck": "^1.4.7",
     "fs-exists-sync": "^0.1.0",
     "pinkie-promise": "^2.0.1"
   },

package/dist/cjs/get.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/get.ts"],"sourcesContent":["import fs from 'fs';\nimport path from 'path';\nimport get from 'get-remote';\n\nimport update from './update.js';\n\ninterface GetError {\n  code?: string;\n}\n\ninterface GetHeaders {\n  etag?: string;\n}\n\nexport default function getCache(endpoint, callback) {\n  const fullPath = path.join(this.cacheDirectory, `${this.options.hash(endpoint)}.json`);\n  fs.readFile(fullPath, (err, contents) => {\n    // doesn't exist so create\n    if (err) {\n      update.call(this, endpoint, (err, json) => {\n        err ? callback(err) : callback(null, json);\n      });\n    }\n    // check existing if etag changed and if so, recache\n    else {\n      const record = JSON.parse(contents.toString());\n      get(endpoint).head((err, res) => {\n        // not accessible\n        if (err) {\n          if ((err as GetError).code === 'ENOTFOUND' || err.message.indexOf('routines:SSL23_GET_SERVER_HELLO') >= 0) return callback(null, record.body);\n          return callback(err);\n        }\n        if ((res.headers as GetHeaders).etag === record.headers.etag) return callback(null, record.body);\n        update.call(this, endpoint, (err, json) => {\n          err ? callback(err) : callback(null, json);\n        });\n      });\n    }\n  });\n}\n"],"names":["getCache","endpoint","callback","fullPath","path","join","cacheDirectory","options","hash","fs","readFile","err","contents","update","call","json","record","JSON","parse","toString","get","head","res","code","message","indexOf","body","headers","etag"],"mappings":";;;;+BAcA;;;eAAwBA;;;yDAdT;2DACE;gEACD;6DAEG;;;;;;AAUJ,SAASA,SAASC,QAAQ,EAAEC,QAAQ;;IACjD,IAAMC,WAAWC,aAAI,CAACC,IAAI,CAAC,IAAI,CAACC,cAAc,EAAE,AAAC,GAA8B,OAA5B,IAAI,CAACC,OAAO,CAACC,IAAI,CAACP,WAAU;IAC/EQ,WAAE,CAACC,QAAQ,CAACP,UAAU,SAACQ,KAAKC;QAC1B,0BAA0B;QAC1B,IAAID,KAAK;YACPE,eAAM,CAACC,IAAI,QAAOb,UAAU,SAACU,KAAKI;gBAChCJ,MAAMT,SAASS,OAAOT,SAAS,MAAMa;YACvC;QACF,OAEK;YACH,IAAMC,SAASC,KAAKC,KAAK,CAACN,SAASO,QAAQ;YAC3CC,IAAAA,kBAAG,EAACnB,UAAUoB,IAAI,CAAC,SAACV,KAAKW;gBACvB,iBAAiB;gBACjB,IAAIX,KAAK;oBACP,IAAI,AAACA,IAAiBY,IAAI,KAAK,eAAeZ,IAAIa,OAAO,CAACC,OAAO,CAAC,sCAAsC,GAAG,OAAOvB,SAAS,MAAMc,OAAOU,IAAI;oBAC5I,OAAOxB,SAASS;gBAClB;gBACA,IAAI,AAACW,IAAIK,OAAO,CAAgBC,IAAI,KAAKZ,OAAOW,OAAO,CAACC,IAAI,EAAE,OAAO1B,SAAS,MAAMc,OAAOU,IAAI;gBAC/Fb,eAAM,CAACC,IAAI,QAAOb,UAAU,SAACU,KAAKI;oBAChCJ,MAAMT,SAASS,OAAOT,SAAS,MAAMa;gBACvC;YACF;QACF;IACF;AACF"}

package/dist/cjs/getSync.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/getSync.ts"],"sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\nexport default function getCacheAsync(endpoint) {\n  const fullPath = path.join(this.cacheDirectory, `${this.options.hash(endpoint)}.json`);\n  try {\n    const contents = fs.readFileSync(fullPath, 'utf8');\n    const record = JSON.parse(contents.toString());\n    return record.body;\n  } catch (_err) {\n    return null;\n  }\n}\n"],"names":["getCacheAsync","endpoint","fullPath","path","join","cacheDirectory","options","hash","contents","fs","readFileSync","record","JSON","parse","toString","body","_err"],"mappings":";;;;+BAGA;;;eAAwBA;;;yDAHT;2DACE;;;;;;AAEF,SAASA,cAAcC,QAAQ;IAC5C,IAAMC,WAAWC,aAAI,CAACC,IAAI,CAAC,IAAI,CAACC,cAAc,EAAE,AAAC,GAA8B,OAA5B,IAAI,CAACC,OAAO,CAACC,IAAI,CAACN,WAAU;IAC/E,IAAI;QACF,IAAMO,WAAWC,WAAE,CAACC,YAAY,CAACR,UAAU;QAC3C,IAAMS,SAASC,KAAKC,KAAK,CAACL,SAASM,QAAQ;QAC3C,OAAOH,OAAOI,IAAI;IACpB,EAAE,OAAOC,MAAM;QACb,OAAO;IACT;AACF"}

package/dist/cjs/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/index.ts"],"sourcesContent":["import rimraf2 from 'rimraf2';\n\nimport get from './get.js';\nimport getSync from './getSync.js';\nimport hash from './hash.js';\nimport update from './update.js';\n\nexport interface CacheOptions {\n  hash?: (string: string) => string;\n}\n\nexport interface GetOptions {\n  force?: boolean;\n}\nexport type GetCallback = (error?: Error, json?: object) => void;\nexport type ClearCallback = (error?: Error) => void;\n\nexport default class Cache {\n  cacheDirectory: string;\n  options: CacheOptions;\n\n  constructor(cacheDirectory: string, options: CacheOptions = {}) {\n    if (!(this instanceof Cache)) throw new Error('Cache needs to be called with new');\n    if (!cacheDirectory) throw new Error('Cache needs cacheDirectory');\n    this.cacheDirectory = cacheDirectory;\n    this.options = options;\n    if (!this.options.hash) this.options.hash = hash;\n  }\n\n  get(endpoint: string, options?: GetOptions | GetCallback, callback?: GetCallback): undefined | Promise<object | null> {\n    if (typeof options === 'function') {\n      callback = options as GetCallback;\n      options = null;\n    }\n    options = options || {};\n\n    if (typeof callback === 'function') return (options as GetOptions).force ? update.call(this, endpoint, callback) : get.call(this, endpoint, callback);\n    return new Promise((resolve, reject) => {\n      this.get(endpoint, options, (err, json) => {\n        err ? reject(err) : resolve(json);\n      });\n    });\n  }\n\n  getSync(endpoint: string): object | null {\n    // TODO: add async fetching\n    return getSync.call(this, endpoint);\n  }\n\n  clear(callback?: ClearCallback): undefined | Promise<undefined> {\n    if (typeof callback === 'function')\n      return rimraf2(this.cacheDirectory, { disableGlob: true }, (_err) => {\n        _err = null; // ignore errors since it is fine to delete a directory that doesn't exist from a cache standpoint\n        callback();\n      });\n    return new Promise((resolve, reject) => {\n      this.clear((err) => {\n        err ? reject(err) : resolve(undefined);\n      });\n    });\n  }\n}\n"],"names":["Cache","cacheDirectory","options","Error","hash","get","endpoint","callback","force","update","call","Promise","resolve","reject","err","json","getSync","clear","rimraf2","disableGlob","_err","undefined"],"mappings":";;;;;;;eAiBqBA;;;8DAjBD;0DAEJ;8DACI;2DACH;6DACE;;;;;;;;;;;;;;;;;;AAYJ,IAAA,AAAMA,sBAAN;;aAAMA,MAIPC,cAAsB;YAAEC,UAAAA,iEAAwB,CAAC;gCAJ1CF;QAKjB,IAAI,CAAE,AAAI,YAAJ,IAAI,EALOA,QAKa,MAAM,IAAIG,MAAM;QAC9C,IAAI,CAACF,gBAAgB,MAAM,IAAIE,MAAM;QACrC,IAAI,CAACF,cAAc,GAAGA;QACtB,IAAI,CAACC,OAAO,GAAGA;QACf,IAAI,CAAC,IAAI,CAACA,OAAO,CAACE,IAAI,EAAE,IAAI,CAACF,OAAO,CAACE,IAAI,GAAGA,aAAI;;iBAT/BJ;IAYnBK,OAAAA,GAaC,GAbDA,SAAAA,IAAIC,QAAgB,EAAEJ,OAAkC,EAAEK,QAAsB;;QAC9E,IAAI,OAAOL,YAAY,YAAY;YACjCK,WAAWL;YACXA,UAAU;QACZ;QACAA,UAAUA,WAAW,CAAC;QAEtB,IAAI,OAAOK,aAAa,YAAY,OAAO,AAACL,QAAuBM,KAAK,GAAGC,eAAM,CAACC,IAAI,CAAC,IAAI,EAAEJ,UAAUC,YAAYF,YAAG,CAACK,IAAI,CAAC,IAAI,EAAEJ,UAAUC;QAC5I,OAAO,IAAII,QAAQ,SAACC,SAASC;YAC3B,MAAKR,GAAG,CAACC,UAAUJ,SAAS,SAACY,KAAKC;gBAChCD,MAAMD,OAAOC,OAAOF,QAAQG;YAC9B;QACF;IACF;IAEAC,OAAAA,OAGC,GAHDA,SAAAA,QAAQV,QAAgB;QACtB,2BAA2B;QAC3B,OAAOU,gBAAO,CAACN,IAAI,CAAC,IAAI,EAAEJ;IAC5B;IAEAW,OAAAA,KAWC,GAXDA,SAAAA,MAAMV,QAAwB;;QAC5B,IAAI,OAAOA,aAAa,YACtB,OAAOW,IAAAA,gBAAO,EAAC,IAAI,CAACjB,cAAc,EAAE;YAAEkB,aAAa;QAAK,GAAG,SAACC;YAC1DA,OAAO,MAAM,kGAAkG;YAC/Gb;QACF;QACF,OAAO,IAAII,QAAQ,SAACC,SAASC;YAC3B,MAAKI,KAAK,CAAC,SAACH;gBACVA,MAAMD,OAAOC,OAAOF,QAAQS;YAC9B;QACF;IACF;WA3CmBrB"}

package/dist/cjs/package.json

@@ -1 +0,0 @@
-{"type":"commonjs"}

package/dist/cjs/update.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/update.ts"],"sourcesContent":["import fs from 'fs';\nimport path from 'path';\nimport get from 'get-remote';\nimport mkdirp from 'mkdirp-classic';\nimport Queue from 'queue-cb';\nimport rimraf2 from 'rimraf2';\nimport tempSuffix from 'temp-suffix';\n\nexport default function update(endpoint, callback) {\n  const fullPath = path.join(this.cacheDirectory, `${this.options.hash(endpoint)}.json`);\n\n  mkdirp(this.cacheDirectory, (err) => {\n    if (err && err.code !== 'EEXIST') return callback(err);\n\n    get(endpoint).json((err, res) => {\n      if (err) return callback(err);\n      const record = { headers: res.headers, body: res.body };\n      const tempFile = `${fullPath}-${tempSuffix()}`;\n\n      const queue = new Queue(1);\n      queue.defer(fs.writeFile.bind(null, tempFile, JSON.stringify(record), 'utf8'));\n      queue.defer((cb) => rimraf2(fullPath, { disableGlob: true }, cb.bind(null, null)));\n      queue.defer(fs.rename.bind(null, tempFile, fullPath));\n      queue.await((err) => {\n        if (!err) return callback(null, record.body);\n        // cleanup the temp file if the operation failed\n        rimraf2(tempFile, { disableGlob: true }, callback.bind(err));\n      });\n    });\n  });\n}\n"],"names":["update","endpoint","callback","fullPath","path","join","cacheDirectory","options","hash","mkdirp","err","code","get","json","res","record","headers","body","tempFile","tempSuffix","queue","Queue","defer","fs","writeFile","bind","JSON","stringify","cb","rimraf2","disableGlob","rename","await"],"mappings":";;;;+BAQA;;;eAAwBA;;;yDART;2DACE;gEACD;oEACG;8DACD;8DACE;iEACG;;;;;;AAER,SAASA,OAAOC,QAAQ,EAAEC,QAAQ;IAC/C,IAAMC,WAAWC,aAAI,CAACC,IAAI,CAAC,IAAI,CAACC,cAAc,EAAE,AAAC,GAA8B,OAA5B,IAAI,CAACC,OAAO,CAACC,IAAI,CAACP,WAAU;IAE/EQ,IAAAA,sBAAM,EAAC,IAAI,CAACH,cAAc,EAAE,SAACI;QAC3B,IAAIA,OAAOA,IAAIC,IAAI,KAAK,UAAU,OAAOT,SAASQ;QAElDE,IAAAA,kBAAG,EAACX,UAAUY,IAAI,CAAC,SAACH,KAAKI;YACvB,IAAIJ,KAAK,OAAOR,SAASQ;YACzB,IAAMK,SAAS;gBAAEC,SAASF,IAAIE,OAAO;gBAAEC,MAAMH,IAAIG,IAAI;YAAC;YACtD,IAAMC,WAAW,AAAC,GAAcC,OAAZhB,UAAS,KAAgB,OAAbgB,IAAAA,mBAAU;YAE1C,IAAMC,QAAQ,IAAIC,gBAAK,CAAC;YACxBD,MAAME,KAAK,CAACC,WAAE,CAACC,SAAS,CAACC,IAAI,CAAC,MAAMP,UAAUQ,KAAKC,SAAS,CAACZ,SAAS;YACtEK,MAAME,KAAK,CAAC,SAACM;uBAAOC,IAAAA,gBAAO,EAAC1B,UAAU;oBAAE2B,aAAa;gBAAK,GAAGF,GAAGH,IAAI,CAAC,MAAM;;YAC3EL,MAAME,KAAK,CAACC,WAAE,CAACQ,MAAM,CAACN,IAAI,CAAC,MAAMP,UAAUf;YAC3CiB,MAAMY,KAAK,CAAC,SAACtB;gBACX,IAAI,CAACA,KAAK,OAAOR,SAAS,MAAMa,OAAOE,IAAI;gBAC3C,gDAAgD;gBAChDY,IAAAA,gBAAO,EAACX,UAAU;oBAAEY,aAAa;gBAAK,GAAG5B,SAASuB,IAAI,CAACf;YACzD;QACF;IACF;AACF"}

package/dist/esm/package.json

@@ -1 +0,0 @@
-{"type":"commonjs"}