@azure/msal-common 14.13.1 → 14.14.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/account/AccountInfo.mjs +1 -1
- package/dist/account/AuthToken.mjs +1 -1
- package/dist/account/CcsCredential.mjs +1 -1
- package/dist/account/ClientInfo.mjs +1 -1
- package/dist/account/TokenClaims.mjs +1 -1
- package/dist/authority/Authority.mjs +1 -1
- package/dist/authority/AuthorityFactory.mjs +1 -1
- package/dist/authority/AuthorityMetadata.mjs +1 -1
- package/dist/authority/AuthorityOptions.mjs +1 -1
- package/dist/authority/AuthorityType.mjs +1 -1
- package/dist/authority/CloudInstanceDiscoveryErrorResponse.mjs +1 -1
- package/dist/authority/CloudInstanceDiscoveryResponse.mjs +1 -1
- package/dist/authority/OpenIdConfigResponse.mjs +1 -1
- package/dist/authority/ProtocolMode.mjs +1 -1
- package/dist/authority/RegionDiscovery.mjs +1 -1
- package/dist/cache/CacheManager.mjs +1 -1
- package/dist/cache/entities/AccountEntity.mjs +1 -1
- package/dist/cache/entities/ServerTelemetryEntity.d.ts +1 -0
- package/dist/cache/entities/ServerTelemetryEntity.d.ts.map +1 -1
- package/dist/cache/persistence/TokenCacheContext.mjs +1 -1
- package/dist/cache/utils/CacheHelpers.mjs +1 -1
- package/dist/client/AuthorizationCodeClient.mjs +1 -1
- package/dist/client/BaseClient.mjs +1 -1
- package/dist/client/RefreshTokenClient.mjs +1 -1
- package/dist/client/SilentFlowClient.mjs +1 -1
- package/dist/config/ClientConfiguration.mjs +1 -1
- package/dist/constants/AADServerParamKeys.d.ts +1 -0
- package/dist/constants/AADServerParamKeys.d.ts.map +1 -1
- package/dist/constants/AADServerParamKeys.mjs +3 -2
- package/dist/constants/AADServerParamKeys.mjs.map +1 -1
- package/dist/crypto/ICrypto.mjs +1 -1
- package/dist/crypto/JoseHeader.mjs +1 -1
- package/dist/crypto/PopTokenGenerator.mjs +1 -1
- package/dist/error/AuthError.mjs +1 -1
- package/dist/error/AuthErrorCodes.mjs +1 -1
- package/dist/error/CacheError.mjs +1 -1
- package/dist/error/CacheErrorCodes.mjs +1 -1
- package/dist/error/ClientAuthError.mjs +1 -1
- package/dist/error/ClientAuthErrorCodes.mjs +1 -1
- package/dist/error/ClientConfigurationError.mjs +1 -1
- package/dist/error/ClientConfigurationErrorCodes.mjs +1 -1
- package/dist/error/InteractionRequiredAuthError.mjs +1 -1
- package/dist/error/InteractionRequiredAuthErrorCodes.mjs +1 -1
- package/dist/error/JoseHeaderError.mjs +1 -1
- package/dist/error/JoseHeaderErrorCodes.mjs +1 -1
- package/dist/error/ServerError.mjs +1 -1
- package/dist/index.cjs +64 -3
- package/dist/index.cjs.map +1 -1
- package/dist/index.mjs +1 -1
- package/dist/logger/Logger.mjs +1 -1
- package/dist/network/INetworkModule.mjs +1 -1
- package/dist/network/NetworkManager.mjs +1 -1
- package/dist/network/ThrottlingUtils.mjs +1 -1
- package/dist/packageMetadata.d.ts +1 -1
- package/dist/packageMetadata.mjs +2 -2
- package/dist/request/AuthenticationHeaderParser.mjs +1 -1
- package/dist/request/RequestParameterBuilder.mjs +1 -1
- package/dist/request/RequestValidator.mjs +1 -1
- package/dist/request/ScopeSet.mjs +1 -1
- package/dist/response/ResponseHandler.mjs +1 -1
- package/dist/telemetry/performance/PerformanceClient.mjs +1 -1
- package/dist/telemetry/performance/PerformanceEvent.mjs +1 -1
- package/dist/telemetry/performance/StubPerformanceClient.mjs +1 -1
- package/dist/telemetry/server/ServerTelemetryManager.d.ts +12 -0
- package/dist/telemetry/server/ServerTelemetryManager.d.ts.map +1 -1
- package/dist/telemetry/server/ServerTelemetryManager.mjs +61 -2
- package/dist/telemetry/server/ServerTelemetryManager.mjs.map +1 -1
- package/dist/url/UrlString.mjs +1 -1
- package/dist/utils/ClientAssertionUtils.mjs +1 -1
- package/dist/utils/Constants.mjs +1 -1
- package/dist/utils/FunctionWrappers.mjs +1 -1
- package/dist/utils/ProtocolUtils.mjs +1 -1
- package/dist/utils/StringUtils.mjs +1 -1
- package/dist/utils/TimeUtils.mjs +1 -1
- package/dist/utils/UrlUtils.mjs +1 -1
- package/package.json +1 -1
- package/src/cache/entities/ServerTelemetryEntity.ts +1 -0
- package/src/constants/AADServerParamKeys.ts +1 -0
- package/src/packageMetadata.ts +1 -1
- package/src/telemetry/server/ServerTelemetryManager.ts +95 -1
package/dist/index.mjs
CHANGED
package/dist/logger/Logger.mjs
CHANGED
package/dist/packageMetadata.mjs
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
/*! @azure/msal-common v14.
|
|
1
|
+
/*! @azure/msal-common v14.14.0 2024-07-23 */
|
|
2
2
|
'use strict';
|
|
3
3
|
/* eslint-disable header/header */
|
|
4
4
|
const name = "@azure/msal-common";
|
|
5
|
-
const version = "14.
|
|
5
|
+
const version = "14.14.0";
|
|
6
6
|
|
|
7
7
|
export { name, version };
|
|
8
8
|
//# sourceMappingURL=packageMetadata.mjs.map
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! @azure/msal-common v14.
|
|
1
|
+
/*! @azure/msal-common v14.14.0 2024-07-23 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import { Constants, ResponseMode, OIDC_DEFAULT_SCOPES, HeaderNames, CLIENT_INFO, ClaimsRequestKeys, PasswordGrantConstants, AuthenticationScheme, ThrottlingConstants } from '../utils/Constants.mjs';
|
|
4
4
|
import { RESPONSE_TYPE, RESPONSE_MODE, NATIVE_BROKER, SCOPE, CLIENT_ID, REDIRECT_URI, POST_LOGOUT_URI, ID_TOKEN_HINT, DOMAIN_HINT, LOGIN_HINT, SID, CLAIMS, CLIENT_REQUEST_ID, X_CLIENT_SKU, X_CLIENT_VER, X_CLIENT_OS, X_CLIENT_CPU, X_APP_NAME, X_APP_VER, PROMPT, STATE, NONCE, CODE_CHALLENGE, CODE_CHALLENGE_METHOD, CODE, DEVICE_CODE, REFRESH_TOKEN, CODE_VERIFIER, CLIENT_SECRET, CLIENT_ASSERTION, CLIENT_ASSERTION_TYPE, OBO_ASSERTION, REQUESTED_TOKEN_USE, GRANT_TYPE, TOKEN_TYPE, REQ_CNF, X_CLIENT_CURR_TELEM, X_CLIENT_LAST_TELEM, X_MS_LIB_CAPABILITY, LOGOUT_HINT } from '../constants/AADServerParamKeys.mjs';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! @azure/msal-common v14.
|
|
1
|
+
/*! @azure/msal-common v14.14.0 2024-07-23 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import { createClientConfigurationError } from '../error/ClientConfigurationError.mjs';
|
|
4
4
|
import { CodeChallengeMethodValues, PromptValue } from '../utils/Constants.mjs';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! @azure/msal-common v14.
|
|
1
|
+
/*! @azure/msal-common v14.14.0 2024-07-23 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import { IntFields, PerformanceEventAbbreviations, PerformanceEventStatus } from './PerformanceEvent.mjs';
|
|
4
4
|
import { StubPerformanceMeasurement } from './StubPerformanceClient.mjs';
|
|
@@ -3,6 +3,13 @@ import { CacheManager } from "../../cache/CacheManager";
|
|
|
3
3
|
import { ServerTelemetryRequest } from "./ServerTelemetryRequest";
|
|
4
4
|
import { ServerTelemetryEntity } from "../../cache/entities/ServerTelemetryEntity";
|
|
5
5
|
import { RegionDiscoveryMetadata } from "../../authority/RegionDiscoveryMetadata";
|
|
6
|
+
type SkuParams = {
|
|
7
|
+
libraryName?: string;
|
|
8
|
+
libraryVersion?: string;
|
|
9
|
+
extensionName?: string;
|
|
10
|
+
extensionVersion?: string;
|
|
11
|
+
skus?: string;
|
|
12
|
+
};
|
|
6
13
|
/** @internal */
|
|
7
14
|
export declare class ServerTelemetryManager {
|
|
8
15
|
private cacheManager;
|
|
@@ -63,5 +70,10 @@ export declare class ServerTelemetryManager {
|
|
|
63
70
|
* Set cache outcome
|
|
64
71
|
*/
|
|
65
72
|
setCacheOutcome(cacheOutcome: CacheOutcome): void;
|
|
73
|
+
setNativeBrokerErrorCode(errorCode: string): void;
|
|
74
|
+
getNativeBrokerErrorCode(): string | undefined;
|
|
75
|
+
clearNativeBrokerErrorCode(): void;
|
|
76
|
+
static makeExtraSkuString(params: SkuParams): string;
|
|
66
77
|
}
|
|
78
|
+
export {};
|
|
67
79
|
//# sourceMappingURL=ServerTelemetryManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerTelemetryManager.d.ts","sourceRoot":"","sources":["../../../src/telemetry/server/ServerTelemetryManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAGH,YAAY,EAIf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"ServerTelemetryManager.d.ts","sourceRoot":"","sources":["../../../src/telemetry/server/ServerTelemetryManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAGH,YAAY,EAIf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAKlF,KAAK,SAAS,GAAG;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAsDF,gBAAgB;AAChB,qBAAa,sBAAsB;IAC/B,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,YAAY,CAAqC;IACzD,OAAO,CAAC,aAAa,CAAsC;IAC3D,OAAO,CAAC,YAAY,CAA6C;gBAG7D,gBAAgB,EAAE,sBAAsB,EACxC,YAAY,EAAE,YAAY;IAc9B;;OAEG;IACH,iCAAiC,IAAI,MAAM;IAuB3C;;OAEG;IACH,8BAA8B,IAAI,MAAM;IA8BxC;;;OAGG;IACH,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAsCxC;;OAEG;IACH,kBAAkB,IAAI,MAAM;IAW5B;;OAEG;IACH,eAAe,IAAI,qBAAqB;IAaxC;;OAEG;IACH,mBAAmB,IAAI,IAAI;IAyB3B;;;OAGG;IACH,MAAM,CAAC,eAAe,CAClB,qBAAqB,EAAE,qBAAqB,GAC7C,MAAM;IAkCT;;;;OAIG;IACH,wBAAwB,IAAI,MAAM;IAYlC;;;;;OAKG;IACH,6BAA6B,CACzB,uBAAuB,EAAE,uBAAuB,GACjD,IAAI;IAMP;;OAEG;IACH,eAAe,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI;IAIjD,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IASjD,wBAAwB,IAAI,MAAM,GAAG,SAAS;IAI9C,0BAA0B,IAAI,IAAI;IASlC,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;CAGvD"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! @azure/msal-common v14.
|
|
1
|
+
/*! @azure/msal-common v14.14.0 2024-07-23 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import { CacheOutcome, Constants, SERVER_TELEM_CONSTANTS, Separators } from '../../utils/Constants.mjs';
|
|
4
4
|
import { AuthError } from '../../error/AuthError.mjs';
|
|
@@ -7,6 +7,44 @@ import { AuthError } from '../../error/AuthError.mjs';
|
|
|
7
7
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
8
8
|
* Licensed under the MIT License.
|
|
9
9
|
*/
|
|
10
|
+
const skuGroupSeparator = ",";
|
|
11
|
+
const skuValueSeparator = "|";
|
|
12
|
+
function makeExtraSkuString(params) {
|
|
13
|
+
const { skus, libraryName, libraryVersion, extensionName, extensionVersion, } = params;
|
|
14
|
+
const skuMap = new Map([
|
|
15
|
+
[0, [libraryName, libraryVersion]],
|
|
16
|
+
[2, [extensionName, extensionVersion]],
|
|
17
|
+
]);
|
|
18
|
+
let skuArr = [];
|
|
19
|
+
if (skus?.length) {
|
|
20
|
+
skuArr = skus.split(skuGroupSeparator);
|
|
21
|
+
// Ignore invalid input sku param
|
|
22
|
+
if (skuArr.length < 4) {
|
|
23
|
+
return skus;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
skuArr = Array.from({ length: 4 }, () => skuValueSeparator);
|
|
28
|
+
}
|
|
29
|
+
skuMap.forEach((value, key) => {
|
|
30
|
+
if (value.length === 2 && value[0]?.length && value[1]?.length) {
|
|
31
|
+
setSku({
|
|
32
|
+
skuArr,
|
|
33
|
+
index: key,
|
|
34
|
+
skuName: value[0],
|
|
35
|
+
skuVersion: value[1],
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
return skuArr.join(skuGroupSeparator);
|
|
40
|
+
}
|
|
41
|
+
function setSku(params) {
|
|
42
|
+
const { skuArr, index, skuName, skuVersion } = params;
|
|
43
|
+
if (index >= skuArr.length) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
skuArr[index] = [skuName, skuVersion].join(skuValueSeparator);
|
|
47
|
+
}
|
|
10
48
|
/** @internal */
|
|
11
49
|
class ServerTelemetryManager {
|
|
12
50
|
constructor(telemetryRequest, cacheManager) {
|
|
@@ -26,7 +64,12 @@ class ServerTelemetryManager {
|
|
|
26
64
|
*/
|
|
27
65
|
generateCurrentRequestHeaderValue() {
|
|
28
66
|
const request = `${this.apiId}${SERVER_TELEM_CONSTANTS.VALUE_SEPARATOR}${this.cacheOutcome}`;
|
|
29
|
-
const
|
|
67
|
+
const platformFieldsArr = [this.wrapperSKU, this.wrapperVer];
|
|
68
|
+
const nativeBrokerErrorCode = this.getNativeBrokerErrorCode();
|
|
69
|
+
if (nativeBrokerErrorCode?.length) {
|
|
70
|
+
platformFieldsArr.push(`broker_error=${nativeBrokerErrorCode}`);
|
|
71
|
+
}
|
|
72
|
+
const platformFields = platformFieldsArr.join(SERVER_TELEM_CONSTANTS.VALUE_SEPARATOR);
|
|
30
73
|
const regionDiscoveryFields = this.getRegionDiscoveryFields();
|
|
31
74
|
const requestWithRegionDiscoveryFields = [
|
|
32
75
|
request,
|
|
@@ -203,6 +246,22 @@ class ServerTelemetryManager {
|
|
|
203
246
|
setCacheOutcome(cacheOutcome) {
|
|
204
247
|
this.cacheOutcome = cacheOutcome;
|
|
205
248
|
}
|
|
249
|
+
setNativeBrokerErrorCode(errorCode) {
|
|
250
|
+
const lastRequests = this.getLastRequests();
|
|
251
|
+
lastRequests.nativeBrokerErrorCode = errorCode;
|
|
252
|
+
this.cacheManager.setServerTelemetry(this.telemetryCacheKey, lastRequests);
|
|
253
|
+
}
|
|
254
|
+
getNativeBrokerErrorCode() {
|
|
255
|
+
return this.getLastRequests().nativeBrokerErrorCode;
|
|
256
|
+
}
|
|
257
|
+
clearNativeBrokerErrorCode() {
|
|
258
|
+
const lastRequests = this.getLastRequests();
|
|
259
|
+
delete lastRequests.nativeBrokerErrorCode;
|
|
260
|
+
this.cacheManager.setServerTelemetry(this.telemetryCacheKey, lastRequests);
|
|
261
|
+
}
|
|
262
|
+
static makeExtraSkuString(params) {
|
|
263
|
+
return makeExtraSkuString(params);
|
|
264
|
+
}
|
|
206
265
|
}
|
|
207
266
|
|
|
208
267
|
export { ServerTelemetryManager };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerTelemetryManager.mjs","sources":["../../../src/telemetry/server/ServerTelemetryManager.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAAA;;;AAGG;AAgBH;MACa,sBAAsB,CAAA;IAY/B,WACI,CAAA,gBAAwC,EACxC,YAA0B,EAAA;AAJtB,QAAA,IAAA,CAAA,YAAY,GAAiB,YAAY,CAAC,cAAc,CAAC;AAM7D,QAAA,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;AACjC,QAAA,IAAI,CAAC,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC;AACpC,QAAA,IAAI,CAAC,aAAa,GAAG,gBAAgB,CAAC,aAAa,CAAC;QACpD,IAAI,CAAC,UAAU,GAAG,gBAAgB,CAAC,UAAU,IAAI,SAAS,CAAC,YAAY,CAAC;QACxE,IAAI,CAAC,UAAU,GAAG,gBAAgB,CAAC,UAAU,IAAI,SAAS,CAAC,YAAY,CAAC;AAExE,QAAA,IAAI,CAAC,iBAAiB;AAClB,YAAA,sBAAsB,CAAC,SAAS;AAChC,gBAAA,UAAU,CAAC,mBAAmB;gBAC9B,gBAAgB,CAAC,QAAQ,CAAC;KACjC;AAED;;AAEG;IACH,iCAAiC,GAAA;AAC7B,QAAA,MAAM,OAAO,GAAG,CAAG,EAAA,IAAI,CAAC,KAAK,CAAA,EAAG,sBAAsB,CAAC,eAAe,CAAG,EAAA,IAAI,CAAC,YAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"ServerTelemetryManager.mjs","sources":["../../../src/telemetry/server/ServerTelemetryManager.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/dist/url/UrlString.mjs
CHANGED
package/dist/utils/Constants.mjs
CHANGED
package/dist/utils/TimeUtils.mjs
CHANGED
package/dist/utils/UrlUtils.mjs
CHANGED
package/package.json
CHANGED
package/src/packageMetadata.ts
CHANGED
|
@@ -17,6 +17,69 @@ import { ServerTelemetryRequest } from "./ServerTelemetryRequest";
|
|
|
17
17
|
import { ServerTelemetryEntity } from "../../cache/entities/ServerTelemetryEntity";
|
|
18
18
|
import { RegionDiscoveryMetadata } from "../../authority/RegionDiscoveryMetadata";
|
|
19
19
|
|
|
20
|
+
const skuGroupSeparator = ",";
|
|
21
|
+
const skuValueSeparator = "|";
|
|
22
|
+
|
|
23
|
+
type SkuParams = {
|
|
24
|
+
libraryName?: string;
|
|
25
|
+
libraryVersion?: string;
|
|
26
|
+
extensionName?: string;
|
|
27
|
+
extensionVersion?: string;
|
|
28
|
+
skus?: string;
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
function makeExtraSkuString(params: SkuParams): string {
|
|
32
|
+
const {
|
|
33
|
+
skus,
|
|
34
|
+
libraryName,
|
|
35
|
+
libraryVersion,
|
|
36
|
+
extensionName,
|
|
37
|
+
extensionVersion,
|
|
38
|
+
} = params;
|
|
39
|
+
const skuMap: Map<number, (string | undefined)[]> = new Map([
|
|
40
|
+
[0, [libraryName, libraryVersion]],
|
|
41
|
+
[2, [extensionName, extensionVersion]],
|
|
42
|
+
]);
|
|
43
|
+
let skuArr: string[] = [];
|
|
44
|
+
|
|
45
|
+
if (skus?.length) {
|
|
46
|
+
skuArr = skus.split(skuGroupSeparator);
|
|
47
|
+
|
|
48
|
+
// Ignore invalid input sku param
|
|
49
|
+
if (skuArr.length < 4) {
|
|
50
|
+
return skus;
|
|
51
|
+
}
|
|
52
|
+
} else {
|
|
53
|
+
skuArr = Array.from({ length: 4 }, () => skuValueSeparator);
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
skuMap.forEach((value, key) => {
|
|
57
|
+
if (value.length === 2 && value[0]?.length && value[1]?.length) {
|
|
58
|
+
setSku({
|
|
59
|
+
skuArr,
|
|
60
|
+
index: key,
|
|
61
|
+
skuName: value[0],
|
|
62
|
+
skuVersion: value[1],
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
return skuArr.join(skuGroupSeparator);
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
function setSku(params: {
|
|
71
|
+
skuArr: string[];
|
|
72
|
+
index: number;
|
|
73
|
+
skuName: string;
|
|
74
|
+
skuVersion: string;
|
|
75
|
+
}): void {
|
|
76
|
+
const { skuArr, index, skuName, skuVersion } = params;
|
|
77
|
+
if (index >= skuArr.length) {
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
skuArr[index] = [skuName, skuVersion].join(skuValueSeparator);
|
|
81
|
+
}
|
|
82
|
+
|
|
20
83
|
/** @internal */
|
|
21
84
|
export class ServerTelemetryManager {
|
|
22
85
|
private cacheManager: CacheManager;
|
|
@@ -51,7 +114,12 @@ export class ServerTelemetryManager {
|
|
|
51
114
|
*/
|
|
52
115
|
generateCurrentRequestHeaderValue(): string {
|
|
53
116
|
const request = `${this.apiId}${SERVER_TELEM_CONSTANTS.VALUE_SEPARATOR}${this.cacheOutcome}`;
|
|
54
|
-
const
|
|
117
|
+
const platformFieldsArr = [this.wrapperSKU, this.wrapperVer];
|
|
118
|
+
const nativeBrokerErrorCode = this.getNativeBrokerErrorCode();
|
|
119
|
+
if (nativeBrokerErrorCode?.length) {
|
|
120
|
+
platformFieldsArr.push(`broker_error=${nativeBrokerErrorCode}`);
|
|
121
|
+
}
|
|
122
|
+
const platformFields = platformFieldsArr.join(
|
|
55
123
|
SERVER_TELEM_CONSTANTS.VALUE_SEPARATOR
|
|
56
124
|
);
|
|
57
125
|
const regionDiscoveryFields = this.getRegionDiscoveryFields();
|
|
@@ -277,4 +345,30 @@ export class ServerTelemetryManager {
|
|
|
277
345
|
setCacheOutcome(cacheOutcome: CacheOutcome): void {
|
|
278
346
|
this.cacheOutcome = cacheOutcome;
|
|
279
347
|
}
|
|
348
|
+
|
|
349
|
+
setNativeBrokerErrorCode(errorCode: string): void {
|
|
350
|
+
const lastRequests = this.getLastRequests();
|
|
351
|
+
lastRequests.nativeBrokerErrorCode = errorCode;
|
|
352
|
+
this.cacheManager.setServerTelemetry(
|
|
353
|
+
this.telemetryCacheKey,
|
|
354
|
+
lastRequests
|
|
355
|
+
);
|
|
356
|
+
}
|
|
357
|
+
|
|
358
|
+
getNativeBrokerErrorCode(): string | undefined {
|
|
359
|
+
return this.getLastRequests().nativeBrokerErrorCode;
|
|
360
|
+
}
|
|
361
|
+
|
|
362
|
+
clearNativeBrokerErrorCode(): void {
|
|
363
|
+
const lastRequests = this.getLastRequests();
|
|
364
|
+
delete lastRequests.nativeBrokerErrorCode;
|
|
365
|
+
this.cacheManager.setServerTelemetry(
|
|
366
|
+
this.telemetryCacheKey,
|
|
367
|
+
lastRequests
|
|
368
|
+
);
|
|
369
|
+
}
|
|
370
|
+
|
|
371
|
+
static makeExtraSkuString(params: SkuParams): string {
|
|
372
|
+
return makeExtraSkuString(params);
|
|
373
|
+
}
|
|
280
374
|
}
|