logos-messaging/logos-messaging-nim
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-nim.git synced 2026-01-03 22:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix/libp2p-protocol-inheritance (#173)

Browse Source
This commit is contained in:
Dean Eigenmann 2020-09-18 15:28:19 +02:00 committed by GitHub
parent fe5c0a9ce8
commit bcae93300a
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
waku/protocol/v2/waku_filter.nim
View File

@ -74,25 +74,22 @@ proc init*(T: type MessagePush, buffer: seq[byte]): ProtoResult[T] =
ok(push) ok(push)
proc init*(T: type WakuFilter): T = method init*(wf: WakuFilter) =
var ws = WakuFilter(subscribers: newSeq[Subscriber](0))
# From my understanding we need to set up filters,
# then on every message received we need the handle function to send it to the connection
# if the peer subscribed.
proc handle(conn: Connection, proto: string) {.async, gcsafe, closure.} = proc handle(conn: Connection, proto: string) {.async, gcsafe, closure.} =
var message = await conn.readLp(64*1024) var message = await conn.readLp(64*1024)
var res = FilterRequest.init(message) var res = FilterRequest.init(message)
if res.isErr: if res.isErr:
return return
ws.subscribers.add(Subscriber(connection: conn, filter: res.value)) wf.subscribers.add(Subscriber(connection: conn, filter: res.value))
# @TODO THIS IS A VERY ROUGH EXPERIMENT # @TODO THIS IS A VERY ROUGH EXPERIMENT
ws.handler = handle wf.handler = handle
ws.codec = WakuFilterCodec wf.codec = WakuFilterCodec
result = ws
proc init*(T: type WakuFilter): T =
new result
result.init()
proc subscription*(proto: WakuFilter): MessageNotificationSubscription = proc subscription*(proto: WakuFilter): MessageNotificationSubscription =
## Returns a Filter for the specific protocol ## Returns a Filter for the specific protocol

9
waku/protocol/v2/waku_store.nim
View File

@ -61,9 +61,7 @@ proc query(w: WakuStore, query: HistoryQuery): HistoryResponse =
if msg.contentTopic in query.topics: if msg.contentTopic in query.topics:
result.messages.insert(msg) result.messages.insert(msg)
proc init*(T: type WakuStore): T = method init*(ws: WakuStore) =
var ws = WakuStore()
proc handle(conn: Connection, proto: string) {.async, gcsafe, closure.} = proc handle(conn: Connection, proto: string) {.async, gcsafe, closure.} =
var message = await conn.readLp(64*1024) var message = await conn.readLp(64*1024)
var rpc = HistoryQuery.init(message) var rpc = HistoryQuery.init(message)
@ -78,7 +76,10 @@ proc init*(T: type WakuStore): T =
ws.handler = handle ws.handler = handle
ws.codec = WakuStoreCodec ws.codec = WakuStoreCodec
result = ws
proc init*(T: type WakuStore): T =
new result
result.init()
proc subscription*(proto: WakuStore): MessageNotificationSubscription = proc subscription*(proto: WakuStore): MessageNotificationSubscription =
## The filter function returns the pubsub filter for the node. ## The filter function returns the pubsub filter for the node.