fetch-json-cache 1.3.13 → 1.5.0

package/dist/cjs/Cache.d.cts

@@ -3,7 +3,10 @@ export default class Cache {
     cachePath: string;
     options: CacheOptions;
     constructor(cachePath: string, options?: CacheOptions);
-    get<T>(endpoint: string, options?: GetOptions | GetCallback<T>, callback?: GetCallback<T>): undefined | Promise<object | null>;
+    get<T>(endpoint: string, callback: GetCallback<T>): void;
+    get<T>(endpoint: string, options: GetOptions, callback: GetCallback<T>): void;
+    get<T>(endpoint: string, options?: GetOptions): Promise<T | null>;
     getSync<T>(endpoint: string): T | null;
-    clear(callback?: ClearCallback): undefined | Promise<undefined>;
+    clear(callback: ClearCallback): void;
+    clear(): Promise<void>;
 }

package/dist/cjs/Cache.d.ts

@@ -3,7 +3,10 @@ export default class Cache {
     cachePath: string;
     options: CacheOptions;
     constructor(cachePath: string, options?: CacheOptions);
-    get<T>(endpoint: string, options?: GetOptions | GetCallback<T>, callback?: GetCallback<T>): undefined | Promise<object | null>;
+    get<T>(endpoint: string, callback: GetCallback<T>): void;
+    get<T>(endpoint: string, options: GetOptions, callback: GetCallback<T>): void;
+    get<T>(endpoint: string, options?: GetOptions): Promise<T | null>;
     getSync<T>(endpoint: string): T | null;
-    clear(callback?: ClearCallback): undefined | Promise<undefined>;
+    clear(callback: ClearCallback): void;
+    clear(): Promise<void>;
 }

package/dist/cjs/Cache.js

@@ -72,7 +72,7 @@ var Cache = /*#__PURE__*/ function() {
         if (typeof callback === 'function') return worker.call(this, callback);
         return new Promise(function(resolve, reject) {
             return worker.call(_this, function(err) {
-                err ? reject(err) : resolve(undefined);
+                err ? reject(err) : resolve();
             });
         });
     };

