diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0299d1b..dffb299 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,38 +46,6 @@ jobs: name: olcrtc-cli-binaries path: build/ - build-ui: - name: Build UI (${{ matrix.os }}) - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - steps: - - uses: actions/checkout@v4 - - - name: Set up Go - uses: actions/setup-go@v5 - with: - go-version: '1.25.x' - - - name: Install Linux Dependencies (Fyne) - if: runner.os == 'Linux' - run: | - sudo apt-get update - sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev libwayland-dev libx11-dev - - - name: Install Mage - run: go install github.com/magefile/mage@latest - - - name: Build UI - run: mage buildUI - - - name: Upload UI Artifact - uses: actions/upload-artifact@v4 - with: - name: olcrtc-ui-${{ runner.os }} - path: build/ - build-android: name: Build Android (AAR) runs-on: ubuntu-latest diff --git a/asset/logo.png b/asset/logo.png deleted file mode 100644 index bd96010..0000000 Binary files a/asset/logo.png and /dev/null differ diff --git a/asset/logod.png b/asset/logod.png deleted file mode 100644 index f4507d7..0000000 Binary files a/asset/logod.png and /dev/null differ diff --git a/asset/logor.png b/asset/logor.png deleted file mode 100644 index fd1075c..0000000 Binary files a/asset/logor.png and /dev/null differ diff --git a/magefile.go b/magefile.go index 7fc94f2..3e61fed 100644 --- a/magefile.go +++ b/magefile.go @@ -27,9 +27,9 @@ var ( goarch = envOr("GOARCH", runtime.GOARCH) ) -// Build builds both olcrtc CLI and UI binaries. +// Build builds the olcrtc CLI binary. func Build() error { - mg.Deps(BuildCLI, BuildUI) + mg.Deps(BuildCLI) return nil } @@ -39,11 +39,6 @@ func BuildCLI() error { return buildBinary("olcrtc", "./cmd/olcrtc", goos, goarch) } -// BuildUI builds the Fyne desktop UI binary. -func BuildUI() error { - return buildUIBinary(goos, goarch) -} - // Cross builds olcrtc for all supported platforms. func Cross() error { mg.Deps(Deps) @@ -153,40 +148,6 @@ func buildBinary(name, pkg, os_, arch string) error { return sh.RunWithV(env, goexe, args...) } -func buildUIBinary(os_, arch string) error { - if err := ensureBuildDir(); err != nil { - return err - } - - ext := "" - if os_ == "windows" { - ext = ".exe" - } - outName := fmt.Sprintf("%s-%s-%s%s", "olcrtc-ui", os_, arch, ext) - absOut, err := filepath.Abs(filepath.Join(buildDir, outName)) - if err != nil { - return err - } - - fmt.Printf("building olcrtc-ui (%s/%s)\n", os_, arch) - - cmd := exec.Command(goexe, "build", - "-trimpath", - "-ldflags", ldflags, - "-o", absOut, - ".", - ) - cmd.Dir = "ui" - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - cmd.Env = append(os.Environ(), - "GOOS="+os_, - "GOARCH="+arch, - ) - - return cmd.Run() -} - func ensureBuildDir() error { return os.MkdirAll(buildDir, 0o755) } diff --git a/readme.md b/readme.md index f504df9..8b15dbe 100644 --- a/readme.md +++ b/readme.md @@ -41,9 +41,6 @@ mage buildCLI # build cli with b codec, clones b repo, builds libb.so, compiles with -tags b mage buildCLIB -# build ui only -mage buildUI - # cross-compile for linux / windows / darwin mage cross diff --git a/ui/config.go b/ui/config.go deleted file mode 100644 index df008dd..0000000 --- a/ui/config.go +++ /dev/null @@ -1,157 +0,0 @@ -package main - -import ( - "encoding/json" - "fmt" - "os" - "path/filepath" - "regexp" - "strconv" - "strings" -) - -type Config struct { - Os string - DNS string `json:"dns"` - EncryptionKey string `json:"encryption_key"` - SocksPort string `json:"socks_port"` - ConferenceID string `json:"conference_id"` - RoomPassword string `json:"room_password"` - Provider string `json:"provider"` -} - -func isValidPort(portStr string) bool { - portStr = strings.TrimSpace(portStr) - if portStr == "" { - return false - } - port, err := strconv.Atoi(portStr) - if err != nil { - return false - } - return port > 0 && port <= 65535 -} - -func isValidConferenceID(conferenceID string) bool { - conferenceID = strings.TrimSpace(conferenceID) - if conferenceID == "" { - return false - } - matched, err := regexp.MatchString(`^\d+$`, conferenceID) - if err != nil { - return false - } - return matched -} - -func (p *Program) getConfigPath() string { - dir, err := os.UserConfigDir() - if err != nil { - log("WARNING: Could not get system config directory: %v", err) - return "config.json" - } - configDir := filepath.Join(dir, "olcrtc") - if err := os.MkdirAll(configDir, 0755); err != nil { - log("WARNING: Could not create config directory: %v", err) - } - return filepath.Join(configDir, "config.json") -} - -func (p *Program) loadConfig() *Config { - configPath := p.getConfigPath() - log("Loading config from: %s", configPath) - cfg := &Config{ - DNS: "1.1.1.1", - EncryptionKey: "", - SocksPort: "1080", - ConferenceID: "", - RoomPassword: "", - Provider: "telemost", - } - data, err := os.ReadFile(configPath) - if err != nil { - if os.IsNotExist(err) { - log("Config file not found. Using default configuration.") - } else { - log("WARNING: Could not read config file: %v", err) - } - return cfg - } - if err := json.Unmarshal(data, cfg); err != nil { - log("WARNING: Could not parse config file: %v", err) - return cfg - } - cfg.ConferenceID = strings.ReplaceAll(cfg.ConferenceID, " ", "") - - // Validation check for telemost specifically if it was stored - if cfg.Provider == "telemost" && !isValidConferenceID(cfg.ConferenceID) { - log("WARNING: Invalid conference ID in config (must be numbers only for telemost)") - cfg.ConferenceID = "" - } - - if !isValidPort(cfg.SocksPort) { - log("WARNING: Invalid port in config, using default: 1080") - cfg.SocksPort = "1080" - } - log("Config loaded successfully") - return cfg -} - -func (p *Program) saveConfig(dns, encryptionKey, socksPort, conferenceID, roomPassword, provider string) { - log("Saving configuration...") - - conferenceID = strings.ReplaceAll(conferenceID, " ", "") - roomPassword = strings.ReplaceAll(roomPassword, " ", "") - - if !isValidPort(socksPort) { - log("ERROR: Invalid port: %s", socksPort) - p.showError(fmt.Errorf("invalid port: must be between 1 and 65535")) - return - } - - if provider == "telemost" && !isValidConferenceID(conferenceID) { - log("ERROR: Invalid conference ID for telemost: %s", conferenceID) - p.showError(fmt.Errorf("invalid conference ID: must contain only numbers for telemost")) - return - } - - if (provider == "jazz" || provider == "wbstream") && conferenceID == "" { - log("ERROR: Room ID required for %s provider", provider) - p.showError(fmt.Errorf("room ID required for %s provider", provider)) - return - } - - if provider != "telemost" && provider != "jazz" && provider != "wbstream" { - log("ERROR: Invalid provider: %s", provider) - p.showError(fmt.Errorf("invalid provider: must be telemost, jazz or wbstream")) - return - } - - currentOs := p.Config.Os - - p.Config = &Config{ - Os: currentOs, - DNS: dns, - EncryptionKey: encryptionKey, - SocksPort: socksPort, - ConferenceID: conferenceID, - RoomPassword: roomPassword, - Provider: provider, - } - - configPath := p.getConfigPath() - data, err := json.MarshalIndent(p.Config, "", " ") - if err != nil { - log("ERROR: Could not marshal config: %v", err) - p.showError(err) - return - } - - if err := os.WriteFile(configPath, data, 0644); err != nil { - log("ERROR: Could not write config file: %v", err) - p.showError(err) - return - } - - log("Configuration saved to: %s", configPath) -} diff --git a/ui/go.mod b/ui/go.mod deleted file mode 100644 index 020ef0e..0000000 --- a/ui/go.mod +++ /dev/null @@ -1,40 +0,0 @@ -module github.com/openlibrecommunity/olcrtc/ui - -go 1.26.1 - -require fyne.io/fyne/v2 v2.7.3 - -require ( - fyne.io/systray v1.12.0 // indirect - github.com/BurntSushi/toml v1.5.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/fredbi/uri v1.1.1 // indirect - github.com/fsnotify/fsnotify v1.9.0 // indirect - github.com/fyne-io/gl-js v0.2.0 // indirect - github.com/fyne-io/glfw-js v0.3.0 // indirect - github.com/fyne-io/image v0.1.1 // indirect - github.com/fyne-io/oksvg v0.2.0 // indirect - github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect - github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a // indirect - github.com/go-text/render v0.2.0 // indirect - github.com/go-text/typesetting v0.3.3 // indirect - github.com/godbus/dbus/v5 v5.1.0 // indirect - github.com/hack-pad/go-indexeddb v0.3.2 // indirect - github.com/hack-pad/safejs v0.1.0 // indirect - github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade // indirect - github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect - github.com/kr/text v0.2.0 // indirect - github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect - github.com/nicksnyder/go-i18n/v2 v2.5.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rymdport/portal v0.4.2 // indirect - github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect - github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect - github.com/stretchr/testify v1.11.1 // indirect - github.com/yuin/goldmark v1.7.8 // indirect - golang.org/x/image v0.24.0 // indirect - golang.org/x/net v0.35.0 // indirect - golang.org/x/sys v0.30.0 // indirect - golang.org/x/text v0.22.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect -) diff --git a/ui/go.sum b/ui/go.sum deleted file mode 100644 index 7988b55..0000000 --- a/ui/go.sum +++ /dev/null @@ -1,80 +0,0 @@ -fyne.io/fyne/v2 v2.7.3 h1:xBT/iYbdnNHONWO38fZMBrVBiJG8rV/Jypmy4tVfRWE= -fyne.io/fyne/v2 v2.7.3/go.mod h1:gu+dlIcZWSzKZmnrY8Fbnj2Hirabv2ek+AKsfQ2bBlw= -fyne.io/systray v1.12.0 h1:CA1Kk0e2zwFlxtc02L3QFSiIbxJ/P0n582YrZHT7aTM= -fyne.io/systray v1.12.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs= -github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= -github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g= -github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw= -github.com/fredbi/uri v1.1.1 h1:xZHJC08GZNIUhbP5ImTHnt5Ya0T8FI2VAwI/37kh2Ko= -github.com/fredbi/uri v1.1.1/go.mod h1:4+DZQ5zBjEwQCDmXW5JdIjz0PUA+yJbvtBv+u+adr5o= -github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= -github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= -github.com/fyne-io/gl-js v0.2.0 h1:+EXMLVEa18EfkXBVKhifYB6OGs3HwKO3lUElA0LlAjs= -github.com/fyne-io/gl-js v0.2.0/go.mod h1:ZcepK8vmOYLu96JoxbCKJy2ybr+g1pTnaBDdl7c3ajI= -github.com/fyne-io/glfw-js v0.3.0 h1:d8k2+Y7l+zy2pc7wlGRyPfTgZoqDf3AI4G+2zOWhWUk= -github.com/fyne-io/glfw-js v0.3.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk= -github.com/fyne-io/image v0.1.1 h1:WH0z4H7qfvNUw5l4p3bC1q70sa5+YWVt6HCj7y4VNyA= -github.com/fyne-io/image v0.1.1/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM= -github.com/fyne-io/oksvg v0.2.0 h1:mxcGU2dx6nwjJsSA9PCYZDuoAcsZ/OuJlvg/Q9Njfo8= -github.com/fyne-io/oksvg v0.2.0/go.mod h1:dJ9oEkPiWhnTFNCmRgEze+YNprJF7YRbpjgpWS4kzoI= -github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA= -github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-text/render v0.2.0 h1:LBYoTmp5jYiJ4NPqDc2pz17MLmA3wHw1dZSVGcOdeAc= -github.com/go-text/render v0.2.0/go.mod h1:CkiqfukRGKJA5vZZISkjSYrcdtgKQWRa2HIzvwNN5SU= -github.com/go-text/typesetting v0.3.3 h1:ihGNJU9KzdK2QRDy1Bm7FT5RFQoYb+3n3EIhI/4eaQc= -github.com/go-text/typesetting v0.3.3/go.mod h1:vIRUT25mLQaSh4C8H/lIsKppQz/Gdb8Pu/tNwpi52ts= -github.com/go-text/typesetting-utils v0.0.0-20250618110550-c820a94c77b8 h1:4KCscI9qYWMGTuz6BpJtbUSRzcBrUSSE0ENMJbNSrFs= -github.com/go-text/typesetting-utils v0.0.0-20250618110550-c820a94c77b8/go.mod h1:3/62I4La/HBRX9TcTpBj4eipLiwzf+vhI+7whTc9V7o= -github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= -github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y= -github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= -github.com/hack-pad/go-indexeddb v0.3.2 h1:DTqeJJYc1usa45Q5r52t01KhvlSN02+Oq+tQbSBI91A= -github.com/hack-pad/go-indexeddb v0.3.2/go.mod h1:QvfTevpDVlkfomY498LhstjwbPW6QC4VC/lxYb0Kom0= -github.com/hack-pad/safejs v0.1.0 h1:qPS6vjreAqh2amUqj4WNG1zIw7qlRQJ9K10eDKMCnE8= -github.com/hack-pad/safejs v0.1.0/go.mod h1:HdS+bKF1NrE72VoXZeWzxFOVQVUSqZJAG0xNCnb+Tio= -github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade h1:FmusiCI1wHw+XQbvL9M+1r/C3SPqKrmBaIOYwVfQoDE= -github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o= -github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M= -github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= -github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= -github.com/nicksnyder/go-i18n/v2 v2.5.1 h1:IxtPxYsR9Gp60cGXjfuR/llTqV8aYMsC472zD0D1vHk= -github.com/nicksnyder/go-i18n/v2 v2.5.1/go.mod h1:DrhgsSDZxoAfvVrBVLXoxZn/pN5TXqaDbq7ju94viiQ= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA= -github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rymdport/portal v0.4.2 h1:7jKRSemwlTyVHHrTGgQg7gmNPJs88xkbKcIL3NlcmSU= -github.com/rymdport/portal v0.4.2/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4= -github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE= -github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q= -github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ= -github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE= -github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= -github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic= -github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= -golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ= -golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8= -golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= -golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= -golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= -golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= -golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/ui/logger.go b/ui/logger.go deleted file mode 100644 index f6fd5f7..0000000 --- a/ui/logger.go +++ /dev/null @@ -1,23 +0,0 @@ -package main - -import "fmt" - -var currentProgram *Program - -func log(msg string, args ...interface{}) { - var formattedMsg string - if len(args) > 0 { - formattedMsg = fmt.Sprintf(msg, args...) - fmt.Println(formattedMsg) - } else { - formattedMsg = msg - fmt.Println(msg) - } - - if currentProgram != nil && currentProgram.LogsChannel != nil { - select { - case currentProgram.LogsChannel <- formattedMsg: - default: - } - } -} diff --git a/ui/main.go b/ui/main.go deleted file mode 100644 index 021cbca..0000000 --- a/ui/main.go +++ /dev/null @@ -1,129 +0,0 @@ -package main - -import ( - "os/exec" - "runtime" - "sync" - - "image/color" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/app" - "fyne.io/fyne/v2/canvas" - "fyne.io/fyne/v2/container" - "fyne.io/fyne/v2/theme" - "fyne.io/fyne/v2/widget" -) - -type Program struct { - App fyne.App - ParentWindow fyne.Window - RunString string - RunCheck *widget.Check - Config *Config - Cmd *exec.Cmd - CmdMu sync.Mutex - LogsArea *widget.RichText - LogsText *widget.Label - LogsChannel chan string - LogsContent string - LogsMu sync.Mutex -} - -func main() { - log("Starting application...") - program := NewProgram() - program.Run() -} - -func NewProgram() *Program { - log("Initializing program...") - uOs := runtime.GOOS - log("RUNTIME: Detected OS - %v", uOs) - p := &Program{ - App: app.New(), - LogsChannel: make(chan string, 100), - } - currentProgram = p - cfg := p.loadConfig() - cfg.Os = uOs - p.Config = cfg - p.buildRunString(cfg.ConferenceID, cfg.RoomPassword, cfg.EncryptionKey, cfg.SocksPort, cfg.DNS, cfg.Provider) - return p -} - -func (p *Program) Run() { - log("Creating main window...") - w := p.App.NewWindow("OlcRTC") - w.CenterOnScreen() - w.Resize(fyne.NewSize(1280, 700)) - w.SetOnClosed(p.olcrtcStop) - p.ParentWindow = w - - settingsBtn := widget.NewButtonWithIcon("Settings", theme.SettingsIcon(), func() { - log("Settings button clicked") - p.settingsWindow() - }) - - p.RunCheck = widget.NewCheck("Run", func(b bool) { - if b { - log("Run enabled") - p.olcrtcRun() - } else { - log("Run disabled") - p.olcrtcStop() - } - }) - - // Create logs display area - p.LogsText = widget.NewLabel("") - p.LogsText.Wrapping = fyne.TextWrapWord - logsScroll := container.NewScroll(p.LogsText) - logsScroll.SetMinSize(fyne.NewSize(0, 300)) - - // Create styled logs box with darker background - bgRect := canvas.NewRectangle(color.NRGBA{R: 40, G: 40, B: 40, A: 255}) - logsWithPadding := container.NewBorder( - widget.NewLabel("Logs"), - nil, nil, nil, - logsScroll, - ) - logsBox := container.NewStack( - bgRect, - container.NewBorder( - nil, nil, nil, nil, - logsWithPadding, - ), - ) - - topBar := container.NewBorder( - settingsBtn, - p.RunCheck, nil, nil, - ) - - mainContent := container.NewVBox( - topBar, - logsBox, - ) - - w.SetContent(mainContent) - - go p.listenLogs() - - log("Window created and running...") - w.ShowAndRun() -} - -func (p *Program) listenLogs() { - for logMsg := range p.LogsChannel { - fyne.Do(func() { - if p.LogsText != nil { - p.LogsMu.Lock() - p.LogsContent += logMsg + "\n" - logsToDisplay := p.LogsContent - p.LogsMu.Unlock() - p.LogsText.SetText(logsToDisplay) - } - }) - } -} diff --git a/ui/process.go b/ui/process.go deleted file mode 100644 index 032b08b..0000000 --- a/ui/process.go +++ /dev/null @@ -1,150 +0,0 @@ -package main - -import ( - "bufio" - "fmt" - "io" - "os" - "os/exec" - "time" -) - -func pipeOutput(reader io.ReadCloser, prefix string) { - defer reader.Close() - scanner := bufio.NewScanner(reader) - for scanner.Scan() { - line := scanner.Text() - if prefix != "" { - log("olcrtc %s: %s", prefix, line) - } else { - log("olcrtc: %s", line) - } - } - if err := scanner.Err(); err != nil { - log("ERROR: Failed to read %s: %v", prefix, err) - } -} - -func (p *Program) olcrtcRun() { - log("%s - Starting olcrtc process...", time.Now().Format("2006-01-02 15:04:05")) - if p.RunString == "" { - log("ERROR: Run string is empty. Please configure settings first.") - p.showError(fmt.Errorf("run string is empty - please configure settings")) - p.MarkUncheck() - return - } - - var cmd *exec.Cmd - if p.Config.Os == "windows" { - cmd = exec.Command("cmd.exe", "/C", p.RunString) - } else { - cmd = exec.Command("sh", "-c", p.RunString) - } - - stdout, err := cmd.StdoutPipe() - if err != nil { - log("ERROR: Failed to create stdout pipe: %v", err) - p.showError(err) - p.MarkUncheck() - return - } - - stderr, err := cmd.StderrPipe() - if err != nil { - log("ERROR: Failed to create stderr pipe: %v", err) - p.showError(err) - p.MarkUncheck() - return - } - - p.CmdMu.Lock() - p.Cmd = cmd - err = p.Cmd.Start() - pid := 0 - if err == nil && p.Cmd.Process != nil { - pid = p.Cmd.Process.Pid - } - p.CmdMu.Unlock() - - if err != nil { - log("ERROR: Failed to start olcrtc: %v", err) - p.showError(err) - p.CmdMu.Lock() - p.Cmd = nil - p.CmdMu.Unlock() - p.MarkUncheck() - } else { - log("olcrtc process started (PID: %d)", pid) - - go pipeOutput(stdout, "stdout") - go pipeOutput(stderr, "stderr") - - go func() { - p.CmdMu.Lock() - cmd := p.Cmd - p.CmdMu.Unlock() - - if cmd != nil { - err = cmd.Wait() - if err != nil { - log("olcrtc process exited with error: %v", err) - p.MarkUncheck() - } else { - log("olcrtc process exited successfully") - } - } - - p.CmdMu.Lock() - p.Cmd = nil - p.CmdMu.Unlock() - }() - } -} - -func (p *Program) olcrtcStop() { - log("%s - Stopping olcrtc process...", time.Now().Format("2006-01-02 15:04:05")) - - p.CmdMu.Lock() - cmd := p.Cmd - p.CmdMu.Unlock() - - if cmd == nil || cmd.Process == nil { - log("WARNING: No active olcrtc process to stop") - return - } - - var err error - if p.Config.Os == "windows" { - err = cmd.Process.Kill() - } else { - err = cmd.Process.Signal(os.Interrupt) - } - if err != nil { - log("ERROR: Failed to signal olcrtc: %v", err) - p.showError(err) - return - } - - log("olcrtc process termination signal sent (PID: %d)", cmd.Process.Pid) - - done := make(chan error, 1) - go func() { - done <- cmd.Wait() - }() - - select { - case <-time.After(5 * time.Second): - log("WARNING: Process did not exit gracefully, forcing kill...") - if err := cmd.Process.Kill(); err != nil { - log("ERROR: Failed to kill olcrtc: %v", err) - } else { - log("olcrtc process forcefully killed (PID: %d)", cmd.Process.Pid) - } - case err := <-done: - if err != nil { - log("olcrtc process exited with error: %v", err) - } else { - log("olcrtc process exited gracefully") - } - } -} diff --git a/ui/ui.go b/ui/ui.go deleted file mode 100644 index 5016ddd..0000000 --- a/ui/ui.go +++ /dev/null @@ -1,151 +0,0 @@ -package main - -import ( - "fmt" - "os" - "runtime" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/container" - "fyne.io/fyne/v2/dialog" - "fyne.io/fyne/v2/theme" - "fyne.io/fyne/v2/widget" -) - -func (p *Program) settingsWindow() { - log("Opening settings dialog...") - - providerSelect := widget.NewSelect([]string{"telemost", "jazz", "wbstream"}, nil) - if p.Config.Provider != "" { - providerSelect.SetSelected(p.Config.Provider) - } else { - providerSelect.SetSelected("telemost") - } - - dns := widget.NewEntry() - dns.SetPlaceHolder("1.1.1.1") - if p.Config.DNS != "" { - dns.SetText(p.Config.DNS) - } - - encrpKey := widget.NewEntry() - if p.Config.EncryptionKey != "" { - encrpKey.SetText(p.Config.EncryptionKey) - } - - socksPort := widget.NewEntry() - socksPort.SetPlaceHolder("1080") - if p.Config.SocksPort != "" { - socksPort.SetText(p.Config.SocksPort) - } - - conferenceId := widget.NewEntry() - if p.Config.ConferenceID != "" { - conferenceId.SetText(p.Config.ConferenceID) - } - - roomPassword := widget.NewPasswordEntry() - if p.Config.RoomPassword != "" { - roomPassword.SetText(p.Config.RoomPassword) - } - - roomIdLabel := widget.NewLabel("Room ID (telemost: numbers only, others: any)") - roomPasswordLabel := widget.NewLabel("Room Password (jazz only)") - roomPasswordContainer := container.NewVBox(roomPasswordLabel, roomPassword) - - providerSelect.OnChanged = func(value string) { - log("Provider selected: %s", value) - if value == "jazz" { - roomIdLabel.SetText("Room ID (jazz: any)") - roomPasswordContainer.Show() - } else if value == "wbstream" { - roomIdLabel.SetText("Room ID (wbstream: any)") - roomPasswordContainer.Hide() - } else { - roomIdLabel.SetText("Room ID (telemost: numbers only)") - roomPasswordContainer.Hide() - } - } - - if providerSelect.Selected != "jazz" { - roomPasswordContainer.Hide() - } - - applyBtn := widget.NewButtonWithIcon("Apply", theme.CheckButtonCheckedIcon(), func() { - log("Applying settings...") - p.buildRunString(conferenceId.Text, roomPassword.Text, encrpKey.Text, socksPort.Text, dns.Text, providerSelect.Selected) - p.saveConfig(dns.Text, encrpKey.Text, socksPort.Text, conferenceId.Text, roomPassword.Text, providerSelect.Selected) - }) - - content := container.NewVBox( - widget.NewLabel("Provider"), - providerSelect, - widget.NewLabel("Custom DNS Server"), - dns, - widget.NewLabel("Encryption Key"), - encrpKey, - widget.NewLabel("Socks Port"), - socksPort, - roomIdLabel, - conferenceId, - roomPasswordContainer, - applyBtn, - ) - dialog.ShowCustom("Settings", "Close", content, p.ParentWindow) -} - -func (p *Program) getBinaryName() string { - ext := "" - if p.Config.Os == "windows" { - ext = ".exe" - } - - simpleName := "olcrtc" + ext - archName := fmt.Sprintf("olcrtc-%s-%s%s", p.Config.Os, runtime.GOARCH, ext) - - if _, err := os.Stat(simpleName); err == nil { - if p.Config.Os != "windows" { - return "./" + simpleName - } - return simpleName - } - - if _, err := os.Stat(archName); err == nil { - if p.Config.Os != "windows" { - return "./" + archName - } - return archName - } - - if p.Config.Os != "windows" { - return "./" + simpleName - } - return simpleName -} - -func (p *Program) buildRunString(conferenceId, roomPassword, encryptionKey, socksPort, dns, provider string) { - log("Building run string...") - log(" Provider: %s", provider) - log(" Conference ID: %s", conferenceId) - log(" Room Password: %s", roomPassword) - log(" Encryption Key: %s", encryptionKey) - log(" Socks Port: %s", socksPort) - log(" DNS Server: %s", dns) - - finalRoomId := conferenceId - if provider == "jazz" && roomPassword != "" { - finalRoomId = conferenceId + ":" + roomPassword - } - - binName := p.getBinaryName() - p.RunString = fmt.Sprintf("%s -mode cnc -provider %s -id \"%s\" -key \"%s\" -socks-port %s -dns %s", binName, provider, finalRoomId, encryptionKey, socksPort, dns) - log("Generated command: %s", p.RunString) -} - -func (p *Program) showError(err error) { - dialog.ShowError(err, p.ParentWindow) -} - -func (p *Program) MarkUncheck() { - fyne.Do(func() { p.RunCheck.SetChecked(false) }) -}