noibu-react-native 0.2.3 → 0.2.5

package/dist/api/clientConfig.js

@@ -5,6 +5,7 @@ import { stringifyJSON, getMaxSubstringAllowed, getUserAgent, makeRequest } from
 import Storage from '../storage/storage.js';
 import { noibuLog } from '../utils/log.js';
 import { unwrapNoibuWrapped } from '../utils/object.js';
+import { Singleton } from '../monitors/BaseMonitor.js';
 
 /**
  * Singleton class to manage the client configuration
@@ -12,54 +13,46 @@ import { unwrapNoibuWrapped } from '../utils/object.js';
  * status of the client script as well as managing all storage
  * storing and retrieval.
  */
-class ClientConfig {
+class ClientConfig extends Singleton {
     /**
      * Creates a ClientConfig singleton instance
      */
     constructor(noibuErrorURL, customerConfig) {
-        this.locationBreadcrumbs = [];
-        // sets up this.browserId, this.disabledStatus
+        super();
         this.pageVisitId = uuid.v4();
-        // variables stored in storage
-        this.isClientDisabled = false;
         this.browserId = '';
         this.pageVisitSeq = null;
         // This variable tracks the last time the user was active in this session.
         // It is also written to storage. Initialized to now so the session can be
         // timed out even if a PV is never sent.
         this.lastActiveTime = new Date();
-        // error URL to send Noibu errors to
-        this.noibuErrorURL = noibuErrorURL;
         // error sent to backend counter
         this.cltErrorPostCounter = 0;
         // variables for checking if the socket is inactive
         // used a class variables in order to be changed in testing
         this.maxSocketInactiveTime = MAX_METROPLEX_SOCKET_INNACTIVE_TIME;
+        this.locationBreadcrumbs = [];
+        this.isClientDisabled = false;
+        this.noibuErrorURL = noibuErrorURL;
         this.customerDomain = customerConfig.domain;
         this.listOfUrlsToCollectHttpDataFrom =
             customerConfig.listOfUrlsToCollectHttpDataFrom;
         this.enableHttpDataCollection = customerConfig.enableHttpDataCollection;
         this.blockedElements = customerConfig.blockedElements;
-    }
-    /** Configures the singleton instance */
-    static configureInstance(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ noibuErrorURL, customerConfig, }) {
-            if (!this.instance) {
-                ClientConfig.noibuErrorURL = noibuErrorURL;
-                this.instance = new ClientConfig(noibuErrorURL, customerConfig);
-                // sets up this.browserId, this.isClientDisabled, this.pageVisitSeq
-                yield this.instance._setupStorageVars();
-            }
-        });
+        if (!noibuErrorURL || !this.hasAllNecessaryArgs()) {
+            const reason = Object.assign({ msg: 'ClientConfig was not properly configured' }, customerConfig);
+            void this.postNoibuErrorAndOptionallyDisableClient(reason, true, SEVERITY.error);
+            this.configurationPromise = Promise.reject(reason);
+            return;
+        }
+        // sets up this.browserId, this.isClientDisabled, this.pageVisitSeq
+        this.configurationPromise = this._setupStorageVars();
     }
     /**
-     * gets the singleton instance
+     * Convenience method to check correct setup
      */
