From cb23dcd2ede36c606208b90cd0064f64e7fb9a5a Mon Sep 17 00:00:00 2001
From: Alan Hamlett <alan.hamlett@gmail.com>
Date: Thu, 27 Apr 2023 15:32:18 +0200
Subject: [PATCH] Add operating system to user agent string

---
 src/core/WakaTimeCore.ts | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/core/WakaTimeCore.ts b/src/core/WakaTimeCore.ts
index a4422d3..1aed316 100644
--- a/src/core/WakaTimeCore.ts
+++ b/src/core/WakaTimeCore.ts
@@ -284,7 +284,7 @@ class WakaTimeCore {
     // And send that in heartbeat
     if (loggingType == 'domain') {
       heartbeat.url = getDomainFromUrl(heartbeat.url);
-      payload = this.preparePayload(heartbeat, 'domain');
+      payload = await this.preparePayload(heartbeat, 'domain');
       await this.sendPostRequestToApi(
         { ...payload, ...navigationPayload },
         apiKey,
@@ -293,7 +293,7 @@ class WakaTimeCore {
     }
     // Send entity in heartbeat
     else if (loggingType == 'url') {
-      payload = this.preparePayload(heartbeat, 'url');
+      payload = await this.preparePayload(heartbeat, 'url');
       await this.sendPostRequestToApi(
         { ...payload, ...navigationPayload },
         apiKey,
@@ -325,7 +325,8 @@ class WakaTimeCore {
    * @returns {*}
    * @private
    */
-  preparePayload(heartbeat: SendHeartbeat, type: string): Record<string, unknown> {
+  async preparePayload(heartbeat: SendHeartbeat, type: string): Promise<Record<string, unknown>> {
+    const os = await this.getOperatingSystem();
     let browserName = 'chrome';
     let userAgent;
     if (IS_FIREFOX) {
@@ -338,7 +339,7 @@ class WakaTimeCore {
       entity: heartbeat.url,
       time: moment().format('X'),
       type: type,
-      user_agent: `${userAgent} ${browserName}-wakatime/${config.version}`,
+      user_agent: `${userAgent} ${os} ${browserName}-wakatime/${config.version}`,
     };
 
     if (heartbeat.project) {
@@ -348,6 +349,14 @@ class WakaTimeCore {
     return payload;
   }
 
+  getOperatingSystem(): Promise<string> {
+    return new Promise((resolve) => {
+      chrome.runtime.getPlatformInfo(function(info) {
+        resolve(`${info.os}_${info.arch}`);
+      });
+    });
+  }
+
   /**
    * Sends AJAX request with payload to the heartbeat API as JSON.
    *