bruce-models 2.3.0 → 2.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bruce-models.es5.js +186 -196
- package/dist/bruce-models.es5.js.map +1 -1
- package/dist/bruce-models.umd.js +181 -191
- package/dist/bruce-models.umd.js.map +1 -1
- package/dist/lib/api/bruce-api.js +29 -40
- package/dist/lib/api/bruce-api.js.map +1 -1
- package/dist/types/account/account-settings.d.ts +0 -3
- package/package.json +1 -1
|
@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.BruceApi = void 0;
|
|
13
|
-
const account_1 = require("../account/account");
|
|
14
13
|
const abstract_api_1 = require("./abstract-api");
|
|
15
14
|
const api_1 = require("./api");
|
|
16
15
|
const message_broker_1 = require("../server/message-broker");
|
|
@@ -60,70 +59,60 @@ var BruceApi;
|
|
|
60
59
|
* @returns
|
|
61
60
|
*/
|
|
62
61
|
init(guardian, loadConfig) {
|
|
63
|
-
var _a, _b
|
|
62
|
+
var _a, _b;
|
|
64
63
|
return __awaiter(this, void 0, void 0, function* () {
|
|
65
64
|
if (!this.accountId) {
|
|
66
65
|
throw ("accountId is required.");
|
|
67
66
|
}
|
|
68
|
-
// Set using a stable default.
|
|
69
|
-
const prefix = `https://${this.accountId}.api.nextspace`;
|
|
70
|
-
let url;
|
|
71
67
|
const env = this.env.toUpperCase();
|
|
68
|
+
let domain = "nextspace.host";
|
|
72
69
|
switch (env) {
|
|
73
70
|
case api_1.Api.EEnv.DEV:
|
|
74
|
-
|
|
71
|
+
domain = "nextspace-dev.net";
|
|
75
72
|
break;
|
|
76
73
|
case api_1.Api.EEnv.STG:
|
|
77
|
-
|
|
74
|
+
domain = "nextspace-stg.net";
|
|
78
75
|
break;
|
|
79
76
|
case api_1.Api.EEnv.UAT:
|
|
80
|
-
|
|
77
|
+
domain = "nextspace-uat.net";
|
|
81
78
|
break;
|
|
82
79
|
case api_1.Api.EEnv.PROD:
|
|
83
|
-
|
|
80
|
+
domain = "nextspace.host";
|
|
84
81
|
break;
|
|
85
82
|
default:
|
|
86
|
-
|
|
83
|
+
console.error("Specified Environment is not valid. SuppliedEnv=" + env);
|
|
87
84
|
}
|
|
88
|
-
|
|
85
|
+
// Set using a stable default.
|
|
86
|
+
this.baseUrl = `https://${this.accountId}.api.${domain}/`;
|
|
89
87
|
if (guardian && loadConfig) {
|
|
90
|
-
// Attempt to load an account specific base url.
|
|
91
|
-
// This could be one with a region specific endpoint.
|
|
92
88
|
try {
|
|
93
|
-
const settings = (yield account_1.Account.GetAppSettings({
|
|
94
|
-
api: guardian,
|
|
95
|
-
accountId: this.accountId,
|
|
96
|
-
appId: account_1.Account.EAppId.BruceApi
|
|
97
|
-
})).settings;
|
|
98
|
-
if (this.loadCancelled) {
|
|
99
|
-
console.warn("BruceApi: Loading was cancelled due to SetBaseUrl being called, not setting regional base url.");
|
|
100
|
-
return;
|
|
101
|
-
}
|
|
102
|
-
let endpoint = (_a = settings.BruceAPIURL) === null || _a === void 0 ? void 0 : _a[env];
|
|
103
|
-
if (typeof endpoint == "string") {
|
|
104
|
-
if (!endpoint.endsWith("/")) {
|
|
105
|
-
endpoint += "/";
|
|
106
|
-
}
|
|
107
|
-
this.baseUrl = endpoint;
|
|
108
|
-
}
|
|
109
89
|
const host = yield hosting_location_1.HostingLocation.GetByAccountId({
|
|
110
90
|
accountId: this.accountId,
|
|
111
|
-
apiSettings: settings,
|
|
112
91
|
api: guardian
|
|
113
92
|
});
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", this.accountId);
|
|
93
|
+
if (host === null || host === void 0 ? void 0 : host.location) {
|
|
94
|
+
// Attempt to load regional base url.
|
|
95
|
+
if (host.location.BruceAPIURL) {
|
|
96
|
+
const regionalUrl = host.location.BruceAPIURL.replace("<ACCOUNT>", this.accountId).replace("<DOMAIN>", domain);
|
|
97
|
+
if (regionalUrl && regionalUrl.length > 1) {
|
|
98
|
+
this.baseUrl = regionalUrl;
|
|
121
99
|
}
|
|
122
|
-
|
|
123
|
-
|
|
100
|
+
}
|
|
101
|
+
// Attempt to load CDN settings.
|
|
102
|
+
const settings = host.location.Settings;
|
|
103
|
+
if (settings === null || settings === void 0 ? void 0 : settings.CDN) {
|
|
104
|
+
this.EntityCdnUrl = (_a = settings.CDN.entityURL) === null || _a === void 0 ? void 0 : _a[env];
|
|
105
|
+
// We need to fix our configs.
|
|
106
|
+
if (this.EntityCdnUrl) {
|
|
107
|
+
if (this.EntityCdnUrl.includes("entitiesListForCDN")) {
|
|
108
|
+
this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", this.accountId);
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", "entitiesListForCDN/" + this.accountId);
|
|
112
|
+
}
|
|
124
113
|
}
|
|
114
|
+
this.LegacyTilesetCdnUrl = (_b = settings.CDN.legacyTilesetURL) === null || _b === void 0 ? void 0 : _b[env];
|
|
125
115
|
}
|
|
126
|
-
this.LegacyTilesetCdnUrl = (_d = hostSettings.CDN.legacyTilesetURL) === null || _d === void 0 ? void 0 : _d[env];
|
|
127
116
|
}
|
|
128
117
|
}
|
|
129
118
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bruce-api.js","sourceRoot":"","sources":["../../../src/api/bruce-api.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"bruce-api.js","sourceRoot":"","sources":["../../../src/api/bruce-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Api } from "../bruce-models";
|
|
2
1
|
export declare namespace AccountSettings {
|
|
3
2
|
type Settings = IBruceApi | INavigator | any;
|
|
4
3
|
interface IBruceApi {
|
|
@@ -6,10 +5,8 @@ export declare namespace AccountSettings {
|
|
|
6
5
|
"DatabaseServer.ID"?: number;
|
|
7
6
|
DBLocation?: string;
|
|
8
7
|
DBServer?: string;
|
|
9
|
-
DBReadonlyServers?: string[];
|
|
10
8
|
FileStorageRegion?: string;
|
|
11
9
|
FileStorageName?: string;
|
|
12
|
-
BruceAPIURL?: Record<Api.Env, string>;
|
|
13
10
|
}
|
|
14
11
|
interface INavigator {
|
|
15
12
|
branding?: {
|