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

package/lib/ngw-connector.global.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 */
 var NgwConnector = (function () {
   'use strict';
 
@@ -776,7 +776,7 @@ var NgwConnector = (function () {
 
   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",
@@ -1172,7 +1172,7 @@ var NgwConnector = (function () {
   }
   function request(path, options, cacheEngine) {
     return __async$3(this, null, function* () {
-      var _b;
+      var _b, _c;
       const defaults = {
         method: "GET",
         credentials: "same-origin",
@@ -1197,6 +1197,7 @@ var NgwConnector = (function () {
         "query",
         "json"
       ]);
+      opt.method = (_b = opt.method) == null ? void 0 : _b.toUpperCase();
       if (withCredentials) {
         opt.credentials = "include";
       }
@@ -1254,15 +1255,24 @@ var NgwConnector = (function () {
         }
         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();
     });
@@ -1567,12 +1577,16 @@ var NgwConnector = (function () {
       __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 {
@@ -1633,19 +1647,9 @@ var NgwConnector = (function () {
           }
         }
         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 })
         );
       });
     }
@@ -1666,6 +1670,7 @@ var NgwConnector = (function () {
       removeConnector(this);
       this.options.auth = void 0;
       this.user = void 0;
+      this.routeCache.clean();
       this.clearCache();
       this.emitter.emit("logout");
     }
@@ -1772,7 +1777,7 @@ var NgwConnector = (function () {
             this._cleanActiveRequest(id);
           }
         });
-        if (method === "GET") {
+        if (method === "GET" && cache !== false) {
           const cacheOptions = cacheProps ? cacheProps : __spreadProps$1(__spreadValues$1({}, objectRemoveEmpty({
             headers,
             withCredentials,