aptechka 0.92.4 → 0.92.5

package/lib/api-fetcher/index.cjs

@@ -1 +1 @@
-"use strict";var __defProp=Object.defineProperty,__defProps=Object.defineProperties;var __getOwnPropDescs=Object.getOwnPropertyDescriptors;var __getOwnPropSymbols=Object.getOwnPropertySymbols;var __hasOwnProp=Object.prototype.hasOwnProperty,__propIsEnum=Object.prototype.propertyIsEnumerable;var __defNormalProp=(obj,key,value)=>key in obj?__defProp(obj,key,{enumerable:!0,configurable:!0,writable:!0,value}):obj[key]=value,__spreadValues=(a,b)=>{for(var prop in b||(b={}))__hasOwnProp.call(b,prop)&&__defNormalProp(a,prop,b[prop]);if(__getOwnPropSymbols)for(var prop of __getOwnPropSymbols(b))__propIsEnum.call(b,prop)&&__defNormalProp(a,prop,b[prop]);return a},__spreadProps=(a,b)=>__defProps(a,__getOwnPropDescs(b)),__name=(target,value)=>__defProp(target,"name",{value,configurable:!0});var __async=(__this,__arguments,generator)=>new Promise((resolve,reject)=>{var fulfilled=value=>{try{step(generator.next(value))}catch(e){reject(e)}},rejected=value=>{try{step(generator.throw(value))}catch(e){reject(e)}},step=x=>x.done?resolve(x.value):Promise.resolve(x.value).then(fulfilled,rejected);step((generator=generator.apply(__this,__arguments)).next())});Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const cache_index=require("../cache/index.cjs");require("../Store-B96mD8mD.cjs");require("../index-BoGx2BWX.cjs");require("construct-style-sheets-polyfill");const url=require("../url-D0rESDQq.cjs"),cache=new cache_index.Cache;function apiFetcher(input,options){return __async(this,null,function*(){var _a,_b;const startTime=Date.now(),baseResult={data:null,error:null,status:"unknown",headers:new Headers};try{let url$1=input;if(options!=null&&options.params){const params=url.searchParamsObjectToString(options.params);if(params){const separator=url$1.includes("?")?"&":"?";url$1+=`${separator}${params}`}}const cacheKey=(_a=options==null?void 0:options.cacheKey)!=null?_a:url$1,cacheTTL=(_b=options==null?void 0:options.cacheTTLMinutes)!=null?_b:0,cacheAllowed=cacheTTL>0;if((options!=null&&options.forceClearCache||globalThis.forceClearCache)&&cache.delete(cacheKey),cacheAllowed){const cached=cache.get(cacheKey);if(cached)return __spreadProps(__spreadValues({},baseResult),{data:cached,cached:!0,status:"success",time:Date.now()-startTime})}const response=yield fetch(url$1,options==null?void 0:options.init);if(!response.ok){const errorText=yield response.text();return __spreadProps(__spreadValues({},baseResult),{error:errorText,status:"error",time:Date.now()-startTime,headers:response.headers})}const contentType=response.headers.get("content-type");if(!(contentType!=null&&contentType.includes("application/json")))return __spreadProps(__spreadValues({},baseResult),{error:"Endpoint did not return JSON",status:"error",time:Date.now()-startTime,headers:response.headers});const jsonData=yield response.json();return cacheAllowed&&cache.set(cacheKey,jsonData,cacheTTL),__spreadProps(__spreadValues({},baseResult),{data:jsonData,status:"success",time:Date.now()-startTime,headers:response.headers})}catch(error){const errorMessage=error instanceof Error?error.message:String(error);return __spreadProps(__spreadValues({},baseResult),{error:errorMessage,status:"error",time:Date.now()-startTime})}})}__name(apiFetcher,"apiFetcher");exports.apiFetcher=apiFetcher;
+"use strict";var __defProp=Object.defineProperty,__defProps=Object.defineProperties;var __getOwnPropDescs=Object.getOwnPropertyDescriptors;var __getOwnPropSymbols=Object.getOwnPropertySymbols;var __hasOwnProp=Object.prototype.hasOwnProperty,__propIsEnum=Object.prototype.propertyIsEnumerable;var __defNormalProp=(obj,key,value)=>key in obj?__defProp(obj,key,{enumerable:!0,configurable:!0,writable:!0,value}):obj[key]=value,__spreadValues=(a,b)=>{for(var prop in b||(b={}))__hasOwnProp.call(b,prop)&&__defNormalProp(a,prop,b[prop]);if(__getOwnPropSymbols)for(var prop of __getOwnPropSymbols(b))__propIsEnum.call(b,prop)&&__defNormalProp(a,prop,b[prop]);return a},__spreadProps=(a,b)=>__defProps(a,__getOwnPropDescs(b)),__name=(target,value)=>__defProp(target,"name",{value,configurable:!0});var __async=(__this,__arguments,generator)=>new Promise((resolve,reject)=>{var fulfilled=value=>{try{step(generator.next(value))}catch(e){reject(e)}},rejected=value=>{try{step(generator.throw(value))}catch(e){reject(e)}},step=x=>x.done?resolve(x.value):Promise.resolve(x.value).then(fulfilled,rejected);step((generator=generator.apply(__this,__arguments)).next())});Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const cache_index=require("../cache/index.cjs");require("../Store-B96mD8mD.cjs");require("../index-BoGx2BWX.cjs");require("construct-style-sheets-polyfill");const url=require("../url-D0rESDQq.cjs"),apiFetcherCache=new cache_index.Cache,pendingRequests=new Map;function apiFetcherClearPendingRequests(){pendingRequests.clear()}__name(apiFetcherClearPendingRequests,"apiFetcherClearPendingRequests");function apiFetcherGetPendingRequestsCount(){return pendingRequests.size}__name(apiFetcherGetPendingRequestsCount,"apiFetcherGetPendingRequestsCount");function apiFetcher(input,options){return __async(this,null,function*(){var _a,_b;const startTime=Date.now(),baseResult={data:null,error:null,status:"unknown",headers:new Headers};try{let url$1=input;if(options!=null&&options.params){const params=url.searchParamsObjectToString(options.params);if(params){const separator=url$1.includes("?")?"&":"?";url$1+=`${separator}${params}`}}const cacheKey=(_a=options==null?void 0:options.cacheKey)!=null?_a:url$1,cacheTTL=(_b=options==null?void 0:options.cacheTTLMinutes)!=null?_b:0,cacheAllowed=cacheTTL>0;if((options!=null&&options.forceClearCache||globalThis.forceClearCache)&&(apiFetcherCache.delete(cacheKey),pendingRequests.delete(cacheKey)),cacheAllowed){const cached=apiFetcherCache.get(cacheKey);if(cached)return __spreadProps(__spreadValues({},baseResult),{data:cached,cached:!0,status:"success",time:Date.now()-startTime})}const pendingRequest=pendingRequests.get(cacheKey);if(pendingRequest)return pendingRequest;const requestPromise=__async(this,null,function*(){try{const response=yield fetch(url$1,options==null?void 0:options.init);if(!response.ok){const errorText=yield response.text();return __spreadProps(__spreadValues({},baseResult),{error:errorText,status:"error",time:Date.now()-startTime,headers:response.headers})}const contentType=response.headers.get("content-type");if(!(contentType!=null&&contentType.includes("application/json")))return __spreadProps(__spreadValues({},baseResult),{error:"Endpoint did not return JSON",status:"error",time:Date.now()-startTime,headers:response.headers});const jsonData=yield response.json();return cacheAllowed&&apiFetcherCache.set(cacheKey,jsonData,cacheTTL),__spreadProps(__spreadValues({},baseResult),{data:jsonData,status:"success",time:Date.now()-startTime,headers:response.headers})}finally{pendingRequests.delete(cacheKey)}});return pendingRequests.set(cacheKey,requestPromise),yield requestPromise}catch(error){const errorMessage=error instanceof Error?error.message:String(error);return __spreadProps(__spreadValues({},baseResult),{error:errorMessage,status:"error",time:Date.now()-startTime})}})}__name(apiFetcher,"apiFetcher");exports.apiFetcher=apiFetcher;exports.apiFetcherCache=apiFetcherCache;exports.apiFetcherClearPendingRequests=apiFetcherClearPendingRequests;exports.apiFetcherGetPendingRequestsCount=apiFetcherGetPendingRequestsCount;

