highperfocused/go-nostr
1
0
Fork 0
mirror of https://github.com/nbd-wtf/go-nostr.git synced 2025-06-29 18:11:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Append 'ws://' prefix if url starts with localhost (#132)

Browse Source 
* test: refactor NormalizeURL tests

* feat(NormalizeURL): add 'ws://' prefix if url starts with 'localhost'

* test(NormalizeURL): add 'ws://' prefix if url is localhost
This commit is contained in:
P. Reis
2024-07-04 12:06:24 -03:00
committed by GitHub
parent 6ed112cc69
commit 8aaf5b8f98
2 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
normalize.go
View File

@ -15,6 +15,10 @@ func NormalizeURL(u string) string {
u = strings.TrimSpace(u)
u = strings.ToLower(u)
if strings.HasPrefix(u, "localhost") == true {
u = "ws://" + u
}
if !strings.HasPrefix(u, "http") && !strings.HasPrefix(u, "ws") {
u = "wss://" + u
}

60
normalize_test.go
View File

@ -1,32 +1,36 @@
package nostr
import "fmt"
import (
"testing"
)
func ExampleNormalizeURL() {
fmt.Println(NormalizeURL(""))
fmt.Println(NormalizeURL("wss://x.com/y"))
fmt.Println(NormalizeURL("wss://x.com/y/"))
fmt.Println(NormalizeURL("http://x.com/y"))
fmt.Println(NormalizeURL(NormalizeURL("http://x.com/y")))
fmt.Println(NormalizeURL("wss://x.com"))
fmt.Println(NormalizeURL("wss://x.com/"))
fmt.Println(NormalizeURL(NormalizeURL(NormalizeURL("wss://x.com/"))))
fmt.Println(NormalizeURL("x.com"))
fmt.Println(NormalizeURL("x.com/"))
fmt.Println(NormalizeURL("x.com////"))
fmt.Println(NormalizeURL("x.com/?x=23"))
// Output:
//
// wss://x.com/y
// wss://x.com/y
// ws://x.com/y
// ws://x.com/y
// wss://x.com
// wss://x.com
// wss://x.com
// wss://x.com
// wss://x.com
// wss://x.com
// wss://x.com?x=23
type urlTest struct {
url, expected string
}
var urlTests = []urlTest{
{"", ""},
{"wss://x.com/y", "wss://x.com/y"},
{"wss://x.com/y/", "wss://x.com/y"},
{"http://x.com/y", "ws://x.com/y"},
{NormalizeURL("http://x.com/y"), "ws://x.com/y"},
{NormalizeURL("wss://x.com"), "wss://x.com"},
{NormalizeURL("wss://x.com/"), "wss://x.com"},
{NormalizeURL(NormalizeURL(NormalizeURL("wss://x.com/"))), "wss://x.com"},
{"wss://x.com", "wss://x.com"},
{"wss://x.com/", "wss://x.com"},
{"x.com////", "wss://x.com"},
{"x.com/?x=23", "wss://x.com?x=23"},
{"localhost:4036", "ws://localhost:4036"},
{"localhost:4036/relay", "ws://localhost:4036/relay"},
{NormalizeURL("localhost:4036/relay"), "ws://localhost:4036/relay"},
}
func TestNormalizeURL(t *testing.T) {
for _, test := range urlTests {
if output := NormalizeURL(test.url); output != test.expected {
t.Errorf("Output '%s' not equal to expected '%s'", output, test.expected)
}
}
}