diff --git a/package-lock.json b/package-lock.json index cf86740cf..4f0f506de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "11.12.0", "license": "Apache-2.0", "dependencies": { - "@splitsoftware/splitio-commons": "2.13.0", + "@splitsoftware/splitio-commons": "3.1.1-rc.13", "bloom-filters": "^3.0.4", "ioredis": "^4.28.0 || ^5.0.0 || ^6.0.0", "js-yaml": "^4.2.0", @@ -340,20 +340,28 @@ "dev": true }, "node_modules/@splitsoftware/splitio-commons": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/@splitsoftware/splitio-commons/-/splitio-commons-2.13.0.tgz", - "integrity": "sha512-zEHsE9NjYFzyBWRfsQmMX57bR+R83GtMwVFTalomhW0Omo/hdGoObsyV82asFoV2iZL3kk9N2PtO5h9EEzsLbQ==", + "version": "3.1.1-rc.13", + "resolved": "https://registry.npmjs.org/@splitsoftware/splitio-commons/-/splitio-commons-3.1.1-rc.13.tgz", + "integrity": "sha512-da7JG1kQwodGKHGeld1s+glng/7H7anTCpDEJGBz2LgkwBLaS2elrxbukLm5tdFo3sJrFcw8CFDeI8DC0WPZcg==", "license": "Apache-2.0", "dependencies": { "@types/node": ">=14.0.0", "tslib": "^2.3.1" }, "peerDependencies": { - "ioredis": "^4.28.0 || ^5.0.0 || ^6.0.0" + "bloom-filters": "^3.0.0", + "ioredis": "^4.28.0 || ^5.0.0 || ^6.0.0", + "node-fetch": "^2.7.0" }, "peerDependenciesMeta": { + "bloom-filters": { + "optional": true + }, "ioredis": { "optional": true + }, + "node-fetch": { + "optional": true } } }, @@ -1202,6 +1210,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/bloom-filters/-/bloom-filters-3.0.4.tgz", "integrity": "sha512-BdnPWo2OpYhlvuP2fRzJBdioMCkm7Zp0HCf8NJgF5Mbyqy7VQ/CnTiVWMMyq4EZCBHwj0Kq6098gW2/3RsZsrA==", + "peer": true, "dependencies": { "@types/seedrandom": "^3.0.8", "base64-arraybuffer": "^1.0.2", @@ -5082,6 +5091,7 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "peer": true, "dependencies": { "whatwg-url": "^5.0.0" }, @@ -8761,9 +8771,9 @@ "dev": true }, "@splitsoftware/splitio-commons": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/@splitsoftware/splitio-commons/-/splitio-commons-2.13.0.tgz", - "integrity": "sha512-zEHsE9NjYFzyBWRfsQmMX57bR+R83GtMwVFTalomhW0Omo/hdGoObsyV82asFoV2iZL3kk9N2PtO5h9EEzsLbQ==", + "version": "3.1.1-rc.13", + "resolved": "https://registry.npmjs.org/@splitsoftware/splitio-commons/-/splitio-commons-3.1.1-rc.13.tgz", + "integrity": "sha512-da7JG1kQwodGKHGeld1s+glng/7H7anTCpDEJGBz2LgkwBLaS2elrxbukLm5tdFo3sJrFcw8CFDeI8DC0WPZcg==", "requires": { "@types/node": ">=14.0.0", "tslib": "^2.3.1" @@ -9434,6 +9444,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/bloom-filters/-/bloom-filters-3.0.4.tgz", "integrity": "sha512-BdnPWo2OpYhlvuP2fRzJBdioMCkm7Zp0HCf8NJgF5Mbyqy7VQ/CnTiVWMMyq4EZCBHwj0Kq6098gW2/3RsZsrA==", + "peer": true, "requires": { "@types/seedrandom": "^3.0.8", "base64-arraybuffer": "^1.0.2", @@ -12252,6 +12263,7 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "peer": true, "requires": { "whatwg-url": "^5.0.0" }, diff --git a/package.json b/package.json index 8f99fbbc0..d94dd892b 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "node": ">=14.0.0" }, "dependencies": { - "@splitsoftware/splitio-commons": "2.13.0", + "@splitsoftware/splitio-commons": "3.1.1-rc.13", "bloom-filters": "^3.0.4", "ioredis": "^4.28.0 || ^5.0.0 || ^6.0.0", "js-yaml": "^4.2.0", diff --git a/src/__tests__/browserSuites/readiness.spec.js b/src/__tests__/browserSuites/readiness.spec.js index d25c0dae1..f6f0a116a 100644 --- a/src/__tests__/browserSuites/readiness.spec.js +++ b/src/__tests__/browserSuites/readiness.spec.js @@ -129,8 +129,8 @@ export default function (fetchMock, assert) { if (startWithSegments) { // Adjust since and till so the order is inverted. fetchMock.get(testUrls.sdk + '/splitChanges?s=1.3&since=-1&rbSince=-1', { status: 200, body: splitChangesStartWithSegmentsMock }); - fetchMock.get(testUrls.sdk + '/splitChanges?s=1.3&since=1457552620999&rbSince=-1', { status: 200, body: { ff: { ...splitChangesUpdateWithoutSegmentsMock.ff, s: 1457552620999, t: 1457552649999 } } }); - fetchMock.get(testUrls.sdk + '/splitChanges?s=1.3&since=1457552649999&rbSince=-1', { status: 200, body: { ff: { ...splitChangesUpdateWithSegmentsMock.ff, s: 1457552649999, t: 1457552669999 } } }); + fetchMock.get(testUrls.sdk + '/splitChanges?s=1.3&since=1457552620999&rbSince=-1', { status: 200, body: { ff: { ...splitChangesUpdateWithoutSegmentsMock.ff, d: splitChangesUpdateWithoutSegmentsMock.ff.d.map(f => ({ ...f, changeNumber: 1457552649999 })), s: 1457552620999, t: 1457552649999 } } }); + fetchMock.get(testUrls.sdk + '/splitChanges?s=1.3&since=1457552649999&rbSince=-1', { status: 200, body: { ff: { ...splitChangesUpdateWithSegmentsMock.ff, d: splitChangesUpdateWithSegmentsMock.ff.d.map(f => ({ ...f, changeNumber: 1457552669999 })), s: 1457552649999, t: 1457552669999 } } }); fetchMock.get(testUrls.sdk + '/splitChanges?s=1.3&since=1457552669999&rbSince=-1', { status: 200, body: { ff: { d: [], s: 1457552669999, t: 1457552669999 } } }); } else { fetchMock.get(testUrls.sdk + '/splitChanges?s=1.3&since=-1&rbSince=-1', { status: 200, body: splitChangesStartWithoutSegmentsMock }); diff --git a/src/__tests__/browserSuites/ready-promise.spec.js b/src/__tests__/browserSuites/ready-promise.spec.js index 25a8fa727..93b4010da 100644 --- a/src/__tests__/browserSuites/ready-promise.spec.js +++ b/src/__tests__/browserSuites/ready-promise.spec.js @@ -31,7 +31,7 @@ function assertGetTreatmentWhenReady(assert, client) { function assertGetTreatmentControlNotReady(assert, client) { consoleSpy.log.resetHistory(); assert.equal(client.getTreatment('hierarchical_splits_test'), 'control', 'We should get control if client is not ready.'); - assert.true(consoleSpy.log.calledWithExactly('[WARN] splitio => getTreatment: the SDK is not ready to evaluate. Results may be incorrect for feature flag hierarchical_splits_test. Make sure to wait for SDK readiness before using this method.'), 'Telling us that calling getTreatment would return CONTROL since SDK is not ready at this point.'); + assert.true(consoleSpy.log.calledWithExactly('[WARN] splitio => getTreatment: the SDK is not ready to evaluate. Results may be incorrect. Make sure to wait for SDK readiness before using this method.'), 'Telling us that calling getTreatment would return CONTROL since SDK is not ready at this point.'); } function assertGetTreatmentControlNotReadyOnDestroy(assert, client) { @@ -538,8 +538,6 @@ export default function readyPromiseAssertions(fetchMock, assert) { consoleSpy.log.resetHistory(); const sharedClientWithCb = splitio.client('nicolas@split.io'); sharedClientWithCb.on(client.Event.SDK_READY, () => { - t.false(consoleSpy.log.calledWithExactly('[WARN] splitio => No listeners for SDK_READY event detected. Incorrect control treatments could have been logged if you called getTreatment/s while the SDK was not yet synchronized with the backend.'), - 'No warning logged'); const sharedClientWithoutCb = splitio.client('emiliano@split.io'); setTimeout(() => { diff --git a/src/__tests__/mocks/message.CONTROL.STREAMING_DISABLED.control_pri.1586987434950.json b/src/__tests__/mocks/message.CONTROL.STREAMING_DISABLED.control_pri.1586987434950.json index 84db4b457..094f3c842 100644 --- a/src/__tests__/mocks/message.CONTROL.STREAMING_DISABLED.control_pri.1586987434950.json +++ b/src/__tests__/mocks/message.CONTROL.STREAMING_DISABLED.control_pri.1586987434950.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"itKIDa6b4b:0:0\",\"clientId\": \"EORI49J_FSJKA2\",\"timestamp\":1586987434950,\"encoding\":\"json\",\"channel\":\"control_pri\",\"data\":\"{\\\"type\\\":\\\"CONTROL\\\",\\\"controlType\\\":\\\"STREAMING_DISABLED\\\"}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.CONTROL.STREAMING_PAUSED.control_pri.1586987434750.json b/src/__tests__/mocks/message.CONTROL.STREAMING_PAUSED.control_pri.1586987434750.json index e24fabcd0..4bc97de29 100644 --- a/src/__tests__/mocks/message.CONTROL.STREAMING_PAUSED.control_pri.1586987434750.json +++ b/src/__tests__/mocks/message.CONTROL.STREAMING_PAUSED.control_pri.1586987434750.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"itKIDa6b4b:0:0\",\"clientId\": \"EORI49J_FSJKA2\",\"timestamp\":1586987434750,\"encoding\":\"json\",\"channel\":\"control_pri\",\"data\":\"{\\\"type\\\":\\\"CONTROL\\\",\\\"controlType\\\":\\\"STREAMING_PAUSED\\\"}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.CONTROL.STREAMING_PAUSED.control_pri.1586987434900.json b/src/__tests__/mocks/message.CONTROL.STREAMING_PAUSED.control_pri.1586987434900.json index da97099ec..f7e1a5858 100644 --- a/src/__tests__/mocks/message.CONTROL.STREAMING_PAUSED.control_pri.1586987434900.json +++ b/src/__tests__/mocks/message.CONTROL.STREAMING_PAUSED.control_pri.1586987434900.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"itKIDa6b4b:0:0\",\"clientId\": \"EORI49J_FSJKA2\",\"timestamp\":1586987434900,\"encoding\":\"json\",\"channel\":\"control_pri\",\"data\":\"{\\\"type\\\":\\\"CONTROL\\\",\\\"controlType\\\":\\\"STREAMING_PAUSED\\\"}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.CONTROL.STREAMING_RESUMED.control_pri.1586987434850.json b/src/__tests__/mocks/message.CONTROL.STREAMING_RESUMED.control_pri.1586987434850.json index 854a2397c..89369e744 100644 --- a/src/__tests__/mocks/message.CONTROL.STREAMING_RESUMED.control_pri.1586987434850.json +++ b/src/__tests__/mocks/message.CONTROL.STREAMING_RESUMED.control_pri.1586987434850.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"itKIDa6b4b:0:0\",\"clientId\": \"EORI49J_FSJKA2\",\"timestamp\":1586987434850,\"encoding\":\"json\",\"channel\":\"control_pri\",\"data\":\"{\\\"type\\\":\\\"CONTROL\\\",\\\"controlType\\\":\\\"STREAMING_RESUMED\\\"}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.MEMBERSHIPS_LS_UPDATE.SEGMENT_REMOVAL.1457552653000.json b/src/__tests__/mocks/message.MEMBERSHIPS_LS_UPDATE.SEGMENT_REMOVAL.1457552653000.json index baa24fe3f..1dfe4b3ea 100644 --- a/src/__tests__/mocks/message.MEMBERSHIPS_LS_UPDATE.SEGMENT_REMOVAL.1457552653000.json +++ b/src/__tests__/mocks/message.MEMBERSHIPS_LS_UPDATE.SEGMENT_REMOVAL.1457552653000.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"data\":\"{\\\"type\\\":\\\"MEMBERSHIPS_LS_UPDATE\\\",\\\"cn\\\":1457552653000,\\\"n\\\":[\\\"splitters\\\"],\\\"c\\\": 0,\\\"u\\\": 3,\\\"d\\\":\\\"\\\"}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.MEMBERSHIPS_LS_UPDATE.UNBOUNDED.DELAY.1457552650000.json b/src/__tests__/mocks/message.MEMBERSHIPS_LS_UPDATE.UNBOUNDED.DELAY.1457552650000.json index 99c839cb0..4ac6defe1 100644 --- a/src/__tests__/mocks/message.MEMBERSHIPS_LS_UPDATE.UNBOUNDED.DELAY.1457552650000.json +++ b/src/__tests__/mocks/message.MEMBERSHIPS_LS_UPDATE.UNBOUNDED.DELAY.1457552650000.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"data\":\"{\\\"type\\\":\\\"MEMBERSHIPS_LS_UPDATE\\\",\\\"cn\\\":1457552650000,\\\"n\\\":[],\\\"c\\\": 0,\\\"u\\\": 0,\\\"d\\\":\\\"\\\",\\\"i\\\":300,\\\"h\\\":1,\\\"s\\\":0}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.BOUNDED.GZIP.1457552651000.json b/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.BOUNDED.GZIP.1457552651000.json index 59da6ea6f..cec4ee02d 100644 --- a/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.BOUNDED.GZIP.1457552651000.json +++ b/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.BOUNDED.GZIP.1457552651000.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"data\":\"{\\\"type\\\":\\\"MEMBERSHIPS_MS_UPDATE\\\",\\\"cn\\\":1457552651000,\\\"n\\\":[],\\\"c\\\": 1,\\\"u\\\": 1,\\\"d\\\":\\\"H4sIAAAAAAAA/2JABxzYeIxQLguYFIBLN8Bl4EABjc+EzOnAsA4QAAD//8YBvWeAAAAA\\\",\\\"h\\\":0}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.BOUNDED.ZLIB.1457552651000.json b/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.BOUNDED.ZLIB.1457552651000.json index fe4ff5a38..ef635806e 100644 --- a/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.BOUNDED.ZLIB.1457552651000.json +++ b/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.BOUNDED.ZLIB.1457552651000.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"data\":\"{\\\"type\\\":\\\"MEMBERSHIPS_MS_UPDATE\\\",\\\"cn\\\":1457552651000,\\\"n\\\":[],\\\"c\\\": 2,\\\"u\\\": 1,\\\"d\\\":\\\"eJxiGAX4AMdAO2AU4AeMA+2AAQACA+0AuoORGMvDBDANtAPoDBQG2gGDGQz16pRloB0wCkbBKBgFo4As0EBYyZCqoojwDwEACAAA//+W/QFR\\\",\\\"h\\\":0}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.KEYLIST.GZIP.1457552652000.json b/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.KEYLIST.GZIP.1457552652000.json index 320522553..8deba8b63 100644 --- a/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.KEYLIST.GZIP.1457552652000.json +++ b/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.KEYLIST.GZIP.1457552652000.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"data\":\"{\\\"type\\\":\\\"MEMBERSHIPS_MS_UPDATE\\\",\\\"cn\\\":1457552652000,\\\"n\\\":[\\\"splitters\\\"],\\\"c\\\": 1,\\\"u\\\": 2,\\\"d\\\":\\\"H4sIAAAAAAAA/wTAsRHDUAgD0F2ofwEIkPAqPhdZIW0uu/v97GPXHU004ULuMGrYR6XUbIjlXULPPse+dt1yhJibBODjrTmj3GJ4emduuDDP/w0AAP//18WLsl0AAAA=\\\",\\\"h\\\":0}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.SEGMENT_REMOVAL.1457552653000.json b/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.SEGMENT_REMOVAL.1457552653000.json index 23e582775..4697113b4 100644 --- a/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.SEGMENT_REMOVAL.1457552653000.json +++ b/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.SEGMENT_REMOVAL.1457552653000.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"data\":\"{\\\"type\\\":\\\"MEMBERSHIPS_MS_UPDATE\\\",\\\"cn\\\":1457552653000,\\\"n\\\":[\\\"splitters\\\"],\\\"c\\\": 0,\\\"u\\\": 3,\\\"d\\\":\\\"\\\",\\\"h\\\":0}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.UNBOUNDED.1457552640000.json b/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.UNBOUNDED.1457552640000.json index dcce251be..b671eaada 100644 --- a/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.UNBOUNDED.1457552640000.json +++ b/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.UNBOUNDED.1457552640000.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"data\":\"{\\\"type\\\":\\\"MEMBERSHIPS_MS_UPDATE\\\",\\\"cn\\\":1457552640000,\\\"u\\\": 0,\\\"h\\\":0}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.UNBOUNDED.1457552650000.json b/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.UNBOUNDED.1457552650000.json index a69df9dd9..e8c48e856 100644 --- a/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.UNBOUNDED.1457552650000.json +++ b/src/__tests__/mocks/message.MEMBERSHIPS_MS_UPDATE.UNBOUNDED.1457552650000.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"data\":\"{\\\"type\\\":\\\"MEMBERSHIPS_MS_UPDATE\\\",\\\"cn\\\":1457552650000,\\\"n\\\":[],\\\"c\\\": 0,\\\"u\\\": 0,\\\"d\\\":\\\"\\\",\\\"h\\\":0}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.OCCUPANCY.0.control_pri.1586987434550.json b/src/__tests__/mocks/message.OCCUPANCY.0.control_pri.1586987434550.json index d506cb904..59b6647e4 100644 --- a/src/__tests__/mocks/message.OCCUPANCY.0.control_pri.1586987434550.json +++ b/src/__tests__/mocks/message.OCCUPANCY.0.control_pri.1586987434550.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"itKIDa6b4b:0:0\",\"timestamp\":1586987434550,\"encoding\":\"json\",\"channel\":\"[?occupancy=metrics.publishers]control_pri\",\"data\":\"{\\\"metrics\\\":{\\\"publishers\\\":0}}\",\"name\":\"[meta]occupancy\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.OCCUPANCY.0.control_sec.1586987434451.json b/src/__tests__/mocks/message.OCCUPANCY.0.control_sec.1586987434451.json index 495e0d1eb..f1eaa6236 100644 --- a/src/__tests__/mocks/message.OCCUPANCY.0.control_sec.1586987434451.json +++ b/src/__tests__/mocks/message.OCCUPANCY.0.control_sec.1586987434451.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"JdPcOgIxuH:0:0\",\"timestamp\":1586987434451,\"encoding\":\"json\",\"channel\":\"[?occupancy=metrics.publishers]control_sec\",\"data\":\"{\\\"metrics\\\":{\\\"publishers\\\":0}}\",\"name\":\"[meta]occupancy\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.OCCUPANCY.1.control_pri.1586987434450.json b/src/__tests__/mocks/message.OCCUPANCY.1.control_pri.1586987434450.json index efc18cb44..d340317f8 100644 --- a/src/__tests__/mocks/message.OCCUPANCY.1.control_pri.1586987434450.json +++ b/src/__tests__/mocks/message.OCCUPANCY.1.control_pri.1586987434450.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"itKIDa6b4b:0:0\",\"timestamp\":1586987434450,\"encoding\":\"json\",\"channel\":\"[?occupancy=metrics.publishers]control_pri\",\"data\":\"{\\\"metrics\\\":{\\\"publishers\\\":1}}\",\"name\":\"[meta]occupancy\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.OCCUPANCY.2.control_pri.1586987434650.json b/src/__tests__/mocks/message.OCCUPANCY.2.control_pri.1586987434650.json index c13552593..e646f7e07 100644 --- a/src/__tests__/mocks/message.OCCUPANCY.2.control_pri.1586987434650.json +++ b/src/__tests__/mocks/message.OCCUPANCY.2.control_pri.1586987434650.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"itKIDa6b4b:0:0\",\"timestamp\":1586987434650,\"encoding\":\"json\",\"channel\":\"[?occupancy=metrics.publishers]control_pri\",\"data\":\"{\\\"metrics\\\":{\\\"publishers\\\":2}}\",\"name\":\"[meta]occupancy\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.1457552649999.json b/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.1457552649999.json index acad9194d..72c380476 100644 --- a/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.1457552649999.json +++ b/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.1457552649999.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"1111\",\"clientId\":\"pri:ODc1NjQyNzY1\",\"timestamp\":1588254699236,\"encoding\":\"json\",\"channel\":\"xxxx_xxxx_flags\",\"data\": \"{\\\"type\\\":\\\"RB_SEGMENT_UPDATE\\\",\\\"changeNumber\\\":1457552649999}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.C0.json b/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.C0.json index e1696abd2..d0132f568 100644 --- a/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.C0.json +++ b/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.C0.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"1111\",\"clientId\":\"pri:ODc1NjQyNzY1\",\"timestamp\":1588254699236,\"encoding\":\"json\",\"channel\":\"xxxx_xxxx_flags\",\"data\":\"{\\\"type\\\":\\\"RB_SEGMENT_UPDATE\\\",\\\"changeNumber\\\":1684265694505,\\\"pcn\\\":1457552649999,\\\"c\\\":0,\\\"d\\\":\\\"eyJuYW1lIjoicmJzX3Rlc3QiLCJzdGF0dXMiOiJBQ1RJVkUiLCJ0cmFmZmljVHlwZU5hbWUiOiJ1c2VyIiwiZXhjbHVkZWQiOnsia2V5cyI6W10sInNlZ21lbnRzIjpbXX0sImNvbmRpdGlvbnMiOlt7Im1hdGNoZXJHcm91cCI6eyJjb21iaW5lciI6IkFORCIsIm1hdGNoZXJzIjpbeyJrZXlTZWxlY3RvciI6eyJ0cmFmZmljVHlwZSI6InVzZXIifSwibWF0Y2hlclR5cGUiOiJBTExfS0VZUyIsIm5lZ2F0ZSI6ZmFsc2V9XX19XX0=\\\"}\"}" } diff --git a/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.C1.json b/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.C1.json index 2b09cfaa0..cc90a3fff 100644 --- a/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.C1.json +++ b/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.C1.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"1111\",\"clientId\":\"pri:ODc1NjQyNzY1\",\"timestamp\":1588254699236,\"encoding\":\"json\",\"channel\":\"xxxx_xxxx_flags\",\"data\":\"{\\\"type\\\":\\\"RB_SEGMENT_UPDATE\\\",\\\"changeNumber\\\":1684265694506,\\\"pcn\\\":1684265694505,\\\"c\\\":1,\\\"d\\\":\\\"H4sIAAAAAAAA/0zOwWrDMBAE0H+Zs75At9CGUhpySSiUYoIij1MTSwraFdQY/XtRU5ccd3jDzoLoAmGRz3JSisJA1GkRWGyejq/vWxhodsMw+uN84/7OizDDgN9+Kj172AVXzgL72RkIL4FRf69q4FPsRx1TbMGC4NR/Mb/kVG6t51M4j5G5Pdw/w6zgrq+cD5zoNeWGH5asK+p/4y/d7Hant+3HAQaRF6eEHdwkrF2tXf0JAAD//9JucZnyAAAA\\\"}\"}" } diff --git a/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.C2.json b/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.C2.json index 0addfbc45..f7f621c49 100644 --- a/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.C2.json +++ b/src/__tests__/mocks/message.RB_SEGMENT_UPDATE.C2.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"1111\",\"clientId\":\"pri:ODc1NjQyNzY1\",\"timestamp\":1588254699236,\"encoding\":\"json\",\"channel\":\"xxxx_xxxx_flags\",\"data\":\"{\\\"type\\\":\\\"RB_SEGMENT_UPDATE\\\",\\\"changeNumber\\\":1684265694507,\\\"pcn\\\":1684265694506,\\\"c\\\":2,\\\"d\\\":\\\"eJxMzsFqwzAQBNB/mbO+QLfQhlIackkolGKCIo9TE0sK2hXUGP17UVOXHHd4w86C6AJhkc9yUorCQNRpEVhsno6v71sYaHbDMPrjfOP+zosww4Dffio9e9gFV84C+9kZCC+BUX+vauBT7EcdU2zBguDUfzG/5FRuredTOI+RuT3cP8Os4K6vnA+c6DXlhh+WrCvqf+Mv3ex2p7ftxwEGkRenhB3cJKxdrV39CQAA//8FrVMM\\\"}\"}" } diff --git a/src/__tests__/mocks/message.SEGMENT_UPDATE.1457552640000.json b/src/__tests__/mocks/message.SEGMENT_UPDATE.1457552640000.json index 28ebf1e78..89393c878 100644 --- a/src/__tests__/mocks/message.SEGMENT_UPDATE.1457552640000.json +++ b/src/__tests__/mocks/message.SEGMENT_UPDATE.1457552640000.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"mc4i3NENoA:0:0\",\"clientId\":\"NDEzMTY5Mzg0MA==:MTM2ODE2NDMxNA==\",\"timestamp\":1457552640900,\"encoding\":\"json\",\"channel\":\"NzM2MDI5Mzc0_NDEzMjQ1MzA0Nw==_segments\",\"data\":\"{\\\"type\\\":\\\"SEGMENT_UPDATE\\\",\\\"changeNumber\\\":1457552640000,\\\"segmentName\\\":\\\"splitters\\\"}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.SEGMENT_UPDATE.1457552650000.json b/src/__tests__/mocks/message.SEGMENT_UPDATE.1457552650000.json index 0d22a5cb5..2895bcd4d 100644 --- a/src/__tests__/mocks/message.SEGMENT_UPDATE.1457552650000.json +++ b/src/__tests__/mocks/message.SEGMENT_UPDATE.1457552650000.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"mc4i3NENoA:0:0\",\"clientId\":\"NDEzMTY5Mzg0MA==:MTM2ODE2NDMxNA==\",\"timestamp\":1457552650900,\"encoding\":\"json\",\"channel\":\"NzM2MDI5Mzc0_NDEzMjQ1MzA0Nw==_segments\",\"data\":\"{\\\"type\\\":\\\"SEGMENT_UPDATE\\\",\\\"changeNumber\\\":1457552650000,\\\"segmentName\\\":\\\"employees\\\"}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.SPLIT_KILL.1457552650000.json b/src/__tests__/mocks/message.SPLIT_KILL.1457552650000.json index 8b23b51f8..fcaa3bf4f 100644 --- a/src/__tests__/mocks/message.SPLIT_KILL.1457552650000.json +++ b/src/__tests__/mocks/message.SPLIT_KILL.1457552650000.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"mc4i3NENoA:0:0\",\"clientId\":\"NDEzMTY5Mzg0MA==:MTM2ODE2NDMxNA==\",\"timestamp\":1457552650900,\"encoding\":\"json\",\"channel\":\"NzM2MDI5Mzc0_NDEzMjQ1MzA0Nw==_splits\",\"data\":\"{\\\"type\\\":\\\"SPLIT_KILL\\\",\\\"changeNumber\\\":1457552650000,\\\"defaultTreatment\\\":\\\"not_allowed\\\",\\\"splitName\\\":\\\"whitelist\\\"}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.1457552620999.json b/src/__tests__/mocks/message.SPLIT_UPDATE.1457552620999.json index b17dbfdb0..f9a301c08 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.1457552620999.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.1457552620999.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"mc4i3NENoA:0:0\",\"clientId\":\"NDEzMTY5Mzg0MA==:MTM2ODE2NDMxNA==\",\"timestamp\":1457552621899,\"encoding\":\"json\",\"channel\":\"NzM2MDI5Mzc0_NDEzMjQ1MzA0Nw==_splits\",\"data\":\"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":1457552620999}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.1457552649999.json b/src/__tests__/mocks/message.SPLIT_UPDATE.1457552649999.json index 2916c1fd6..04e707bd0 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.1457552649999.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.1457552649999.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\": \"mc4i3NENoA:0:0\",\"clientId\": \"NDEzMTY5Mzg0MA==:MTM2ODE2NDMxNA==\",\"timestamp\": 1457552649999,\"encoding\": \"json\",\"channel\": \"NzM2MDI5Mzc0_NDEzMjQ1MzA0Nw==_splits\",\"data\": \"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":1457552649999}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.1457552650001.json b/src/__tests__/mocks/message.SPLIT_UPDATE.1457552650001.json index 38229898b..02d0c4e23 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.1457552650001.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.1457552650001.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\": \"mc4i3NENoA:0:0\",\"clientId\": \"NDEzMTY5Mzg0MA==:MTM2ODE2NDMxNA==\",\"timestamp\": 1457552650001,\"encoding\": \"json\",\"channel\": \"NzM2MDI5Mzc0_NDEzMjQ1MzA0Nw==_splits\",\"data\": \"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":1457552650001}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.1.json b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.1.json index a8d69166b..8bcffa6ea 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.1.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.1.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"m2T85LA4fQ:0:0\",\"clientId\":\"pri:NzIyNjY1MzI4\",\"timestamp\":1694548198907,\"encoding\":\"json\",\"channel\":\"NzM2MDI5Mzc0_MTgyNTg1MTgwNg==_splits\",\"data\":\"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":2,\\\"pcn\\\":1,\\\"c\\\":0,\\\"d\\\":\\\"eyJ0cmFmZmljVHlwZU5hbWUiOiJ1c2VyIiwiaWQiOiJkNDMxY2RkMC1iMGJlLTExZWEtOGE4MC0xNjYwYWRhOWNlMzkiLCJuYW1lIjoibWF1cm9famF2YSIsInRyYWZmaWNBbGxvY2F0aW9uIjoxMDAsInRyYWZmaWNBbGxvY2F0aW9uU2VlZCI6LTkyMzkxNDkxLCJzZWVkIjotMTc2OTM3NzYwNCwic3RhdHVzIjoiQUNUSVZFIiwia2lsbGVkIjpmYWxzZSwiZGVmYXVsdFRyZWF0bWVudCI6Im9mZiIsImNoYW5nZU51bWJlciI6MTYwMjc5OTYzODM0NCwiYWxnbyI6MiwiY29uZmlndXJhdGlvbnMiOnt9LCJzZXRzIjpbXSwiY29uZGl0aW9ucyI6W3siY29uZGl0aW9uVHlwZSI6IldISVRFTElTVCIsIm1hdGNoZXJHcm91cCI6eyJjb21iaW5lciI6IkFORCIsIm1hdGNoZXJzIjpbeyJtYXRjaGVyVHlwZSI6IldISVRFTElTVCIsIm5lZ2F0ZSI6ZmFsc2UsIndoaXRlbGlzdE1hdGNoZXJEYXRhIjp7IndoaXRlbGlzdCI6WyJhZG1pbiIsIm1hdXJvIiwibmljbyJdfX1dfSwicGFydGl0aW9ucyI6W3sidHJlYXRtZW50Ijoib2ZmIiwic2l6ZSI6MTAwfV0sImxhYmVsIjoid2hpdGVsaXN0ZWQifSx7ImNvbmRpdGlvblR5cGUiOiJST0xMT1VUIiwibWF0Y2hlckdyb3VwIjp7ImNvbWJpbmVyIjoiQU5EIiwibWF0Y2hlcnMiOlt7ImtleVNlbGVjdG9yIjp7InRyYWZmaWNUeXBlIjoidXNlciJ9LCJtYXRjaGVyVHlwZSI6IklOX1NFR01FTlQiLCJuZWdhdGUiOmZhbHNlLCJ1c2VyRGVmaW5lZFNlZ21lbnRNYXRjaGVyRGF0YSI6eyJzZWdtZW50TmFtZSI6Im1hdXItMiJ9fV19LCJwYXJ0aXRpb25zIjpbeyJ0cmVhdG1lbnQiOiJvbiIsInNpemUiOjB9LHsidHJlYXRtZW50Ijoib2ZmIiwic2l6ZSI6MTAwfSx7InRyZWF0bWVudCI6IlY0Iiwic2l6ZSI6MH0seyJ0cmVhdG1lbnQiOiJ2NSIsInNpemUiOjB9XSwibGFiZWwiOiJpbiBzZWdtZW50IG1hdXItMiJ9LHsiY29uZGl0aW9uVHlwZSI6IlJPTExPVVQiLCJtYXRjaGVyR3JvdXAiOnsiY29tYmluZXIiOiJBTkQiLCJtYXRjaGVycyI6W3sia2V5U2VsZWN0b3IiOnsidHJhZmZpY1R5cGUiOiJ1c2VyIn0sIm1hdGNoZXJUeXBlIjoiQUxMX0tFWVMiLCJuZWdhdGUiOmZhbHNlfV19LCJwYXJ0aXRpb25zIjpbeyJ0cmVhdG1lbnQiOiJvbiIsInNpemUiOjB9LHsidHJlYXRtZW50Ijoib2ZmIiwic2l6ZSI6MTAwfSx7InRyZWF0bWVudCI6IlY0Iiwic2l6ZSI6MH0seyJ0cmVhdG1lbnQiOiJ2NSIsInNpemUiOjB9XSwibGFiZWwiOiJkZWZhdWx0IHJ1bGUifV19\\\"}\"}" } diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.2.json b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.2.json index 2df299899..0971bc526 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.2.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.2.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"m2T85LA4fQ:0:0\",\"clientId\":\"pri:NzIyNjY1MzI4\",\"timestamp\":1694548363040,\"encoding\":\"json\",\"channel\":\"NzM2MDI5Mzc0_MTgyNTg1MTgwNg==_splits\",\"data\":\"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":2,\\\"pcn\\\":1,\\\"c\\\":0,\\\"d\\\":\\\"eyJ0cmFmZmljVHlwZU5hbWUiOiJjbGllbnQiLCJuYW1lIjoid29ya20iLCJ0cmFmZmljQWxsb2NhdGlvbiI6MTAwLCJ0cmFmZmljQWxsb2NhdGlvblNlZWQiOjE0NzM5MjIyNCwic2VlZCI6NTI0NDE3MTA1LCJzdGF0dXMiOiJBQ1RJVkUiLCJraWxsZWQiOmZhbHNlLCJkZWZhdWx0VHJlYXRtZW50Ijoib24iLCJjaGFuZ2VOdW1iZXIiOjIsImFsZ28iOjIsImNvbmZpZ3VyYXRpb25zIjp7fSwic2V0cyI6WyJzZXRfMSIsInNldF8yIl0sImNvbmRpdGlvbnMiOlt7ImNvbmRpdGlvblR5cGUiOiJST0xMT1VUIiwibWF0Y2hlckdyb3VwIjp7ImNvbWJpbmVyIjoiQU5EIiwibWF0Y2hlcnMiOlt7ImtleVNlbGVjdG9yIjp7InRyYWZmaWNUeXBlIjoiY2xpZW50IiwiYXR0cmlidXRlIjpudWxsfSwibWF0Y2hlclR5cGUiOiJJTl9TRUdNRU5UIiwibmVnYXRlIjpmYWxzZSwidXNlckRlZmluZWRTZWdtZW50TWF0Y2hlckRhdGEiOnsic2VnbWVudE5hbWUiOiJuZXdfc2VnbWVudCJ9LCJ3aGl0ZWxpc3RNYXRjaGVyRGF0YSI6bnVsbCwidW5hcnlOdW1lcmljTWF0Y2hlckRhdGEiOm51bGwsImJldHdlZW5NYXRjaGVyRGF0YSI6bnVsbCwiYm9vbGVhbk1hdGNoZXJEYXRhIjpudWxsLCJkZXBlbmRlbmN5TWF0Y2hlckRhdGEiOm51bGwsInN0cmluZ01hdGNoZXJEYXRhIjpudWxsfV19LCJwYXJ0aXRpb25zIjpbeyJ0cmVhdG1lbnQiOiJvbiIsInNpemUiOjB9LHsidHJlYXRtZW50Ijoib2ZmIiwic2l6ZSI6MH0seyJ0cmVhdG1lbnQiOiJmcmVlIiwic2l6ZSI6MTAwfSx7InRyZWF0bWVudCI6ImNvbnRhIiwic2l6ZSI6MH1dLCJsYWJlbCI6ImluIHNlZ21lbnQgbmV3X3NlZ21lbnQifSx7ImNvbmRpdGlvblR5cGUiOiJST0xMT1VUIiwibWF0Y2hlckdyb3VwIjp7ImNvbWJpbmVyIjoiQU5EIiwibWF0Y2hlcnMiOlt7ImtleVNlbGVjdG9yIjp7InRyYWZmaWNUeXBlIjoiY2xpZW50IiwiYXR0cmlidXRlIjpudWxsfSwibWF0Y2hlclR5cGUiOiJBTExfS0VZUyIsIm5lZ2F0ZSI6ZmFsc2UsInVzZXJEZWZpbmVkU2VnbWVudE1hdGNoZXJEYXRhIjpudWxsLCJ3aGl0ZWxpc3RNYXRjaGVyRGF0YSI6bnVsbCwidW5hcnlOdW1lcmljTWF0Y2hlckRhdGEiOm51bGwsImJldHdlZW5NYXRjaGVyRGF0YSI6bnVsbCwiYm9vbGVhbk1hdGNoZXJEYXRhIjpudWxsLCJkZXBlbmRlbmN5TWF0Y2hlckRhdGEiOm51bGwsInN0cmluZ01hdGNoZXJEYXRhIjpudWxsfV19LCJwYXJ0aXRpb25zIjpbeyJ0cmVhdG1lbnQiOiJvbiIsInNpemUiOjEwMH0seyJ0cmVhdG1lbnQiOiJvZmYiLCJzaXplIjowfSx7InRyZWF0bWVudCI6ImZyZWUiLCJzaXplIjowfSx7InRyZWF0bWVudCI6ImNvbnRhIiwic2l6ZSI6MH1dLCJsYWJlbCI6ImRlZmF1bHQgcnVsZSJ9XX0\\\"}\"}" } diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.3.json b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.3.json index d7e1aee32..d43514735 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.3.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.3.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"m2T85LA4fQ:0:0\",\"clientId\":\"pri:NzIyNjY1MzI4\",\"timestamp\":1694548363039,\"encoding\":\"json\",\"channel\":\"NzM2MDI5Mzc0_MTgyNTg1MTgwNg==_splits\",\"data\":\"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":3,\\\"pcn\\\":2,\\\"c\\\":0,\\\"d\\\":\\\"eyJ0cmFmZmljVHlwZU5hbWUiOiJjbGllbnQiLCJuYW1lIjoid29ya20iLCJ0cmFmZmljQWxsb2NhdGlvbiI6MTAwLCJ0cmFmZmljQWxsb2NhdGlvblNlZWQiOjE0NzM5MjIyNCwic2VlZCI6NTI0NDE3MTA1LCJzdGF0dXMiOiJBQ1RJVkUiLCJraWxsZWQiOmZhbHNlLCJkZWZhdWx0VHJlYXRtZW50Ijoib24iLCJjaGFuZ2VOdW1iZXIiOjMsImFsZ28iOjIsImNvbmZpZ3VyYXRpb25zIjp7fSwic2V0cyI6WyJzZXRfMSJdLCJjb25kaXRpb25zIjpbeyJjb25kaXRpb25UeXBlIjoiUk9MTE9VVCIsIm1hdGNoZXJHcm91cCI6eyJjb21iaW5lciI6IkFORCIsIm1hdGNoZXJzIjpbeyJrZXlTZWxlY3RvciI6eyJ0cmFmZmljVHlwZSI6ImNsaWVudCIsImF0dHJpYnV0ZSI6bnVsbH0sIm1hdGNoZXJUeXBlIjoiSU5fU0VHTUVOVCIsIm5lZ2F0ZSI6ZmFsc2UsInVzZXJEZWZpbmVkU2VnbWVudE1hdGNoZXJEYXRhIjp7InNlZ21lbnROYW1lIjoibmV3X3NlZ21lbnQifSwid2hpdGVsaXN0TWF0Y2hlckRhdGEiOm51bGwsInVuYXJ5TnVtZXJpY01hdGNoZXJEYXRhIjpudWxsLCJiZXR3ZWVuTWF0Y2hlckRhdGEiOm51bGwsImJvb2xlYW5NYXRjaGVyRGF0YSI6bnVsbCwiZGVwZW5kZW5jeU1hdGNoZXJEYXRhIjpudWxsLCJzdHJpbmdNYXRjaGVyRGF0YSI6bnVsbH1dfSwicGFydGl0aW9ucyI6W3sidHJlYXRtZW50Ijoib24iLCJzaXplIjowfSx7InRyZWF0bWVudCI6Im9mZiIsInNpemUiOjB9LHsidHJlYXRtZW50IjoiZnJlZSIsInNpemUiOjEwMH0seyJ0cmVhdG1lbnQiOiJjb250YSIsInNpemUiOjB9XSwibGFiZWwiOiJpbiBzZWdtZW50IG5ld19zZWdtZW50In0seyJjb25kaXRpb25UeXBlIjoiUk9MTE9VVCIsIm1hdGNoZXJHcm91cCI6eyJjb21iaW5lciI6IkFORCIsIm1hdGNoZXJzIjpbeyJrZXlTZWxlY3RvciI6eyJ0cmFmZmljVHlwZSI6ImNsaWVudCIsImF0dHJpYnV0ZSI6bnVsbH0sIm1hdGNoZXJUeXBlIjoiQUxMX0tFWVMiLCJuZWdhdGUiOmZhbHNlLCJ1c2VyRGVmaW5lZFNlZ21lbnRNYXRjaGVyRGF0YSI6bnVsbCwid2hpdGVsaXN0TWF0Y2hlckRhdGEiOm51bGwsInVuYXJ5TnVtZXJpY01hdGNoZXJEYXRhIjpudWxsLCJiZXR3ZWVuTWF0Y2hlckRhdGEiOm51bGwsImJvb2xlYW5NYXRjaGVyRGF0YSI6bnVsbCwiZGVwZW5kZW5jeU1hdGNoZXJEYXRhIjpudWxsLCJzdHJpbmdNYXRjaGVyRGF0YSI6bnVsbH1dfSwicGFydGl0aW9ucyI6W3sidHJlYXRtZW50Ijoib24iLCJzaXplIjoxMDB9LHsidHJlYXRtZW50Ijoib2ZmIiwic2l6ZSI6MH0seyJ0cmVhdG1lbnQiOiJmcmVlIiwic2l6ZSI6MH0seyJ0cmVhdG1lbnQiOiJjb250YSIsInNpemUiOjB9XSwibGFiZWwiOiJkZWZhdWx0IHJ1bGUifV19\\\"}\"}" } diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.4.json b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.4.json index 0806febf2..61c4e4fc4 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.4.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.4.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"m2T85LA4fQ:0:0\",\"clientId\":\"pri:NzIyNjY1MzI4\",\"timestamp\":1694548363039,\"encoding\":\"json\",\"channel\":\"NzM2MDI5Mzc0_MTgyNTg1MTgwNg==_splits\",\"data\":\"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":4,\\\"pcn\\\":3,\\\"c\\\":0,\\\"d\\\":\\\"eyJ0cmFmZmljVHlwZU5hbWUiOiJjbGllbnQiLCJuYW1lIjoid29ya20iLCJ0cmFmZmljQWxsb2NhdGlvbiI6MTAwLCJ0cmFmZmljQWxsb2NhdGlvblNlZWQiOjE0NzM5MjIyNCwic2VlZCI6NTI0NDE3MTA1LCJzdGF0dXMiOiJBQ1RJVkUiLCJraWxsZWQiOmZhbHNlLCJkZWZhdWx0VHJlYXRtZW50Ijoib24iLCJjaGFuZ2VOdW1iZXIiOjQsImFsZ28iOjIsImNvbmZpZ3VyYXRpb25zIjp7fSwic2V0cyI6WyJzZXRfMyJdLCJjb25kaXRpb25zIjpbeyJjb25kaXRpb25UeXBlIjoiUk9MTE9VVCIsIm1hdGNoZXJHcm91cCI6eyJjb21iaW5lciI6IkFORCIsIm1hdGNoZXJzIjpbeyJrZXlTZWxlY3RvciI6eyJ0cmFmZmljVHlwZSI6ImNsaWVudCIsImF0dHJpYnV0ZSI6bnVsbH0sIm1hdGNoZXJUeXBlIjoiSU5fU0VHTUVOVCIsIm5lZ2F0ZSI6ZmFsc2UsInVzZXJEZWZpbmVkU2VnbWVudE1hdGNoZXJEYXRhIjp7InNlZ21lbnROYW1lIjoibmV3X3NlZ21lbnQifSwid2hpdGVsaXN0TWF0Y2hlckRhdGEiOm51bGwsInVuYXJ5TnVtZXJpY01hdGNoZXJEYXRhIjpudWxsLCJiZXR3ZWVuTWF0Y2hlckRhdGEiOm51bGwsImJvb2xlYW5NYXRjaGVyRGF0YSI6bnVsbCwiZGVwZW5kZW5jeU1hdGNoZXJEYXRhIjpudWxsLCJzdHJpbmdNYXRjaGVyRGF0YSI6bnVsbH1dfSwicGFydGl0aW9ucyI6W3sidHJlYXRtZW50Ijoib24iLCJzaXplIjowfSx7InRyZWF0bWVudCI6Im9mZiIsInNpemUiOjB9LHsidHJlYXRtZW50IjoiZnJlZSIsInNpemUiOjEwMH0seyJ0cmVhdG1lbnQiOiJjb250YSIsInNpemUiOjB9XSwibGFiZWwiOiJpbiBzZWdtZW50IG5ld19zZWdtZW50In0seyJjb25kaXRpb25UeXBlIjoiUk9MTE9VVCIsIm1hdGNoZXJHcm91cCI6eyJjb21iaW5lciI6IkFORCIsIm1hdGNoZXJzIjpbeyJrZXlTZWxlY3RvciI6eyJ0cmFmZmljVHlwZSI6ImNsaWVudCIsImF0dHJpYnV0ZSI6bnVsbH0sIm1hdGNoZXJUeXBlIjoiQUxMX0tFWVMiLCJuZWdhdGUiOmZhbHNlLCJ1c2VyRGVmaW5lZFNlZ21lbnRNYXRjaGVyRGF0YSI6bnVsbCwid2hpdGVsaXN0TWF0Y2hlckRhdGEiOm51bGwsInVuYXJ5TnVtZXJpY01hdGNoZXJEYXRhIjpudWxsLCJiZXR3ZWVuTWF0Y2hlckRhdGEiOm51bGwsImJvb2xlYW5NYXRjaGVyRGF0YSI6bnVsbCwiZGVwZW5kZW5jeU1hdGNoZXJEYXRhIjpudWxsLCJzdHJpbmdNYXRjaGVyRGF0YSI6bnVsbH1dfSwicGFydGl0aW9ucyI6W3sidHJlYXRtZW50Ijoib24iLCJzaXplIjoxMDB9LHsidHJlYXRtZW50Ijoib2ZmIiwic2l6ZSI6MH0seyJ0cmVhdG1lbnQiOiJmcmVlIiwic2l6ZSI6MH0seyJ0cmVhdG1lbnQiOiJjb250YSIsInNpemUiOjB9XSwibGFiZWwiOiJkZWZhdWx0IHJ1bGUifV19\\\"}\"}" } diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.4None.json b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.4None.json index ef90c8f9a..81730d566 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.4None.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.4None.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"m2T85LA4fQ:0:0\",\"clientId\":\"pri:NzIyNjY1MzI4\",\"timestamp\":1694548363039,\"encoding\":\"json\",\"channel\":\"NzM2MDI5Mzc0_MTgyNTg1MTgwNg==_splits\",\"data\":\"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":4,\\\"pcn\\\":3,\\\"c\\\":0,\\\"d\\\":\\\"eyJ0cmFmZmljVHlwZU5hbWUiOiJjbGllbnQiLCJuYW1lIjoid29ya20iLCJ0cmFmZmljQWxsb2NhdGlvbiI6MTAwLCJ0cmFmZmljQWxsb2NhdGlvblNlZWQiOjE0NzM5MjIyNCwic2VlZCI6NTI0NDE3MTA1LCJzdGF0dXMiOiJBQ1RJVkUiLCJraWxsZWQiOmZhbHNlLCJkZWZhdWx0VHJlYXRtZW50Ijoib24iLCJjaGFuZ2VOdW1iZXIiOjUsImFsZ28iOjIsImNvbmZpZ3VyYXRpb25zIjp7fSwic2V0cyI6W10sImNvbmRpdGlvbnMiOlt7ImNvbmRpdGlvblR5cGUiOiJST0xMT1VUIiwibWF0Y2hlckdyb3VwIjp7ImNvbWJpbmVyIjoiQU5EIiwibWF0Y2hlcnMiOlt7ImtleVNlbGVjdG9yIjp7InRyYWZmaWNUeXBlIjoiY2xpZW50IiwiYXR0cmlidXRlIjpudWxsfSwibWF0Y2hlclR5cGUiOiJJTl9TRUdNRU5UIiwibmVnYXRlIjpmYWxzZSwidXNlckRlZmluZWRTZWdtZW50TWF0Y2hlckRhdGEiOnsic2VnbWVudE5hbWUiOiJuZXdfc2VnbWVudCJ9LCJ3aGl0ZWxpc3RNYXRjaGVyRGF0YSI6bnVsbCwidW5hcnlOdW1lcmljTWF0Y2hlckRhdGEiOm51bGwsImJldHdlZW5NYXRjaGVyRGF0YSI6bnVsbCwiYm9vbGVhbk1hdGNoZXJEYXRhIjpudWxsLCJkZXBlbmRlbmN5TWF0Y2hlckRhdGEiOm51bGwsInN0cmluZ01hdGNoZXJEYXRhIjpudWxsfV19LCJwYXJ0aXRpb25zIjpbeyJ0cmVhdG1lbnQiOiJvbiIsInNpemUiOjB9LHsidHJlYXRtZW50Ijoib2ZmIiwic2l6ZSI6MH0seyJ0cmVhdG1lbnQiOiJmcmVlIiwic2l6ZSI6MTAwfSx7InRyZWF0bWVudCI6ImNvbnRhIiwic2l6ZSI6MH1dLCJsYWJlbCI6ImluIHNlZ21lbnQgbmV3X3NlZ21lbnQifSx7ImNvbmRpdGlvblR5cGUiOiJST0xMT1VUIiwibWF0Y2hlckdyb3VwIjp7ImNvbWJpbmVyIjoiQU5EIiwibWF0Y2hlcnMiOlt7ImtleVNlbGVjdG9yIjp7InRyYWZmaWNUeXBlIjoiY2xpZW50IiwiYXR0cmlidXRlIjpudWxsfSwibWF0Y2hlclR5cGUiOiJBTExfS0VZUyIsIm5lZ2F0ZSI6ZmFsc2UsInVzZXJEZWZpbmVkU2VnbWVudE1hdGNoZXJEYXRhIjpudWxsLCJ3aGl0ZWxpc3RNYXRjaGVyRGF0YSI6bnVsbCwidW5hcnlOdW1lcmljTWF0Y2hlckRhdGEiOm51bGwsImJldHdlZW5NYXRjaGVyRGF0YSI6bnVsbCwiYm9vbGVhbk1hdGNoZXJEYXRhIjpudWxsLCJkZXBlbmRlbmN5TWF0Y2hlckRhdGEiOm51bGwsInN0cmluZ01hdGNoZXJEYXRhIjpudWxsfV19LCJwYXJ0aXRpb25zIjpbeyJ0cmVhdG1lbnQiOiJvbiIsInNpemUiOjEwMH0seyJ0cmVhdG1lbnQiOiJvZmYiLCJzaXplIjowfSx7InRyZWF0bWVudCI6ImZyZWUiLCJzaXplIjowfSx7InRyZWF0bWVudCI6ImNvbnRhIiwic2l6ZSI6MH1dLCJsYWJlbCI6ImRlZmF1bHQgcnVsZSJ9XX0\\\"}\"}" } diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.5.json b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.5.json index c03ffddc1..a54919e54 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.5.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.5.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"m2T85LA4fQ:0:0\",\"clientId\":\"pri:NzIyNjY1MzI4\",\"timestamp\":1694548665831,\"encoding\":\"json\",\"channel\":\"NzM2MDI5Mzc0_MTgyNTg1MTgwNg==_splits\",\"data\":\"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":5,\\\"pcn\\\":4,\\\"c\\\":0,\\\"d\\\":\\\"eyJ0cmFmZmljVHlwZU5hbWUiOiJjbGllbnQiLCJuYW1lIjoid29ya20iLCJ0cmFmZmljQWxsb2NhdGlvbiI6MTAwLCJ0cmFmZmljQWxsb2NhdGlvblNlZWQiOjE0NzM5MjIyNCwic2VlZCI6NTI0NDE3MTA1LCJzdGF0dXMiOiJBQ1RJVkUiLCJraWxsZWQiOmZhbHNlLCJkZWZhdWx0VHJlYXRtZW50Ijoib24iLCJjaGFuZ2VOdW1iZXIiOjUsImFsZ28iOjIsImNvbmZpZ3VyYXRpb25zIjp7fSwic2V0cyI6WyJzZXRfMyIsInNldF80Il0sImNvbmRpdGlvbnMiOlt7ImNvbmRpdGlvblR5cGUiOiJST0xMT1VUIiwibWF0Y2hlckdyb3VwIjp7ImNvbWJpbmVyIjoiQU5EIiwibWF0Y2hlcnMiOlt7ImtleVNlbGVjdG9yIjp7InRyYWZmaWNUeXBlIjoiY2xpZW50IiwiYXR0cmlidXRlIjpudWxsfSwibWF0Y2hlclR5cGUiOiJJTl9TRUdNRU5UIiwibmVnYXRlIjpmYWxzZSwidXNlckRlZmluZWRTZWdtZW50TWF0Y2hlckRhdGEiOnsic2VnbWVudE5hbWUiOiJuZXdfc2VnbWVudCJ9LCJ3aGl0ZWxpc3RNYXRjaGVyRGF0YSI6bnVsbCwidW5hcnlOdW1lcmljTWF0Y2hlckRhdGEiOm51bGwsImJldHdlZW5NYXRjaGVyRGF0YSI6bnVsbCwiYm9vbGVhbk1hdGNoZXJEYXRhIjpudWxsLCJkZXBlbmRlbmN5TWF0Y2hlckRhdGEiOm51bGwsInN0cmluZ01hdGNoZXJEYXRhIjpudWxsfV19LCJwYXJ0aXRpb25zIjpbeyJ0cmVhdG1lbnQiOiJvbiIsInNpemUiOjB9LHsidHJlYXRtZW50Ijoib2ZmIiwic2l6ZSI6MH0seyJ0cmVhdG1lbnQiOiJmcmVlIiwic2l6ZSI6MTAwfSx7InRyZWF0bWVudCI6ImNvbnRhIiwic2l6ZSI6MH1dLCJsYWJlbCI6ImluIHNlZ21lbnQgbmV3X3NlZ21lbnQifSx7ImNvbmRpdGlvblR5cGUiOiJST0xMT1VUIiwibWF0Y2hlckdyb3VwIjp7ImNvbWJpbmVyIjoiQU5EIiwibWF0Y2hlcnMiOlt7ImtleVNlbGVjdG9yIjp7InRyYWZmaWNUeXBlIjoiY2xpZW50IiwiYXR0cmlidXRlIjpudWxsfSwibWF0Y2hlclR5cGUiOiJBTExfS0VZUyIsIm5lZ2F0ZSI6ZmFsc2UsInVzZXJEZWZpbmVkU2VnbWVudE1hdGNoZXJEYXRhIjpudWxsLCJ3aGl0ZWxpc3RNYXRjaGVyRGF0YSI6bnVsbCwidW5hcnlOdW1lcmljTWF0Y2hlckRhdGEiOm51bGwsImJldHdlZW5NYXRjaGVyRGF0YSI6bnVsbCwiYm9vbGVhbk1hdGNoZXJEYXRhIjpudWxsLCJkZXBlbmRlbmN5TWF0Y2hlckRhdGEiOm51bGwsInN0cmluZ01hdGNoZXJEYXRhIjpudWxsfV19LCJwYXJ0aXRpb25zIjpbeyJ0cmVhdG1lbnQiOiJvbiIsInNpemUiOjEwMH0seyJ0cmVhdG1lbnQiOiJvZmYiLCJzaXplIjowfSx7InRyZWF0bWVudCI6ImZyZWUiLCJzaXplIjowfSx7InRyZWF0bWVudCI6ImNvbnRhIiwic2l6ZSI6MH1dLCJsYWJlbCI6ImRlZmF1bHQgcnVsZSJ9XX0\\\"}\"}" } diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.6.json b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.6.json index 8b26192c8..a0caa3d79 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.6.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.6.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"m2T85LA4fQ:0:0\",\"clientId\":\"pri:NzIyNjY1MzI4\",\"timestamp\":1694548363040,\"encoding\":\"json\",\"channel\":\"NzM2MDI5Mzc0_MTgyNTg1MTgwNg==_splits\",\"data\":\"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":6,\\\"pcn\\\":5,\\\"c\\\":0,\\\"d\\\":\\\"eyJ0cmFmZmljVHlwZU5hbWUiOiJjbGllbnQiLCJuYW1lIjoid29ya20iLCJ0cmFmZmljQWxsb2NhdGlvbiI6MTAwLCJ0cmFmZmljQWxsb2NhdGlvblNlZWQiOjE0NzM5MjIyNCwic2VlZCI6NTI0NDE3MTA1LCJzdGF0dXMiOiJBQ1RJVkUiLCJraWxsZWQiOmZhbHNlLCJkZWZhdWx0VHJlYXRtZW50Ijoib24iLCJjaGFuZ2VOdW1iZXIiOjIsImFsZ28iOjIsImNvbmZpZ3VyYXRpb25zIjp7fSwic2V0cyI6WyJzZXRfMSIsInNldF8yIl0sImNvbmRpdGlvbnMiOlt7ImNvbmRpdGlvblR5cGUiOiJST0xMT1VUIiwibWF0Y2hlckdyb3VwIjp7ImNvbWJpbmVyIjoiQU5EIiwibWF0Y2hlcnMiOlt7ImtleVNlbGVjdG9yIjp7InRyYWZmaWNUeXBlIjoiY2xpZW50IiwiYXR0cmlidXRlIjpudWxsfSwibWF0Y2hlclR5cGUiOiJJTl9TRUdNRU5UIiwibmVnYXRlIjpmYWxzZSwidXNlckRlZmluZWRTZWdtZW50TWF0Y2hlckRhdGEiOnsic2VnbWVudE5hbWUiOiJuZXdfc2VnbWVudCJ9LCJ3aGl0ZWxpc3RNYXRjaGVyRGF0YSI6bnVsbCwidW5hcnlOdW1lcmljTWF0Y2hlckRhdGEiOm51bGwsImJldHdlZW5NYXRjaGVyRGF0YSI6bnVsbCwiYm9vbGVhbk1hdGNoZXJEYXRhIjpudWxsLCJkZXBlbmRlbmN5TWF0Y2hlckRhdGEiOm51bGwsInN0cmluZ01hdGNoZXJEYXRhIjpudWxsfV19LCJwYXJ0aXRpb25zIjpbeyJ0cmVhdG1lbnQiOiJvbiIsInNpemUiOjB9LHsidHJlYXRtZW50Ijoib2ZmIiwic2l6ZSI6MH0seyJ0cmVhdG1lbnQiOiJmcmVlIiwic2l6ZSI6MTAwfSx7InRyZWF0bWVudCI6ImNvbnRhIiwic2l6ZSI6MH1dLCJsYWJlbCI6ImluIHNlZ21lbnQgbmV3X3NlZ21lbnQifSx7ImNvbmRpdGlvblR5cGUiOiJST0xMT1VUIiwibWF0Y2hlckdyb3VwIjp7ImNvbWJpbmVyIjoiQU5EIiwibWF0Y2hlcnMiOlt7ImtleVNlbGVjdG9yIjp7InRyYWZmaWNUeXBlIjoiY2xpZW50IiwiYXR0cmlidXRlIjpudWxsfSwibWF0Y2hlclR5cGUiOiJBTExfS0VZUyIsIm5lZ2F0ZSI6ZmFsc2UsInVzZXJEZWZpbmVkU2VnbWVudE1hdGNoZXJEYXRhIjpudWxsLCJ3aGl0ZWxpc3RNYXRjaGVyRGF0YSI6bnVsbCwidW5hcnlOdW1lcmljTWF0Y2hlckRhdGEiOm51bGwsImJldHdlZW5NYXRjaGVyRGF0YSI6bnVsbCwiYm9vbGVhbk1hdGNoZXJEYXRhIjpudWxsLCJkZXBlbmRlbmN5TWF0Y2hlckRhdGEiOm51bGwsInN0cmluZ01hdGNoZXJEYXRhIjpudWxsfV19LCJwYXJ0aXRpb25zIjpbeyJ0cmVhdG1lbnQiOiJvbiIsInNpemUiOjEwMH0seyJ0cmVhdG1lbnQiOiJvZmYiLCJzaXplIjowfSx7InRyZWF0bWVudCI6ImZyZWUiLCJzaXplIjowfSx7InRyZWF0bWVudCI6ImNvbnRhIiwic2l6ZSI6MH1dLCJsYWJlbCI6ImRlZmF1bHQgcnVsZSJ9XX0\\\"}\"}" } diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.kill.json b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.kill.json index b00248517..6aa87e646 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.FS.kill.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.FS.kill.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\":\"-OT-rGuSwz:0:0\",\"clientId\":\"NDEzMTY5Mzg0MA==:NDIxNjU0NTUyNw==\",\"timestamp\":1694549324214,\"encoding\":\"json\",\"channel\":\"NzM2MDI5Mzc0_MTgyNTg1MTgwNg==_splits\",\"data\":\"{\\\"type\\\":\\\"SPLIT_KILL\\\",\\\"changeNumber\\\":5,\\\"defaultTreatment\\\":\\\"off\\\",\\\"splitName\\\":\\\"workm\\\"}\"}" } diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694505.json b/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694505.json index cf6096c72..ce4051730 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694505.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694505.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\": \"mc4i3NENoA:0:0\",\"clientId\": \"NDEzMTY5Mzg0MA==:MTM2ODE2NDMxNA==\",\"timestamp\": 1684265694505,\"encoding\": \"json\",\"channel\": \"NzM2MDI5Mzc0_NDEzMjQ1MzA0Nw==_splits\",\"data\": \"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":1684265694505,\\\"pcn\\\":1457552650001,\\\"c\\\":1,\\\"d\\\":\\\"H4sIAAAAAAAA/8yT327aTBDFXyU612vJxoTgvUMfKB8qcaSapqoihAZ7DNusvWi9TpUiv3tl/pdQVb1qL+cwc3bOj/EGzlKeq3T6tuaYCoZEXbGFgMogkXXDIM0y31v4C/aCgMnrU9/3gl7Pp4yilMMIAuVusqDamvlXeiWIg/FAa5OSU6aEDHz/ip4wZ5Be1AmjoBsFAtVOCO56UXh31/O7ApUjV1eQGPw3HT+NIPCitG7bctIVC2ScU63d1DK5gksHCZPnEEhXVC45rosFW8ig1++GYej3g85tJEB6aSA7Aqkpc7Ws7XahCnLTbLVM7evnzalsUUHi8//j6WgyTqYQKMilK7b31tRryLa3WKiyfRCDeHhq2Dntiys+JS/J8THUt5VyrFXlHnYTQ3LU2h91yGdQVqhy+0RtTeuhUoNZ08wagTVZdxbBndF5vYVApb7z9m9pZgKaFqwhT+6coRHvg398nEweP/157Bd+S1hz6oxtm88O73B0jbhgM47nyej+YRRfgdNODDlXJWcJL9tUF5SqnRqfbtPr4LdcTHnk4rfp3buLOkG7+Pmp++vRM9w/wVblzX7Pm8OGfxf5YDKZfxh9SS6B/2Pc9t/7ja01o5k1PwIAAP//uTipVskEAAA=\\\"}\"}" } diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694515.json b/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694515.json index e296d63a5..168eeb961 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694515.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694515.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\": \"mc4i3NENoA:0:0\",\"clientId\": \"NDEzMTY5Mzg0MA==:MTM2ODE2NDMxNA==\",\"timestamp\": 1684265694515,\"encoding\": \"json\",\"channel\": \"NzM2MDI5Mzc0_NDEzMjQ1MzA0Nw==_splits\",\"data\": \"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":1684265694515,\\\"pcn\\\":1457552650001,\\\"c\\\":3,\\\"d\\\":\\\"eJzMk99u2kwQxV8lOtdryQZj8N6hD5QPlThSTVNVEUKDPYZt1jZar1OlyO9emf8lVFWv2ss5zJyd82O8hTWUZSqZvW04opwhUVdsIKBSSKR+10vS1HWW7pIdz2NyBjRwHS8IXEopTLgbQqDYT+ZUm3LxlV4J4mg81LpMyKqygPRc94YeM6eQTtjphp4fegLVXvD6Qdjt9wPXF6gs2bqCxPC/2eRpDIEXpXXblpGuWCDljGptZ4bJ5lxYSJRZBoFkTcWKozpfsoH0goHfCXpB6PfcngDpVQnZEUjKIlOr2uwWqiC3zU5L1aF+3p7LFhUkPv8/mY2nk3gGgZxssmZzb8p6A9n25ktVtA9iGI3ODXunQ3HDp+AVWT6F+rZWlrWq7MN+YkSWWvuTDvkMSnNV7J6oTdl6qKTEvGnmjcCGjL2IYC/ovPYgUKnvvPtbmrmApiVryLM7p2jE++AfH6fTx09/HvuF32LWnNjStM0Xh3c8ukZcsZlEi3h8/zCObsBpJ0acqYLTmFdtqitK1V6NzrfpdPBbLmVx4uK26e27izpDu/r5yf/16AXun2Cr4u6w591xw7+LfDidLj6Mv8TXwP8xbofv/c7UmtHMmx8BAAD//0fclvU=\\\"}\"}" } diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694525.json b/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694525.json index f5d8ee3ee..31cab8650 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694525.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694525.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\": \"mc4i3NENoA:0:0\",\"clientId\": \"NDEzMTY5Mzg0MA==:MTM2ODE2NDMxNA==\",\"timestamp\": 1684265694525,\"encoding\": \"json\",\"channel\": \"NzM2MDI5Mzc0_NDEzMjQ1MzA0Nw==_splits\",\"data\": \"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":1684265694525,\\\"pcn\\\":0,\\\"c\\\":2,\\\"d\\\":\\\"eJzMk99u2kwQxV8lOtdryQZj8N6hD5QPlThSTVNVEUKDPYZt1jZar1OlyO9emf8lVFWv2ss5zJyd82O8hTWUZSqZvW04opwhUVdsIKBSSKR+10vS1HWW7pIdz2NyBjRwHS8IXEopTLgbQqDYT+ZUm3LxlV4J4mg81LpMyKqygPRc94YeM6eQTtjphp4fegLVXvD6Qdjt9wPXF6gs2bqCxPC/2eRpDIEXpXXblpGuWCDljGptZ4bJ5lxYSJRZBoFkTcWKozpfsoH0goHfCXpB6PfcngDpVQnZEUjKIlOr2uwWqiC3zU5L1aF+3p7LFhUkPv8/mY2nk3gGgZxssmZzb8p6A9n25ktVtA9iGI3ODXunQ3HDp+AVWT6F+rZWlrWq7MN+YkSWWvuTDvkMSnNV7J6oTdl6qKTEvGnmjcCGjL2IYC/ovPYgUKnvvPtbmrmApiVryLM7p2jE++AfH6fTx09/HvuF32LWnNjStM0Xh3c8ukZcsZlEi3h8/zCObsBpJ0acqYLTmFdtqitK1V6NzrfpdPBbLmVx4uK26e27izpDu/r5yf/16AXun2Cr4u6w591xw7+LfDidLj6Mv8TXwP8xbofv/c7UmtHMmx8BAAD//0fclvU=\\\"}\"}" } diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694545.json b/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694545.json index 4884cb7fa..797e8b8c3 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694545.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694545.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\": \"mc4i3NENoA:0:0\",\"clientId\": \"NDEzMTY5Mzg0MA==:MTM2ODE2NDMxNA==\",\"timestamp\": 1684265694545,\"encoding\": \"json\",\"channel\": \"NzM2MDI5Mzc0_NDEzMjQ1MzA0Nw==_splits\",\"data\": \"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":1684265694545,\\\"pcn\\\":1684265694535,\\\"c\\\":1,\\\"d\\\":\\\"eJzMk99u2kwQxV8lOtdryQZj8N6hD5QPlThSTVNVEUKDPYZt1jZar1OlyO9emf8lVFWv2ss5zJyd82O8hTWUZSqZvW04opwhUVdsIKBSSKR+10vS1HWW7pIdz2NyBjRwHS8IXEopTLgbQqDYT+ZUm3LxlV4J4mg81LpMyKqygPRc94YeM6eQTtjphp4fegLVXvD6Qdjt9wPXF6gs2bqCxPC/2eRpDIEXpXXblpGuWCDljGptZ4bJ5lxYSJRZBoFkTcWKozpfsoH0goHfCXpB6PfcngDpVQnZEUjKIlOr2uwWqiC3zU5L1aF+3p7LFhUkPv8/mY2nk3gGgZxssmZzb8p6A9n25ktVtA9iGI3ODXunQ3HDp+AVWT6F+rZWlrWq7MN+YkSWWvuTDvkMSnNV7J6oTdl6qKTEvGnmjcCGjL2IYC/ovPYgUKnvvPtbmrmApiVryLM7p2jE++AfH6fTx09/HvuF32LWnNjStM0Xh3c8ukZcsZlEi3h8/zCObsBpJ0acqYLTmFdtqitK1V6NzrfpdPBbLmVx4uK26e27izpDu/r5yf/16AXun2Cr4u6w591xw7+LfDidLj6Mv8TXwP8xbofv/c7UmtHMmx8BAAD//0fclvU=\\\"}\"}" } diff --git a/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694555.json b/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694555.json index 4b108ebd7..efb3b9f72 100644 --- a/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694555.json +++ b/src/__tests__/mocks/message.SPLIT_UPDATE.IFFU.1684265694555.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"id\": \"mc4i3NENoA:0:0\",\"clientId\": \"NDEzMTY5Mzg0MA==:MTM2ODE2NDMxNA==\",\"timestamp\": 1684265694555,\"encoding\": \"json\",\"channel\": \"NzM2MDI5Mzc0_NDEzMjQ1MzA0Nw==_splits\",\"data\": \"{\\\"type\\\":\\\"SPLIT_UPDATE\\\",\\\"changeNumber\\\":1684265694555,\\\"pcn\\\":1684265694535,\\\"c\\\":2,\\\"d\\\":\\\"eJxsUdFu4jAQ/JVqnx3JDjTh/JZCrj2JBh0EqtOBIuNswKqTIMeuxKH8+ykhiKrqiyXvzM7O7lzAGlEUSqbnEyaiRODgGjRAQOXAIQ/puPB96tHHIPQYQ/QmFNErxEgG44DKnI2AQHXtTOI0my6WcXZAmxoUtsTKvil7nNZVoQ5RYdFERh7VBwK5TY60rqWwqq6AM0q/qa8Qc+As/EHZ5HHMCDR9wQ/9kIajcEygscK6BjhEy+nLr008AwLvSuuOVgjdIIEcC+H03RZw2Hg/n88JEJBHUR0wceUeDXAWTAIWPAYsZEFAQOhDDdwnIPslnOk9NcAvNwEOly3IWtdmC3wLe+1wCy0Q2Hh/zNvTV9xg3sFtr5irQe3v5f7twgAOy8V8vlinQKAUVh7RPJvanbrBsi73qurMQpTM7oSrzjueV6hR2tp05E8J39MV1hq1d7YrWWxsZ2cQGYjzeLXK0pcoyRbLLP69juZZuuiyxoPo2oa7ukqYc+JKNEq+XgVmwopucC6sGMSS9etTvAQCH0I7BO7Ttt21BE7C2E8XsN+l06h/CJy25CveH/eGM0rbHQEt9qiHnR62jtKR7N/8wafQ7tr/AQAA//8S4fPB\\\"}\"}" } diff --git a/src/__tests__/mocks/message.STREAMING_RESET.json b/src/__tests__/mocks/message.STREAMING_RESET.json index 791d9ded9..99f96f6ba 100644 --- a/src/__tests__/mocks/message.STREAMING_RESET.json +++ b/src/__tests__/mocks/message.STREAMING_RESET.json @@ -1,4 +1,4 @@ { - "type": "message", + "event": "message", "data": "{\"timestamp\":1457552660000,\"data\":\"{\\\"type\\\":\\\"CONTROL\\\",\\\"controlType\\\":\\\"STREAMING_RESET\\\"}\"}" } \ No newline at end of file diff --git a/src/__tests__/mocks/splitChanges.since.1500492097547.till.1500492297547.json b/src/__tests__/mocks/splitChanges.since.1500492097547.till.1500492297547.json index 5c0ce4c57..76be92f92 100644 --- a/src/__tests__/mocks/splitChanges.since.1500492097547.till.1500492297547.json +++ b/src/__tests__/mocks/splitChanges.since.1500492097547.till.1500492297547.json @@ -10,7 +10,7 @@ "status": "ACTIVE", "killed": false, "defaultTreatment": "off", - "changeNumber": 1492734008466, + "changeNumber": 1500492297547, "algo": null, "conditions": [ { diff --git a/src/__tests__/mocks/splitchanges.real.json b/src/__tests__/mocks/splitchanges.real.json index 5fb9163de..2b9d0d644 100644 --- a/src/__tests__/mocks/splitchanges.real.json +++ b/src/__tests__/mocks/splitchanges.real.json @@ -10,7 +10,7 @@ "status": "ACTIVE", "killed": false, "defaultTreatment": "on", - "changeNumber": 1550099287313, + "changeNumber": 1457552620999, "algo": 2, "conditions": [ { diff --git a/src/__tests__/mocks/splitchanges.real.updateWithSegments.json b/src/__tests__/mocks/splitchanges.real.updateWithSegments.json index 99e015051..af35a1308 100644 --- a/src/__tests__/mocks/splitchanges.real.updateWithSegments.json +++ b/src/__tests__/mocks/splitchanges.real.updateWithSegments.json @@ -10,7 +10,7 @@ "status": "ACTIVE", "killed": false, "defaultTreatment": "on", - "changeNumber": 1550099287313, + "changeNumber": 1457552649999, "algo": 2, "conditions": [ { diff --git a/src/__tests__/mocks/splitchanges.real.updateWithoutSegments.json b/src/__tests__/mocks/splitchanges.real.updateWithoutSegments.json index 865bae27b..b89c00147 100644 --- a/src/__tests__/mocks/splitchanges.real.updateWithoutSegments.json +++ b/src/__tests__/mocks/splitchanges.real.updateWithoutSegments.json @@ -10,7 +10,7 @@ "status": "ARCHIVED", "killed": false, "defaultTreatment": "on", - "changeNumber": 1550099287313, + "changeNumber": 1457552669999, "algo": 2, "conditions": [ { diff --git a/src/__tests__/mocks/splitchanges.real.withSegments.json b/src/__tests__/mocks/splitchanges.real.withSegments.json index ad766b311..799c774c0 100644 --- a/src/__tests__/mocks/splitchanges.real.withSegments.json +++ b/src/__tests__/mocks/splitchanges.real.withSegments.json @@ -10,7 +10,7 @@ "status": "ACTIVE", "killed": false, "defaultTreatment": "on", - "changeNumber": 1550099287313, + "changeNumber": 1457552620999, "algo": 2, "conditions": [ { @@ -66,57 +66,6 @@ } ], "configurations": {} - }, - { - "trafficTypeName": "user", - "name": "real_split_2", - "trafficAllocation": 100, - "trafficAllocationSeed": -1427479928, - "seed": 769174959, - "status": "ACTIVE", - "killed": false, - "defaultTreatment": "on", - "changeNumber": 1550099287990, - "algo": 2, - "conditions": [ - { - "conditionType": "ROLLOUT", - "matcherGroup": { - "combiner": "AND", - "matchers": [ - { - "keySelector": { - "trafficType": "user", - "attribute": null - }, - "matcherType": "ALL_KEYS", - "negate": false, - "userDefinedSegmentMatcherData": null, - "whitelistMatcherData": null, - "unaryNumericMatcherData": null, - "betweenMatcherData": null, - "booleanMatcherData": null, - "dependencyMatcherData": null, - "stringMatcherData": null - } - ] - }, - "partitions": [ - { - "treatment": "on", - "size": 100 - }, - { - "treatment": "off", - "size": 0 - } - ], - "label": "default rule" - } - ], - "configurations": { - "on": "{\"color\":\"brown\",\"dimensions\":{\"height\":12,\"width\":14},\"text\":{\"inner\":\"click me\"}}" - } } ], "s": -1, diff --git a/src/__tests__/nodeSuites/impressions-listener.spec.js b/src/__tests__/nodeSuites/impressions-listener.spec.js index 5a09d532c..5e1562314 100644 --- a/src/__tests__/nodeSuites/impressions-listener.spec.js +++ b/src/__tests__/nodeSuites/impressions-listener.spec.js @@ -43,9 +43,10 @@ export default function (assert) { client.getTreatment({ matchingKey: 'marcio@split.io', bucketingKey: 'impr_bucketing_2' }, 'qc_team'); client.getTreatment('facundo@split.io', 'qc_team', testAttrs); client.getTreatment('facundo@split.io', 'qc_team', testAttrs); + client.getTreatment('trevor@split.io', 'qc_team'); setTimeout(() => { - assert.equal(listener.logImpression.callCount, 4, 'Impression listener logImpression method should be called after we call client.getTreatment, once per each impression generated.'); + assert.equal(listener.logImpression.callCount, 5, 'Impression listener logImpression method should be called after we call client.getTreatment, once per each impression generated.'); assert.true(listener.logImpression.getCall(0).calledWithExactly({ impression: { feature: 'hierarchical_splits_test', @@ -94,6 +95,16 @@ export default function (assert) { attributes: testAttrs, ...metaData })); + assert.true(listener.logImpression.getCall(4).calledWithMatch({ + impression: { + feature: 'qc_team', + keyName: 'trevor@split.io', + treatment: 'yes', + bucketingKey: undefined, + label: '', + }, + ...metaData + })); client.destroy(); assert.end(); diff --git a/src/__tests__/nodeSuites/push-fallback.spec.js b/src/__tests__/nodeSuites/push-fallback.spec.js index 61065c7d3..76edbd8c0 100644 --- a/src/__tests__/nodeSuites/push-fallback.spec.js +++ b/src/__tests__/nodeSuites/push-fallback.spec.js @@ -27,7 +27,7 @@ import streamingResetMessage from '../mocks/message.STREAMING_RESET.json'; import { nearlyEqual, mockSegmentChanges, url } from '../testUtils'; import EventSourceMock, { setMockListener } from '../testUtils/eventSourceMock'; -import { __setEventSource } from '../../platform/getEventSource/node'; +import { __setEventSource } from '@splitsoftware/splitio-commons/src/platform/getEventSource/node'; import { SplitFactory } from '../../'; import { settingsFactory } from '../../settings'; diff --git a/src/__tests__/nodeSuites/push-flag-sets.spec.js b/src/__tests__/nodeSuites/push-flag-sets.spec.js index e8a6fa6d5..a7c4c8fe3 100644 --- a/src/__tests__/nodeSuites/push-flag-sets.spec.js +++ b/src/__tests__/nodeSuites/push-flag-sets.spec.js @@ -1,6 +1,6 @@ import { SplitFactory } from '../..'; import EventSourceMock, { setMockListener } from '../testUtils/eventSourceMock'; -import { __setEventSource } from '../../platform/getEventSource/node'; +import { __setEventSource } from '@splitsoftware/splitio-commons/src/platform/getEventSource/node'; import { mockSegmentChanges } from '../testUtils'; import notification1 from '../mocks/message.SPLIT_UPDATE.FS.1.json'; diff --git a/src/__tests__/nodeSuites/push-initialization-nopush.spec.js b/src/__tests__/nodeSuites/push-initialization-nopush.spec.js index e06397592..fc7876a54 100644 --- a/src/__tests__/nodeSuites/push-initialization-nopush.spec.js +++ b/src/__tests__/nodeSuites/push-initialization-nopush.spec.js @@ -8,7 +8,7 @@ import authInvalidCredentials from '../mocks/auth.invalidCredentials.txt'; import authNoUserSpecified from '../mocks/auth.noUserSpecified.txt'; import { nearlyEqual, url } from '../testUtils'; -import { __setEventSource, __restore } from '../../platform/getEventSource/node'; +import { __setEventSource, __restore } from '@splitsoftware/splitio-commons/src/platform/getEventSource/node'; import EventSourceMock, { setMockListener } from '../testUtils/eventSourceMock'; const baseUrls = { diff --git a/src/__tests__/nodeSuites/push-initialization-retries.spec.js b/src/__tests__/nodeSuites/push-initialization-retries.spec.js index 94fc9d7c0..b81639ac3 100644 --- a/src/__tests__/nodeSuites/push-initialization-retries.spec.js +++ b/src/__tests__/nodeSuites/push-initialization-retries.spec.js @@ -7,7 +7,7 @@ import authPushBadToken from '../mocks/auth.pushBadToken.json'; import { nearlyEqual, url } from '../testUtils'; import EventSourceMock, { setMockListener } from '../testUtils/eventSourceMock'; -import { __setEventSource } from '../../platform/getEventSource/node'; +import { __setEventSource } from '@splitsoftware/splitio-commons/src/platform/getEventSource/node'; import { SplitFactory } from '../../'; import { settingsFactory } from '../../settings'; diff --git a/src/__tests__/nodeSuites/push-refresh-token.spec.js b/src/__tests__/nodeSuites/push-refresh-token.spec.js index 148bc45b7..a34f78a71 100644 --- a/src/__tests__/nodeSuites/push-refresh-token.spec.js +++ b/src/__tests__/nodeSuites/push-refresh-token.spec.js @@ -7,7 +7,7 @@ import authPushDisabled from '../mocks/auth.pushDisabled.json'; import { nearlyEqual, mockSegmentChanges, url } from '../testUtils'; import EventSourceMock, { setMockListener } from '../testUtils/eventSourceMock'; -import { __setEventSource } from '../../platform/getEventSource/node'; +import { __setEventSource } from '@splitsoftware/splitio-commons/src/platform/getEventSource/node'; import { SplitFactory } from '../../'; import { settingsFactory } from '../../settings'; diff --git a/src/__tests__/nodeSuites/push-synchronization-retries.spec.js b/src/__tests__/nodeSuites/push-synchronization-retries.spec.js index 71b97474d..9fcd1f571 100644 --- a/src/__tests__/nodeSuites/push-synchronization-retries.spec.js +++ b/src/__tests__/nodeSuites/push-synchronization-retries.spec.js @@ -13,7 +13,7 @@ import { nearlyEqual, mockSegmentChanges, url } from '../testUtils'; import { Backoff } from '@splitsoftware/splitio-commons/src/utils/Backoff'; import EventSourceMock, { setMockListener } from '../testUtils/eventSourceMock'; -import { __setEventSource } from '../../platform/getEventSource/node'; +import { __setEventSource } from '@splitsoftware/splitio-commons/src/platform/getEventSource/node'; import { SplitFactory } from '../../'; import { settingsFactory } from '../../settings'; diff --git a/src/__tests__/nodeSuites/push-synchronization.spec.js b/src/__tests__/nodeSuites/push-synchronization.spec.js index fee427fe5..27788f5db 100644 --- a/src/__tests__/nodeSuites/push-synchronization.spec.js +++ b/src/__tests__/nodeSuites/push-synchronization.spec.js @@ -30,7 +30,7 @@ import authPushEnabled from '../mocks/auth.pushEnabled.node.json'; import { nearlyEqual, mockSegmentChanges, url, hasNoCacheHeader } from '../testUtils'; import EventSourceMock, { setMockListener } from '../testUtils/eventSourceMock'; -import { __setEventSource } from '../../platform/getEventSource/node'; +import { __setEventSource } from '@splitsoftware/splitio-commons/src/platform/getEventSource/node'; import { SplitFactory } from '../../'; import { settingsFactory } from '../../settings'; @@ -92,7 +92,7 @@ const MILLIS_DESTROY = 1700; * 1.6 secs: RB_SEGMENT_UPDATE IFFU event with ZLib compression */ export function testSynchronization(fetchMock, assert) { - assert.plan(56); // +3 for SDK_UPDATE metadata (type, names array, names includes whitelist) + assert.plan(55); fetchMock.reset(); __setEventSource(EventSourceMock); @@ -138,13 +138,13 @@ export function testSynchronization(fetchMock, assert) { }, MILLIS_SEGMENT_UPDATE_EVENT); // send a SEGMENT_UPDATE event with a new changeNumber after 0.4 seconds setTimeout(() => { assert.equal(client.getTreatment(key, 'whitelist'), 'allowed', 'evaluation with not killed Split'); - const onUpdateCb = () => { + const onUpdateCb = (metadata) => { + assert.deepEqual(metadata, { type: 'FLAGS_UPDATE', names: ['whitelist'] }, 'SDK_UPDATE due to SPLIT_KILL event carries the killed flag name'); const lapse = Date.now() - start; assert.true(nearlyEqual(lapse, MILLIS_SPLIT_KILL_EVENT), 'SDK_UPDATE due to SPLIT_KILL event'); assert.equal(client.getTreatment(key, 'whitelist'), 'not_allowed', 'evaluation with killed Split'); }; - // SPLIT_KILL triggers two SDK_UPDATE events. The 1st due to `killLocally` and the 2nd due to `/splitChanges` fetch - client.once(client.Event.SDK_UPDATE, onUpdateCb); + // SPLIT_KILL triggers one SDK_UPDATE event due to `killLocally`. The `/splitChanges` fetch doesn't emit another one, since the flag was already updated with the same changeNumber client.once(client.Event.SDK_UPDATE, onUpdateCb); eventSourceInstance.emitMessage(splitKillMessage); }, MILLIS_SPLIT_KILL_EVENT); // send a SPLIT_KILL event with a new changeNumber after 0.5 seconds @@ -256,8 +256,7 @@ export function testSynchronization(fetchMock, assert) { setTimeout(() => { client.destroy().then(() => { assert.equal(client.getTreatment(key, 'whitelist'), 'control', 'evaluation returns control if client is destroyed'); - // @TODO SDK_UPDATE should be emitted 13 times, but currently it is being emitted twice on SPLIT_KILL - assert.equal(sdkUpdateCount, 14, 'SDK_UPDATE should be emitted 14 times'); + assert.equal(sdkUpdateCount, 13, 'SDK_UPDATE should be emitted 13 times'); assert.end(); }); }, MILLIS_DESTROY); // destroy client diff --git a/src/__tests__/nodeSuites/ready-promise.spec.js b/src/__tests__/nodeSuites/ready-promise.spec.js index bdcfd2737..2f7f85527 100644 --- a/src/__tests__/nodeSuites/ready-promise.spec.js +++ b/src/__tests__/nodeSuites/ready-promise.spec.js @@ -28,7 +28,7 @@ function assertGetTreatmentWhenReady(assert, client, key) { function assertGetTreatmentControlNotReady(assert, client, key) { consoleSpy.log.resetHistory(); assert.equal(client.getTreatment(key, 'hierarchical_splits_test'), 'control', 'We should get control if client is not ready.'); - assert.true(consoleSpy.log.calledWithExactly('[WARN] splitio => getTreatment: the SDK is not ready to evaluate. Results may be incorrect for feature flag hierarchical_splits_test. Make sure to wait for SDK readiness before using this method.'), 'Telling us that calling getTreatment would return CONTROL since SDK is not ready at this point.'); + assert.true(consoleSpy.log.calledWithExactly('[WARN] splitio => getTreatment: the SDK is not ready to evaluate. Results may be incorrect. Make sure to wait for SDK readiness before using this method.'), 'Telling us that calling getTreatment would return CONTROL since SDK is not ready at this point.'); } function assertGetTreatmentControlNotReadyOnDestroy(assert, client, key) { diff --git a/src/__tests__/offline/browser.spec.js b/src/__tests__/offline/browser.spec.js index cda953afe..0d3dd14c2 100644 --- a/src/__tests__/offline/browser.spec.js +++ b/src/__tests__/offline/browser.spec.js @@ -89,6 +89,9 @@ tape('Browser offline mode', function (assert) { assert.equal(sharedClient.getTreatment('testing_split'), 'control', 'control due to not ready'); assert.equal(manager.splits().length, 0); + // Sorted names of the flags added ('testing_split_2', 'testing_split_3') or modified ('testing_split_with_config') by the features update. 'testing_split' is unchanged + const UPDATED_NAMES = ['testing_split_2', 'testing_split_3', 'testing_split_with_config']; + // SDK events on shared client let sharedReadyCount = 0; sharedClient.on(sharedClient.Event.SDK_READY, function () { @@ -96,7 +99,9 @@ tape('Browser offline mode', function (assert) { sharedReadyCount++; }); let sharedUpdateCount = 0; - sharedClient.on(sharedClient.Event.SDK_UPDATE, function () { + sharedClient.on(sharedClient.Event.SDK_UPDATE, function (metadata) { + assert.equal(metadata.type, 'FLAGS_UPDATE'); + assert.deepEqual(metadata.names.sort(), UPDATED_NAMES, 'SDK_UPDATE on shared client should carry the names of the added and modified flags'); sharedUpdateCount++; }); @@ -120,7 +125,7 @@ tape('Browser offline mode', function (assert) { }); client.on(client.Event.SDK_UPDATE, (metadata) => { assert.equal(metadata.type, 'FLAGS_UPDATE', 'SDK_UPDATE for localhost features update should have type FLAGS_UPDATE'); - assert.true(Array.isArray(metadata.names), 'metadata.names should be an array'); + assert.deepEqual(metadata.names.sort(), UPDATED_NAMES, 'SDK_UPDATE should carry the names of the added and modified flags'); assert.deepEqual(manager.names().sort(), ['testing_split', 'testing_split_2', 'testing_split_3', 'testing_split_with_config']); assert.equal(client.getTreatment('testing_split_with_config'), 'nope'); updateCount++; @@ -301,11 +306,11 @@ tape('Browser offline mode', function (assert) { const expectedSplitView3 = { name: 'testing_split_with_config', trafficType: 'localhost', killed: false, changeNumber: 0, treatments: ['nope'], configs: {}, defaultTreatment: 'control', sets: [], impressionsDisabled: false, prerequisites: [] }; - assert.deepEqual(manager.names(), ['testing_split', 'testing_split_2', 'testing_split_3', 'testing_split_with_config']); + assert.deepEqual(manager.names().sort(), ['testing_split', 'testing_split_2', 'testing_split_3', 'testing_split_with_config']); assert.deepEqual(manager.split('testing_split'), expectedSplitView1); assert.deepEqual(manager.split('not_existent'), null); assert.deepEqual(manager.split('testing_split_with_config'), expectedSplitView3); - assert.deepEqual(manager.splits(), [ + assert.deepEqual(manager.splits().sort((a, b) => a.name < b.name ? -1 : 1), [ expectedSplitView1, { ...expectedSplitView3, name: 'testing_split_2', treatments: ['off'] diff --git a/src/__tests__/offline/node.spec.js b/src/__tests__/offline/node.spec.js index afbb495e0..d1f97145d 100644 --- a/src/__tests__/offline/node.spec.js +++ b/src/__tests__/offline/node.spec.js @@ -168,7 +168,8 @@ function DotSplitTests(assert) { setTimeout(() => { factory.settings.features = path.join(__dirname, '.split'); }, 890); setTimeout(() => { factory.settings.features = path.join(__dirname, 'update.split'); }, 1000); - client.once(client.Event.SDK_UPDATE, () => { + client.once(client.Event.SDK_UPDATE, (metadata) => { + assert.deepEqual(metadata, { type: 'FLAGS_UPDATE', names: ['testing_split4'] }, 'SDK_UPDATE should carry the names of the added flags'); assert.equal(client.getTreatment('qa-user', 'testing_split4'), 'updated_treatment'); networkAssertions(client, assert).then(() => { @@ -243,7 +244,8 @@ function DotYAMLTests(mockFileName, mockFileExt, assert) { setTimeout(() => { factory.settings.features = path.join(__dirname, `${mockFileName}.${mockFileExt}`); }, 890); setTimeout(() => { factory.settings.features = path.join(__dirname, `update.${mockFileName}.${mockFileExt}`); }, 1000); - client.once(client.Event.SDK_UPDATE, () => { + client.once(client.Event.SDK_UPDATE, (metadata) => { + assert.deepEqual(metadata, { type: 'FLAGS_UPDATE', names: ['testing_split_off_with_config', 'testing_split_update'] }, 'SDK_UPDATE should carry the names of the added and removed flags'); assert.equal(client.getTreatment('qa-user', 'testing_split_update'), 'updated_treatment', 'the update should be properly processed'); assert.true((Date.now() - readyTimestamp) > 1000); @@ -455,7 +457,8 @@ function MultipleInstancesTests(assert) { }); - client.once(client.Event.SDK_UPDATE, () => { + client.once(client.Event.SDK_UPDATE, (metadata) => { + assert.deepEqual(metadata, { type: 'FLAGS_UPDATE', names: ['testing_split4'] }, 'SDK_UPDATE should carry the names of the added flags'); assert.equal(client.getTreatment('qa-user', 'testing_split4'), 'updated_treatment'); client.once(client.Event.SDK_UPDATE, function () { assert.fail('Should not emit a second SDK_UPDATE event'); }); diff --git a/src/__tests__/testUtils/index.js b/src/__tests__/testUtils/index.js index 35c601fd1..5dbdc4295 100644 --- a/src/__tests__/testUtils/index.js +++ b/src/__tests__/testUtils/index.js @@ -45,8 +45,9 @@ export function hasNoCacheHeader(fetchMockOpts) { const telemetryEndpointMatcher = /^\/v1\/(metrics|keys)\/(config|usage|ss|cs)/; const eventsEndpointMatcher = /^\/(testImpressions|metrics|events)/; -const authEndpointMatcher = /^\/v2\/auth/; +const authEndpointMatcher = /^\/(v2|v3)\/auth/; const streamingEndpointMatcher = /^\/(sse|event-stream)/; +const configsEndpointMatcher = /^\/v1\/(configs|segmentChanges)/; /** * Switch URLs servers based on target. @@ -69,5 +70,8 @@ export function url(settings, target) { if (streamingEndpointMatcher.test(target)) { return `${settings.urls.streaming}${target}`; } + if (configsEndpointMatcher.test(target)) { + return `${settings.urls.configs}${target}`; + } return `${settings.urls.sdk}${target}`; } diff --git a/src/__tests__/testUtils/nodeFetchMock.js b/src/__tests__/testUtils/nodeFetchMock.js index 6965a9561..db30d9b53 100644 --- a/src/__tests__/testUtils/nodeFetchMock.js +++ b/src/__tests__/testUtils/nodeFetchMock.js @@ -1,5 +1,5 @@ import fetchMock from 'fetch-mock'; -import { __setFetch } from '../../platform/getFetch/node'; +import { __setFetch } from '@splitsoftware/splitio-commons/src/platform/getFetch/node'; const sandboxFetchMock = fetchMock.sandbox(); diff --git a/src/factory/browser.js b/src/factory/browser.js index da9ca826c..e8991d353 100644 --- a/src/factory/browser.js +++ b/src/factory/browser.js @@ -14,9 +14,9 @@ import { createUserConsentAPI } from '@splitsoftware/splitio-commons/src/consent import { localhostFromObjectFactory } from '@splitsoftware/splitio-commons/src/sync/offline/LocalhostFromObject'; import { settingsFactory } from '../settings/browser'; -import { platform, SignalListener } from '../platform'; +import { platform } from '../platform'; -const syncManagerOnlineCSFactory = syncManagerOnlineFactory(pollingManagerCSFactory, pushManagerFactory); +const syncManagerOnlineCSFactory = syncManagerOnlineFactory(pollingManagerCSFactory(), pushManagerFactory); function getStorage(settings) { return settings.storage.type === STORAGE_LOCALSTORAGE ? @@ -39,7 +39,7 @@ function getModules(settings) { storageFactory: getStorage(settings), - splitApiFactory, + serviceApiFactory: splitApiFactory, syncManagerFactory: syncManagerOnlineCSFactory, @@ -47,8 +47,6 @@ function getModules(settings) { sdkClientMethodFactory: sdkClientMethodCSFactory, - SignalListener, - impressionsObserverFactory: impressionObserverCSFactory, extraProps: (params) => { @@ -60,9 +58,8 @@ function getModules(settings) { switch (settings.mode) { case LOCALHOST_MODE: - modules.splitApiFactory = undefined; + modules.serviceApiFactory = undefined; modules.syncManagerFactory = localhostFromObjectFactory; - modules.SignalListener = undefined; break; } diff --git a/src/factory/node.js b/src/factory/node.js index ae4ff1c29..5195db6e0 100644 --- a/src/factory/node.js +++ b/src/factory/node.js @@ -14,10 +14,10 @@ import { isConsumerMode } from '@splitsoftware/splitio-commons/src/utils/setting import { localhostFromFileFactory } from '../sync/offline/LocalhostFromFile'; import { settingsFactory } from '../settings/node'; -import { platform, SignalListener } from '../platform'; -import { bloomFilterFactory } from '../platform/filter/bloomFilter'; +import { platform } from '../platform'; +import { bloomFilterFactory } from '@splitsoftware/splitio-commons/src/utils/filter/bloomFilter'; -const syncManagerOnlineSSFactory = syncManagerOnlineFactory(pollingManagerSSFactory, pushManagerFactory); +const syncManagerOnlineSSFactory = syncManagerOnlineFactory(pollingManagerSSFactory(), pushManagerFactory); function getStorage(settings) { return settings.storage.type === 'REDIS' ? @@ -38,7 +38,7 @@ function getModules(settings) { storageFactory: getStorage(settings), - splitApiFactory, + serviceApiFactory: splitApiFactory, syncManagerFactory: syncManagerOnlineSSFactory, @@ -46,8 +46,6 @@ function getModules(settings) { sdkClientMethodFactory, - SignalListener, - impressionsObserverFactory: impressionObserverSSFactory, filterAdapterFactory: bloomFilterFactory, @@ -65,9 +63,8 @@ function getModules(settings) { switch (settings.mode) { case LOCALHOST_MODE: - modules.splitApiFactory = undefined; + modules.serviceApiFactory = undefined; modules.syncManagerFactory = localhostFromFileFactory; - modules.SignalListener = undefined; break; case CONSUMER_MODE: modules.syncManagerFactory = undefined; diff --git a/src/platform/EventEmitter.js b/src/platform/EventEmitter.js deleted file mode 100644 index 2f173c20a..000000000 --- a/src/platform/EventEmitter.js +++ /dev/null @@ -1,444 +0,0 @@ -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -// Adaptation of "events" library (https://www.npmjs.com/package/events) -// exported as an ES module instead of CommonJS, to avoid extra configuration steps when using -// the ESM build of the SDK with tools that doesn't support CommonJS by default (e.g. Rollup). - -var R = typeof Reflect === 'object' ? Reflect : null; -var ReflectApply = R && typeof R.apply === 'function' - ? R.apply - : function ReflectApply(target, receiver, args) { - return Function.prototype.apply.call(target, receiver, args); - }; - -var ReflectOwnKeys; -if (R && typeof R.ownKeys === 'function') { - ReflectOwnKeys = R.ownKeys; -} else if (Object.getOwnPropertySymbols) { - ReflectOwnKeys = function ReflectOwnKeys(target) { - return Object.getOwnPropertyNames(target) - .concat(Object.getOwnPropertySymbols(target)); - }; -} else { - ReflectOwnKeys = function ReflectOwnKeys(target) { - return Object.getOwnPropertyNames(target); - }; -} - -function ProcessEmitWarning(warning) { - if (console && console.warn) console.warn(warning); -} - -// eslint-disable-next-line compat/compat -var NumberIsNaN = Number.isNaN || function NumberIsNaN(value) { - return value !== value; -}; - -export function EventEmitter() { - EventEmitter.init.call(this); -} - -EventEmitter.prototype._events = undefined; -EventEmitter.prototype._eventsCount = 0; -EventEmitter.prototype._maxListeners = undefined; - -// By default EventEmitters will print a warning if more than 10 listeners are -// added to it. This is a useful default which helps finding memory leaks. -var defaultMaxListeners = 10; - -function checkListener(listener) { - if (typeof listener !== 'function') { - throw new TypeError('The "listener" argument must be of type Function. Received type ' + typeof listener); - } -} - -Object.defineProperty(EventEmitter, 'defaultMaxListeners', { - enumerable: true, - get: function () { - return defaultMaxListeners; - }, - set: function (arg) { - if (typeof arg !== 'number' || arg < 0 || NumberIsNaN(arg)) { - throw new RangeError('The value of "defaultMaxListeners" is out of range. It must be a non-negative number. Received ' + arg + '.'); - } - defaultMaxListeners = arg; - } -}); - -EventEmitter.init = function () { - - if (this._events === undefined || - this._events === Object.getPrototypeOf(this)._events) { - this._events = Object.create(null); - this._eventsCount = 0; - } - - this._maxListeners = this._maxListeners || undefined; -}; - -// Obviously not all Emitters should be limited to 10. This function allows -// that to be increased. Set to zero for unlimited. -EventEmitter.prototype.setMaxListeners = function setMaxListeners(n) { - if (typeof n !== 'number' || n < 0 || NumberIsNaN(n)) { - throw new RangeError('The value of "n" is out of range. It must be a non-negative number. Received ' + n + '.'); - } - this._maxListeners = n; - return this; -}; - -function _getMaxListeners(that) { - if (that._maxListeners === undefined) - return EventEmitter.defaultMaxListeners; - return that._maxListeners; -} - -EventEmitter.prototype.getMaxListeners = function getMaxListeners() { - return _getMaxListeners(this); -}; - -EventEmitter.prototype.emit = function emit(type) { - var args = []; - for (var i = 1; i < arguments.length; i++) args.push(arguments[i]); - var doError = (type === 'error'); - - var events = this._events; - if (events !== undefined) - doError = (doError && events.error === undefined); - else if (!doError) - return false; - - // If there is no 'error' event listener then throw. - if (doError) { - var er; - if (args.length > 0) - er = args[0]; - if (er instanceof Error) { - // Note: The comments on the `throw` lines are intentional, they show - // up in Node.js output if this results in an unhandled exception. - throw er; // Unhandled 'error' event - } - // At least give some kind of context to the user - var err = new Error('Unhandled error.' + (er ? ' (' + er.message + ')' : '')); - err.context = er; - throw err; // Unhandled 'error' event - } - - var handler = events[type]; - - if (handler === undefined) - return false; - - if (typeof handler === 'function') { - ReflectApply(handler, this, args); - } else { - var len = handler.length; - var listeners = arrayClone(handler, len); // eslint-disable-next-line no-redeclare - for (var i = 0; i < len; ++i) - ReflectApply(listeners[i], this, args); - } - - return true; -}; - -function _addListener(target, type, listener, prepend) { - var m; - var events; - var existing; - - checkListener(listener); - - events = target._events; - if (events === undefined) { - events = target._events = Object.create(null); - target._eventsCount = 0; - } else { - // To avoid recursion in the case that type === "newListener"! Before - // adding it to the listeners, first emit "newListener". - if (events.newListener !== undefined) { - target.emit('newListener', type, listener.listener ? listener.listener : listener); - - // Re-assign `events` because a newListener handler could have caused the - // this._events to be assigned to a new object - events = target._events; - } - existing = events[type]; - } - - if (existing === undefined) { - // Optimize the case of one listener. Don't need the extra array object. - existing = events[type] = listener; - ++target._eventsCount; - } else { - if (typeof existing === 'function') { - // Adding the second element, need to change to array. - existing = events[type] = - prepend ? [listener, existing] : [existing, listener]; - // If we've already got an array, just append. - } else if (prepend) { - existing.unshift(listener); - } else { - existing.push(listener); - } - - // Check for listener leak - m = _getMaxListeners(target); - if (m > 0 && existing.length > m && !existing.warned) { - existing.warned = true; - // No error code for this since it is a Warning - // eslint-disable-next-line no-restricted-syntax - var w = new Error('Possible EventEmitter memory leak detected. ' + - existing.length + ' ' + String(type) + ' listeners ' + - 'added. Use emitter.setMaxListeners() to ' + - 'increase limit'); - w.name = 'MaxListenersExceededWarning'; - w.emitter = target; - w.type = type; - w.count = existing.length; - ProcessEmitWarning(w); - } - } - - return target; -} - -EventEmitter.prototype.addListener = function addListener(type, listener) { - return _addListener(this, type, listener, false); -}; - -EventEmitter.prototype.on = EventEmitter.prototype.addListener; - -EventEmitter.prototype.prependListener = - function prependListener(type, listener) { - return _addListener(this, type, listener, true); - }; - -function onceWrapper() { - if (!this.fired) { - this.target.removeListener(this.type, this.wrapFn); - this.fired = true; - if (arguments.length === 0) - return this.listener.call(this.target); - return this.listener.apply(this.target, arguments); - } -} - -function _onceWrap(target, type, listener) { - var state = { fired: false, wrapFn: undefined, target: target, type: type, listener: listener }; - var wrapped = onceWrapper.bind(state); - wrapped.listener = listener; - state.wrapFn = wrapped; - return wrapped; -} - -EventEmitter.prototype.once = function once(type, listener) { - checkListener(listener); - this.on(type, _onceWrap(this, type, listener)); - return this; -}; - -EventEmitter.prototype.prependOnceListener = - function prependOnceListener(type, listener) { - checkListener(listener); - this.prependListener(type, _onceWrap(this, type, listener)); - return this; - }; - -// Emits a 'removeListener' event if and only if the listener was removed. -EventEmitter.prototype.removeListener = - function removeListener(type, listener) { - var list, events, position, i, originalListener; - - checkListener(listener); - - events = this._events; - if (events === undefined) - return this; - - list = events[type]; - if (list === undefined) - return this; - - if (list === listener || list.listener === listener) { - if (--this._eventsCount === 0) - this._events = Object.create(null); - else { - delete events[type]; - if (events.removeListener) - this.emit('removeListener', type, list.listener || listener); - } - } else if (typeof list !== 'function') { - position = -1; - - for (i = list.length - 1; i >= 0; i--) { - if (list[i] === listener || list[i].listener === listener) { - originalListener = list[i].listener; - position = i; - break; - } - } - - if (position < 0) - return this; - - if (position === 0) - list.shift(); - else { - spliceOne(list, position); - } - - if (list.length === 1) - events[type] = list[0]; - - if (events.removeListener !== undefined) - this.emit('removeListener', type, originalListener || listener); - } - - return this; - }; - -EventEmitter.prototype.off = EventEmitter.prototype.removeListener; - -EventEmitter.prototype.removeAllListeners = - function removeAllListeners(type) { - var listeners, events, i; - - events = this._events; - if (events === undefined) - return this; - - // not listening for removeListener, no need to emit - if (events.removeListener === undefined) { - if (arguments.length === 0) { - this._events = Object.create(null); - this._eventsCount = 0; - } else if (events[type] !== undefined) { - if (--this._eventsCount === 0) - this._events = Object.create(null); - else - delete events[type]; - } - return this; - } - - // emit removeListener for all listeners on all events - if (arguments.length === 0) { - var keys = Object.keys(events); - var key; - for (i = 0; i < keys.length; ++i) { - key = keys[i]; - if (key === 'removeListener') continue; - this.removeAllListeners(key); - } - this.removeAllListeners('removeListener'); - this._events = Object.create(null); - this._eventsCount = 0; - return this; - } - - listeners = events[type]; - - if (typeof listeners === 'function') { - this.removeListener(type, listeners); - } else if (listeners !== undefined) { - // LIFO order - for (i = listeners.length - 1; i >= 0; i--) { - this.removeListener(type, listeners[i]); - } - } - - return this; - }; - -function _listeners(target, type, unwrap) { - var events = target._events; - - if (events === undefined) - return []; - - var evlistener = events[type]; - if (evlistener === undefined) - return []; - - if (typeof evlistener === 'function') - return unwrap ? [evlistener.listener || evlistener] : [evlistener]; - - return unwrap ? - unwrapListeners(evlistener) : arrayClone(evlistener, evlistener.length); -} - -EventEmitter.prototype.listeners = function listeners(type) { - return _listeners(this, type, true); -}; - -EventEmitter.prototype.rawListeners = function rawListeners(type) { - return _listeners(this, type, false); -}; - -EventEmitter.listenerCount = function (emitter, type) { - if (typeof emitter.listenerCount === 'function') { - return emitter.listenerCount(type); - } else { - return listenerCount.call(emitter, type); - } -}; - -EventEmitter.prototype.listenerCount = listenerCount; -function listenerCount(type) { - var events = this._events; - - if (events !== undefined) { - var evlistener = events[type]; - - if (typeof evlistener === 'function') { - return 1; - } else if (evlistener !== undefined) { - return evlistener.length; - } - } - - return 0; -} - -EventEmitter.prototype.eventNames = function eventNames() { - return this._eventsCount > 0 ? ReflectOwnKeys(this._events) : []; -}; - -function arrayClone(arr, n) { - var copy = new Array(n); - for (var i = 0; i < n; ++i) - copy[i] = arr[i]; - return copy; -} - -function spliceOne(list, index) { - for (; index + 1 < list.length; index++) - list[index] = list[index + 1]; - list.pop(); -} - -function unwrapListeners(arr) { - var ret = new Array(arr.length); - for (var i = 0; i < ret.length; ++i) { - ret[i] = arr[i].listener || arr[i]; - } - return ret; -} diff --git a/src/platform/browser.js b/src/platform/browser.js index 9432f1d60..3074b1970 100644 --- a/src/platform/browser.js +++ b/src/platform/browser.js @@ -1,14 +1,19 @@ -import { EventEmitter } from './EventEmitter'; -import { getFetch } from '../platform/getFetch/browser'; -import { getEventSource } from '../platform/getEventSource/browser'; +import { EventEmitter } from '@splitsoftware/splitio-commons/src/utils/EventEmitter'; +import { getEventSource } from '@splitsoftware/splitio-commons/src/platform/getEventSource/browser'; import { BrowserSignalListener } from '@splitsoftware/splitio-commons/src/listeners/browser'; import { now } from '@splitsoftware/splitio-commons/src/utils/timeTracker/now/browser'; +import unfetch from 'unfetch'; + +// @TODO: Breaking change (drop support for old browsers without native fetch): replace with '@splitsoftware/splitio-commons/src/platform/getFetch/browser' and remove `unfetch` dependency +export function getFetch() { + return typeof fetch === 'function' ? fetch : unfetch; +} + export const platform = { getFetch, getEventSource, EventEmitter, - now + now, + SignalListener: BrowserSignalListener, }; - -export const SignalListener = BrowserSignalListener; diff --git a/src/platform/filter/__tests__/bloomFilter.spec.js b/src/platform/filter/__tests__/bloomFilter.spec.js deleted file mode 100644 index 2a097adae..000000000 --- a/src/platform/filter/__tests__/bloomFilter.spec.js +++ /dev/null @@ -1,22 +0,0 @@ -import tape from 'tape-catch'; -import { bloomFilterFactory } from '../bloomFilter'; - -tape('Bloom filter', (assert) => { - - const bloomFilter = bloomFilterFactory(); - - assert.true(bloomFilter.add('feature','key')); - assert.false(bloomFilter.contains('feature1','key')); - assert.true(bloomFilter.contains('feature','key')); - - bloomFilter.clear(); - - assert.false(bloomFilter.contains('feature','key')); - - assert.true(bloomFilter.add('feature2','key')); - assert.false(bloomFilter.contains('feature3','key')); - assert.true(bloomFilter.contains('feature2','key')); - - assert.end(); - -}); diff --git a/src/platform/filter/bloomFilter.js b/src/platform/filter/bloomFilter.js deleted file mode 100644 index 2d3663bde..000000000 --- a/src/platform/filter/bloomFilter.js +++ /dev/null @@ -1,33 +0,0 @@ -import { BloomFilter } from 'bloom-filters'; - -const EXPECTED_INSERTIONS = 10000000; -const ERROR_RATE = 0.01; -const REFRESH_RATE = 24 * 60 * 60000; // 24HS - -export function bloomFilterFactory(expectedInsertions = EXPECTED_INSERTIONS, errorRate = ERROR_RATE, refreshRate = REFRESH_RATE) { - let filter = BloomFilter.create(expectedInsertions, errorRate); - - return { - - refreshRate: refreshRate, - - add(key, value) { - const data = `${key}:${value}`; - if (filter.has(data)) { - return false; - } - filter.add(data); - return true; - }, - - contains(key, value) { - const data = `${key}:${value}`; - return filter.has(data); - }, - - clear() { - filter = BloomFilter.create(expectedInsertions, errorRate); - } - - }; -} diff --git a/src/platform/getEventSource/__tests__/browser.spec.js b/src/platform/getEventSource/__tests__/browser.spec.js deleted file mode 100644 index 82e760c62..000000000 --- a/src/platform/getEventSource/__tests__/browser.spec.js +++ /dev/null @@ -1,8 +0,0 @@ -import tape from 'tape-catch'; -import { getEventSource } from '../browser'; - -tape('getEventSource returns global EventSource in Browser', assert => { - assert.equal(getEventSource(), EventSource); - - assert.end(); -}); diff --git a/src/platform/getEventSource/__tests__/node.spec.js b/src/platform/getEventSource/__tests__/node.spec.js deleted file mode 100644 index 27736468b..000000000 --- a/src/platform/getEventSource/__tests__/node.spec.js +++ /dev/null @@ -1,8 +0,0 @@ -import tape from 'tape-catch'; -import { getEventSource } from '../node'; - -tape('getEventSource returns eventsource module in Node', assert => { - assert.equal(getEventSource(), require('../eventsource')); - - assert.end(); -}); diff --git a/src/platform/getEventSource/browser.js b/src/platform/getEventSource/browser.js deleted file mode 100644 index 780a01287..000000000 --- a/src/platform/getEventSource/browser.js +++ /dev/null @@ -1,3 +0,0 @@ -export function getEventSource() { - return typeof EventSource === 'function' ? EventSource : undefined; -} diff --git a/src/platform/getEventSource/eventsource.js b/src/platform/getEventSource/eventsource.js deleted file mode 100644 index 36a23d3f3..000000000 --- a/src/platform/getEventSource/eventsource.js +++ /dev/null @@ -1,519 +0,0 @@ -/* eslint-disable no-prototype-builtins */ -/* eslint-disable no-restricted-syntax */ -/* -Modified version of "eventsource" v1.1.2 package (https://www.npmjs.com/package/eventsource/v/1.1.2) -that accepts a custom agent. - -The MIT License - -Copyright (c) EventSource GitHub organization - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ -var parse = require('url').parse; -var events = require('events'); -var https = require('https'); -var http = require('http'); -var util = require('util'); - -var httpsOptions = [ - 'pfx', 'key', 'passphrase', 'cert', 'ca', 'ciphers', - 'rejectUnauthorized', 'secureProtocol', 'servername', 'checkServerIdentity' -]; - -var bom = [239, 187, 191]; -var colon = 58; -var space = 32; -var lineFeed = 10; -var carriageReturn = 13; - -function hasBom(buf) { - return bom.every(function (charCode, index) { - return buf[index] === charCode; - }); -} - -/** - * Creates a new EventSource object - * - * @param {String} url the URL to which to connect - * @param {Object} [eventSourceInitDict] extra init params. See README for details. - * @api public - **/ -function EventSource(url, eventSourceInitDict) { - var readyState = EventSource.CONNECTING; - var headers = eventSourceInitDict && eventSourceInitDict.headers; - var hasNewOrigin = false; - Object.defineProperty(this, 'readyState', { - get: function () { - return readyState; - } - }); - - Object.defineProperty(this, 'url', { - get: function () { - return url; - } - }); - - var self = this; - self.reconnectInterval = 1000; - self.connectionInProgress = false; - - var reconnectUrl = null; - - function onConnectionClosed(message) { - if (readyState === EventSource.CLOSED) return; - readyState = EventSource.CONNECTING; - _emit('error', new Event('error', { message: message })); - - // The url may have been changed by a temporary redirect. If that's the case, - // revert it now, and flag that we are no longer pointing to a new origin - if (reconnectUrl) { - url = reconnectUrl; - reconnectUrl = null; - hasNewOrigin = false; - } - setTimeout(function () { - if (readyState !== EventSource.CONNECTING || self.connectionInProgress) { - return; - } - self.connectionInProgress = true; - connect(); - }, self.reconnectInterval); - } - - var req; - var lastEventId = ''; - if (headers && headers['Last-Event-ID']) { - lastEventId = headers['Last-Event-ID']; - delete headers['Last-Event-ID']; - } - - var discardTrailingNewline = false; - var data = ''; - var eventName = ''; - - function connect() { - var options = parse(url); - var isSecure = options.protocol === 'https:'; - options.headers = { 'Cache-Control': 'no-cache', 'Accept': 'text/event-stream' }; - if (lastEventId) options.headers['Last-Event-ID'] = lastEventId; - if (headers) { - var reqHeaders = hasNewOrigin ? removeUnsafeHeaders(headers) : headers; - for (var i in reqHeaders) { - var header = reqHeaders[i]; - if (header) { - options.headers[i] = header; - } - } - } - - // Legacy: this should be specified as `eventSourceInitDict.https.rejectUnauthorized`, - // but for now exists as a backwards-compatibility layer - options.rejectUnauthorized = !(eventSourceInitDict && !eventSourceInitDict.rejectUnauthorized); - - if (eventSourceInitDict && eventSourceInitDict.createConnection !== undefined) { - options.createConnection = eventSourceInitDict.createConnection; - } - - // If specify agent, use it. - if (eventSourceInitDict && eventSourceInitDict.agent !== undefined) { - options.agent = eventSourceInitDict.agent; - } - - // If specify http proxy, make the request to sent to the proxy server, - // and include the original url in path and Host headers - var useProxy = eventSourceInitDict && eventSourceInitDict.proxy; - if (useProxy) { - var proxy = parse(eventSourceInitDict.proxy); - isSecure = proxy.protocol === 'https:'; - - options.protocol = isSecure ? 'https:' : 'http:'; - options.path = url; - options.headers.Host = options.host; - options.hostname = proxy.hostname; - options.host = proxy.host; - options.port = proxy.port; - } - - // If https options are specified, merge them into the request options - if (eventSourceInitDict && eventSourceInitDict.https) { - for (var optName in eventSourceInitDict.https) { - if (httpsOptions.indexOf(optName) === -1) { - continue; - } - - var option = eventSourceInitDict.https[optName]; - if (option !== undefined) { - options[optName] = option; - } - } - } - - // Pass this on to the XHR - if (eventSourceInitDict && eventSourceInitDict.withCredentials !== undefined) { - options.withCredentials = eventSourceInitDict.withCredentials; - } - - req = (isSecure ? https : http).request(options, function (res) { - self.connectionInProgress = false; - // Handle HTTP errors - if (res.statusCode === 500 || res.statusCode === 502 || res.statusCode === 503 || res.statusCode === 504) { - _emit('error', new Event('error', { status: res.statusCode, message: res.statusMessage })); - onConnectionClosed(); - return; - } - - // Handle HTTP redirects - if (res.statusCode === 301 || res.statusCode === 302 || res.statusCode === 307) { - var location = res.headers.location; - if (!location) { - // Server sent redirect response without Location header. - _emit('error', new Event('error', { status: res.statusCode, message: res.statusMessage })); - return; - } - var prevOrigin = getOrigin(url); - var nextOrigin = getOrigin(location); - hasNewOrigin = prevOrigin !== nextOrigin; - if (res.statusCode === 307) reconnectUrl = url; - url = location; - process.nextTick(connect); - return; - } - - if (res.statusCode !== 200) { - _emit('error', new Event('error', { status: res.statusCode, message: res.statusMessage })); - return self.close(); - } - - readyState = EventSource.OPEN; - res.on('close', function () { - res.removeAllListeners('close'); - res.removeAllListeners('end'); - onConnectionClosed(); - }); - - res.on('end', function () { - res.removeAllListeners('close'); - res.removeAllListeners('end'); - onConnectionClosed(); - }); - _emit('open', new Event('open')); - - // text/event-stream parser adapted from webkit's - // Source/WebCore/page/EventSource.cpp - var isFirst = true; - var buf; - var startingPos = 0; - var startingFieldLength = -1; - res.on('data', function (chunk) { - buf = buf ? Buffer.concat([buf, chunk]) : chunk; - if (isFirst && hasBom(buf)) { - buf = buf.slice(bom.length); - } - - isFirst = false; - var pos = 0; - var length = buf.length; - - while (pos < length) { - if (discardTrailingNewline) { - if (buf[pos] === lineFeed) { - ++pos; - } - discardTrailingNewline = false; - } - - var lineLength = -1; - var fieldLength = startingFieldLength; - var c; - - for (var i = startingPos; lineLength < 0 && i < length; ++i) { - c = buf[i]; - if (c === colon) { - if (fieldLength < 0) { - fieldLength = i - pos; - } - } else if (c === carriageReturn) { - discardTrailingNewline = true; - lineLength = i - pos; - } else if (c === lineFeed) { - lineLength = i - pos; - } - } - - if (lineLength < 0) { - startingPos = length - pos; - startingFieldLength = fieldLength; - break; - } else { - startingPos = 0; - startingFieldLength = -1; - } - - parseEventStreamLine(buf, pos, fieldLength, lineLength); - - pos += lineLength + 1; - } - - if (pos === length) { - buf = void 0; - } else if (pos > 0) { - buf = buf.slice(pos); - } - }); - }); - - req.on('error', function (err) { - self.connectionInProgress = false; - onConnectionClosed(err.message); - }); - - if (req.setNoDelay) req.setNoDelay(true); - req.end(); - } - - connect(); - - function _emit() { - if (self.listeners(arguments[0]).length > 0) { - self.emit.apply(self, arguments); - } - } - - this._close = function () { - if (readyState === EventSource.CLOSED) return; - readyState = EventSource.CLOSED; - if (req.abort) req.abort(); - if (req.xhr && req.xhr.abort) req.xhr.abort(); - }; - - function parseEventStreamLine(buf, pos, fieldLength, lineLength) { - if (lineLength === 0) { - if (data.length > 0) { - var type = eventName || 'message'; - _emit(type, new MessageEvent(type, { - data: data.slice(0, -1), // remove trailing newline - lastEventId: lastEventId, - origin: getOrigin(url) - })); - data = ''; - } - eventName = void 0; - } else if (fieldLength > 0) { - var noValue = fieldLength < 0; - var step = 0; - var field = buf.slice(pos, pos + (noValue ? lineLength : fieldLength)).toString(); - - if (noValue) { - step = lineLength; - } else if (buf[pos + fieldLength + 1] !== space) { - step = fieldLength + 1; - } else { - step = fieldLength + 2; - } - pos += step; - - var valueLength = lineLength - step; - var value = buf.slice(pos, pos + valueLength).toString(); - - if (field === 'data') { - data += value + '\n'; - } else if (field === 'event') { - eventName = value; - } else if (field === 'id') { - lastEventId = value; - } else if (field === 'retry') { - var retry = parseInt(value, 10); - if (!Number.isNaN(retry)) { - self.reconnectInterval = retry; - } - } - } - } -} - -module.exports = EventSource; - -util.inherits(EventSource, events.EventEmitter); -EventSource.prototype.constructor = EventSource; // make stacktraces readable - -['open', 'error', 'message'].forEach(function (method) { - Object.defineProperty(EventSource.prototype, 'on' + method, { - /** - * Returns the current listener - * - * @return {Mixed} the set function or undefined - * @api private - */ - get: function get() { - var listener = this.listeners(method)[0]; - return listener ? (listener._listener ? listener._listener : listener) : undefined; - }, - - /** - * Start listening for events - * - * @param {Function} listener the listener - * @return {Mixed} the set function or undefined - * @api private - */ - set: function set(listener) { - this.removeAllListeners(method); - this.addEventListener(method, listener); - } - }); -}); - -/** - * Ready states - */ -Object.defineProperty(EventSource, 'CONNECTING', { enumerable: true, value: 0 }); -Object.defineProperty(EventSource, 'OPEN', { enumerable: true, value: 1 }); -Object.defineProperty(EventSource, 'CLOSED', { enumerable: true, value: 2 }); - -EventSource.prototype.CONNECTING = 0; -EventSource.prototype.OPEN = 1; -EventSource.prototype.CLOSED = 2; - -/** - * Closes the connection, if one is made, and sets the readyState attribute to 2 (closed) - * - * @see https://developer.mozilla.org/en-US/docs/Web/API/EventSource/close - * @api public - */ -EventSource.prototype.close = function () { - this._close(); -}; - -/** - * Emulates the W3C Browser based WebSocket interface using addEventListener. - * - * @param {String} type A string representing the event type to listen out for - * @param {Function} listener callback - * @see https://developer.mozilla.org/en/DOM/element.addEventListener - * @see http://dev.w3.org/html5/websockets/#the-websocket-interface - * @api public - */ -EventSource.prototype.addEventListener = function addEventListener(type, listener) { - if (typeof listener === 'function') { - // store a reference so we can return the original function again - listener._listener = listener; - this.on(type, listener); - } -}; - -/** - * Emulates the W3C Browser based WebSocket interface using dispatchEvent. - * - * @param {Event} event An event to be dispatched - * @see https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/dispatchEvent - * @api public - */ -EventSource.prototype.dispatchEvent = function dispatchEvent(event) { - if (!event.type) { - throw new Error('UNSPECIFIED_EVENT_TYPE_ERR'); - } - // if event is instance of an CustomEvent (or has 'details' property), - // send the detail object as the payload for the event - this.emit(event.type, event.detail); -}; - -/** - * Emulates the W3C Browser based WebSocket interface using removeEventListener. - * - * @param {String} type A string representing the event type to remove - * @param {Function} listener callback - * @see https://developer.mozilla.org/en/DOM/element.removeEventListener - * @see http://dev.w3.org/html5/websockets/#the-websocket-interface - * @api public - */ -EventSource.prototype.removeEventListener = function removeEventListener(type, listener) { - if (typeof listener === 'function') { - listener._listener = undefined; - this.removeListener(type, listener); - } -}; - -/** - * W3C Event - * - * @see http://www.w3.org/TR/DOM-Level-3-Events/#interface-Event - * @api private - */ -function Event(type, optionalProperties) { - Object.defineProperty(this, 'type', { writable: false, value: type, enumerable: true }); - if (optionalProperties) { - for (var f in optionalProperties) { - if (optionalProperties.hasOwnProperty(f)) { - Object.defineProperty(this, f, { writable: false, value: optionalProperties[f], enumerable: true }); - } - } - } -} - -/** - * W3C MessageEvent - * - * @see http://www.w3.org/TR/webmessaging/#event-definitions - * @api private - */ -function MessageEvent(type, eventInitDict) { - Object.defineProperty(this, 'type', { writable: false, value: type, enumerable: true }); - for (var f in eventInitDict) { - if (eventInitDict.hasOwnProperty(f)) { - Object.defineProperty(this, f, { writable: false, value: eventInitDict[f], enumerable: true }); - } - } -} - -/** - * Returns a new object of headers that does not include any authorization and cookie headers - * - * @param {Object} headers An object of headers ({[headerName]: headerValue}) - * @return {Object} a new object of headers - * @api private - */ -function removeUnsafeHeaders(headers) { - var safe = {}; - for (var key in headers) { - if (/^(cookie|authorization)$/i.test(key)) { - continue; - } - - safe[key] = headers[key]; - } - - return safe; -} - -/** - * Transform an URL to a valid origin value. - * - * @param {String|Object} url URL to transform to it's origin. - * @returns {String} The origin. - * @api private - */ -function getOrigin(url) { - if (typeof url === 'string') url = parse(url); - if (!url.protocol || !url.hostname) return 'null'; - return (url.protocol + '//' + url.host).toLowerCase(); -} diff --git a/src/platform/getEventSource/node.js b/src/platform/getEventSource/node.js deleted file mode 100644 index 4ef41d0af..000000000 --- a/src/platform/getEventSource/node.js +++ /dev/null @@ -1,20 +0,0 @@ -let __isCustom = false; -let __eventSource = undefined; - -// This function is only exposed for testing purposes. -export function __setEventSource(eventSource) { - __eventSource = eventSource; - __isCustom = true; -} -export function __restore() { - __isCustom = false; -} - -export function getEventSource() { - // returns EventSource at `eventsource` package. If not available, return global EventSource or undefined - try { - return __isCustom ? __eventSource : require('./eventsource'); - } catch (error) { - return typeof EventSource === 'function' ? EventSource : undefined; - } -} diff --git a/src/platform/getEventSource/package.json b/src/platform/getEventSource/package.json deleted file mode 100644 index a19625907..000000000 --- a/src/platform/getEventSource/package.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "main": "./node.js", - "browser": "./browser.js" -} diff --git a/src/platform/getFetch/__tests__/browser.spec.js b/src/platform/getFetch/__tests__/browser.spec.js deleted file mode 100644 index a9499ded0..000000000 --- a/src/platform/getFetch/__tests__/browser.spec.js +++ /dev/null @@ -1,8 +0,0 @@ -import tape from 'tape-catch'; -import { getFetch } from '../browser'; - -tape('getFetch returns global fetch in Browser', assert => { - assert.equal(getFetch(), fetch); - - assert.end(); -}); diff --git a/src/platform/getFetch/__tests__/node.spec.js b/src/platform/getFetch/__tests__/node.spec.js deleted file mode 100644 index 144d8880c..000000000 --- a/src/platform/getFetch/__tests__/node.spec.js +++ /dev/null @@ -1,8 +0,0 @@ -import tape from 'tape-catch'; -import { getFetch } from '../node'; - -tape('getFetch returns node-fetch module in Node', assert => { - assert.equal(getFetch(), require('node-fetch')); - - assert.end(); -}); diff --git a/src/platform/getFetch/browser.js b/src/platform/getFetch/browser.js deleted file mode 100644 index 5db3b9484..000000000 --- a/src/platform/getFetch/browser.js +++ /dev/null @@ -1,5 +0,0 @@ -import unfetch from 'unfetch'; - -export function getFetch() { - return typeof fetch === 'function' ? fetch : unfetch; -} diff --git a/src/platform/getFetch/node.js b/src/platform/getFetch/node.js deleted file mode 100644 index b1b97c02a..000000000 --- a/src/platform/getFetch/node.js +++ /dev/null @@ -1,24 +0,0 @@ -let nodeFetch; - -try { - nodeFetch = require('node-fetch'); - - // Handle node-fetch issue https://github.com/node-fetch/node-fetch/issues/1037 - if (typeof nodeFetch !== 'function') nodeFetch = nodeFetch.default; - -} catch (error) { - // Try to access global fetch if `node-fetch` package couldn't be imported (e.g., not in a Node environment) - nodeFetch = typeof fetch === 'function' ? fetch : undefined; -} - -// This function is only exposed for testing purposes. -export function __setFetch(fetch) { - nodeFetch = fetch; -} - -/** - * Retrieves 'node-fetch', a Fetch API polyfill for Node.js, with fallback to global 'fetch' if available. - */ -export function getFetch() { - return nodeFetch; -} diff --git a/src/platform/getFetch/package.json b/src/platform/getFetch/package.json deleted file mode 100644 index a19625907..000000000 --- a/src/platform/getFetch/package.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "main": "./node.js", - "browser": "./browser.js" -} diff --git a/src/platform/getOptions/__tests__/node.spec.js b/src/platform/getOptions/__tests__/node.spec.js deleted file mode 100644 index eaeb2b5b7..000000000 --- a/src/platform/getOptions/__tests__/node.spec.js +++ /dev/null @@ -1,25 +0,0 @@ -import tape from 'tape-catch'; -import { settingsFactory } from '../../../settings/node'; -import { getOptions } from '../node'; - -tape('getOptions returns an object with a custom agent if all urls are https', assert => { - const settings = settingsFactory({}); - assert.true(typeof getOptions(settings).agent === 'object'); - - assert.end(); -}); - -tape('getOptions returns undefined if some url is not https', assert => { - const settings = settingsFactory({ urls: { sdk: 'http://sdk.split.io' } }); - assert.equal(getOptions(settings), undefined); - - assert.end(); -}); - -tape('getOptions returns the provided options from settings', assert => { - const customRequestOptions = { agent: false }; - const settings = settingsFactory({ sync: { requestOptions: customRequestOptions } }); - assert.equal(getOptions(settings), customRequestOptions); - - assert.end(); -}); diff --git a/src/platform/getOptions/node.js b/src/platform/getOptions/node.js deleted file mode 100644 index 7c693af08..000000000 --- a/src/platform/getOptions/node.js +++ /dev/null @@ -1,23 +0,0 @@ -// @TODO -// 1- handle multiple protocols automatically -// 2- destroy it once the sdk is destroyed -import https from 'https'; - -import { find } from '@splitsoftware/splitio-commons/src/utils/lang'; - -const agent = new https.Agent({ - keepAlive: true, - keepAliveMsecs: 1500 -}); - -export function getOptions(settings) { - // User provided options take precedence - if (settings.sync.requestOptions) return settings.sync.requestOptions; - - // If some URL is not HTTPS, we don't use the agent, to let the SDK connect to HTTP endpoints - if (find(settings.urls, url => !url.startsWith('https:'))) return; - - return { - agent - }; -} diff --git a/src/platform/node.js b/src/platform/node.js index 8572e70f1..cdfc2f33a 100644 --- a/src/platform/node.js +++ b/src/platform/node.js @@ -1,16 +1 @@ -import EventEmitter from 'events'; -import { getFetch } from '../platform/getFetch/node'; -import { getEventSource } from '../platform/getEventSource/node'; -import { getOptions } from '../platform/getOptions/node'; -import { NodeSignalListener } from '@splitsoftware/splitio-commons/src/listeners/node'; -import { now } from '@splitsoftware/splitio-commons/src/utils/timeTracker/now/node'; - -export const platform = { - getFetch, - getEventSource, - getOptions, - EventEmitter, - now -}; - -export const SignalListener = NodeSignalListener; +export { platform } from '@splitsoftware/splitio-commons/src/platform/node'; diff --git a/src/sync/offline/splitsParserFromFile.js b/src/sync/offline/splitsParserFromFile.js index 2d38b63a6..d1bcf9595 100644 --- a/src/sync/offline/splitsParserFromFile.js +++ b/src/sync/offline/splitsParserFromFile.js @@ -3,6 +3,7 @@ import path from 'path'; import yaml from 'js-yaml'; import { isString, endsWith, find, forOwn, uniq, } from '@splitsoftware/splitio-commons/src/utils/lang'; import { parseCondition } from '@splitsoftware/splitio-commons/src/sync/offline/splitsParser/parseCondition'; +import { definitionChangesBuilderFactory } from '@splitsoftware/splitio-commons/src/sync/offline/splitsParser/definitionChangesBuilder'; const logPrefix = 'sync:offline:fetcher: '; @@ -63,6 +64,7 @@ function arrangeConditions(mocksData) { export function splitsParserFromFileFactory() { let previousMock = 'NO_MOCK_LOADED'; + const definitionChangesBuilder = definitionChangesBuilderFactory(); // Parse `.split` configuration file and return a map of feature flag objects function readFeatureFlagConfigFile(log, filePath) { @@ -167,7 +169,10 @@ export function splitsParserFromFileFactory() { mockData = readYAMLConfigFile(log, filePath); } - return mockData; + // The file content was not modified since the last call + if (mockData === false) return {}; + + return definitionChangesBuilder(mockData); }; }