bruce-models 3.5.7 → 3.5.9

package/dist/bruce-models.es5.js

@@ -1297,6 +1297,9 @@ var BruceApi;
         get MessageBroker() {
             return this.messageBroker;
         }
+        get ConfigLoadAttempted() {
+            return this.configLoadAttempted;
+        }
         get Loading() {
             return this.loadProm;
         }
@@ -1308,16 +1311,18 @@ var BruceApi;
             // Load cancelled indicates the user set a custom base url.
             // This will stop the regional url from being set if it's still loading.
             this.loadCancelled = false;
+            // Indicates if loading the regional configuration was already called.
+            this.configLoadAttempted = false;
             let { accountId, env, guardian, loadRegionalBaseUrl, loadConfig, loadWebSocket } = params;
             this.accountId = accountId;
             this.env = env !== null && env !== void 0 ? env : Api.EEnv.PROD;
+            // Backwards compatibility.
             if (loadRegionalBaseUrl) {
                 loadConfig = true;
             }
-            if (!guardian && loadConfig) {
-                guardian = new GuardianApi.Api({
-                    env: this.env
-                });
+            if (loadConfig) {
+                // Mark it as attempted right away because we don't want any external calls while it gets to that async point.
+                this.configLoadAttempted = true;
             }
             this.loadProm = this.init(guardian, loadConfig, loadWebSocket);
         }
