Fix cache with HTTP2 (#2380)

xc2 · web-flow · commit f2f8cb29fe9f · 2024-10-09T12:56:20.000+07:00
diff --git a/source/core/index.ts b/source/core/index.ts
@@ -1001,13 +1001,13 @@ export default class Request extends Duplex implements RequestEvents<Request> {
 										handler(error);
 									}
 								})();
-							} else if (event === 'abort') {
+							} else if (event === 'abort' || event === 'destroy') {
 								// The empty catch is needed here in case when
 								// it rejects before it's `await`ed in `_makeRequest`.
 								(async () => {
 									try {
 										const request = (await result) as ClientRequest;
-										request.once('abort', handler);
+										request.once(event, handler);
 									} catch {}
 								})();
 							} else {
diff --git a/test/cache.ts b/test/cache.ts
@@ -179,6 +179,15 @@ test('doesn\'t cache response when received HTTP error', withServer, async (t, s
 	t.is(body, 'ok');
 });
 
+test('cache should work with http2', async t => {
+	const instance = got.extend({
+		cache: true,
+		http2: true,
+	});
+
+	await t.notThrowsAsync(instance('https://example.com'));
+});
+
 test('DNS cache works', async t => {
 	const instance = got.extend({
 		dnsCache: true,
