launchdarkly
diff --git a/‎CHANGELOG.md‎
Lines changed: 4 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/EventProcessor.js‎
Lines changed: 1 addition & 1 deletion b/‎src/EventProcessor.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/EventSender.js‎
Lines changed: 3 additions & 2 deletions b/‎src/EventSender.js‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/Requestor.js‎
Lines changed: 4 additions & 3 deletions b/‎src/Requestor.js‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎src/Stream.js‎
Lines changed: 4 additions & 3 deletions b/‎src/Stream.js‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎src/__tests__/Stream-test.js‎
Lines changed: 1 addition & 1 deletion b/‎src/__tests__/Stream-test.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/__tests__/configuration-test.js‎
Lines changed: 39 additions & 0 deletions b/‎src/__tests__/configuration-test.js‎
Lines changed: 39 additions & 0 deletions
diff --git a/‎src/__tests__/headers-test.js‎
Lines changed: 117 additions & 0 deletions b/‎src/__tests__/headers-test.js‎
Lines changed: 117 additions & 0 deletions
diff --git a/‎src/__tests__/utils-test.js‎
Lines changed: 8 additions & 73 deletions b/‎src/__tests__/utils-test.js‎
Lines changed: 8 additions & 73 deletions
@@ -23,6 +23,10 @@ All notable changes to the `launchdarkly-js-sdk-common` package will be document
 - Removed the type `NonNullableLDEvaluationReason`, which was a side effect of the `LDEvaluationDetail.reason` being incorrectly defined before.
 - Removed all types, properties, and functions that were deprecated as of the last 3.x release.
 
+## [3.5.1] - 2022-02-17
+### Fixed:
+- If the SDK receives invalid JSON data from a streaming connection (possibly as a result of the connection being cut off), it now uses its regular error-handling logic: the error is emitted as an `error` event or, if there are no `error` event listeners, it is logged. Previously, it would be thrown as an unhandled exception.
+
 ## [3.5.0] - 2022-01-14
 ### Added:
 - New configurable logger factory `commonBasicLogger` and `BasicLoggerOptions`. The `commonBasicLogger` method is not intended to be exported directly in the SDKs, but wrapped to provide platform-specific behavior.
 
