bruce-models 1.9.9 → 2.0.1

package/dist/bruce-models.umd.js

@@ -153,7 +153,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -180,7 +184,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(type), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(type),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -225,7 +233,11 @@
                         rej(err);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(id), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(id),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -255,7 +267,11 @@
                         forms: data.Items
                     };
                 });
-                api.Cache.Set(GetListCacheKey(typeId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(typeId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -535,6 +551,20 @@
             }
             return this.Cache.Get(key);
         }
+        SetCacheItem(params) {
+            let { key, value, duration, req } = params;
+            let noCache = req === null || req === void 0 ? void 0 : req.noCache;
+            if (noCache == null) {
+                noCache = exports.Api.DEFAULT_NO_CACHE;
+            }
+            if (noCache) {
+                return;
+            }
+            if (isNaN(duration)) {
+                duration = exports.Api.DEFAULT_CACHE_DURATION;
+            }
+            this.Cache.Set(key, value, duration);
+        }
         GetSessionId() {
             return this.ssid;
         }
@@ -738,7 +768,11 @@
                 const resData = {
                     account: req
                 };
-                api.Cache.Set(GetCacheKey(id), resData, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(id),
+                    value: resData,
+                    req: reqParams
+                });
                 return resData;
             });
         }
@@ -763,7 +797,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(api.GetSessionId()), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(api.GetSessionId()),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -789,7 +827,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(id, appId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(id, appId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -854,7 +896,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetDbRegionListCacheKey(), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetDbRegionListCacheKey(),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -1154,31 +1200,35 @@
                                 }
                                 this.baseUrl = endpoint;
                             }
-                            const api = new BruceApi.Api({
-                                accountId: this.accountId,
-                                cam: cam,
-                                env: this.env,
-                                // Must be false.
-                                // Else we get stuck in nested init loop.
-                                loadConfig: false
-                            });
-                            // CDN urls.
-                            const region = (yield exports.Account.GetDbRegions({
-                                api,
-                                key: settings.DBServer
-                            })).regions[0];
-                            if (region === null || region === void 0 ? void 0 : region.CDN) {
-                                this.EntityCdnUrl = (_b = region.CDN.entityURL) === null || _b === void 0 ? void 0 : _b[env];
-                                // We need to fix our configs.
-                                if (this.EntityCdnUrl) {
-                                    if (this.EntityCdnUrl.includes("entitiesListForCDN")) {
-                                        this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", this.accountId);
-                                    }
-                                    else {
-                                        this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", "entitiesListForCDN/" + this.accountId);
+                            if (settings.DBLocation) {
+                                const dbLocation = settings.DBLocation.trim();
+                                const api = new BruceApi.Api({
+                                    accountId: this.accountId,
+                                    cam: cam,
+                                    env: this.env,
+                                    // Must be false.
+                                    // Else we get stuck in nested init loop.
+                                    loadConfig: false
+                                });
+                                // CDN urls.
+                                const regions = (yield exports.Account.GetDbRegions({
+                                    api,
+                                    key: dbLocation
+                                })).regions;
+                                const region = regions.find(x => { var _a; return ((_a = x.key) === null || _a === void 0 ? void 0 : _a.trim()) == dbLocation; });
+                                if (region === null || region === void 0 ? void 0 : region.CDN) {
+                                    this.EntityCdnUrl = (_b = region.CDN.entityURL) === null || _b === void 0 ? void 0 : _b[env];
+                                    // We need to fix our configs.
+                                    if (this.EntityCdnUrl) {
+                                        if (this.EntityCdnUrl.includes("entitiesListForCDN")) {
+                                            this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", this.accountId);
+                                        }
+                                        else {
+                                            this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", "entitiesListForCDN/" + this.accountId);
+                                        }
                                     }
+                                    this.LegacyTilesetCdnUrl = (_c = region.CDN.legacyTilesetURL) === null || _c === void 0 ? void 0 : _c[env];
                                 }
-                                this.LegacyTilesetCdnUrl = (_c = region.CDN.legacyTilesetURL) === null || _c === void 0 ? void 0 : _c[env];
                             }
                         }
                         catch (e) {
@@ -1711,7 +1761,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -1761,7 +1815,11 @@
                             }
                             res(null);
                         }));
-                        api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                        api.SetCacheItem({
+                            key,
+                            value: prom,
+                            req: reqParams
+                        });
                         reqs.push(prom);
                     }
                 }
@@ -1970,9 +2028,13 @@
                     for (let i = 0; i < entities.length; i++) {
                         const entity = entities[i];
                         const id = entity.Bruce.ID;
-                        api.Cache.Set(GetCacheKey(id), {
-                            entity: entity
-                        }, exports.Api.DEFAULT_CACHE_DURATION);
+                        api.SetCacheItem({
+                            key: GetCacheKey(id),
+                            value: {
+                                entity: entity
+                            },
+                            req: reqParams
+                        });
                     }
                 }
                 return {
@@ -2912,7 +2974,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3001,7 +3067,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(entityId), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(entityId),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3081,7 +3151,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(entityId), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(entityId),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3146,7 +3220,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(entityId), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(entityId),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3207,7 +3285,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(url), req, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(url),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3248,7 +3330,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetEntityListKey(entityId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetEntityListKey(entityId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -3280,7 +3366,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetTypeListKey(typeId, group), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetTypeListKey(typeId, group),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -3346,7 +3436,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3372,7 +3466,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(id), req);
+                api.SetCacheItem({
+                    key: GetCacheKey(id),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3437,7 +3535,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -3472,7 +3574,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3578,7 +3684,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(entityId, filter), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(entityId, filter),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3604,7 +3714,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetEntityCacheKey(entityId), prom);
+                api.SetCacheItem({
+                    key: GetEntityCacheKey(entityId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -3800,7 +3914,11 @@
                                 rej(e);
                             }
                         }));
-                        api.Cache.Set(GetCacheKey(id), req, exports.Api.DEFAULT_CACHE_DURATION);
+                        api.SetCacheItem({
+                            key: GetCacheKey(id),
+                            value: req,
+                            req: reqParams
+                        });
                         reqs.push(req);
                     }
                 }
