bruce-models 3.2.4 → 3.2.6

package/dist/bruce-models.es5.js

@@ -1142,13 +1142,28 @@ var HostingLocation;
      */
     function GetKeyByAccountId(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { accountId, apiSettings, api, req } = params;
+            let { accountId, apiSettings, api, account, req } = params;
             if (!accountId && !apiSettings) {
                 throw ("Invalid accountId or apiSettings");
             }
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
+            // We'll prioritize account record if provided.
+            if (accountId && !account) {
+                account = (yield Account.Get({
+                    accountId,
+                    api,
+                    req
+                })).account;
+            }
+            if (account === null || account === void 0 ? void 0 : account["HostingLocation.Key"]) {
+                return {
+                    key: account["HostingLocation.Key"],
+                    isLegacy: false
+                };
+            }
+            // Fallback to settings JSON for older records.
             const settings = apiSettings ? apiSettings : (yield Account.GetAppSettings({
                 api,
                 accountId,
@@ -1180,12 +1195,13 @@ var HostingLocation;
      */
     function GetByAccountId(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { accountId, apiSettings, api, req } = params;
+            let { accountId, apiSettings, api, req, account } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
             const data = yield GetKeyByAccountId({
                 accountId,
+                account,
                 apiSettings,
                 api,
                 req
@@ -1376,6 +1392,25 @@ var BruceApi;
         GetCdnBaseUrl() {
             return this.cdnBaseUrl;
         }
+        /**
+         * Returns a url routed through the API's CDN.
+         * If the CDN is not enabled for the account, this will return null.
+         * @param url suffix to append to the base url.
+         * @param urlParams
+         * @returns
+         */
+        ConstructCdnUrl(url, urlParams) {
+            if (!this.cdnBaseUrl) {
+                return null;
+            }
+            let cdnUrl = this.cdnBaseUrl + url;
+            if (!urlParams) {
+                urlParams = new URLSearchParams();
+            }
+            urlParams.set("accountId", this.accountId);
+            cdnUrl += "?" + urlParams.toString();
+            return cdnUrl;
+        }
         /**
          * Warning: This will cancel the init process.
          * The init process loads a region specific endpoint.
@@ -1689,7 +1724,7 @@ class ApiGetters {
         if (!params) {
             params = {};
         }
-        let { accountId, env } = params;
+        let { accountId, env, loadConfig, loadWebSocket } = params;
         accountId = accountId ? accountId : this.accountId;
         env = env ? env : this.env;
         const key = `${accountId}-${env}`;
@@ -1697,7 +1732,11 @@ class ApiGetters {
             this.bruce[key] = new BruceApi.Api({
                 accountId,
                 env,
-                loadRegionalBaseUrl: true
+                loadConfig: loadConfig,
+                loadWebSocket: loadWebSocket,
+                guardian: this.GetGuardianApi({
+                    env
+                }),
             });
             this.bruce[key].SetSessionId(this.sessionId);
         }
@@ -1714,7 +1753,12 @@ class ApiGetters {
             accountId: this.accountId,
             env: this.env,
             getApi: (accountId, env) => {
-                return this.GetBruceApi({ accountId, env });
+                return this.GetBruceApi({
+                    accountId,
+                    env,
+                    loadWebSocket: this.accountId == accountId,
+                    loadConfig: this.accountId == accountId
+                });
             }
         };
     }
@@ -6296,11 +6340,16 @@ var ClientFile;
      * @returns
      */
     function GetUrl(params) {
-        let { api, fileId } = params;
+        let { api, fileId, viaCdn } = params;
         if (!api) {
             api = ENVIRONMENT.Api().GetBruceApi();
         }
-        return `${api.GetBaseUrl()}file/${fileId}`;
+        const urlSuffix = `file/${fileId}`;
+        const cdnUrl = viaCdn ? api.ConstructCdnUrl(urlSuffix) : null;
+        if (cdnUrl) {
+            return cdnUrl;
+        }
+        return `${api.GetBaseUrl()}${urlSuffix}`;
     }
     ClientFile.GetUrl = GetUrl;
     /**
@@ -6309,11 +6358,16 @@ var ClientFile;
      * @returns
      */
     function GetUrlWithExt(params) {
-        let { api, file } = params;
+        let { api, file, viaCdn } = params;
         if (!api) {
             api = ENVIRONMENT.Api().GetBruceApi();
         }
-        return `${api.GetBaseUrl()}file/${file.ID}${file.FileExt ? file.FileExt : ""}`;
+        const urlSuffix = file.FileExt ? `file/${file.ID}${file.FileExt}` : `file/${file.ID}`;
+        const cdnUrl = viaCdn ? api.ConstructCdnUrl(urlSuffix) : null;
+        if (cdnUrl) {
+            return cdnUrl;
+        }
+        return `${api.GetBaseUrl()}${urlSuffix}`;
     }
     ClientFile.GetUrlWithExt = GetUrlWithExt;
     /**
@@ -10482,7 +10536,7 @@ var DataSource;
     DataSource.GetList = GetList;
 })(DataSource || (DataSource = {}));
 
-const VERSION = "3.2.4";
+const VERSION = "3.2.6";
 
 export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityTypeVisualSettings, EntityAttribute, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map