fix: cancel message check

Author: vasco-santos

src/handler.js

@@ -187,7 +187,14 @@ async function batchResponse ({ blocks, context, logger }) {
     for (let i = 0; i < blocks.length; i++) {
       const block = blocks[i]
       const canceledItem = context.canceled.get(block.key)
-      if (!canceledItem || canceledItem !== block.type) {
+
+      if (canceledItem === block.wantType) {
+        const size = messageSize[block.type](block)
+        telemetry.increaseLabelCount('bitswap-block-success-cancel', [block.type])
+        telemetry.increaseLabelCount('bitswap-cancel-size', [block.type], size)
+
+        context.canceled.delete(block.key)
+      } else {
         const size = messageSize[block.type](block)
 
         // maxMessageSize MUST BE larger than a single block info/data
@@ -198,12 +205,6 @@ async function batchResponse ({ blocks, context, logger }) {
 
         message.push(block, size, context.protocol)
         sentMetrics[block.type](block, size)
-      } else {
-        const size = messageSize[block.type](block)
-        telemetry.increaseLabelCount('bitswap-block-success-cancel', [block.type])
-        telemetry.increaseLabelCount('bitswap-cancel-size', [block.type], size)
-
-        context.canceled.delete(block.key)
       }
     }
 

src/service.js

@@ -145,8 +145,6 @@ async function startService ({ peerId, port, peerAnnounceAddr, awsClient, connec
           // Note: we never write to this stream - responses are always sent on
           // another multiplexed stream.
           connection.on('end:receive', () => {
-            // GC canceled LRU on finish
-            canceled.clear()
             connection.close()
           })
 

test/handler.test.js

@@ -197,7 +197,7 @@ t.test('handle', async t => {
 
     await handle({ context: contextSpy, logger: loggerSpy, batchSize: 1 })
 
-    t.equal(connectionSpy.send.callCount, 2) // Only two sends in the 4 block messages
+    t.equal(connectionSpy.send.callCount, 1) // Only one sends in the 4 block messages given other gets canceled
   })
 
   t.test('should handle a request with single batch canceling requested items', async t => {
@@ -356,7 +356,7 @@ t.test('handle', async t => {
     ])
 
     t.equal(response.blocksInfo.length, 2)
-    t.equal(response.blocksData.length, 2)
+    t.equal(response.blocksData.length, 1)
 
     t.ok(responseContainsInfo(response, cid7, BlockPresence.Type.Have))
     t.ok(responseContainsInfo(response, cid9, BlockPresence.Type.Have))