Add support for MDAD playbook templates

Author: jasonlaguidice

.gitignore

@@ -16,11 +16,14 @@ phase*
 # Test binary, built with `go test -c`
 *.test
 
-# Output of the go build
+# Output of the Go build
 /steam
 /build/
 steam-*
 
+# Output of C# build
+steamkit-service
+
 # Go workspace file
 go.work
 

Dockerfile

@@ -16,11 +16,12 @@ WORKDIR /src/SteamBridge
 RUN if [ "$TARGETARCH" = "arm64" ]; then \
         export Protobuf_ProtocFullPath=$(which protoc); \
         dotnet restore --runtime linux-arm64; \
-        dotnet publish -c Release --runtime linux-arm64 --self-contained false -o /app/SteamBridge/bin/Release/net8.0; \
+        dotnet publish -c Release --runtime linux-arm64 --self-contained true -o /app; \
     else \
         dotnet restore --runtime linux-x64; \
-        dotnet publish -c Release --runtime linux-x64 --self-contained false -o /app/SteamBridge/bin/Release/net8.0; \
-    fi
+        dotnet publish -c Release --runtime linux-x64 --self-contained true -o /app; \
+    fi && \
+    mv /app/SteamBridge /app/steamkit-service
 
 # Stage 2: Build Go bridge
 FROM golang:1.24.6-alpine AS go-builder
@@ -57,12 +58,12 @@ RUN adduser -D -s /bin/sh -u 1000 bridge
 
 # Create application directories
 WORKDIR /app
-RUN mkdir -p /app/SteamBridge/bin/Release/net8.0 /app/logs /app/data && \
+RUN mkdir -p /app/logs /app/data /app/config && \
     chown -R bridge:bridge /app
 
 # Copy built applications
 COPY --from=go-builder /src/steam /app/steam
-COPY --from=dotnet-builder /app/SteamBridge/bin/Release/net8.0/ /app/SteamBridge/bin/Release/net8.0/
+COPY --from=dotnet-builder /app/ /app/
 
 # Set proper permissions
 RUN chmod +x /app/steam && \
@@ -93,24 +94,18 @@ if [ ! -w /app/data ]; then
 fi
 
 # Check if config exists
-if [ ! -f /app/data/config.yaml ]; then
-    echo "No config file found at /app/data/config.yaml"
-    echo "Please mount your config file to /app/data/config.yaml"
+if [ ! -f /app/config/config.yaml ]; then
+    echo "No config file found at /app/config/config.yaml"
+    echo "Please mount your config file to /app/config/config.yaml"
     echo "You can use the example config as a starting point:"
-    echo "  docker run -v /path/to/config.yaml:/app/data/config.yaml ..."
+    echo "  docker run -v /path/to/config.yaml:/app/config/config.yaml ..."
     exit 1
 fi
 
 # Start the bridge
 echo "Starting Matrix Steam Bridge..."
 
-# Check if config needs steam_bridge_path fix for Docker
-if grep -q "steam_bridge_path: ./SteamBridge" /app/data/config.yaml 2>/dev/null; then
-    echo "Fixing steam_bridge_path for Docker environment..."
-    sed -i 's|steam_bridge_path: ./SteamBridge|steam_bridge_path: /app/SteamBridge|g' /app/data/config.yaml
-fi
-
-exec /app/steam -c /app/data/config.yaml "$@"
+exec /app/steam -c /app/config/config.yaml "$@"
 EOF
 
 RUN chmod +x /app/entrypoint.sh && chown bridge:bridge /app/entrypoint.sh
@@ -119,9 +114,9 @@ RUN chmod +x /app/entrypoint.sh && chown bridge:bridge /app/entrypoint.sh
 USER bridge
 
 # Set volumes
-VOLUME ["/app/data", "/app/logs"]
+VOLUME ["/app/config", "/app/data", "/app/logs"]
 
-# Default working directory for mounted configs
-WORKDIR /app/data
+# Default working directory
+WORKDIR /app
 
 ENTRYPOINT ["/app/entrypoint.sh"]

