cmd/wasm-client: move shared code to core package

Author: kaloudis

cmd/wasm-client/log.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 package main
@@ -61,4 +62,4 @@ func NewGrpcLogLogger(root *build.RotatingLogWriter,
 	return &mailbox.GrpcLogLogger{
 		Logger: logger,
 	}
-}
+}

cmd/wasm-client/main.go

@@ -20,6 +20,7 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/jessevdk/go-flags"
 	"github.com/lightninglabs/faraday/frdrpc"
+	"github.com/lightninglabs/lightning-node-connect/core"
 	"github.com/lightninglabs/lightning-node-connect/mailbox"
 	"github.com/lightninglabs/loop/looprpc"
 	"github.com/lightninglabs/pool/poolrpc"
@@ -63,7 +64,7 @@ var (
 		frdrpc.RegisterFaradayServerJSONCallbacks,
 	}
 
-	perms = getAllMethodPermissions()
+	perms = core.GetAllMethodPermissions()
 
 	jsonCBRegex = regexp.MustCompile("(\\w+)\\.(\\w+)\\.(\\w+)")
 )
@@ -140,7 +141,7 @@ type wasmClient struct {
 
 	lndConn *grpc.ClientConn
 
-	statusChecker func() mailbox.ClientStatus
+	statusChecker func() mailbox.ConnStatus
 
 	mac *macaroon.Macaroon
 
@@ -209,7 +210,7 @@ func (w *wasmClient) ConnectServer(_ js.Value, args []js.Value) interface{} {
 	// in another goroutine here. See https://pkg.go.dev/syscall/js#FuncOf.
 	go func() {
 		var err error
-		statusChecker, lndConnect, err := mailboxRPCConnection(
+		statusChecker, lndConnect, err := core.MailboxRPCConnection(
 			mailboxServer, pairingPhrase, localPriv, remotePub,
 			func(key *btcec.PublicKey) error {
 				return callJsCallback(

cmd/wasm-client/lnd_conn.go renamed to core/lnd_conn.go

@@ -1,22 +1,19 @@
-//go:build js
-// +build js
-
-package main
+package core
 
 import (
 	"context"
 	"strings"
 
-	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/lightninglabs/lightning-node-connect/mailbox"
+	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/lightningnetwork/lnd/keychain"
 	"google.golang.org/grpc"
 )
 
-func mailboxRPCConnection(mailboxServer, pairingPhrase string,
+func MailboxRPCConnection(mailboxServer, pairingPhrase string,
 	localStatic keychain.SingleKeyECDH, remoteStatic *btcec.PublicKey,
 	onRemoteStatic func(key *btcec.PublicKey) error,
-	onAuthData func(data []byte) error) (func() mailbox.ClientStatus,
+	onAuthData func(data []byte) error) (func() mailbox.ConnStatus,
 	func() (*grpc.ClientConn, error), error) {
 
 	words := strings.Split(pairingPhrase, " ")
@@ -30,9 +27,7 @@ func mailboxRPCConnection(mailboxServer, pairingPhrase string,
 	)
 
 	ctx := context.Background()
-	transportConn, err := mailbox.NewWebsocketsClient(
-		ctx, mailboxServer, connData,
-	)
+	transportConn, err := mailbox.NewClient(ctx, connData)
 	if err != nil {
 		return nil, nil, err
 	}

cmd/wasm-client/permissions.go renamed to core/permissions.go

@@ -1,4 +1,4 @@
-package main
+package core
 
 import (
 	"net"
@@ -45,7 +45,7 @@ var (
 
 // getAllMethodPermissions returns a merged map of all litd's method
 // permissions.
-func getAllMethodPermissions() map[string][]bakery.Op {
+func GetAllMethodPermissions() map[string][]bakery.Op {
 	allPerms := make(map[string][]bakery.Op)
 
 	lndMainPerms := lnd.MainRPCServerPermissions()