bruce-models 1.7.7 → 1.7.9

package/dist/bruce-models.umd.js

@@ -460,12 +460,18 @@
         }
     }
 
+    // TODO: Currently checks for CSV vs json specifically,
+    // Need to see if our api is generally good at setting content-type headers.
+    // Make it less specific to CSV.
     function parseResult(data) {
         return __awaiter(this, void 0, void 0, function* () {
             if (data.status == 200) {
+                let type = data.headers.get("Content-Type");
+                if (type) {
+                    type = type.trim().toLowerCase();
+                }
                 let encoding = "";
-                const type = data.headers.get("Content-Type");
-                const charset = type ? type.split(";").find((x) => x.trim().toLowerCase().startsWith("charset=")) : "";
+                const charset = type ? type.split(";").find((x) => x.startsWith("charset=")) : "";
                 if (charset && charset.includes("=")) {
                     encoding = charset.split("=")[1];
                     encoding = encoding.toLowerCase();
@@ -479,11 +485,18 @@
                     if (!text || !text.trim()) {
                         return null;
                     }
+                    if (type && type.includes("text/csv")) {
+                        return text;
+                    }
                     return JSON.parse(text);
                 }
                 else {
                     const buffer = yield data.arrayBuffer();
-                    return JSON.parse(new TextDecoder(encoding).decode(buffer));
+                    const text = new TextDecoder(encoding).decode(buffer);
+                    if (type && type.includes("text/csv")) {
+                        return text;
+                    }
+                    return JSON.parse(text);
                 }
             }
             else {
@@ -1057,15 +1070,18 @@
                     ssidHeader: "x-sessionid"
                 });
                 this.loadCancelled = false;
-                let { accountId, env, cam, loadRegionalBaseUrl } = params;
+                let { accountId, env, cam, loadRegionalBaseUrl, loadConfig } = params;
                 this.accountId = accountId;
                 this.env = env !== null && env !== void 0 ? env : exports.Api.EEnv.PROD;
-                if (loadRegionalBaseUrl && !cam) {
+                if (loadRegionalBaseUrl) {
+                    loadConfig = true;
+                }
+                if (!cam && loadConfig) {
                     cam = new exports.CamApi.Api({
                         env: this.env
                     });
                 }
-                this.loadProm = this.init(cam, loadRegionalBaseUrl);
+                this.loadProm = this.init(cam, loadConfig);
             }
             get MessageBroker() {
                 return this.messageBroker;
@@ -1078,11 +1094,11 @@
             /**
              * Loads regional base url and sets up message broker.
              * @param cam Required for loading regional base url.
-             * @param loadRegionalUrl
+             * @param loadConfig
              * @returns
              */
-            init(cam, loadRegionalUrl) {
-                var _a;
+            init(cam, loadConfig) {
+                var _a, _b, _c;
                 return __awaiter(this, void 0, void 0, function* () {
                     if (!this.accountId) {
                         throw ("accountId is required.");
@@ -1108,32 +1124,47 @@
                             throw ("Specified Environment is not valid. SuppliedEnv=" + env);
                     }
                     this.baseUrl = url;
-                    if (cam) {
-                        if (loadRegionalUrl) {
-                            // Attempt to load an account specific base url.
-                            // This could be one with a region specific endpoint.
-                            try {
-                                const settings = (yield exports.Account.GetAppSettings({
-                                    api: cam,
-                                    accountId: this.accountId,
-                                    appId: exports.Account.EAppId.BruceApi
-                                })).settings;
-                                if (this.loadCancelled) {
-                                    console.warn("BruceApi: Loading was cancelled due to SetBaseUrl being called, not setting regional base url.");
-                                    return;
-                                }
-                                let endpoint = (_a = settings.BruceAPIURL) === null || _a === void 0 ? void 0 : _a[env];
-                                if (typeof endpoint == "string") {
-                                    if (!endpoint.endsWith("/")) {
-                                        endpoint += "/";
-                                    }
-                                    this.baseUrl = endpoint;
+                    if (cam && loadConfig) {
+                        // Attempt to load an account specific base url.
+                        // This could be one with a region specific endpoint.
+                        try {
+                            const settings = (yield exports.Account.GetAppSettings({
+                                api: cam,
+                                accountId: this.accountId,
+                                appId: exports.Account.EAppId.BruceApi
+                            })).settings;
+                            if (this.loadCancelled) {
+                                console.warn("BruceApi: Loading was cancelled due to SetBaseUrl being called, not setting regional base url.");
+                                return;
+                            }
+                            let endpoint = (_a = settings.BruceAPIURL) === null || _a === void 0 ? void 0 : _a[env];
+                            if (typeof endpoint == "string") {
+                                if (!endpoint.endsWith("/")) {
+                                    endpoint += "/";
                                 }
+                                this.baseUrl = endpoint;
                             }
-                            catch (e) {
-                                console.error(e);
+                            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];
+                                this.LegacyTilesetCdnUrl = (_c = region.CDN.legacyTilesetURL) === null || _c === void 0 ? void 0 : _c[env];
                             }
                         }
+                        catch (e) {
+                            console.error(e);
+                        }
                     }
                     try {
                         this.messageBroker = new exports.MessageBroker.WebSocketBroker(this.baseUrl, this.env);