search

daemons/node/stream/handler.go

@@ -114,10 +114,15 @@ func (abs *StreamService) sendPlanner(event *common.Event) error { //
 }
 
 func (abs *StreamService) retrieveResponse(event *common.Event) error { //
+	if !abs.ResourceSearches.IsActive(event.User) {
+		return nil // search already closed or timed out
+	}
 	res, err := resources.ToResource(int(event.DataType), event.Payload)
 	if err != nil || res == nil {
 		return nil
 	}
+	// A response arrived — reset the idle timeout.
+	abs.ResourceSearches.ResetIdle(event.User)
 	b, err := json.Marshal(res.Serialize(res))
 	go tools.NewNATSCaller().SetNATSPub(tools.SEARCH_EVENT, tools.NATSResponse{
 		FromApp:  "oc-discovery",

daemons/node/stream/service.go

@@ -51,22 +51,24 @@ var protocolsPartners = map[protocol.ID]*common.ProtocolInfo{
 }
 
 type StreamService struct {
-	Key          pp.ID
-	Host         host.Host
-	Node         common.DiscoveryPeer
-	Streams      common.ProtocolStream
-	maxNodesConn int
-	Mu           sync.RWMutex
+	Key             pp.ID
+	Host            host.Host
+	Node            common.DiscoveryPeer
+	Streams         common.ProtocolStream
+	maxNodesConn    int
+	Mu              sync.RWMutex
+	ResourceSearches *common.SearchTracker
 }
 
 func InitStream(ctx context.Context, h host.Host, key pp.ID, maxNode int, node common.DiscoveryPeer) (*StreamService, error) {
 	logger := oclib.GetLogger()
 	service := &StreamService{
-		Key:          key,
-		Node:         node,
-		Host:         h,
-		Streams:      common.ProtocolStream{},
-		maxNodesConn: maxNode,
+		Key:              key,
+		Node:             node,
+		Host:             h,
+		Streams:          common.ProtocolStream{},
+		maxNodesConn:     maxNode,
+		ResourceSearches: common.NewSearchTracker(),
 	}
 	for proto := range protocols {
 		service.Host.SetStreamHandler(proto, service.HandleResponse)