Revert and improve connection handle in NpmRegistry (#381)

* Revert "Add callback for node20 timeouts in npm registry (#377)"

* Adding better connection handling

* Update package-lock.json

* Updating test cases

Author: AlexVTor

common-npm-packages/packaging-common/Tests/npm/npmL0.ts

@@ -2,7 +2,6 @@ import * as assert from "assert";
 import * as mocker from "azure-pipelines-task-lib/lib-mocker";
 
 import Lazy_NpmRegistry = require('../../npm/npmregistry');
-const EventEmitter = require('events');
 
 const BASIC_AUTH_PAT_PASSWD_REGEX = /\/\/.*\/:_password=.*/g;
 const BEARER_AUTH_REGEX = /\/\/.*\/:_authToken=AUTHTOKEN.*/g;
@@ -161,20 +160,15 @@ export function npmcommon() {
             HttpClient: function() {
                 return {
                     get: function(url, headers) {
-                        const emitter = new EventEmitter();
-                        process.nextTick(() => {
-                            emitter.emit('data', 'somedata');
-                            emitter.emit('end');
-                        });
                         return {
                         then: function(handler) {
                             handler({
                                 message: {
                                     statusCode: 401,
-                                    rawHeaders: ['x-tfs-foo: abc', 'x-content-type-options: nosniff', 'X-Powered-By: ASP.NET'],
-                                    on: emitter.on.bind(emitter),
-                                    once: emitter.once.bind(emitter),
-                                    removeListener: emitter.removeListener.bind(emitter)   
+                                    rawHeaders: ['x-tfs-foo: abc', 'x-content-type-options: nosniff', 'X-Powered-By: ASP.NET']
+                                },
+                                readBody: function() {
+                                    return Promise.resolve('mocked body content');
                                 }
                             });
                         }
@@ -224,20 +218,15 @@ export function npmcommon() {
             HttpClient: function() {
                 return {
                     get: function(url, headers) {
-                        const emitter = new EventEmitter();
-                        process.nextTick(() => {
-                            emitter.emit('data', 'somedata');
-                            emitter.emit('end');
-                        });
                         return {
                         then: function(handler) {
                             handler({
                                 message: {
                                     statusCode: 401,
-                                    rawHeaders: ['x-content-type-options: nosniff', 'X-Powered-By: ASP.NET'],
-                                    on: emitter.on.bind(emitter),
-                                    once: emitter.once.bind(emitter),
-                                    removeListener: emitter.removeListener.bind(emitter)    
+                                    rawHeaders: ['x-content-type-options: nosniff', 'X-Powered-By: ASP.NET']
+                                },
+                                readBody: function() {
+                                    return Promise.resolve('mocked body content');
                                 }
                             });
                         }

common-npm-packages/packaging-common/npm/npmregistry.ts

@@ -107,41 +107,16 @@ export class NpmRegistry implements INpmRegistry {
         headers['X-TFS-FedAuthRedirect'] = 'Suppress';
 
         const endpointClient = new HttpClient(tl.getVariable('AZURE_HTTP_USER_AGENT'), null, requestOptions);
-        
-        return new Promise<boolean>((resolve, reject) => {
-            try {
-                endpointClient.get(endpointUri, headers).then((res) => {
-                    if (res.message.statusCode) {
-                        // Define event listener functions
-                        const onData = () => {};
-                        const onEnd = () => {
-                            cleanup();
-                            resolve (res.message.rawHeaders !== null && res.message.rawHeaders.some(t => t.toLowerCase().indexOf('x-tfs') >= 0 || t.toLowerCase().indexOf('x-vss') >= 0));
-                        };
-                        const onError = (err) => {
-                            cleanup();
-                            throw(err);
-                        };
-
-                        const cleanup = () => {
-                            res.message.removeListener('data', onData);
-                            res.message.removeListener('end', onEnd);
-                            res.message.removeListener('error', onError);
-                        };
-
-                        // Attach event listeners
-                        res.message.on('data', onData);
-                        res.message.once('end', onEnd);
-                        res.message.once('error', onError);
-                    } else {
-                        throw new Error('No status code received from the response');
-                    }
-                });
-            } catch (error) {
-                tl.debug(error);
-                reject(false);
-            }
-        });
+        try {
+            const resp = await endpointClient.get(endpointUri, headers);
+            
+            // Read the body to prevent leaking connections
+            resp.readBody();
+            return resp.message.rawHeaders !== null && resp.message.rawHeaders.some( t => t.toLowerCase().indexOf('x-tfs') >= 0 || t.toLowerCase().indexOf('x-vss') >= 0 );
+        } catch (error) {
+            tl.debug(error);
+            return false;
+        }
     }
 
     public static async FromFeedId(packagingUri: string, feedId: string, project: string, authOnly?: boolean, useSession?: boolean): Promise<NpmRegistry> {

common-npm-packages/packaging-common/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "azure-pipelines-tasks-packaging-common",
-    "version": "3.245.1",
+    "version": "3.245.2",
     "description": "Azure Pipelines Packaging Tasks Common",
     "scripts": {
         "test": "mocha _build/Tests/L0.js",