Skip to content
Draft
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
74 changes: 73 additions & 1 deletion launcher/core/attach.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,77 @@
package core

func (t *Launcher) Attach() error {
import (
"context"
"crypto/tls"
"fmt"
"github.com/gorilla/websocket"
"github.com/opendexnetwork/opendex-docker/launcher/service/proxy"
"net/url"
"os"
"os/signal"
"time"
)

func (t *Launcher) Attach(endpoint string) error {
// TODO implement here
// supports ws and wss
return nil
}

func (t *Launcher) attachToProxy(ctx context.Context) error {
interrupt := make(chan os.Signal, 1)
signal.Notify(interrupt, os.Interrupt)

s, err := t.GetService("proxy")
if err != nil {
return err
}

params, err := s.GetRpcParams()
if err != nil {
return err
}

port := params.(proxy.RpcParams).Port

u := url.URL{Scheme: "wss", Host: fmt.Sprintf("127.0.0.1:%d", port), Path: "/launcher"}
t.Logger.Debugf("Connecting to %s", u.String())

config := tls.Config{RootCAs: nil, InsecureSkipVerify: true}

dialer := websocket.DefaultDialer
dialer.TLSClientConfig = &config
c, _, err := dialer.Dial(u.String(), nil)
if err != nil {
return err
}
defer c.Close()

t.Logger.Debugf("Attached to proxy")

done := make(chan struct{})

go func() {
defer close(done)
t.serve(ctx, c)
}()

for {
select {
case <-done:
return nil
case <-interrupt:
t.Logger.Debugf("Interrupted")
err := c.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
if err != nil {
t.Logger.Errorf("write close: %s", err)
return nil
}
select {
case <-done:
case <-time.After(time.Second):
}
return nil
}
}
}
62 changes: 0 additions & 62 deletions launcher/core/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,15 @@ package core
import (
"bytes"
"context"
"crypto/tls"
"encoding/json"
"errors"
"fmt"
"github.com/gorilla/websocket"
"github.com/opendexnetwork/opendex-docker/launcher/service/proxy"
"github.com/opendexnetwork/opendex-docker/launcher/utils"
"golang.org/x/sync/errgroup"
"net/http"
"net/url"
"os"
"os/exec"
"os/signal"
"path/filepath"
"strings"
"sync"
Expand Down Expand Up @@ -367,64 +363,6 @@ func (t *Launcher) upBoltz(ctx context.Context) error {
})
}

func (t *Launcher) attachToProxy(ctx context.Context) error {
interrupt := make(chan os.Signal, 1)
signal.Notify(interrupt, os.Interrupt)

s, err := t.GetService("proxy")
if err != nil {
return err
}

params, err := s.GetRpcParams()
if err != nil {
return err
}

port := params.(proxy.RpcParams).Port

u := url.URL{Scheme: "wss", Host: fmt.Sprintf("127.0.0.1:%d", port), Path: "/launcher"}
t.Logger.Debugf("Connecting to %s", u.String())

config := tls.Config{RootCAs: nil, InsecureSkipVerify: true}

dialer := websocket.DefaultDialer
dialer.TLSClientConfig = &config
c, _, err := dialer.Dial(u.String(), nil)
if err != nil {
return err
}
defer c.Close()

t.Logger.Debugf("Attached to proxy")

done := make(chan struct{})

go func() {
defer close(done)
t.serve(ctx, c)
}()

for {
select {
case <-done:
return nil
case <-interrupt:
t.Logger.Debugf("Interrupted")
err := c.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
if err != nil {
t.Logger.Errorf("write close: %s", err)
return nil
}
select {
case <-done:
case <-time.After(time.Second):
}
return nil
}
}
}

func (t *Launcher) upLayer2(ctx context.Context) error {
g, ctx := errgroup.WithContext(ctx)

Expand Down