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

Author: kaloudis

cmd/wasm-client/go.mod

@@ -1,15 +1,15 @@
 module github.com/lightninglabs/lightning-node-connect/cmd/wasm-client
 
 require (
-	github.com/btcsuite/btcd/btcec/v2 v2.2.0
+	github.com/btcsuite/btcd/btcec/v2 v2.2.1
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
 	github.com/golang/protobuf v1.5.2
 	github.com/jessevdk/go-flags v1.4.0
-	github.com/lightninglabs/faraday v0.2.7-alpha.0.20220614135954-0f761430806c
+	github.com/lightninglabs/faraday v0.2.8-alpha.0.20220909105059-fea194ffb084
 	github.com/lightninglabs/lightning-node-connect v0.1.9-alpha.0.20220602120524-e9964c685b18
-	github.com/lightninglabs/loop v0.19.1-beta.0.20220614171321-490fb352ffe9
-	github.com/lightninglabs/pool v0.5.6-alpha.0.20220615075127-160ae4594f4a
-	github.com/lightningnetwork/lnd v0.15.0-beta.rc4
+	github.com/lightninglabs/loop v0.20.1-beta.0.20220916122221-9c3010150016
+	github.com/lightninglabs/pool v0.5.8-alpha
+	github.com/lightningnetwork/lnd v0.15.0-beta.rc6.0.20221005111311-2efc70a5c492
 	google.golang.org/grpc v1.39.0
 	gopkg.in/macaroon-bakery.v2 v2.0.1
 	gopkg.in/macaroon.v2 v2.1.0

cmd/wasm-client/go.sum

@@ -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+)")
 )
@@ -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/main.go

@@ -1,7 +1,4 @@
-//go:build js
-// +build js
-
-package main
+package core
 
 import (
 	"context"
@@ -13,7 +10,9 @@ import (
 	"google.golang.org/grpc"
 )
 
-func mailboxRPCConnection(mailboxServer, pairingPhrase string,
+// MailboxRPCConnection returns a merged map of all litd's method
+// permissions.
+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,

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

@@ -1,4 +1,4 @@
-package main
+package core
 
 import (
 	"net"
@@ -43,9 +43,9 @@ var (
 	}
 )
 
-// getAllMethodPermissions returns a merged map of all litd's method
-// permissions.
-func getAllMethodPermissions() map[string][]bakery.Op {
+// GetAllMethodPermissions returns a mailbox client status and
+// a function to create an lnd client connection
+func GetAllMethodPermissions() map[string][]bakery.Op {
 	allPerms := make(map[string][]bakery.Op)
 
 	lndMainPerms := lnd.MainRPCServerPermissions()

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

@@ -1,20 +1,26 @@
 module github.com/lightninglabs/lightning-node-connect
 
 require (
-	github.com/btcsuite/btcd/btcec/v2 v2.2.0
+	github.com/btcsuite/btcd/btcec/v2 v2.2.1
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
 	github.com/go-errors/errors v1.0.1
+	github.com/golang/protobuf v1.5.2
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
 	github.com/kkdai/bstream v1.0.0
-	github.com/lightninglabs/aperture v0.1.18-beta
+	github.com/lightninglabs/aperture v0.1.18-beta.0.20221005153455-1f35f48b1734
+	github.com/lightninglabs/faraday v0.2.8-alpha.0.20220909105059-fea194ffb084
 	github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2
-	github.com/lightningnetwork/lnd v0.15.0-beta.rc3
+	github.com/lightninglabs/loop v0.20.1-beta.0.20220916122221-9c3010150016
+	github.com/lightninglabs/pool v0.5.8-alpha
+	github.com/lightningnetwork/lnd v0.15.0-beta.rc6.0.20221005111311-2efc70a5c492
 	github.com/lightningnetwork/lnd/ticker v1.1.0
-	github.com/lightningnetwork/lnd/tor v1.0.0
+	github.com/lightningnetwork/lnd/tor v1.1.0
 	github.com/stretchr/testify v1.7.1
-	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
+	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
 	google.golang.org/grpc v1.39.0
 	google.golang.org/protobuf v1.27.1
+	gopkg.in/macaroon-bakery.v2 v2.0.1
+	gopkg.in/macaroon.v2 v2.1.0
 	nhooyr.io/websocket v1.8.7
 )