Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions backend/vk_calls_oauth_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,6 @@ func (s *vkEdgeSession) obtainVKCallsTokenViaBrowser(ctx context.Context) (vkLeg
select {
case <-waitCtx.Done():
return vkLegacyToken{}, fmt.Errorf("VK Calls OAuth не вернул access token (%s)", lastDiag)
case <-s.waitCh:
return vkLegacyToken{}, fmt.Errorf("окно VK Calls OAuth закрыто (%s)", lastDiag)
case <-time.After(vkEdgePollInterval):
}

Expand Down
2 changes: 0 additions & 2 deletions backend/vk_login_session_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ func waitForLegacyVKSession(ctx context.Context, session *vkEdgeSession) (bool,
select {
case <-ctx.Done():
return false, context.Canceled
case <-session.waitCh:
return false, errors.New("окно авторизации VK закрыто")
case <-time.After(vkEdgePollInterval):
}

Expand Down
11 changes: 9 additions & 2 deletions backend/vk_webview_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ type vkEdgeSession struct {
port int
nextID int64
closed atomic.Bool
cdpClosed atomic.Bool
http *http.Client
userAgent string
}
Expand Down Expand Up @@ -160,9 +161,10 @@ func (s *vkEdgeSession) waitForPageTarget(ctx context.Context) (vkEdgeTarget, er
for {
select {
case <-ctx.Done():
if s.closed.Load() {
return vkEdgeTarget{}, errors.New("Microsoft Edge не предоставил управляемое окно VK после запуска")
}
return vkEdgeTarget{}, errors.New("Microsoft Edge не открыл окно VK вовремя")
case <-s.waitCh:
return vkEdgeTarget{}, errors.New("Microsoft Edge завершился до открытия VK")
default:
}

Expand Down Expand Up @@ -199,6 +201,7 @@ func (s *vkEdgeSession) call(ctx context.Context, method string, params map[stri
_ = s.conn.SetWriteDeadline(time.Now().Add(5 * time.Second))
}
if err := s.conn.WriteJSON(message); err != nil {
s.cdpClosed.Store(true)
return nil, err
}

Expand All @@ -210,6 +213,7 @@ func (s *vkEdgeSession) call(ctx context.Context, method string, params map[stri
}
_, payload, err := s.conn.ReadMessage()
if err != nil {
s.cdpClosed.Store(true)
return nil, err
}
var response vkCDPResponse
Expand Down Expand Up @@ -307,6 +311,9 @@ func (s *vkEdgeSession) navigate(ctx context.Context, targetURL string) error {
}

func (s *vkEdgeSession) exited() bool {
if s.conn != nil {
return s.cdpClosed.Load()
}
return s.closed.Load()
}

Expand Down
74 changes: 74 additions & 0 deletions backend/vk_webview_windows_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
//go:build windows

package backend

import (
"context"
"net"
"net/http"
"net/http/httptest"
"net/url"
"strconv"
"testing"
"time"

"github.com/gorilla/websocket"
)

func TestWaitForPageTargetAllowsEdgeLauncherHandoff(t *testing.T) {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path != "/json/list" {
http.NotFound(w, r)
return
}
w.Header().Set("Content-Type", "application/json")
_, _ = w.Write([]byte(`[{"type":"page","url":"https://vk.ru/","webSocketDebuggerUrl":"ws://127.0.0.1/devtools/page/1"}]`))
}))
defer server.Close()

parsed, err := url.Parse(server.URL)
if err != nil {
t.Fatal(err)
}
_, portText, err := net.SplitHostPort(parsed.Host)
if err != nil {
t.Fatal(err)
}
port, err := strconv.Atoi(portText)
if err != nil {
t.Fatal(err)
}

session := &vkEdgeSession{
waitCh: make(chan error, 1),
port: port,
http: server.Client(),
}
session.waitCh <- nil
session.closed.Store(true)

ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()

target, err := session.waitForPageTarget(ctx)
if err != nil {
t.Fatalf("launcher handoff must not abort CDP discovery: %v", err)
}
if target.WebSocketDebuggerURL == "" {
t.Fatal("expected a page target after launcher handoff")
}
}

func TestVKEdgeSessionUsesCDPStateAfterLauncherHandoff(t *testing.T) {
session := &vkEdgeSession{conn: &websocket.Conn{}}
session.closed.Store(true)

if session.exited() {
t.Fatal("launcher exit must not mark an attached CDP browser as exited")
}

session.cdpClosed.Store(true)
if !session.exited() {
t.Fatal("CDP closure must mark the browser session as exited")
}
}
Loading