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

updated libwaku API to integrate with logos chat poc for mix integration

Browse Source
This commit is contained in:
Prem Chaitanya Prathi 2025-12-24 13:40:36 +05:30
parent 96196ab8bc
commit dc0ebc7142
No known key found for this signature in database
3 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/kernel_api/protocols/filter_api.nim
View File

@ -47,8 +47,10 @@ proc waku_filter_subscribe(
error "fail filter subscribe", error = errorMsg error "fail filter subscribe", error = errorMsg
return err(errorMsg) return err(errorMsg)
let pubsubTopicOpt =
if ($pubsubTopic).len > 0: some(PubsubTopic($pubsubTopic)) else: none(PubsubTopic)
let subFut = ctx.myLib[].node.filterSubscribe( let subFut = ctx.myLib[].node.filterSubscribe(
some(PubsubTopic($pubsubTopic)), pubsubTopicOpt,
($contentTopics).split(",").mapIt(ContentTopic(it)), ($contentTopics).split(",").mapIt(ContentTopic(it)),
peer, peer,
) )

18
library/kernel_api/protocols/lightpush_api.nim
View File

@ -39,13 +39,15 @@ proc waku_lightpush_publish(
let errorMsg = "failed to lightpublish message, no suitable remote peers" let errorMsg = "failed to lightpublish message, no suitable remote peers"
error "PUBLISH failed", error = errorMsg error "PUBLISH failed", error = errorMsg
return err(errorMsg) return err(errorMsg)
let topic =
if ($pubsubTopic).len == 0:
none(PubsubTopic)
else:
some(PubsubTopic($pubsubTopic))
let msgHashHex = ( discard (await ctx.myLib[].node.lightpushPublish(topic, msg, peerOpt)).valueOr:
await ctx.myLib[].node.wakuLegacyLightpushClient.publish( let errorMsg = error.desc.get($error.code.int)
$pubsubTopic, msg, peer = peerOpt.get() error "PUBLISH failed", error = errorMsg
) return err(errorMsg)
).valueOr:
error "PUBLISH failed", error = error
return err($error)
return ok(msgHashHex) return ok("")

14
waku/node/kernel_api/lightpush.nim
View File

@ -246,12 +246,16 @@ proc lightpushPublish*(
return lighpushErrorResult( return lighpushErrorResult(
LightPushErrorCode.SERVICE_NOT_AVAILABLE, "Waku lightpush not available" LightPushErrorCode.SERVICE_NOT_AVAILABLE, "Waku lightpush not available"
) )
if mixify and node.wakuMix.isNil(): var lmixify = mixify
error "failed to publish message using mix as mix protocol is not mounted" if not node.wakuMix.isNil():
lmixify = true
let
#[ error "failed to publish message using mix as mix protocol is not mounted"
return lighpushErrorResult( return lighpushErrorResult(
LightPushErrorCode.SERVICE_NOT_AVAILABLE, "Waku lightpush with mix not available" LightPushErrorCode.SERVICE_NOT_AVAILABLE, "Waku lightpush with mix not available"
) ) ]#
let toPeer: RemotePeerInfo = peerOpt.valueOr: toPeer: RemotePeerInfo = peerOpt.valueOr:
if not node.wakuLightPush.isNil(): if not node.wakuLightPush.isNil():
RemotePeerInfo.init(node.peerId()) RemotePeerInfo.init(node.peerId())
elif not node.wakuLightpushClient.isNil(): elif not node.wakuLightpushClient.isNil():
@ -280,4 +284,4 @@ proc lightpushPublish*(
error "lightpush publish error", error = msg error "lightpush publish error", error = msg
return lighpushErrorResult(LightPushErrorCode.INTERNAL_SERVER_ERROR, msg) return lighpushErrorResult(LightPushErrorCode.INTERNAL_SERVER_ERROR, msg)
return await lightpushPublishHandler(node, pubsubForPublish, message, toPeer, mixify) return await lightpushPublishHandler(node, pubsubForPublish, message, toPeer, lmixify)