Removed DBus module and directly used exec in system

6XGate · Nov 17, 2024 · 1984752 · 1984752
1 parent 4dc4b9a
commit 1984752
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 313 deletions.
diff --git a/src/main/services/dbus.ts b/src/main/services/dbus.ts
diff --git a/src/main/services/system.ts b/src/main/services/system.ts
@@ -1,20 +1,28 @@
+import Logger from 'electron-log'
+import { execa } from 'execa'
 import { memo } from 'radash'
-import useDbus from './dbus'
 
 const useSystem = memo(function useSystem() {
-  const { dbusBind } = useDbus()
+  async function powerOff(interactive = false) {
+    const args = interactive ? ['boolean:true'] : ['boolean:false']
+    const params = [
+      '--system',
+      '--print-reply',
+      '--dest=org.freedesktop.login1',
+      '/org/freedesktop/login1',
+      'org.freedesktop.login1.Manager.PowerOff',
+      ...args
+    ]
 
-  const powerOffByDbus = dbusBind(
-    '--system',
-    'org.freedesktop.login1',
-    '/org/freedesktop/login1',
-    'org.freedesktop.login1.Manager',
-    'PowerOff',
-    ['boolean']
-  )
+    Logger.debug('execa:dbus-send:params', ...params)
+    const { stdout, stderr, exitCode } = await execa('dbus-send', params)
+    if (exitCode !== 0) {
+      throw new Error(stderr)
+    }
 
-  async function powerOff(interactive = false) {
-    await powerOffByDbus(interactive)
+    if (stdout) {
+      Logger.debug('execa:dbus-send:output', stdout)
+    }
   }
 
   return {

diff --git a/src/tests/main/services/system.test.ts b/src/tests/main/services/system.test.ts
@@ -3,6 +3,7 @@ import type { Mock } from 'vitest'
 
 let execaSpy: Mock
 
+let stdout = ''
 let stderr = ''
 let error = null as null | Error
 
@@ -16,18 +17,18 @@ beforeAll(() => {
 })
 
 beforeEach(() => {
+  stdout = ''
   stderr = ''
   error = null
 
   execaSpy.mockImplementation(async () =>
-    error == null
-      ? await Promise.resolve({ stdout: '', stderr, exitCode: stderr ? 1 : 0 })
-      : await Promise.reject(error)
+    error == null ? await Promise.resolve({ stdout, stderr, exitCode: stderr ? 1 : 0 }) : await Promise.reject(error)
   )
 })
 
 describe('powerOff', () => {
   test('success', async () => {
+    stdout = 'shutting down'
     const system = (await import('../../../main/services/system')).default()
 
     await expect(system.powerOff()).resolves.toBeUndefined()