bruce-models 2.2.9 → 2.3.0
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 +24 -5
- package/dist/bruce-models.es5.js.map +1 -1
- package/dist/bruce-models.umd.js +24 -5
- package/dist/bruce-models.umd.js.map +1 -1
- package/dist/lib/server/hosting-location.js +24 -5
- package/dist/lib/server/hosting-location.js.map +1 -1
- package/dist/types/server/hosting-location.d.ts +9 -0
- package/package.json +1 -1
|
@@ -102,7 +102,7 @@ var HostingLocation;
|
|
|
102
102
|
return null;
|
|
103
103
|
}
|
|
104
104
|
HostingLocation.GuessKey = GuessKey;
|
|
105
|
-
function
|
|
105
|
+
function GetKeyByAccountId(params) {
|
|
106
106
|
return __awaiter(this, void 0, void 0, function* () {
|
|
107
107
|
const { accountId, apiSettings, api, req } = params;
|
|
108
108
|
if (!accountId && !apiSettings) {
|
|
@@ -114,23 +114,42 @@ var HostingLocation;
|
|
|
114
114
|
appId: account_1.Account.EAppId.BruceApi
|
|
115
115
|
})).settings;
|
|
116
116
|
let hostingKey = settings["HostingLocation.Key"];
|
|
117
|
+
let isLegacy = false;
|
|
117
118
|
if (!hostingKey) {
|
|
118
119
|
hostingKey = settings.DBLocation;
|
|
120
|
+
isLegacy = true;
|
|
119
121
|
}
|
|
120
122
|
if (!hostingKey) {
|
|
121
123
|
hostingKey = GuessKey({
|
|
122
124
|
DBServer: settings.DBServer
|
|
123
125
|
});
|
|
126
|
+
isLegacy = true;
|
|
124
127
|
}
|
|
125
|
-
|
|
128
|
+
return {
|
|
129
|
+
key: hostingKey,
|
|
130
|
+
isLegacy
|
|
131
|
+
};
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
HostingLocation.GetKeyByAccountId = GetKeyByAccountId;
|
|
135
|
+
function GetByAccountId(params) {
|
|
136
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
137
|
+
const { accountId, apiSettings, api, req } = params;
|
|
138
|
+
const data = yield GetKeyByAccountId({
|
|
139
|
+
accountId,
|
|
140
|
+
apiSettings,
|
|
141
|
+
api,
|
|
142
|
+
req
|
|
143
|
+
});
|
|
144
|
+
if (!(data === null || data === void 0 ? void 0 : data.key)) {
|
|
126
145
|
return null;
|
|
127
146
|
}
|
|
128
|
-
const
|
|
129
|
-
key:
|
|
147
|
+
const key = yield GetByKey({
|
|
148
|
+
key: data.key,
|
|
130
149
|
api,
|
|
131
150
|
req
|
|
132
151
|
});
|
|
133
|
-
return
|
|
152
|
+
return key;
|
|
134
153
|
});
|
|
135
154
|
}
|
|
136
155
|
HostingLocation.GetByAccountId = GetByAccountId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosting-location.js","sourceRoot":"","sources":["../../../src/server/hosting-location.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAA6C;AAE7C,oCAAiC;AAGjC;;;GAGG;AACH,IAAiB,eAAe,
|
|
1
|
+
{"version":3,"file":"hosting-location.js","sourceRoot":"","sources":["../../../src/server/hosting-location.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAA6C;AAE7C,oCAAiC;AAGjC;;;GAGG;AACH,IAAiB,eAAe,CA+L/B;AA/LD,WAAiB,eAAe;IA6B5B;;;;OAIG;IACH,SAAsB,OAAO,CAAC,MAG7B;;YAGG,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,SAAG,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACpF,OAAO;gBACH,SAAS,EAAE,GAAG,CAAC,KAAK;aACvB,CAAC;QACN,CAAC;KAAA;IAVqB,uBAAO,UAU5B,CAAA;IAED,SAAsB,OAAO,CAAC,MAI7B;;YAGG,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;YAChC,IAAI,CAAC,EAAE,EAAE;gBACL,MAAK,CAAC,YAAY,CAAC,CAAC;aACvB;YACD,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,sBAAsB,EAAE,EAAE,EAAE,SAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9E,OAAO;gBACH,QAAQ,EAAE,GAAG;aAChB,CAAC;QACN,CAAC;KAAA;IAfqB,uBAAO,UAe5B,CAAA;IAED,SAAsB,QAAQ,CAAC,MAI9B;;YAGG,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;YACjC,IAAI,CAAC,GAAG,EAAE;gBACN,MAAK,CAAC,aAAa,CAAC,CAAC;aACxB;YACD,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,uBAAuB,GAAG,EAAE,EAAE,SAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;YAChF,OAAO;gBACH,QAAQ,EAAE,GAAG;aAChB,CAAC;QACN,CAAC;KAAA;IAfqB,wBAAQ,WAe7B,CAAA;IAED;;;;;OAKG;IACH,SAAgB,QAAQ,CAAC,MAGxB;QACG,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;QACzC,IAAI,WAAW,CAAC,QAAQ,CAAC,2BAA2B,CAAC,EAAE;YACnD,OAAO,WAAW,CAAC;SACtB;QACD,IAAI,WAAW,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EAAE;YAClD,OAAO,gBAAgB,CAAC;SAC3B;aACI,IAAI,WAAW,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EAAE;YACvD,OAAO,gBAAgB,CAAC;SAC3B;aACI,IAAI,WAAW,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EAAE;YACvD,OAAO,gBAAgB,CAAC;SAC3B;aACI,IAAI,WAAW,CAAC,QAAQ,CAAC,2BAA2B,CAAC,EAAE;YACxD,OAAO,gBAAgB,CAAC;SAC3B;aACI,IAAI,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YACxC,OAAO,WAAW,CAAC;SACtB;aACI,IAAI,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;YAC/C,OAAO,IAAI,CAAC;SACf;aACI,IAAI,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YAC1C,OAAO,IAAI,CAAC;SACf;aACI,IAAI,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YAC1C,OAAO,IAAI,CAAC;SACf;aACI,IAAI,WAAW,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;YAC5C,OAAO,IAAI,CAAC;SACf;aACI,IAAI,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YACxC,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAvCe,wBAAQ,WAuCvB,CAAA;IAED,SAAsB,iBAAiB,CAAC,MAMvC;;YAKG,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;YACpD,IAAI,CAAC,SAAS,IAAI,CAAC,WAAW,EAAE;gBAC5B,MAAK,CAAC,kCAAkC,CAAC,CAAC;aAC7C;YACD,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,iBAAO,CAAC,cAAc,CAAC;gBACvE,GAAG;gBACH,SAAS;gBACT,KAAK,EAAE,iBAAO,CAAC,MAAM,CAAC,QAAQ;aACjC,CAAC,CAAC,CAAC,QAAqC,CAAC;YAC1C,IAAI,UAAU,GAAG,QAAQ,CAAC,qBAAqB,CAAC,CAAC;YACjD,IAAI,QAAQ,GAAG,KAAK,CAAC;YACrB,IAAI,CAAC,UAAU,EAAE;gBACb,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;gBACjC,QAAQ,GAAG,IAAI,CAAC;aACnB;YACD,IAAI,CAAC,UAAU,EAAE;gBACb,UAAU,GAAG,QAAQ,CAAC;oBAClB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;iBAC9B,CAAC,CAAC;gBACH,QAAQ,GAAG,IAAI,CAAC;aACnB;YACD,OAAO;gBACH,GAAG,EAAE,UAAU;gBACf,QAAQ;aACX,CAAC;QACN,CAAC;KAAA;IApCqB,iCAAiB,oBAoCtC,CAAA;IAED,SAAsB,cAAc,CAAC,MAMpC;;YAGG,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;YACpD,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC;gBACjC,SAAS;gBACT,WAAW;gBACX,GAAG;gBACH,GAAG;aACN,CAAC,CAAC;YACH,IAAI,EAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,CAAA,EAAE;gBACZ,OAAO,IAAI,CAAC;aACf;YACD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC;gBACvB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,GAAG;gBACH,GAAG;aACN,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAzBqB,8BAAc,iBAyBnC,CAAA;AACL,CAAC,EA/LgB,eAAe,GAAf,uBAAe,KAAf,uBAAe,QA+L/B"}
|
|
@@ -54,6 +54,15 @@ export declare namespace HostingLocation {
|
|
|
54
54
|
function GuessKey(params: {
|
|
55
55
|
DBServer?: string;
|
|
56
56
|
}): "HYPERFARM" | "AU-VULTR-FIRST" | "US-VULTR-FIRST" | "EU-VULTR-FIRST" | "SE-VULTR-FIRST" | "DEV-FIRST" | "SE" | "US" | "EU" | "AU" | "DEV";
|
|
57
|
+
function GetKeyByAccountId(params: {
|
|
58
|
+
accountId?: string;
|
|
59
|
+
apiSettings?: AccountSettings.IBruceApi;
|
|
60
|
+
api: GuardianApi.Api;
|
|
61
|
+
req?: Api.IReqParams;
|
|
62
|
+
}): Promise<{
|
|
63
|
+
key: string;
|
|
64
|
+
isLegacy?: boolean;
|
|
65
|
+
}>;
|
|
57
66
|
function GetByAccountId(params: {
|
|
58
67
|
accountId?: string;
|
|
59
68
|
apiSettings?: AccountSettings.IBruceApi;
|