fix: adpater http/2 agent on diagnosticsChannel (#511)

#510

Author: fengmk2

.github/workflows/nodejs.yml

@@ -3,7 +3,6 @@ name: CI
 on:
   push:
     branches: [ master ]
-
   pull_request:
     branches: [ master ]
 
@@ -13,5 +12,6 @@ jobs:
     uses: node-modules/github-actions/.github/workflows/node-test.yml@master
     with:
       os: 'ubuntu-latest, macos-latest, windows-latest'
-      version: '14.19.3, 14, 16, 18, 20, 21'
-      install: 'npx npminstall'
+      version: '14.19.3, 14, 16, 18, 20, 22'
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/release.yml

@@ -11,5 +11,3 @@ jobs:
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
-    with:
-      install: 'npx npminstall'

src/diagnosticsChannel.ts

@@ -184,10 +184,15 @@ export function initDiagnosticsChannel() {
 
     // get socket from opaque
     const socket = opaque[symbols.kRequestSocket];
-    socket[symbols.kHandledResponses]++;
-    debug('[%s] Request#%d get %s response headers on Socket#%d (handled %d responses, sock: %o)',
-      name, opaque[symbols.kRequestId], response.statusCode, socket[symbols.kSocketId], socket[symbols.kHandledResponses],
-      formatSocket(socket));
+    if (socket) {
+      socket[symbols.kHandledResponses]++;
+      debug('[%s] Request#%d get %s response headers on Socket#%d (handled %d responses, sock: %o)',
+        name, opaque[symbols.kRequestId], response.statusCode, socket[symbols.kSocketId], socket[symbols.kHandledResponses],
+        formatSocket(socket));
+    } else {
+      debug('[%s] Request#%d get %s response headers on Unknown Socket',
+        name, opaque[symbols.kRequestId], response.statusCode);
+    }
 
     if (!opaque[symbols.kEnableRequestTiming]) return;
     opaque[symbols.kRequestTiming].waiting = performanceTime(opaque[symbols.kRequestStartTime]);
@@ -197,7 +202,9 @@ export function initDiagnosticsChannel() {
   subscribe('undici:request:trailers', (message, name) => {
     const { request } = message as DiagnosticsChannel.RequestTrailersMessage;
     const opaque = getRequestOpaque(request, kHandler);
-    if (!opaque || !opaque[symbols.kRequestId]) return;
+    if (!opaque || !opaque[symbols.kRequestId]) {
+      return;
+    }
 
     debug('[%s] Request#%d get response body and trailers', name, opaque[symbols.kRequestId]);
 

test/index.test.ts

@@ -32,7 +32,7 @@ describe('index.test.ts', () => {
       assert.equal(response.url, `${_url}html`);
       assert(!response.redirected);
       assert.equal(getDefaultHttpClient(), getDefaultHttpClient());
-      console.log('stats %o', getDefaultHttpClient().getDispatcherPoolStats());
+      // console.log('stats %o', getDefaultHttpClient().getDispatcherPoolStats());
     });
   });
 
@@ -76,7 +76,7 @@ describe('index.test.ts', () => {
         dataType: 'json',
       });
       assert.equal(response.status, 200);
-      console.log(response.data.hello);
+      // console.log(response.data.hello);
     });
 
     it('should curl alias to request', async () => {

test/keep-alive-header.test.ts

@@ -31,7 +31,7 @@ describe('keep-alive-header.test.ts', () => {
       count++;
       try {
         const task = httpClient.request(_url);
-        console.log('after request stats: %o', httpClient.getDispatcherPoolStats());
+        // console.log('after request stats: %o', httpClient.getDispatcherPoolStats());
         if (httpClient.getDispatcherPoolStats()[origin]) {
           if (!(nodeMajorVersion() === 14 || isWindows())) {
             // ignore node = 14 & windows
@@ -40,7 +40,7 @@ describe('keep-alive-header.test.ts', () => {
           }
         }
         let response = await task;
-        console.log('after response stats: %o', httpClient.getDispatcherPoolStats());
+        // console.log('after response stats: %o', httpClient.getDispatcherPoolStats());
         assert.equal(httpClient.getDispatcherPoolStats()[origin].pending, 0);
         assert.equal(httpClient.getDispatcherPoolStats()[origin].connected, 1);
         // console.log(response.res.socket);
@@ -129,12 +129,12 @@ describe('keep-alive-header.test.ts', () => {
         assert.equal(response.headers.connection, 'keep-alive');
         assert.equal(response.headers['keep-alive'], 'timeout=2');
         assert(parseInt(response.headers['x-requests-persocket'] as string) > 1);
-        console.log('before sleep stats: %o', httpClient.getDispatcherPoolStats());
+        // console.log('before sleep stats: %o', httpClient.getDispatcherPoolStats());
         // { connected: 2, free: 1, pending: 0, queued: 0, running: 0, size: 0 }
         assert.equal(httpClient.getDispatcherPoolStats()[origin].connected, 2);
         assert.equal(httpClient.getDispatcherPoolStats()[origin].free, 1);
         await sleep(keepAliveTimeout);
-        console.log('after sleep stats: %o', httpClient.getDispatcherPoolStats());
+        // console.log('after sleep stats: %o', httpClient.getDispatcherPoolStats());
         // clients maybe all gone => after sleep stats: {}
         // { connected: 0, free: 0, pending: 0, queued: 0, running: 0, size: 0 }
         // { connected: 1, free: 1, pending: 0, queued: 0, running: 0, size: 0 }

test/options.dispatcher.test.ts

@@ -1,7 +1,7 @@
 import { strict as assert } from 'node:assert';
 import { describe, it, beforeAll, afterAll } from 'vitest';
 import setup from 'proxy';
-import { request, ProxyAgent, getGlobalDispatcher, setGlobalDispatcher } from '../src';
+import { request, ProxyAgent, getGlobalDispatcher, setGlobalDispatcher, Agent } from '../src';
 import { startServer } from './fixtures/server';
 
 describe('options.dispatcher.test.ts', () => {
@@ -62,4 +62,19 @@ describe('options.dispatcher.test.ts', () => {
     assert.equal(response.data, '<h1>hello</h1>');
     setGlobalDispatcher(agent);
   });
+
+  it('should work with http/2 dispatcher', async () => {
+    // https://github.com/nodejs/undici/issues/2750#issuecomment-1941009554
+    const agent = new Agent({
+      allowH2: true,
+    });
+    assert(agent);
+    const response = await request('https://registry.npmmirror.com', {
+      dataType: 'json',
+      timing: true,
+      dispatcher: agent,
+    });
+    assert.equal(response.status, 200);
+    assert.equal(response.headers['content-type'], 'application/json; charset=utf-8');
+  });
 });