1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-24 13:32:50 -05:00

core/server: add generic dbus service

- Add QML client with subscribe/introspect/getprop/setprop/call
- Add CLI helper `dms notify` that allows async calls with action
  handlers.
This commit is contained in:
bbedward
2026-01-17 22:04:58 -05:00
parent 53f5240d41
commit 162ec909da
20 changed files with 1403 additions and 287 deletions

View File

@@ -20,6 +20,7 @@ import (
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness"
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/clipboard"
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups"
serverDbus "github.com/AvengeMedia/DankMaterialShell/core/internal/server/dbus"
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/dwl"
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/evdev"
"github.com/AvengeMedia/DankMaterialShell/core/internal/server/extworkspace"
@@ -65,8 +66,11 @@ var brightnessManager *brightness.Manager
var wlrOutputManager *wlroutput.Manager
var evdevManager *evdev.Manager
var clipboardManager *clipboard.Manager
var dbusManager *serverDbus.Manager
var wlContext *wlcontext.SharedContext
const dbusClientID = "dms-dbus-client"
var capabilitySubscribers syncmap.Map[string, chan ServerInfo]
var cupsSubscribers syncmap.Map[string, bool]
var cupsSubscriberCount atomic.Int32
@@ -363,6 +367,19 @@ func InitializeClipboardManager() error {
return nil
}
func InitializeDbusManager() error {
manager, err := serverDbus.NewManager()
if err != nil {
log.Warnf("Failed to initialize dbus manager: %v", err)
return err
}
dbusManager = manager
log.Info("DBus manager initialized")
return nil
}
func handleConnection(conn net.Conn) {
defer conn.Close()
@@ -440,6 +457,10 @@ func getCapabilities() Capabilities {
caps = append(caps, "clipboard")
}
if dbusManager != nil {
caps = append(caps, "dbus")
}
return Capabilities{Capabilities: caps}
}
@@ -498,6 +519,10 @@ func getServerInfo() ServerInfo {
caps = append(caps, "clipboard")
}
if dbusManager != nil {
caps = append(caps, "dbus")
}
return ServerInfo{
APIVersion: APIVersion,
CLIVersion: CLIVersion,
@@ -1133,6 +1158,31 @@ func handleSubscribe(conn net.Conn, req models.Request) {
}()
}
if shouldSubscribe("dbus") && dbusManager != nil {
wg.Add(1)
dbusChan := dbusManager.SubscribeSignals(dbusClientID)
go func() {
defer wg.Done()
defer dbusManager.UnsubscribeSignals(dbusClientID)
for {
select {
case event, ok := <-dbusChan:
if !ok {
return
}
select {
case eventChan <- ServiceEvent{Service: "dbus", Data: event}:
case <-stopChan:
return
}
case <-stopChan:
return
}
}
}()
}
go func() {
wg.Wait()
close(eventChan)
@@ -1198,6 +1248,9 @@ func cleanupManagers() {
if clipboardManager != nil {
clipboardManager.Close()
}
if dbusManager != nil {
dbusManager.Close()
}
if wlContext != nil {
wlContext.Close()
}
@@ -1490,6 +1543,14 @@ func Start(printDocs bool) error {
}
}()
go func() {
if err := InitializeDbusManager(); err != nil {
log.Warnf("DBus manager unavailable: %v", err)
} else {
notifyCapabilityChange()
}
}()
log.Info("")
log.Infof("Ready! Capabilities: %v", getCapabilities().Capabilities)