package/dist/cjs/Cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/Cache.ts"],"sourcesContent":["import { safeRm } from 'fs-remove-compat';\n\nimport get from './get.ts';\nimport getSync from './getSync.ts';\nimport hash from './hash.ts';\nimport type { CacheOptions, ClearCallback, GetCallback, GetOptions } from './types.ts';\nimport update from './update.ts';\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<T>(endpoint: string, options?: GetOptions | GetCallback<T>, callback?: GetCallback<T>): undefined | Promise<object | null> {\n    if (typeof options === 'function') {\n      callback = options as GetCallback<T>;\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<T>(endpoint: string): T | 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      safeRm(this.cachePath, 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","safeRm","bind","undefined"],"mappings":";;;;;;;eAQqBA;;;8BARE;4DAEP;gEACI;6DACH;+DAEE;;;;;;;;;;;;;;;;;;AAEJ,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,eAAI;;iBAT/BJ;IAYnBK,OAAAA,GAaC,GAbDA,SAAAA,IAAOC,QAAgB,EAAEJ,OAAqC,EAAEK,QAAyB;;QACvF,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,iBAAM,CAACC,IAAI,CAAC,IAAI,EAAEL,UAAUC,YAAYF,cAAG,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,QAAWX,QAAgB;QACzB,2BAA2B;QAC3B,OAAOW,kBAAO,CAACN,IAAI,CAAC,IAAI,EAAEL;IAC5B;IAEAY,OAAAA,KAYC,GAZDA,SAAAA,MAAMX,QAAwB;;QAC5B,SAASC,OAAOD,QAAQ;YACtB,kGAAkG;YAClGY,IAAAA,sBAAM,EAAC,IAAI,CAAClB,SAAS,EAAEM,SAASa,IAAI,CAAC,MAAM;QAC7C;QAEA,IAAI,OAAOb,aAAa,YAAY,OAAOC,OAAOG,IAAI,CAAC,IAAI,EAAEJ;QAC7D,OAAO,IAAIK,QAAQ,SAACC,SAASC;mBAC3BN,OAAOG,IAAI,QAAO,SAACI;gBACjBA,MAAMD,OAAOC,OAAOF,QAAQQ;YAC9B;;IAEJ;WA5CmBrB"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/Cache.ts"],"sourcesContent":["import { safeRm } from 'fs-remove-compat';\n\nimport get from './get.ts';\nimport getSync from './getSync.ts';\nimport hash from './hash.ts';\nimport type { CacheOptions, ClearCallback, GetCallback, GetOptions } from './types.ts';\nimport update from './update.ts';\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<T>(endpoint: string, callback: GetCallback<T>): void;\n  get<T>(endpoint: string, options: GetOptions, callback: GetCallback<T>): void;\n  get<T>(endpoint: string, options?: GetOptions): Promise<T | null>;\n  get<T>(endpoint: string, options?: GetOptions | GetCallback<T>, callback?: GetCallback<T>): void | Promise<T | null> {\n    if (typeof options === 'function') {\n      callback = options as GetCallback<T>;\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);\n    return new Promise((resolve, reject) => worker.call(this, endpoint, options, (err, json) => (err ? reject(err) : resolve(json))));\n  }\n\n  getSync<T>(endpoint: string): T | null {\n    // TODO: add async fetching\n    return getSync.call(this, endpoint);\n  }\n\n  clear(callback: ClearCallback): void;\n  clear(): Promise<void>;\n  clear(callback?: ClearCallback): void | Promise<void> {\n    function worker(callback) {\n      // ignore errors since it is fine to delete a directory that doesn't exist from a cache standpoint\n      safeRm(this.cachePath, 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();\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","safeRm","bind"],"mappings":";;;;;;;eAQqBA;;;8BARE;4DAEP;gEACI;6DACH;+DAEE;;;;;;;;;;;;;;;;;;AAEJ,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,eAAI;;iBAT/BJ;IAenBK,OAAAA,GAaC,GAbDA,SAAAA,IAAOC,QAAgB,EAAEJ,OAAqC,EAAEK,QAAyB;;QACvF,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,iBAAM,CAACC,IAAI,CAAC,IAAI,EAAEL,UAAUC,YAAYF,cAAG,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,QAAWX,QAAgB;QACzB,2BAA2B;QAC3B,OAAOW,kBAAO,CAACN,IAAI,CAAC,IAAI,EAAEL;IAC5B;IAIAY,OAAAA,KAYC,GAZDA,SAAAA,MAAMX,QAAwB;;QAC5B,SAASC,OAAOD,QAAQ;YACtB,kGAAkG;YAClGY,IAAAA,sBAAM,EAAC,IAAI,CAAClB,SAAS,EAAEM,SAASa,IAAI,CAAC,MAAM;QAC7C;QAEA,IAAI,OAAOb,aAAa,YAAY,OAAOC,OAAOG,IAAI,CAAC,IAAI,EAAEJ;QAC7D,OAAO,IAAIK,QAAQ,SAACC,SAASC;mBAC3BN,OAAOG,IAAI,QAAO,SAACI;gBACjBA,MAAMD,OAAOC,OAAOF;YACtB;;IAEJ;WAjDmBb"}

package/dist/cjs/get.d.cts

@@ -1,2 +1,2 @@
 import type { GetCallback } from './types.js';
-export default function getCache<T>(endpoint: string, callback: GetCallback<T>): undefined;
+export default function getCache<T>(endpoint: string, callback: GetCallback<T>): void;

package/dist/cjs/get.d.ts

@@ -1,2 +1,2 @@
 import type { GetCallback } from './types.js';
-export default function getCache<T>(endpoint: string, callback: GetCallback<T>): undefined;
+export default function getCache<T>(endpoint: string, callback: GetCallback<T>): void;

package/dist/cjs/get.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
-var _getremote = /*#__PURE__*/ _interop_require_default(require("get-remote"));
+var _getfilecompat = require("get-file-compat");
 var _path = /*#__PURE__*/ _interop_require_default(require("path"));
 var _updatets = /*#__PURE__*/ _interop_require_default(require("./update.js"));
 function _interop_require_default(obj) {
@@ -28,7 +28,7 @@ function getCache(endpoint, callback) {
             });
         } else {
             var record = JSON.parse(contents.toString());
-            (0, _getremote.default)(endpoint).head(function(err, res) {
+            (0, _getfilecompat.head)(endpoint, function(err, res) {
                 // not accessible
                 if (err) {
                     if (err.code === 'ENOTFOUND' || err.message.indexOf('routines:SSL23_GET_SERVER_HELLO') >= 0) return callback(null, record.body);

package/dist/cjs/get.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/get.ts"],"sourcesContent":["import fs from 'fs';\nimport get from 'get-remote';\nimport path from 'path';\n\nimport update from './update.ts';\n\ninterface GetError {\n  code?: string;\n}\n\ninterface GetHeaders {\n  etag?: string;\n}\n\nimport type { GetCallback } from './types.ts';\n\nexport default function getCache<T>(endpoint: string, callback: GetCallback<T>): undefined {\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":";;;;+BAgBA;;;eAAwBA;;;yDAhBT;gEACC;2DACC;+DAEE;;;;;;AAYJ,SAASA,SAAYC,QAAgB,EAAEC,QAAwB;;IAC5E,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,iBAAM,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,iBAAM,CAACC,IAAI,QAAOb,UAAU,SAACU,KAAKI;oBAChCJ,MAAMT,SAASS,OAAOT,SAAS,MAAMa;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 { head } from 'get-file-compat';\nimport path from 'path';\n\nimport update from './update.ts';\n\ninterface GetError {\n  code?: string;\n}\n\ninterface GetHeaders {\n  etag?: string;\n}\n\nimport type { GetCallback } from './types.ts';\n\nexport default function getCache<T>(endpoint: string, callback: GetCallback<T>): void {\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      head(endpoint, (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","head","res","code","message","indexOf","body","headers","etag"],"mappings":";;;;+BAgBA;;;eAAwBA;;;yDAhBT;6BACM;2DACJ;+DAEE;;;;;;AAYJ,SAASA,SAAYC,QAAgB,EAAEC,QAAwB;;IAC5E,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,iBAAM,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,mBAAI,EAACnB,UAAU,SAACU,KAAKU;gBACnB,iBAAiB;gBACjB,IAAIV,KAAK;oBACP,IAAI,AAACA,IAAiBW,IAAI,KAAK,eAAeX,IAAIY,OAAO,CAACC,OAAO,CAAC,sCAAsC,GAAG,OAAOtB,SAAS,MAAMc,OAAOS,IAAI;oBAC5I,OAAOvB,SAASS;gBAClB;gBACA,IAAI,AAACU,IAAIK,OAAO,CAAgBC,IAAI,KAAKX,OAAOU,OAAO,CAACC,IAAI,EAAE,OAAOzB,SAAS,MAAMc,OAAOS,IAAI;gBAC/FZ,iBAAM,CAACC,IAAI,QAAOb,UAAU,SAACU,KAAKI;oBAChCJ,MAAMT,SAASS,OAAOT,SAAS,MAAMa;gBACvC;YACF;QACF;IACF;AACF"}

package/dist/cjs/types.d.cts

@@ -8,6 +8,6 @@ export interface CacheOptions {
 export interface GetOptions {
     force?: boolean;
 }
-export type GetCallback<T> = (error?: Error, result?: T) => undefined;
-export type ClearCallback = (error?: Error) => undefined;
-export type UpdateCallback<T> = (error?: Error, result?: T) => undefined;
+export type GetCallback<T> = (error?: Error, result?: T) => void;
+export type ClearCallback = (error?: Error) => void;
+export type UpdateCallback<T> = (error?: Error, result?: T) => void;

package/dist/cjs/types.d.ts

@@ -8,6 +8,6 @@ export interface CacheOptions {
 export interface GetOptions {
     force?: boolean;
 }
-export type GetCallback<T> = (error?: Error, result?: T) => undefined;
-export type ClearCallback = (error?: Error) => undefined;
-export type UpdateCallback<T> = (error?: Error, result?: T) => undefined;
+export type GetCallback<T> = (error?: Error, result?: T) => void;
+export type ClearCallback = (error?: Error) => void;
+export type UpdateCallback<T> = (error?: Error, result?: T) => void;

package/dist/cjs/update.d.cts

@@ -1,2 +1,2 @@
 import type { UpdateCallback } from './types.js';
-export default function update<T>(endpoint: string, callback: UpdateCallback<T>): undefined;
+export default function update<T>(endpoint: string, callback: UpdateCallback<T>): void;

package/dist/cjs/update.d.ts

@@ -1,2 +1,2 @@
 import type { UpdateCallback } from './types.js';
-export default function update<T>(endpoint: string, callback: UpdateCallback<T>): undefined;
+export default function update<T>(endpoint: string, callback: UpdateCallback<T>): void;

package/dist/cjs/update.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "default", {
 });
 var _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
 var _fsremovecompat = require("fs-remove-compat");
-var _getremote = /*#__PURE__*/ _interop_require_default(require("get-remote"));
+var _getfilecompat = require("get-file-compat");
 var _mkdirpclassic = /*#__PURE__*/ _interop_require_default(require("mkdirp-classic"));
 var _path = /*#__PURE__*/ _interop_require_default(require("path"));
 var _queuecb = /*#__PURE__*/ _interop_require_default(require("queue-cb"));
@@ -24,24 +24,29 @@ function update(endpoint, callback) {
     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) {
+        (0, _getfilecompat.getContent)(endpoint, 'utf8', function(err, res) {
             if (err) return callback(err);
-            var record = {
-                headers: res.headers,
-                body: res.body
-            };
-            var tempFile = "".concat(fullPath, "-").concat((0, _tempsuffix.default)());
-            var queue = new _queuecb.default(1);
-            queue.defer(_fs.default.writeFile.bind(null, tempFile, JSON.stringify(record), 'utf8'));
-            queue.defer(function(cb) {
-                return (0, _fsremovecompat.rm)(fullPath, cb.bind(null, null));
-            });
-            queue.defer(_fs.default.rename.bind(null, tempFile, fullPath));
-            queue.await(function(err) {
-                if (!err) return callback(null, record.body);
-                // cleanup the temp file if the operation failed
-                (0, _fsremovecompat.rm)(tempFile, callback.bind(err));
-            });
+            try {
+                var body = JSON.parse(res.content);
+                var record = {
+                    headers: res.headers,
+                    body: body
+                };
+                var tempFile = "".concat(fullPath, "-").concat((0, _tempsuffix.default)());
+                var queue = new _queuecb.default(1);
+                queue.defer(_fs.default.writeFile.bind(null, tempFile, JSON.stringify(record), 'utf8'));
+                queue.defer(function(cb) {
+                    return (0, _fsremovecompat.rm)(fullPath, cb.bind(null, null));
+                });
+                queue.defer(_fs.default.rename.bind(null, tempFile, fullPath));
+                queue.await(function(err) {
+                    if (!err) return callback(null, record.body);
+                    // cleanup the temp file if the operation failed
+                    (0, _fsremovecompat.rm)(tempFile, callback.bind(err));
+                });
+            } catch (err) {
+                return callback(err);
+            }
         });
     });
 }

package/dist/cjs/update.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/update.ts"],"sourcesContent":["import fs from 'fs';\nimport { rm } from 'fs-remove-compat';\nimport get from 'get-remote';\nimport mkdirp from 'mkdirp-classic';\nimport path from 'path';\nimport Queue from 'queue-cb';\nimport tempSuffix from 'temp-suffix';\n\nimport type { Record, UpdateCallback } from './types.ts';\n\nexport default function update<T>(endpoint: string, callback: UpdateCallback<T>): undefined {\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 } as Record<T>;\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) => rm(fullPath, 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        rm(tempFile, 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","rm","rename","await"],"mappings":";;;;+BAUA;;;eAAwBA;;;yDAVT;8BACI;gEACH;oEACG;2DACF;8DACC;iEACK;;;;;;AAIR,SAASA,OAAUC,QAAgB,EAAEC,QAA2B;IAC7E,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,kBAAE,EAAC1B,UAAUyB,GAAGH,IAAI,CAAC,MAAM;;YAC/CL,MAAME,KAAK,CAACC,WAAE,CAACO,MAAM,CAACL,IAAI,CAAC,MAAMP,UAAUf;YAC3CiB,MAAMW,KAAK,CAAC,SAACrB;gBACX,IAAI,CAACA,KAAK,OAAOR,SAAS,MAAMa,OAAOE,IAAI;gBAC3C,gDAAgD;gBAChDY,IAAAA,kBAAE,EAACX,UAAUhB,SAASuB,IAAI,CAACf;YAC7B;QACF;IACF;AACF"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/update.ts"],"sourcesContent":["import fs from 'fs';\nimport { rm } from 'fs-remove-compat';\nimport { getContent } from 'get-file-compat';\nimport mkdirp from 'mkdirp-classic';\nimport path from 'path';\nimport Queue from 'queue-cb';\nimport tempSuffix from 'temp-suffix';\n\nimport type { Record, UpdateCallback } from './types.ts';\n\nexport default function update<T>(endpoint: string, callback: UpdateCallback<T>): void {\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    getContent(endpoint, 'utf8', (err, res) => {\n      if (err) return callback(err);\n\n      try {\n        const body = JSON.parse(res.content);\n        const record = { headers: res.headers, body } as Record<T>;\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) => rm(fullPath, 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          rm(tempFile, callback.bind(err));\n        });\n      } catch (err) {\n        return callback(err);\n      }\n    });\n  });\n}\n"],"names":["update","endpoint","callback","fullPath","path","join","cachePath","options","hash","mkdirp","err","code","getContent","res","body","JSON","parse","content","record","headers","tempFile","tempSuffix","queue","Queue","defer","fs","writeFile","bind","stringify","cb","rm","rename","await"],"mappings":";;;;+BAUA;;;eAAwBA;;;yDAVT;8BACI;6BACQ;oEACR;2DACF;8DACC;iEACK;;;;;;AAIR,SAASA,OAAUC,QAAgB,EAAEC,QAA2B;IAC7E,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,yBAAU,EAACX,UAAU,QAAQ,SAACS,KAAKG;YACjC,IAAIH,KAAK,OAAOR,SAASQ;YAEzB,IAAI;gBACF,IAAMI,OAAOC,KAAKC,KAAK,CAACH,IAAII,OAAO;gBACnC,IAAMC,SAAS;oBAAEC,SAASN,IAAIM,OAAO;oBAAEL,MAAAA;gBAAK;gBAC5C,IAAMM,WAAW,AAAC,GAAcC,OAAZlB,UAAS,KAAgB,OAAbkB,IAAAA,mBAAU;gBAE1C,IAAMC,QAAQ,IAAIC,gBAAK,CAAC;gBACxBD,MAAME,KAAK,CAACC,WAAE,CAACC,SAAS,CAACC,IAAI,CAAC,MAAMP,UAAUL,KAAKa,SAAS,CAACV,SAAS;gBACtEI,MAAME,KAAK,CAAC,SAACK;2BAAOC,IAAAA,kBAAE,EAAC3B,UAAU0B,GAAGF,IAAI,CAAC,MAAM;;gBAC/CL,MAAME,KAAK,CAACC,WAAE,CAACM,MAAM,CAACJ,IAAI,CAAC,MAAMP,UAAUjB;gBAC3CmB,MAAMU,KAAK,CAAC,SAACtB;oBACX,IAAI,CAACA,KAAK,OAAOR,SAAS,MAAMgB,OAAOJ,IAAI;oBAC3C,gDAAgD;oBAChDgB,IAAAA,kBAAE,EAACV,UAAUlB,SAASyB,IAAI,CAACjB;gBAC7B;YACF,EAAE,OAAOA,KAAK;gBACZ,OAAOR,SAASQ;YAClB;QACF;IACF;AACF"}

package/dist/esm/Cache.d.ts

@@ -3,7 +3,10 @@ export default class Cache {
     cachePath: string;
     options: CacheOptions;
     constructor(cachePath: string, options?: CacheOptions);
-    get<T>(endpoint: string, options?: GetOptions | GetCallback<T>, callback?: GetCallback<T>): undefined | Promise<object | null>;
+    get<T>(endpoint: string, callback: GetCallback<T>): void;
+    get<T>(endpoint: string, options: GetOptions, callback: GetCallback<T>): void;
+    get<T>(endpoint: string, options?: GetOptions): Promise<T | null>;
     getSync<T>(endpoint: string): T | null;
-    clear(callback?: ClearCallback): undefined | Promise<undefined>;
+    clear(callback: ClearCallback): void;
+    clear(): Promise<void>;
 }

package/dist/esm/Cache.js

@@ -27,7 +27,7 @@ let Cache = class Cache {
         }
         if (typeof callback === 'function') return worker.call(this, callback);
         return new Promise((resolve, reject)=>worker.call(this, (err)=>{
-                err ? reject(err) : resolve(undefined);
+                err ? reject(err) : resolve();
             }));
     }
     constructor(cachePath, options = {}){

package/dist/esm/Cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/Cache.ts"],"sourcesContent":["import { safeRm } from 'fs-remove-compat';\n\nimport get from './get.ts';\nimport getSync from './getSync.ts';\nimport hash from './hash.ts';\nimport type { CacheOptions, ClearCallback, GetCallback, GetOptions } from './types.ts';\nimport update from './update.ts';\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<T>(endpoint: string, options?: GetOptions | GetCallback<T>, callback?: GetCallback<T>): undefined | Promise<object | null> {\n    if (typeof options === 'function') {\n      callback = options as GetCallback<T>;\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<T>(endpoint: string): T | 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      safeRm(this.cachePath, 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":["safeRm","get","getSync","hash","update","Cache","endpoint","options","callback","worker","force","call","Promise","resolve","reject","err","json","clear","cachePath","bind","undefined","Error"],"mappings":"AAAA,SAASA,MAAM,QAAQ,mBAAmB;AAE1C,OAAOC,SAAS,WAAW;AAC3B,OAAOC,aAAa,eAAe;AACnC,OAAOC,UAAU,YAAY;AAE7B,OAAOC,YAAY,cAAc;AAElB,IAAA,AAAMC,QAAN,MAAMA;IAYnBJ,IAAOK,QAAgB,EAAEC,OAAqC,EAAEC,QAAyB,EAAsC;QAC7H,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,QAAWI,QAAgB,EAAY;QACrC,2BAA2B;QAC3B,OAAOJ,QAAQS,IAAI,CAAC,IAAI,EAAEL;IAC5B;IAEAW,MAAMT,QAAwB,EAAkC;QAC9D,SAASC,OAAOD,QAAQ;YACtB,kGAAkG;YAClGR,OAAO,IAAI,CAACkB,SAAS,EAAEV,SAASW,IAAI,CAAC,MAAM;QAC7C;QAEA,IAAI,OAAOX,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,QAAQO;YAC9B;IAEJ;IAxCA,YAAYF,SAAiB,EAAEX,UAAwB,CAAC,CAAC,CAAE;QACzD,IAAI,CAAE,CAAA,IAAI,YAAYF,KAAI,GAAI,MAAM,IAAIgB,MAAM;QAC9C,IAAI,CAACH,WAAW,MAAM,IAAIG,MAAM;QAChC,IAAI,CAACH,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"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/Cache.ts"],"sourcesContent":["import { safeRm } from 'fs-remove-compat';\n\nimport get from './get.ts';\nimport getSync from './getSync.ts';\nimport hash from './hash.ts';\nimport type { CacheOptions, ClearCallback, GetCallback, GetOptions } from './types.ts';\nimport update from './update.ts';\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<T>(endpoint: string, callback: GetCallback<T>): void;\n  get<T>(endpoint: string, options: GetOptions, callback: GetCallback<T>): void;\n  get<T>(endpoint: string, options?: GetOptions): Promise<T | null>;\n  get<T>(endpoint: string, options?: GetOptions | GetCallback<T>, callback?: GetCallback<T>): void | Promise<T | null> {\n    if (typeof options === 'function') {\n      callback = options as GetCallback<T>;\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);\n    return new Promise((resolve, reject) => worker.call(this, endpoint, options, (err, json) => (err ? reject(err) : resolve(json))));\n  }\n\n  getSync<T>(endpoint: string): T | null {\n    // TODO: add async fetching\n    return getSync.call(this, endpoint);\n  }\n\n  clear(callback: ClearCallback): void;\n  clear(): Promise<void>;\n  clear(callback?: ClearCallback): void | Promise<void> {\n    function worker(callback) {\n      // ignore errors since it is fine to delete a directory that doesn't exist from a cache standpoint\n      safeRm(this.cachePath, 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();\n      })\n    );\n  }\n}\n"],"names":["safeRm","get","getSync","hash","update","Cache","endpoint","options","callback","worker","force","call","Promise","resolve","reject","err","json","clear","cachePath","bind","Error"],"mappings":"AAAA,SAASA,MAAM,QAAQ,mBAAmB;AAE1C,OAAOC,SAAS,WAAW;AAC3B,OAAOC,aAAa,eAAe;AACnC,OAAOC,UAAU,YAAY;AAE7B,OAAOC,YAAY,cAAc;AAElB,IAAA,AAAMC,QAAN,MAAMA;IAenBJ,IAAOK,QAAgB,EAAEC,OAAqC,EAAEC,QAAyB,EAA4B;QACnH,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,QAAWI,QAAgB,EAAY;QACrC,2BAA2B;QAC3B,OAAOJ,QAAQS,IAAI,CAAC,IAAI,EAAEL;IAC5B;IAIAW,MAAMT,QAAwB,EAAwB;QACpD,SAASC,OAAOD,QAAQ;YACtB,kGAAkG;YAClGR,OAAO,IAAI,CAACkB,SAAS,EAAEV,SAASW,IAAI,CAAC,MAAM;QAC7C;QAEA,IAAI,OAAOX,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;YACtB;IAEJ;IA7CA,YAAYK,SAAiB,EAAEX,UAAwB,CAAC,CAAC,CAAE;QACzD,IAAI,CAAE,CAAA,IAAI,YAAYF,KAAI,GAAI,MAAM,IAAIe,MAAM;QAC9C,IAAI,CAACF,WAAW,MAAM,IAAIE,MAAM;QAChC,IAAI,CAACF,SAAS,GAAGA;QACjB,IAAI,CAACX,OAAO,GAAGA;QACf,IAAI,CAAC,IAAI,CAACA,OAAO,CAACJ,IAAI,EAAE,IAAI,CAACI,OAAO,CAACJ,IAAI,GAAGA;IAC9C;AAwCF;AAlDA,SAAqBE,mBAkDpB"}

package/dist/esm/get.d.ts

@@ -1,2 +1,2 @@
 import type { GetCallback } from './types.js';
-export default function getCache<T>(endpoint: string, callback: GetCallback<T>): undefined;
+export default function getCache<T>(endpoint: string, callback: GetCallback<T>): void;

package/dist/esm/get.js

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import get from 'get-remote';
+import { head } from 'get-file-compat';
 import path from 'path';
 import update from './update.js';
 export default function getCache(endpoint, callback) {
@@ -12,7 +12,7 @@ export default function getCache(endpoint, callback) {
             });
         } else {
             const record = JSON.parse(contents.toString());
-            get(endpoint).head((err, res)=>{
+            head(endpoint, (err, res)=>{
                 // not accessible
                 if (err) {
                     if (err.code === 'ENOTFOUND' || err.message.indexOf('routines:SSL23_GET_SERVER_HELLO') >= 0) return callback(null, record.body);

package/dist/esm/get.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/get.ts"],"sourcesContent":["import fs from 'fs';\nimport get from 'get-remote';\nimport path from 'path';\n\nimport update from './update.ts';\n\ninterface GetError {\n  code?: string;\n}\n\ninterface GetHeaders {\n  etag?: string;\n}\n\nimport type { GetCallback } from './types.ts';\n\nexport default function getCache<T>(endpoint: string, callback: GetCallback<T>): undefined {\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","get","path","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,SAAS,aAAa;AAC7B,OAAOC,UAAU,OAAO;AAExB,OAAOC,YAAY,cAAc;AAYjC,eAAe,SAASC,SAAYC,QAAgB,EAAEC,QAAwB;IAC5E,MAAMC,WAAWL,KAAKM,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;YAC3CnB,IAAII,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 { head } from 'get-file-compat';\nimport path from 'path';\n\nimport update from './update.ts';\n\ninterface GetError {\n  code?: string;\n}\n\ninterface GetHeaders {\n  etag?: string;\n}\n\nimport type { GetCallback } from './types.ts';\n\nexport default function getCache<T>(endpoint: string, callback: GetCallback<T>): void {\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      head(endpoint, (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","head","path","update","getCache","endpoint","callback","fullPath","join","cachePath","options","hash","readFile","err","contents","call","json","record","JSON","parse","toString","res","code","message","indexOf","body","headers","etag"],"mappings":"AAAA,OAAOA,QAAQ,KAAK;AACpB,SAASC,IAAI,QAAQ,kBAAkB;AACvC,OAAOC,UAAU,OAAO;AAExB,OAAOC,YAAY,cAAc;AAYjC,eAAe,SAASC,SAAYC,QAAgB,EAAEC,QAAwB;IAC5E,MAAMC,WAAWL,KAAKM,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;YAC3CnB,KAAKI,UAAU,CAACQ,KAAKQ;gBACnB,iBAAiB;gBACjB,IAAIR,KAAK;oBACP,IAAI,AAACA,IAAiBS,IAAI,KAAK,eAAeT,IAAIU,OAAO,CAACC,OAAO,CAAC,sCAAsC,GAAG,OAAOlB,SAAS,MAAMW,OAAOQ,IAAI;oBAC5I,OAAOnB,SAASO;gBAClB;gBACA,IAAI,AAACQ,IAAIK,OAAO,CAAgBC,IAAI,KAAKV,OAAOS,OAAO,CAACC,IAAI,EAAE,OAAOrB,SAAS,MAAMW,OAAOQ,IAAI;gBAC/FtB,OAAOY,IAAI,CAAC,IAAI,EAAEV,UAAU,CAACQ,KAAKG;oBAChCH,MAAMP,SAASO,OAAOP,SAAS,MAAMU;gBACvC;YACF;QACF;IACF;AACF"}

package/dist/esm/types.d.ts

@@ -8,6 +8,6 @@ export interface CacheOptions {
 export interface GetOptions {
     force?: boolean;
 }
-export type GetCallback<T> = (error?: Error, result?: T) => undefined;
-export type ClearCallback = (error?: Error) => undefined;
-export type UpdateCallback<T> = (error?: Error, result?: T) => undefined;
+export type GetCallback<T> = (error?: Error, result?: T) => void;
+export type ClearCallback = (error?: Error) => void;
+export type UpdateCallback<T> = (error?: Error, result?: T) => void;

package/dist/esm/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/types.ts"],"sourcesContent":["export interface Record<T> {\n  headers: object;\n  body: T;\n}\n\nexport interface CacheOptions {\n  hash?: (string: string) => string;\n}\n\nexport interface GetOptions {\n  force?: boolean;\n}\nexport type GetCallback<T> = (error?: Error, result?: T) => undefined;\nexport type ClearCallback = (error?: Error) => undefined;\nexport type UpdateCallback<T> = (error?: Error, result?: T) => undefined;\n"],"names":[],"mappings":"AAcA,WAAyE"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/types.ts"],"sourcesContent":["export interface Record<T> {\n  headers: object;\n  body: T;\n}\n\nexport interface CacheOptions {\n  hash?: (string: string) => string;\n}\n\nexport interface GetOptions {\n  force?: boolean;\n}\nexport type GetCallback<T> = (error?: Error, result?: T) => void;\nexport type ClearCallback = (error?: Error) => void;\nexport type UpdateCallback<T> = (error?: Error, result?: T) => void;\n"],"names":[],"mappings":"AAcA,WAAoE"}

package/dist/esm/update.d.ts

@@ -1,2 +1,2 @@
 import type { UpdateCallback } from './types.js';
-export default function update<T>(endpoint: string, callback: UpdateCallback<T>): undefined;
+export default function update<T>(endpoint: string, callback: UpdateCallback<T>): void;

package/dist/esm/update.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import { rm } from 'fs-remove-compat';
-import get from 'get-remote';
+import { getContent } from 'get-file-compat';
 import mkdirp from 'mkdirp-classic';
 import path from 'path';
 import Queue from 'queue-cb';
@@ -9,22 +9,27 @@ export default function update(endpoint, callback) {
     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)=>{
+        getContent(endpoint, 'utf8', (err, res)=>{
             if (err) return callback(err);
-            const record = {
-                headers: res.headers,
-                body: res.body
-            };
-            const tempFile = `${fullPath}-${tempSuffix()}`;
-            const queue = new Queue(1);
-            queue.defer(fs.writeFile.bind(null, tempFile, JSON.stringify(record), 'utf8'));
-            queue.defer((cb)=>rm(fullPath, cb.bind(null, null)));
-            queue.defer(fs.rename.bind(null, tempFile, fullPath));
-            queue.await((err)=>{
-                if (!err) return callback(null, record.body);
-                // cleanup the temp file if the operation failed
-                rm(tempFile, callback.bind(err));
-            });
+            try {
+                const body = JSON.parse(res.content);
+                const record = {
+                    headers: res.headers,
+                    body
+                };
+                const tempFile = `${fullPath}-${tempSuffix()}`;
+                const queue = new Queue(1);
+                queue.defer(fs.writeFile.bind(null, tempFile, JSON.stringify(record), 'utf8'));
+                queue.defer((cb)=>rm(fullPath, cb.bind(null, null)));
+                queue.defer(fs.rename.bind(null, tempFile, fullPath));
+                queue.await((err)=>{
+                    if (!err) return callback(null, record.body);
+                    // cleanup the temp file if the operation failed
+                    rm(tempFile, callback.bind(err));
+                });
+            } catch (err) {
+                return callback(err);
+            }
         });
     });
 }

package/dist/esm/update.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/update.ts"],"sourcesContent":["import fs from 'fs';\nimport { rm } from 'fs-remove-compat';\nimport get from 'get-remote';\nimport mkdirp from 'mkdirp-classic';\nimport path from 'path';\nimport Queue from 'queue-cb';\nimport tempSuffix from 'temp-suffix';\n\nimport type { Record, UpdateCallback } from './types.ts';\n\nexport default function update<T>(endpoint: string, callback: UpdateCallback<T>): undefined {\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 } as Record<T>;\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) => rm(fullPath, 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        rm(tempFile, callback.bind(err));\n      });\n    });\n  });\n}\n"],"names":["fs","rm","get","mkdirp","path","Queue","tempSuffix","update","endpoint","callback","fullPath","join","cachePath","options","hash","err","code","json","res","record","headers","body","tempFile","queue","defer","writeFile","bind","JSON","stringify","cb","rename","await"],"mappings":"AAAA,OAAOA,QAAQ,KAAK;AACpB,SAASC,EAAE,QAAQ,mBAAmB;AACtC,OAAOC,SAAS,aAAa;AAC7B,OAAOC,YAAY,iBAAiB;AACpC,OAAOC,UAAU,OAAO;AACxB,OAAOC,WAAW,WAAW;AAC7B,OAAOC,gBAAgB,cAAc;AAIrC,eAAe,SAASC,OAAUC,QAAgB,EAAEC,QAA2B;IAC7E,MAAMC,WAAWN,KAAKO,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,IAAIlB,MAAM;YACxBkB,MAAMC,KAAK,CAACxB,GAAGyB,SAAS,CAACC,IAAI,CAAC,MAAMJ,UAAUK,KAAKC,SAAS,CAACT,SAAS;YACtEI,MAAMC,KAAK,CAAC,CAACK,KAAO5B,GAAGS,UAAUmB,GAAGH,IAAI,CAAC,MAAM;YAC/CH,MAAMC,KAAK,CAACxB,GAAG8B,MAAM,CAACJ,IAAI,CAAC,MAAMJ,UAAUZ;YAC3Ca,MAAMQ,KAAK,CAAC,CAAChB;gBACX,IAAI,CAACA,KAAK,OAAON,SAAS,MAAMU,OAAOE,IAAI;gBAC3C,gDAAgD;gBAChDpB,GAAGqB,UAAUb,SAASiB,IAAI,CAACX;YAC7B;QACF;IACF;AACF"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/fetch-json-cache/src/update.ts"],"sourcesContent":["import fs from 'fs';\nimport { rm } from 'fs-remove-compat';\nimport { getContent } from 'get-file-compat';\nimport mkdirp from 'mkdirp-classic';\nimport path from 'path';\nimport Queue from 'queue-cb';\nimport tempSuffix from 'temp-suffix';\n\nimport type { Record, UpdateCallback } from './types.ts';\n\nexport default function update<T>(endpoint: string, callback: UpdateCallback<T>): void {\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    getContent(endpoint, 'utf8', (err, res) => {\n      if (err) return callback(err);\n\n      try {\n        const body = JSON.parse(res.content);\n        const record = { headers: res.headers, body } as Record<T>;\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) => rm(fullPath, 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          rm(tempFile, callback.bind(err));\n        });\n      } catch (err) {\n        return callback(err);\n      }\n    });\n  });\n}\n"],"names":["fs","rm","getContent","mkdirp","path","Queue","tempSuffix","update","endpoint","callback","fullPath","join","cachePath","options","hash","err","code","res","body","JSON","parse","content","record","headers","tempFile","queue","defer","writeFile","bind","stringify","cb","rename","await"],"mappings":"AAAA,OAAOA,QAAQ,KAAK;AACpB,SAASC,EAAE,QAAQ,mBAAmB;AACtC,SAASC,UAAU,QAAQ,kBAAkB;AAC7C,OAAOC,YAAY,iBAAiB;AACpC,OAAOC,UAAU,OAAO;AACxB,OAAOC,WAAW,WAAW;AAC7B,OAAOC,gBAAgB,cAAc;AAIrC,eAAe,SAASC,OAAUC,QAAgB,EAAEC,QAA2B;IAC7E,MAAMC,WAAWN,KAAKO,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,WAAWM,UAAU,QAAQ,CAACO,KAAKE;YACjC,IAAIF,KAAK,OAAON,SAASM;YAEzB,IAAI;gBACF,MAAMG,OAAOC,KAAKC,KAAK,CAACH,IAAII,OAAO;gBACnC,MAAMC,SAAS;oBAAEC,SAASN,IAAIM,OAAO;oBAAEL;gBAAK;gBAC5C,MAAMM,WAAW,GAAGd,SAAS,CAAC,EAAEJ,cAAc;gBAE9C,MAAMmB,QAAQ,IAAIpB,MAAM;gBACxBoB,MAAMC,KAAK,CAAC1B,GAAG2B,SAAS,CAACC,IAAI,CAAC,MAAMJ,UAAUL,KAAKU,SAAS,CAACP,SAAS;gBACtEG,MAAMC,KAAK,CAAC,CAACI,KAAO7B,GAAGS,UAAUoB,GAAGF,IAAI,CAAC,MAAM;gBAC/CH,MAAMC,KAAK,CAAC1B,GAAG+B,MAAM,CAACH,IAAI,CAAC,MAAMJ,UAAUd;gBAC3Ce,MAAMO,KAAK,CAAC,CAACjB;oBACX,IAAI,CAACA,KAAK,OAAON,SAAS,MAAMa,OAAOJ,IAAI;oBAC3C,gDAAgD;oBAChDjB,GAAGuB,UAAUf,SAASmB,IAAI,CAACb;gBAC7B;YACF,EAAE,OAAOA,KAAK;gBACZ,OAAON,SAASM;YAClB;QACF;IACF;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fetch-json-cache",
-  "version": "1.3.13",
+  "version": "1.5.0",
   "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",
@@ -38,20 +38,20 @@
     "version": "tsds version"
   },
   "dependencies": {
-    "fs-remove-compat": "^0.2.3",
-    "get-remote": "^2.3.2",
-    "mkdirp-classic": "^0.5.3",
-    "queue-cb": "^1.6.3",
+    "fs-remove-compat": "^1.0.0",
+    "get-file-compat": "^2.0.0",
+    "mkdirp-classic": "^0.5.2",
+    "queue-cb": "^1.0.0",
     "temp-suffix": "^1.0.10"
   },
   "devDependencies": {
-    "@types/mocha": "^10.0.10",
-    "@types/node": "^25.0.1",
+    "@types/mocha": "*",
+    "@types/node": "*",
     "fs-exists-sync": "^0.1.0",
-    "node-version-use": "^2.1.5",
-    "pinkie-promise": "^2.0.1",
-    "ts-dev-stack": "^1.21.3",
-    "tsds-config": "^0.2.1"
+    "node-version-use": "*",
+    "pinkie-promise": "*",
+    "ts-dev-stack": "*",
+    "tsds-config": "^1.0.4"
   },
   "engines": {
     "node": ">=0.8"