@nextgis/ngw-connector 2.5.0 → 3.0.0-alpha.1

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

@@ -1,12 +1,11 @@
-/** Bundle of @nextgis/ngw-connector; version: 2.5.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-connector; version: 3.0.0-alpha.1; author: NextGIS */
 import { EventEmitter } from 'events';
 import Cache from '@nextgis/cache';
-import CancelablePromise from '@nextgis/cancelable-promise';
 import { objectDeepEqual, defined, objectRemoveEmpty, fixUrlStr } from '@nextgis/utils';
 
-var __defProp$5 = Object.defineProperty;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$5 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$6 = Object.defineProperty;
+var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$5 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
 class NgwError extends Error {
   constructor(er) {
     super();
@@ -23,9 +22,9 @@ class NgwError extends Error {
   }
 }
 
-var __defProp$4 = Object.defineProperty;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$4 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$5 = Object.defineProperty;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$4 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
 class ResourceNotFoundError extends NgwError {
   constructor(obj) {
     super(obj);
@@ -64,27 +63,24 @@ function resourceToQuery(resource, prefix = "") {
   return query;
 }
 
-var __defProp$3 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$1 = (a, b) => {
+var __defProp$4 = Object.defineProperty;
+var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
+var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
+var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$2 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$1.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
-  if (__getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(b)) {
-      if (__propIsEnum$1.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
+    if (__hasOwnProp$2.call(b, prop))
+      __defNormalProp$4(a, prop, b[prop]);
+  if (__getOwnPropSymbols$2)
+    for (var prop of __getOwnPropSymbols$2(b)) {
+      if (__propIsEnum$2.call(b, prop))
+        __defNormalProp$4(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __publicField$3 = (obj, key, value) => __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async = (__this, __arguments, generator) => {
+var __publicField$3 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __async$2 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -125,39 +121,27 @@ class ResourcesControl {
    * Fetching resource would be cached to speed up next call
    */
   getOne(resource, requestOptions) {
-    const cache = this.cache;
-    const forCache = {};
-    const opt = __spreadProps(__spreadValues$1({}, requestOptions), { cache: false });
-    if (typeof resource === "string") {
-      forCache.keyname = resource;
-    } else if (typeof resource === "number") {
-      forCache.id = resource;
-    } else if (isObject(resource)) {
+    const opt = __spreadValues$2({}, requestOptions);
+    if (typeof resource === "string") ; else if (typeof resource === "number") ; else if (isObject(resource)) {
       if (resource.id !== void 0) {
-        forCache.id = resource.id;
+        resource.id;
       } else {
         if (resource.keyname) {
-          forCache.keyname = resource.keyname;
+          resource.keyname;
         }
         if (resource.display_name) {
-          forCache.display_name = resource.display_name;
+          resource.display_name;
         }
       }
     }
-    const makeRequest = () => {
-      if (typeof resource === "string") {
-        return this._fetchResourceBy({ keyname: resource }, opt);
-      } else if (typeof resource === "number") {
-        return this._fetchResourceById(resource, opt);
-      } else if (isObject(resource)) {
-        return this._fetchResourceBy(resource, opt);
-      }
-      return CancelablePromise.resolve(void 0);
-    };
-    if (requestOptions == null ? void 0 : requestOptions.cache) {
-      return cache.addFull("resource", makeRequest, forCache);
+    if (typeof resource === "string") {
+      return this._fetchResourceBy({ keyname: resource }, opt);
+    } else if (typeof resource === "number") {
+      return this._fetchResourceById(resource, opt);
+    } else if (isObject(resource)) {
+      return this._fetchResourceBy(resource, opt);
     }
-    return makeRequest();
+    return Promise.resolve(void 0);
   }
   getOneOrFail(resource, requestOptions) {
     return this.getOne(resource, requestOptions).then((res) => {
@@ -179,7 +163,7 @@ class ResourcesControl {
    */
   getId(resource, requestOptions) {
     if (typeof resource === "number") {
-      return CancelablePromise.resolve(resource);
+      return Promise.resolve(resource);
     } else if (typeof resource === "string" || isObject(resource)) {
       return this.getOne(resource, requestOptions).then((res) => {
         if (res) {
@@ -187,7 +171,7 @@ class ResourcesControl {
         }
       });
     }
-    return CancelablePromise.resolve(void 0);
+    return Promise.resolve(void 0);
   }
   /**
    * A fast way to retrieve resource ID for any resource definition.
@@ -214,12 +198,12 @@ class ResourcesControl {
         } else {
           Object.assign(query, resourceToQuery(resource));
         }
-        return this.connector.get("resource.search", requestOptions, __spreadValues$1({
+        return this.connector.get("resource.search", requestOptions, __spreadValues$2({
           serialization: "full"
         }, query)).then((resources) => {
-          if (resources) {
+          if ((requestOptions == null ? void 0 : requestOptions.cache) && resources) {
             for (const x of resources) {
-              this.cache.add("resource.item", CancelablePromise.resolve(x), {
+              this.cache.add("resource.item", Promise.resolve(x), {
                 id: x.resource.id
               });
             }
@@ -235,7 +219,7 @@ class ResourcesControl {
       if (child) {
         return this.getOne(child.resource.parent.id, requestOptions);
       }
-      return CancelablePromise.resolve(void 0);
+      return Promise.resolve(void 0);
     });
   }
   getChildrenOf(resource, requestOptions) {
@@ -265,18 +249,16 @@ class ResourcesControl {
     });
   }
   _getChildrenOf(parent, requestOptions, _items = []) {
-    return this.connector.get(
-      "resource.collection",
-      __spreadValues$1({ cache: true }, requestOptions),
-      {
-        parent
-      }
-    ).then((items) => {
+    return this.connector.get("resource.collection", requestOptions, {
+      parent
+    }).then((items) => {
       const recursivePromises = [];
       for (const item of items) {
-        this.cache.add("resource.item", CancelablePromise.resolve(item), {
-          id: item.resource.id
-        });
+        if (requestOptions == null ? void 0 : requestOptions.cache) {
+          this.cache.add("resource.item", Promise.resolve(item), {
+            id: item.resource.id
+          });
+        }
         _items.push(item);
         if ((requestOptions == null ? void 0 : requestOptions.recursive) && item.resource.children) {
           recursivePromises.push(
@@ -285,7 +267,7 @@ class ResourcesControl {
         }
       }
       if (recursivePromises.length) {
-        return CancelablePromise.all(recursivePromises).then(() => {
+        return Promise.all(recursivePromises).then(() => {
           return _items;
         });
       }
@@ -293,11 +275,12 @@ class ResourcesControl {
     });
   }
   _cleanResourceItemCache(id) {
-    return __async(this, null, function* () {
+    return __async$2(this, null, function* () {
+      var _a;
       const all = this.cache.all();
       const toDelete = [];
       for (const c of all) {
-        const cid = c.options && c.options.id;
+        const cid = (_a = c.props) == null ? void 0 : _a.id;
         if (["resource.item", "resource"].includes(c.key) && cid !== void 0) {
           if (typeof cid === "number") {
             if (cid === id) {
@@ -317,18 +300,7 @@ class ResourcesControl {
     });
   }
   _fetchResourceById(id, requestOptions) {
-    const promise = () => this.connector.get("resource.item", requestOptions, { id });
-    if (requestOptions == null ? void 0 : requestOptions.cache) {
-      return this.cache.add("resource.item", promise, {
-        id
-      }).catch((er) => {
-        if (!(er instanceof ResourceNotFoundError)) {
-          throw er;
-        }
-        return void 0;
-      });
-    }
-    return promise();
+    return this.connector.get("resource.item", requestOptions, { id });
   }
   _fetchResourceBy(resource, requestOptions) {
     return this.getMany(resource, requestOptions).then((resources) => {
@@ -336,7 +308,7 @@ class ResourcesControl {
     });
   }
   _resourceCacheFilter(resource) {
-    return CancelablePromise.all(this.cache.matchAll("resource.item")).then(
+    return Promise.all(this.cache.matchAll("resource.item")).then(
       (resources) => {
         const items = [];
         resources.filter((x) => {
@@ -380,9 +352,16 @@ function removeConnector(connector) {
   }
 }
 
-var __defProp$2 = Object.defineProperty;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$2 = (obj, key, value) => __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
+class AbortError extends Error {
+  constructor(message = "AbortError") {
+    super(message);
+    this.name = "AbortError";
+  }
+}
+
+var __defProp$3 = Object.defineProperty;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$2 = (obj, key, value) => __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
 class InsufficientPermissionsError extends NgwError {
   constructor(obj) {
     super(obj);
@@ -405,58 +384,90 @@ function template(str, data) {
   });
 }
 
+var __defProp$2 = Object.defineProperty;
+var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
+var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
+var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$1 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$1.call(b, prop))
+      __defNormalProp$2(a, prop, b[prop]);
+  if (__getOwnPropSymbols$1)
+    for (var prop of __getOwnPropSymbols$1(b)) {
+      if (__propIsEnum$1.call(b, prop))
+        __defNormalProp$2(a, prop, b[prop]);
+    }
+  return a;
+};
+var __async$1 = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 function apiRequest(opt) {
-  const params = opt.params;
-  return new CancelablePromise((resolve, reject) => {
-    return opt.connector.connect().then((apiItems) => {
-      let apiItem = apiItems && apiItems[opt.name];
-      if (apiItem) {
-        apiItem = [...apiItem];
-        let url = apiItem.shift();
-        if (apiItem.length) {
-          const replaceParams = {};
-          for (let fry = 0; fry < apiItem.length; fry++) {
-            const arg = apiItem[fry];
-            replaceParams[fry] = "{" + arg + "}";
-            if (params[arg] === void 0) {
-              throw new Error(
-                "`" + arg + "` url api argument is not specified"
-              );
-            }
-          }
-          if (url) {
-            url = template(url, replaceParams);
+  return __async$1(this, null, function* () {
+    const { params, name, connector, requestOptions } = opt;
+    const apiItems = yield connector.connect();
+    let apiItem = apiItems && apiItems[name];
+    if (apiItem) {
+      apiItem = [...apiItem];
+      let url = apiItem.shift();
+      if (apiItem.length) {
+        const replaceParams = {};
+        for (let fry = 0; fry < apiItem.length; fry++) {
+          const arg = apiItem[fry];
+          replaceParams[fry] = `{${arg}}`;
+          if (params[arg] === void 0) {
+            throw new Error(`\`${arg}\` URL API argument is not specified`);
           }
         }
-        if (params) {
-          const paramArray = [];
-          const paramList = params.paramList;
-          if (Array.isArray(paramList)) {
-            delete params.paramList;
-            paramList.forEach((x) => {
-              paramArray.push(`${x[0]}=${x[1]}`);
-            });
-          }
-          for (const p in params) {
-            if (apiItem.indexOf(p) === -1) {
-              paramArray.push(`${p}=${params[p]}`);
-            }
-          }
-          if (paramArray.length) {
-            url = url + "?" + paramArray.join("&");
+        if (url) {
+          url = template(url, replaceParams);
+        }
+      }
+      if (params) {
+        const paramArray = [];
+        const paramList = params.paramList;
+        if (Array.isArray(paramList)) {
+          paramList.forEach(([key, value]) => {
+            paramArray.push(`${key}=${value}`);
+          });
+        }
+        for (const p in params) {
+          if (apiItem.indexOf(p) === -1) {
+            paramArray.push(`${p}=${params[p]}`);
           }
         }
-        if (url) {
-          resolve(opt.connector.makeQuery(url, params, opt.requestOptions));
-        } else {
-          reject(new Error("request url is not set"));
+        if (paramArray.length) {
+          url = `${url}?${paramArray.join("&")}`;
         }
+      }
+      if (url) {
+        return connector.makeQuery(url, params, __spreadValues$1({
+          cacheName: name
+        }, requestOptions));
       } else {
-        resolve(void 0);
+        throw new Error("Request URL is not set");
       }
-    }).catch((er) => {
-      reject(er);
-    });
+    } else {
+      return void 0;
+    }
   });
 }
 
@@ -556,6 +567,8 @@ let loadData;
 }
 
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
@@ -571,8 +584,42 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 let ID = 0;
+let REQUEST_ID = 0;
 class NgwConnector {
   constructor(options) {
     this.options = options;
@@ -583,7 +630,7 @@ class NgwConnector {
     __publicField(this, "cache");
     __publicField(this, "withCredentials");
     __publicField(this, "routeStr", "/api/component/pyramid/route");
-    __publicField(this, "activeRequests", []);
+    __publicField(this, "activeRequests", {});
     __publicField(this, "requestTransform");
     const exist = findConnector(options);
     this.cache = new Cache({ namespace: options.cacheId });
@@ -644,29 +691,27 @@ class NgwConnector {
    * ```
    */
   connect() {
-    const auth = this.options.auth;
-    const makeConnect = () => new CancelablePromise((resolve, reject) => {
-      const makeQuery = () => {
-        return this.makeQuery(this.routeStr, {}, {}).then((route) => {
-          resolve(route);
-        }).catch((er) => {
-          reject(er);
-        });
-      };
+    return __async(this, null, function* () {
+      const auth = this.options.auth;
       if (auth) {
         const { login, password } = auth;
         if (login && password) {
-          return this._login({ login, password }).then(() => {
-            return makeQuery();
-          }).catch((er) => reject(er));
+          yield this._login({ login, password });
         }
       }
-      return makeQuery();
-    });
-    return this.cache.add("route", makeConnect, {
-      id: this.id,
-      auth,
-      baseUrl: this.options.baseUrl
+      return yield this.makeQuery(
+        this.routeStr,
+        {},
+        {
+          cacheName: "route",
+          cache: true,
+          cacheProps: {
+            id: this.id,
+            auth,
+            baseUrl: this.options.baseUrl
+          }
+        }
+      );
     });
   }
   /**
@@ -690,20 +735,22 @@ class NgwConnector {
     this.emitter.emit("logout");
   }
   getUserInfo(credentials, options) {
-    if (this.user && this.user.id) {
-      return CancelablePromise.resolve(this.user);
-    }
-    if (credentials) {
-      this.options.auth = credentials;
-    }
-    const options_ = __spreadValues({
-      headers: this.getAuthorizationHeaders(credentials)
-    }, options);
-    return this.makeQuery(
-      "/api/component/auth/current_user",
-      {},
-      options_
-    );
+    return __async(this, null, function* () {
+      if (this.user && this.user.id) {
+        return this.user;
+      }
+      if (credentials) {
+        this.options.auth = credentials;
+      }
+      const options_ = __spreadValues({
+        headers: this.getAuthorizationHeaders(credentials)
+      }, options);
+      return this.makeQuery(
+        "/api/component/auth/current_user",
+        {},
+        options_
+      );
+    });
   }
   /**
    * Obtaining the required Headers for authentication of requests in the NGW.
@@ -712,7 +759,7 @@ class NgwConnector {
     const client = this.makeClientId(credentials);
     if (client) {
       return {
-        Authorization: "Basic " + client
+        Authorization: `Basic ${client}`
       };
     }
   }
@@ -720,21 +767,22 @@ class NgwConnector {
     credentials = credentials || this.options.auth;
     if (credentials) {
       const { login, password } = credentials;
-      const str = unescape(encodeURIComponent(`${login}:${password}`));
+      const str = `${login}:${password}`;
+      const encodedStr = encodeURIComponent(str);
       {
-        return window.btoa(str);
+        return window.btoa(encodedStr);
       }
     }
   }
   /** Stop all api requests */
   abort() {
-    for (const req of this.activeRequests) {
-      req.cancel();
+    for (const abortController of Object.values(this.activeRequests)) {
+      abortController.abort();
     }
-    this.activeRequests = [];
+    this.activeRequests = {};
   }
   getActiveApiRequests() {
-    return [...this.activeRequests];
+    return __spreadValues({}, this.activeRequests);
   }
   /**
    * Send request to NGW api router.
@@ -766,26 +814,10 @@ class NgwConnector {
    * ```
    */
   apiRequest(name, params_ = {}, requestOptions = {}) {
-    var _a, _b;
-    requestOptions = __spreadValues({
-      withCredentials: this.withCredentials
-    }, requestOptions);
-    const { method, headers, withCredentials, responseType } = requestOptions;
+    var _a;
     params_ = (_a = requestOptions.params) != null ? _a : params_;
     const params = objectRemoveEmpty(params_);
-    const makeApiRequest = () => apiRequest({ name, params, requestOptions, connector: this });
-    if (requestOptions.cache && method === "GET") {
-      return this.cache.add(name, makeApiRequest, __spreadValues({
-        params
-      }, objectRemoveEmpty({
-        headers,
-        withCredentials,
-        responseType,
-        baseUrl: this.options.baseUrl,
-        userId: (_b = this.user) == null ? void 0 : _b.id
-      })));
-    }
-    return makeApiRequest();
+    return apiRequest({ name, params, requestOptions, connector: this });
   }
   /**
    * Shortcut method for send POST request to NGW.
@@ -875,17 +907,68 @@ class NgwConnector {
    * @param params - Query params
    * @param options - Request options
    */
-  makeQuery(url, params, options = {}) {
-    url = (this.options.baseUrl ? this.options.baseUrl : "") + url;
-    if (url) {
+  makeQuery(_0, _1) {
+    return __async(this, arguments, function* (url, params, options = {}) {
+      var _b;
+      url = (this.options.baseUrl ? this.options.baseUrl : "") + url;
+      if (!url) {
+        throw new Error("Empty `url` not allowed");
+      }
       if (params) {
-        url = template(url, params);
+        const _a = params, restParams = __objRest(_a, ["paramList"]);
+        url = template(url, restParams);
       }
       url = encodeURI(fixUrlStr(url));
-      return this._loadData(url, options);
-    } else {
-      throw new Error("Empty `url` not allowed");
-    }
+      options = __spreadValues({ withCredentials: this.withCredentials }, options);
+      const {
+        cache,
+        signal: externalSignal,
+        method = "GET",
+        headers,
+        cacheName,
+        cacheProps,
+        responseType,
+        withCredentials
+      } = options;
+      const internalAbortController = new AbortController();
+      const internalSignal = internalAbortController.signal;
+      if (externalSignal) {
+        if (externalSignal.aborted) {
+          throw new AbortError();
+        }
+        externalSignal.addEventListener("abort", () => {
+          internalAbortController.abort();
+        });
+      }
+      options.signal = internalSignal;
+      const createPromise = () => __async(this, null, function* () {
+        const id = REQUEST_ID++;
+        this.activeRequests[id] = internalAbortController;
+        try {
+          return this._loadData(url, options);
+        } finally {
+          this._cleanActiveRequest(id);
+        }
+      });
+      if (cache && method === "GET") {
+        const cacheOptions = cacheProps ? cacheProps : __spreadProps(__spreadValues({}, objectRemoveEmpty({
+          headers,
+          withCredentials,
+          responseType,
+          baseUrl: this.options.baseUrl,
+          userId: (_b = this.user) == null ? void 0 : _b.id
+        })), {
+          params
+        });
+        return this.cache.add(
+          cacheName || url,
+          createPromise,
+          cacheOptions,
+          false
+        );
+      }
+      return createPromise();
+    });
   }
   // -------------------------------------------------------------------------
   // Resource Methods
@@ -967,10 +1050,8 @@ class NgwConnector {
    */
   _loadData(url, options) {
     options.responseType = options.responseType || "json";
-    if (options.signal && options.signal.aborted) {
-      return CancelablePromise.reject(new CancelablePromise.CancelError());
-    }
-    const request = new CancelablePromise((resolve, reject, onCancel) => {
+    return new Promise((resolve, reject) => {
+      var _a;
       if (this.user) {
         options = options || {};
         options.headers = __spreadValues(__spreadValues({}, this.getAuthorizationHeaders()), options.headers);
@@ -980,13 +1061,18 @@ class NgwConnector {
         url = transUrl;
         options = transOptions;
       }
-      loadData(url, resolve, options, reject, onCancel);
-    }).then((resp) => {
-      this._cleanActiveRequests(request);
-      return resp;
+      let runOnAbort = void 0;
+      loadData(url, resolve, options, reject, (handler) => {
+        runOnAbort = handler;
+      });
+      (_a = options.signal) == null ? void 0 : _a.addEventListener("abort", () => {
+        if (runOnAbort !== void 0) {
+          runOnAbort();
+        }
+        reject(new AbortError());
+      });
     }).catch((httpError) => {
-      this._cleanActiveRequests(request);
-      if (httpError instanceof CancelablePromise.CancelError) ; else {
+      if (httpError.name !== "AbortError") {
         if (!!(process.env.NODE_ENV !== "production")) {
           console.warn("DEV WARN", httpError);
         }
@@ -995,31 +1081,24 @@ class NgwConnector {
           throw er;
         }
       }
+      throw httpError;
     });
-    if (options.signal && typeof options.signal.addEventListener === "function") {
-      options.signal.addEventListener("abort", () => {
-        request.cancel();
-        this._cleanActiveRequests(request);
-      });
-    }
-    this.activeRequests.push(request);
-    return request;
   }
   _login(credentials, options) {
-    return this.getUserInfo(credentials, options).then((data) => {
-      this.user = data;
-      this.emitter.emit("login", data);
-      return data;
-    }).catch((er) => {
-      this.emitter.emit("login:error", er);
-      throw er;
+    return __async(this, null, function* () {
+      try {
+        const data = yield this.getUserInfo(credentials, options);
+        this.user = data;
+        this.emitter.emit("login", data);
+        return data;
+      } catch (er) {
+        this.emitter.emit("login:error", er);
+        throw er;
+      }
     });
   }
-  _cleanActiveRequests(request) {
-    const activeRequestIndex = this.activeRequests.indexOf(request);
-    if (activeRequestIndex !== -1) {
-      this.activeRequests.splice(activeRequestIndex, 1);
-    }
+  _cleanActiveRequest(requestId) {
+    delete this.activeRequests[requestId];
   }
   _handleHttpError(er) {
     if (er) {