SteamBridge/SteamBridge.csproj

@@ -5,6 +5,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <PublishSingleFile>true</PublishSingleFile>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
   <ItemGroup>

build.sh

@@ -11,13 +11,51 @@ fi
 
 echo "Building SteamBridge C# service..."
 cd SteamBridge
-dotnet build --configuration Release
+
+# Detect platform and set appropriate runtime and executable name
+case "$(uname -s)" in
+    MINGW*|CYGWIN*|MSYS*)
+        RUNTIME="win-x64"
+        EXEC_NAME="steamkit-service.exe"
+        SOURCE_BINARY="SteamBridge.exe"
+        ;;
+    Darwin*)
+        case "$(uname -m)" in
+            arm64)
+                RUNTIME="osx-arm64"
+                ;;
+            *)
+                RUNTIME="osx-x64"
+                ;;
+        esac
+        EXEC_NAME="steamkit-service"
+        SOURCE_BINARY="SteamBridge"
+        ;;
+    *)
+        case "$(uname -m)" in
+            aarch64|arm64)
+                RUNTIME="linux-arm64"
+                ;;
+            *)
+                RUNTIME="linux-x64"
+                ;;
+        esac
+        EXEC_NAME="steamkit-service"
+        SOURCE_BINARY="SteamBridge"
+        ;;
+esac
+
+echo "Building for runtime: $RUNTIME"
+dotnet publish --configuration Release --self-contained true --runtime "$RUNTIME"
 if [ $? -ne 0 ]; then
     echo "Failed to build SteamBridge service"
     exit 1
 fi
 cd ..
 
+echo "Moving SteamBridge binary to root level..."
+mv "SteamBridge/bin/Release/net8.0/$RUNTIME/publish/$SOURCE_BINARY" "./$EXEC_NAME"
+
 echo "Build completed successfully!"
 echo "  - Go bridge: steam"
-echo "  - C# service: SteamBridge/bin/Release/net8.0/SteamBridge.dll"
+echo "  - C# service: $EXEC_NAME"

docker-compose.yml

@@ -3,7 +3,9 @@ services:
     image: ghcr.io/jasonlaguidice/matrix-steam-bridge:latest
     restart: unless-stopped
     volumes:
-      # Mount config and data directory
+      # Mount config directory
+      - ./config:/app/config
+      # Mount data directory
       - ./data:/app/data
       # Mount logs directory
       - ./logs:/app/logs

pkg/connector/connector.go

@@ -6,7 +6,10 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
+	"runtime"
 	"strconv"
+	"strings"
 	"sync"
 	"syscall"
 	"time"
@@ -395,7 +398,25 @@ func (sc *SteamConnector) startSteamBridgeService(ctx context.Context) error {
 	sc.steamProcessCancel = cancel
 
 	// Prepare the command to run the compiled executable
-	cmd := exec.CommandContext(processCtx, "dotnet", "SteamBridge.dll")
+	// Determine platform-specific executable name
+	execName := "steamkit-service"
+	if runtime.GOOS == "windows" {
+		execName += ".exe"
+	}
+	
+	// Ensure we have an absolute path or explicit relative path
+	var execPath string
+	if filepath.IsAbs(sc.Config.Path) {
+		execPath = filepath.Join(sc.Config.Path, execName)
+	} else {
+		// For relative paths, ensure we have an explicit "./" prefix
+		execPath = filepath.Join(sc.Config.Path, execName)
+		if !strings.HasPrefix(execPath, "./") && !strings.HasPrefix(execPath, "../") {
+			execPath = "./" + execPath
+		}
+	}
+	
+	cmd := exec.CommandContext(processCtx, execPath)
 	cmd.Dir = sc.Config.Path
 
 	// Set environment variables including parent PID for monitoring

pkg/connector/example-config.yaml

@@ -1,4 +1,4 @@
-steam_bridge_path: ./SteamBridge/bin/Release/net8.0
+steam_bridge_path: ./
 steam_bridge_address: localhost:50051
 steam_bridge_auto_start: true
 steam_bridge_startup_timeout: 30