@@ -1328,110 +1333,142 @@ var BruceApi;
          * @returns
          */
         init(guardian, loadConfig, loadWebSocket) {
-            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function* () {
                 if (!this.accountId) {
                     throw ("accountId is required.");
                 }
-                const env = this.env.toUpperCase();
-                let domain = "nextspace.host";
-                switch (env) {
-                    case Api.EEnv.DEV:
-                        domain = "nextspace-dev.net";
-                        break;
-                    case Api.EEnv.STG:
-                        domain = "nextspace-stg.net";
-                        break;
-                    case Api.EEnv.UAT:
-                        domain = "nextspace-uat.net";
-                        break;
-                    case Api.EEnv.PROD:
-                        domain = "nextspace.host";
-                        break;
-                    default:
-                        console.error("Specified Environment is not valid. SuppliedEnv=" + env);
-                }
                 // Set using a stable default.
+                const domain = this.getDomain();
                 this.baseUrl = `https://${this.accountId}.api.${domain}/`;
-                if (guardian && loadConfig) {
+                // Attempt to load regional configuration.
+                if (loadConfig) {
+                    yield this.LoadConfig({
+                        guardian: guardian,
+                        // We marked it as attempted to load outside this method to fight any external calls.
+                        // So we'll force load it now.
+                        forceLoad: true
+                    });
+                }
+                // Start web socket connection.
+                if (loadWebSocket != false) {
                     try {
-                        const host = yield HostingLocation.GetByAccountId({
-                            accountId: this.accountId,
-                            api: guardian
+                        this.messageBroker = new MessageBroker.WebSocketBroker(this.baseUrl, this.env);
+                    }
+                    catch (e) {
+                        console.warn("BruceApi: Failed to create message broker.", e);
+                    }
+                }
+            });
+        }
+        getDomain() {
+            const env = this.env.toUpperCase();
+            let domain = "nextspace.host";
+            switch (env) {
+                case Api.EEnv.DEV:
+                    domain = "nextspace-dev.net";
+                    break;
+                case Api.EEnv.STG:
+                    domain = "nextspace-stg.net";
+                    break;
+                case Api.EEnv.UAT:
+                    domain = "nextspace-uat.net";
+                    break;
+                case Api.EEnv.PROD:
+                    domain = "nextspace.host";
+                    break;
+                default:
+                    console.error("Specified Environment is not valid. SuppliedEnv=" + env);
+            }
+            return domain;
+        }
+        /**
+         * Loads the regional configuration for the account.
+         * If the config is already loaded then this will do nothing.
+         */
+        LoadConfig(params) {
+            var _a, _b, _c;
+            return __awaiter(this, void 0, void 0, function* () {
+                let { guardian, forceLoad } = (params !== null && params !== void 0 ? params : {});
+                if (this.configLoadAttempted && forceLoad != true) {
+                    return;
+                }
+                this.configLoadAttempted = true;
+                try {
+                    if (!guardian) {
+                        guardian = new GuardianApi.Api({
+                            env: this.env
                         });
-                        if (host === null || host === void 0 ? void 0 : host.location) {
-                            const settings = host.location.Settings;
-                            if (!this.loadCancelled) {
-                                // Attempt to load regional base url.
-                                // First try go through settings.
-                                let urlSet = false;
-                                if (settings === null || settings === void 0 ? void 0 : settings.BruceAPIURL) {
-                                    let envUrl = settings.BruceAPIURL[env];
-                                    if (envUrl) {
-                                        envUrl = envUrl
-                                            .replace("<ACCOUNTID>", this.accountId)
-                                            .replace("<ACCOUNT>", this.accountId);
-                                        if (envUrl && envUrl.length > 1) {
-                                            this.baseUrl = envUrl;
-                                            urlSet = true;
-                                        }
-                                    }
-                                }
-                                // Try go through host location's base url.
-                                // This may be wrong env which is why it's used as fallback right now.
-                                if (!urlSet && host.location.BruceAPIURL) {
-                                    const regionalUrl = host.location.BruceAPIURL
+                    }
+                    const env = this.env.toUpperCase();
+                    const domain = this.getDomain();
+                    const host = yield HostingLocation.GetByAccountId({
+                        accountId: this.accountId,
+                        api: guardian
+                    });
+                    if (host === null || host === void 0 ? void 0 : host.location) {
+                        const settings = host.location.Settings;
+                        if (!this.loadCancelled) {
+                            // Attempt to load regional base url.
+                            // First try go through settings.
+                            let urlSet = false;
+                            if (settings === null || settings === void 0 ? void 0 : settings.BruceAPIURL) {
+                                let envUrl = settings.BruceAPIURL[env];
+                                if (envUrl) {
+                                    envUrl = envUrl
                                         .replace("<ACCOUNTID>", this.accountId)
-                                        .replace("<ACCOUNT>", this.accountId)
-                                        .replace("<DOMAIN>", domain);
-                                    if (regionalUrl && regionalUrl.length > 1) {
-                                        this.baseUrl = regionalUrl;
+                                        .replace("<ACCOUNT>", this.accountId);
+                                    if (envUrl && envUrl.length > 1) {
+                                        this.baseUrl = envUrl;
                                         urlSet = true;
                                     }
                                 }
                             }
-                            // Attempt to load CDN settings.
-                            if (settings === null || settings === void 0 ? void 0 : settings.CDN) {
-                                this.EntityCdnUrl = (_a = settings.CDN.entityURL) === null || _a === void 0 ? void 0 : _a[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);
-                                    }
+                            // Try go through host location's base url.
+                            // This may be wrong env which is why it's used as fallback right now.
+                            if (!urlSet && host.location.BruceAPIURL) {
+                                const regionalUrl = host.location.BruceAPIURL
+                                    .replace("<ACCOUNTID>", this.accountId)
+                                    .replace("<ACCOUNT>", this.accountId)
+                                    .replace("<DOMAIN>", domain);
+                                if (regionalUrl && regionalUrl.length > 1) {
+                                    this.baseUrl = regionalUrl;
+                                    urlSet = true;
                                 }
-                                this.LegacyTilesetCdnUrl = (_b = settings.CDN.legacyTilesetURL) === null || _b === void 0 ? void 0 : _b[env];
-                                this.TilesetCdnUrl = (_c = settings.CDN.tilesetURL) === null || _c === void 0 ? void 0 : _c[env];
-                                if (this.TilesetCdnUrl) {
-                                    this.TilesetCdnUrl = this.TilesetCdnUrl.replace("<ACCOUNT>", this.accountId);
+                            }
+                        }
+                        // Attempt to load CDN settings.
+                        if (settings === null || settings === void 0 ? void 0 : settings.CDN) {
+                            this.EntityCdnUrl = (_a = settings.CDN.entityURL) === null || _a === void 0 ? void 0 : _a[env];
+                            // We need to fix our configs.
+                            if (this.EntityCdnUrl) {
+                                if (this.EntityCdnUrl.includes("entitiesListForCDN")) {
+                                    this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", this.accountId);
                                 }
-                                // TilesetCdnUrl example: "https://blah.cloudfront.net/tilesets/<TILESETID>/files/<FILEPATH>?accountId=<ACCOUNT>".
-                                // Lazy at the moment to go around updating every region we have, I'll interpret the url from tilesetCdnUrl.
-                                if (this.TilesetCdnUrl) {
-                                    try {
-                                        const url = new URL(this.TilesetCdnUrl);
-                                        this.cdnBaseUrl = `${url.protocol}//${url.hostname}/`;
-                                    }
-                                    catch (e) {
-                                        console.error(e);
-                                    }
+                                else {
+                                    this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", "entitiesListForCDN/" + this.accountId);
+                                }
+                            }
+                            this.LegacyTilesetCdnUrl = (_b = settings.CDN.legacyTilesetURL) === null || _b === void 0 ? void 0 : _b[env];
+                            this.TilesetCdnUrl = (_c = settings.CDN.tilesetURL) === null || _c === void 0 ? void 0 : _c[env];
+                            if (this.TilesetCdnUrl) {
+                                this.TilesetCdnUrl = this.TilesetCdnUrl.replace("<ACCOUNT>", this.accountId);
+                            }
+                            // TilesetCdnUrl example: "https://blah.cloudfront.net/tilesets/<TILESETID>/files/<FILEPATH>?accountId=<ACCOUNT>".
+                            // Lazy at the moment to go around updating every region we have, I'll interpret the url from tilesetCdnUrl.
+                            if (this.TilesetCdnUrl) {
+                                try {
+                                    const url = new URL(this.TilesetCdnUrl);
+                                    this.cdnBaseUrl = `${url.protocol}//${url.hostname}/`;
+                                }
+                                catch (e) {
+                                    console.error(e);
                                 }
                             }
                         }
                     }
-                    catch (e) {
-                        console.error(e);
-                    }
                 }
-                if (loadWebSocket != false) {
-                    try {
-                        this.messageBroker = new MessageBroker.WebSocketBroker(this.baseUrl, this.env);
-                    }
-                    catch (e) {
-                        console.warn("BruceApi: Failed to create message broker.", e);
-                    }
+                catch (e) {
+                    console.error(e);
                 }
             });
         }
@@ -1746,6 +1783,17 @@ class ApiGetters {
      */
     SetAccountId(accountId) {
         this.accountId = accountId;
+        // Queue load of regional config in case an instance was made earlier without it.
+        // We want the default account to always go through the fastest regional endpoint.
+        const api = this.GetBruceApi({
+            accountId: accountId,
+            loadConfig: true
+        });
+        api.LoadConfig({
+            guardian: this.GetGuardianApi({
+                env: this.env
+            })
+        });
     }
     /**
      * Returns the default account ID to use when one is unspecified.
@@ -1810,7 +1858,9 @@ class ApiGetters {
             this.bruce[key] = new BruceApi.Api({
                 accountId,
                 env,
-                loadConfig: loadConfig,
+                // We'll load regional config if the accountId matches the default accountId.
+                // We'll also load if it no default is known.
+                loadConfig: loadConfig != null ? loadConfig : (this.accountId == accountId || !this.accountId),
                 loadWebSocket: loadWebSocket,
                 guardian: this.GetGuardianApi({
                     env
@@ -1834,8 +1884,9 @@ class ApiGetters {
                 return this.GetBruceApi({
                     accountId,
                     env,
-                    loadWebSocket: this.accountId == accountId,
-                    loadConfig: this.accountId == accountId
+                    // We'll load regional config if the accountId matches the default accountId.
+                    // We'll also load if it no default is known.
+                    loadConfig: this.accountId == accountId || !this.accountId
                 });
             }
         };
@@ -4028,9 +4079,14 @@ var Calculator;
                     str: value,
                     entity: entity
                 });
-                // Check if it includes a math operation.
+                const isJsEval = value.startsWith("JS:");
                 const MATH_REGEX = /(\d+\.?\d*|\.\d+)([+\-*/])(\d+\.?\d*|\.\d+)/;
-                if (MATH_REGEX.test(value)) {
+                const isMathEval = isJsEval || MATH_REGEX.test(value);
+                if (isJsEval || isMathEval) {
+                    if (isJsEval) {
+                        value = value.replace("JS:", "");
+                        value = value.trim();
+                    }
                     // https://rollupjs.org/guide/en/#avoiding-eval
                     // This stops eval warning.
                     const eval2 = eval;
@@ -10887,7 +10943,7 @@ var DataSource;
 })(DataSource || (DataSource = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "3.5.7";
+const VERSION = "3.5.9";
 
 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