@tramvai/module-http-proxy-agent 1.85.0 → 1.90.2

package/lib/add-proxy-to-https-agent/add-proxy-to-https-agent.d.ts

@@ -2,6 +2,7 @@
 import type { AgentOptions } from 'https';
 import type { Socket } from 'net';
 import type { LOGGER_TOKEN } from '@tramvai/tokens-common';
+import type { METRICS_MODULE_TOKEN } from '@tramvai/tokens-metrics';
 declare type Proxy = {
     hostname: string;
     port: number;
@@ -28,7 +29,8 @@ export interface ConnectOptions {
 /**
  * Fork of https://github.com/mknj/node-keepalive-proxy-agent with monkeypatching and no_proxy support
  */
-export declare const addProxyToHttpsAgent: ({ logger }: {
+export declare const addProxyToHttpsAgent: ({ logger, metrics, }: {
     logger: ReturnType<typeof LOGGER_TOKEN>;
+    metrics: typeof METRICS_MODULE_TOKEN;
 }) => void;
 export {};

package/lib/server.es.js

@@ -1,6 +1,7 @@
 import { __decorate } from 'tslib';
 import { Module, commandLineListTokens } from '@tramvai/core';
 import { LOGGER_TOKEN } from '@tramvai/tokens-common';
+import { METRICS_MODULE_TOKEN } from '@tramvai/tokens-metrics';
 import https from 'https';
 import net from 'net';
 import url from 'url';
@@ -52,10 +53,15 @@ const matchNoProxy = ({ noProxy, hostname, }) => {
 /**
  * Fork of https://github.com/mknj/node-keepalive-proxy-agent with monkeypatching and no_proxy support
  */
-const addProxyToHttpsAgent = ({ logger }) => {
+const addProxyToHttpsAgent = ({ logger, metrics, }) => {
     const httpsProxyEnv = getHttpsProxy();
     const noProxyEnv = getNoProxy();
     const noProxyMatchResults = {};
+    const metricsConnectionCounter = metrics.counter({
+        name: 'http_proxy_connect_total',
+        help: 'Number of proxy connects',
+        labelNames: ['host'],
+    });
     if (!httpsProxyEnv) {
         return;
     }
@@ -89,11 +95,16 @@ const addProxyToHttpsAgent = ({ logger }) => {
     }
     function createConnectionHttpsAfterHttp(options, cb) {
         const proxySocket = net.connect(+proxy.port, proxy.hostname);
+        const host = options.hostname || options.host;
         const errorListener = (error) => {
             proxySocket.destroy();
             cb(error);
         };
+        const successConnectionListener = () => {
+            metricsConnectionCounter.inc({ host });
+        };
         proxySocket.once('error', errorListener);
+        proxySocket.on('connect', successConnectionListener);
         let response = '';
         const dataListener = (data) => {
             response += data.toString();
@@ -117,10 +128,6 @@ const addProxyToHttpsAgent = ({ logger }) => {
             cb(null, originalCreateConnection.call(this, options));
         };
         proxySocket.on('data', dataListener);
-        let host = options.hostname;
-        if (!host) {
-            host = options.host;
-        }
         // https://datatracker.ietf.org/doc/html/rfc7231#section-4.3.6
         let cmd = `CONNECT ${host}:${options.port} HTTP/1.1\r\n`;
         cmd += `Host: ${host}:${options.port}\r\n`;
@@ -148,17 +155,18 @@ HttpProxyAgentModule = __decorate([
             httpProxyEnabled() && {
                 provide: commandLineListTokens.init,
                 multi: true,
-                useFactory: ({ loggerFactory }) => function addHttpsProxy() {
+                useFactory: ({ loggerFactory, metrics }) => function addHttpsProxy() {
                     const logger = loggerFactory('http-proxy-agent');
                     logger.debug({
                         event: 'proxy agent enabled',
                         proxyEnv: getHttpsProxy(),
                         noProxyEnv: getNoProxy(),
                     });
-                    addProxyToHttpsAgent({ logger });
+                    addProxyToHttpsAgent({ logger, metrics });
                 },
                 deps: {
                     loggerFactory: LOGGER_TOKEN,
+                    metrics: METRICS_MODULE_TOKEN,
                 },
             },
         ].filter(Boolean),

package/lib/server.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var core = require('@tramvai/core');
 var tokensCommon = require('@tramvai/tokens-common');
+var tokensMetrics = require('@tramvai/tokens-metrics');
 var https = require('https');
 var net = require('net');
 var url = require('url');
@@ -62,10 +63,15 @@ const matchNoProxy = ({ noProxy, hostname, }) => {
 /**
  * Fork of https://github.com/mknj/node-keepalive-proxy-agent with monkeypatching and no_proxy support
  */
-const addProxyToHttpsAgent = ({ logger }) => {
+const addProxyToHttpsAgent = ({ logger, metrics, }) => {
     const httpsProxyEnv = getHttpsProxy();
     const noProxyEnv = getNoProxy();
     const noProxyMatchResults = {};
+    const metricsConnectionCounter = metrics.counter({
+        name: 'http_proxy_connect_total',
+        help: 'Number of proxy connects',
+        labelNames: ['host'],
+    });
     if (!httpsProxyEnv) {
         return;
     }
@@ -99,11 +105,16 @@ const addProxyToHttpsAgent = ({ logger }) => {
     }
     function createConnectionHttpsAfterHttp(options, cb) {
         const proxySocket = net__default["default"].connect(+proxy.port, proxy.hostname);
+        const host = options.hostname || options.host;
         const errorListener = (error) => {
             proxySocket.destroy();
             cb(error);
         };
+        const successConnectionListener = () => {
+            metricsConnectionCounter.inc({ host });
+        };
         proxySocket.once('error', errorListener);
+        proxySocket.on('connect', successConnectionListener);
         let response = '';
         const dataListener = (data) => {
             response += data.toString();
@@ -127,10 +138,6 @@ const addProxyToHttpsAgent = ({ logger }) => {
             cb(null, originalCreateConnection.call(this, options));
         };
         proxySocket.on('data', dataListener);
-        let host = options.hostname;
-        if (!host) {
-            host = options.host;
-        }
         // https://datatracker.ietf.org/doc/html/rfc7231#section-4.3.6
         let cmd = `CONNECT ${host}:${options.port} HTTP/1.1\r\n`;
         cmd += `Host: ${host}:${options.port}\r\n`;
@@ -158,17 +165,18 @@ exports.HttpProxyAgentModule = tslib.__decorate([
             httpProxyEnabled() && {
                 provide: core.commandLineListTokens.init,
                 multi: true,
-                useFactory: ({ loggerFactory }) => function addHttpsProxy() {
+                useFactory: ({ loggerFactory, metrics }) => function addHttpsProxy() {
                     const logger = loggerFactory('http-proxy-agent');
                     logger.debug({
                         event: 'proxy agent enabled',
                         proxyEnv: getHttpsProxy(),
                         noProxyEnv: getNoProxy(),
                     });
-                    addProxyToHttpsAgent({ logger });
+                    addProxyToHttpsAgent({ logger, metrics });
                 },
                 deps: {
                     loggerFactory: tokensCommon.LOGGER_TOKEN,
+                    metrics: tokensMetrics.METRICS_MODULE_TOKEN,
                 },
             },
         ].filter(Boolean),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-http-proxy-agent",
-  "version": "1.85.0",
+  "version": "1.90.2",
   "description": "Enable support for http_proxy, https_proxy and no_proxy env variables",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -24,12 +24,13 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@tramvai/tokens-common": "1.85.0"
+    "@tramvai/tokens-common": "1.90.2"
   },
   "devDependencies": {},
   "peerDependencies": {
-    "@tramvai/core": "1.85.0",
+    "@tramvai/core": "1.90.2",
     "@tinkoff/dippy": "0.7.39",
+    "@tramvai/tokens-metrics": "1.90.2",
     "tslib": "^2.0.3"
   }
 }