Merge pull request #88 from emidev98/master

feat: basic relayer

.vscode/launch.json

@@ -0,0 +1,20 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch Relayer",
+            "type": "go",
+            "request": "launch",
+            "mode": "debug",
+            "asRoot": true,
+            "program": "${workspaceFolder}/examples/basic",
+            "cwd": "${workspaceFolder}/examples/basic",
+            "env": {
+                "POSTGRESQL_DATABASE" : "postgres://nostr:nostr@localhost:5432/nostr?sslmode=disable"
+            }
+        }
+    ]
+}

examples/basic/Dockerfile

@@ -1,8 +1,8 @@
-FROM golang:1.18
+FROM golang:1.21.1
 
 WORKDIR /go/src/app
 COPY ./ .
 
 RUN go get -d -v ./...
 RUN go install -v ./...
-RUN cd basic && make
+RUN cd examples/basic && make

examples/basic/Makefile

@@ -1,2 +1,4 @@
 relayer-basic: $(shell find .. -name "*.go")
 	CC=$$(which musl-gcc) go build -ldflags='-s -w -linkmode external -extldflags "-static"' -o ./relayer-basic
+
+start: POSTGRESQL_DATABASE=postgres://nostr:nostr@localhost:5432/nostr?sslmode=disable go run main.go

examples/basic/docker-compose.yml

@@ -3,17 +3,17 @@ services:
 
   relay:
     build:
-      context: ../
-      dockerfile: ./basic/Dockerfile
+      context: ../../
+      dockerfile: ./examples/basic/Dockerfile
     environment:
-      PORT: 2700
+      PORT: 7447
       POSTGRESQL_DATABASE: postgres://nostr:nostr@postgres:5432/nostr?sslmode=disable
     depends_on:
       postgres:
         condition: service_healthy
     ports:
-      - 2700:2700
-    command: "./basic/relayer-basic"
+      - 2700:7447
+    command: "./examples/basic/relayer-basic"
 
   postgres:
     image: postgres
@@ -30,3 +30,19 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+
+  pgadmin:
+      container_name: pgadmin
+      image: dpage/pgadmin4
+      restart: unless-stopped
+      depends_on:
+        - postgres
+      ports:
+        - "5050:80"
+      environment:
+        PGADMIN_DEFAULT_EMAIL: [email protected]
+        PGADMIN_DEFAULT_PASSWORD: nostr
+      volumes:
+        - pgadmin:/var/lib/pgadmin
+volumes:
+  pgadmin:

go.mod

@@ -1,6 +1,6 @@
 module github.com/fiatjaf/relayer/v2
 
-go 1.18
+go 1.21
 
 require (
 	github.com/PuerkitoBio/goquery v1.8.0

handlers.go

@@ -53,10 +53,11 @@ func challenge(conn *websocket.Conn) *WebSocket {
 
 func (s *Server) doEvent(ctx context.Context, ws *WebSocket, request []json.RawMessage, store Storage) string {
 	advancedDeleter, _ := store.(AdvancedDeleter)
+	latestInex := len(request) - 1
 
 	// it's a new event
 	var evt nostr.Event
-	if err := json.Unmarshal(request[1], &evt); err != nil {
+	if err := json.Unmarshal(request[latestInex], &evt); err != nil {
 		return "failed to decode event: " + err.Error()
 	}