@@ -15,7 +15,7 @@ function EventProcessor(
 ) {
   const processor = {};
   const eventSender = sender || EventSender(platform, environmentId, options);
-  const mainEventsUrl = options.eventsUrl + '/events/bulk/' + environmentId;
+  const mainEventsUrl = utils.appendUrlPath(options.eventsUrl, '/events/bulk/' + environmentId);
   const summarizer = EventSummarizer();
   const userFilter = UserFilter(options);
   const inlineUsers = options.inlineUsersInEvents;
 
@@ -1,12 +1,13 @@
 const errors = require('./errors');
 const utils = require('./utils');
 const { v1: uuidv1 } = require('uuid');
+const { getLDHeaders, transformHeaders } = require('./headers');
 
 const MAX_URL_LENGTH = 2000;
 
 function EventSender(platform, environmentId, options) {
   const imageUrlPath = '/a/' + environmentId + '.gif';
-  const baseHeaders = utils.extend({ 'Content-Type': 'application/json' }, utils.getLDHeaders(platform, options));
+  const baseHeaders = utils.extend({ 'Content-Type': 'application/json' }, getLDHeaders(platform, options));
   const httpFallbackPing = platform.httpFallbackPing; // this will be set for us if we're in the browser SDK
   const sender = {};
 
@@ -34,7 +35,7 @@ function EventSender(platform, environmentId, options) {
             'X-LaunchDarkly-Payload-ID': payloadId,
           });
       return platform
-        .httpRequest('POST', url, utils.transformHeaders(headers, options), jsonBody)
+        .httpRequest('POST', url, transformHeaders(headers, options), jsonBody)
         .promise.then(result => {
           if (!result) {
             // This was a response from a fire-and-forget request, so we won't have a status.
 
@@ -2,6 +2,7 @@ const utils = require('./utils');
 const errors = require('./errors');
 const messages = require('./messages');
 const promiseCoalescer = require('./promiseCoalescer');
+const { transformHeaders, getLDHeaders } = require('./headers');
 
 const jsonContentType = 'application/json';
 
@@ -31,7 +32,7 @@ function Requestor(platform, options, environment) {
     }
 
     const method = body ? 'REPORT' : 'GET';
-    const headers = utils.getLDHeaders(platform, options);
+    const headers = getLDHeaders(platform, options);
     if (body) {
       headers['Content-Type'] = jsonContentType;
     }
@@ -45,7 +46,7 @@ function Requestor(platform, options, environment) {
       activeRequests[endpoint] = coalescer;
     }
 
-    const req = platform.httpRequest(method, endpoint, utils.transformHeaders(headers, options), body);
+    const req = platform.httpRequest(method, endpoint, transformHeaders(headers, options), body);
     const p = req.promise.then(
       result => {
         if (result.status === 200) {
@@ -75,7 +76,7 @@ function Requestor(platform, options, environment) {
   // Performs a GET request to an arbitrary path under baseUrl. Returns a Promise which will resolve
   // with the parsed JSON response, or will be rejected if the request failed.
   requestor.fetchJSON = function(path) {
-    return fetchJSON(baseUrl + path, null);
+    return fetchJSON(utils.appendUrlPath(baseUrl, path), null);
   };
 
   // Requests the current state of all flags for the given user from LaunchDarkly. Returns a Promise
 
@@ -1,5 +1,6 @@
 const messages = require('./messages');
-const { base64URLEncode, getLDHeaders, transformHeaders, objectHasOwnProperty } = require('./utils');
+const { appendUrlPath, base64URLEncode, objectHasOwnProperty } = require('./utils');
+const { getLDHeaders, transformHeaders } = require('./headers');
 
 // The underlying event source implementation is abstracted via the platform object, which should
 // have these three properties:
@@ -20,7 +21,7 @@ function Stream(platform, config, environment, diagnosticsAccumulator) {
   const baseUrl = config.streamUrl;
   const logger = config.logger;
   const stream = {};
-  const evalUrlPrefix = baseUrl + '/eval/' + environment;
+  const evalUrlPrefix = appendUrlPath(baseUrl, '/eval/' + environment);
   const useReport = config.useReport;
   const withReasons = config.evaluationReasons;
   const streamReconnectDelay = config.streamReconnectDelay;
@@ -98,7 +99,7 @@ function Stream(platform, config, environment, diagnosticsAccumulator) {
           options.body = JSON.stringify(user);
         } else {
           // if we can't do REPORT, fall back to the old ping-based stream
-          url = baseUrl + '/ping/' + environment;
+          url = appendUrlPath(baseUrl, '/ping/' + environment);
           query = '';
         }
       } else {
 
@@ -1,7 +1,7 @@
 import { DiagnosticsAccumulator } from '../diagnosticEvents';
 import * as messages from '../messages';
 import Stream from '../Stream';
-import { getLDHeaders } from '../utils';
+import { getLDHeaders } from '../headers';
 
 import { sleepAsync } from 'launchdarkly-js-test-helpers';
 import EventSource from './EventSource-mock';
 
@@ -214,4 +214,43 @@ describe('configuration', () => {
     expect(config.extraFunctionOption).toBe(fn);
     await listener.expectError(messages.wrongOptionType('extraNumericOptionWithoutDefault', 'number', 'string'));
   });
+
+  it('handles a valid application id', async () => {
+    const listener = errorListener();
+    const configIn = { application: { id: 'test-application' } };
+    expect(configuration.validate(configIn, listener.emitter, null, listener.logger).application.id).toEqual(
+      'test-application'
+    );
+  });
+
+  it('logs a warning with an invalid application id', async () => {
+    const listener = errorListener();
+    const configIn = { application: { id: 'test #$#$#' } };
+    expect(configuration.validate(configIn, listener.emitter, null, listener.logger).application.id).toBeUndefined();
+    await listener.expectWarningOnly(messages.invalidTagValue('application.id'));
+  });
+
+  it('handles a valid application version', async () => {
+    const listener = errorListener();
+    const configIn = { application: { version: 'test-version' } };
+    expect(configuration.validate(configIn, listener.emitter, null, listener.logger).application.version).toEqual(
+      'test-version'
+    );
+  });
+
+  it('logs a warning with an invalid application version', async () => {
+    const listener = errorListener();
+    const configIn = { application: { version: 'test #$#$#' } };
+    expect(
+      configuration.validate(configIn, listener.emitter, null, listener.logger).application.version
+    ).toBeUndefined();
+    await listener.expectWarningOnly(messages.invalidTagValue('application.version'));
+  });
+
+  it('includes application id and version in tags when present', async () => {
+    expect(configuration.getTags({ application: { id: 'test-id', version: 'test-version' } })).toEqual({
+      'application-id': ['test-id'],
+      'application-version': ['test-version'],
+    });
+  });
 });
@@ -0,0 +1,117 @@
+import { getLDHeaders, transformHeaders } from '../headers';
+import { getLDUserAgentString } from '../utils';
+import * as stubPlatform from './stubPlatform';
+
+describe('getLDHeaders', () => {
+  it('sends no headers unless sendLDHeaders is true', () => {
+    const platform = stubPlatform.defaults();
+    const headers = getLDHeaders(platform, {});
+    expect(headers).toEqual({});
+  });
+
+  it('adds user-agent header', () => {
+    const platform = stubPlatform.defaults();
+    const headers = getLDHeaders(platform, { sendLDHeaders: true });
+    expect(headers).toMatchObject({ 'User-Agent': getLDUserAgentString(platform) });
+  });
+
+  it('adds user-agent header with custom name', () => {
+    const platform = stubPlatform.defaults();
+    platform.userAgentHeaderName = 'X-Fake-User-Agent';
+    const headers = getLDHeaders(platform, { sendLDHeaders: true });
+    expect(headers).toMatchObject({ 'X-Fake-User-Agent': getLDUserAgentString(platform) });
+  });
+
+  it('adds wrapper info if specified, without version', () => {
+    const platform = stubPlatform.defaults();
+    const headers = getLDHeaders(platform, { sendLDHeaders: true, wrapperName: 'FakeSDK' });
+    expect(headers).toMatchObject({
+      'User-Agent': getLDUserAgentString(platform),
+      'X-LaunchDarkly-Wrapper': 'FakeSDK',
+    });
+  });
+
+  it('adds wrapper info if specified, with version', () => {
+    const platform = stubPlatform.defaults();
+    const headers = getLDHeaders(platform, { sendLDHeaders: true, wrapperName: 'FakeSDK', wrapperVersion: '9.9' });
+    expect(headers).toMatchObject({
+      'User-Agent': getLDUserAgentString(platform),
+      'X-LaunchDarkly-Wrapper': 'FakeSDK/9.9',
+    });
+  });
+
+  it('sets the X-LaunchDarkly-Tags header with valid id and version.', () => {
+    const platform = stubPlatform.defaults();
+    const headers = getLDHeaders(platform, {
+      sendLDHeaders: true,
+      application: {
+        id: 'test-application',
+        version: 'test-version',
+      },
+    });
+    expect(headers).toMatchObject({
+      'User-Agent': getLDUserAgentString(platform),
+      'x-launchdarkly-tags': 'application-id/test-application application-version/test-version',
+    });
+  });
+
+  it('sets the X-LaunchDarkly-Tags header with just application id', () => {
+    const platform = stubPlatform.defaults();
+    const headers = getLDHeaders(platform, {
+      sendLDHeaders: true,
+      application: {
+        id: 'test-application',
+      },
+    });
+    expect(headers).toMatchObject({
+      'User-Agent': getLDUserAgentString(platform),
+      'x-launchdarkly-tags': 'application-id/test-application',
+    });
+  });
+
+  it('sets the X-LaunchDarkly-Tags header with just application version.', () => {
+    const platform = stubPlatform.defaults();
+    const headers = getLDHeaders(platform, {
+      sendLDHeaders: true,
+      application: {
+        version: 'test-version',
+      },
+    });
+    expect(headers).toMatchObject({
+      'User-Agent': getLDUserAgentString(platform),
+      'x-launchdarkly-tags': 'application-version/test-version',
+    });
+  });
+});
+
+describe('transformHeaders', () => {
+  it('does not modify the headers if the option is not available', () => {
+    const inputHeaders = { a: '1', b: '2' };
+    const headers = transformHeaders(inputHeaders, {});
+    expect(headers).toEqual(inputHeaders);
+  });
+
+  it('modifies the headers if the option has a transform', () => {
+    const inputHeaders = { c: '3', d: '4' };
+    const outputHeaders = { c: '9', d: '4', e: '5' };
+    const headerTransform = input => {
+      const output = { ...input };
+      output['c'] = '9';
+      output['e'] = '5';
+      return output;
+    };
+    const headers = transformHeaders(inputHeaders, { requestHeaderTransform: headerTransform });
+    expect(headers).toEqual(outputHeaders);
+  });
+
+  it('cannot mutate the input header object', () => {
+    const inputHeaders = { f: '6' };
+    const expectedInputHeaders = { f: '6' };
+    const headerMutate = input => {
+      input['f'] = '7'; // eslint-disable-line no-param-reassign
+      return input;
+    };
+    transformHeaders(inputHeaders, { requestHeaderTransform: headerMutate });
+    expect(inputHeaders).toEqual(expectedInputHeaders);
+  });
+});
@@ -1,7 +1,6 @@
 import {
+  appendUrlPath,
   base64URLEncode,
-  getLDHeaders,
-  transformHeaders,
   getLDUserAgentString,
   wrapPromiseCallback,
   chunkUserEventsForUrl,
@@ -10,6 +9,13 @@ import {
 import * as stubPlatform from './stubPlatform';
 
 describe('utils', () => {
+  it('appendUrlPath', () => {
+    expect(appendUrlPath('http://base', '/path')).toEqual('http://base/path');
+    expect(appendUrlPath('http://base', 'path')).toEqual('http://base/path');
+    expect(appendUrlPath('http://base/', '/path')).toEqual('http://base/path');
+    expect(appendUrlPath('http://base/', '/path')).toEqual('http://base/path');
+  });
+
   describe('wrapPromiseCallback', () => {
     it('should resolve to the value', done => {
       const promise = wrapPromiseCallback(Promise.resolve('woohoo'));
@@ -48,77 +54,6 @@ describe('utils', () => {
     });
   });
 
-  describe('getLDHeaders', () => {
-    it('sends no headers unless sendLDHeaders is true', () => {
-      const platform = stubPlatform.defaults();
-      const headers = getLDHeaders(platform, {});
-      expect(headers).toEqual({});
-    });
-
-    it('adds user-agent header', () => {
-      const platform = stubPlatform.defaults();
-      const headers = getLDHeaders(platform, { sendLDHeaders: true });
-      expect(headers).toMatchObject({ 'User-Agent': getLDUserAgentString(platform) });
-    });
-
-    it('adds user-agent header with custom name', () => {
-      const platform = stubPlatform.defaults();
-      platform.userAgentHeaderName = 'X-Fake-User-Agent';
-      const headers = getLDHeaders(platform, { sendLDHeaders: true });
-      expect(headers).toMatchObject({ 'X-Fake-User-Agent': getLDUserAgentString(platform) });
-    });
-
-    it('adds wrapper info if specified, without version', () => {
-      const platform = stubPlatform.defaults();
-      const headers = getLDHeaders(platform, { sendLDHeaders: true, wrapperName: 'FakeSDK' });
-      expect(headers).toMatchObject({
-        'User-Agent': getLDUserAgentString(platform),
-        'X-LaunchDarkly-Wrapper': 'FakeSDK',
-      });
-    });
-
-    it('adds wrapper info if specified, with version', () => {
-      const platform = stubPlatform.defaults();
-      const headers = getLDHeaders(platform, { sendLDHeaders: true, wrapperName: 'FakeSDK', wrapperVersion: '9.9' });
-      expect(headers).toMatchObject({
-        'User-Agent': getLDUserAgentString(platform),
-        'X-LaunchDarkly-Wrapper': 'FakeSDK/9.9',
-      });
-    });
-  });
-
-  describe('transformHeaders', () => {
-    it('does not modify the headers if the option is not available', () => {
-      const inputHeaders = { a: '1', b: '2' };
-      const headers = transformHeaders(inputHeaders, {});
-      expect(headers).toEqual(inputHeaders);
-    });
-
-    it('modifies the headers if the option has a transform', () => {
-      const inputHeaders = { c: '3', d: '4' };
-      const outputHeaders = { c: '9', d: '4', e: '5' };
-      const headerTransform = input => {
-        const output = { ...input };
-        output['c'] = '9';
-        output['e'] = '5';
-        return output;
-      };
-      const headers = transformHeaders(inputHeaders, { requestHeaderTransform: headerTransform });
-      expect(headers).toEqual(outputHeaders);
-    });
-
-    it('cannot mutate the input header object', () => {
-      const inputHeaders = { f: '6' };
-      const expectedInputHeaders = { f: '6' };
-      const headerMutate = input => {
-        input['f'] = '7'; // eslint-disable-line no-param-reassign
-        return input;
-      };
-      transformHeaders(inputHeaders, { requestHeaderTransform: headerMutate });
-      expect(inputHeaders).toEqual(expectedInputHeaders);
-    });
-  });
-
   describe('getLDUserAgentString', () => {
     it('uses platform user-agent and unknown version by default', () => {
       const platform = stubPlatform.defaults();