Skip to content

fix: resource cleanup #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: resource cleanup #454

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
482c12b
fix resource cleanup
mineme0110 May 27, 2025
341b1fd
fix resource cleanup
mineme0110 May 27, 2025
1c8a47a
fix resource cleanup
mineme0110 May 27, 2025
be4ad63
fix remov timeout
mineme0110 May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions mediator/src/main/scala/org/hyperledger/identus/mediator/DIDCommRoutes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
package org.hyperledger.identus.mediator

import zio._
import zio.json._
import zio.stream._
import zio.http._
import zio.http.Header.{AccessControlAllowOrigin, AccessControlAllowMethods}

import fmgp.crypto._
import fmgp.crypto.error._
import fmgp.did._
import fmgp.did.comm._
import fmgp.did.framework._
import fmgp.did.method.peer.DidPeerResolver
import fmgp.crypto.*
import fmgp.crypto.error.*
import fmgp.did.*
import fmgp.did.comm.*
import fmgp.did.framework.*
import fmgp.did.framework.Transport
import fmgp.did.method.peer.DIDPeer.AgentDIDPeer
import fmgp.did.method.peer.DidPeerResolver
import zio.*
import zio.http.*
import zio.http.Header.AccessControlAllowMethods
import zio.http.Header.AccessControlAllowOrigin
import zio.json.*
import zio.stream.*

object DIDCommRoutes {

Expand Down Expand Up @@ -50,10 +51,13 @@ object DIDCommRoutes {
def transmissionType = Transport.TransmissionType.SingleTransmission
def id: TransportID = TransportID.http(req.headers.get("request_id"))
def inbound: ZStream[Any, Transport.InErr, SignedMessage | EncryptedMessage] =
ZStream.fromQueue(inboundQueue)
ZStream
.fromQueue(inboundQueue)
.ensuring(inboundQueue.shutdown)
def outbound: ZSink[Any, Transport.OutErr, SignedMessage | EncryptedMessage, Nothing, Unit] =
ZSink.fromQueue(outboundQueue)

ZSink
.fromQueue(outboundQueue)
.ensuring(outboundQueue.shutdown)
// TODO def close = inboundQueue.shutdown <&> outboundQueue.shutdown
}
operator <- ZIO.service[Operator]
Expand All @@ -69,8 +73,8 @@ object DIDCommRoutes {
case Some(msg: EncryptedMessage) =>
Response(Status.Ok, Headers(MediaTypes.ENCRYPTED.asContentType), Body.fromCharSequence(msg.toJson))
}
shutdown <- inboundQueue.shutdown <&> outboundQueue.shutdown
_ <- fiber.join
_ <- fiber.interrupt.fork
_ <- inboundQueue.shutdown <&> outboundQueue.shutdown
} yield ret)
.tapErrorCause(ZIO.logErrorCause("Error", _))
.catchAllCause(cause => ZIO.succeed(Response.fromCause(cause)))
Expand Down
Loading