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

package/package.json

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

package/src/EventProcessor.js

@@ -4,6 +4,7 @@ const ContextFilter = require('./ContextFilter');
 const errors = require('./errors');
 const messages = require('./messages');
 const utils = require('./utils');
+const { getContextKeys } = require('./context');
 
 function EventProcessor(
   platform,
@@ -50,7 +51,7 @@ function EventProcessor(
       // identify events always have an inline context
       ret.context = contextFilter.filter(e.context);
     } else {
-      ret.contextKeys = getContextKeys(e);
+      ret.contextKeys = getContextKeysFromEvent(e);
       delete ret['context'];
     }
     if (e.kind === 'feature') {
@@ -60,26 +61,8 @@ function EventProcessor(
     return ret;
   }
 
-  function getContextKeys(event) {
-    const keys = {};
-    const context = event.context;
-    if (context !== undefined) {
-      if (context.kind === undefined) {
-        keys.user = String(context.key);
-      } else if (context.kind === 'multi') {
-        Object.entries(context)
-          .filter(([key]) => key !== 'kind')
-          .forEach(([key, value]) => {
-            if (value !== undefined && value.key !== undefined) {
-              keys[key] = value.key;
-            }
-          });
-      } else {
-        keys[context.kind] = String(context.key);
-      }
-      return keys;
-    }
-    return undefined;
+  function getContextKeysFromEvent(event) {
+    return getContextKeys(event.context, logger);
   }
 
   function addToOutbox(event) {

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/__tests__/context-test.js

@@ -1,4 +1,4 @@
-const { checkContext, getContextKinds, getCanonicalKey } = require('../context');
+const { checkContext, getContextKeys, getContextKinds, getCanonicalKey } = require('../context');
 
 describe.each([{ key: 'test' }, { kind: 'user', key: 'test' }, { kind: 'multi', user: { key: 'test' } }])(
   'given a context which contains a single kind',
@@ -91,3 +91,111 @@ describe('when determining canonical keys', () => {
     expect(getCanonicalKey(null)).toBeUndefined();
   });
 });
+
+describe('getContextKeys', () => {
+  it('returns undefined if argument is undefined', () => {
+    const context = undefined;
+    const keys = getContextKeys(context);
+    expect(keys).toBeUndefined();
+  });
+
+  it('works with legacy user without kind attribute', () => {
+    const user = {
+      key: 'legacy-user-key',
+      name: 'Test User',
+      custom: {
+        customAttribute1: true,
+      },
+    };
+    const keys = getContextKeys(user);
+    expect(keys).toEqual({ user: 'legacy-user-key' });
+  });
+
+  it('gets keys from multi context', () => {
+    const context = {
+      kind: 'multi',
+      user: {
+        key: 'test-user-key',
+        name: 'Test User',
+        isPremiumCustomer: true,
+      },
+      organization: {
+        key: 'test-organization-key',
+        name: 'Test Company',
+        industry: 'technology',
+      },
+    };
+    const keys = getContextKeys(context);
+    expect(keys).toEqual({ user: 'test-user-key', organization: 'test-organization-key' });
+  });
+
+  it('ignores undefined keys from multi context', () => {
+    const context = {
+      kind: 'multi',
+      user: {
+        key: 'test-user-key',
+        name: 'Test User',
+        isPremiumCustomer: true,
+      },
+      organization: {
+        name: 'Test Company',
+        industry: 'technology',
+      },
+      rogueAttribute: undefined,
+    };
+    const keys = getContextKeys(context);
+    expect(keys).toEqual({ user: 'test-user-key' });
+  });
+
+  it.only('ignores empty string and null keys from multi context', () => {
+    const context = {
+      kind: 'multi',
+      user: {
+        key: 'test-user-key',
+        name: 'Test User',
+        isPremiumCustomer: true,
+      },
+      organization: {
+        key: '',
+        name: 'Test Company',
+        industry: 'technology',
+      },
+      drone: {
+        key: null,
+        name: 'test-drone',
+      },
+    };
+    const keys = getContextKeys(context);
+    expect(keys).toEqual({ user: 'test-user-key' });
+  });
+
+  it('gets keys from single context', () => {
+    const context = {
+      kind: 'drone',
+      key: 'test-drone-key',
+      name: 'test-drone',
+    };
+    const keys = getContextKeys(context);
+    expect(keys).toEqual({ drone: 'test-drone-key' });
+  });
+
+  it('ignores kind when it is an empty string', () => {
+    const context = {
+      kind: '',
+      key: 'test-drone-key',
+      name: 'test-drone',
+    };
+    const keys = getContextKeys(context);
+    expect(keys).toEqual({});
+  });
+
+  it('ignores kind when it is null', () => {
+    const context = {
+      kind: null,
+      key: 'test-drone-key',
+      name: 'test-drone',
+    };
+    const keys = getContextKeys(context);
+    expect(keys).toEqual({});
+  });
+});

package/src/__tests__/utils-test.js

@@ -1,4 +1,4 @@
-import { appendUrlPath, base64URLEncode, getLDUserAgentString, wrapPromiseCallback, chunkEventsForUrl } from '../utils';
+import { appendUrlPath, base64URLEncode, chunkEventsForUrl, getLDUserAgentString, wrapPromiseCallback } from '../utils';
 
 import * as stubPlatform from './stubPlatform';
 

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;
   }
 

package/src/context.js

@@ -89,8 +89,44 @@ function getCanonicalKey(context) {
   }
 }
 
+function getContextKeys(context, logger) {
+  if (!context) {
+    return undefined;
+  }
+
+  const keys = {};
+  const { kind, key } = context;
+
+  switch (kind) {
+    case typeof kind === 'undefined':
+      keys.user = `${key}`;
+      break;
+    case 'multi':
+      Object.entries(context)
+        .filter(([key]) => key !== 'kind')
+        .forEach(([key, value]) => {
+          if (value?.key) {
+            keys[key] = value.key;
+          }
+        });
+      break;
+    case null:
+      logger?.warn(`null is not a valid context kind: ${context}`);
+      break;
+    case '':
+      logger?.warn(`'' is not a valid context kind: ${context}`);
+      break;
+    default:
+      keys[kind] = `${key}`;
+      break;
+  }
+
+  return keys;
+}
+
 module.exports = {
   checkContext,
+  getContextKeys,
   getContextKinds,
   getCanonicalKey,
 };

package/src/index.js

@@ -14,7 +14,7 @@ const { commonBasicLogger } = require('./loggers');
 const utils = require('./utils');
 const errors = require('./errors');
 const messages = require('./messages');
-const { checkContext } = require('./context');
+const { checkContext, getContextKeys } = require('./context');
 const { InspectorTypes, InspectorManager } = require('./InspectorManager');
 
 const changeEvent = 'change';
@@ -809,4 +809,5 @@ module.exports = {
   errors,
   messages,
   utils,
+  getContextKeys,
 };