From da37a289516b249c8147b74d4f44a51446d830bf Mon Sep 17 00:00:00 2001
From: Viktor Liu <viktor@netbird.io>
Date: Sun, 17 May 2026 09:48:06 +0200
Subject: [PATCH] Exclude VNC server from js, ios, and android builds

---
 client/internal/engine_vnc.go              |  2 ++
 client/internal/engine_vnc_stub.go         | 18 ++++++++++--------
 client/vnc/server/capture_fb_unix.go       |  2 +-
 client/vnc/server/capture_x11.go           |  2 +-
 client/vnc/server/coalesce_test.go         |  2 ++
 client/vnc/server/copyrect.go              |  2 ++
 client/vnc/server/copyrect_test.go         |  2 ++
 client/vnc/server/input_uinput_unix.go     |  2 +-
 client/vnc/server/input_x11.go             |  2 +-
 client/vnc/server/pseudo_encodings_test.go |  2 ++
 client/vnc/server/rfb.go                   |  2 ++
 client/vnc/server/rfb_bench_test.go        |  2 ++
 client/vnc/server/scancodes.go             |  2 ++
 client/vnc/server/scancodes_test.go        |  2 ++
 client/vnc/server/server.go                |  2 ++
 client/vnc/server/server_stub.go           | 21 ---------------------
 client/vnc/server/server_test.go           |  2 ++
 client/vnc/server/server_x11.go            |  2 +-
 client/vnc/server/session.go               |  2 ++
 client/vnc/server/stubs.go                 |  2 ++
 client/vnc/server/swizzle.go               |  2 ++
 client/vnc/server/tight_test.go            |  2 ++
 client/vnc/server/virtual_x11.go           |  2 +-
 23 files changed, 46 insertions(+), 35 deletions(-)
 delete mode 100644 client/vnc/server/server_stub.go

