Feat: multi entry

.vscode/settings.json

@@ -3,5 +3,6 @@
   "[go]": {
     "editor.defaultFormatter": "golang.go"
   },
-  "editor.formatOnSave": true
-}
+  "editor.formatOnSave": true,
+  "go.buildTags": "http,wails"
+}

README.md

@@ -7,8 +7,8 @@ Connect applications like [Damus](https://damus.io/) or [Amethyst](https://linkt
 
 ## Supported Backends
 
-- [Alby](https://getalby.com) (see: alby.go)
 - LND (see: lnd.go)
+- Breez (see: breez.go)
 - want more? please open an issue.
 
 ## Installation
@@ -27,35 +27,30 @@ To get a new random Nostr key use `openssl rand -hex 32` or similar.
 
 ## Development
 
-### Server (LND)
+### Server (HTTP mode)
 
 1. Create a Lightning Polar setup with two LND nodes and uncomment the Polar LND section in your `.env` file.
 
 2. Compile the frontend or run `touch frontend/dist/tmp` to ensure there are embeddable files available.
 
-3. `go run .` or `gow -e=go,mod,html,css run .` using [gow](https://github.com/mitranim/gow)
+3. `go run .`
 
-### Server (Alby Wallet API)
-
-Generate a new OAuth client for <http://localhost:8080> from the [Alby developer portal](https://getalby.com/developer) and set `ALBY_CLIENT_ID` and `ALBY_CLIENT_SECRET` in your .env file.
-
-### React Frontend (LND)
+### React Frontend (HTTP mode)
 
 Go to `/frontend`
 
-1. `cp .env.example .env.local`
-2. `yarn install`
-3. `yarn dev`
+1. `yarn install`
+2. `yarn dev`
 
-### React Frontend (Alby Wallet API)
+### Wails (Backend + Frontend)
 
-Follow standard LND instructions. After logging in, you will be redirected to the wrong port (8080), so manually re-open <http://localhost:5173>.
+`unset GTK_PATH && wails dev -tags "wails"`
 
-### Wails (Backend + Frontend)
+#### Wails Production build
 
-`unset GTK_PATH && wails dev`
+`wails build -tags "wails"`
 
-### Build and run locally
+### Build and run locally (HTTP mode)
 
 `mkdir tmp`
 `go build -o main`
@@ -64,7 +59,7 @@ Follow standard LND instructions. After logging in, you will be redirected to th
 `cd tmp`
 `./main`
 
-### Run dockerfile locally
+### Run dockerfile locally (HTTP mode)
 
 `docker build . -t nwc-local`
 

config.go

@@ -17,12 +17,11 @@ type Config struct {
 	// database config always takes preference.
 	db.Config
 	NostrSecretKey          string `envconfig:"NOSTR_PRIVKEY"`
-	CookieSecret            string `envconfig:"COOKIE_SECRET" required:"true"`
+	CookieSecret            string `envconfig:"COOKIE_SECRET"`
 	CookieDomain            string `envconfig:"COOKIE_DOMAIN"`
 	ClientPubkey            string `envconfig:"CLIENT_NOSTR_PUBKEY"`
 	Relay                   string `envconfig:"RELAY" default:"wss://relay.getalby.com/v1"`
 	PublicRelay             string `envconfig:"PUBLIC_RELAY"`
-	AppType                 string `envconfig:"APP_TYPE" default:"HTTP"`
 	BreezAPIKey             string `envconfig:"BREEZ_API_KEY"`
 	BreezWorkdir            string `envconfig:"BREEZ_WORK_DIR" default:".breez"`
 	BasicAuthUser           string `envconfig:"BASIC_AUTH_USER"`

frontend/package.json

@@ -5,7 +5,9 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
+    "dev:wails": "VITE_NWC_APP_TYPE=WAILS vite",
     "build": "tsc && vite build",
+    "build:wails": "tsc && VITE_NWC_APP_TYPE=WAILS vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview"
   },

frontend/src/utils/request.ts

@@ -7,8 +7,9 @@ export const request = async <T>(
   ...args: Parameters<typeof fetch>
 ): Promise<T | undefined> => {
   try {
+    const appType = import.meta.env.VITE_NWC_APP_TYPE || "HTTP";
     // TODO: can we use a different request file at build time so no conditional / env variable is needed?
-    switch (import.meta.env.VITE_APP_TYPE) {
+    switch (appType) {
       case "WAILS": {
         const res = await WailsRequestRouter(
           args[0].toString(),
@@ -43,9 +44,7 @@ export const request = async <T>(
         return body;
       }
       default:
-        throw new Error(
-          "Unsupported app type: " + import.meta.env.VITE_APP_TYPE
-        );
+        throw new Error("Unsupported app type: " + appType);
     }
   } catch (error) {
     console.error("Failed to fetch", error);

main.go

@@ -4,21 +4,17 @@ import (
 	"context"
 	"database/sql"
 	"errors"
-	"fmt"
-	"net/http"
 	"os"
 	"os/signal"
 	"strings"
 	"sync"
 	"time"
 
-	echologrus "github.com/davrux/echo-logrus/v4"
 	"github.com/getAlby/nostr-wallet-connect/migrations"
 	"github.com/getAlby/nostr-wallet-connect/models/db"
 	"github.com/glebarez/sqlite"
 	"github.com/joho/godotenv"
 	"github.com/kelseyhightower/envconfig"
-	"github.com/labstack/echo/v4"
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
 	log "github.com/sirupsen/logrus"
@@ -31,8 +27,8 @@ import (
 	gormtrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/gorm.io/gorm.v1"
 )
 
-func main() {
-
+// TODO: move to service.go
+func NewService(wg *sync.WaitGroup) *Service {
 	// Load config from environment variables / .env file
 	godotenv.Load(".env")
 	cfg := &Config{}
@@ -148,59 +144,10 @@ func main() {
 	logger.SetLevel(log.InfoLevel)
 	svc.Logger = logger
 
-	var wg sync.WaitGroup
-	wg.Add(1)
-	// TODO: can we move these into two separate entrypoint files?
-	switch cfg.AppType {
-	case WailsAppType:
-		err := svc.launchLNBackend()
-		if err != nil {
-			// LN backend not needed immediately, just log errors
-			svc.Logger.Warnf("Failed to launch LN backend: %v", err)
-		}
-		go func() {
-			app := NewApp(svc)
-			LaunchWailsApp(app)
-			wg.Done()
-			svc.Logger.Info("Wails app exited")
-		}()
-	case HttpAppType:
-		// using echo
-		echologrus.Logger = logger
-		e := echo.New()
-
-		// Alby backend only supported in HTTP app type
-		if svc.cfg.LNBackendType == AlbyBackendType {
-			oauthService, err := NewAlbyOauthService(svc, e)
-			if err != nil {
-				svc.Logger.Fatal(err)
-			}
-			svc.lnClient = oauthService
-		} else {
-			err := svc.launchLNBackend()
-			if err != nil {
-				// LN backend not needed immediately, just log errors
-				svc.Logger.Warnf("Failed to launch LN backend: %v", err)
-			}
-		}
-
-		//register shared routes
-		svc.RegisterSharedRoutes(e)
-		//start Echo server
-		go func() {
-			if err := e.Start(fmt.Sprintf(":%v", svc.cfg.Port)); err != nil && err != http.ErrServerClosed {
-				e.Logger.Fatal("shutting down the server")
-			}
-			//handle graceful shutdown
-			<-ctx.Done()
-			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-			defer cancel()
-			e.Shutdown(ctx)
-			svc.Logger.Info("Echo server exited")
-			wg.Done()
-		}()
-	default:
-		svc.Logger.Fatalf("Unknown app type: %s", cfg.AppType)
+	err = svc.launchLNBackend()
+	if err != nil {
+		// LN backend not needed immediately, just log errors
+		svc.Logger.Warnf("Failed to launch LN backend: %v", err)
 	}
 
 	go func() {
@@ -246,7 +193,8 @@ func main() {
 		svc.Logger.Info("Graceful shutdown completed. Goodbye.")
 		wg.Done()
 	}()
-	wg.Wait()
+
+	return svc
 }
 
 func (svc *Service) setupDbConfig() error {

main_http.go

@@ -0,0 +1,53 @@
+//go:build !wails || http
+// +build !wails http
+
+// (http tag above is simply to fix go language server issue and is not needed to build the app)
+
+package main
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"sync"
+	"time"
+
+	echologrus "github.com/davrux/echo-logrus/v4"
+	"github.com/labstack/echo/v4"
+	log "github.com/sirupsen/logrus"
+)
+
+// ignore this warning: we use build tags
+// this function will only be executed if no wails tag is set
+func main() {
+	log.Info("NWC Starting in HTTP mode")
+	var wg sync.WaitGroup
+	wg.Add(1)
+
+	svc := NewService(&wg)
+
+	if svc.cfg.CookieSecret == "" {
+		svc.Logger.Fatalf("required key COOKIE_SECRET missing value")
+	}
+
+	echologrus.Logger = svc.Logger
+	e := echo.New()
+
+	//register shared routes
+	svc.RegisterSharedRoutes(e)
+	//start Echo server
+	go func() {
+		if err := e.Start(fmt.Sprintf(":%v", svc.cfg.Port)); err != nil && err != http.ErrServerClosed {
+			e.Logger.Fatal("shutting down the server")
+		}
+		//handle graceful shutdown
+		<-svc.ctx.Done()
+		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+		defer cancel()
+		e.Shutdown(ctx)
+		svc.Logger.Info("Echo server exited")
+		wg.Done()
+	}()
+
+	wg.Wait()
+}

main_wails.go

@@ -0,0 +1,29 @@
+//go:build wails
+// +build wails
+
+package main
+
+import (
+	"sync"
+
+	log "github.com/sirupsen/logrus"
+)
+
+// ignore this warning: we use build tags
+// this function will only be executed if the wails tag is set
+func main() {
+	log.Info("NWC Starting in WAILS mode")
+	var wg sync.WaitGroup
+	wg.Add(1)
+
+	svc := NewService(&wg)
+
+	go func() {
+		app := NewApp(svc)
+		LaunchWailsApp(app)
+		wg.Done()
+		svc.Logger.Info("Wails app exited")
+	}()
+
+	wg.Wait()
+}

wails.json

@@ -3,8 +3,8 @@
   "name": "nostr-wallet-connect",
   "outputfilename": "Nostr-Wallet-Connect",
   "frontend:install": "yarn install",
-  "frontend:build": "yarn build",
-  "frontend:dev:watcher": "yarn dev",
+  "frontend:build": "yarn build:wails",
+  "frontend:dev:watcher": "yarn dev:wails",
   "frontend:dev:serverUrl": "auto",
   "author": {
     "name": "Alby Contributors",