Merge pull request #435 from mozilla/count-pageloads-on-idle

for #321: page count telemetry per activity

webextension/background.js

@@ -298,6 +298,20 @@ const messageHandler = {
       });
     });
 
+    browser.idle.onStateChanged.addListener((newState) => {
+      browser.tabs.query({}).then(tabs => {
+        for (let tab of tabs) { // eslint-disable-line prefer-const
+          if (newState === "idle") {
+            tabPageCounter.sendTabCountAndDelete(tab.id, "user-went-idle");
+          } else if (newState === "active" && tab.active) {
+            tabPageCounter.initTabCounter(tab);
+          }
+        }
+      }).catch(e => {
+        throw e;
+      });
+    });
+
     browser.webRequest.onCompleted.addListener((details) => {
       if (details.frameId !== 0 || details.tabId === -1) {
         return {};
@@ -360,30 +374,68 @@ const themeManager = {
 };
 
 const tabPageCounter = {
-  counter: {},
+  counters: {},
 
   initTabCounter(tab) {
-    if (tab.id in this.counter) {
-      return;
+    if (tab.id in this.counters) {
+      if (!("activity" in this.counters[tab.id])) {
+        this.counters[tab.id].activity = {
+          "cookieStoreId": tab.cookieStoreId,
+          "pageRequests": 0
+        };
+      }
+      if (!("tab" in this.counters[tab.id])) {
+        this.counters[tab.id].tab = {
+          "cookieStoreId": tab.cookieStoreId,
+          "pageRequests": 0
+        };
+      }
+    } else {
+      this.counters[tab.id] = {};
+      this.counters[tab.id].tab = {
+        "cookieStoreId": tab.cookieStoreId,
+        "pageRequests": 0
+      };
+      this.counters[tab.id].activity = {
+        "cookieStoreId": tab.cookieStoreId,
+        "pageRequests": 0
+      };
     }
-    this.counter[tab.id] = {
-      "cookieStoreId": tab.cookieStoreId,
-      "pageRequests": 0
-    };
   },
 
-  sendTabCountAndDelete(tabId) {
-    browser.runtime.sendMessage({
-      method: "sendTelemetryPayload",
-      event: "page-requests-completed-per-tab",
-      userContextId: this.counter[tabId].cookieStoreId,
-      pageRequestCount: this.counter[tabId].pageRequests
-    });
-    delete this.counter[tabId];
+  sendTabCountAndDelete(tabId, why = "user-closed-tab") {
+    if (!(this.counters[tabId])) {
+      return;
+    }
+    if (why === "user-closed-tab" && this.counters[tabId].tab) {
+      browser.runtime.sendMessage({
+        method: "sendTelemetryPayload",
+        event: "page-requests-completed-per-tab",
+        userContextId: this.counters[tabId].tab.cookieStoreId,
+        pageRequestCount: this.counters[tabId].tab.pageRequests
+      });
+      // When we send the ping because the user closed the tab,
+      // delete both the 'tab' and 'activity' counters
+      delete this.counters[tabId];
+    } else if (why === "user-went-idle" && this.counters[tabId].activity) {
+      browser.runtime.sendMessage({
+        method: "sendTelemetryPayload",
+        event: "page-requests-completed-per-activity",
+        userContextId: this.counters[tabId].activity.cookieStoreId,
+        pageRequestCount: this.counters[tabId].activity.pageRequests
+      });
+      // When we send the ping because the user went idle,
+      // only reset the 'activity' counter
+      this.counters[tabId].activity = {
+        "cookieStoreId": this.counters[tabId].tab.cookieStoreId,
+        "pageRequests": 0
+      };
+    }
   },
 
   incrementTabCount(tab) {
-    this.counter[tab.id].pageRequests++;
+    this.counters[tab.id].tab.pageRequests++;
+    this.counters[tab.id].activity.pageRequests++;
   }
 };