apm-1717: remove agent keepalive from sync-wrap

Author: matt-mercer

docker/sync-wrap/package-lock.json

@@ -9,7 +9,6 @@
   "author": "",
   "license": "",
   "dependencies": {
-    "agentkeepalive": "^4.1.3",
     "express": "^5.0.0-alpha.8",
     "loglevel": "^1.7.1",
     "uuid": "^8.3.2"

docker/sync-wrap/package.json

@@ -8,40 +8,29 @@ const uuid = require('uuid');
 function setup(options) {
     options = options || {};
     app.locals.app_name = options.APP_NAME || 'sync-wrap';
-    app.locals.upstream = new URL(options.UPSTREAM || "http://localhost");
+    app.locals.upstream = new URL(options.UPSTREAM || "http://localhost:9003");
     app.locals.version_info = JSON.parse(options.VERSION_INFO || '{}');
     app.locals.base_path = app.locals.upstream.pathname === "/" ? "" : app.locals.upstream.pathname;
     log.setLevel(options.LOG_LEVEL || "info");
     app.locals.allow_insecure = (options.ALLOW_INSECURE || "false") === "true";
     app.locals.unbotli = (options.UNBOTLI || "false") === "true";
     app.locals.max_sleep = parseFloat(options.MAX_SLEEP || 5);
     app.locals.default_syncwait = parseFloat(options.DEFAULT_SYNCWAIT || 5);
-    let keepalive = (options.KEEPALIVE || "true") === "true";
 
     let https = app.locals.upstream.protocol === "https:";
 
+    app.locals.conn = https ? require("https") : require("http");
 
     let default_options = {
         host: app.locals.upstream.hostname,
         port: app.locals.upstream.port
     };
 
-    if (keepalive) {
-        let Agent = https ? require("agentkeepalive").HttpsAgent : require("agentkeepalive");
-        default_options.agent = new Agent({
-            maxSockets: 1000,
-            maxFreeSockets: 100,
-            timeout: 900000, // active socket keepalive for 15 mins ?
-            freeSocketTimeout: 30000 // free socket keepalive for 30 seconds
-        });
-    }
-
     if (app.locals.allow_insecure) {
         default_options.rejectUnauthorized = false;
     }
 
     app.locals.default_options = default_options;
-    app.locals.conn = https ? require("https") : require("http");
 
     log.info(JSON.stringify({
         timestamp: Date.now(),
@@ -109,11 +98,6 @@ function after_request(req, res, next) {
         version: app.locals.version_info
     };
 
-    if (req.path === "/_status") {
-        let agent = req.app.locals.default_options.agent;
-        log_entry.agent_status = agent.getCurrentStatus();
-    }
-
     if (log.getLevel()<2) {
         // debug
         log_entry.req.headers = (req.rawHeaders || []).asMultiValue();

docker/sync-wrap/src/app.js

@@ -2,9 +2,10 @@
 
 const log = require("loglevel");
 const querystring = require("querystring");
-const util = require("util");
 const stream = require("stream");
-const pipeline = util.promisify(stream.pipeline);
+const { promisify } = require('util')
+const pipeline = promisify(stream.pipeline);
+const sleep = promisify(setTimeout)
 const zlib = require("zlib");
 
 
@@ -241,11 +242,7 @@ const lazy_log = (res, log_level, options = {}) => {
     log[log_level](JSON.stringify(log_line))
 };
 
-const sleep = (delay) => {
-    return new Promise(resolve => {
-        setTimeout(resolve, delay)
-    });
-};
+
 
 function ping_response(req) {
     return {
@@ -264,7 +261,7 @@ async function ping(req, res, next) {
 }
 
 async function status(req, res, next) {
-    res.locals.status = true;
+    res.locals.handled = true;
 
     let response = ping_response(req);