bruce-models 1.4.9 → 1.5.1

package/dist/bruce-models.umd.js

@@ -470,11 +470,14 @@
                     encoding = charset.split("=")[1];
                     encoding = encoding.toLowerCase();
                 }
+                if (!encoding) {
+                    return null;
+                }
                 // Our API has a very specific utf-16 encoding.
                 if (encoding == "utf-16") {
                     encoding = exports.Api.EEncoding.UTF16;
                 }
-                if (!encoding || encoding == "utf-8") {
+                if (encoding == "utf-8") {
                     return data.json();
                 }
                 else {
@@ -492,10 +495,20 @@
      * This is a base class for communication with an arbitrary Bruce Api.
      */
     class AbstractApi {
-        constructor(ssidHeader) {
+        constructor(params) {
             this.ssid = "";
+            this.baseUrl = "";
             this.Cache = new CacheControl();
-            this.ssidHeader = ssidHeader;
+            this.ssidHeader = params === null || params === void 0 ? void 0 : params.ssidHeader;
+        }
+        GetBaseUrl() {
+            return this.baseUrl;
+        }
+        SetBaseUrl(url) {
+            this.baseUrl = url;
+            if (!this.baseUrl.endsWith("/")) {
+                this.baseUrl += "/";
+            }
         }
         GetCacheItem(key, reqParams) {
             let noCache = reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache;
@@ -962,17 +975,17 @@
          */
         class Api$$1 extends AbstractApi {
             /**
-             * @param accountId
-             * @param env (Optional) environment to use, this will default to PROD.
-             * @param cam (Optional) cam instance to use for loading the regional base url.
+             * @param params
              */
-            constructor(accountId, env, cam) {
-                super("x-sessionid");
-                this.baseUrl = "";
+            constructor(params) {
+                super({
+                    ssidHeader: "x-sessionid"
+                });
                 this.loadCancelled = false;
+                const { accountId, env, cam, loadRegionalBaseUrl } = params;
                 this.accountId = accountId;
                 this.env = env !== null && env !== void 0 ? env : exports.Api.EEnv.PROD;
-                this.loadProm = this.init(cam);
+                this.loadProm = this.init(cam, loadRegionalBaseUrl);
             }
             get MessageBroker() {
                 return this.messageBroker;
@@ -985,11 +998,15 @@
             /**
              * Loads regional base url and sets up message broker.
              * @param cam Required for loading regional base url.
+             * @param loadRegionalUrl
              * @returns
              */
-            init(cam) {
+            init(cam, loadRegionalUrl) {
                 var _a;
                 return __awaiter(this, void 0, void 0, function* () {
+                    if (!this.accountId) {
+                        throw ("accountId is required.");
+                    }
                     // Set using a stable default.
                     const prefix = `https://${this.accountId}.api.nextspace`;
                     let url;
@@ -1011,7 +1028,7 @@
                             throw ("Specified Environment is not valid. SuppliedEnv=" + env);
                     }
                     this.baseUrl = url;
-                    if (cam) {
+                    if (cam && loadRegionalUrl) {
                         // Attempt to load an account specific base url.
                         // This could be one with a region specific endpoint.
                         try {
@@ -1118,10 +1135,11 @@
 
     (function (CamApi) {
         class Api$$1 extends AbstractApi {
-            constructor(env) {
-                super("SSID");
-                this.baseUrl = "";
-                this.env = env !== null && env !== void 0 ? env : exports.Api.EEnv.PROD;
+            constructor(params) {
+                super({
+                    ssidHeader: "SSID"
+                });
+                this.env = (params === null || params === void 0 ? void 0 : params.env) ? params.env : exports.Api.EEnv.PROD;
                 this.setBaseUrl();
             }
             setBaseUrl() {
@@ -1185,10 +1203,11 @@
          * it should be passed to any method that wants to communicate with this particular api.
          */
         class Api$$1 extends AbstractApi {
-            constructor(env) {
-                super("SSID");
-                this.baseUrl = "";
-                this.env = env !== null && env !== void 0 ? env : exports.Api.EEnv.PROD;
+            constructor(params) {
+                super({
+                    ssidHeader: "SSID"
+                });
+                this.env = (params === null || params === void 0 ? void 0 : params.env) ? params.env : exports.Api.EEnv.PROD;
                 this.setBaseUrl();
             }
             setBaseUrl() {
@@ -1252,10 +1271,11 @@
          * it should be passed to any method that wants to communicate with this particular api.
          */
         class Api$$1 extends AbstractApi {
-            constructor(env) {
-                super("x-sessionid");
-                this.baseUrl = "";
-                this.env = env !== null && env !== void 0 ? env : exports.Api.EEnv.PROD;
+            constructor(params) {
+                super({
+                    ssidHeader: "x-sessionid"
+                });
+                this.env = (params === null || params === void 0 ? void 0 : params.env) ? params.env : exports.Api.EEnv.PROD;
                 this.setBaseUrl();
             }
             setBaseUrl() {