activity.go

@@ -69,7 +69,7 @@ func (d *Client) SetActivity(act *Activity) (string, error) {
 
 	nonce := uuid.New().String()
 
-	_, _, err := validateRaw[Response[any]](Heartbeat, "", "SET_ACTIVITY", nonce)(
+	_, _, err := validateRaw[Response[[]byte]](Heartbeat, "", "SET_ACTIVITY", nonce)(
 		d, Heartbeat, Command[activityArgs]{
 			Arguments: activityArgs{
 				PID:      os.Getpid(),

fetch/apply.go

@@ -105,7 +105,7 @@ func apply() {
 func retry(act *rpcfetch.Activity, s *applyState) (string, error) {
 try:
 	nonce, err := d.SetActivity(act)
-	if errors.Is(err, rpcfetch.ErrAgain) || errors.Is(err, rpcfetch.ErrNonce) {
+	if errors.Is(err, rpcfetch.ErrAgain) {
 		failureState(false)
 		log.Println("retrying in 5 seconds...")
 		time.Sleep(5 * time.Second)

fetch/apply_windows.go

@@ -1,54 +0,0 @@
-package main
-
-import (
-	"log"
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-var (
-	kernel32             = syscall.NewLazyDLL("kernel32.dll")
-	globalMemoryStatusEx = kernel32.NewProc("GlobalMemoryStatusEx")
-)
-
-type globalMemoryStatusExT struct {
-	dwLength     uint32
-	dwMemoryLoad uint32
-	ullTotalPhys uint64
-	ullAvailPhys uint64
-	unused       [5]uint64
-}
-
-func init() {
-	if h, err := os.Hostname(); err != nil {
-		log.Fatalf("error reading hostname: %s", err)
-	} else {
-		hostname = h
-	}
-}
-
-func (s *applyState) populateLoadavg() {
-	if s.loadavg != nil {
-		return
-	}
-
-	// loadavg is unsupported on Windows
-	s.loadavg = &[3]string{"0.00", "0.00", "0.00"}
-}
-
-func (s *applyState) populateMem() {
-	if s.mem != nil {
-		return
-	}
-
-	// failure defaults
-	s.mem = &[2]int{-1, -1}
-
-	v := new(globalMemoryStatusExT)
-	v.dwLength = 64
-	r1, _, err := globalMemoryStatusEx.Call(uintptr(unsafe.Pointer(v)))
-	log.Printf("call to globalMemoryStatusEx, r1=%d, %s", r1, err)
-	s.mem[0] = int(v.ullAvailPhys / (1 << 10))
-	s.mem[1] = int(v.ullTotalPhys / (1 << 10))
-}

fetch/ui.go

@@ -412,7 +412,7 @@ func failureState(ok bool) {
 		statusText.SetText("Retrying in 5 seconds...")
 		profileStatusB.FillColor = colornames.Darkred
 		profileStatusT.SetText("Disconnected")
-		profileActT.SetText("Pending...")
+		profileStatusT.SetText("Pending...")
 		profileT.Hide()
 	}
 }

go.mod

@@ -4,9 +4,7 @@ go 1.22
 
 require (
 	fyne.io/fyne/v2 v2.4.5
-	github.com/Microsoft/go-winio v0.6.2
 	github.com/google/uuid v1.6.0
-	golang.org/x/image v0.17.0
 )
 
 require (
@@ -30,6 +28,7 @@ require (
 	github.com/stretchr/testify v1.8.4 // indirect
 	github.com/tevino/abool v1.2.0 // indirect
 	github.com/yuin/goldmark v1.5.5 // indirect
+	golang.org/x/image v0.17.0 // indirect
 	golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a // indirect
 	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/sys v0.21.0 // indirect

go.sum

@@ -43,8 +43,6 @@ fyne.io/systray v1.10.1-0.20231115130155-104f5ef7839e h1:Hvs+kW2VwCzNToF3FmnIAzm
 fyne.io/systray v1.10.1-0.20231115130155-104f5ef7839e/go.mod h1:oM2AQqGJ1AMo4nNqZFYU8xYygSBZkW2hmdJ7n4yjedE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
-github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=

io.go

@@ -7,10 +7,7 @@ import (
 	"net"
 	"os"
 	"strconv"
-)
-
-var (
-	ErrAgain = errors.New("operation not performed")
+	"syscall"
 )
 
 type Client struct {
@@ -65,7 +62,7 @@ func Raw[T any](d *Client, opcode uint32, payload any) (uint32, T, error) {
 // Raw writes a raw payload to Discord and returns the response opcode and payload
 func (d *Client) Raw(opcode uint32, payload any) (uint32, []byte, error) {
 	opcodeResp, payloadResp, err := d.raw(opcode, payload)
-	if errors.Is(err, errPipe) {
+	if errors.Is(err, syscall.EPIPE) {
 		// clean up as much as possible
 		_ = d.Close()
 		// advise retry

io_unix.go

@@ -1,16 +1,15 @@
-//go:build !windows
-
 package rpcfetch
 
 import (
 	"errors"
 	"io/fs"
 	"net"
-	"syscall"
 	"time"
 )
 
-var errPipe = syscall.EPIPE
+var (
+	ErrAgain = errors.New("operation not performed")
+)
 
 func (d *Client) dial() error {
 	if d.dialed {

io_windows.go

@@ -1,27 +0,0 @@
-package rpcfetch
-
-import (
-	"errors"
-	"github.com/Microsoft/go-winio"
-	"io/fs"
-	"syscall"
-)
-
-var errPipe = syscall.Errno(232)
-
-func (d *Client) dial() error {
-	if d.dialed {
-		panic("attempted to dial on open client")
-	}
-
-	if conn, err := winio.DialPipe(`\\.\pipe\discord-ipc-0`, nil); err != nil {
-		if errors.Is(err, winio.ErrTimeout) || errors.Is(err, fs.ErrNotExist) {
-			return ErrAgain
-		}
-		return err
-	} else {
-		d.conn = conn
-		d.dialed = true
-	}
-	return nil
-}

rpc.go

@@ -68,9 +68,6 @@ func (p payload) traceCommand(command string) *string {
 }
 
 func (p payload) nonce(n string) bool {
-	if n == "initial-ready" {
-		return true
-	}
 	return p.Nonce == n
 }