From 572928b8a2a194a7640c9914d23079f991be8c11 Mon Sep 17 00:00:00 2001 From: Emiliano Sanchez Date: Tue, 19 Apr 2022 18:41:15 -0300 Subject: [PATCH 1/2] revert: updated how settings version is accessed --- package-lock.json | 2 +- package.json | 2 +- src/services/splitHttpClient.ts | 22 ++++++++++------------ src/trackers/impressionsTracker.ts | 4 ++-- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9459fc73..79a35942 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@splitsoftware/splitio-commons", - "version": "1.3.1", + "version": "1.3.1-rc.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ba8520d5..0a19cd18 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@splitsoftware/splitio-commons", - "version": "1.3.1", + "version": "1.3.1-rc.1", "description": "Split Javascript SDK common components", "main": "cjs/index.js", "module": "esm/index.js", diff --git a/src/services/splitHttpClient.ts b/src/services/splitHttpClient.ts index b5df0e68..d9ec90f7 100644 --- a/src/services/splitHttpClient.ts +++ b/src/services/splitHttpClient.ts @@ -14,26 +14,24 @@ const messageNoFetch = 'Global fetch API is not available.'; */ export function splitHttpClientFactory(settings: Pick, getFetch?: () => (IFetch | undefined), getOptions?: () => object): ISplitHttpClient { - const log = settings.log; + const { log, core: { authorizationKey }, version, runtime: { ip, hostname } } = settings; const options = getOptions && getOptions(); const fetch = getFetch && getFetch(); // if fetch is not available, log Error if (!fetch) log.error(ERROR_CLIENT_CANNOT_GET_READY, [messageNoFetch]); - return function httpClient(url: string, reqOpts: IRequestOptions = {}, logErrorsAsInfo: boolean = false): Promise { - - const { core: { authorizationKey }, version, runtime: { ip, hostname } } = settings; + const headers: Record = { + 'Accept': 'application/json', + 'Content-Type': 'application/json', + 'Authorization': `Bearer ${authorizationKey}`, + 'SplitSDKVersion': version + }; - const headers: Record = { - 'Accept': 'application/json', - 'Content-Type': 'application/json', - 'Authorization': `Bearer ${authorizationKey}`, - 'SplitSDKVersion': version - }; + if (ip) headers['SplitSDKMachineIP'] = ip; + if (hostname) headers['SplitSDKMachineName'] = hostname; - if (ip) headers['SplitSDKMachineIP'] = ip; - if (hostname) headers['SplitSDKMachineName'] = hostname; + return function httpClient(url: string, reqOpts: IRequestOptions = {}, logErrorsAsInfo: boolean = false): Promise { const request = objectAssign({ headers: reqOpts.headers ? objectAssign({}, headers, reqOpts.headers) : headers, diff --git a/src/trackers/impressionsTracker.ts b/src/trackers/impressionsTracker.ts index f3274678..c2335531 100644 --- a/src/trackers/impressionsTracker.ts +++ b/src/trackers/impressionsTracker.ts @@ -28,7 +28,7 @@ export function impressionsTrackerFactory( countsCache?: IImpressionCountsCacheSync ): IImpressionsTracker { - const { log, impressionListener, runtime: { ip, hostname } } = settings; + const { log, impressionListener, runtime: { ip, hostname }, version } = settings; return { track(impressions: ImpressionDTO[], attributes?: SplitIO.Attributes) { @@ -76,7 +76,7 @@ export function impressionsTrackerFactory( attributes, ip, hostname, - sdkLanguageVersion: settings.version + sdkLanguageVersion: version }; // Wrap in a timeout because we don't want it to be blocking. From 5d6faa1225f7a5371194f25cb7add2700b9b74a0 Mon Sep 17 00:00:00 2001 From: Emiliano Sanchez Date: Tue, 19 Apr 2022 18:49:23 -0300 Subject: [PATCH 2/2] update version --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 79a35942..9459fc73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@splitsoftware/splitio-commons", - "version": "1.3.1-rc.1", + "version": "1.3.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0a19cd18..ba8520d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@splitsoftware/splitio-commons", - "version": "1.3.1-rc.1", + "version": "1.3.1", "description": "Split Javascript SDK common components", "main": "cjs/index.js", "module": "esm/index.js",