chore: callback compatibility for daemonapi

vacp2p · Feb 19, 2025 · a978660 · a978660
1 parent b5f657e
commit a978660
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/libp2p/daemon/daemonapi.nim b/libp2p/daemon/daemonapi.nim
@@ -146,7 +146,7 @@ type
 
   PubsubTicket* = ref object
     topic*: string
-    handler*: P2PPubSubCallback
+    handler*: P2PPubSubCallback2
     transp*: StreamTransport
 
   PubSubMessage* = object
@@ -162,8 +162,10 @@ type
   .}
   P2PPubSubCallback* = proc(
     api: DaemonAPI, ticket: PubsubTicket, message: PubSubMessage
-  ): Future[bool] {.async: (raises: [CatchableError]).}
-
+  ): Future[bool] {.gcsafe, raises: [CatchableError].}
+  P2PPubSubCallback2* = proc(
+    api: DaemonAPI, ticket: PubsubTicket, message: PubSubMessage
+  ): Future[bool] {.async:(raises: [CatchableError]).}
   DaemonError* = object of LPError
   DaemonRemoteError* = object of DaemonError
   DaemonLocalError* = object of DaemonError
@@ -1480,7 +1482,7 @@ proc pubsubLoop(
       break
 
 proc pubsubSubscribe*(
-    api: DaemonAPI, topic: string, handler: P2PPubSubCallback
+    api: DaemonAPI, topic: string, handler: P2PPubSubCallback2
 ): Future[PubsubTicket] {.
     async: (
       raises:
@@ -1508,6 +1510,13 @@ proc pubsubSubscribe*(
     await api.closeConnection(transp)
     raise exc
 
+proc pubsubSubscribe*(
+    api: DaemonAPI, topic: string, handler: P2PPubSubCallback
+): Future[PubsubTicket] {.async: (raises: [CatchableError]), deprecated: "Use P2PPubSubCallback2 instead".} =
+  proc wrap(api: DaemonAPI, ticket: PubsubTicket, message: PubSubMessage): Future[bool] {.async:(raises: [CatchableError]).} =
+    await handler(api, ticket, message)
+  await pubsubSubscribe(api, topic, wrap)
+
 proc shortLog*(pinfo: PeerInfo): string =
   ## Get string representation of ``PeerInfo`` object.
   result = newStringOfCap(128)