Merge branch 'refs/heads/master' into release-wails

Author: rdmitr

.github/workflows/build-docker.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Run tests
-        run: mkdir frontend/dist && touch frontend/dist/tmp && go test
+        run: mkdir frontend/dist && touch frontend/dist/tmp && go test ./...
       - name: Docker build
         uses: mr-smithers-excellent/docker-build-push@v6
         id: build

.github/workflows/multiplatform.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Run tests
-        run: mkdir frontend/dist && touch frontend/dist/tmp && go test
+        run: mkdir frontend/dist && touch frontend/dist/tmp && go test ./...
       - name: Docker build
         uses: mr-smithers-excellent/docker-build-push@v6
         id: build

.github/workflows/package-raspberry-pi.yml

@@ -42,7 +42,7 @@ jobs:
           GOARM: 6
           CGO_ENABLED: 1
           CC: ${{ github.workspace }}/armv6-unknown-linux-gnueabihf/bin/armv6-unknown-linux-gnueabihf-gcc
-        run: go build -tags skip_breez,netgo -v -o nostr-wallet-connect
+        run: go build -tags skip_breez,netgo -v -o nostr-wallet-connect cmd/http/main.go
 
       - name: Find and copy shared libraries
         run: |

.github/workflows/wails2.yaml

@@ -90,8 +90,8 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           cp `go list -m -f "{{.Dir}}" github.com/breez/breez-sdk-go`/breez_sdk/lib/windows-amd64/breez_sdk_bindings.dll ./
-          cp `go list -m -f "{{.Dir}}" github.com/getAlby/glalby-go`/glalby/x86_64-pc-windows-gnu/glalby_bindings.dll ./
-          cp `go list -m -f "{{.Dir}}" github.com/getAlby/ldk-node-go`/ldk_node/x86_64-pc-windows-gnu/ldk_node.dll ./
+          cp `go list -m -f "{{.Dir}}" github.com/getAlby/glalby-go`/glalby/x86_64-pc-windows-msvc/glalby_bindings.dll ./
+          cp `go list -m -f "{{.Dir}}" github.com/getAlby/ldk-node-go`/ldk_node/x86_64-pc-windows-msvc/ldk_node.dll ./
         shell: bash
 
       - name: Copy appicon in place

.vscode/settings.json

@@ -4,7 +4,6 @@
     "editor.defaultFormatter": "golang.go"
   },
   "editor.formatOnSave": true,
