OceanSlim/grain
1
0
Fork 0
mirror of https://github.com/0ceanSlim/grain.git synced 2024-10-30 01:26:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

import events work, styling, checkWhitelist refactor

Browse Source
This commit is contained in:
0ceanSlim 2024-08-07 17:24:38 -04:00
parent 41c7998831
commit 7edbee13ac
8 changed files with 156 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
app/src/api/importEvents.go
View File

@ -40,19 +40,30 @@ func ImportEvents(w http.ResponseWriter, r *http.Request) {
for _, url := range urls {
var events []map[string]interface{}
events, err = fetchEventsFromRelay(pubkey, url)
if err != nil {
errorChan <- fmt.Errorf("error fetching events from relay %s: %w", url, err)
return
}
var lastEventCreatedAt int64 = 0 // Track the timestamp of the last event fetched
err = sendEventsToRelay(events)
if err != nil {
errorChan <- fmt.Errorf("error sending events to relay: %w", err)
return
}
for {
events, err = fetchEventsFromRelay(pubkey, url, lastEventCreatedAt)
if err != nil {
errorChan <- fmt.Errorf("error fetching events from relay %s: %w", url, err)
return
}
totalEvents += len(events)
if len(events) == 0 {
break
}
err = sendEventsToRelay(events)
if err != nil {
errorChan <- fmt.Errorf("error sending events to relay: %w", err)
return
}
totalEvents += len(events)
// Update lastEventCreatedAt with the timestamp of the last event fetched
lastEventCreatedAt = int64(events[len(events)-1]["created_at"].(float64))
}
}
totalEventsChan <- totalEvents
@ -92,7 +103,7 @@ func renderResult(w http.ResponseWriter, success bool, message string, count int
}
}
func fetchEventsFromRelay(pubkey, relayUrl string) ([]map[string]interface{}, error) {
func fetchEventsFromRelay(pubkey, relayUrl string, lastEventCreatedAt int64) ([]map[string]interface{}, error) {
log.Printf("Connecting to relay: %s", relayUrl)
conn, err := websocket.Dial(relayUrl, "", "http://localhost/")
if err != nil {
@ -102,7 +113,17 @@ func fetchEventsFromRelay(pubkey, relayUrl string) ([]map[string]interface{}, er
defer conn.Close()
log.Printf("Connected to relay: %s", relayUrl)
reqMessage := fmt.Sprintf(`["REQ", "import-sub", {"authors": ["%s"]}]`, pubkey)
filters := map[string]interface{}{
"authors": []string{pubkey},
"limit": 100,
}
if lastEventCreatedAt > 0 {
filters["until"] = lastEventCreatedAt - 1
}
filtersJSON, _ := json.Marshal(filters)
reqMessage := fmt.Sprintf(`["REQ", "import-sub", %s]`, filtersJSON)
log.Printf("Sending request: %s", reqMessage)
if _, err := conn.Write([]byte(reqMessage)); err != nil {
log.Printf("Error sending request to relay %s: %v", relayUrl, err)
@ -156,7 +177,7 @@ func sendEventsToRelay(events []map[string]interface{}) error {
relayUrl := fmt.Sprintf("ws://localhost%s", cfg.Server.Port)
batchSize := 5 // Reduce the batch size to avoid connection issues
batchSize := 20 // Reduce the batch size to avoid connection issues
for i := 0; i < len(events); i += batchSize {
end := i + batchSize
if end > len(events) {
@ -167,6 +188,9 @@ func sendEventsToRelay(events []map[string]interface{}) error {
if err := sendBatchToRelay(batch, relayUrl); err != nil {
return err
}
// Wait for a short period to avoid overloading the relay server
time.Sleep(1 * time.Second)
}
return nil
@ -196,9 +220,8 @@ func sendBatchToRelay(events []map[string]interface{}, relayUrl string) error {
}
log.Printf("Sent event to local relay: %s", event["id"])
}
// Wait for a short period to avoid overloading the relay server
time.Sleep(100 * time.Millisecond)
time.Sleep(1 * time.Second)
return nil
}

2
app/src/app.go
View File

@ -23,7 +23,7 @@ func RootHandler(w http.ResponseWriter, r *http.Request) {
}
data := PageData{
Title: "GRAIN Relay",
Title: "GRAIN Dashboard",
Events: events,
}

55
app/views/importEvents.html
View File

@ -1,6 +1,6 @@
{{define "view"}}
<main class="flex flex-col items-center justify-center p-8">
<div class="mb-4">You are now viewing the {{.Title}}</div>
<div class="mb-4">{{.Title}}</div>
<div
class="container flex justify-center p-4 border-2 border-gray-600 border-solid rounded-md w-fit"
>
@ -10,26 +10,28 @@
hx-target="#result"
hx-indicator="#spinner"
>
<div>
<label for="pubkey">Pubkey:</label>
<input
class="p-2 m-2 text-black rounded-md"
type="text"
id="pubkey"
name="pubkey"
required
maxlength="64"
/>
</div>
<div>
<label for="relayUrls">Relay URLs (comma separated):</label>
<input
class="p-2 m-2 text-black rounded-md"
type="text"
id="relayUrls"
name="relayUrls"
required
/>
<div class="content-right">
<div>
<label for="pubkey">Pubkey:</label>
<input
class="p-2 m-2 text-black rounded-md"
type="text"
id="pubkey"
name="pubkey"
required
maxlength="64"
/>
</div>
<div>
<label for="relayUrls">Relay URLs (comma separated):</label>
<input
class="p-2 m-2 text-black rounded-md"
type="text"
id="relayUrls"
name="relayUrls"
required
/>
</div>
</div>
<button
class="p-2 m-2 font-bold bg-green-500 rounded-md font-xl"
@ -37,9 +39,18 @@
>
Import Events
</button>
<div class="font-bold text-md">
⚠️ This Feature is Experimental<br />
If you are whitelisted, this SHOULD capture all of your events<br />
Please Be Patient. Imports can take quite some time due to Rate Limits
</div>
</form>
</div>
<div id="spinner" class="spinner" style="display: none"></div>
<div
id="spinner"
class="m-4 text-lg font-bold text-center spinner"
style="display: none"
></div>
<div id="result" class="p-2 m-2 text-xl font-bold"></div>
<button
hx-get="/"

2
app/views/index.html
View File

@ -15,7 +15,7 @@
<button
hx-get="/import-events"
hx-swap="outerHTML"
class="p-2 mb-2 text-white bg-orange-400 rounded-md"
class="p-2 mb-2 text-white bg-purple-500 rounded-md"
hx-target="body"
>
Import Events

20
app/views/templates/footer.html
View File

@ -1,5 +1,23 @@
{{define "footer"}}
<footer class="text-textMuted">
<p>&copy; 2024 GRAIN 🌾, made with 💜 by OceanSlim</p>
<p>
&copy; 2024
<a href="https://github.com/0ceanSlim/grain" class="text-purple-400"
>GRAIN 🌾</a
>, made with 💜 by
<a
href="https://njump.me/npub1zmc6qyqdfnllhnzzxr5wpepfpnzcf8q6m3jdveflmgruqvd3qa9sjv7f60"
class="text-purple-400"
>OceanSlim</a
>
</p>
<p>
GRAIN is Proudly Open Source. Don't hesitate to
<a
href="https://github.com/0ceanSlim/grain?tab=readme-ov-file#development"
class="text-purple-400"
>contribute</a
>!
</p>
</footer>
{{end}}

8
app/views/templates/layout.html
View File

@ -29,10 +29,10 @@
<style>
.spinner {
display: none;
width: 50px;
height: 50px;
border: 5px solid lightgray;
border-top: 5px solid blue;
width: 32px;
height: 32px;
border: 5px solid purple;
border-top: 5px solid violet;
border-radius: 50%;
animation: spin 1s linear infinite;
}

54
server/handlers/event.go
View File

@ -9,7 +9,6 @@ import (
"grain/server/handlers/kinds"
"grain/server/handlers/response"
"grain/server/utils"
"strconv"
relay "grain/server/types"
@ -74,13 +73,13 @@ func HandleKind(ctx context.Context, evt relay.Event, ws *websocket.Conn, eventS
}
// Check if the kind is whitelisted
if config.GetConfig().KindWhitelist.Enabled && !isKindWhitelisted(evt.Kind) {
if config.GetConfig().KindWhitelist.Enabled && !utils.IsKindWhitelisted(evt.Kind) {
response.SendOK(ws, evt.ID, false, "not allowed: event kind is not whitelisted")
return
}
// Check pubkey/npub whitelist only if the kind is not whitelisted
if config.GetConfig().PubkeyWhitelist.Enabled && !isPubKeyWhitelisted(evt.PubKey) {
if config.GetConfig().PubkeyWhitelist.Enabled && !utils.IsPubKeyWhitelisted(evt.PubKey) {
response.SendOK(ws, evt.ID, false, "not allowed: pubkey or npub is not whitelisted")
return
}
@ -148,52 +147,3 @@ func determineCategory(kind int) string {
}
}
// Helper function to check if a pubkey or npub is whitelisted
func isPubKeyWhitelisted(pubKey string) bool {
cfg := config.GetConfig()
if !cfg.PubkeyWhitelist.Enabled {
return true
}
// Check pubkeys
for _, whitelistedKey := range cfg.PubkeyWhitelist.Pubkeys {
if pubKey == whitelistedKey {
return true
}
}
// Check npubs
for _, npub := range cfg.PubkeyWhitelist.Npubs {
decodedPubKey, err := utils.DecodeNpub(npub)
if err != nil {
fmt.Println("Error decoding npub:", err)
continue
}
if pubKey == decodedPubKey {
return true
}
}
return false
}
func isKindWhitelisted(kind int) bool {
cfg := config.GetConfig()
if !cfg.KindWhitelist.Enabled {
return true
}
// Check event kinds
for _, whitelistedKindStr := range cfg.KindWhitelist.Kinds {
whitelistedKind, err := strconv.Atoi(whitelistedKindStr)
if err != nil {
fmt.Println("Error converting whitelisted kind to int:", err)
continue
}
if kind == whitelistedKind {
return true
}
}
return false
}

57
server/utils/checkWhitelist.go Normal file
View File

@ -0,0 +1,57 @@
package utils
import (
"fmt"
"grain/config"
"strconv"
)
// Helper function to check if a pubkey or npub is whitelisted
func IsPubKeyWhitelisted(pubKey string) bool {
cfg := config.GetConfig()
if !cfg.PubkeyWhitelist.Enabled {
return true
}
// Check pubkeys
for _, whitelistedKey := range cfg.PubkeyWhitelist.Pubkeys {
if pubKey == whitelistedKey {
return true
}
}
// Check npubs
for _, npub := range cfg.PubkeyWhitelist.Npubs {
decodedPubKey, err := DecodeNpub(npub)
if err != nil {
fmt.Println("Error decoding npub:", err)
continue
}
if pubKey == decodedPubKey {
return true
}
}
return false
}
func IsKindWhitelisted(kind int) bool {
cfg := config.GetConfig()
if !cfg.KindWhitelist.Enabled {
return true
}
// Check event kinds
for _, whitelistedKindStr := range cfg.KindWhitelist.Kinds {
whitelistedKind, err := strconv.Atoi(whitelistedKindStr)
if err != nil {
fmt.Println("Error converting whitelisted kind to int:", err)
continue
}
if kind == whitelistedKind {
return true
}
}
return false
}