bruce-models 1.9.9 → 2.0.1

package/dist/bruce-models.es5.js

@@ -153,7 +153,11 @@ var AnnDocument;
                     rej(e);
                 }
             }));
-            api.Cache.Set(key, prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key,
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -180,7 +184,11 @@ var AnnDocument;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(type), req);
+            api.SetCacheItem({
+                key: GetListCacheKey(type),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -230,7 +238,11 @@ var CustomForm;
                     rej(err);
                 }
             }));
-            api.Cache.Set(GetCacheKey(id), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetCacheKey(id),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -260,7 +272,11 @@ var CustomForm;
                     forms: data.Items
                 };
             });
-            api.Cache.Set(GetListCacheKey(typeId), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetListCacheKey(typeId),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -541,6 +557,20 @@ class AbstractApi {
         }
         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 = Api.DEFAULT_NO_CACHE;
+        }
+        if (noCache) {
+            return;
+        }
+        if (isNaN(duration)) {
+            duration = Api.DEFAULT_CACHE_DURATION;
+        }
+        this.Cache.Set(key, value, duration);
+    }
     GetSessionId() {
         return this.ssid;
     }
@@ -749,7 +779,11 @@ var Account;
             const resData = {
                 account: req
             };
-            api.Cache.Set(GetCacheKey(id), resData, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetCacheKey(id),
+                value: resData,
+                req: reqParams
+            });
             return resData;
         });
     }
@@ -774,7 +808,11 @@ var Account;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(api.GetSessionId()), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetListCacheKey(api.GetSessionId()),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -800,7 +838,11 @@ var Account;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetCacheKey(id, appId), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetCacheKey(id, appId),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -865,7 +907,11 @@ var Account;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetDbRegionListCacheKey(), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetDbRegionListCacheKey(),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -1172,31 +1218,35 @@ var BruceApi;
                             }
                             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 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 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) {
@@ -1740,7 +1790,11 @@ var Entity;
                     rej(e);
                 }
             }));
-            api.Cache.Set(key, prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key,
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -1790,7 +1844,11 @@ var Entity;
                         }
                         res(null);
                     }));
-                    api.Cache.Set(key, prom, Api.DEFAULT_CACHE_DURATION);
+                    api.SetCacheItem({
+                        key,
+                        value: prom,
+                        req: reqParams
+                    });
                     reqs.push(prom);
                 }
             }
@@ -1999,9 +2057,13 @@ var Entity;
                 for (let i = 0; i < entities.length; i++) {
                     const entity = entities[i];
                     const id = entity.Bruce.ID;
-                    api.Cache.Set(GetCacheKey(id), {
-                        entity: entity
-                    }, Api.DEFAULT_CACHE_DURATION);
+                    api.SetCacheItem({
+                        key: GetCacheKey(id),
+                        value: {
+                            entity: entity
+                        },
+                        req: reqParams
+                    });
                 }
             }
             return {
@@ -2964,7 +3026,11 @@ var EntityAttachmentType;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(), req);
+            api.SetCacheItem({
+                key: GetListCacheKey(),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -3059,7 +3125,11 @@ var EntityAttachment;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(entityId), req);
+            api.SetCacheItem({
+                key: GetListCacheKey(entityId),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -3144,7 +3214,11 @@ var EntityComment;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(entityId), req);
+            api.SetCacheItem({
+                key: GetListCacheKey(entityId),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -3214,7 +3288,11 @@ var EntityLink;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(entityId), req);
+            api.SetCacheItem({
+                key: GetListCacheKey(entityId),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -3282,7 +3360,11 @@ var EntityLod;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetCacheKey(url), req, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetCacheKey(url),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -3323,7 +3405,11 @@ var EntityLod;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetEntityListKey(entityId), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetEntityListKey(entityId),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -3355,7 +3441,11 @@ var EntityLod;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetTypeListKey(typeId, group), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetTypeListKey(typeId, group),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -3422,7 +3512,11 @@ var EntityLodCategory;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(), req);
+            api.SetCacheItem({
+                key: GetListCacheKey(),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -3448,7 +3542,11 @@ var EntityLodCategory;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetCacheKey(id), req);
+            api.SetCacheItem({
+                key: GetCacheKey(id),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -3518,7 +3616,11 @@ var EntityRelationType;
                     rej(e);
                 }
             }));
-            api.Cache.Set(key, prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key,
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -3553,7 +3655,11 @@ var EntityRelationType;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(), req);
+            api.SetCacheItem({
+                key: GetListCacheKey(),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -3665,7 +3771,11 @@ var EntityRelation;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(entityId, filter), req);
+            api.SetCacheItem({
+                key: GetListCacheKey(entityId, filter),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -3691,7 +3801,11 @@ var EntityRelation;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetEntityCacheKey(entityId), prom);
+            api.SetCacheItem({
+                key: GetEntityCacheKey(entityId),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -3899,7 +4013,11 @@ var EntityTag;
                             rej(e);
                         }
                     }));
-                    api.Cache.Set(GetCacheKey(id), req, Api.DEFAULT_CACHE_DURATION);
+                    api.SetCacheItem({
+                        key: GetCacheKey(id),
+                        value: req,
+                        req: reqParams
+                    });
                     reqs.push(req);
                 }
             }
@@ -3927,7 +4045,11 @@ var EntityTag;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(entityTypeId), req, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetListCacheKey(entityTypeId),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -3996,7 +4118,11 @@ var EntityType;
                     rej(e);
                 }
             }));
