fix(powerMonitor): experiment

bugsnag · Oct 10, 2023 · 24de901 · 24de901
1 parent 53e18c1
commit 24de901
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/packages/electron/src/client/main.js b/packages/electron/src/client/main.js
@@ -48,7 +48,7 @@ module.exports = (opts) => {
     require('@bugsnag/plugin-node-unhandled-rejection'),
     require('@bugsnag/plugin-electron-app')(NativeClient, process, electron.app, electron.BrowserWindow, filestore),
     require('@bugsnag/plugin-electron-app-breadcrumbs')(electron.app, electron.BrowserWindow),
-    require('@bugsnag/plugin-electron-device')(electron.app, electron.screen, process, filestore, NativeClient, electron.app.whenReady().then(() => electron.powerMonitor)),
+    require('@bugsnag/plugin-electron-device')(electron.app, electron.screen, process, filestore, NativeClient, electron.powerMonitor),
     require('@bugsnag/plugin-electron-session')(electron.app, electron.BrowserWindow, NativeClient),
     require('@bugsnag/plugin-console-breadcrumbs'),
     require('@bugsnag/plugin-strip-project-root'),

diff --git a/packages/plugin-electron-device/device.js b/packages/plugin-electron-device/device.js
@@ -17,7 +17,7 @@ const createDeviceUpdater = (client, NativeClient, device) => newProperties => {
   }
 }
 
-module.exports = (app, screen, process, filestore, NativeClient, powerMonitorPromise) => ({
+module.exports = (app, screen, process, filestore, NativeClient, powerMonitor) => ({
   load (client) {
     const device = {}
     let cachedDevice = {}
@@ -45,7 +45,7 @@ module.exports = (app, screen, process, filestore, NativeClient, powerMonitorPro
       }
     })
 
-    powerMonitorPromise.then(powerMonitor => {
+    app.whenReady().then(() => {
       client.addMetadata('device', {
         // the value for 'idleThreshold' doesn't matter here because it is ignored
         // if the system is locked and that's the only state we care about
@@ -70,23 +70,25 @@ module.exports = (app, screen, process, filestore, NativeClient, powerMonitorPro
       powerMonitor.on('lock-screen', () => {
         client.addMetadata('device', { isLocked: true })
       })
+    })
 
-      client.addOnError(event => {
-        event.device = Object.assign(
-          {},
-          event.device,
-          device,
-          {
-            freeMemory: kibibytesToBytes(process.getSystemMemoryInfo().free),
-            time: new Date()
-          }
-        )
+    client.addOnError(event => {
+      event.device = Object.assign(
+        {},
+        event.device,
+        device,
+        {
+          freeMemory: kibibytesToBytes(process.getSystemMemoryInfo().free),
+          time: new Date()
+        }
+      )
 
+      if (powerMonitor && powerMonitor.getSystemIdleTime) {
         event.addMetadata('device', { idleTime: powerMonitor.getSystemIdleTime() })
+      }
 
-        setDefaultUserId(event)
-      }, true)
-    })
+      setDefaultUserId(event)
+    }, true)
 
     app.whenReady().then(() => {
       // on windows, app.getLocale won't return the locale until the app is ready