Revert to create maintenance branch. (#103)

Author: kinyoklion

package.json

@@ -9,7 +9,6 @@
   "scripts": {
     "lint": "eslint --format 'node_modules/eslint-formatter-pretty' --ignore-path .eslintignore",
     "lint:all": "eslint --format 'node_modules/eslint-formatter-pretty' --ignore-path .eslintignore src",
-    "lint-fix:all": "eslint --fix --format 'node_modules/eslint-formatter-pretty' --ignore-path .eslintignore src",
     "format": "npm run format:md && npm run format:js",
     "format:md": "prettier --parser markdown --ignore-path .prettierignore --write '*.md'",
     "format:js": "prettier --ignore-path .prettierignore --write 'src/**/*.js'",
@@ -27,7 +26,6 @@
     "@babel/preset-env": "^7.6.3",
     "@babel/runtime": "7.6.3",
     "@rollup/plugin-replace": "^2.2.0",
-    "@types/jest": "^27.4.1",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^25.1.0",
     "cross-env": "^5.1.4",

src/AnonymousContextProcessor.js

@@ -1,10 +1,9 @@
 const EventSender = require('./EventSender');
 const EventSummarizer = require('./EventSummarizer');
-const ContextFilter = require('./ContextFilter');
+const UserFilter = require('./UserFilter');
 const errors = require('./errors');
 const messages = require('./messages');
 const utils = require('./utils');
-const { getContextKeys } = require('./context');
 
 function EventProcessor(
   platform,
@@ -18,7 +17,8 @@ function EventProcessor(
   const eventSender = sender || EventSender(platform, environmentId, options);
   const mainEventsUrl = utils.appendUrlPath(options.eventsUrl, '/events/bulk/' + environmentId);
   const summarizer = EventSummarizer();
-  const contextFilter = ContextFilter(options);
+  const userFilter = UserFilter(options);
+  const inlineUsers = options.inlineUsersInEvents;
   const samplingInterval = options.samplingInterval;
   const eventCapacity = options.eventCapacity;
   const flushInterval = options.flushInterval;
@@ -47,12 +47,16 @@ function EventProcessor(
   // Transform an event from its internal format to the format we use when sending a payload.
   function makeOutputEvent(e) {
     const ret = utils.extend({}, e);
-    if (e.kind === 'identify') {
-      // identify events always have an inline context
-      ret.context = contextFilter.filter(e.context);
+    if (e.kind === 'alias') {
+      // alias events do not require any transformation
+      return ret;
+    }
+    if (inlineUsers || e.kind === 'identify') {
+      // identify events always have an inline user
+      ret.user = userFilter.filterUser(e.user);
     } else {
-      ret.contextKeys = getContextKeysFromEvent(e);
-      delete ret['context'];
+      ret.userKey = e.user.key;
+      delete ret['user'];
     }
     if (e.kind === 'feature') {
       delete ret['trackEvents'];
@@ -61,10 +65,6 @@ function EventProcessor(
     return ret;
   }
 
-  function getContextKeysFromEvent(event) {
-    return getContextKeys(event.context, logger);
-  }
-
   function addToOutbox(event) {
     if (queue.length < eventCapacity) {
       queue.push(event);
@@ -107,7 +107,7 @@ function EventProcessor(
     }
     if (addDebugEvent) {
       const debugEvent = utils.extend({}, event, { kind: 'debug' });
-      debugEvent.context = contextFilter.filter(debugEvent.context);
+      debugEvent.user = userFilter.filterUser(debugEvent.user);
       delete debugEvent['trackEvents'];
       delete debugEvent['debugEventsUntilDate'];
       addToOutbox(debugEvent);
@@ -136,8 +136,7 @@ function EventProcessor(
     }
     queue = [];
     logger.debug(messages.debugPostingEvents(eventsToSend.length));
-    return eventSender.sendEvents(eventsToSend, mainEventsUrl).then(responses => {
-      const responseInfo = responses && responses[0];
+    return eventSender.sendEvents(eventsToSend, mainEventsUrl).then(responseInfo => {
       if (responseInfo) {
         if (responseInfo.serverTime) {
           lastKnownPastTime = responseInfo.serverTime;

src/ContextFilter.js

@@ -31,7 +31,7 @@ function EventSender(platform, environmentId, options) {
       const headers = isDiagnostic
         ? baseHeaders
         : utils.extend({}, baseHeaders, {
-            'X-LaunchDarkly-Event-Schema': '4',
+            'X-LaunchDarkly-Event-Schema': '3',
             'X-LaunchDarkly-Payload-ID': payloadId,
           });
       return platform
@@ -73,7 +73,7 @@ function EventSender(platform, environmentId, options) {
       // no need to break up events into chunks if we can send a POST
       chunks = [events];
     } else {
-      chunks = utils.chunkEventsForUrl(MAX_URL_LENGTH - url.length, events);
+      chunks = utils.chunkUserEventsForUrl(MAX_URL_LENGTH - url.length, events);
     }
     const results = [];
     for (let i = 0; i < chunks.length; i++) {