libwaku store enhancements

library/libwaku.nim

@@ -662,7 +662,7 @@ proc waku_store_query(
   handleRequest(
     ctx,
     RequestType.STORE,
-    JsonStoreQueryRequest.createShared(jsonQuery, peerAddr, timeoutMs),
+    StoreRequest.createShared(StoreReqType.REMOTE_QUERY, jsonQuery, peerAddr, timeoutMs),
     callback,
     userData,
   )

library/waku_thread/inter_thread_communication/requests/protocols/store_request.nim

@@ -14,31 +14,27 @@ import
 type StoreReqType* = enum
   REMOTE_QUERY ## to perform a query to another Store node
 
-type JsonStoreQueryRequest* = object
+type StoreRequest* = object
+  operation: StoreReqType
   jsonQuery: cstring
   peerAddr: cstring
   timeoutMs: cint
 
-type StoreRequest* = object
-  operation: StoreReqType
-  storeReq: pointer
-
-func fromJsonNode(
-    T: type JsonStoreQueryRequest, jsonContent: JsonNode
-): Result[StoreQueryRequest, string] =
+func fromJsonNode(T: type StoreRequest, jsonContent: JsonNode): StoreQueryRequest =
   let contentTopics = collect(newSeq):
     for cTopic in jsonContent["content_topics"].getElems():
       cTopic.getStr()
 
   let msgHashes = collect(newSeq):
-    for hashJsonObj in jsonContent["message_hashes"].getElems():
-      var hash: WakuMessageHash
-      var count: int = 0
-      for byteValue in hashJsonObj.getElems():
-        hash[count] = byteValue.getInt().byte
-        count.inc()
+    if jsonContent.contains("message_hashes"):
+      for hashJsonObj in jsonContent["message_hashes"].getElems():
+        var hash: WakuMessageHash
+        var count: int = 0
+        for byteValue in hashJsonObj.getElems():
+          hash[count] = byteValue.getInt().byte
+          count.inc()
 
-      hash
+        hash
 
   let pubsubTopic =
     if jsonContent.contains("pubsub_topic"):
@@ -84,24 +80,26 @@ func fromJsonNode(
   )
 
 proc createShared*(
-    T: type JsonStoreQueryRequest,
+    T: type StoreRequest,
+    op: StoreReqType,
     jsonQuery: cstring,
     peerAddr: cstring,
     timeoutMs: cint,
 ): ptr type T =
   var ret = createShared(T)
+  ret[].operation = op
   ret[].timeoutMs = timeoutMs
   ret[].jsonQuery = jsonQuery.alloc()
   ret[].peerAddr = peerAddr.alloc()
   return ret
 
-proc destroyShared(self: ptr JsonStoreQueryRequest) =
+proc destroyShared(self: ptr StoreRequest) =
   deallocShared(self[].jsonQuery)
   deallocShared(self[].peerAddr)
   deallocShared(self)
 
-proc process(
-    self: ptr JsonStoreQueryRequest, waku: ptr Waku
+proc process_remote_query(
+    self: ptr StoreRequest, waku: ptr Waku
 ): Future[Result[string, string]] {.async.} =
   defer:
     destroyShared(self)
@@ -110,17 +108,15 @@ proc process(
     parseJson($self[].jsonQuery)
 
   if jsonContentRes.isErr():
-    return err(
-      "JsonStoreQueryRequest failed parsing store request: " & jsonContentRes.error.msg
-    )
+    return err("StoreRequest failed parsing store request: " & jsonContentRes.error.msg)
 
-  let storeQueryRequest = JsonStoreQueryRequest.fromJsonNode(jsonContentRes.get())
+  let storeQueryRequest = StoreRequest.fromJsonNode(jsonContentRes.get())
 
   let peer = peers.parsePeerInfo(($self[].peerAddr).split(",")).valueOr:
-    return err("JsonStoreQueryRequest failed to parse peer addr: " & $error)
+    return err("StoreRequest failed to parse peer addr: " & $error)
 
   let queryResponse = (await waku.node.wakuStoreClient.query(?storeQueryRequest, peer)).valueOr:
-    return err("JsonStoreQueryRequest failed store query: " & $error)
+    return err("StoreRequest failed store query: " & $error)
 
   return ok($(%*queryResponse)) ## returning the response in json format
 
@@ -132,7 +128,7 @@ proc process*(
 
   case self.operation
   of REMOTE_QUERY:
-    return await cast[ptr JsonStoreQueryRequest](self[].storeReq).process(waku)
+    return await self.process_remote_query(waku)
 
   error "store request not handled at all"
   return err("store request not handled at all")