@kovalenko/http-request-cache 1.3.5 → 1.3.7

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.3.7](https://github.com/menelai/http-request-cache/compare/v1.3.6...v1.3.7) (2026-09-28)
+
+
+### Bug Fixes
+
+* args serializer ([242948a](https://github.com/menelai/http-request-cache/commit/242948ae49188e6e574c3d159a3e1df16871af45))
+* cache in instance ([736dde3](https://github.com/menelai/http-request-cache/commit/736dde34e799a6d64c786f9948bf502b950e8c84))
+* subscriber number increment ([449b56e](https://github.com/menelai/http-request-cache/commit/449b56ef1ea0c5db4c26bcaa6d5f90246c9d257a))
+
+## [1.3.6](https://github.com/menelai/http-request-cache/compare/v1.3.5...v1.3.6) (2026-09-28)
+
+
+### Bug Fixes
+
+* revert ([23960f6](https://github.com/menelai/http-request-cache/commit/23960f66b333d52a046706d9241dfc49d6ce0588))
+
 ## [1.3.5](https://github.com/menelai/http-request-cache/compare/v1.3.4...v1.3.5) (2026-09-24)
 
 

package/esm2020/lib/http-request-cache.decorator.mjs

@@ -1,4 +1,4 @@
-import { finalize, merge, NEVER, Subject, startWith, switchMap, share, ReplaySubject, timer, } from 'rxjs';
+import { filter, finalize, merge, NEVER, ReplaySubject, share, startWith, Subject, switchMap, tap, timer, } from 'rxjs';
 import { DefaultStorage } from './default-storage';
 import { RequestTimes } from './request-times';
 const serializeArg = (value) => {
@@ -46,7 +46,7 @@ const serializeArg = (value) => {
             out = `[${v.map(serialize).join(',')}]`;
         }
         else {
-            out = `{${Object.keys(v).sort().map(k => `${serialize(k)}:${serialize(v[k])}`).join(',')}}`;
+            out = `{${Object.keys(v).sort().map((k) => `${serialize(k)}:${serialize(v[k])}`).join(',')}}`;
         }
         seen.delete(v);
         return out;
@@ -63,29 +63,28 @@ const hashArgs = (input) => {
 };
 export const HttpRequestCache = (optionsHandler) => {
     return (target, methodName, descriptor) => {
-        if (typeof descriptor?.value !== 'function') {
+        if (!(descriptor?.value instanceof Function)) {
             throw Error(`'@HttpRequestCache' can be applied only to the class method which returns an Observable`);
         }
         const cacheKeyPrefix = `${target.constructor.name}_${methodName}`;
         const originalMethod = descriptor.value;
-        const latestCall = {};
+        const working = {};
+        const subscribers = {};
+        const removeTimers = {};
         const instanceIds = new WeakMap();
         let instanceIdCounter = 0;
         descriptor.value = function (...args) {
-            const self = this;
+            const self = this ?? target;
             const options = optionsHandler?.call(self, self, ...args);
-            const useDefaultStorage = !options?.storage;
-            if (useDefaultStorage && !self.___storage___) {
+            if (!options?.storage && !self.___storage___) {
                 self.___storage___ = new DefaultStorage();
             }
-            const ttlEnabled = options?.ttl != null;
-            if (ttlEnabled && !self.___ttl_storage___) {
+            if (options?.ttl && !self.___ttl_storage___) {
                 self.___ttl_storage___ = new RequestTimes();
             }
             const storage = options?.storage ?? self.___storage___;
-            const ttlStorage = self.___ttl_storage___;
             let instanceId = '';
-            if (useDefaultStorage) {
+            if (!options?.storage) {
                 let id = instanceIds.get(self);
                 if (id === undefined) {
                     id = ++instanceIdCounter;
@@ -94,58 +93,72 @@ export const HttpRequestCache = (optionsHandler) => {
                 instanceId = `_${id}`;
             }
             const key = `${cacheKeyPrefix}${instanceId}_${hashArgs(serializeArg(args))}`;
-            const latest = latestCall[key] ?? (latestCall[key] = { self, args });
-            latest.self = self;
-            latest.args = args;
+            // отменяем запланированное удаление
+            if (removeTimers[key]) {
+                clearTimeout(removeTimers[key]);
+                delete removeTimers[key];
+            }
             let ttl = undefined;
-            if (ttlEnabled && ttlStorage) {
-                ttl = ttlStorage.getItem(key);
+            if (options?.ttl) {
+                ttl = self.___ttl_storage___.getItem(key);
                 if (!ttl) {
                     ttl = {
                         requestTime: Date.now(),
                         subject: new Subject(),
                     };
                 }
-                else if (ttl.requestTime + options?.ttl <= Date.now()) {
+                else if (ttl.requestTime + options.ttl <= Date.now()) {
+                    working[key] = true;
                     ttl.requestTime = Date.now();
                     ttl.subject.next();
                 }
-                ttlStorage.setItem(key, ttl);
+                self.___ttl_storage___.setItem(key, ttl);
             }
             const refreshOn = merge(options?.refreshOn ?? NEVER, ttl?.subject ?? NEVER);
             let observable = storage.getItem(key);
             if (!observable) {
-                const ttlRemaining = ttlEnabled && ttl
-                    ? ttl.requestTime + options?.ttl - Date.now()
-                    : 0;
-                observable = refreshOn.pipe(startWith(true), switchMap(() => originalMethod.apply(latest.self, latest.args)), finalize(() => {
-                    storage.deleteItem(key);
-                    ttlStorage?.deleteItem(key);
-                    delete latestCall[key];
+                observable = refreshOn.pipe(startWith(true), switchMap(() => originalMethod.apply(this, [...args])), tap(() => {
+                    delete working[key];
                 }), share({
                     connector: () => new ReplaySubject(1),
                     resetOnComplete: false,
                     resetOnError: true,
-                    resetOnRefCountZero: options?.refCount
-                        ? options.refCountDelay != null
+                    resetOnRefCountZero: !options?.refCount
+                        ? false
+                        : options.refCountDelay != null
                             ? () => timer(options.refCountDelay)
-                            : true
-                        : ttlRemaining > 0
-                            ? () => timer(ttlRemaining)
                             : true,
+                }), filter(() => !working[key]), finalize(() => {
+                    subscribers[key]--;
+                    if (subscribers[key] <= 0) {
+                        delete subscribers[key];
+                        if (options?.refCount) {
+                            const unset = () => {
+                                storage.deleteItem(key);
+                                self.___ttl_storage___?.deleteItem(key);
+                                delete removeTimers[key];
+                            };
+                            if (options.refCountDelay == null) {
+                                unset();
+                            }
+                            else {
+                                removeTimers[key] = setTimeout(unset, options.refCountDelay);
+                            }
+                        }
+                    }
                 }));
                 storage.setItem(key, observable);
                 if (options?.windowTime) {
                     setTimeout(() => {
                         storage.deleteItem(key);
-                        ttlStorage?.deleteItem(key);
-                        delete latestCall[key];
+                        self.___ttl_storage___?.deleteItem(key);
                     }, options.windowTime);
                 }
             }
+            subscribers[key] = (subscribers[key] ?? 0) + 1;
             return observable;
         };
         return descriptor;
     };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"http-request-cache.decorator.js","sourceRoot":"","sources":["../../../../projects/http-request-cache/src/lib/http-request-cache.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAc,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EACxE,aAAa,EAAE,KAAK,GACrB,MAAM,MAAM,CAAC;AAEd,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAI7C,MAAM,YAAY,GAAG,CAAC,KAAU,EAAU,EAAE;IAC1C,MAAM,IAAI,GAAG,IAAI,OAAO,EAAkB,CAAC;IAC3C,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,MAAM,SAAS,GAAG,CAAC,CAAM,EAAU,EAAE;QACnC,IAAI,CAAC,KAAK,IAAI,EAAE;YACd,OAAO,MAAM,CAAC;SACf;QACD,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC;QAEnB,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,SAAS,EAAE;YACrC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;SAClB;QACD,IAAI,CAAC,KAAK,QAAQ,EAAE;YAClB,OAAO,GAAG,CAAC,GAAG,CAAC;SAChB;QACD,IAAI,CAAC,KAAK,WAAW,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,UAAU,EAAE;YAC3D,OAAO,OAAO,CAAC;SAChB;QACD,IAAI,CAAC,KAAK,QAAQ,EAAE;YAClB,OAAO,OAAO,CAAC,EAAE,CAAC;SACnB;QACD,IAAI,CAAC,KAAK,QAAQ,EAAE;YAClB,OAAO,GAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;SAC5B;QAED,IAAI,CAAC,YAAY,IAAI,EAAE;YACrB,OAAO,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;SAClC;QACD,IAAI,CAAC,YAAY,MAAM,EAAE;YACvB,OAAO,UAAU,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;SACjC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,OAAO,QAAQ,IAAI,EAAE,CAAC;SACvB;QACD,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,OAAO,EAAE,EAAE,CAAC,CAAC;QAE7B,IAAI,GAAW,CAAC;QAChB,IAAI,CAAC,YAAY,GAAG,EAAE;YACpB,GAAG,GAAG,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC;SACnD;aAAM,IAAI,CAAC,YAAY,GAAG,EAAE;YAC3B,GAAG,GAAG,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;SAClD;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC3B,GAAG,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;SACzC;aAAM;YACL,GAAG,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;SAC7F;QAED,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACf,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;IAEF,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC;AAC1B,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAU,EAAE;IACzC,IAAI,CAAC,GAAG,UAAU,CAAC;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;KAC9B;IACD,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAgC,cAA6D,EAAE,EAAE;IAC/H,OAAO,CAAC,MAAS,EAAE,UAAkB,EAAE,UAA2D,EAAmD,EAAE;QACrJ,IAAI,OAAO,UAAU,EAAE,KAAK,KAAK,UAAU,EAAE;YAC3C,MAAM,KAAK,CAAC,yFAAyF,CAAC,CAAC;SACxG;QAED,MAAM,cAAc,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,UAAU,EAAE,CAAC;QAClE,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC;QACxC,MAAM,UAAU,GAA6C,EAAE,CAAC;QAEhE,MAAM,WAAW,GAAG,IAAI,OAAO,EAAkB,CAAC;QAClD,IAAI,iBAAiB,GAAG,CAAC,CAAC;QAE1B,UAAU,CAAC,KAAK,GAAG,UAAS,GAAG,IAAW;YACxC,MAAM,IAAI,GAAG,IAA2B,CAAC;YACzC,MAAM,OAAO,GAAG,cAAc,EAAE,IAAI,CAAC,IAAS,EAAE,IAAS,EAAE,GAAG,IAAI,CAAC,CAAC;YAEpE,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC;YAC5C,IAAI,iBAAiB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBAC5C,IAAI,CAAC,aAAa,GAAG,IAAI,cAAc,EAAE,CAAC;aAC3C;YAED,MAAM,UAAU,GAAG,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC;YACxC,IAAI,UAAU,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBACzC,IAAI,CAAC,iBAAiB,GAAG,IAAI,YAAY,EAAE,CAAC;aAC7C;YAED,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,IAAI,IAAI,CAAC,aAAa,CAAC;YACvD,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC;YAE1C,IAAI,UAAU,GAAG,EAAE,CAAC;YACpB,IAAI,iBAAiB,EAAE;gBACrB,IAAI,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC/B,IAAI,EAAE,KAAK,SAAS,EAAE;oBACpB,EAAE,GAAG,EAAE,iBAAiB,CAAC;oBACzB,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;iBAC3B;gBACD,UAAU,GAAG,IAAI,EAAE,EAAE,CAAC;aACvB;YAED,MAAM,GAAG,GAAG,GAAG,cAAc,GAAG,UAAU,IAAI,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YAC7E,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC;YACnE,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;YACnB,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;YAEnB,IAAI,GAAG,GAAkD,SAAgB,CAAC;YAE1E,IAAI,UAAU,IAAI,UAAU,EAAE;gBAC5B,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAE9B,IAAI,CAAC,GAAG,EAAE;oBACR,GAAG,GAAG;wBACJ,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE;wBACvB,OAAO,EAAE,IAAI,OAAO,EAAE;qBACvB,CAAC;iBACH;qBAAM,IAAI,GAAG,CAAC,WAAW,GAAI,OAAO,EAAE,GAAc,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE;oBACnE,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;oBAC7B,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;iBACpB;gBAED,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aAC9B;YAED,MAAM,SAAS,GAAG,KAAK,CACrB,OAAO,EAAE,SAAS,IAAI,KAA4B,EAClD,GAAG,EAAE,OAAO,IAAI,KAA4B,CAC7C,CAAC;YAEF,IAAI,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAEtC,IAAI,CAAC,UAAU,EAAE;gBACf,MAAM,YAAY,GAAG,UAAU,IAAI,GAAG;oBACpC,CAAC,CAAC,GAAG,CAAC,WAAW,GAAI,OAAO,EAAE,GAAc,GAAG,IAAI,CAAC,GAAG,EAAE;oBACzD,CAAC,CAAC,CAAC,CAAC;gBAEN,UAAU,GAAG,SAAS,CAAC,IAAI,CACzB,SAAS,CAAC,IAAI,CAAC,EACf,SAAS,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,EAC/D,QAAQ,CAAC,GAAG,EAAE;oBACZ,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;oBACxB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;oBAC5B,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;gBACzB,CAAC,CAAC,EACF,KAAK,CAAC;oBACJ,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC;oBACrC,eAAe,EAAE,KAAK;oBACtB,YAAY,EAAE,IAAI;oBAClB,mBAAmB,EAAE,OAAO,EAAE,QAAQ;wBACpC,CAAC,CAAC,OAAO,CAAC,aAAa,IAAI,IAAI;4BAC7B,CAAC,CAAC,GAAuB,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,aAAc,CAAC;4BACzD,CAAC,CAAC,IAAI;wBACR,CAAC,CAAC,YAAY,GAAG,CAAC;4BAChB,CAAC,CAAC,GAAuB,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC;4BAC/C,CAAC,CAAC,IAAI;iBACX,CAAC,CACH,CAAC;gBACF,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;gBAEjC,IAAI,OAAO,EAAE,UAAU,EAAE;oBACvB,UAAU,CACR,GAAG,EAAE;wBACH,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;wBACxB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;wBAC5B,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;oBACzB,CAAC,EACD,OAAO,CAAC,UAAU,CACnB,CAAC;iBACH;aACF;YAED,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC;QAEF,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import {\n  finalize, merge, NEVER, Observable, Subject, startWith, switchMap, share,\n  ReplaySubject, timer,\n} from 'rxjs';\n\nimport {DefaultStorage} from './default-storage';\nimport {HttpCacheOptions} from './http-cache-options';\nimport {RequestTimes} from './request-times';\n\ntype HttpRequestCacheMethod = (...args: any[]) => Observable<any>;\n\nconst serializeArg = (value: any): string => {\n  const seen = new WeakMap<object, string>();\n  let counter = 0;\n\n  const serialize = (v: any): string => {\n    if (v === null) {\n      return 'null';\n    }\n    const t = typeof v;\n\n    if (t === 'number' || t === 'boolean') {\n      return String(v);\n    }\n    if (t === 'bigint') {\n      return `${v}n`;\n    }\n    if (t === 'undefined' || t === 'symbol' || t === 'function') {\n      return 'undef';\n    }\n    if (t === 'string') {\n      return `str:${v}`;\n    }\n    if (t !== 'object') {\n      return `${t}:${String(v)}`;\n    }\n\n    if (v instanceof Date) {\n      return `date:${v.toISOString()}`;\n    }\n    if (v instanceof RegExp) {\n      return `regexp:${v.toString()}`;\n    }\n\n    const path = seen.get(v);\n    if (path !== undefined) {\n      return `circ:${path}`;\n    }\n    seen.set(v, `v${counter++}`);\n\n    let out: string;\n    if (v instanceof Map) {\n      out = `map:${serialize(Array.from(v.entries()))}`;\n    } else if (v instanceof Set) {\n      out = `set:${serialize(Array.from(v.values()))}`;\n    } else if (Array.isArray(v)) {\n      out = `[${v.map(serialize).join(',')}]`;\n    } else {\n      out = `{${Object.keys(v).sort().map(k => `${serialize(k)}:${serialize(v[k])}`).join(',')}}`;\n    }\n\n    seen.delete(v);\n    return out;\n  };\n\n  return serialize(value);\n};\n\nconst hashArgs = (input: string): string => {\n  let h = 0x811c9dc5;\n  for (let i = 0; i < input.length; i++) {\n    h ^= input.charCodeAt(i);\n    h = Math.imul(h, 0x01000193);\n  }\n  return (h >>> 0).toString(36);\n};\n\nexport const HttpRequestCache = <T extends Record<string, any>>(optionsHandler?: (obj: T, ...args: any[]) => HttpCacheOptions) => {\n  return (target: T, methodName: string, descriptor: TypedPropertyDescriptor<HttpRequestCacheMethod>): TypedPropertyDescriptor<HttpRequestCacheMethod> => {\n    if (typeof descriptor?.value !== 'function') {\n      throw Error(`'@HttpRequestCache' can be applied only to the class method which returns an Observable`);\n    }\n\n    const cacheKeyPrefix = `${target.constructor.name}_${methodName}`;\n    const originalMethod = descriptor.value;\n    const latestCall: Record<string, {self: any, args: any[]}> = {};\n\n    const instanceIds = new WeakMap<object, number>();\n    let instanceIdCounter = 0;\n\n    descriptor.value = function(...args: any[]): Observable<any> {\n      const self = this as Record<string, any>;\n      const options = optionsHandler?.call(self as T, self as T, ...args);\n\n      const useDefaultStorage = !options?.storage;\n      if (useDefaultStorage && !self.___storage___) {\n        self.___storage___ = new DefaultStorage();\n      }\n\n      const ttlEnabled = options?.ttl != null;\n      if (ttlEnabled && !self.___ttl_storage___) {\n        self.___ttl_storage___ = new RequestTimes();\n      }\n\n      const storage = options?.storage ?? self.___storage___;\n      const ttlStorage = self.___ttl_storage___;\n\n      let instanceId = '';\n      if (useDefaultStorage) {\n        let id = instanceIds.get(self);\n        if (id === undefined) {\n          id = ++instanceIdCounter;\n          instanceIds.set(self, id);\n        }\n        instanceId = `_${id}`;\n      }\n\n      const key = `${cacheKeyPrefix}${instanceId}_${hashArgs(serializeArg(args))}`;\n      const latest = latestCall[key] ?? (latestCall[key] = {self, args});\n      latest.self = self;\n      latest.args = args;\n\n      let ttl: {requestTime: number, subject: Subject<void>} = undefined as any;\n\n      if (ttlEnabled && ttlStorage) {\n        ttl = ttlStorage.getItem(key);\n\n        if (!ttl) {\n          ttl = {\n            requestTime: Date.now(),\n            subject: new Subject(),\n          };\n        } else if (ttl.requestTime + (options?.ttl as number) <= Date.now()) {\n          ttl.requestTime = Date.now();\n          ttl.subject.next();\n        }\n\n        ttlStorage.setItem(key, ttl);\n      }\n\n      const refreshOn = merge(\n        options?.refreshOn ?? NEVER as Observable<unknown>,\n        ttl?.subject ?? NEVER as Observable<unknown>,\n      );\n\n      let observable = storage.getItem(key);\n\n      if (!observable) {\n        const ttlRemaining = ttlEnabled && ttl\n          ? ttl.requestTime + (options?.ttl as number) - Date.now()\n          : 0;\n\n        observable = refreshOn.pipe(\n          startWith(true),\n          switchMap(() => originalMethod.apply(latest.self, latest.args)),\n          finalize(() => {\n            storage.deleteItem(key);\n            ttlStorage?.deleteItem(key);\n            delete latestCall[key];\n          }),\n          share({\n            connector: () => new ReplaySubject(1),\n            resetOnComplete: false,\n            resetOnError: true,\n            resetOnRefCountZero: options?.refCount\n              ? options.refCountDelay != null\n                ? (): Observable<number> => timer(options.refCountDelay!)\n                : true\n              : ttlRemaining > 0\n                ? (): Observable<number> => timer(ttlRemaining)\n                : true,\n          }),\n        );\n        storage.setItem(key, observable);\n\n        if (options?.windowTime) {\n          setTimeout(\n            () => {\n              storage.deleteItem(key);\n              ttlStorage?.deleteItem(key);\n              delete latestCall[key];\n            },\n            options.windowTime,\n          );\n        }\n      }\n\n      return observable;\n    };\n\n    return descriptor;\n  };\n};\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"http-request-cache.decorator.js","sourceRoot":"","sources":["../../../../projects/http-request-cache/src/lib/http-request-cache.decorator.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  filter,\n  finalize,\n  merge,\n  NEVER,\n  Observable,\n  ReplaySubject,\n  share,\n  startWith,\n  Subject,\n  switchMap,\n  tap,\n  timer,\n} from 'rxjs';\n\nimport {DefaultStorage} from './default-storage';\nimport {HttpCacheOptions} from './http-cache-options';\nimport {RequestTimes} from './request-times';\n\ntype HttpRequestCacheMethod = (...args: any[]) => Observable<any>;\n\nconst serializeArg = (value: any): string => {\n  const seen = new WeakMap<object, string>();\n  let counter = 0;\n\n  const serialize = (v: any): string => {\n    if (v === null) {\n      return 'null';\n    }\n    const t = typeof v;\n\n    if (t === 'number' || t === 'boolean') {\n      return String(v);\n    }\n    if (t === 'bigint') {\n      return `${v}n`;\n    }\n    if (t === 'undefined' || t === 'symbol' || t === 'function') {\n      return 'undef';\n    }\n    if (t === 'string') {\n      return `str:${v}`;\n    }\n    if (t !== 'object') {\n      return `${t}:${String(v)}`;\n    }\n\n    if (v instanceof Date) {\n      return `date:${v.toISOString()}`;\n    }\n    if (v instanceof RegExp) {\n      return `regexp:${v.toString()}`;\n    }\n\n    const path = seen.get(v);\n    if (path !== undefined) {\n      return `circ:${path}`;\n    }\n    seen.set(v, `v${counter++}`);\n\n    let out: string;\n    if (v instanceof Map) {\n      out = `map:${serialize(Array.from(v.entries()))}`;\n    } else if (v instanceof Set) {\n      out = `set:${serialize(Array.from(v.values()))}`;\n    } else if (Array.isArray(v)) {\n      out = `[${v.map(serialize).join(',')}]`;\n    } else {\n      out = `{${Object.keys(v).sort().map((k: string): string => `${serialize(k)}:${serialize(v[k])}`).join(',')}}`;\n    }\n\n    seen.delete(v);\n    return out;\n  };\n\n  return serialize(value);\n};\n\nconst hashArgs = (input: string): string => {\n  let h = 0x811c9dc5;\n  for (let i = 0; i < input.length; i++) {\n    h ^= input.charCodeAt(i);\n    h = Math.imul(h, 0x01000193);\n  }\n  return (h >>> 0).toString(36);\n};\n\nexport const HttpRequestCache = <T extends Record<string, any>>(optionsHandler?: (obj: T, ...args: any[]) => HttpCacheOptions) => {\n  return (\n    target: T,\n    methodName: string,\n    descriptor: TypedPropertyDescriptor<HttpRequestCacheMethod>,\n  ): TypedPropertyDescriptor<HttpRequestCacheMethod> => {\n    if (!(descriptor?.value instanceof Function)) {\n      throw Error(`'@HttpRequestCache' can be applied only to the class method which returns an Observable`);\n    }\n\n    const cacheKeyPrefix = `${target.constructor.name}_${methodName}`;\n    const originalMethod = descriptor.value;\n    const working: Record<string, boolean> = {};\n    const subscribers: Record<string, number> = {};\n    const removeTimers: Record<string, ReturnType<typeof setTimeout>> = {};\n    const instanceIds = new WeakMap<object, number>();\n    let instanceIdCounter = 0;\n\n    descriptor.value = function(...args: any[]): Observable<any> {\n      const self = (this as Record<string, any>) ?? target;\n      const options = optionsHandler?.call(self as T, self as T, ...args);\n\n      if (!options?.storage && !self.___storage___) {\n        self.___storage___ = new DefaultStorage();\n      }\n\n      if (options?.ttl && !self.___ttl_storage___) {\n        self.___ttl_storage___ = new RequestTimes();\n      }\n\n      const storage = options?.storage ?? self.___storage___;\n\n      let instanceId = '';\n      if (!options?.storage) {\n        let id = instanceIds.get(self);\n        if (id === undefined) {\n          id = ++instanceIdCounter;\n          instanceIds.set(self, id);\n        }\n        instanceId = `_${id}`;\n      }\n\n      const key = `${cacheKeyPrefix}${instanceId}_${hashArgs(serializeArg(args))}`;\n\n      // отменяем запланированное удаление\n      if (removeTimers[key]) {\n        clearTimeout(removeTimers[key]);\n        delete removeTimers[key];\n      }\n\n      let ttl: {requestTime: number, subject: Subject<void>} = undefined as any;\n\n      if (options?.ttl) {\n        ttl = self.___ttl_storage___.getItem(key);\n\n        if (!ttl) {\n          ttl = {\n            requestTime: Date.now(),\n            subject: new Subject(),\n          };\n        } else if (ttl.requestTime + options.ttl <= Date.now()) {\n          working[key] = true;\n          ttl.requestTime = Date.now();\n          ttl.subject.next();\n        }\n\n        self.___ttl_storage___.setItem(key, ttl);\n      }\n\n      const refreshOn = merge(\n        options?.refreshOn ?? NEVER as Observable<unknown>,\n        ttl?.subject ?? NEVER as Observable<unknown>,\n      );\n\n      let observable = storage.getItem(key);\n\n      if (!observable) {\n        observable = refreshOn.pipe(\n          startWith(true),\n          switchMap(() => originalMethod.apply(this, [...args])),\n          tap(() => {\n            delete working[key];\n          }),\n          share({\n            connector: () => new ReplaySubject(1),\n            resetOnComplete: false,\n            resetOnError: true,\n            resetOnRefCountZero: !options?.refCount\n              ? false\n              : options.refCountDelay != null\n                ? (): Observable<number> => timer(options.refCountDelay!)\n                : true,\n          }),\n          filter(() => !working[key]),\n          finalize(() => {\n            subscribers[key]--;\n\n            if (subscribers[key] <= 0) {\n              delete subscribers[key];\n\n              if (options?.refCount) {\n                const unset = (): void => {\n                  storage.deleteItem(key);\n                  self.___ttl_storage___?.deleteItem(key);\n\n                  delete removeTimers[key];\n                };\n\n                if (options.refCountDelay == null) {\n                  unset();\n                } else {\n                  removeTimers[key] = setTimeout(unset, options.refCountDelay);\n                }\n              }\n            }\n          }),\n        );\n        storage.setItem(key, observable);\n\n        if (options?.windowTime) {\n          setTimeout(\n            () => {\n              storage.deleteItem(key);\n              self.___ttl_storage___?.deleteItem(key);\n            },\n            options.windowTime,\n          );\n        }\n      }\n\n      subscribers[key] = (subscribers[key] ?? 0) + 1;\n\n      return observable;\n    };\n\n    return descriptor;\n  };\n};\n\n"]}

package/fesm2015/kovalenko-http-request-cache.mjs

@@ -1,4 +1,4 @@
-import { Subject, merge, NEVER, startWith, switchMap, finalize, share, ReplaySubject, timer } from 'rxjs';
+import { Subject, merge, NEVER, startWith, switchMap, tap, share, ReplaySubject, timer, filter, finalize } from 'rxjs';
 
 class DefaultStorage {
     constructor() {
@@ -75,7 +75,7 @@ const serializeArg = (value) => {
             out = `[${v.map(serialize).join(',')}]`;
         }
         else {
-            out = `{${Object.keys(v).sort().map(k => `${serialize(k)}:${serialize(v[k])}`).join(',')}}`;
+            out = `{${Object.keys(v).sort().map((k) => `${serialize(k)}:${serialize(v[k])}`).join(',')}}`;
         }
         seen.delete(v);
         return out;
@@ -92,30 +92,29 @@ const hashArgs = (input) => {
 };
 const HttpRequestCache = (optionsHandler) => {
     return (target, methodName, descriptor) => {
-        if (typeof (descriptor === null || descriptor === void 0 ? void 0 : descriptor.value) !== 'function') {
+        if (!((descriptor === null || descriptor === void 0 ? void 0 : descriptor.value) instanceof Function)) {
             throw Error(`'@HttpRequestCache' can be applied only to the class method which returns an Observable`);
         }
         const cacheKeyPrefix = `${target.constructor.name}_${methodName}`;
         const originalMethod = descriptor.value;
-        const latestCall = {};
+        const working = {};
+        const subscribers = {};
+        const removeTimers = {};
         const instanceIds = new WeakMap();
         let instanceIdCounter = 0;
         descriptor.value = function (...args) {
             var _a, _b, _c, _d;
-            const self = this;
+            const self = this !== null && this !== void 0 ? this : target;
             const options = optionsHandler === null || optionsHandler === void 0 ? void 0 : optionsHandler.call(self, self, ...args);
-            const useDefaultStorage = !(options === null || options === void 0 ? void 0 : options.storage);
-            if (useDefaultStorage && !self.___storage___) {
+            if (!(options === null || options === void 0 ? void 0 : options.storage) && !self.___storage___) {
                 self.___storage___ = new DefaultStorage();
             }
-            const ttlEnabled = (options === null || options === void 0 ? void 0 : options.ttl) != null;
-            if (ttlEnabled && !self.___ttl_storage___) {
+            if ((options === null || options === void 0 ? void 0 : options.ttl) && !self.___ttl_storage___) {
                 self.___ttl_storage___ = new RequestTimes();
             }
             const storage = (_a = options === null || options === void 0 ? void 0 : options.storage) !== null && _a !== void 0 ? _a : self.___storage___;
-            const ttlStorage = self.___ttl_storage___;
             let instanceId = '';
-            if (useDefaultStorage) {
+            if (!(options === null || options === void 0 ? void 0 : options.storage)) {
                 let id = instanceIds.get(self);
                 if (id === undefined) {
                     id = ++instanceIdCounter;
@@ -124,55 +123,71 @@ const HttpRequestCache = (optionsHandler) => {
                 instanceId = `_${id}`;
             }
             const key = `${cacheKeyPrefix}${instanceId}_${hashArgs(serializeArg(args))}`;
-            const latest = (_b = latestCall[key]) !== null && _b !== void 0 ? _b : (latestCall[key] = { self, args });
-            latest.self = self;
-            latest.args = args;
+            // отменяем запланированное удаление
+            if (removeTimers[key]) {
+                clearTimeout(removeTimers[key]);
+                delete removeTimers[key];
+            }
             let ttl = undefined;
-            if (ttlEnabled && ttlStorage) {
-                ttl = ttlStorage.getItem(key);
+            if (options === null || options === void 0 ? void 0 : options.ttl) {
+                ttl = self.___ttl_storage___.getItem(key);
                 if (!ttl) {
                     ttl = {
                         requestTime: Date.now(),
                         subject: new Subject(),
                     };
                 }
-                else if (ttl.requestTime + (options === null || options === void 0 ? void 0 : options.ttl) <= Date.now()) {
+                else if (ttl.requestTime + options.ttl <= Date.now()) {
+                    working[key] = true;
                     ttl.requestTime = Date.now();
                     ttl.subject.next();
                 }
-                ttlStorage.setItem(key, ttl);
+                self.___ttl_storage___.setItem(key, ttl);
             }
-            const refreshOn = merge((_c = options === null || options === void 0 ? void 0 : options.refreshOn) !== null && _c !== void 0 ? _c : NEVER, (_d = ttl === null || ttl === void 0 ? void 0 : ttl.subject) !== null && _d !== void 0 ? _d : NEVER);
+            const refreshOn = merge((_b = options === null || options === void 0 ? void 0 : options.refreshOn) !== null && _b !== void 0 ? _b : NEVER, (_c = ttl === null || ttl === void 0 ? void 0 : ttl.subject) !== null && _c !== void 0 ? _c : NEVER);
             let observable = storage.getItem(key);
             if (!observable) {
-                const ttlRemaining = ttlEnabled && ttl
-                    ? ttl.requestTime + (options === null || options === void 0 ? void 0 : options.ttl) - Date.now()
-                    : 0;
-                observable = refreshOn.pipe(startWith(true), switchMap(() => originalMethod.apply(latest.self, latest.args)), finalize(() => {
-                    storage.deleteItem(key);
-                    ttlStorage === null || ttlStorage === void 0 ? void 0 : ttlStorage.deleteItem(key);
-                    delete latestCall[key];
+                observable = refreshOn.pipe(startWith(true), switchMap(() => originalMethod.apply(this, [...args])), tap(() => {
+                    delete working[key];
                 }), share({
                     connector: () => new ReplaySubject(1),
                     resetOnComplete: false,
                     resetOnError: true,
-                    resetOnRefCountZero: (options === null || options === void 0 ? void 0 : options.refCount)
-                        ? options.refCountDelay != null
+                    resetOnRefCountZero: !(options === null || options === void 0 ? void 0 : options.refCount)
+                        ? false
+                        : options.refCountDelay != null
                             ? () => timer(options.refCountDelay)
-                            : true
-                        : ttlRemaining > 0
-                            ? () => timer(ttlRemaining)
                             : true,
+                }), filter(() => !working[key]), finalize(() => {
+                    subscribers[key]--;
+                    if (subscribers[key] <= 0) {
+                        delete subscribers[key];
+                        if (options === null || options === void 0 ? void 0 : options.refCount) {
+                            const unset = () => {
+                                var _a;
+                                storage.deleteItem(key);
+                                (_a = self.___ttl_storage___) === null || _a === void 0 ? void 0 : _a.deleteItem(key);
+                                delete removeTimers[key];
+                            };
+                            if (options.refCountDelay == null) {
+                                unset();
+                            }
+                            else {
+                                removeTimers[key] = setTimeout(unset, options.refCountDelay);
+                            }
+                        }
+                    }
                 }));
                 storage.setItem(key, observable);
                 if (options === null || options === void 0 ? void 0 : options.windowTime) {
                     setTimeout(() => {
+                        var _a;
                         storage.deleteItem(key);
-                        ttlStorage === null || ttlStorage === void 0 ? void 0 : ttlStorage.deleteItem(key);
-                        delete latestCall[key];
+                        (_a = self.___ttl_storage___) === null || _a === void 0 ? void 0 : _a.deleteItem(key);
                     }, options.windowTime);
                 }
             }
+            subscribers[key] = ((_d = subscribers[key]) !== null && _d !== void 0 ? _d : 0) + 1;
             return observable;
         };
         return descriptor;

package/fesm2015/kovalenko-http-request-cache.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"kovalenko-http-request-cache.mjs","sources":["../../../projects/http-request-cache/src/lib/default-storage.ts","../../../projects/http-request-cache/src/lib/request-times.ts","../../../projects/http-request-cache/src/lib/http-request-cache.decorator.ts","../../../projects/http-request-cache/src/public-api.ts","../../../projects/http-request-cache/src/kovalenko-http-request-cache.ts"],"sourcesContent":["import {HttpCacheStorage} from './http-cache-storage';\nimport {Observable} from 'rxjs';\n\nexport class DefaultStorage implements HttpCacheStorage {\n  private storage = new Map<string, Observable<any>>();\n\n  getItem(key: string): Observable<any> | undefined {\n    return this.storage.get(key);\n  }\n\n  setItem(key: string, item: Observable<any>): void {\n    this.storage.set(key, item);\n  }\n\n  deleteItem(key: string): void {\n    this.storage.delete(key);\n  }\n}\n","import {HttpCacheStorage} from './http-cache-storage';\nimport {Observable} from 'rxjs';\n\nexport class RequestTimes implements HttpCacheStorage {\n  private storage = new Map<string, Observable<any>>();\n\n  getItem(key: string): Observable<any> | undefined {\n    return this.storage.get(key);\n  }\n\n  setItem(key: string, item: Observable<any>): void {\n    this.storage.set(key, item);\n  }\n\n  deleteItem(key: string): void {\n    this.storage.delete(key);\n  }\n}\n","import {\n  finalize, merge, NEVER, Observable, Subject, startWith, switchMap, share,\n  ReplaySubject, timer,\n} from 'rxjs';\n\nimport {DefaultStorage} from './default-storage';\nimport {HttpCacheOptions} from './http-cache-options';\nimport {RequestTimes} from './request-times';\n\ntype HttpRequestCacheMethod = (...args: any[]) => Observable<any>;\n\nconst serializeArg = (value: any): string => {\n  const seen = new WeakMap<object, string>();\n  let counter = 0;\n\n  const serialize = (v: any): string => {\n    if (v === null) {\n      return 'null';\n    }\n    const t = typeof v;\n\n    if (t === 'number' || t === 'boolean') {\n      return String(v);\n    }\n    if (t === 'bigint') {\n      return `${v}n`;\n    }\n    if (t === 'undefined' || t === 'symbol' || t === 'function') {\n      return 'undef';\n    }\n    if (t === 'string') {\n      return `str:${v}`;\n    }\n    if (t !== 'object') {\n      return `${t}:${String(v)}`;\n    }\n\n    if (v instanceof Date) {\n      return `date:${v.toISOString()}`;\n    }\n    if (v instanceof RegExp) {\n      return `regexp:${v.toString()}`;\n    }\n\n    const path = seen.get(v);\n    if (path !== undefined) {\n      return `circ:${path}`;\n    }\n    seen.set(v, `v${counter++}`);\n\n    let out: string;\n    if (v instanceof Map) {\n      out = `map:${serialize(Array.from(v.entries()))}`;\n    } else if (v instanceof Set) {\n      out = `set:${serialize(Array.from(v.values()))}`;\n    } else if (Array.isArray(v)) {\n      out = `[${v.map(serialize).join(',')}]`;\n    } else {\n      out = `{${Object.keys(v).sort().map(k => `${serialize(k)}:${serialize(v[k])}`).join(',')}}`;\n    }\n\n    seen.delete(v);\n    return out;\n  };\n\n  return serialize(value);\n};\n\nconst hashArgs = (input: string): string => {\n  let h = 0x811c9dc5;\n  for (let i = 0; i < input.length; i++) {\n    h ^= input.charCodeAt(i);\n    h = Math.imul(h, 0x01000193);\n  }\n  return (h >>> 0).toString(36);\n};\n\nexport const HttpRequestCache = <T extends Record<string, any>>(optionsHandler?: (obj: T, ...args: any[]) => HttpCacheOptions) => {\n  return (target: T, methodName: string, descriptor: TypedPropertyDescriptor<HttpRequestCacheMethod>): TypedPropertyDescriptor<HttpRequestCacheMethod> => {\n    if (typeof descriptor?.value !== 'function') {\n      throw Error(`'@HttpRequestCache' can be applied only to the class method which returns an Observable`);\n    }\n\n    const cacheKeyPrefix = `${target.constructor.name}_${methodName}`;\n    const originalMethod = descriptor.value;\n    const latestCall: Record<string, {self: any, args: any[]}> = {};\n\n    const instanceIds = new WeakMap<object, number>();\n    let instanceIdCounter = 0;\n\n    descriptor.value = function(...args: any[]): Observable<any> {\n      const self = this as Record<string, any>;\n      const options = optionsHandler?.call(self as T, self as T, ...args);\n\n      const useDefaultStorage = !options?.storage;\n      if (useDefaultStorage && !self.___storage___) {\n        self.___storage___ = new DefaultStorage();\n      }\n\n      const ttlEnabled = options?.ttl != null;\n      if (ttlEnabled && !self.___ttl_storage___) {\n        self.___ttl_storage___ = new RequestTimes();\n      }\n\n      const storage = options?.storage ?? self.___storage___;\n      const ttlStorage = self.___ttl_storage___;\n\n      let instanceId = '';\n      if (useDefaultStorage) {\n        let id = instanceIds.get(self);\n        if (id === undefined) {\n          id = ++instanceIdCounter;\n          instanceIds.set(self, id);\n        }\n        instanceId = `_${id}`;\n      }\n\n      const key = `${cacheKeyPrefix}${instanceId}_${hashArgs(serializeArg(args))}`;\n      const latest = latestCall[key] ?? (latestCall[key] = {self, args});\n      latest.self = self;\n      latest.args = args;\n\n      let ttl: {requestTime: number, subject: Subject<void>} = undefined as any;\n\n      if (ttlEnabled && ttlStorage) {\n        ttl = ttlStorage.getItem(key);\n\n        if (!ttl) {\n          ttl = {\n            requestTime: Date.now(),\n            subject: new Subject(),\n          };\n        } else if (ttl.requestTime + (options?.ttl as number) <= Date.now()) {\n          ttl.requestTime = Date.now();\n          ttl.subject.next();\n        }\n\n        ttlStorage.setItem(key, ttl);\n      }\n\n      const refreshOn = merge(\n        options?.refreshOn ?? NEVER as Observable<unknown>,\n        ttl?.subject ?? NEVER as Observable<unknown>,\n      );\n\n      let observable = storage.getItem(key);\n\n      if (!observable) {\n        const ttlRemaining = ttlEnabled && ttl\n          ? ttl.requestTime + (options?.ttl as number) - Date.now()\n          : 0;\n\n        observable = refreshOn.pipe(\n          startWith(true),\n          switchMap(() => originalMethod.apply(latest.self, latest.args)),\n          finalize(() => {\n            storage.deleteItem(key);\n            ttlStorage?.deleteItem(key);\n            delete latestCall[key];\n          }),\n          share({\n            connector: () => new ReplaySubject(1),\n            resetOnComplete: false,\n            resetOnError: true,\n            resetOnRefCountZero: options?.refCount\n              ? options.refCountDelay != null\n                ? (): Observable<number> => timer(options.refCountDelay!)\n                : true\n              : ttlRemaining > 0\n                ? (): Observable<number> => timer(ttlRemaining)\n                : true,\n          }),\n        );\n        storage.setItem(key, observable);\n\n        if (options?.windowTime) {\n          setTimeout(\n            () => {\n              storage.deleteItem(key);\n              ttlStorage?.deleteItem(key);\n              delete latestCall[key];\n            },\n            options.windowTime,\n          );\n        }\n      }\n\n      return observable;\n    };\n\n    return descriptor;\n  };\n};\n","/*\n * Public API Surface of http-request-cache\n */\n\nexport * from './lib/http-request-cache.decorator';\nexport * from './lib/http-cache-storage';\nexport * from './lib/http-cache-options';\nexport * from './lib/default-storage';\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"kovalenko-http-request-cache.mjs","sources":["../../../projects/http-request-cache/src/lib/default-storage.ts","../../../projects/http-request-cache/src/lib/request-times.ts","../../../projects/http-request-cache/src/lib/http-request-cache.decorator.ts","../../../projects/http-request-cache/src/public-api.ts","../../../projects/http-request-cache/src/kovalenko-http-request-cache.ts"],"sourcesContent":["import {HttpCacheStorage} from './http-cache-storage';\nimport {Observable} from 'rxjs';\n\nexport class DefaultStorage implements HttpCacheStorage {\n  private storage = new Map<string, Observable<any>>();\n\n  getItem(key: string): Observable<any> | undefined {\n    return this.storage.get(key);\n  }\n\n  setItem(key: string, item: Observable<any>): void {\n    this.storage.set(key, item);\n  }\n\n  deleteItem(key: string): void {\n    this.storage.delete(key);\n  }\n}\n","import {HttpCacheStorage} from './http-cache-storage';\nimport {Observable} from 'rxjs';\n\nexport class RequestTimes implements HttpCacheStorage {\n  private storage = new Map<string, Observable<any>>();\n\n  getItem(key: string): Observable<any> | undefined {\n    return this.storage.get(key);\n  }\n\n  setItem(key: string, item: Observable<any>): void {\n    this.storage.set(key, item);\n  }\n\n  deleteItem(key: string): void {\n    this.storage.delete(key);\n  }\n}\n","import {\n  filter,\n  finalize,\n  merge,\n  NEVER,\n  Observable,\n  ReplaySubject,\n  share,\n  startWith,\n  Subject,\n  switchMap,\n  tap,\n  timer,\n} from 'rxjs';\n\nimport {DefaultStorage} from './default-storage';\nimport {HttpCacheOptions} from './http-cache-options';\nimport {RequestTimes} from './request-times';\n\ntype HttpRequestCacheMethod = (...args: any[]) => Observable<any>;\n\nconst serializeArg = (value: any): string => {\n  const seen = new WeakMap<object, string>();\n  let counter = 0;\n\n  const serialize = (v: any): string => {\n    if (v === null) {\n      return 'null';\n    }\n    const t = typeof v;\n\n    if (t === 'number' || t === 'boolean') {\n      return String(v);\n    }\n    if (t === 'bigint') {\n      return `${v}n`;\n    }\n    if (t === 'undefined' || t === 'symbol' || t === 'function') {\n      return 'undef';\n    }\n    if (t === 'string') {\n      return `str:${v}`;\n    }\n    if (t !== 'object') {\n      return `${t}:${String(v)}`;\n    }\n\n    if (v instanceof Date) {\n      return `date:${v.toISOString()}`;\n    }\n    if (v instanceof RegExp) {\n      return `regexp:${v.toString()}`;\n    }\n\n    const path = seen.get(v);\n    if (path !== undefined) {\n      return `circ:${path}`;\n    }\n    seen.set(v, `v${counter++}`);\n\n    let out: string;\n    if (v instanceof Map) {\n      out = `map:${serialize(Array.from(v.entries()))}`;\n    } else if (v instanceof Set) {\n      out = `set:${serialize(Array.from(v.values()))}`;\n    } else if (Array.isArray(v)) {\n      out = `[${v.map(serialize).join(',')}]`;\n    } else {\n      out = `{${Object.keys(v).sort().map((k: string): string => `${serialize(k)}:${serialize(v[k])}`).join(',')}}`;\n    }\n\n    seen.delete(v);\n    return out;\n  };\n\n  return serialize(value);\n};\n\nconst hashArgs = (input: string): string => {\n  let h = 0x811c9dc5;\n  for (let i = 0; i < input.length; i++) {\n    h ^= input.charCodeAt(i);\n    h = Math.imul(h, 0x01000193);\n  }\n  return (h >>> 0).toString(36);\n};\n\nexport const HttpRequestCache = <T extends Record<string, any>>(optionsHandler?: (obj: T, ...args: any[]) => HttpCacheOptions) => {\n  return (\n    target: T,\n    methodName: string,\n    descriptor: TypedPropertyDescriptor<HttpRequestCacheMethod>,\n  ): TypedPropertyDescriptor<HttpRequestCacheMethod> => {\n    if (!(descriptor?.value instanceof Function)) {\n      throw Error(`'@HttpRequestCache' can be applied only to the class method which returns an Observable`);\n    }\n\n    const cacheKeyPrefix = `${target.constructor.name}_${methodName}`;\n    const originalMethod = descriptor.value;\n    const working: Record<string, boolean> = {};\n    const subscribers: Record<string, number> = {};\n    const removeTimers: Record<string, ReturnType<typeof setTimeout>> = {};\n    const instanceIds = new WeakMap<object, number>();\n    let instanceIdCounter = 0;\n\n    descriptor.value = function(...args: any[]): Observable<any> {\n      const self = (this as Record<string, any>) ?? target;\n      const options = optionsHandler?.call(self as T, self as T, ...args);\n\n      if (!options?.storage && !self.___storage___) {\n        self.___storage___ = new DefaultStorage();\n      }\n\n      if (options?.ttl && !self.___ttl_storage___) {\n        self.___ttl_storage___ = new RequestTimes();\n      }\n\n      const storage = options?.storage ?? self.___storage___;\n\n      let instanceId = '';\n      if (!options?.storage) {\n        let id = instanceIds.get(self);\n        if (id === undefined) {\n          id = ++instanceIdCounter;\n          instanceIds.set(self, id);\n        }\n        instanceId = `_${id}`;\n      }\n\n      const key = `${cacheKeyPrefix}${instanceId}_${hashArgs(serializeArg(args))}`;\n\n      // отменяем запланированное удаление\n      if (removeTimers[key]) {\n        clearTimeout(removeTimers[key]);\n        delete removeTimers[key];\n      }\n\n      let ttl: {requestTime: number, subject: Subject<void>} = undefined as any;\n\n      if (options?.ttl) {\n        ttl = self.___ttl_storage___.getItem(key);\n\n        if (!ttl) {\n          ttl = {\n            requestTime: Date.now(),\n            subject: new Subject(),\n          };\n        } else if (ttl.requestTime + options.ttl <= Date.now()) {\n          working[key] = true;\n          ttl.requestTime = Date.now();\n          ttl.subject.next();\n        }\n\n        self.___ttl_storage___.setItem(key, ttl);\n      }\n\n      const refreshOn = merge(\n        options?.refreshOn ?? NEVER as Observable<unknown>,\n        ttl?.subject ?? NEVER as Observable<unknown>,\n      );\n\n      let observable = storage.getItem(key);\n\n      if (!observable) {\n        observable = refreshOn.pipe(\n          startWith(true),\n          switchMap(() => originalMethod.apply(this, [...args])),\n          tap(() => {\n            delete working[key];\n          }),\n          share({\n            connector: () => new ReplaySubject(1),\n            resetOnComplete: false,\n            resetOnError: true,\n            resetOnRefCountZero: !options?.refCount\n              ? false\n              : options.refCountDelay != null\n                ? (): Observable<number> => timer(options.refCountDelay!)\n                : true,\n          }),\n          filter(() => !working[key]),\n          finalize(() => {\n            subscribers[key]--;\n\n            if (subscribers[key] <= 0) {\n              delete subscribers[key];\n\n              if (options?.refCount) {\n                const unset = (): void => {\n                  storage.deleteItem(key);\n                  self.___ttl_storage___?.deleteItem(key);\n\n                  delete removeTimers[key];\n                };\n\n                if (options.refCountDelay == null) {\n                  unset();\n                } else {\n                  removeTimers[key] = setTimeout(unset, options.refCountDelay);\n                }\n              }\n            }\n          }),\n        );\n        storage.setItem(key, observable);\n\n        if (options?.windowTime) {\n          setTimeout(\n            () => {\n              storage.deleteItem(key);\n              self.___ttl_storage___?.deleteItem(key);\n            },\n            options.windowTime,\n          );\n        }\n      }\n\n      subscribers[key] = (subscribers[key] ?? 0) + 1;\n\n      return observable;\n    };\n\n    return descriptor;\n  };\n};\n\n","/*\n * Public API Surface of http-request-cache\n */\n\nexport * from './lib/http-request-cache.decorator';\nexport * from './lib/http-cache-storage';\nexport * from './lib/http-cache-options';\nexport * from './lib/default-storage';\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":"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"}

package/fesm2020/kovalenko-http-request-cache.mjs

@@ -1,4 +1,4 @@
-import { Subject, merge, NEVER, startWith, switchMap, finalize, share, ReplaySubject, timer } from 'rxjs';
+import { Subject, merge, NEVER, startWith, switchMap, tap, share, ReplaySubject, timer, filter, finalize } from 'rxjs';
 
 class DefaultStorage {
     constructor() {
@@ -75,7 +75,7 @@ const serializeArg = (value) => {
             out = `[${v.map(serialize).join(',')}]`;
         }
         else {
-            out = `{${Object.keys(v).sort().map(k => `${serialize(k)}:${serialize(v[k])}`).join(',')}}`;
+            out = `{${Object.keys(v).sort().map((k) => `${serialize(k)}:${serialize(v[k])}`).join(',')}}`;
         }
         seen.delete(v);
         return out;
@@ -92,29 +92,28 @@ const hashArgs = (input) => {
 };
 const HttpRequestCache = (optionsHandler) => {
     return (target, methodName, descriptor) => {
-        if (typeof descriptor?.value !== 'function') {
+        if (!(descriptor?.value instanceof Function)) {
             throw Error(`'@HttpRequestCache' can be applied only to the class method which returns an Observable`);
         }
         const cacheKeyPrefix = `${target.constructor.name}_${methodName}`;
         const originalMethod = descriptor.value;
-        const latestCall = {};
+        const working = {};
+        const subscribers = {};
+        const removeTimers = {};
         const instanceIds = new WeakMap();
         let instanceIdCounter = 0;
         descriptor.value = function (...args) {
-            const self = this;
+            const self = this ?? target;
             const options = optionsHandler?.call(self, self, ...args);
-            const useDefaultStorage = !options?.storage;
-            if (useDefaultStorage && !self.___storage___) {
+            if (!options?.storage && !self.___storage___) {
                 self.___storage___ = new DefaultStorage();
             }
-            const ttlEnabled = options?.ttl != null;
-            if (ttlEnabled && !self.___ttl_storage___) {
+            if (options?.ttl && !self.___ttl_storage___) {
                 self.___ttl_storage___ = new RequestTimes();
             }
             const storage = options?.storage ?? self.___storage___;
-            const ttlStorage = self.___ttl_storage___;
             let instanceId = '';
-            if (useDefaultStorage) {
+            if (!options?.storage) {
                 let id = instanceIds.get(self);
                 if (id === undefined) {
                     id = ++instanceIdCounter;
@@ -123,55 +122,69 @@ const HttpRequestCache = (optionsHandler) => {
                 instanceId = `_${id}`;
             }
             const key = `${cacheKeyPrefix}${instanceId}_${hashArgs(serializeArg(args))}`;
-            const latest = latestCall[key] ?? (latestCall[key] = { self, args });
-            latest.self = self;
-            latest.args = args;
+            // отменяем запланированное удаление
+            if (removeTimers[key]) {
+                clearTimeout(removeTimers[key]);
+                delete removeTimers[key];
+            }
             let ttl = undefined;
-            if (ttlEnabled && ttlStorage) {
-                ttl = ttlStorage.getItem(key);
+            if (options?.ttl) {
+                ttl = self.___ttl_storage___.getItem(key);
                 if (!ttl) {
                     ttl = {
                         requestTime: Date.now(),
                         subject: new Subject(),
                     };
                 }
-                else if (ttl.requestTime + options?.ttl <= Date.now()) {
+                else if (ttl.requestTime + options.ttl <= Date.now()) {
+                    working[key] = true;
                     ttl.requestTime = Date.now();
                     ttl.subject.next();
                 }
-                ttlStorage.setItem(key, ttl);
+                self.___ttl_storage___.setItem(key, ttl);
             }
             const refreshOn = merge(options?.refreshOn ?? NEVER, ttl?.subject ?? NEVER);
             let observable = storage.getItem(key);
             if (!observable) {
-                const ttlRemaining = ttlEnabled && ttl
-                    ? ttl.requestTime + options?.ttl - Date.now()
-                    : 0;
-                observable = refreshOn.pipe(startWith(true), switchMap(() => originalMethod.apply(latest.self, latest.args)), finalize(() => {
-                    storage.deleteItem(key);
-                    ttlStorage?.deleteItem(key);
-                    delete latestCall[key];
+                observable = refreshOn.pipe(startWith(true), switchMap(() => originalMethod.apply(this, [...args])), tap(() => {
+                    delete working[key];
                 }), share({
                     connector: () => new ReplaySubject(1),
                     resetOnComplete: false,
                     resetOnError: true,
-                    resetOnRefCountZero: options?.refCount
-                        ? options.refCountDelay != null
+                    resetOnRefCountZero: !options?.refCount
+                        ? false
+                        : options.refCountDelay != null
                             ? () => timer(options.refCountDelay)
-                            : true
-                        : ttlRemaining > 0
-                            ? () => timer(ttlRemaining)
                             : true,
+                }), filter(() => !working[key]), finalize(() => {
+                    subscribers[key]--;
+                    if (subscribers[key] <= 0) {
+                        delete subscribers[key];
+                        if (options?.refCount) {
+                            const unset = () => {
+                                storage.deleteItem(key);
+                                self.___ttl_storage___?.deleteItem(key);
+                                delete removeTimers[key];
+                            };
+                            if (options.refCountDelay == null) {
+                                unset();
+                            }
+                            else {
+                                removeTimers[key] = setTimeout(unset, options.refCountDelay);
+                            }
+                        }
+                    }
                 }));
                 storage.setItem(key, observable);
                 if (options?.windowTime) {
                     setTimeout(() => {
                         storage.deleteItem(key);
-                        ttlStorage?.deleteItem(key);
-                        delete latestCall[key];
+                        self.___ttl_storage___?.deleteItem(key);
                     }, options.windowTime);
                 }
             }
+            subscribers[key] = (subscribers[key] ?? 0) + 1;
             return observable;
         };
         return descriptor;