-  "go.buildTags": "http,wails",
   "typescript.preferences.importModuleSpecifier": "non-relative",
   "editor.codeActionsOnSave": {
     "source.organizeImports": "always"

Dockerfile

@@ -33,7 +33,7 @@ COPY . .
 # Copy frontend dist files into the container
 COPY --from=frontend /build/frontend/dist ./frontend/dist
 
-RUN GOARCH=$(echo "$TARGETPLATFORM" | cut -d'/' -f2) go build -o main .
+RUN GOARCH=$(echo "$TARGETPLATFORM" | cut -d'/' -f2) go build -o main cmd/http/main.go
 
 RUN cp `find /go/pkg/mod/github.com/breez/ |grep linux-amd64 |grep libbreez_sdk_bindings.so` ./
 RUN cp `find /go/pkg/mod/github.com/get\!alby/ | grep x86_64-unknown-linux-gnu | grep libglalby_bindings.so` ./

README.md

@@ -34,10 +34,6 @@ As data storage SQLite is used.
     # edit the config for your needs
     vim .env
 
-#### Optional Requirements
-
-See [Greenlight](./README_GREENLIGHT.md)
-
 ## Development
 
 ### Required Software
@@ -53,7 +49,7 @@ See [Greenlight](./README_GREENLIGHT.md)
 
 2. Compile the frontend or run `touch frontend/dist/tmp` to ensure there are embeddable files available.
 
-3. `go run .`
+3. `go run cmd/http/main.go`
 
 ### React Frontend (HTTP mode)
 
@@ -77,7 +73,7 @@ _If you get a blank screen, try running in your normal terminal (outside of vsco
 ### Build and run locally (HTTP mode)
 
     $ mkdir tmp
-    $ go build -o main
+    $ go build -o main cmd/http/main.go
     $ cp main tmp
     $ cp .env tmp
     $ cd tmp
@@ -90,7 +86,11 @@ _If you get a blank screen, try running in your normal terminal (outside of vsco
 
 ### Testing
 
-    $ go test
+    $ go test ./...
+
+#### Test matching regular expression
+
+    $ go test ./... -run TestHandleGetInfoEvent
 
 ### Profiling
 
@@ -363,8 +363,9 @@ LDK logs:
 - install nvm (curl script)
 - with nvm, choose node lts
 - install yarn (via npm)
-- then run yarn build
-- go run .
+- run `(cd frontend && yarn install`
+- run `(cd frontend && yarn build:http)`
+- run `go run cmd/http/main.go`
 
 ### Docker
 

README_GREENLIGHT.md

@@ -5,20 +5,18 @@ import (
 	"net/http"
 
 	"github.com/getAlby/nostr-wallet-connect/config"
+	"github.com/getAlby/nostr-wallet-connect/logger"
 	"github.com/labstack/echo/v4"
-	"github.com/sirupsen/logrus"
 )
 
 type AlbyHttpService struct {
 	albyOAuthSvc AlbyOAuthService
-	logger       *logrus.Logger
 	appConfig    *config.AppConfig
 }
 
-func NewAlbyHttpService(albyOAuthSvc AlbyOAuthService, logger *logrus.Logger, appConfig *config.AppConfig) *AlbyHttpService {
+func NewAlbyHttpService(albyOAuthSvc AlbyOAuthService, appConfig *config.AppConfig) *AlbyHttpService {
 	return &AlbyHttpService{
 		albyOAuthSvc: albyOAuthSvc,
-		logger:       logger,
 		appConfig:    appConfig,
 	}
 }
@@ -36,7 +34,7 @@ func (albyHttpSvc *AlbyHttpService) albyCallbackHandler(c echo.Context) error {
 
 	err := albyHttpSvc.albyOAuthSvc.CallbackHandler(c.Request().Context(), code)
 	if err != nil {
-		albyHttpSvc.logger.WithError(err).Error("Failed to handle Alby OAuth callback")
+		logger.Logger.WithError(err).Error("Failed to handle Alby OAuth callback")
 		return c.JSON(http.StatusInternalServerError, ErrorResponse{
 			Message: fmt.Sprintf("Failed to handle Alby OAuth callback: %s", err.Error()),
 		})
@@ -59,7 +57,7 @@ func (albyHttpSvc *AlbyHttpService) albyCallbackHandler(c echo.Context) error {
 func (albyHttpSvc *AlbyHttpService) albyMeHandler(c echo.Context) error {
 	me, err := albyHttpSvc.albyOAuthSvc.GetMe(c.Request().Context())
 	if err != nil {
-		albyHttpSvc.logger.WithError(err).Error("Failed to request alby me endpoint")
+		logger.Logger.WithError(err).Error("Failed to request alby me endpoint")
 		return c.JSON(http.StatusInternalServerError, ErrorResponse{
 			Message: fmt.Sprintf("Failed to request alby me endpoint: %s", err.Error()),
 		})
@@ -71,7 +69,7 @@ func (albyHttpSvc *AlbyHttpService) albyMeHandler(c echo.Context) error {
 func (albyHttpSvc *AlbyHttpService) albyBalanceHandler(c echo.Context) error {
 	balance, err := albyHttpSvc.albyOAuthSvc.GetBalance(c.Request().Context())
 	if err != nil {
-		albyHttpSvc.logger.WithError(err).Error("Failed to request alby balance endpoint")
+		logger.Logger.WithError(err).Error("Failed to request alby balance endpoint")
 		return c.JSON(http.StatusInternalServerError, ErrorResponse{
 			Message: fmt.Sprintf("Failed to request alby balance endpoint: %s", err.Error()),
 		})
@@ -92,7 +90,7 @@ func (albyHttpSvc *AlbyHttpService) albyPayHandler(c echo.Context) error {
 
 	err := albyHttpSvc.albyOAuthSvc.SendPayment(c.Request().Context(), payRequest.Invoice)
 	if err != nil {
-		albyHttpSvc.logger.WithError(err).Error("Failed to request alby pay endpoint")
+		logger.Logger.WithError(err).Error("Failed to request alby pay endpoint")
 		return c.JSON(http.StatusInternalServerError, ErrorResponse{
 			Message: fmt.Sprintf("Failed to request alby pay endpoint: %s", err.Error()),
 		})
@@ -104,7 +102,7 @@ func (albyHttpSvc *AlbyHttpService) albyPayHandler(c echo.Context) error {
 func (albyHttpSvc *AlbyHttpService) albyLinkAccountHandler(c echo.Context) error {
 	err := albyHttpSvc.albyOAuthSvc.LinkAccount(c.Request().Context())
 	if err != nil {
-		albyHttpSvc.logger.WithError(err).Error("Failed to connect alby account")
+		logger.Logger.WithError(err).Error("Failed to connect alby account")
 		return err
 	}