feat: new project layout #9 and implemented NIP-42 for broadcasting #5

.env.sample

@@ -10,6 +10,7 @@ VERSION=0.3.1
 REPLAY_TO_RELAYS=false
 RELAYS_TO_PUBLISH_TO=""
 DEFAULT_WAIT_TIME_BETWEEN_BATCHES=60000
+DEFAULT_WAIT_TIME_FOR_RELAY_RESPONSE=3000
 MAX_EVENTS_TO_REPLAY=10
 ENABLE_AUTO_NIP05_REGISTRATION=false
 MAIN_DOMAIN_NAME=""

.goreleaser.yaml

@@ -1,5 +1,6 @@
 builds:
 - id: rsslay-linux
+  main: ./cmd/rsslay
   ldflags:
     - -s -w -linkmode external -extldflags '-static' -X 'github.com/piraces/rsslay/pkg/version.BuildVersion={{.Version}}'
   env:

Dockerfile

@@ -6,14 +6,15 @@ COPY go.mod ./
 COPY go.sum ./
 RUN go mod download
 
-COPY *.go ./
-COPY assets/* ./assets/
-COPY templates/* ./templates/
-COPY schema.sql .
+COPY cmd/ ./cmd/
+COPY internal/ ./internal/
+COPY pkg/ ./pkg/
+COPY web/ ./web/
+COPY scripts/ ./scripts/
 
 RUN apk add --no-cache build-base
 
-RUN CGO_ENABLED=1 go build -ldflags="-s -w -linkmode external -extldflags '-static'" -o /rsslay
+RUN CGO_ENABLED=1 go build -ldflags="-s -w -linkmode external -extldflags '-static'" -o /rsslay cmd/rsslay/main.go
 
 FROM alpine:latest
 
@@ -31,6 +32,7 @@ ENV VERSION=0.3.1
 ENV REPLAY_TO_RELAYS=false
 ENV RELAYS_TO_PUBLISH_TO=""
 ENV DEFAULT_WAIT_TIME_BETWEEN_BATCHES=60000
+ENV DEFAULT_WAIT_TIME_FOR_RELAY_RESPONSE=3000
 ENV MAX_EVENTS_TO_REPLAY=10
 ENV ENABLE_AUTO_NIP05_REGISTRATION=false
 ENV MAIN_DOMAIN_NAME=""

Dockerfile.fly

@@ -8,14 +8,15 @@ COPY go.mod ./
 COPY go.sum ./
 RUN go mod download
 
-COPY *.go ./
-COPY assets/* ./assets/
-COPY templates/* ./templates/
-COPY schema.sql .
+COPY cmd/ ./cmd/
+COPY internal/ ./internal/
+COPY pkg/ ./pkg/
+COPY web/ ./web/
+COPY scripts/ ./scripts/
 
 RUN apk add --no-cache build-base
 
-RUN CGO_ENABLED=1 go build -ldflags="-s -w -linkmode external -extldflags '-static'" -tags osusergo,netgo -o /rsslay
+RUN CGO_ENABLED=1 go build -ldflags="-s -w -linkmode external -extldflags '-static'" -tags osusergo,netgo -o /rsslay cmd/rsslay/main.go
 
 FROM alpine:latest
 
@@ -33,6 +34,7 @@ ENV VERSION=0.3.1
 ENV REPLAY_TO_RELAYS=false
 ENV RELAYS_TO_PUBLISH_TO=""
 ENV DEFAULT_WAIT_TIME_BETWEEN_BATCHES=60000
+ENV DEFAULT_WAIT_TIME_FOR_RELAY_RESPONSE=3000
 ENV MAX_EVENTS_TO_REPLAY=10
 ENV ENABLE_AUTO_NIP05_REGISTRATION=false
 ENV MAIN_DOMAIN_NAME=""

Dockerfile.railwayapp

@@ -7,6 +7,7 @@ ARG SECRET
 ARG REPLAY_TO_RELAYS
 ARG RELAYS_TO_PUBLISH_TO
 ARG DEFAULT_WAIT_TIME_BETWEEN_BATCHES
+ARG DEFAULT_WAIT_TIME_FOR_RELAY_RESPONSE
 ARG MAX_EVENTS_TO_REPLAY
 ARG ENABLE_AUTO_NIP05_REGISTRATION
 ARG MAIN_DOMAIN_NAME
@@ -19,14 +20,15 @@ COPY go.mod ./
 COPY go.sum ./
 RUN go mod download
 
-COPY *.go ./
-COPY assets/* ./assets/
-COPY templates/* ./templates/
-COPY schema.sql .
+COPY cmd/ ./cmd/
+COPY internal/ ./internal/
+COPY pkg/ ./pkg/
+COPY web/ ./web/
+COPY scripts/ ./scripts/
 
 RUN apk add --no-cache build-base
 
-RUN CGO_ENABLED=1 go build -ldflags="-s -w -linkmode external -extldflags '-static'" -o /rsslay
+RUN CGO_ENABLED=1 go build -ldflags="-s -w -linkmode external -extldflags '-static'" -o /rsslay cmd/rsslay/main.go
 
 FROM alpine:latest
 
@@ -37,6 +39,7 @@ ARG SECRET
 ARG REPLAY_TO_RELAYS
 ARG RELAYS_TO_PUBLISH_TO
 ARG DEFAULT_WAIT_TIME_BETWEEN_BATCHES
+ARG DEFAULT_WAIT_TIME_FOR_RELAY_RESPONSE
 ARG MAX_EVENTS_TO_REPLAY
 ARG ENABLE_AUTO_NIP05_REGISTRATION
 ARG MAIN_DOMAIN_NAME
@@ -57,6 +60,7 @@ ENV VERSION=0.3.1
 ENV REPLAY_TO_RELAYS=false
 ENV RELAYS_TO_PUBLISH_TO=""
 ENV DEFAULT_WAIT_TIME_BETWEEN_BATCHES=60000
+ENV DEFAULT_WAIT_TIME_FOR_RELAY_RESPONSE=3000
 ENV MAX_EVENTS_TO_REPLAY=10
 ENV ENABLE_AUTO_NIP05_REGISTRATION="false"
 ENV MAIN_DOMAIN_NAME=""

Makefile

@@ -1,2 +1,2 @@
 relayer-rss-bridge: $(shell find . -name "*.go")
-	CC=$$(which musl-gcc) go build -ldflags="-s -w -linkmode external -extldflags '-static'" -o ./relayer-rss-bridge
+	CC=$$(which musl-gcc) go build -ldflags="-s -w -linkmode external -extldflags '-static'" -o ./relayer-rss-bridge cmd/rsslay/main.go

README.md

@@ -5,6 +5,9 @@
 [![Publish Docker image](https://github.com/piraces/rsslay/actions/workflows/docker-publish.yml/badge.svg)](https://github.com/piraces/rsslay/actions/workflows/docker-publish.yml)
 ![Docker Hub](https://img.shields.io/docker/pulls/piraces/rsslay?logo=docker)
 
+[![Go Report Card](https://goreportcard.com/badge/github.com/piraces/rsslay)](https://goreportcard.com/report/github.com/piraces/rsslay)
+[![Go Reference](https://pkg.go.dev/badge/github.com/piraces/rsslay.svg)](https://pkg.go.dev/github.com/piraces/rsslay)
+
 **Relay that creates virtual nostr profiles for each RSS feed submitted**
 
 **Working relay: `wss://rsslay.nostr.moe`. Frontend available in [rsslay.nostr.moe](https://rsslay.nostr.moe).**
@@ -76,6 +79,7 @@ _**Note:** it will create a local database file to store the currently known RSS
 - `REPLAY_TO_RELAYS`: set to true if you want to send the fetched events to other relays defined in `RELAYS_TO_PUBLISH_TO` (default is false)
 - `RELAYS_TO_PUBLISH_TO`: string with relays separated by `,` to re-publish events to in format `wss://[URL],wss://[URL2]` where `URL` and `URL2` are URLs of valid relays (default is empty)
 - `DEFAULT_WAIT_TIME_BETWEEN_BATCHES`: default time to wait between sending batches of requests to other relays in milliseconds (default 60000, 60 seconds)
+- `DEFAULT_WAIT_TIME_FOR_RELAY_RESPONSE`: default time to wait for relay response for possible auth event in milliseconds (default is 3000, 3 seconds).
 - `MAX_EVENTS_TO_REPLAY`: maximum number of events to send to a relay in `RELAYS_TO_PUBLISH_TO` in a batch
 - `ENABLE_AUTO_NIP05_REGISTRATION`: enables [NIP-05](https://github.com/nostr-protocol/nips/blob/master/05.md) automatic registration for all feed profiles in the format `[URL]@[MAIN_DOMAIN_NAME]` where URL is the main URL for the feed and `MAIN_DOMAIN_NAME` the below environment variable (default `false`)
 - `MAIN_DOMAIN_NAME`: main domain name where this relay will be available (only for NIP-05 purposes if enabled with `ENABLE_AUTO_NIP05_REGISTRATION`)