-    static getInstance() {
-        if (!this.instance) {
-            throw new Error('ClientConfig was not configured');
-        }
-        return this.instance;
+    hasAllNecessaryArgs() {
+        return (!!this.customerDomain && this.globalUrl.includes(this.customerDomain));
     }
     /** lockClient will disable the client script for a single pagevisit for
      * duration given in minuntes */
@@ -285,7 +278,7 @@ class ClientConfig {
     /** gets current global url */
     get globalUrl() {
         const globalUrl = new URL('https://localhost');
-        globalUrl.hostname = ClientConfig.getInstance().customerDomain;
+        globalUrl.hostname = this.customerDomain;
         if (this.locationBreadcrumbs.length) {
             globalUrl.pathname = this.locationBreadcrumbs.join('/');
         }
@@ -296,8 +289,8 @@ class ClientConfig {
      * and disable the client if required
      * severity expects one of the SEVERITY_x level constants, or else error will be used
      */
-    postNoibuErrorAndOptionallyDisableClient(errorMsg_1, disableClient_1, severity_1) {
-        return __awaiter(this, arguments, void 0, function* (errorMsg, disableClient, severity, keepAlive = false) {
+    postNoibuErrorAndOptionallyDisableClient(errorMsg_1) {
+        return __awaiter(this, arguments, void 0, function* (errorMsg, disableClient = false, severity = SEVERITY.error, keepAlive = false) {
             noibuLog('postNoibuErrorAndOptionallyDisableClient', {
                 errorMsg,
                 disableClient,

package/dist/api/helpCode.js

@@ -1,100 +1,74 @@
+import { __awaiter } from 'tslib';
 import MetroplexSocket from './metroplexSocket.js';
 import { SEVERITY } from '../constants.js';
 import ClientConfig from './clientConfig.js';
+import { Singleton } from '../monitors/BaseMonitor.js';
 
 /**
  * HelpCode class is responsible for help code feature related functionality
  */
-class HelpCode {
-  /**
-   * Singleton instance
-   * @returns {HelpCode}
-   */
-  static getInstance() {
-    if (!this.instance) {
-      this.instance = new HelpCode();
+class HelpCode extends Singleton {
+    /**
+     * Constructs instance and sets up event listeners
+     */
+    constructor() {
+        super();
+        this.requestContext = null;
+        this.receiveHelpCode = this.receiveHelpCode.bind(this);
     }
-
-    return this.instance;
-  }
-
-  /**
-   * Constructs instance and sets up event listeners
-   */
-  constructor() {
-    this.requestContext = null;
-    this.receiveHelpCode = this.receiveHelpCode.bind(this);
-  }
-
-  /**
-   * Requests a help code and returns a Promise that resolves when the help code is obtained
-   * or rejects if the noibu connection is unavailable.
-
-   * @returns {Promise<string>} Promise object representing the help code request.
-   * @throws {string} Throws an error if the noibu connection is unavailable.
-   */
-  async requestHelpCode() {
-    if (this.requestContext !== null) {
-      return this.requestContext.promise;
-    }
-
-    const context = {
-      resolve: null,
-      reject: null,
-      promise: null,
-    };
-
-    context.promise = new Promise((resolve, reject) => {
-      context.resolve = resolve;
-      context.reject = reject;
-    });
-
-    this.requestContext = context;
-
-    const result = await MetroplexSocket.getInstance().requestHelpCode(
-      this.receiveHelpCode,
-    );
-
-    if (result === false) {
-      this.requestContext = null;
-      return Promise.reject(new Error('noibu connection is unavailable'));
+    /**
+     * Requests a help code and returns a Promise that resolves when the help code is obtained
+     * or rejects if the noibu connection is unavailable.
+  
+     * @returns {Promise<string>} Promise object representing the help code request.
+     * @throws {string} Throws an error if the noibu connection is unavailable.
+     */
+    requestHelpCode() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.requestContext !== null) {
+                return this.requestContext.promise;
+            }
+            const context = {
+                resolve: null,
+                reject: null,
+                promise: null,
+            };
+            context.promise = new Promise((resolve, reject) => {
+                context.resolve = resolve;
+                context.reject = reject;
+            });
+            this.requestContext = context;
+            const result = yield MetroplexSocket.getInstance().requestHelpCode(this.receiveHelpCode);
+            if (!result) {
+                this.requestContext = null;
+                return Promise.reject(new Error('noibu connection is unavailable'));
+            }
+            return this.requestContext.promise;
+        });
     }
-
-    return this.requestContext.promise;
-  }
-
-  /**
-   * Handles the received help code event.
-   * @param {CustomEvent<string>} event - The event object with string detail property.
-   * @returns {void}
-   */
-  receiveHelpCode(event) {
-    if (this.requestContext === null) {
-      const { success, data } = event.detail;
-
-      if (!success) {
-        const message = `Noibu help code is not available due to ${data}`;
-
-        ClientConfig.getInstance().postNoibuErrorAndOptionallyDisableClient(
-          message,
-          false,
-          SEVERITY.error,
-        );
-      }
-      return;
-    }
-
-    const context = this.requestContext;
-    this.requestContext = null;
-
-    const { success, data } = event.detail;
-
-    if (success) {
-      context.resolve(data);
-    } else {
-      context.reject(new Error(data));
+    /**
+     * Handles the received help code event.
+     */
+    receiveHelpCode(event) {
+        var _a, _b;
+        if (this.requestContext === null) {
+            const { success, data } = event.detail;
+            if (!success) {
+                const message = `Noibu help code is not available due to ${data}`;
+                ClientConfig.getInstance().postNoibuErrorAndOptionallyDisableClient(message, false, SEVERITY.error);
+            }
+            return;
+        }
+        const context = this.requestContext;
+        this.requestContext = null;
+        const { success, data } = event.detail;
+        if (success) {
+            (_a = context.resolve) === null || _a === void 0 ? void 0 : _a.call(context, data);
+        }
+        else {
+            (_b = context.reject) === null || _b === void 0 ? void 0 : _b.call(context, new Error(data));
+        }
     }
-  }
 }
 
 export { HelpCode as default };

package/dist/api/metroplexSocket.js

@@ -2,7 +2,7 @@ import { __awaiter } from 'tslib';
 import uuid from 'react-native-uuid';
 import { getUserAgent, stringifyJSON, getVideoRecorderType } from '../utils/function.js';
 import { addSafeEventListener } from '../utils/eventlistener.js';
-import { GET_METROPLEX_BASE_SOCKET_URL, METROPLEX_FRAG_ROUTE, GET_METROPLEX_POST_URL, METROPLEX_RETRY_FREQUENCY, META_DATA_METROPLEX_TYPE, PAGE_VISIT_META_DATA_ATT_NAME, HTTP_DATA_METROPLEX_TYPE, PAGE_VISIT_HTTP_DATA_ATT_NAME, VIDEO_METROPLEX_TYPE, PAGE_VISIT_VID_FRAG_ATT_NAME, PV_METROPLEX_TYPE, PAGE_VISIT_PART_ATT_NAME, SEQ_NUM_ATT_NAME, WORK_REQUEST_ATT_NAME, HELP_CODE_ATT_NAME, PV_EVENTS_ATT_NAME, TYPE_ATT_NAME, USERSTEP_EVENT_TYPE, GET_MAX_METROPLEX_RECONNECTION_NUMBER, MAX_METROPLEX_CONNECTION_COUNT, GET_METROPLEX_CONSECUTIVE_CONNECTION_DELAY, END_AT_ATT_NAME, SEVERITY, OK_SOCKET_MESSAGE, CLOSE_CONNECTION_FORCEFULLY, BLOCK_SOCKET_MESSAGE, STOP_STORING_PV_SOCKET_MESSAGE, STOP_STORING_VID_SOCKET_MESSAGE, MAX_BEACON_PAYLOAD_SIZE, PAGE_VISIT_INFORMATION_ATT_NAME, VIDEO_PART_COUNT_ATT_NAME, IS_LAST_ATT_NAME, BROWSER_ID_ATT_NAME, PV_ID_ATT_NAME, VER_ATT_NAME, CURRENT_PV_VERSION, PV_SEQ_ATT_NAME, ON_URL_ATT_NAME, REF_URL_ATT_NAME, STARTED_AT_ATT_NAME, CONN_COUNT_ATT_NAME, COLLECT_VER_ATT_NAME, CURRENT_NOIBUJS_VERSION, SCRIPT_ID_ATT_NAME, GET_SCRIPT_ID, SCRIPT_INSTANCE_ID_ATT_NAME, METROPLEX_SOCKET_INSTANCE_ID_ATT_NAME, SOCKET_INSTANCE_ID_ATT_NAME, VIDEO_RECORDER_ATT_NAME } from '../constants.js';
+import { GET_METROPLEX_BASE_SOCKET_URL, METROPLEX_FRAG_ROUTE, GET_METROPLEX_POST_URL, METROPLEX_RETRY_FREQUENCY, SEQ_NUM_ATT_NAME, WORK_REQUEST_ATT_NAME, HELP_CODE_ATT_NAME, PV_METROPLEX_TYPE, PAGE_VISIT_PART_ATT_NAME, PV_EVENTS_ATT_NAME, TYPE_ATT_NAME, USERSTEP_EVENT_TYPE, GET_MAX_METROPLEX_RECONNECTION_NUMBER, MAX_METROPLEX_CONNECTION_COUNT, GET_METROPLEX_CONSECUTIVE_CONNECTION_DELAY, END_AT_ATT_NAME, SEVERITY, OK_SOCKET_MESSAGE, CLOSE_CONNECTION_FORCEFULLY, BLOCK_SOCKET_MESSAGE, STOP_STORING_PV_SOCKET_MESSAGE, STOP_STORING_VID_SOCKET_MESSAGE, VIDEO_METROPLEX_TYPE, PAGE_VISIT_VID_FRAG_ATT_NAME, MAX_BEACON_PAYLOAD_SIZE, PAGE_VISIT_INFORMATION_ATT_NAME, PAGE_VISIT_HTTP_DATA_ATT_NAME, VIDEO_PART_COUNT_ATT_NAME, IS_LAST_ATT_NAME, HTTP_DATA_METROPLEX_TYPE, BROWSER_ID_ATT_NAME, PV_ID_ATT_NAME, VER_ATT_NAME, CURRENT_PV_VERSION, PV_SEQ_ATT_NAME, ON_URL_ATT_NAME, REF_URL_ATT_NAME, STARTED_AT_ATT_NAME, CONN_COUNT_ATT_NAME, COLLECT_VER_ATT_NAME, CURRENT_NOIBUJS_VERSION, SCRIPT_ID_ATT_NAME, GET_SCRIPT_ID, SCRIPT_INSTANCE_ID_ATT_NAME, METROPLEX_SOCKET_INSTANCE_ID_ATT_NAME, SOCKET_INSTANCE_ID_ATT_NAME, VIDEO_RECORDER_ATT_NAME, META_DATA_METROPLEX_TYPE, PAGE_VISIT_META_DATA_ATT_NAME, MAX_RETRY_MSG_Q_SIZE } from '../constants.js';
 import ClientConfig from './clientConfig.js';
 import StoredMetrics from './storedMetrics.js';
 import StoredPageVisit from './storedPageVisit.js';
@@ -10,15 +10,39 @@ import { safePerformanceNow } from '../utils/performance.js';
 import { isDateOverwritten } from '../utils/date.js';
 import { unwrapNoibuWrapped } from '../utils/object.js';
 import { noibuLog } from '../utils/log.js';
+import { Singleton } from '../monitors/BaseMonitor.js';
 
+/**
+ * Implements rolling window of specified size,
+ * but only makes a cut once array length exceeds 150%.
+ * During downsize deletes oldest (lowest indexes) elements.
+ */
+function createSlidingArrayOfSize(size, arraySource = [], downsizeThreshold = 1.5, downsizeFactor = 2) {
+    return new Proxy(arraySource, {
+        /**
+         * override push to implement sliding window
+         */
+        get(target, p) {
+            if (p === 'push') {
+                return (...args) => {
+                    target.push(...args);
+                    if (target.length >= downsizeThreshold * size) {
+                        target.splice(0, size / downsizeFactor);
+                    }
+                };
+            }
+            return target[p];
+        },
+    });
+}
 /** Manages the socket to Metroplex */
-class MetroplexSocket {
+class MetroplexSocket extends Singleton {
     /**
      * Creates an instance of metroplex
      * id of script, to make sure only a single socket is open
      */
     constructor(scriptInstanceId) {
-        const socketBase = GET_METROPLEX_BASE_SOCKET_URL();
+        super();
         // this flag is set to true when we manually need to close the
         // socket. It happens currently during the pagehide event and
         // if we havent sent a message to our backend in some time.
@@ -33,12 +57,13 @@ class MetroplexSocket {
         this.currentConnectionAttempts = 0;
         // how many successful connections to metroplex
         this.connectionCount = 0;
-        // sessiont start time, used to calculate accurate end time
+        // session start time, used to calculate accurate end time
         this.sessionStartTime = safePerformanceNow();
+        this.connectionPromise = null;
         // Whether or not we have sent the page visit information after connecting the socket
         this.pageVisitInfoSent = false;
         // socket connection url
-        this.connectionURL = `${socketBase}/${METROPLEX_FRAG_ROUTE}`;
+        this.connectionURL = `${GET_METROPLEX_BASE_SOCKET_URL()}/${METROPLEX_FRAG_ROUTE}`;
         // post endpoint for the same events we would send to the socket
         this.postURL = GET_METROPLEX_POST_URL();
         // sequence number of the message sent to metroplex
@@ -47,25 +72,20 @@ class MetroplexSocket {
         this.latestReceivedSeqNumber = -1;
         // set to true only when we start running behind on messages in metroplex
         this.isRetryLoopDisabled = false;
-        // messages that need to be resent to metroplex since they are lacking confirmation
-        this.retryMessageQueue = [];
+        /** messages that need to be resent to metroplex since they are lacking confirmation */
+        this.retryMessageQueue = createSlidingArrayOfSize(MAX_RETRY_MSG_Q_SIZE);
         // this map will hold all types that noibujs should not send to metroplex
         this.metroplexTypeLock = {};
         // setting initial URL at the start in order to guarentee that the
         // current page visit has the real initial onURL. Fragments and SPA's
         // can change the URL without reloading the page.
-        this._initialURL = ClientConfig.getInstance().globalUrl;
-        noibuLog('metroplex constructor', {
-            initialURL: this._initialURL,
-        });
-        this.initialReferingURL = '';
+        this.initialURL = ClientConfig.getInstance().globalUrl;
+        this.initialReferringURL = '';
         this.sessionTimestamp = new Date();
         // latest time that we received a confirmation message from metroplex
         this.latestReceivedSeqNumStoredTime = new Date();
         // unique instance id of Metroplex Socket
         this.instanceId = uuid.v4();
-        // unique script instance id
-        this.scriptInstanceId = scriptInstanceId;
         // length of the session based on page visit events
         this.sessionLength = 0;
         // track socket closure codes for debug
@@ -76,51 +96,30 @@ class MetroplexSocket {
         this.ackedOnce = false;
         // retry frequency in ms
         this.metroRetryFrequencyMS = METROPLEX_RETRY_FREQUENCY;
-        this.helpCodeCb = null;
         this.retryMetroplexInterval = null;
+        this.helpCodeCb = null;
+        noibuLog('Metroplex constructor', {
+            initialURL: this.initialURL,
+            scriptInstanceId,
+        });
+        this.scriptInstanceId = scriptInstanceId;
         // Connect the WS
         this.connectionPromise = this.connectSocket();
         // Set up the offload events immediately
         this._setupOffloadEvents();
     }
-    /**
-     * gets the singleton instance
-     * @returns {MetroplexSocket}
-     */
-    static getInstance(scriptInstanceId) {
-        if (!this.instance) {
-            this.instance = new MetroplexSocket(scriptInstanceId);
-        }
-        return this.instance;
-    }
     /**
      * Adds the seq num field to the given payload depending on whether its
      * a page visit part or video frag
      */
     _addSeqNumToPayload(type, payload) {
-        switch (type) {
-            case PV_METROPLEX_TYPE:
-                this._setSeqNumInPayloadAndIncrementSeqNum(PAGE_VISIT_PART_ATT_NAME, payload);
-                break;
-            case VIDEO_METROPLEX_TYPE:
-                this._setSeqNumInPayloadAndIncrementSeqNum(PAGE_VISIT_VID_FRAG_ATT_NAME, payload);
-                break;
-            case HTTP_DATA_METROPLEX_TYPE:
-                this._setSeqNumInPayloadAndIncrementSeqNum(PAGE_VISIT_HTTP_DATA_ATT_NAME, payload);
-                break;
-            case META_DATA_METROPLEX_TYPE:
-                this._setSeqNumInPayloadAndIncrementSeqNum(PAGE_VISIT_META_DATA_ATT_NAME, payload);
-                break;
+        const newPayload = Object.assign({}, payload);
+        const key = MetroplexSocket.typeToPayloadPropMap[type];
+        if (key) {
+            newPayload[key][SEQ_NUM_ATT_NAME] = this.messageSequenceNum;
+            this.messageSequenceNum += 1;
         }
-    }
-    /**
-     * sets the seq num in the payload for the given key and increments the
-     * global seq number
-     */
-    _setSeqNumInPayloadAndIncrementSeqNum(payloadKey, payload) {
-        // eslint-disable-next-line no-param-reassign
-        payload[payloadKey][SEQ_NUM_ATT_NAME] = this.messageSequenceNum;
-        this.messageSequenceNum += 1;
+        return newPayload;
     }
     /** requests help code and saves a callback to be called on response */
     requestHelpCode(cb) {
@@ -136,7 +135,7 @@ class MetroplexSocket {
      */
     sendMessage(type, payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            noibuLog('sendMessage start', { type, payload: JSON.stringify(payload) });
+            noibuLog('sendMessage start', { type });
             // if we have a lock on this specific type, we dont send it
             if (type in this.metroplexTypeLock ||
                 ClientConfig.getInstance().isClientDisabled) {
@@ -146,19 +145,18 @@ class MetroplexSocket {
                 });
                 return false;
             }
-            const payloadData = payload;
             if (type !== WORK_REQUEST_ATT_NAME) {
                 // Increasing the message sequence number for every message we send to metroplex
                 // and move the data to the retry queue.
-                this._addSeqNumToPayload(type, payloadData);
+                this._addSeqNumToPayload(type, payload);
                 // push the message to the retry queue immediately in case socket isnt connected
-                this.retryMessageQueue.push({ payload: payloadData, type });
+                this.retryMessageQueue.push({ payload, type });
                 StoredPageVisit.getInstance().checkAndStoreRetryQueue(this.retryMessageQueue, yield this.getPageInformation());
             }
             // send the socket message if we are connected and have sent page visit info
             if (this.isConnected() && this.pageVisitInfoSent) {
                 // sending the data to metroplex
-                yield this._sendSocketMessage(payloadData);
+                yield this._sendSocketMessage(payload);
             }
             this.previousMessageType = type;
             // Only update the last message send if its a page visit with user action
@@ -256,7 +254,7 @@ class MetroplexSocket {
                 // if we tried reconnecting too many times we abandon
                 if (this.connectionCount >= MAX_METROPLEX_CONNECTION_COUNT) {
                     // if we tried beyond the threshold, we block ourselves a short
-                    // while while fix the issue
+                    // while fix the issue
                     yield ClientConfig.getInstance().lockClientUntilNextPage('Too many connections, locking until next page');
                     return;
                 }
@@ -355,6 +353,9 @@ class MetroplexSocket {
                     // we do nothing on an OK
                     break;
                 default:
+                    if (!event.data) {
+                        break;
+                    }
                     // we now need to check if we receive text that contains
                     // the text SEQ_NUM. if that is true, then its a seq num
                     // and we need to clear out the retry queue.
@@ -409,8 +410,9 @@ class MetroplexSocket {
      */
     _clearRetryQueue(seqNum) {
         this.latestReceivedSeqNumStoredTime = new Date();
-        this.retryMessageQueue = this.retryMessageQueue.filter(message => this._messagePayloadHasLargerSeqNum(message, PAGE_VISIT_PART_ATT_NAME, seqNum) ||
+        const newQueue = this.retryMessageQueue.filter(message => this._messagePayloadHasLargerSeqNum(message, PAGE_VISIT_PART_ATT_NAME, seqNum) ||
             this._messagePayloadHasLargerSeqNum(message, PAGE_VISIT_VID_FRAG_ATT_NAME, seqNum));
+        this.retryMessageQueue = createSlidingArrayOfSize(MAX_RETRY_MSG_Q_SIZE, newQueue);
     }
     /** will resend everything that is in the retry queue */
     _sendUnconfirmedMessages(socketWasAlreadyOpen) {
@@ -622,7 +624,9 @@ class MetroplexSocket {
                 return;
             }
             const payloadJson = stringifyJSON(payload);
-            noibuLog(`_sendSocketMessage sending: ${payloadJson}`);
+            noibuLog(`_sendSocketMessage sending: ${PAGE_VISIT_VID_FRAG_ATT_NAME in payload
+                ? PAGE_VISIT_VID_FRAG_ATT_NAME
+                : payloadJson}`);
             if (this.socket) {
                 this.socket.send(payloadJson);
             }
@@ -642,12 +646,10 @@ class MetroplexSocket {
                 // the next page is loaded.
                 yield ClientConfig.getInstance().lockClientUntilNextPage('Session is inactive, locking until next page');
                 this.close();
-                Promise.all([
-                    // post metrics now so we don't include events after going inactive
-                    StoredMetrics.getInstance().postMetrics(),
-                    // post retry queue now so we don't include event after going inactive
-                    this.postFullPageVisit(MAX_BEACON_PAYLOAD_SIZE),
-                ]);
+                // post metrics now so we don't include events after going inactive
+                StoredMetrics.getInstance().postMetrics();
+                // post retry queue now so we don't include event after going inactive
+                this.postFullPageVisit(MAX_BEACON_PAYLOAD_SIZE);
             }
             return inactive;
         });
@@ -660,8 +662,8 @@ class MetroplexSocket {
                 [PV_ID_ATT_NAME]: ClientConfig.getInstance().pageVisitId,
                 [VER_ATT_NAME]: CURRENT_PV_VERSION,
                 [PV_SEQ_ATT_NAME]: yield ClientConfig.getInstance().getPageVisitSeq(),
-                [ON_URL_ATT_NAME]: this._initialURL,
-                [REF_URL_ATT_NAME]: this.initialReferingURL,
+                [ON_URL_ATT_NAME]: this.initialURL,
+                [REF_URL_ATT_NAME]: this.initialReferringURL,
                 [STARTED_AT_ATT_NAME]: this.sessionTimestamp.toISOString(),
                 [CONN_COUNT_ATT_NAME]: this.connectionCount,
                 [COLLECT_VER_ATT_NAME]: CURRENT_NOIBUJS_VERSION,
@@ -676,7 +678,6 @@ class MetroplexSocket {
     }
     /**
      * Try to parse help code response and fire custom event
-     * @param {String} response
      */
     _tryProcessHelpCodeResponse(response) {
         const prefix = `${HELP_CODE_ATT_NAME}:`;
@@ -691,5 +692,11 @@ class MetroplexSocket {
         return true;
     }
 }
+MetroplexSocket.typeToPayloadPropMap = {
+    [HTTP_DATA_METROPLEX_TYPE]: PAGE_VISIT_HTTP_DATA_ATT_NAME,
+    [META_DATA_METROPLEX_TYPE]: PAGE_VISIT_META_DATA_ATT_NAME,
+    [PV_METROPLEX_TYPE]: PAGE_VISIT_PART_ATT_NAME,
+    [VIDEO_METROPLEX_TYPE]: PAGE_VISIT_VID_FRAG_ATT_NAME,
+};
 
-export { MetroplexSocket as default };
+export { createSlidingArrayOfSize, MetroplexSocket as default };