fix(pubsub): remove messages from leasing on nackWithResponse (googleapis#7817)

feywind · web-flow · commit 841f0ca06d3d · 2026-03-31T17:22:16.000-04:00
* fix(pubsub): remove messages from leasing on nackWithResponse

* chore: remove extra whitespace in test
diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts
@@ -1163,6 +1163,8 @@ export class Subscriber extends EventEmitter {
     const response = await this.modAckWithResponse(message, 0);
     message.subSpans.nackEnd();
     message.endParentSpan();
+    this._inventory.remove(message);
+
     return response;
   }
 
diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts
@@ -918,13 +918,22 @@ describe('Subscriber', () => {
   });
 
   describe('nack', () => {
-    it('should modAck the message with a 0 deadline', async () => {
+    it('should modAck the message with a 0 deadline (nack)', async () => {
       const stub = sandbox.stub(subscriber, 'modAck');
 
       await subscriber.nack(message);
 
       const [msg, deadline] = stub.lastCall.args;
+      assert.strictEqual(msg, message);
+      assert.strictEqual(deadline, 0);
+    });
+
+    it('should modAck the message with a 0 deadline (nackWithResponse)', async () => {
+      const stub = sandbox.stub(subscriber, 'modAckWithResponse');
 
+      await subscriber.nackWithResponse(message);
+
+      const [msg, deadline] = stub.lastCall.args;
       assert.strictEqual(msg, message);
       assert.strictEqual(deadline, 0);
     });
@@ -942,14 +951,23 @@ describe('Subscriber', () => {
       assert.strictEqual(fakeLog.args![1], message.id);
     });
 
-    it('should remove the message from the inventory', async () => {
+    it('should remove the message from the inventory (nack)', async () => {
       const inventory: FakeLeaseManager = stubs.get('inventory');
       const stub = sandbox.stub(inventory, 'remove').withArgs(message);
 
       await subscriber.nack(message);
 
       assert.strictEqual(stub.callCount, 1);
     });
+
+    it('should remove the message from the inventory (nackWithResponse)', async () => {
+      const inventory: FakeLeaseManager = stubs.get('inventory');
+      const stub = sandbox.stub(inventory, 'remove').withArgs(message);
+
+      await subscriber.nackWithResponse(message);
+
+      assert.strictEqual(stub.callCount, 1);
+    });
   });
 
   describe('open', () => {

Original file line number	Diff line number	Diff line change
`@@ -1163,6 +1163,8 @@ export class Subscriber extends EventEmitter {`
`1163`	`1163`	`const response = await this.modAckWithResponse(message, 0);`
`1164`	`1164`	`message.subSpans.nackEnd();`
`1165`	`1165`	`message.endParentSpan();`
	`1166`	`+ this._inventory.remove(message);`
	`1167`	`+`
`1166`	`1168`	`return response;`
`1167`	`1169`	`}`
`1168`	`1170`