diff --git a/packages/cache/dist/lib/index.d.ts b/packages/cache/dist/lib/index.d.ts index febb90bb..d4689219 100644 --- a/packages/cache/dist/lib/index.d.ts +++ b/packages/cache/dist/lib/index.d.ts @@ -8,4 +8,5 @@ export declare const set_cached_object: (opts: any, namespace: string, data: any export declare const get_cache_key: (path: string, opts?: any, namespace?: string) => Promise; export declare const get_cached: (path: string, opts?: any, namespace?: string) => Promise; export declare const get_cached_object: (opts?: any, namespace?: string) => Promise; +export declare const rm_cached_object: (opts?: any, namespace?: string) => Promise; export declare const get_path_cached: (path: string, opts?: any, namespace?: string) => Promise; diff --git a/packages/cache/dist/lib/index.js b/packages/cache/dist/lib/index.js index c517fd81..f6835fe5 100644 --- a/packages/cache/dist/lib/index.js +++ b/packages/cache/dist/lib/index.js @@ -1,6 +1,6 @@ import { resolve, join } from 'node:path'; import * as ssri from 'ssri'; -import { get as cache_get, put as cache_put } from 'cacache'; +import { get as cache_get, put as cache_put, rm as cache_rm } from 'cacache'; import { sync as exists } from '@polymech/fs/exists'; import { sync as mkdir } from '@polymech/fs/dir'; import { isString, isObject, isArray } from '@polymech/core/primitives'; @@ -124,11 +124,29 @@ export const get_cached_object = async (opts = {}, namespace = "nons") => { data = JSON.parse(data); } catch (e) { - logger.error(`Error parsing cached object: ${e}`, opts); + logger.error(`Error parsing cached object: ${e.message}`); } } return data; }; +export const rm_cached_object = async (opts = {}, namespace = "nons") => { + const c_integrity = object_hash(opts, namespace); + const c_dir = cache_path(namespace); + if (!exists(c_dir)) { + mkdir(c_dir); + } + let data; + try { + const cached = await cache_get.info(c_dir, c_integrity); + if (cached) { + await cache_rm(c_dir, c_integrity); + } + } + catch (e) { + logger.error(e); + } + return data; +}; export const get_path_cached = async (path, opts = {}, namespace = "nons") => { const c_integrity = file_hash(path, opts, namespace); const c_dir = cache_path(namespace); @@ -147,4 +165,4 @@ export const get_path_cached = async (path, opts = {}, namespace = "nons") => { } return data; }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,EAAE,GAAG,IAAI,SAAS,EAAE,GAAG,IAAI,SAAS,EAAE,EAAE,IAAI,QAAQ,EAAE,MAAM,SAAS,CAAA;AAC5E,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,IAAI,IAAI,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,UAAkB,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,UAAU,CAAC,CAAC,EAAE,CAAA;AAC7F,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAW,CAAA;AAE5E,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,OAAY,EAAE,EAAE,YAAoB,MAAM,EAAE,EAAE;IAClF,MAAM,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,CAAA;IACvC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAA;IACpB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAA;IACtB,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAW,CAAA;IAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAC1E,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAA;IAC7C,OAAO,GAAG,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAY,EAAE,EAAE,YAAoB,MAAM,EAAE,EAAE;IACtE,MAAM,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,CAAA;IACvC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAClE,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAA;IAC7C,OAAO,GAAG,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,OAAY,EAAE,EAAE,YAAoB,MAAM,EAAE,EAAE;IACvF,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;IAC3G,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAA;IAC7C,OAAO,GAAG,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,IAAY,EAAE,OAAY,EAAE,EAAE,YAAoB,MAAM,EAAE,IAAS,EAAE,WAAgB,EAAE,EAAE,EAAE;IACxH,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAA;IACpD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACjB,KAAK,CAAC,KAAK,CAAC,CAAA;IAChB,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACvD,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QACxC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE;QAC7C,QAAQ,EAAE;YACN,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,WAAW;YACjB,GAAG,QAAQ;SACd;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,OAAY,EAAE,EAAE,YAAoB,MAAM,EAAE,IAAS,EAAE,WAAgB,EAAE,EAAE,EAAE;IACjH,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IAChD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IAEnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACjB,KAAK,CAAC,KAAK,CAAC,CAAA;IAChB,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACvD,IAAI,CAAC;gBACD,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;YACxC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;gBACjE,OAAO,KAAK,CAAA;YAChB,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,MAAM,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE;QAC7C,QAAQ,EAAE;YACN,IAAI,EAAE,WAAW;YACjB,GAAG,QAAQ;SACd;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,IAAY,EAAE,OAAY,EAAE,EAAE,YAAoB,MAAM,EAAE,EAAE;IAC5F,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAA;IACpD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IACnC,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;QACvD,IAAI,MAAM,EAAE,CAAC;YACT,OAAO,MAAM,CAAA;QACjB,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;AACL,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,IAAY,EAAE,OAAY,EAAE,EAAE,YAAoB,MAAM,EAAE,EAAE;IACzF,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAA;IACpD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACjB,KAAK,CAAC,KAAK,CAAC,CAAA;IAChB,CAAC;IACD,IAAI,IAAS,CAAA;IACb,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;QACvD,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,GAAI,CAAC,MAAM,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,IAAe,CAAC,QAAQ,EAAE,CAAA;QAC5E,CAAC;IAEL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;IACD,OAAO,IAAI,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,OAAY,EAAE,EAAE,YAAoB,MAAM,EAAE,EAAE;IAClF,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IAChD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACjB,KAAK,CAAC,KAAK,CAAC,CAAA;IAChB,CAAC;IACD,IAAI,IAAS,CAAA;IACb,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;QACvD,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,GAAI,CAAC,MAAM,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,IAAe,CAAC,QAAQ,EAAE,CAAA;QAC5E,CAAC;IAEL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;IACD,IAAI,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,IAAI,CAAC;YACD,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC3B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;QAC7D,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,OAAY,EAAE,EAAE,YAAoB,MAAM,EAAE,EAAE;IACjF,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IAChD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACjB,KAAK,CAAC,KAAK,CAAC,CAAA;IAChB,CAAC;IACD,IAAI,IAAS,CAAA;IACb,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;QACvD,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;QACtC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;IACD,OAAO,IAAI,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,IAAY,EAAE,OAAY,EAAE,EAAE,YAAoB,MAAM,EAAE,EAAE;IAC9F,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAA;IACpD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACjB,KAAK,CAAC,KAAK,CAAC,CAAA;IAChB,CAAC;IACD,IAAI,IAAS,CAAA;IACb,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;QACvD,IAAI,MAAM,EAAE,CAAC;YACT,OAAO,MAAM,CAAC,IAAI,CAAA;QACtB,CAAC;IAEL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;IACD,OAAO,IAAI,CAAA;AACf,CAAC,CAAA"} \ No newline at end of file diff --git a/packages/cache/src/lib/index.ts b/packages/cache/src/lib/index.ts index 2a8dd024..dc7ca9b5 100644 --- a/packages/cache/src/lib/index.ts +++ b/packages/cache/src/lib/index.ts @@ -1,6 +1,6 @@ import { resolve, join } from 'node:path' import * as ssri from 'ssri' -import { get as cache_get, put as cache_put } from 'cacache' +import { get as cache_get, put as cache_put, rm as cache_rm } from 'cacache' import { sync as exists } from '@polymech/fs/exists' import { sync as mkdir } from '@polymech/fs/dir' import { isString, isObject, isArray } from '@polymech/core/primitives' @@ -57,6 +57,7 @@ export const set_cached = async (path: string, opts: any = {}, namespace: string export const set_cached_object = async (opts: any = {}, namespace: string = "nons", data: any, metadata: any = {}) => { const c_integrity = object_hash(opts, namespace) const c_dir = cache_path(namespace) + if (!exists(c_dir)) { mkdir(c_dir) } @@ -125,17 +126,34 @@ export const get_cached_object = async (opts: any = {}, namespace: string = "non } catch (e) { logger.error(e) } - if (data && isString(data)) { try { data = JSON.parse(data) } catch (e) { - logger.error(`Error parsing cached object: ${e}`, opts) + logger.error(`Error parsing cached object: ${e.message}`) } } return data } +export const rm_cached_object = async (opts: any = {}, namespace: string = "nons") => { + const c_integrity = object_hash(opts, namespace) + const c_dir = cache_path(namespace) + if (!exists(c_dir)) { + mkdir(c_dir) + } + let data: any + try { + const cached = await cache_get.info(c_dir, c_integrity) + if (cached) { + await cache_rm(c_dir, c_integrity) + } + } catch (e) { + logger.error(e) + } + return data +} + export const get_path_cached = async (path: string, opts: any = {}, namespace: string = "nons") => { const c_integrity = file_hash(path, opts, namespace) const c_dir = cache_path(namespace)