-            api.Cache.Set(key, prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key,
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -4031,7 +4157,11 @@ var EntityType;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(), req, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetListCacheKey(),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -4472,7 +4602,10 @@ var EntityFilterGetter;
                                 sortOrder: Api.ESortOrder.Asc,
                                 entityTypeConditions: this.attrFilter
                             },
-                            viaCdn: this.viaCdn
+                            viaCdn: this.viaCdn,
+                            req: {
+                                noCache: true
+                            }
                         });
                         const integrity = this.getIntegrityId();
                         if (loopIntegrity == integrity && entities) {
@@ -4675,7 +4808,11 @@ var EntityCoords;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetCacheKey(entityId), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetCacheKey(entityId),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -4929,7 +5066,11 @@ var ClientFile;
                     rej(e);
                 }
             }));
-            api.Cache.Set(key, prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key,
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -5161,7 +5302,11 @@ var ProgramKey;
                     rej(e);
                 }
             }));
-            api.Cache.Set(key, prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key,
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -5184,7 +5329,11 @@ var ProgramKey;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(), req, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetListCacheKey(),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -5295,7 +5444,11 @@ var Tileset;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetCacheKey(tilesetId, loadFiles), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetCacheKey(tilesetId, loadFiles),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -5349,7 +5502,11 @@ var Tileset;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(), req, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetListCacheKey(),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -5584,7 +5741,11 @@ var Tileset;
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(accountId, tilesetId), prom);
+                api.SetCacheItem({
+                    key: GetCacheKey(accountId, tilesetId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -5610,7 +5771,11 @@ var Tileset;
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(accountId), req);
+                api.SetCacheItem({
+                    key: GetCacheKey(accountId),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -5799,7 +5964,11 @@ var ProjectViewBookmark;
                     rej(e);
                 }
             }));
-            api.Cache.Set(key, prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key,
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -5840,7 +6009,11 @@ var ProjectViewBookmark;
                                 bookmark: item
                             });
                         });
-                        api.Cache.Set(GetCacheKey(viewId, item.ID), prom, Api.DEFAULT_CACHE_DURATION);
+                        api.SetCacheItem({
+                            key: GetCacheKey(viewId, item.ID),
+                            value: prom,
+                            req: reqParams
+                        });
                     }
                     res({
                         bookmarks: items
@@ -5850,7 +6023,11 @@ var ProjectViewBookmark;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(viewId), req, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetListCacheKey(viewId),
+                value: req,
+                req: reqParams
+            });
             return req;
         });
     }
@@ -5932,7 +6109,11 @@ var ProjectView;
                     rej(e);
                 }
             }));
-            api.Cache.Set(key, prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key,
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -5955,7 +6136,11 @@ var ProjectView;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetListCacheKey(),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -6295,7 +6480,11 @@ var Style;
                 rej(e);
             }
         }));
-        api.Cache.Set(GetListCacheKey(), res, Api.DEFAULT_CACHE_DURATION);
+        api.SetCacheItem({
+            key: GetListCacheKey(),
+            value: res,
+            req: reqParams
+        });
         return res;
     }
     Style.GetList = GetList;
@@ -6319,7 +6508,11 @@ var Style;
                 rej(e);
             }
         }));
-        api.Cache.Set(GetCacheKey(id), prom, Api.DEFAULT_CACHE_DURATION);
+        api.SetCacheItem({
+            key: GetCacheKey(id),
+            value: prom,
+            req: reqParams
+        });
         return prom;
     }
     Style.Get = Get;
@@ -6405,7 +6598,11 @@ var Session;
                     rej(e);
                 }
             }));
-            api.Cache.Set(key, prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key,
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -6633,7 +6830,11 @@ var User;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetCacheKey(id, accountId), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetCacheKey(id, accountId),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -6709,7 +6910,11 @@ var User;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetSettingsCacheKey(userId, appId), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetSettingsCacheKey(userId, appId),
+                value: prom,
+                req: req
+            });
             return prom;
         });
     }
@@ -6786,7 +6991,11 @@ var User;
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetEmailCacheKey(email, accountId), prom, Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetEmailCacheKey(email, accountId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -6818,13 +7027,21 @@ var User;
                 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, Api.DEFAULT_CACHE_DURATION);
+                    api.SetCacheItem({
+                        key: GetListCacheKey(accountId),
+                        value: req,
+                        req: reqParams
+                    });
                 }
                 return req;
             });
@@ -6972,12 +7189,20 @@ var User;
                 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, Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(accountId),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -7283,7 +7508,11 @@ var ImportedFile;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(type, pageIndex), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetListCacheKey(type, pageIndex),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -7306,7 +7535,11 @@ var ImportedFile;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetCacheKey(fileId), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetCacheKey(fileId),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         });
     }
@@ -7527,7 +7760,11 @@ var Plugin;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetCacheKey(pluginId), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetCacheKey(pluginId),
+                value: prom,
+                req: req
+            });
             return prom;
         });
     }
@@ -7550,7 +7787,11 @@ var Plugin;
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(), prom, Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetListCacheKey(),
+                value: prom,
+                req: req
+            });
             return prom;
         });
     }