@@ -3828,7 +3946,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(entityTypeId), req, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(entityTypeId),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3891,7 +4013,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -3926,7 +4052,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), req, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -4360,7 +4490,10 @@
                                     sortOrder: exports.Api.ESortOrder.Asc,
                                     entityTypeConditions: this.attrFilter
                                 },
-                                viaCdn: this.viaCdn
+                                viaCdn: this.viaCdn,
+                                req: {
+                                    noCache: true
+                                }
                             });
                             const integrity = this.getIntegrityId();
                             if (loopIntegrity == integrity && entities) {
@@ -4556,7 +4689,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(entityId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(entityId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -4802,7 +4939,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -5029,7 +5170,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -5052,7 +5197,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), req, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -5151,7 +5300,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(tilesetId, loadFiles), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(tilesetId, loadFiles),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -5205,7 +5358,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), req, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -5440,7 +5597,11 @@
                             rej(e);
                         }
                     }));
-                    api.Cache.Set(GetCacheKey(accountId, tilesetId), prom);
+                    api.SetCacheItem({
+                        key: GetCacheKey(accountId, tilesetId),
+                        value: prom,
+                        req: reqParams
+                    });
                     return prom;
                 });
             }
@@ -5466,7 +5627,11 @@
                             rej(e);
                         }
                     }));
-                    api.Cache.Set(GetCacheKey(accountId), req);
+                    api.SetCacheItem({
+                        key: GetCacheKey(accountId),
+                        value: req,
+                        req: reqParams
+                    });
                     return req;
                 });
             }
@@ -5642,7 +5807,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -5683,7 +5852,11 @@
                                     bookmark: item
                                 });
                             });
-                            api.Cache.Set(GetCacheKey(viewId, item.ID), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                            api.SetCacheItem({
+                                key: GetCacheKey(viewId, item.ID),
+                                value: prom,
+                                req: reqParams
+                            });
                         }
                         res({
                             bookmarks: items
@@ -5693,7 +5866,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(viewId), req, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(viewId),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -5769,7 +5946,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -5792,7 +5973,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -6111,7 +6296,11 @@
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(), res, exports.Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetListCacheKey(),
+                value: res,
+                req: reqParams
+            });
             return res;
         }
         Style.GetList = GetList;
@@ -6135,7 +6324,11 @@
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetCacheKey(id), prom, exports.Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetCacheKey(id),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         }
         Style.Get = Get;
@@ -6214,7 +6407,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -6429,7 +6626,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(id, accountId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(id, accountId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -6505,7 +6706,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetSettingsCacheKey(userId, appId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetSettingsCacheKey(userId, appId),
+                    value: prom,
+                    req: req
+                });
                 return prom;
             });
         }
@@ -6582,7 +6787,11 @@
                             rej(e);
                         }
                     }));
-                    api.Cache.Set(GetEmailCacheKey(email, accountId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                    api.SetCacheItem({
+                        key: GetEmailCacheKey(email, accountId),
+                        value: prom,
+                        req: reqParams
+                    });
                     return prom;
                 });
             }
@@ -6614,13 +6823,21 @@
                     req.then((data) => {
                         const users = data.users;
                         for (let i = 0; i < users.length; i++) {
-                            api.Cache.Set(GetCacheKey(users[i].ID, accountId), {
-                                user: users[i]
+                            api.SetCacheItem({
+                                key: GetCacheKey(users[i].ID, accountId),
+                                value: {
+                                    user: users[i]
+                                },
+                                req: reqParams
                             });
                         }
                     });
                     if (!exclusive) {
-                        api.Cache.Set(GetListCacheKey(accountId), req, exports.Api.DEFAULT_CACHE_DURATION);
+                        api.SetCacheItem({
+                            key: GetListCacheKey(accountId),
+                            value: req,
+                            req: reqParams
+                        });
                     }
                     return req;
                 });
@@ -6768,12 +6985,20 @@
                     req.then((data) => {
                         const users = data.tokens;
                         for (let i = 0; i < users.length; i++) {
-                            api.Cache.Set(GetCacheKey(users[i].ID, accountId), {
-                                user: users[i]
+                            api.SetCacheItem({
+                                key: GetCacheKey(users[i].ID, accountId),
+                                value: {
+                                    user: users[i]
+                                },
+                                req: reqParams
                             });
                         }
                     });
-                    api.Cache.Set(GetListCacheKey(accountId), req, exports.Api.DEFAULT_CACHE_DURATION);
+                    api.SetCacheItem({
+                        key: GetListCacheKey(accountId),
+                        value: req,
+                        req: reqParams
+                    });
                     return req;
                 });
             }
@@ -7067,7 +7292,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(type, pageIndex), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(type, pageIndex),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -7090,7 +7319,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(fileId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(fileId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -7309,7 +7542,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(pluginId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(pluginId),
+                    value: prom,
+                    req: req
+                });
                 return prom;
             });
         }
@@ -7332,7 +7569,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: prom,
+                    req: req
+                });
                 return prom;
             });
         }