@newrelic/browser-agent 1.234.0 → 1.236.0

package/dist/cjs/common/harvest/harvest.js

@@ -4,11 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Harvest = void 0;
-exports.getSubmitMethod = getSubmitMethod;
-var _mapOwn = require("../util/map-own");
 var _encode = require("../url/encode");
 var _stringify = require("../util/stringify");
-var _submitData = require("../util/submit-data");
+var submitData = _interopRequireWildcard(require("../util/submit-data"));
 var _location = require("../url/location");
 var _config = require("../config/config");
 var _cleanUrl = require("../url/clean-url");
@@ -18,31 +16,22 @@ var _obfuscate = require("../util/obfuscate");
 var _traverse = require("../util/traverse");
 var _sharedContext = require("../context/shared-context");
 var _env = require("../constants/env.npm");
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
- * @typedef {object} NetworkSendSpec
- * @param {string} endpoint The endpoint to use (jserrors, events, resources etc.)
- * @param {object} payload Object representing payload.
- * @param {object} payload.qs Map of values that should be sent as part of the request query string.
- * @param {string} payload.body String that should be sent as the body of the request.
- * @param {string} payload.body.e Special case of body used for browser interactions.
- * @param {object} opts Additional options for sending data
- * @param {boolean} opts.needResponse Specify whether the caller expects a response data.
- * @param {boolean} opts.unload Specify whether the call is a final harvest during page unload.
- * @param {boolean} opts.sendEmptyBody Specify whether the call should be made even if the body is empty. Useful for rum calls.
- * @param {function} submitMethod The submit method to use {@link ../util/submit-data}
- * @param {string} customUrl Override the beacon url the data is sent to; must include protocol if defined
- * @param {boolean} gzip Enabled gzip compression on the body of the request before it is sent
- * @param {boolean} includeBaseParams Enables the use of base query parameters in the beacon url {@see Harvest.baseQueryString}
+ * @typedef {import('./types.js').NetworkSendSpec} NetworkSendSpec
+ * @typedef {import('./types.js').HarvestEndpointIdentifier} HarvestEndpointIdentifier
+ * @typedef {import('./types.js').HarvestPayload} HarvestPayload
+ * @typedef {import('./types.js').FeatureHarvestCallback} FeatureHarvestCallback
+ * @typedef {import('./types.js').FeatureHarvestCallbackOptions} FeatureHarvestCallbackOptions
  */
 
