bruce-models 3.2.5 → 3.2.6
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 +64 -10
- package/dist/bruce-models.es5.js.map +1 -1
- package/dist/bruce-models.umd.js +64 -10
- package/dist/bruce-models.umd.js.map +1 -1
- package/dist/lib/api/api-getters.js +12 -3
- package/dist/lib/api/api-getters.js.map +1 -1
- package/dist/lib/api/bruce-api.js +19 -0
- package/dist/lib/api/bruce-api.js.map +1 -1
- package/dist/lib/bruce-models.js +1 -1
- package/dist/lib/client-file/client-file.js +14 -4
- package/dist/lib/client-file/client-file.js.map +1 -1
- package/dist/lib/server/hosting-location.js +18 -2
- package/dist/lib/server/hosting-location.js.map +1 -1
- package/dist/types/api/api-getters.d.ts +2 -0
- package/dist/types/api/bruce-api.d.ts +8 -0
- package/dist/types/bruce-models.d.ts +1 -1
- package/dist/types/client-file/client-file.d.ts +2 -0
- package/dist/types/server/hosting-location.d.ts +3 -0
- package/package.json +1 -1
|
@@ -107,7 +107,7 @@ class ApiGetters {
|
|
|
107
107
|
if (!params) {
|
|
108
108
|
params = {};
|
|
109
109
|
}
|
|
110
|
-
let { accountId, env } = params;
|
|
110
|
+
let { accountId, env, loadConfig, loadWebSocket } = params;
|
|
111
111
|
accountId = accountId ? accountId : this.accountId;
|
|
112
112
|
env = env ? env : this.env;
|
|
113
113
|
const key = `${accountId}-${env}`;
|
|
@@ -115,7 +115,11 @@ class ApiGetters {
|
|
|
115
115
|
this.bruce[key] = new bruce_api_1.BruceApi.Api({
|
|
116
116
|
accountId,
|
|
117
117
|
env,
|
|
118
|
-
|
|
118
|
+
loadConfig: loadConfig,
|
|
119
|
+
loadWebSocket: loadWebSocket,
|
|
120
|
+
guardian: this.GetGuardianApi({
|
|
121
|
+
env
|
|
122
|
+
}),
|
|
119
123
|
});
|
|
120
124
|
this.bruce[key].SetSessionId(this.sessionId);
|
|
121
125
|
}
|
|
@@ -132,7 +136,12 @@ class ApiGetters {
|
|
|
132
136
|
accountId: this.accountId,
|
|
133
137
|
env: this.env,
|
|
134
138
|
getApi: (accountId, env) => {
|
|
135
|
-
return this.GetBruceApi({
|
|
139
|
+
return this.GetBruceApi({
|
|
140
|
+
accountId,
|
|
141
|
+
env,
|
|
142
|
+
loadWebSocket: this.accountId == accountId,
|
|
143
|
+
loadConfig: this.accountId == accountId
|
|
144
|
+
});
|
|
136
145
|
}
|
|
137
146
|
};
|
|
138
147
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-getters.js","sourceRoot":"","sources":["../../../src/api/api-getters.ts"],"names":[],"mappings":";;;AACA,+BAA4B;AAC5B,2CAAuC;AACvC,6CAAyC;AACzC,iDAA6C;AAE7C;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAa,UAAU;IAWnB,YAAY,MAQX;QAlBO,UAAK,GAA8B,EAAE,CAAC;QACtC,aAAQ,GAAiC,EAAE,CAAC;QAC5C,WAAM,GAA+B,EAAE,CAAC;QAiB5C,IAAI,CAAC,SAAS,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,CAAC;QACnC,IAAI,CAAC,GAAG,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,EAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,SAAG,CAAC,IAAI,CAAC,IAAI,CAAC;QACpD,IAAI,CAAC,SAAS,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,CAAC;IACvC,CAAC;IAED;;OAEG;IACI,UAAU;;QACb,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,EAAE;YAC1B,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,0CAAE,KAAK,0CAAE,KAAK,EAAE,CAAC;SACnC;QACD,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC7B,MAAA,MAAA,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,0CAAE,KAAK,0CAAE,KAAK,EAAE,CAAC;SACtC;QACD,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE;YAC3B,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,0CAAE,KAAK,0CAAE,KAAK,EAAE,CAAC;SACpC;IACL,CAAC;IAED;;;OAGG;IACI,YAAY,CAAC,SAAiB;QACjC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAED;;;OAGG;IACI,YAAY;QACf,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,GAAa;QACvB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,MAAM;QACT,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IAED;;;;OAIG;IACI,YAAY,CAAC,SAAiB;QACjC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,EAAE;YAC1B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;SAC3C;QACD,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE;YAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;SAC5C;QACD,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAED;;;OAGG;IACI,YAAY;QACf,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACI,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"api-getters.js","sourceRoot":"","sources":["../../../src/api/api-getters.ts"],"names":[],"mappings":"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"}
|
|
@@ -187,6 +187,25 @@ var BruceApi;
|
|
|
187
187
|
GetCdnBaseUrl() {
|
|
188
188
|
return this.cdnBaseUrl;
|
|
189
189
|
}
|
|
190
|
+
/**
|
|
191
|
+
* Returns a url routed through the API's CDN.
|
|
192
|
+
* If the CDN is not enabled for the account, this will return null.
|
|
193
|
+
* @param url suffix to append to the base url.
|
|
194
|
+
* @param urlParams
|
|
195
|
+
* @returns
|
|
196
|
+
*/
|
|
197
|
+
ConstructCdnUrl(url, urlParams) {
|
|
198
|
+
if (!this.cdnBaseUrl) {
|
|
199
|
+
return null;
|
|
200
|
+
}
|
|
201
|
+
let cdnUrl = this.cdnBaseUrl + url;
|
|
202
|
+
if (!urlParams) {
|
|
203
|
+
urlParams = new URLSearchParams();
|
|
204
|
+
}
|
|
205
|
+
urlParams.set("accountId", this.accountId);
|
|
206
|
+
cdnUrl += "?" + urlParams.toString();
|
|
207
|
+
return cdnUrl;
|
|
208
|
+
}
|
|
190
209
|
/**
|
|
191
210
|
* Warning: This will cancel the init process.
|
|
192
211
|
* The init process loads a region specific endpoint.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bruce-api.js","sourceRoot":"","sources":["../../../src/api/bruce-api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA6C;AAC7C,+BAAiC;AACjC,6DAAyD;AACzD,iDAA6C;AAC7C,iEAA6D;AAE7D;;;GAGG;AACH,IAAiB,QAAQ,
|
|
1
|
+
{"version":3,"file":"bruce-api.js","sourceRoot":"","sources":["../../../src/api/bruce-api.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/bruce-models.js
CHANGED
|
@@ -94,5 +94,5 @@ __exportStar(require("./internal/uploader"), exports);
|
|
|
94
94
|
__exportStar(require("./plugin/plugin"), exports);
|
|
95
95
|
__exportStar(require("./environment"), exports);
|
|
96
96
|
__exportStar(require("./data-source/data-source"), exports);
|
|
97
|
-
exports.VERSION = "3.2.
|
|
97
|
+
exports.VERSION = "3.2.6";
|
|
98
98
|
//# sourceMappingURL=bruce-models.js.map
|
|
@@ -45,11 +45,16 @@ var ClientFile;
|
|
|
45
45
|
* @returns
|
|
46
46
|
*/
|
|
47
47
|
function GetUrl(params) {
|
|
48
|
-
let { api, fileId } = params;
|
|
48
|
+
let { api, fileId, viaCdn } = params;
|
|
49
49
|
if (!api) {
|
|
50
50
|
api = environment_1.ENVIRONMENT.Api().GetBruceApi();
|
|
51
51
|
}
|
|
52
|
-
|
|
52
|
+
const urlSuffix = `file/${fileId}`;
|
|
53
|
+
const cdnUrl = viaCdn ? api.ConstructCdnUrl(urlSuffix) : null;
|
|
54
|
+
if (cdnUrl) {
|
|
55
|
+
return cdnUrl;
|
|
56
|
+
}
|
|
57
|
+
return `${api.GetBaseUrl()}${urlSuffix}`;
|
|
53
58
|
}
|
|
54
59
|
ClientFile.GetUrl = GetUrl;
|
|
55
60
|
/**
|
|
@@ -58,11 +63,16 @@ var ClientFile;
|
|
|
58
63
|
* @returns
|
|
59
64
|
*/
|
|
60
65
|
function GetUrlWithExt(params) {
|
|
61
|
-
let { api, file } = params;
|
|
66
|
+
let { api, file, viaCdn } = params;
|
|
62
67
|
if (!api) {
|
|
63
68
|
api = environment_1.ENVIRONMENT.Api().GetBruceApi();
|
|
64
69
|
}
|
|
65
|
-
|
|
70
|
+
const urlSuffix = file.FileExt ? `file/${file.ID}${file.FileExt}` : `file/${file.ID}`;
|
|
71
|
+
const cdnUrl = viaCdn ? api.ConstructCdnUrl(urlSuffix) : null;
|
|
72
|
+
if (cdnUrl) {
|
|
73
|
+
return cdnUrl;
|
|
74
|
+
}
|
|
75
|
+
return `${api.GetBaseUrl()}${urlSuffix}`;
|
|
66
76
|
}
|
|
67
77
|
ClientFile.GetUrlWithExt = GetUrlWithExt;
|
|
68
78
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-file.js","sourceRoot":"","sources":["../../../src/client-file/client-file.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiC;AAGjC,gDAA6C;AAC7C,mDAAgD;AAEhD;;;GAGG;AACH,IAAiB,UAAU,
|
|
1
|
+
{"version":3,"file":"client-file.js","sourceRoot":"","sources":["../../../src/client-file/client-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -131,13 +131,28 @@ var HostingLocation;
|
|
|
131
131
|
*/
|
|
132
132
|
function GetKeyByAccountId(params) {
|
|
133
133
|
return __awaiter(this, void 0, void 0, function* () {
|
|
134
|
-
let { accountId, apiSettings, api, req } = params;
|
|
134
|
+
let { accountId, apiSettings, api, account, req } = params;
|
|
135
135
|
if (!accountId && !apiSettings) {
|
|
136
136
|
throw ("Invalid accountId or apiSettings");
|
|
137
137
|
}
|
|
138
138
|
if (!api) {
|
|
139
139
|
api = environment_1.ENVIRONMENT.Api().GetGuardianApi();
|
|
140
140
|
}
|
|
141
|
+
// We'll prioritize account record if provided.
|
|
142
|
+
if (accountId && !account) {
|
|
143
|
+
account = (yield account_1.Account.Get({
|
|
144
|
+
accountId,
|
|
145
|
+
api,
|
|
146
|
+
req
|
|
147
|
+
})).account;
|
|
148
|
+
}
|
|
149
|
+
if (account === null || account === void 0 ? void 0 : account["HostingLocation.Key"]) {
|
|
150
|
+
return {
|
|
151
|
+
key: account["HostingLocation.Key"],
|
|
152
|
+
isLegacy: false
|
|
153
|
+
};
|
|
154
|
+
}
|
|
155
|
+
// Fallback to settings JSON for older records.
|
|
141
156
|
const settings = apiSettings ? apiSettings : (yield account_1.Account.GetAppSettings({
|
|
142
157
|
api,
|
|
143
158
|
accountId,
|
|
@@ -169,12 +184,13 @@ var HostingLocation;
|
|
|
169
184
|
*/
|
|
170
185
|
function GetByAccountId(params) {
|
|
171
186
|
return __awaiter(this, void 0, void 0, function* () {
|
|
172
|
-
let { accountId, apiSettings, api, req } = params;
|
|
187
|
+
let { accountId, apiSettings, api, req, account } = params;
|
|
173
188
|
if (!api) {
|
|
174
189
|
api = environment_1.ENVIRONMENT.Api().GetGuardianApi();
|
|
175
190
|
}
|
|
176
191
|
const data = yield GetKeyByAccountId({
|
|
177
192
|
accountId,
|
|
193
|
+
account,
|
|
178
194
|
apiSettings,
|
|
179
195
|
api,
|
|
180
196
|
req
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosting-location.js","sourceRoot":"","sources":["../../../src/server/hosting-location.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAA6C;AAE7C,oCAAiC;AAEjC,gDAA6C;AAE7C;;;GAGG;AACH,IAAiB,eAAe,
|
|
1
|
+
{"version":3,"file":"hosting-location.js","sourceRoot":"","sources":["../../../src/server/hosting-location.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,6 +62,14 @@ export declare namespace BruceApi {
|
|
|
62
62
|
* @returns
|
|
63
63
|
*/
|
|
64
64
|
GetCdnBaseUrl(): string;
|
|
65
|
+
/**
|
|
66
|
+
* Returns a url routed through the API's CDN.
|
|
67
|
+
* If the CDN is not enabled for the account, this will return null.
|
|
68
|
+
* @param url suffix to append to the base url.
|
|
69
|
+
* @param urlParams
|
|
70
|
+
* @returns
|
|
71
|
+
*/
|
|
72
|
+
ConstructCdnUrl(url: string, urlParams?: URLSearchParams): string;
|
|
65
73
|
/**
|
|
66
74
|
* Warning: This will cancel the init process.
|
|
67
75
|
* The init process loads a region specific endpoint.
|
|
@@ -43,6 +43,7 @@ export declare namespace ClientFile {
|
|
|
43
43
|
function GetUrl(params: {
|
|
44
44
|
api?: BruceApi.Api;
|
|
45
45
|
fileId: string;
|
|
46
|
+
viaCdn?: boolean;
|
|
46
47
|
}): string;
|
|
47
48
|
/**
|
|
48
49
|
* Returns the URL for a client file with the extension.
|
|
@@ -52,6 +53,7 @@ export declare namespace ClientFile {
|
|
|
52
53
|
function GetUrlWithExt(params: {
|
|
53
54
|
api?: BruceApi.Api;
|
|
54
55
|
file: IFile;
|
|
56
|
+
viaCdn?: boolean;
|
|
55
57
|
}): string;
|
|
56
58
|
/**
|
|
57
59
|
* Returns a client file record by ID.
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Account } from "../account/account";
|
|
1
2
|
import { AccountSettings } from "../account/account-settings";
|
|
2
3
|
import { Api } from "../api/api";
|
|
3
4
|
import { GuardianApi } from "../api/guardian-api";
|
|
@@ -75,6 +76,7 @@ export declare namespace HostingLocation {
|
|
|
75
76
|
*/
|
|
76
77
|
function GetKeyByAccountId(params: {
|
|
77
78
|
accountId?: string;
|
|
79
|
+
account?: Account.IAccount;
|
|
78
80
|
apiSettings?: AccountSettings.IBruceApi;
|
|
79
81
|
api?: GuardianApi.Api;
|
|
80
82
|
req?: Api.IReqParams;
|
|
@@ -89,6 +91,7 @@ export declare namespace HostingLocation {
|
|
|
89
91
|
*/
|
|
90
92
|
function GetByAccountId(params: {
|
|
91
93
|
accountId?: string;
|
|
94
|
+
account?: Account.IAccount;
|
|
92
95
|
apiSettings?: AccountSettings.IBruceApi;
|
|
93
96
|
api?: GuardianApi.Api;
|
|
94
97
|
req?: Api.IReqParams;
|