Skip to content

Commit

Permalink
feat(relay): test1: pass
Browse files Browse the repository at this point in the history
  • Loading branch information
kehiy committed Sep 11, 2024
1 parent 7771a94 commit 8776a89
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 2 deletions.
12 changes: 12 additions & 0 deletions tmp/client_recvr.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
const req = `["REQ","nak",{"ids":["cbba15aff4ed4db6370834c9370436ba20615ffa2d170515058f11e522c8dc02"]}]`;
const close = `["CLOSE", "nak"]`;

let ws = new WebSocket("ws://localhost:3000/ws");

ws.onmessage = (e) => {
console.log(e.data);
};

ws.send(req);

// ws.send(close);
9 changes: 9 additions & 0 deletions tmp/client_sendr.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const eventMsg = `["EVENT",{"kind":1,"id":"cbba15aff4ed4db6370834c9370436ba20615ffa2d170515058f11e522c8dc02","pubkey":"79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798","created_at":1726056813,"tags":[],"content":"test","sig":"282db08a865b5fe97d2351a3e7321ee279b9e6bd16e4e8d9f746c4ea148337e01bae7bc10f7465bdffe740bf6682d7aaadd4777919891ba845e66bf52ee7b6f8"}]`;

let ws = new WebSocket("ws://localhost:3000/ws");

ws.onmessage = (e) => {
console.log(e.data);
};

ws.send(eventMsg);
4 changes: 3 additions & 1 deletion types/message/message.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ func ParseMessage(message []byte) Message {
var e Message
switch {
case bytes.Contains(label, []byte("EVENT")):
e = &Event{}
e = &Event{
Event: new(event.Event),
}
case bytes.Contains(label, []byte("REQ")):
e = &Req{}
case bytes.Contains(label, []byte("COUNT")):
Expand Down
18 changes: 17 additions & 1 deletion types/message/message_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"testing"

"github.com/dezh-tech/immortal/types"
"github.com/dezh-tech/immortal/types/event"
"github.com/dezh-tech/immortal/types/filter"
"github.com/dezh-tech/immortal/types/message"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -32,7 +33,7 @@ var testCases = []testCase{
ExpectedEnvelope: nil,
},
{
Name: "REQ envelope",
Name: "REQ message",
Message: []byte(`["REQ","million", {"kinds": [1]}, {"kinds": [30023 ], "#d": ["buteko", "batuke"]}]`),
ExpectedEnvelope: &message.Req{
SubscriptionID: "million",
Expand All @@ -42,6 +43,21 @@ var testCases = []testCase{
}},
},
},
{
Name: "EVENT message",
Message: []byte(`["EVENT",{"kind":1,"id":"d86745e397de3a3b8c8f15f7a02c6aa6a60213f59b14e1a7093ea286e020423e","pubkey":"79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798","created_at":1726055814,"tags":[],"content":"test","sig":"ec9f5702c2698ebfa1ce037c31568c7eb420d65d9684f33ba4d3266c82b771f58cf92c44f1e2a710ba71ce3c92bba1253aa7419d124b2a5eed74e9165e868d50"}]`),
ExpectedEnvelope: &message.Event{
Event: &event.Event{
ID: "d86745e397de3a3b8c8f15f7a02c6aa6a60213f59b14e1a7093ea286e020423e",
PublicKey: "79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798",
CreatedAt: 1726055814,
Kind: types.KindTextNote,
Tags: []types.Tag{},
Content: "test",
Signature: "ec9f5702c2698ebfa1ce037c31568c7eb420d65d9684f33ba4d3266c82b771f58cf92c44f1e2a710ba71ce3c92bba1253aa7419d124b2a5eed74e9165e868d50",
},
},
},
}

func TestEnvelope(t *testing.T) {
Expand Down

0 comments on commit 8776a89

Please sign in to comment.