diff --git a/client/internal/engine_vnc.go b/client/internal/engine_vnc.go
index a7d9b1012..d162f27cb 100644
--- a/client/internal/engine_vnc.go
+++ b/client/internal/engine_vnc.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package internal
 
 import (
diff --git a/client/internal/engine_vnc_stub.go b/client/internal/engine_vnc_stub.go
index 8ef16803d..b1d0ac262 100644
--- a/client/internal/engine_vnc_stub.go
+++ b/client/internal/engine_vnc_stub.go
@@ -1,13 +1,15 @@
-//go:build (!windows && !darwin && !freebsd && !(linux && !android)) || (darwin && ios)
+//go:build js || ios || android
 
 package internal
 
-import vncserver "github.com/netbirdio/netbird/client/vnc/server"
+import (
+	mgmProto "github.com/netbirdio/netbird/shared/management/proto"
+)
 
-func newPlatformVNC() (vncserver.ScreenCapturer, vncserver.InputInjector, bool) {
-	return nil, nil, false
-}
+type vncServer interface{}
 
-func vncNeedsServiceMode() bool {
-	return false
-}
+func (e *Engine) updateVNC(_ *mgmProto.SSHConfig) error { return nil }
+
+func (e *Engine) updateVNCServerAuth(_ *mgmProto.VNCAuth) {}
+
+func (e *Engine) stopVNCServer() error { return nil }
diff --git a/client/vnc/server/capture_fb_unix.go b/client/vnc/server/capture_fb_unix.go
index da57dcc2c..01981371f 100644
--- a/client/vnc/server/capture_fb_unix.go
+++ b/client/vnc/server/capture_fb_unix.go
@@ -1,4 +1,4 @@
-//go:build (linux && !android) || freebsd
+//go:build unix && !darwin && !ios && !android
 
 package server
 
diff --git a/client/vnc/server/capture_x11.go b/client/vnc/server/capture_x11.go
index d108aada1..fd3eb5859 100644
--- a/client/vnc/server/capture_x11.go
+++ b/client/vnc/server/capture_x11.go
@@ -1,4 +1,4 @@
-//go:build (linux && !android) || freebsd
+//go:build unix && !darwin && !ios && !android
 
 package server
 
diff --git a/client/vnc/server/coalesce_test.go b/client/vnc/server/coalesce_test.go
index f37bc9eee..08632922b 100644
--- a/client/vnc/server/coalesce_test.go
+++ b/client/vnc/server/coalesce_test.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package server
 
 import (
diff --git a/client/vnc/server/copyrect.go b/client/vnc/server/copyrect.go
index b0356a37e..97d2756ae 100644
--- a/client/vnc/server/copyrect.go
+++ b/client/vnc/server/copyrect.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package server
 
 import (
diff --git a/client/vnc/server/copyrect_test.go b/client/vnc/server/copyrect_test.go
index 8b5691b56..51f0d23b5 100644
--- a/client/vnc/server/copyrect_test.go
+++ b/client/vnc/server/copyrect_test.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package server
 
 import (
diff --git a/client/vnc/server/input_uinput_unix.go b/client/vnc/server/input_uinput_unix.go
index e9a89f3dc..4b70594f2 100644
--- a/client/vnc/server/input_uinput_unix.go
+++ b/client/vnc/server/input_uinput_unix.go
@@ -1,4 +1,4 @@
-//go:build (linux && !android) || freebsd
+//go:build unix && !darwin && !ios && !android
 
 package server
 
diff --git a/client/vnc/server/input_x11.go b/client/vnc/server/input_x11.go
index ada791ce8..60a325806 100644
--- a/client/vnc/server/input_x11.go
+++ b/client/vnc/server/input_x11.go
@@ -1,4 +1,4 @@
-//go:build (linux && !android) || freebsd
+//go:build unix && !darwin && !ios && !android
 
 package server
 
diff --git a/client/vnc/server/pseudo_encodings_test.go b/client/vnc/server/pseudo_encodings_test.go
index a319227c5..965e82432 100644
--- a/client/vnc/server/pseudo_encodings_test.go
+++ b/client/vnc/server/pseudo_encodings_test.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package server
 
 import "testing"
diff --git a/client/vnc/server/rfb.go b/client/vnc/server/rfb.go
index 136b5599b..57f9c21bc 100644
--- a/client/vnc/server/rfb.go
+++ b/client/vnc/server/rfb.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package server
 
 import (
diff --git a/client/vnc/server/rfb_bench_test.go b/client/vnc/server/rfb_bench_test.go
index a835d56e9..fb0f6ac75 100644
--- a/client/vnc/server/rfb_bench_test.go
+++ b/client/vnc/server/rfb_bench_test.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package server
 
 import (
diff --git a/client/vnc/server/scancodes.go b/client/vnc/server/scancodes.go
index 2016bbc45..54db42a63 100644
--- a/client/vnc/server/scancodes.go
+++ b/client/vnc/server/scancodes.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package server
 
 // QEMU Extended Key Event carries hardware scancodes encoded as PC AT Set 1.
diff --git a/client/vnc/server/scancodes_test.go b/client/vnc/server/scancodes_test.go
index 1c6beafa6..5479aa66f 100644
--- a/client/vnc/server/scancodes_test.go
+++ b/client/vnc/server/scancodes_test.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package server
 
 import "testing"
diff --git a/client/vnc/server/server.go b/client/vnc/server/server.go
index 64d8e6e7e..1bda413e8 100644
--- a/client/vnc/server/server.go
+++ b/client/vnc/server/server.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package server
 
 import (
diff --git a/client/vnc/server/server_stub.go b/client/vnc/server/server_stub.go
deleted file mode 100644
index e6ace1a27..000000000
--- a/client/vnc/server/server_stub.go
+++ /dev/null
@@ -1,21 +0,0 @@
-//go:build (!windows && !darwin && !freebsd && !(linux && !android)) || (darwin && ios)
-
-package server
-
-func (s *Server) platformInit() {
-	// no-op on unsupported platforms
-}
-
-// serviceAcceptLoop is not supported on non-Windows platforms.
-func (s *Server) serviceAcceptLoop() {
-	s.log.Warn("service mode not supported on this platform, falling back to direct mode")
-	s.acceptLoop()
-}
-
-func (s *Server) platformSessionManager() virtualSessionManager {
-	return nil
-}
-
-func (s *Server) platformShutdown() {
-	// no-op on this platform
-}
diff --git a/client/vnc/server/server_test.go b/client/vnc/server/server_test.go
index 9776667af..db8dbce53 100644
--- a/client/vnc/server/server_test.go
+++ b/client/vnc/server/server_test.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package server
 
 import (
diff --git a/client/vnc/server/server_x11.go b/client/vnc/server/server_x11.go
index 6c0b6b643..6e6c53fcb 100644
--- a/client/vnc/server/server_x11.go
+++ b/client/vnc/server/server_x11.go
@@ -1,4 +1,4 @@
-//go:build (linux && !android) || freebsd
+//go:build unix && !darwin && !ios && !android
 
 package server
 
diff --git a/client/vnc/server/session.go b/client/vnc/server/session.go
index cd4e89cd2..e8d9a5904 100644
--- a/client/vnc/server/session.go
+++ b/client/vnc/server/session.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package server
 
 import (
diff --git a/client/vnc/server/stubs.go b/client/vnc/server/stubs.go
index d8441751a..0417252e0 100644
--- a/client/vnc/server/stubs.go
+++ b/client/vnc/server/stubs.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package server
 
 import (
diff --git a/client/vnc/server/swizzle.go b/client/vnc/server/swizzle.go
index 4b34ed63e..e94a933b6 100644
--- a/client/vnc/server/swizzle.go
+++ b/client/vnc/server/swizzle.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package server
 
 import "unsafe"
diff --git a/client/vnc/server/tight_test.go b/client/vnc/server/tight_test.go
index 698f703e8..808c1b01a 100644
--- a/client/vnc/server/tight_test.go
+++ b/client/vnc/server/tight_test.go
@@ -1,3 +1,5 @@
+//go:build !js && !ios && !android
+
 package server
 
 import (
diff --git a/client/vnc/server/virtual_x11.go b/client/vnc/server/virtual_x11.go
index 4575a0aab..bc2b426c2 100644
--- a/client/vnc/server/virtual_x11.go
+++ b/client/vnc/server/virtual_x11.go
@@ -1,4 +1,4 @@
-//go:build (linux && !android) || freebsd
+//go:build unix && !darwin && !ios && !android
 
 package server