@nextgis/ngw-connector 3.0.0-alpha.13 → 3.0.0-alpha.16

package/lib/ngw-connector.esm-bundler.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-connector; version: 3.0.0-alpha.13; author: NextGIS */
+/** Bundle of @nextgis/ngw-connector; version: 3.0.0-alpha.16; author: NextGIS */
 import { isObject as isObject$1, objectRemoveEmpty, fixUrlStr, objectDeepEqual, defined } from '@nextgis/utils';
 import Cache from '@nextgis/cache';
 import { EventEmitter } from 'events';
@@ -105,7 +105,7 @@ function apiRequest(opt) {
 
 var pkg = {
 	name: "@nextgis/ngw-connector",
-	version: "3.0.0-alpha.13",
+	version: "3.0.0-alpha.16",
 	_priority: 12,
 	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
 	main: "index.js",
@@ -501,7 +501,7 @@ function generateUrl(path, query) {
 }
 function request(path, options, cacheEngine) {
   return __async$3(this, null, function* () {
-    var _b;
+    var _b, _c;
     const defaults = {
       method: "GET",
       credentials: "same-origin",
@@ -526,6 +526,7 @@ function request(path, options, cacheEngine) {
       "query",
       "json"
     ]);
+    opt.method = (_b = opt.method) == null ? void 0 : _b.toUpperCase();
     if (withCredentials) {
       opt.credentials = "include";
     }
@@ -583,15 +584,24 @@ function request(path, options, cacheEngine) {
       }
       return body;
     });
-    if (cacheEngine && cache !== false && ((_b = opt.method) == null ? void 0 : _b.toUpperCase()) === "GET") {
-      const props = cacheProps ? cacheProps : __spreadValues$3({}, objectRemoveEmpty({
-        withCredentials,
-        responseType
-      }));
-      return cacheEngine.add(cacheName || url, makeRequest, {
-        props,
-        expirationTime: cache ? void 0 : 500
-      });
+    if (cacheEngine) {
+      if (((_c = opt.method) == null ? void 0 : _c.toUpperCase()) === "GET") {
+        if (cache !== false) {
+          const props = cacheProps ? cacheProps : __spreadValues$3({}, objectRemoveEmpty({
+            withCredentials,
+            responseType
+          }));
+          return cacheEngine.add(cacheName || url, makeRequest, {
+            props,
+            expirationTime: cache ? void 0 : 500
+          });
+        }
+      } else {
+        const ignoredForClean = ["api/feature_layer/identify"];
+        if (ignoredForClean.every((part) => !path.includes(part))) {
+          cacheEngine.clean();
+        }
+      }
     }
     return makeRequest();
   });
@@ -896,12 +906,16 @@ class NgwConnector {
     __publicField$2(this, "user");
     __publicField$2(this, "cache");
     __publicField$2(this, "withCredentials");
+    // Dedicated cache for route requests, as these are executed before any other requests.
+    // This cache does not need to be cleared during the session.
+    __publicField$2(this, "routeCache");
     __publicField$2(this, "client", `NextGIS-NGW-Connector/${pkg.version}`);
     __publicField$2(this, "routeStr", "/api/component/pyramid/route");
     __publicField$2(this, "activeRequests", {});
     __publicField$2(this, "requestTransform");
     const exist = findConnector(options);
     this.cache = new Cache({ namespace: options.cacheId });
+    this.routeCache = new Cache({ namespace: "routecache" });
     if (exist) {
       return exist;
     } else {
@@ -962,19 +976,9 @@ class NgwConnector {
         }
       }
       const routeUrl = `${this.routeStr}?client=${this.client}`;
-      return this.makeQuery(
-        routeUrl,
-        {},
-        {
-          cacheName: "route",
-          signal,
-          cache: true,
-          cacheProps: {
-            id: this.id,
-            auth,
-            baseUrl: this.options.baseUrl
-          }
-        }
+      return this.routeCache.add(
+        this.options.baseUrl || String(this.id),
+        () => this.makeQuery(routeUrl, null, { signal, cache: false })
       );
     });
   }
@@ -995,6 +999,7 @@ class NgwConnector {
     removeConnector(this);
     this.options.auth = void 0;
     this.user = void 0;
+    this.routeCache.clean();
     this.clearCache();
     this.emitter.emit("logout");
   }
@@ -1101,7 +1106,7 @@ class NgwConnector {
           this._cleanActiveRequest(id);
         }
       });
-      if (method === "GET") {
+      if (method === "GET" && cache !== false) {
         const cacheOptions = cacheProps ? cacheProps : __spreadProps$1(__spreadValues$1({}, objectRemoveEmpty({
           headers,
           withCredentials,