package/lib/api-fetcher/index.d.ts

@@ -1,3 +1,4 @@
+import { Cache } from '../cache';
 export interface IAPIFetcherOptions<Params extends object = {}> {
     init?: RequestInit;
     cacheKey?: string;
@@ -13,4 +14,7 @@ export interface IAPIResponseJSON<T = null> {
     cached?: boolean;
     headers: Headers;
 }
+export declare const apiFetcherCache: Cache;
+export declare function apiFetcherClearPendingRequests(): void;
+export declare function apiFetcherGetPendingRequestsCount(): number;
 export declare function apiFetcher<Params extends object = {}, Result = any>(input: string, options?: IAPIFetcherOptions<Params>): Promise<IAPIResponseJSON<Result>>;

package/lib/api-fetcher/index.js

@@ -31,7 +31,15 @@ import "../Store-CAGUSjFX.js";
 import "../index-DAG0CtYo.js";
 import "construct-style-sheets-polyfill";
 import { s as searchParamsObjectToString } from "../url-DTxLpq5m.js";
-const cache = new Cache();
+const apiFetcherCache = new Cache(), pendingRequests = /* @__PURE__ */ new Map();
+function apiFetcherClearPendingRequests() {
+  pendingRequests.clear();
+}
+__name(apiFetcherClearPendingRequests, "apiFetcherClearPendingRequests");
+function apiFetcherGetPendingRequestsCount() {
+  return pendingRequests.size;
+}
+__name(apiFetcherGetPendingRequestsCount, "apiFetcherGetPendingRequestsCount");
 function apiFetcher(input, options) {
   return __async(this, null, function* () {
     var _a, _b;
@@ -51,8 +59,8 @@ function apiFetcher(input, options) {
         }
       }
       const cacheKey = (_a = options == null ? void 0 : options.cacheKey) != null ? _a : url, cacheTTL = (_b = options == null ? void 0 : options.cacheTTLMinutes) != null ? _b : 0, cacheAllowed = cacheTTL > 0;
-      if ((options != null && options.forceClearCache || globalThis.forceClearCache) && cache.delete(cacheKey), cacheAllowed) {
-        const cached = cache.get(cacheKey);
+      if ((options != null && options.forceClearCache || globalThis.forceClearCache) && (apiFetcherCache.delete(cacheKey), pendingRequests.delete(cacheKey)), cacheAllowed) {
+        const cached = apiFetcherCache.get(cacheKey);
         if (cached)
           return __spreadProps(__spreadValues({}, baseResult), {
             data: cached,
@@ -61,31 +69,41 @@ function apiFetcher(input, options) {
             time: Date.now() - startTime
           });
       }
-      const response = yield fetch(url, options == null ? void 0 : options.init);
-      if (!response.ok) {
-        const errorText = yield response.text();
-        return __spreadProps(__spreadValues({}, baseResult), {
-          error: errorText,
-          status: "error",
-          time: Date.now() - startTime,
-          headers: response.headers
-        });
-      }
-      const contentType = response.headers.get("content-type");
-      if (!(contentType != null && contentType.includes("application/json")))
-        return __spreadProps(__spreadValues({}, baseResult), {
-          error: "Endpoint did not return JSON",
-          status: "error",
-          time: Date.now() - startTime,
-          headers: response.headers
-        });
-      const jsonData = yield response.json();
-      return cacheAllowed && cache.set(cacheKey, jsonData, cacheTTL), __spreadProps(__spreadValues({}, baseResult), {
-        data: jsonData,
-        status: "success",
-        time: Date.now() - startTime,
-        headers: response.headers
+      const pendingRequest = pendingRequests.get(cacheKey);
+      if (pendingRequest)
+        return pendingRequest;
+      const requestPromise = __async(this, null, function* () {
+        try {
+          const response = yield fetch(url, options == null ? void 0 : options.init);
+          if (!response.ok) {
+            const errorText = yield response.text();
+            return __spreadProps(__spreadValues({}, baseResult), {
+              error: errorText,
+              status: "error",
+              time: Date.now() - startTime,
+              headers: response.headers
+            });
+          }
+          const contentType = response.headers.get("content-type");
+          if (!(contentType != null && contentType.includes("application/json")))
+            return __spreadProps(__spreadValues({}, baseResult), {
+              error: "Endpoint did not return JSON",
+              status: "error",
+              time: Date.now() - startTime,
+              headers: response.headers
+            });
+          const jsonData = yield response.json();
+          return cacheAllowed && apiFetcherCache.set(cacheKey, jsonData, cacheTTL), __spreadProps(__spreadValues({}, baseResult), {
+            data: jsonData,
+            status: "success",
+            time: Date.now() - startTime,
+            headers: response.headers
+          });
+        } finally {
+          pendingRequests.delete(cacheKey);
+        }
       });
+      return pendingRequests.set(cacheKey, requestPromise), yield requestPromise;
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       return __spreadProps(__spreadValues({}, baseResult), {
@@ -98,5 +116,8 @@ function apiFetcher(input, options) {
 }
 __name(apiFetcher, "apiFetcher");
 export {
-  apiFetcher
+  apiFetcher,
+  apiFetcherCache,
+  apiFetcherClearPendingRequests,
+  apiFetcherGetPendingRequestsCount
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aptechka",
-  "version": "0.92.4",
+  "version": "0.92.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/denisavitski/aptechka.git"