launchdarkly-js-sdk-common 5.0.0-alpha.2 → 5.0.0-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "launchdarkly-js-sdk-common",
-  "version": "5.0.0-alpha.2",
+  "version": "5.0.0-alpha.3",
   "description": "LaunchDarkly SDK for JavaScript - common code",
   "author": "LaunchDarkly <team@launchdarkly.com>",
   "license": "Apache-2.0",

package/src/EventSender.js

@@ -31,7 +31,7 @@ function EventSender(platform, environmentId, options) {
       const headers = isDiagnostic
         ? baseHeaders
         : utils.extend({}, baseHeaders, {
-            'X-LaunchDarkly-Event-Schema': '3',
+            'X-LaunchDarkly-Event-Schema': '4',
             'X-LaunchDarkly-Payload-ID': payloadId,
           });
       return platform

package/src/Requestor.js

@@ -88,11 +88,11 @@ function Requestor(platform, options, environment) {
     let body;
 
     if (useReport) {
-      endpoint = [baseUrl, '/sdk/evalx/', environment, '/user'].join('');
+      endpoint = [baseUrl, '/sdk/evalx/', environment, '/context'].join('');
       body = JSON.stringify(context);
     } else {
       data = utils.base64URLEncode(JSON.stringify(context));
-      endpoint = [baseUrl, '/sdk/evalx/', environment, '/users/', data].join('');
+      endpoint = [baseUrl, '/sdk/evalx/', environment, '/contexts/', data].join('');
     }
     if (hash) {
       query = 'h=' + hash;

package/src/__tests__/Requestor-test.js

@@ -69,7 +69,7 @@ describe('Requestor', () => {
 
       expect(server.requests.length()).toEqual(1);
       const req = await server.requests.take();
-      expect(req.path).toEqual(`/sdk/evalx/${env}/users/${encodedUser}`);
+      expect(req.path).toEqual(`/sdk/evalx/${env}/contexts/${encodedUser}`);
     });
   });
 
@@ -81,7 +81,7 @@ describe('Requestor', () => {
 
       expect(server.requests.length()).toEqual(1);
       const req = await server.requests.take();
-      expect(req.path).toEqual(`/sdk/evalx/${env}/users/${encodedUser}?h=hash1`);
+      expect(req.path).toEqual(`/sdk/evalx/${env}/contexts/${encodedUser}?h=hash1`);
     });
   });
 
@@ -93,7 +93,7 @@ describe('Requestor', () => {
 
       expect(server.requests.length()).toEqual(1);
       const req = await server.requests.take();
-      expect(req.path).toEqual(`/sdk/evalx/${env}/users/${encodedUser}?withReasons=true`);
+      expect(req.path).toEqual(`/sdk/evalx/${env}/contexts/${encodedUser}?withReasons=true`);
     });
   });
 
@@ -105,7 +105,7 @@ describe('Requestor', () => {
 
       expect(server.requests.length()).toEqual(1);
       const req = await server.requests.take();
-      expect(req.path).toEqual(`/sdk/evalx/${env}/users/${encodedUser}?h=hash1&withReasons=true`);
+      expect(req.path).toEqual(`/sdk/evalx/${env}/contexts/${encodedUser}?h=hash1&withReasons=true`);
     });
   });
 
@@ -117,7 +117,7 @@ describe('Requestor', () => {
 
       expect(server.requests.length()).toEqual(1);
       const req = await server.requests.take();
-      expect(req.path).toEqual(`/sdk/evalx/${env}/user`);
+      expect(req.path).toEqual(`/sdk/evalx/${env}/context`);
     });
   });
 
@@ -129,7 +129,7 @@ describe('Requestor', () => {
 
       expect(server.requests.length()).toEqual(1);
       const req = await server.requests.take();
-      expect(req.path).toEqual(`/sdk/evalx/${env}/user?h=hash1`);
+      expect(req.path).toEqual(`/sdk/evalx/${env}/context?h=hash1`);
     });
   });
 
@@ -141,7 +141,7 @@ describe('Requestor', () => {
 
       expect(server.requests.length()).toEqual(1);
       const req = await server.requests.take();
-      expect(req.path).toEqual(`/sdk/evalx/${env}/user?withReasons=true`);
+      expect(req.path).toEqual(`/sdk/evalx/${env}/context?withReasons=true`);
     });
   });
 
@@ -153,7 +153,7 @@ describe('Requestor', () => {
 
       expect(server.requests.length()).toEqual(1);
       const req = await server.requests.take();
-      expect(req.path).toEqual(`/sdk/evalx/${env}/user?h=hash1&withReasons=true`);
+      expect(req.path).toEqual(`/sdk/evalx/${env}/context?h=hash1&withReasons=true`);
     });
   });
 

package/src/configuration.js

@@ -44,6 +44,10 @@ const baseOptionDefs = {
  */
 const allowedTagCharacters = /^(\w|\.|-)+$/;
 
+function canonicalizeUrl(url) {
+  return url?.replace(/\/+$/, '');
+}
+
 /**
  * Verify that a value meets the requirements for a tag value.
  * @param {string} tagValue
@@ -165,6 +169,11 @@ function validate(options, emitter, extraOptionDefs, logger) {
         }
       }
     });
+
+    ret.baseUrl = canonicalizeUrl(ret.baseUrl);
+    ret.streamUrl = canonicalizeUrl(ret.streamUrl);
+    ret.eventsUrl = canonicalizeUrl(ret.eventsUrl);
+
     return ret;
   }