@inboxsdk/core 0.2.28-alpha.3 → 0.2.28-alpha.5

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/create-link.js

@@ -1,24 +1,15 @@
-/* @flow */
-
-import populateRouteID from '../../../lib/populateRouteID';
-import Logger from '../../../lib/logger';
-
-import type { RouteParams } from '../../../namespaces/router';
-import type GmailRouteProcessor from '../views/gmail-route-view/gmail-route-processor';
-
-export default function createLink(
-  GmailRouteProcessor: GmailRouteProcessor,
-  routeID: string,
-  params: ?RouteParams | string
-): string {
-  params =
-    typeof params === 'string'
-      ? params
-      : params
-      ? Object.assign({}, params)
-      : {};
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = createLink;
+var _populateRouteID = _interopRequireDefault(require("../../../lib/populateRouteID"));
+var _logger = _interopRequireDefault(require("../../../lib/logger"));
+function createLink(GmailRouteProcessor, routeID, params) {
+  params = typeof params === 'string' ? params : params ? Object.assign({}, params) : {};
   routeID = GmailRouteProcessor.getCompatibleRouteID(routeID);
-
   if (typeof params === 'string') {
     var matches = routeID.match(/:/g);
     if (matches && matches.length === 1) {
@@ -29,50 +20,38 @@ export default function createLink(
       params = {};
     }
   }
-
   const hasPageParam = routeID.match(/:page(?:\/|$)/);
   if (hasPageParam && !params.page) {
     params.page = 0;
   }
-
   const parts = routeID.split('/');
 
   // attempt to use new, more strict populateRouteID fn, if that fails
   // log an error and fallback to older, more permissive approach.
   // intent is to retire the old approach once we understand the consequences.
-  let processedRoute: string;
+  let processedRoute;
   try {
-    processedRoute = populateRouteID(routeID, params);
+    processedRoute = (0, _populateRouteID.default)(routeID, params);
   } catch (error) {
-    Logger.error(error, {
+    _logger.default.error(error, {
       routeID,
-      paramsKey: Object.keys(params),
+      paramsKey: Object.keys(params)
     });
-
-    processedRoute = parts
-      .map(function (part) {
-        if (part.indexOf(':') === -1) {
-          return part;
-        }
-
-        const colonParts = part.split(':');
-        if (params && typeof params[colonParts[1]] !== 'undefined') {
-          return colonParts[0] + params[colonParts[1]];
-        }
-
-        return colonParts[0];
-      })
-      .map(encodeURIComponent)
-      .join('/');
+    processedRoute = parts.map(function (part) {
+      if (part.indexOf(':') === -1) {
+        return part;
+      }
+      const colonParts = part.split(':');
+      if (params && typeof params[colonParts[1]] !== 'undefined') {
+        return colonParts[0] + params[colonParts[1]];
+      }
+      return colonParts[0];
+    }).map(encodeURIComponent).join('/');
   }
 
   //check if link is of the form inbox/p0 or search/blah/p0
-  if (
-    GmailRouteProcessor.isListRouteName(parts[0]) &&
-    processedRoute.indexOf('p0') === processedRoute.length - 2
-  ) {
+  if (GmailRouteProcessor.isListRouteName(parts[0]) && processedRoute.indexOf('p0') === processedRoute.length - 2) {
     processedRoute = processedRoute.substring(0, processedRoute.length - 3);
   }
-
   return '#' + processedRoute;
-}
+}

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/encodeDraftUrlId.js

@@ -0,0 +1,8 @@
+import { convertBase } from '@macil/simple-base-converter';
+const B64_ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+const GMAIL_ALPHABET = 'BCDFGHJKLMNPQRSTVWXZbcdfghjklmnpqrstvwxz';
+export default function encodeDraftUrlId(syncThreadId, syncMessageId) {
+    const raw = `${syncThreadId.replace(/^thread-/, '')}+${syncMessageId}`;
+    const b64 = Buffer.from(raw).toString('base64').replace(/=/g, '');
+    return convertBase(b64, B64_ALPHABET, GMAIL_ALPHABET);
+}

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/get-draft-id-for-message-id.js

@@ -1,24 +1,19 @@
-/* @flow */
+"use strict";
 
-import memoize from 'lodash/memoize';
-import { defn } from 'ud';
-import gmailAjax from '../../../driver-common/gmailAjax';
-import { readDraftId } from '../gmail-response-processor';
-import type GmailDriver from '../gmail-driver';
-import isStreakAppId from '../../../lib/isStreakAppId';
-
-export type GetDraftIdResult = {
-  draftID: ?string,
-  debugData: ?Object,
-};
-
-async function uncachedGetDraftIDForMessageID(
-  driver: GmailDriver,
-  messageID: string
-): Promise<GetDraftIdResult> {
-  const response = await gmailAjax({
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _memoize = _interopRequireDefault(require("lodash/memoize"));
+var _ud = require("ud");
+var _gmailAjax = _interopRequireDefault(require("../../../driver-common/gmailAjax"));
+var _gmailResponseProcessor = require("../gmail-response-processor");
+var _isStreakAppId = _interopRequireDefault(require("../../../lib/isStreakAppId"));
+async function uncachedGetDraftIDForMessageID(driver, messageID) {
+  const response = await (0, _gmailAjax.default)({
     method: 'GET',
-    url: (document.location: any).origin + document.location.pathname,
+    url: document.location.origin + document.location.pathname,
     data: {
       ui: '2',
       ik: driver.getPageCommunicator().getIkValue(),
@@ -28,43 +23,37 @@ async function uncachedGetDraftIDForMessageID(
       nsc: '1',
       mb: '0',
       rt: 'j',
-      search: 'drafts',
-    },
+      search: 'drafts'
+    }
   });
   try {
-    const draftID = readDraftId(response.text, messageID);
-    const debugData = { responseText: response.text };
-    return { draftID, debugData };
+    const draftID = (0, _gmailResponseProcessor.readDraftId)(response.text, messageID);
+    const debugData = {
+      responseText: response.text
+    };
+    return {
+      draftID,
+      debugData
+    };
   } catch (err) {
-    if (isStreakAppId(driver.getAppId())) {
+    if ((0, _isStreakAppId.default)(driver.getAppId())) {
       driver.getLogger().error(err, {
         message: 'failed to read draft ID',
         messageID,
-        text: response.text,
+        text: response.text
       });
     }
     throw err;
   }
 }
-
-const cachedGetDraftIDForMessageID: (
-  driver: GmailDriver,
-  messageID: string
-) => Promise<GetDraftIdResult> = memoize(
-  uncachedGetDraftIDForMessageID,
-  (driver, messageID) => messageID
-);
-
-function getDraftIDForMessageID(
-  driver: GmailDriver,
-  messageID: string,
-  skipCache: boolean = false
-): Promise<GetDraftIdResult> {
+const cachedGetDraftIDForMessageID = (0, _memoize.default)(uncachedGetDraftIDForMessageID, (driver, messageID) => messageID);
+function getDraftIDForMessageID(driver, messageID) {
+  let skipCache = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   if (skipCache) {
     return uncachedGetDraftIDForMessageID(driver, messageID);
   } else {
     return cachedGetDraftIDForMessageID(driver, messageID);
   }
 }
-
-export default defn(module, getDraftIDForMessageID);
+var _default = (0, _ud.defn)(module, getDraftIDForMessageID);
+exports.default = _default;

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/get-native-nav-item.js

@@ -1,43 +1,33 @@
-/* @flow */
+"use strict";
 
-import NativeGmailNavItemView from '../views/native-gmail-nav-item-view';
-import GmailElementGetter from '../gmail-element-getter';
-import findParent from '../../../../common/find-parent';
-import waitFor from '../../../lib/wait-for';
-
-import type GmailDriver from '../gmail-driver';
-
-export default function getNativeNavItem(
-  driver: GmailDriver,
-  label: string
-): Promise<NativeGmailNavItemView> {
-  return waitFor(() => {
-    const navContainer = GmailElementGetter.getLeftNavContainerElement();
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = getNativeNavItem;
+var _nativeGmailNavItemView = _interopRequireDefault(require("../views/native-gmail-nav-item-view"));
+var _gmailElementGetter = _interopRequireDefault(require("../gmail-element-getter"));
+var _findParent = _interopRequireDefault(require("../../../../common/find-parent"));
+var _waitFor = _interopRequireDefault(require("../../../lib/wait-for"));
+function getNativeNavItem(driver, label) {
+  return (0, _waitFor.default)(() => {
+    const navContainer = _gmailElementGetter.default.getLeftNavContainerElement();
     if (!navContainer) return null;
     return navContainer.querySelector(`.aim a[href*="#${label}"]`);
-  }, 300 * 1000)
-    .then((labelLinkElement) => {
-      const labelElement = findParent(labelLinkElement, (el) =>
-        el.classList.contains('aim')
-      );
-
-      if (!labelElement) {
-        throw new Error('native nav item structured weird');
-      }
-
-      if (!(labelElement: any).__nativeGmailNavItemView) {
-        (labelElement: any).__nativeGmailNavItemView =
-          new NativeGmailNavItemView(driver, labelElement, label);
-      }
-
-      return (labelElement: any).__nativeGmailNavItemView;
-    })
-    .catch((err) => {
-      if (GmailElementGetter.isStandalone()) {
-        // never resolve
-        return new Promise((resolve, reject) => {});
-      }
-
-      throw err;
-    });
-}
+  }, 300 * 1000).then(labelLinkElement => {
+    const labelElement = (0, _findParent.default)(labelLinkElement, el => el.classList.contains('aim'));
+    if (!labelElement) {
+      throw new Error('native nav item structured weird');
+    }
+    if (!labelElement.__nativeGmailNavItemView) {
+      labelElement.__nativeGmailNavItemView = new _nativeGmailNavItemView.default(driver, labelElement, label);
+    }
+    return labelElement.__nativeGmailNavItemView;
+  }).catch(err => {
+    if (_gmailElementGetter.default.isStandalone()) {
+      // never resolve
+      return new Promise((resolve, reject) => {});
+    }
+    throw err;
+  });
+}

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/get-rfc-message-id-for-gmail-message-id.js

@@ -0,0 +1,12 @@
+import getOriginalMessagePage from '../../../driver-common/getOriginalMessagePage';
+import htmlToText from '../../../../common/html-to-text';
+export default async function getRfcMessageIdForGmailMessageId(driver, gmailMessageId) {
+    const text = await getOriginalMessagePage(driver, {
+        oldGmailMessageID: gmailMessageId,
+    });
+    const match = text.match(/^Message-ID:\s+(\S+)\s*$/im);
+    if (!match) {
+        throw new Error("Failed to find rfc id for gmail thread id. Message may not exist in user's account.");
+    }
+    return htmlToText(match[1]);
+}

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/get-rfc-message-id-for-gmail-thread-id.js

@@ -0,0 +1,33 @@
+import gmailAjax from '../../../driver-common/gmailAjax';
+import querystring from 'querystring';
+import * as GmailResponseProcessor from '../gmail-response-processor';
+import getRfcMessageIdForGmailMessageId from './get-rfc-message-id-for-gmail-message-id';
+export default async function getRfcMessageIdForGmailThreadId(driver, gmailThreadId) {
+    const messageIdQuery = {
+        ui: 2,
+        ik: driver.getPageCommunicator().getIkValue(),
+        view: 'cv',
+        th: gmailThreadId,
+        nsc: 1,
+        mb: 0,
+        rt: 'j',
+        search: 'all',
+    };
+    const gmailMessageIdResponse = await gmailAjax({
+        method: 'POST',
+        url: document.location.origin +
+            document.location.pathname +
+            '?' +
+            querystring.stringify(messageIdQuery),
+        canRetry: true,
+    });
+    const extractedIds = GmailResponseProcessor.extractMessageIdsFromThreadBatchRequest(gmailMessageIdResponse.text);
+    if (Object.keys(extractedIds).length !== 1) {
+        throw new Error(`Expected to find 1 thread/message ID pair, but got ${Object.keys(extractedIds).length}`);
+    }
+    const gmailMessageId = extractedIds[gmailThreadId];
+    if (!gmailMessageId) {
+        throw new Error('Could not find a message ID for given thread ID');
+    }
+    return getRfcMessageIdForGmailMessageId(driver, gmailMessageId);
+}

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/get-url-object.js

@@ -1,33 +1,25 @@
-/* @flow */
+"use strict";
 
-export type URLObject = {
-  name: string,
-  params: string[],
-  query: ?string,
-  hash: string,
-};
-
-export default function getURLObject(url: string): URLObject {
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = getURLObject;
+function getURLObject(url) {
   const m = url.match(/#([^?]*)(?:\?(.*))?/);
   if (!m) {
     return {
       name: 'inbox',
       params: [],
       hash: '',
-      query: undefined,
+      query: undefined
     };
   }
-
   const hash = m[1];
   const hashParts = hash.split('/');
-
   return {
     name: decodeURIComponent(hashParts[0]),
-    params: hashParts
-      .slice(1)
-      .map((part) => part.replace(/\+/g, ' '))
-      .map(decodeURIComponent),
+    params: hashParts.slice(1).map(part => part.replace(/\+/g, ' ')).map(decodeURIComponent),
     query: m[2],
-    hash,
+    hash
   };
-}
+}

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/getSyncThreadForOldGmailThreadId.js

@@ -1,38 +1,31 @@
-/* @flow */
+"use strict";
 
-import { defn } from 'ud';
-import BigNumber from 'bignumber.js';
-
-import getSyncThreadsForSearch from '../../../driver-common/getSyncThreadsForSearch';
-
-import gmailAjax from '../../../driver-common/gmailAjax';
-import isStreakAppId from '../../../lib/isStreakAppId';
-
-import { extractThreadsFromSearchResponse } from '../gmail-sync-response-processor';
-
-import type GmailDriver from '../gmail-driver';
-import type { SyncThread } from '../gmail-sync-response-processor';
-
-export default async function getSyncThreadForOldGmailThreadId(
-  driver: GmailDriver,
-  oldGmailThreadId: string
-): Promise<SyncThread> {
-  const { threads: threadDescriptors, _text } = await getSyncThreadsForSearch(
-    driver,
-    'threadid:' + new BigNumber(oldGmailThreadId, 16).toString(10)
-  );
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = getSyncThreadForOldGmailThreadId;
+var _ud = require("ud");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
+var _getSyncThreadsForSearch = _interopRequireDefault(require("../../../driver-common/getSyncThreadsForSearch"));
+var _gmailAjax = _interopRequireDefault(require("../../../driver-common/gmailAjax"));
+var _isStreakAppId = _interopRequireDefault(require("../../../lib/isStreakAppId"));
+var _gmailSyncResponseProcessor = require("../gmail-sync-response-processor");
+async function getSyncThreadForOldGmailThreadId(driver, oldGmailThreadId) {
+  const {
+    threads: threadDescriptors,
+    _text
+  } = await (0, _getSyncThreadsForSearch.default)(driver, 'threadid:' + new _bignumber.default(oldGmailThreadId, 16).toString(10));
   const firstThread = threadDescriptors[0];
   if (firstThread == null) {
     console.error(`Thread with ID ${oldGmailThreadId} not found by Gmail`); //eslint-disable-line
-    const isStreak = isStreakAppId(driver.getAppId());
-    const err = new Error(
-      'Thread not found by getSyncThreadForOldGmailThreadId'
-    );
+    const isStreak = (0, _isStreakAppId.default)(driver.getAppId());
+    const err = new Error('Thread not found by getSyncThreadForOldGmailThreadId');
     driver.getLogger().error(err, {
       oldGmailThreadId: isStreak ? oldGmailThreadId : null,
-      responseText: isStreak ? _text : null,
+      responseText: isStreak ? _text : null
     });
     throw err;
   }
   return firstThread;
-}
+}

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/getSyncThreadFromSyncThreadId.js

@@ -1,76 +1,64 @@
-/* @flow */
+"use strict";
 
-import { defn } from 'ud';
-import gmailAjax from '../../../driver-common/gmailAjax';
-import { extractThreadsFromThreadResponse } from '../gmail-sync-response-processor';
-import getAccountUrlPart from '../../../driver-common/getAccountUrlPart';
-import type GmailDriver from '../gmail-driver';
-import type { SyncThread } from '../gmail-sync-response-processor';
-
-export default async function getThreadFromSyncThreadId(
-  driver: GmailDriver,
-  syncThreadId: string
-): Promise<?SyncThread> {
-  const [btaiHeader, xsrfToken] = await Promise.all([
-    driver.getPageCommunicator().getBtaiHeader(),
-    driver.getPageCommunicator().getXsrfToken(),
-  ]);
-  return getThreadFromSyncThreadIdUsingHeaders(
-    syncThreadId,
-    btaiHeader,
-    xsrfToken
-  );
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = getThreadFromSyncThreadId;
+exports.getThreadFromSyncThreadIdUsingHeaders = getThreadFromSyncThreadIdUsingHeaders;
+var _ud = require("ud");
+var _gmailAjax = _interopRequireDefault(require("../../../driver-common/gmailAjax"));
+var _gmailSyncResponseProcessor = require("../gmail-sync-response-processor");
+var _getAccountUrlPart = _interopRequireDefault(require("../../../driver-common/getAccountUrlPart"));
+async function getThreadFromSyncThreadId(driver, syncThreadId) {
+  const [btaiHeader, xsrfToken] = await Promise.all([driver.getPageCommunicator().getBtaiHeader(), driver.getPageCommunicator().getXsrfToken()]);
+  return getThreadFromSyncThreadIdUsingHeaders(syncThreadId, btaiHeader, xsrfToken);
 }
-
-export async function getThreadFromSyncThreadIdUsingHeaders(
-  syncThreadId: string,
-  btaiHeader: string,
-  xsrfToken: string
-): Promise<?SyncThread> {
+async function getThreadFromSyncThreadIdUsingHeaders(syncThreadId, btaiHeader, xsrfToken) {
   let responseText = null;
   try {
-    let { text } = await gmailAjax({
+    let {
+      text
+    } = await (0, _gmailAjax.default)({
       method: 'POST',
-      url: `https://mail.google.com/sync${getAccountUrlPart()}/i/fd`,
+      url: `https://mail.google.com/sync${(0, _getAccountUrlPart.default)()}/i/fd`,
       headers: {
         'Content-Type': 'application/json',
         'X-Framework-Xsrf-Token': xsrfToken,
         'X-Gmail-BTAI': btaiHeader,
-        'X-Google-BTD': '1',
+        'X-Google-BTD': '1'
       },
       data: JSON.stringify({
-        '1': [
-          {
-            '1': syncThreadId,
-            '2': 1,
-          },
-        ],
-      }),
+        '1': [{
+          '1': syncThreadId,
+          '2': 1
+        }]
+      })
     });
     responseText = text;
   } catch (err) {
     // try sending request with new format 2022_09_09
-    let { text } = await gmailAjax({
+    let {
+      text
+    } = await (0, _gmailAjax.default)({
       method: 'POST',
-      url: `https://mail.google.com/sync${getAccountUrlPart()}/i/fd?rt=r&pt=ji`,
+      url: `https://mail.google.com/sync${(0, _getAccountUrlPart.default)()}/i/fd?rt=r&pt=ji`,
       headers: {
         'Content-Type': 'application/json',
         'X-Framework-Xsrf-Token': xsrfToken,
         'X-Gmail-BTAI': btaiHeader,
-        'X-Google-BTD': '1',
+        'X-Google-BTD': '1'
       },
-      data: JSON.stringify([[[syncThreadId, 1]], 2]),
+      data: JSON.stringify([[[syncThreadId, 1]], 2])
     });
     responseText = text;
   }
-
-  const threadDescriptors = extractThreadsFromThreadResponse(responseText);
+  const threadDescriptors = (0, _gmailSyncResponseProcessor.extractThreadsFromThreadResponse)(responseText);
   if (threadDescriptors.length > 0) {
     const thread = threadDescriptors[0];
     if (thread.oldGmailThreadID) {
       return thread;
     }
   }
-
   return null;
-}
+}

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/gmail-load-event.js

@@ -1,19 +1,19 @@
-/* @flow */
+"use strict";
 
-import gmailElementGetter from '../gmail-element-getter';
-import type GmailDriver from '../gmail-driver';
-import isIntegratedViewGmail from './isIntegratedViewGmail';
-import { waitForMenuReady } from './add-nav-item';
-
-export default async function gmailLoadEvent(driver: GmailDriver) {
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = gmailLoadEvent;
+var _gmailElementGetter = _interopRequireDefault(require("../gmail-element-getter"));
+var _isIntegratedViewGmail = _interopRequireDefault(require("./isIntegratedViewGmail"));
+var _addNavItem = require("./add-nav-item");
+async function gmailLoadEvent(driver) {
   const pageCommunicator = driver.getPageCommunicator();
-
-  const isConversationViewDisabled =
-    await pageCommunicator.isConversationViewDisabled();
-  await waitForMenuReady();
-
+  const isConversationViewDisabled = await pageCommunicator.isConversationViewDisabled();
+  await (0, _addNavItem.waitForMenuReady)();
   driver.getLogger().eventSite('gmailSettings', {
-    isGmailIntegratedView: isIntegratedViewGmail(),
+    isGmailIntegratedView: (0, _isIntegratedViewGmail.default)(),
     screenWidth: window.screen && window.screen.width,
     screenHeight: window.screen && window.screen.height,
     windowWidth: window.innerWidth,
@@ -22,40 +22,22 @@ export default async function gmailLoadEvent(driver: GmailDriver) {
     isUsingSyncAPI: pageCommunicator.isUsingSyncAPI(),
     previewPane: pageCommunicator.getUserOriginalPreviewPaneMode(),
     isConversationViewDisabled,
-    wasAccountSwitcherReadyAtStart:
-      driver.getEnvData().wasAccountSwitcherReadyAtStart,
-    timings: Object.assign(
-      ({
-        responseStart:
-          global.performance && global.performance.timing.responseStart,
-        responseEnd:
-          global.performance && global.performance.timing.responseEnd,
-        domLoading: global.performance && global.performance.timing.domLoading,
-        domInteractive:
-          global.performance && global.performance.timing.domInteractive,
-        domComplete:
-          global.performance && global.performance.timing.domComplete,
-        domContentLoadedEventStart:
-          global.performance &&
-          global.performance.timing.domContentLoadedEventStart,
-        domContentLoadedEventEnd:
-          global.performance &&
-          global.performance.timing.domContentLoadedEventEnd,
-        domainLookupEnd:
-          global.performance && global.performance.timing.domainLookupEnd,
-        domainLookupStart:
-          global.performance && global.performance.timing.domainLookupStart,
-        fetchStart: global.performance && global.performance.timing.fetchStart,
-        loadEventStart:
-          global.performance && global.performance.timing.loadEventStart,
-        loadEventEnd:
-          global.performance && global.performance.timing.loadEventEnd,
-        navigationStart:
-          global.performance && global.performance.timing.navigationStart,
-        requestStart:
-          global.performance && global.performance.timing.requestStart,
-      }: any),
-      driver.getTimings()
-    ),
+    wasAccountSwitcherReadyAtStart: driver.getEnvData().wasAccountSwitcherReadyAtStart,
+    timings: Object.assign({
+      responseStart: global.performance && global.performance.timing.responseStart,
+      responseEnd: global.performance && global.performance.timing.responseEnd,
+      domLoading: global.performance && global.performance.timing.domLoading,
+      domInteractive: global.performance && global.performance.timing.domInteractive,
+      domComplete: global.performance && global.performance.timing.domComplete,
+      domContentLoadedEventStart: global.performance && global.performance.timing.domContentLoadedEventStart,
+      domContentLoadedEventEnd: global.performance && global.performance.timing.domContentLoadedEventEnd,
+      domainLookupEnd: global.performance && global.performance.timing.domainLookupEnd,
+      domainLookupStart: global.performance && global.performance.timing.domainLookupStart,
+      fetchStart: global.performance && global.performance.timing.fetchStart,
+      loadEventStart: global.performance && global.performance.timing.loadEventStart,
+      loadEventEnd: global.performance && global.performance.timing.loadEventEnd,
+      navigationStart: global.performance && global.performance.timing.navigationStart,
+      requestStart: global.performance && global.performance.timing.requestStart
+    }, driver.getTimings())
   });
-}
+}