-const haveSendBeacon = !!navigator.sendBeacon; // only the web window obj has sendBeacon at this time, so 'false' for other envs
-
 class Harvest extends _sharedContext.SharedContext {
   constructor(parent) {
     super(parent); // gets any allowed properties from the parent and stores them in `sharedContext`
@@ -56,20 +45,19 @@ class Harvest extends _sharedContext.SharedContext {
   /**
    * Initiate a harvest from multiple sources. An event that corresponds to the endpoint
    * name is emitted, which gives any listeners the opportunity to provide payload data.
+   * Note: Used by page_action
    * @param {NetworkSendSpec} spec Specification for sending data
    */
-  sendX(spec) {
-    const {
-      endpoint,
-      opts
-    } = spec;
-    var submitMethod = getSubmitMethod(endpoint, opts);
-    if (!submitMethod) return false;
-    var options = {
-      retry: submitMethod.method === _submitData.submitData.xhr
+  sendX() {
+    let spec = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    const submitMethod = submitData.getSubmitMethod({
+      isFinalHarvest: spec.opts?.unload
+    });
+    const options = {
+      retry: !spec.opts?.unload && submitMethod === submitData.xhr
     };
-    const payload = this.createPayload(endpoint, options);
-    var caller = this.obfuscator.shouldObfuscate() ? this.obfuscateAndSend.bind(this) : this._send.bind(this);
+    const payload = this.createPayload(spec.endpoint, options);
+    const caller = this.obfuscator.shouldObfuscate() ? this.obfuscateAndSend.bind(this) : this._send.bind(this);
     return caller({
       ...spec,
       payload,
@@ -81,31 +69,19 @@ class Harvest extends _sharedContext.SharedContext {
    * Initiate a harvest call.
    * @param {NetworkSendSpec} spec Specification for sending data
    */
-  send(spec) {
-    const {
-      payload = {}
-    } = spec;
-    var makeBody = createAccumulator();
-    var makeQueryString = createAccumulator();
-    if (payload.body) (0, _mapOwn.mapOwn)(payload.body, makeBody);
-    if (payload.qs) (0, _mapOwn.mapOwn)(payload.qs, makeQueryString);
-    var newPayload = {
-      body: makeBody(),
-      qs: makeQueryString()
-    };
-    var caller = this.obfuscator.shouldObfuscate() ? this.obfuscateAndSend.bind(this) : this._send.bind(this);
-    return caller({
-      ...spec,
-      payload: newPayload
-    });
+  send() {
+    let spec = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    const caller = this.obfuscator.shouldObfuscate() ? this.obfuscateAndSend.bind(this) : this._send.bind(this);
+    return caller(spec);
   }
 
   /**
    * Apply obfuscation rules to the payload and then initial the harvest network call.
    * @param {NetworkSendSpec} spec Specification for sending data
    */
-  obfuscateAndSend(spec) {
+  obfuscateAndSend() {
     var _this = this;
+    let spec = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const {
       payload = {}
     } = spec;
@@ -117,6 +93,14 @@ class Harvest extends _sharedContext.SharedContext {
       payload
     });
   }
+
+  /**
+   * Initiate a harvest call. Typically used by `sendX` and `send` methods or called directly
+   * for raw network calls.
+   * @param {NetworkSendSpec} param0 Specification for sending data
+   * @returns {boolean} True if the network call succeeded. For final harvest calls, the return
+   * value should not be relied upon because network calls will be made asynchronously.
+   */
   _send(_ref) {
     let {
       endpoint,
@@ -128,10 +112,14 @@ class Harvest extends _sharedContext.SharedContext {
       raw,
       includeBaseParams = true
     } = _ref;
-    var info = (0, _config.getInfo)(this.sharedContext.agentIdentifier);
+    const info = (0, _config.getInfo)(this.sharedContext.agentIdentifier);
     if (!info.errorBeacon) return false;
-    var agentRuntime = (0, _config.getRuntime)(this.sharedContext.agentIdentifier);
-    if (!payload.body && !opts?.sendEmptyBody) {
+    const agentRuntime = (0, _config.getRuntime)(this.sharedContext.agentIdentifier);
+    let {
+      body,
+      qs
+    } = this.cleanPayload(payload);
+    if (Object.keys(body).length === 0 && !opts?.sendEmptyBody) {
       // no payload body? nothing to send, just run onfinish stuff and return
       if (cbFinished) {
         cbFinished({
@@ -140,27 +128,32 @@ class Harvest extends _sharedContext.SharedContext {
       }
       return false;
     }
-    let url = '';
-    if (customUrl) url = customUrl;else if (raw) url = "".concat(this.getScheme(), "://").concat(info.errorBeacon, "/").concat(endpoint);else url = "".concat(this.getScheme(), "://").concat(info.errorBeacon).concat(endpoint !== 'rum' ? "/".concat(endpoint) : '', "/1/").concat(info.licenseKey);
-    var baseParams = !raw && includeBaseParams ? this.baseQueryString() : '';
-    var payloadParams = payload.qs ? (0, _encode.obj)(payload.qs, agentRuntime.maxBytes) : '';
+    let url = "".concat(this.getScheme(), "://").concat(info.errorBeacon).concat(endpoint !== 'rum' ? "/".concat(endpoint) : '', "/1/").concat(info.licenseKey);
+    if (customUrl) url = customUrl;
+    if (raw) url = "".concat(this.getScheme(), "://").concat(info.errorBeacon, "/").concat(endpoint);
+    const baseParams = !raw && includeBaseParams ? this.baseQueryString() : '';
+    let payloadParams = (0, _encode.obj)(qs, agentRuntime.maxBytes);
     if (!submitMethod) {
-      submitMethod = getSubmitMethod(endpoint, opts);
+      submitMethod = submitData.getSubmitMethod({
+        isFinalHarvest: opts.unload
+      });
+    }
+    if (baseParams === '' && payloadParams.startsWith('&')) {
+      payloadParams = payloadParams.substring(1);
     }
-    var method = submitMethod.method;
-    var useBody = submitMethod.useBody;
-    var body;
-    var fullUrl = "".concat(url, "?").concat(baseParams).concat(payloadParams);
-    const gzip = payload?.qs?.content_encoding === 'gzip';
+    const fullUrl = "".concat(url, "?").concat(baseParams).concat(payloadParams);
+    const gzip = qs.content_encoding === 'gzip';
     if (!gzip) {
-      if (useBody && endpoint === 'events') {
-        body = payload.body.e;
-      } else if (useBody) {
-        body = (0, _stringify.stringify)(payload.body);
+      if (endpoint === 'events') {
+        body = body.e;
       } else {
-        fullUrl = fullUrl + (0, _encode.obj)(payload.body, agentRuntime.maxBytes);
+        body = (0, _stringify.stringify)(body);
       }
-    } else body = payload.body;
+    }
+    if (!body || body.length === 0 || body === '{}' || body === '[]') {
+      // If body is null, undefined, or an empty object or array, send an empty string instead
+      body = '';
+    }
 
     // Get bytes harvested per endpoint as a supportability metric. See metrics aggregator (on unload).
     agentRuntime.bytesSent[endpoint] = (agentRuntime.bytesSent[endpoint] || 0) + body?.length || 0;
@@ -172,122 +165,148 @@ class Harvest extends _sharedContext.SharedContext {
       value: 'text/plain'
     });
 
-    /* Since workers don't support sendBeacon right now, or Image(), they can only use XHR method.
+    /* Since workers don't support sendBeacon right now, they can only use XHR method.
         Because they still do permit synch XHR, the idea is that at final harvest time (worker is closing),
-        we just make a BLOCKING request--trivial impact--with the remaining data as a temp fill-in for sendBeacon. */
-
-    var result = method({
+        we just make a BLOCKING request--trivial impact--with the remaining data as a temp fill-in for sendBeacon.
+       Following the removal of img-element method, IE will also use sync XHR on page dismissal to ensure final analytics are sent. */
+    let result = submitMethod({
       url: fullUrl,
       body,
-      sync: opts.unload && _globalScope.isWorkerScope,
+      sync: opts.unload && (_runtime.isWorkerScope || _runtime.isIE),
       headers
     });
-    if (cbFinished && method === _submitData.submitData.xhr) {
-      var xhr = result;
-      xhr.addEventListener('load', function () {
-        var result = {
+    if (!opts.unload && cbFinished && submitMethod === submitData.xhr) {
+      const harvestScope = this;
+      result.addEventListener('load', function () {
+        // `this` refers to the XHR object in this scope, do not change this to a fat arrow
+        const cbResult = {
           sent: true,
           status: this.status
         };
         if (this.status === 429) {
-          result.retry = true;
-          result.delay = this.tooManyRequestsDelay;
+          cbResult.retry = true;
+          cbResult.delay = harvestScope.tooManyRequestsDelay;
         } else if (this.status === 408 || this.status === 500 || this.status === 503) {
-          result.retry = true;
+          cbResult.retry = true;
         }
         if (opts.needResponse) {
-          result.responseText = this.responseText;
+          cbResult.responseText = this.responseText;
         }
-        cbFinished(result);
+        cbFinished(cbResult);
       }, (0, _eventListenerOpts.eventListenerOpts)(false));
     }
 
     // if beacon request failed, retry with an alternative method -- will not happen for workers
-    if (!result && method === _submitData.submitData.beacon) {
-      method = _submitData.submitData.img;
-      result = method({
-        url: fullUrl + (0, _encode.obj)(payload.body, agentRuntime.maxBytes)
-      });
+    if (!result && submitMethod === submitData.beacon) {
+      // browsers that support sendBeacon also support fetch with keepalive - IE will not retry unload calls
+      submitMethod = submitData.fetchKeepAlive;
+      try {
+        submitMethod({
+          url: fullUrl,
+          body,
+          headers
+        });
+      } catch (e) {
+        // Ignore error in final harvest
+      } finally {
+        result = true;
+      }
     }
     return result;
   }
 
   // The stuff that gets sent every time.
   baseQueryString() {
-    var runtime = (0, _config.getRuntime)(this.sharedContext.agentIdentifier);
-    var info = (0, _config.getInfo)(this.sharedContext.agentIdentifier);
-    var location = (0, _cleanUrl.cleanURL)((0, _location.getLocation)());
-    var ref = this.obfuscator.shouldObfuscate() ? this.obfuscator.obfuscateString(location) : location;
+    const runtime = (0, _config.getRuntime)(this.sharedContext.agentIdentifier);
+    const info = (0, _config.getInfo)(this.sharedContext.agentIdentifier);
+    const location = (0, _cleanUrl.cleanURL)((0, _location.getLocation)());
+    const ref = this.obfuscator.shouldObfuscate() ? this.obfuscator.obfuscateString(location) : location;
     return ['a=' + info.applicationID, (0, _encode.param)('sa', info.sa ? '' + info.sa : ''), (0, _encode.param)('v', _env.VERSION), transactionNameParam(info), (0, _encode.param)('ct', runtime.customTransaction), '&rst=' + (0, _now.now)(), '&ck=0',
     // ck param DEPRECATED - still expected by backend
     '&s=' + (runtime.session?.state.value || '0'),
     // the 0 id encaps all untrackable and default traffic
     (0, _encode.param)('ref', ref), (0, _encode.param)('ptid', runtime.ptid ? '' + runtime.ptid : '')].join('');
   }
-  createPayload(type, options) {
-    var makeBody = createAccumulator();
-    var makeQueryString = createAccumulator();
-    var listeners = this._events[type] && this._events[type] || [];
-    for (var i = 0; i < listeners.length; i++) {
-      var singlePayload = listeners[i](options);
-      if (!singlePayload) continue;
-      if (singlePayload.body) (0, _mapOwn.mapOwn)(singlePayload.body, makeBody);
-      if (singlePayload.qs) (0, _mapOwn.mapOwn)(singlePayload.qs, makeQueryString);
+
+  /**
+   * Calls and accumulates data from registered harvesting functions based on
+   * the endpoint being harvested.
+   * @param {HarvestEndpointIdentifier} endpoint BAM endpoint identifier.
+   * @param {FeatureHarvestCallbackOptions} options Options to be passed to the
+   * feature harvest listener callback.
+   * @returns {HarvestPayload} Payload object to transmit to the bam endpoint.
+   */
+  createPayload(endpoint, options) {
+    const listeners = this._events[endpoint];
+    const payload = {
+      body: {},
+      qs: {}
+    };
+    if (Array.isArray(listeners) && listeners.length > 0) {
+      for (let i = 0; i < listeners.length; i++) {
+        const singlePayload = listeners[i](options);
+        if (singlePayload) {
+          payload.body = {
+            ...payload.body,
+            ...(singlePayload.body || {})
+          };
+          payload.qs = {
+            ...payload.qs,
+            ...(singlePayload.qs || {})
+          };
+        }
+      }
     }
+    return payload;
+  }
+
+  /**
+   * Cleans and returns a payload object containing a body and qs
+   * object with key/value pairs. KV pairs where the value is null,
+   * undefined, or an empty string are removed to save on transmission
+   * size.
+   * @param {HarvestPayload} payload Payload to be sent to the endpoint.
+   * @returns {HarvestPayload} Cleaned payload payload to be sent to the endpoint.
+   */
+  cleanPayload() {
+    let payload = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    const clean = input => {
+      if (typeof Uint8Array !== 'undefined' && input instanceof Uint8Array) {
+        return input.length > 0 ? input : null;
+      }
+      return Object.entries(input || {}).reduce((accumulator, _ref2) => {
+        let [key, value] = _ref2;
+        if (typeof value === 'number' || typeof value === 'string' && value.length > 0 || typeof value === 'object' && Object.keys(value || {}).length > 0) {
+          accumulator[key] = value;
+        }
+        return accumulator;
+      }, {});
+    };
     return {
-      body: makeBody(),
-      qs: makeQueryString()
+      body: clean(payload.body),
+      qs: clean(payload.qs)
     };
   }
-  on(type, listener) {
-    var listeners = this._events[type] || (this._events[type] = []);
-    listeners.push(listener);
-  }
-  resetListeners() {
-    (0, _mapOwn.mapOwn)(this._events, key => {
-      this._events[key] = [];
-    });
-  }
-}
-exports.Harvest = Harvest;
-function getSubmitMethod(endpoint, opts) {
-  opts = opts || {};
-  var method;
-  var useBody;
-  if (opts.unload && _globalScope.isBrowserScope) {
-    // all the features' final harvest; neither methods work outside window context
-    useBody = haveSendBeacon;
-    method = haveSendBeacon ? _submitData.submitData.beacon : _submitData.submitData.img; // really only IE doesn't have Beacon API for web browsers
-  } else {
-    // `submitData.beacon` was removed, there is an upper limit to the
-    // number of data allowed before it starts failing, so we save it only for page unloading
-    useBody = true;
-    method = _submitData.submitData.xhr;
+
+  /**
+   * Registers a function to be called when harvesting is triggered for a specific
+   * endpoint.
+   * @param {HarvestEndpointIdentifier} endpoint
+   * @param {FeatureHarvestCallback} listener
+   */
+  on(endpoint, listener) {
+    if (!Array.isArray(this._events[endpoint])) {
+      this._events[endpoint] = [];
+    }
+    this._events[endpoint].push(listener);
   }
-  return {
-    method: method,
-    useBody: useBody
-  };
 }
 
 // Constructs the transaction name param for the beacon URL.
 // Prefers the obfuscated transaction name over the plain text.
 // Falls back to making up a name.
+exports.Harvest = Harvest;
 function transactionNameParam(info) {
   if (info.transactionName) return (0, _encode.param)('to', info.transactionName);
   return (0, _encode.param)('t', info.tNamePlain || 'Unnamed Transaction');
-}
-
-// returns a function that can be called to accumulate values to a single object
-// when the function is called without parameters, then the accumulator is returned
-function createAccumulator() {
-  var accumulator = {};
-  var hasData = false;
-  return function (key, val) {
-    if (val !== null && val !== undefined && val.toString()?.length) {
-      accumulator[key] = val;
-      hasData = true;
-    }
-    if (hasData) return accumulator;
-  };
 }

package/dist/cjs/common/harvest/types.js

@@ -0,0 +1,54 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.unused = void 0;
+/**
+ * @file Contains types related to harvesting data.
+ * @copyright 2023 New Relic Corporation. All rights reserved.
+ * @license Apache-2.0
+ */
+
+/**
+ * @typedef {'rum'|'jserrors'|'events'|'ins'|'resources'|'blob'} HarvestEndpointIdentifier
+ */
+
+/**
+ * @typedef {object} HarvestPayload
+ * @property {object} qs Map of values that should be sent as part of the request query string.
+ * @property {object} body Map of values that should be sent as the body of the request.
+ * @property {string} body.e Special case of body used for browser interactions.
+ */
+
+/**
+ * @typedef {object} FeatureHarvestCallbackOptions Options for aggregating data for harvesting.
+ * @property {boolean} options.retry Indicates if the feature should store the aggregated
+ * data in anticipation of a possible need to retry the transmission.
+ */
+
+/**
+ * @callback FeatureHarvestCallback
+ * @param {FeatureHarvestCallbackOptions} options Options for aggregating data for harvesting.
+ * @returns {HarvestPayload} Payload of data to transmit to bam endpoint.
+ */
+
+/**
+ * @typedef {object} NetworkSendSpec
+ * @property {HarvestEndpointIdentifier} endpoint The endpoint to use (jserrors, events, resources etc.)
+ * @property {HarvestPayload} payload Object representing payload.
+ * @property {object} opts Additional options for sending data
+ * @property {boolean} opts.needResponse Specify whether the caller expects a response data.
+ * @property {boolean} opts.unload Specify whether the call is a final harvest during page unload.
+ * @property {boolean} opts.sendEmptyBody Specify whether the call should be made even if the body is empty. Useful for rum calls.
+ * @property {boolean} opts.retry Indicates if the feature should store the aggregated data in anticipation of a possible need to
+ * retry the transmission.
+ * @property {import('../util/submit-data.js').NetworkMethods} submitMethod The network method to use {@link ../util/submit-data.js}
+ * @property {string} customUrl Override the beacon url the data is sent to; must include protocol if defined
+ * @property {boolean} raw If true, disables adding the license key to the url
+ * @property {boolean} includeBaseParams Enables the use of base query parameters in the beacon url
+ */
+
+/* istanbul ignore next */
+const unused = {};
+exports.unused = unused;

package/dist/cjs/common/ids/id.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.id = id;
 var _getOrSet = require("../util/get-or-set");
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -31,7 +31,7 @@ function id(obj) {
   // We can only tag objects, functions, and arrays with ids.
   // For all primitive values we instead return -1.
   if (!obj || !(type === 'object' || type === 'function')) return -1;
-  if (obj === _globalScope.globalScope) return 0;
+  if (obj === _runtime.globalScope) return 0;
   return (0, _getOrSet.getOrSet)(obj, prop, function () {
     return index++;
   });

package/dist/cjs/common/ids/unique-id.js

@@ -7,7 +7,7 @@ exports.generateRandomHexString = generateRandomHexString;
 exports.generateSpanId = generateSpanId;
 exports.generateTraceId = generateTraceId;
 exports.generateUuid = generateUuid;
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -46,7 +46,7 @@ function getRandomValue(valueTable, tableIndex) {
  * @returns {string} uuid version 4 string
  */
 function generateUuid() {
-  const crypto = _globalScope.globalScope?.crypto || _globalScope.globalScope?.msCrypto;
+  const crypto = _runtime.globalScope?.crypto || _runtime.globalScope?.msCrypto;
   let randomValueTable;
   let randomValueIndex = 0;
   if (crypto && crypto.getRandomValues) {
@@ -73,7 +73,7 @@ function generateUuid() {
  * @returns {string} generated hex string
  */
 function generateRandomHexString(length) {
-  const crypto = _globalScope.globalScope?.crypto || _globalScope.globalScope?.msCrypto;
+  const crypto = _runtime.globalScope?.crypto || _runtime.globalScope?.msCrypto;
   let randomValueTable;
   let randomValueIndex = 0;
   if (crypto && crypto.getRandomValues) {

package/dist/cjs/common/session/session-entity.js

@@ -3,30 +3,35 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SessionEntity = exports.SESSION_EVENTS = void 0;
+exports.SessionEntity = exports.SESSION_EVENTS = exports.MODE = void 0;
 var _uniqueId = require("../ids/unique-id");
 var _console = require("../util/console");
 var _stringify = require("../util/stringify");
 var _contextualEe = require("../event-emitter/contextual-ee");
 var _timer = require("../timer/timer");
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 var _constants = require("./constants");
-var _localMemory = require("../storage/local-memory");
 var _interactionTimer = require("../timer/interaction-timer");
 var _wrap = require("../wrap");
 var _configurable = require("../config/state/configurable");
 var _handle = require("../event-emitter/handle");
 var _constants2 = require("../../features/metrics/constants");
 var _features = require("../../loaders/features/features");
+const MODE = {
+  OFF: 0,
+  FULL: 1,
+  ERROR: 2
+};
 // this is what can be stored in local storage (not enforced but probably should be)
 // these values should sync between local storage and the parent class props
+exports.MODE = MODE;
 const model = {
   value: '',
   inactiveAt: 0,
   expiresAt: 0,
   updatedAt: Date.now(),
-  sessionReplay: 0,
-  sessionTraceActive: false,
+  sessionReplay: MODE.OFF,
+  sessionTraceMode: MODE.OFF,
   custom: {}
 };
 const SESSION_EVENTS = {
@@ -49,16 +54,19 @@ class SessionEntity {
     let {
       agentIdentifier,
       key,
+      storage,
       value = (0, _uniqueId.generateRandomHexString)(16),
       expiresMs = _constants.DEFAULT_EXPIRES_MS,
-      inactiveMs = _constants.DEFAULT_INACTIVE_MS,
-      storageAPI = new _localMemory.LocalMemory()
+      inactiveMs = _constants.DEFAULT_INACTIVE_MS
     } = _ref;
-    if (!agentIdentifier || !key) throw new Error('Missing Required Fields');
-    if (!_globalScope.isBrowserScope) this.storage = new _localMemory.LocalMemory();else this.storage = storageAPI;
+    if (!agentIdentifier || !key || !storage) {
+      throw new Error("Missing required field(s):".concat(!agentIdentifier ? ' agentID' : '').concat(!key ? ' key' : '').concat(!storage ? ' storage' : ''));
+    }
+    this.agentIdentifier = agentIdentifier;
+    this.storage = storage;
     this.state = {};
     this.sync(model);
-    this.agentIdentifier = agentIdentifier;
+
     // key is intended to act as the k=v pair
     this.key = key;
     // value is intended to act as the primary value of the k=v pair
@@ -185,7 +193,7 @@ class SessionEntity {
       this.sync(data); // update the parent class "state" properties with the local storage values
       //
       // TODO - compression would need happen here if we decide to do it
-      this.storage.set(this.lookupKey, (0, _stringify.stringify)(data));
+      this.storage.set(this.lookupKey, (0, _stringify.stringify)(this.state));
       return data;
     } catch (e) {
       // storage is inaccessible
@@ -207,7 +215,7 @@ class SessionEntity {
       this.setup({
         agentIdentifier: this.agentIdentifier,
         key: this.key,
-        storageAPI: this.storage,
+        storage: this.storage,
         expiresMs: this.expiresMs,
         inactiveMs: this.inactiveMs
       });
@@ -266,7 +274,7 @@ class SessionEntity {
     return Date.now() + futureMs;
   }
   syncCustomAttribute(key, value) {
-    if (!_globalScope.isBrowserScope) return;
+    if (!_runtime.isBrowserScope) return;
     if (value === null) {
       const curr = this.read();
       if (curr.custom) {

package/dist/cjs/common/timer/interaction-timer.js

@@ -7,7 +7,7 @@ exports.InteractionTimer = void 0;
 var _timer = require("./timer");
 var _pageVisibility = require("../window/page-visibility");
 var _invoke = require("../util/invoke");
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 class InteractionTimer extends _timer.Timer {
   constructor(opts, ms) {
     super(opts, ms);
@@ -25,7 +25,7 @@ class InteractionTimer extends _timer.Timer {
     } catch (e) {
       // this try-catch can be removed when IE11 is completely unsupported & gone
     }
-    if (_globalScope.isBrowserScope && opts.ee) {
+    if (_runtime.isBrowserScope && opts.ee) {
       if (opts.ee) {
         const debouncedRefresh = (0, _invoke.debounce)(this.refresh.bind(this), 500, {
           leading: true
@@ -49,8 +49,8 @@ class InteractionTimer extends _timer.Timer {
         if (state === 'hidden') this.pause();
         // vis change --> visible is treated like a new interaction with the page
         else {
-          this.onResume();
           this.refresh();
+          this.onResume(); // emit resume event after state updated
         }
       }, false, false, this.abortController?.signal);
     }