coding-tool-x 3.9.4 → 3.9.5-261012

package/src/platforms/drivers/claude/proxy-implementation.js

@@ -19,14 +19,15 @@ const {
 const { persistProxyRequestSnapshot, persistClaudeRequestTemplate } = require('../../../server/services/request-logger');
 const { redirectModel, normalizeGatewaySourceType } = require('../../../shared/proxy-utils');
 const { handleClaudeOpenAiGatewayRequest } = require('./openai-gateway');
-const { attachServerShutdownHandling, expediteServerShutdown } = require('../../../server/services/server-shutdown');
+const { bindProxyRequest, prepareProxyResponse } = require('../../../shared/proxy-transport');
+const { attachServerShutdownHandling, expediteServerShutdown, PROXY_IDLE_TIMEOUT_MS } = require('../../../server/services/server-shutdown');
 
 let proxyServer = null;
 let proxyApp = null;
 let currentPort = null;
 
 // 用于存储每个请求的元数据（用于 WebSocket 日志）
-const requestMetadata = new Map();
+let requestMetadata = new WeakMap();
 
 // 用于缓存已打印过的模型重定向规则，避免重复打印
 // 格式: { channelId: { "originalModel": "redirectedModel", ... } }
@@ -35,7 +36,7 @@ const printedRedirectCache = new Map();
 const jsonBodyParser = express.json({
   limit: '100mb',
   verify: (req, res, buf) => {
-    req.rawBody = Buffer.from(buf);
+    req.rawBody = buf;
   }
 });
 
@@ -174,6 +175,7 @@ async function startProxyServer(options = {}) {
     const proxy = httpProxy.createProxyServer({});
 
     proxy.on('proxyReq', (proxyReq, req, res) => {
+      bindProxyRequest(proxyReq, res);
       const selectedChannel = req.selectedChannel;
       if (selectedChannel) {
         const requestId = `${Date.now()}-${Math.random()}`;
@@ -238,9 +240,10 @@ async function startProxyServer(options = {}) {
         };
 
         req.__releaseChannel = release;
-
+        res.on('finish', release);
         res.on('close', release);
         res.on('error', release);
+        if (res.destroyed || res.writableEnded) { release(); return; }
 
         const effectiveKey = getEffectiveApiKey(channel);
         if (!effectiveKey) {
@@ -306,8 +309,8 @@ async function startProxyServer(options = {}) {
         const proxyOptions = {
           target: channel.baseUrl,
           changeOrigin: true,
-          proxyTimeout: 120000,  // 代理连接超时 2 分钟
-          timeout: 120000        // 请求超时 2 分钟
+          proxyTimeout: PROXY_IDLE_TIMEOUT_MS,  // Allow long reasoning gaps without an unbounded upstream wait
+          timeout: 0            // The upstream timeout bounds idle waits; streaming clients may pause
         };
 
         if (channel.proxyUrl) {
@@ -329,6 +332,7 @@ async function startProxyServer(options = {}) {
           }
         });
       } catch (error) {
+        req.__releaseChannel?.();
         console.error('Channel allocation error:', error);
         if (!res.headersSent) {
           res.status(503).json({
@@ -341,6 +345,7 @@ async function startProxyServer(options = {}) {
 
     // 代理响应只负责维护传输健康状态；实时日志和 usage 来自 CLI 原生日志。
     proxy.on('proxyRes', (proxyRes, req, res) => {
+      prepareProxyResponse(proxyRes, res);
       const metadata = requestMetadata.get(req);
       if (!metadata) return;
 
@@ -425,9 +430,9 @@ async function stopProxyServer(options = {}) {
     return { success: true, message: 'Proxy server not running' };
   }
 
-  requestMetadata.clear();
+  requestMetadata = new WeakMap();
 
-  const shutdownTimer = expediteServerShutdown(proxyServer);
+  const shutdownTimer = expediteServerShutdown(proxyServer, { forceAfterMs: options.forceAfterMs });
 
   return new Promise((resolve) => {
     proxyServer.close(() => {

package/src/platforms/drivers/codex/proxy-implementation.js

@@ -15,14 +15,15 @@ const {
   isChatCompletionsPath,
   ensureOpenAiStreamUsage
 } = require('../../../shared/proxy-utils');
-const { attachServerShutdownHandling, expediteServerShutdown } = require('../../../server/services/server-shutdown');
+const { bindProxyRequest, prepareProxyResponse } = require('../../../shared/proxy-transport');
+const { attachServerShutdownHandling, expediteServerShutdown, PROXY_IDLE_TIMEOUT_MS } = require('../../../server/services/server-shutdown');
 
 let proxyServer = null;
 let proxyApp = null;
 let currentPort = null;
 
 // 用于存储每个请求的元数据
-const requestMetadata = new Map();
+let requestMetadata = new WeakMap();
 
 // 用于缓存已打印过的模型重定向规则，避免重复打印
 // 格式: { channelId: { "originalModel": "redirectedModel", ... } }
@@ -37,7 +38,7 @@ const resolveCodexTarget = resolveTargetUrl;
 const jsonBodyParser = express.json({
   limit: '100mb',
   verify: (req, res, buf) => {
-    req.rawBody = Buffer.from(buf);
+    req.rawBody = buf;
   }
 });
 
@@ -77,7 +78,8 @@ async function startCodexProxyServer(options = {}) {
 
     const proxy = httpProxy.createProxyServer({});
 
-    proxy.on('proxyReq', (proxyReq, req) => {
+    proxy.on('proxyReq', (proxyReq, req, res) => {
+      bindProxyRequest(proxyReq, res);
       const activeChannel = req.selectedChannel;
       if (!activeChannel) return;
 
@@ -127,8 +129,11 @@ async function startCodexProxyServer(options = {}) {
           };
         })();
 
+        req.__releaseChannel = release;
+        res.on('finish', release);
         res.on('close', release);
         res.on('error', release);
+        if (res.destroyed || res.writableEnded) { release(); return; }
 
         broadcastSchedulerState('codex', getSchedulerState('codex'));
 
@@ -200,8 +205,8 @@ async function startCodexProxyServer(options = {}) {
         proxy.web(req, res, {
           target,
           changeOrigin: true,
-          proxyTimeout: 120000,  // 代理连接超时 2 分钟
-          timeout: 120000        // 请求超时 2 分钟
+          proxyTimeout: PROXY_IDLE_TIMEOUT_MS,  // Allow long reasoning gaps without an unbounded upstream wait
+          timeout: 0            // The upstream timeout bounds idle waits; streaming clients may pause
         }, (err) => {
           release();
           if (err) {
@@ -218,6 +223,7 @@ async function startCodexProxyServer(options = {}) {
           }
         });
       } catch (error) {
+        req.__releaseChannel?.();
         console.error('Codex channel allocation error:', error);
         if (!res.headersSent) {
           res.status(503).json({
@@ -232,6 +238,7 @@ async function startCodexProxyServer(options = {}) {
 
     // 代理响应只负责维护传输健康状态；实时日志和 usage 来自 CLI 原生日志。
     proxy.on('proxyRes', (proxyRes, req, res) => {
+      prepareProxyResponse(proxyRes, res);
       const metadata = requestMetadata.get(req);
       if (!metadata) return;
 
@@ -277,8 +284,7 @@ async function startCodexProxyServer(options = {}) {
       console.error('Codex proxy error:', err);
       if (req && req.selectedChannel) {
         recordFailure(req.selectedChannel.id, 'codex', err);
-        releaseChannel(req.selectedChannel.id, 'codex');
-        broadcastSchedulerState('codex', getSchedulerState('codex'));
+        req.__releaseChannel?.();
       }
       if (res && !res.headersSent) {
         res.status(502).json({
@@ -331,9 +337,9 @@ async function stopCodexProxyServer(options = {}) {
     return { success: true, message: 'Codex proxy server not running' };
   }
 
-  requestMetadata.clear();
+  requestMetadata = new WeakMap();
 
-  const shutdownTimer = expediteServerShutdown(proxyServer);
+  const shutdownTimer = expediteServerShutdown(proxyServer, { forceAfterMs: options.forceAfterMs });
 
   return new Promise((resolve) => {
     proxyServer.close(() => {

package/src/platforms/drivers/dsh/api-operations.js

@@ -9,6 +9,7 @@ const { installPlugin, uninstallPlugin, updatePlugin } = require('./plugin-manag
 const { createDriver: createChannelsDriver } = require('./channels');
 const { createDriver: createProxyDriver } = require('./proxy');
 const { createDriver: createStatisticsDriver } = require('./statistics');
+const { importMcpServer } = require('../../../shared/mcp-import');
 
 function requiredId(value, label) {
   const id = String(value || '').trim();
@@ -153,18 +154,34 @@ function dshMcpSpecToConfig(spec = {}, serverName) {
   return config;
 }
 
-function readDshMcpEntries(context = {}) {
+function dshMcpServerName(server, fallbackId) {
+  const requested = String(server?.name || '').trim();
+  if (/^[A-Za-z0-9_-]{1,32}$/.test(requested)) return requested;
+  return String(fallbackId || '')
+    .replace(/[^A-Za-z0-9_-]/g, '_')
+    .slice(0, 32) || 'mcp';
+}
+
+function readDshMcpRecords(context = {}) {
   const profile = resolveProfileName(context);
-  if (!profile) return {};
+  if (!profile) return [];
   const result = listProfileMcp(context, profile);
-  const entries = {};
+  const entries = [];
   for (const server of result?.servers || []) {
     if (!server?.id || server.disabled) continue;
-    entries[server.id] = dshMcpConfigToSpec(server.config || {});
+    entries.push({
+      id: server.id,
+      name: server.config?.serverName || server.id,
+      spec: dshMcpConfigToSpec(server.config || {})
+    });
   }
   return entries;
 }
 
+function readDshMcpEntries(context = {}) {
+  return Object.fromEntries(readDshMcpRecords(context).map(({ id, spec }) => [id, spec]));
+}
+
 function promptContentFromDshConfig(config = {}) {
   for (const key of ['content', 'prompt', 'text']) {
     if (typeof config[key] === 'string') return config[key];
@@ -359,47 +376,33 @@ function createDriver(context = {}) {
     driver.read = () => resultFor(mcpContext('read'), 'ok', { mcpServers: readDshMcpEntries(context) });
     driver.normalize = spec => resultFor(mcpContext('normalize'), 'ok', spec);
     driver.sync = async server => {
-    const profileName = profileNameForRequest(context, server);
-    const id = String(server?.id || '').trim();
-    if (!id) throw new Error('MCP server id is required');
-    const patch = requirePatchResult(
-      upsertProfilePatchRow(context, profileName, {
-        id,
-        name: '@deepseek-ai/dsh-mcp-client',
-        config: dshMcpSpecToConfig(server.server || {}, id)
-      }),
-      profileName
-    );
-    return resultFor(mcpContext('sync'), 'ok', patch);
-  };
-  driver.remove = async serverId => {
-    const profileName = profileNameForRequest(context);
-    const id = String(serverId || '').trim();
-    if (!id) throw new Error('MCP server id is required');
-    if (!profileName) return resultFor(mcpContext('remove'), 'ok', true);
-    const patch = requirePatchResult(deleteProfilePatchRow(context, profileName, id), profileName);
-    return resultFor(mcpContext('remove'), 'ok', patch);
-  };
+      const profileName = profileNameForRequest(context, server);
+      const id = String(server?.id || '').trim();
+      if (!id) throw new Error('MCP server id is required');
+      const patch = requirePatchResult(
+        upsertProfilePatchRow(context, profileName, {
+          id,
+          name: '@deepseek-ai/dsh-mcp-client',
+          config: dshMcpSpecToConfig(server.server || {}, dshMcpServerName(server, id))
+        }),
+        profileName
+      );
+      return resultFor(mcpContext('sync'), 'ok', patch);
+    };
+    driver.remove = async serverId => {
+      const profileName = profileNameForRequest(context);
+      const id = String(serverId || '').trim();
+      if (!id) throw new Error('MCP server id is required');
+      if (!profileName) return resultFor(mcpContext('remove'), 'ok', true);
+      const patch = requirePatchResult(deleteProfilePatchRow(context, profileName, id), profileName);
+      return resultFor(mcpContext('remove'), 'ok', patch);
+    };
     driver.import = async servers => {
-    const entries = readDshMcpEntries(context);
-    let count = 0;
-    for (const [id, spec] of Object.entries(entries)) {
-      if (servers[id]) {
-        servers[id].apps = { ...(servers[id].apps || {}), dsh: true };
-        continue;
+      let count = 0;
+      for (const entry of readDshMcpRecords(context)) {
+        if (importMcpServer(servers, { ...entry, platform: 'dsh' })) count++;
       }
-      const now = Date.now();
-      servers[id] = {
-        id,
-        name: id,
-        server: spec,
-        apps: { dsh: true },
-        createdAt: now,
-        updatedAt: now
-      };
-      count++;
-    }
-    return resultFor(mcpContext('import'), 'ok', count);
+      return resultFor(mcpContext('import'), 'ok', count);
     };
   }
 

package/src/platforms/drivers/dsh/proxy-implementation.js

@@ -20,16 +20,17 @@ const {
 const { persistProxyRequestSnapshot } = require('../../../server/services/request-logger');
 const { redirectModel, resolveTargetUrl, isChatCompletionsPath, ensureOpenAiStreamUsage } = require('../../../shared/proxy-utils');
 const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('../../../server/services/proxy-runtime');
-const { attachServerShutdownHandling, expediteServerShutdown } = require('../../../server/services/server-shutdown');
+const { bindProxyRequest, prepareProxyResponse } = require('../../../shared/proxy-transport');
+const { attachServerShutdownHandling, expediteServerShutdown, PROXY_IDLE_TIMEOUT_MS } = require('../../../server/services/server-shutdown');
 
 let proxyServer = null;
 let currentPort = null;
-const requestMetadata = new Map();
+let requestMetadata = new WeakMap();
 
 const jsonBodyParser = express.json({
   limit: '100mb',
   verify: (req, _res, buffer) => {
-    req.rawBody = Buffer.from(buffer);
+    req.rawBody = buffer;
   }
 });
 
@@ -84,8 +85,11 @@ async function startDshProxyServer(options = {}) {
       });
       req.selectedChannel = channel;
       release = releaseOnce(channel);
+      req.__releaseChannel = release;
+      res.on('finish', release);
       res.on('close', release);
       res.on('error', release);
+      if (res.destroyed || res.writableEnded) { release(); return; }
       broadcastSchedulerState('dsh', getSchedulerState('dsh'));
 
       const apiKey = getEffectiveApiKey(channel);
@@ -119,8 +123,8 @@ async function startDshProxyServer(options = {}) {
       proxy.web(req, res, {
         target: resolveTargetUrl(channel.baseUrl, req.url),
         changeOrigin: true,
-        proxyTimeout: 120000,
-        timeout: 120000
+        proxyTimeout: PROXY_IDLE_TIMEOUT_MS,
+        timeout: 0
       }, error => {
         release?.();
         if (!error) return;
@@ -137,7 +141,8 @@ async function startDshProxyServer(options = {}) {
     }
   });
 
-  proxy.on('proxyReq', (proxyReq, req) => {
+  proxy.on('proxyReq', (proxyReq, req, res) => {
+    bindProxyRequest(proxyReq, res);
     const channel = req.selectedChannel;
     if (!channel) return;
     const metadata = {
@@ -161,22 +166,32 @@ async function startDshProxyServer(options = {}) {
   });
 
   proxy.on('proxyRes', (proxyRes, req, res) => {
+    prepareProxyResponse(proxyRes, res);
     const metadata = requestMetadata.get(req);
     if (!metadata) return;
-    if (Number(proxyRes.statusCode) >= 400) {
-      recordFailure(metadata.channelId, 'dsh', new Error(`DSH upstream HTTP ${proxyRes.statusCode}`));
-    } else {
-      recordSuccess(metadata.channelId, 'dsh');
-    }
-    requestMetadata.delete(req);
-    res?.on('close', () => requestMetadata.delete(req));
+    let completed = false;
+    const finish = error => {
+      if (completed) return;
+      completed = true;
+      requestMetadata.delete(req);
+      if (error || Number(proxyRes.statusCode) >= 400) {
+        recordFailure(metadata.channelId, 'dsh', error || new Error(`DSH upstream HTTP ${proxyRes.statusCode}`));
+      } else {
+        recordSuccess(metadata.channelId, 'dsh');
+      }
+    };
+    proxyRes.once('end', () => finish());
+    proxyRes.once('error', finish);
+    proxyRes.once('close', () => {
+      if (!completed) finish(new Error('DSH upstream response closed early'));
+    });
+    res?.once('close', () => requestMetadata.delete(req));
   });
 
   proxy.on('error', (error, req, res) => {
     if (req?.selectedChannel) {
       recordFailure(req.selectedChannel.id, 'dsh', error);
-      releaseChannel(req.selectedChannel.id, 'dsh');
-      broadcastSchedulerState('dsh', getSchedulerState('dsh'));
+      req.__releaseChannel?.();
     }
     if (res && !res.headersSent) res.status(502).json({ error: { message: `Proxy error: ${error.message}`, type: 'proxy_error' } });
   });
@@ -213,10 +228,10 @@ async function startDshProxyServer(options = {}) {
 async function stopDshProxyServer(options = {}) {
   const clearStartTime = options.clearStartTime !== false;
   const stoppedPort = currentPort;
-  requestMetadata.clear();
+  requestMetadata = new WeakMap();
 
   if (proxyServer) {
-    const shutdownTimer = expediteServerShutdown(proxyServer);
+    const shutdownTimer = expediteServerShutdown(proxyServer, { forceAfterMs: options.forceAfterMs });
     await new Promise(resolve => proxyServer.close(resolve));
     if (shutdownTimer) clearTimeout(shutdownTimer);
     proxyServer = null;

package/src/platforms/drivers/gemini/proxy-implementation.js

@@ -13,14 +13,15 @@ const {
 } = require('./channels-implementation');
 const { persistProxyRequestSnapshot } = require('../../../server/services/request-logger');
 const { redirectModel: redirectModelBase, resolveTargetUrl } = require('../../../shared/proxy-utils');
-const { attachServerShutdownHandling, expediteServerShutdown } = require('../../../server/services/server-shutdown');
+const { bindProxyRequest, prepareProxyResponse } = require('../../../shared/proxy-transport');
+const { attachServerShutdownHandling, expediteServerShutdown, PROXY_IDLE_TIMEOUT_MS } = require('../../../server/services/server-shutdown');
 
 let proxyServer = null;
 let proxyApp = null;
 let currentPort = null;
 
 // 用于存储每个请求的元数据
-const requestMetadata = new Map();
+let requestMetadata = new WeakMap();
 
 // 用于缓存已打印过的模型重定向规则，避免重复打印
 // 格式: { channelId: { "originalModel": "redirectedModel", ... } }
@@ -30,7 +31,7 @@ const printedGeminiRedirectCache = new Map();
 const jsonBodyParser = express.json({
   limit: '100mb',
   verify: (req, res, buf) => {
-    req.rawBody = Buffer.from(buf);
+    req.rawBody = buf;
   }
 });
 
@@ -198,7 +199,8 @@ async function startGeminiProxyServer(options = {}) {
 
     const proxy = httpProxy.createProxyServer({});
 
-    proxy.on('proxyReq', (proxyReq, req) => {
+    proxy.on('proxyReq', (proxyReq, req, res) => {
+      bindProxyRequest(proxyReq, res);
       const activeChannel = req.selectedChannel;
       if (!activeChannel) return;
 
@@ -255,8 +257,11 @@ async function startGeminiProxyServer(options = {}) {
           };
         })();
 
+        req.__releaseChannel = release;
+        res.on('finish', release);
         res.on('close', release);
         res.on('error', release);
+        if (res.destroyed || res.writableEnded) { release(); return; }
 
         broadcastSchedulerState('gemini', getSchedulerState('gemini'));
 
@@ -335,8 +340,8 @@ async function startGeminiProxyServer(options = {}) {
         proxy.web(req, res, {
           target,
           changeOrigin: true,
-          proxyTimeout: 120000,  // 代理连接超时 2 分钟
-          timeout: 120000        // 请求超时 2 分钟
+          proxyTimeout: PROXY_IDLE_TIMEOUT_MS,  // Allow long reasoning gaps without an unbounded upstream wait
+          timeout: 0            // The upstream timeout bounds idle waits; streaming clients may pause
         }, (err) => {
           release();
           if (err) {
@@ -353,6 +358,7 @@ async function startGeminiProxyServer(options = {}) {
           }
         });
       } catch (error) {
+        req.__releaseChannel?.();
         console.error('Gemini channel allocation error:', error);
         if (!res.headersSent) {
           res.status(503).json({
@@ -367,6 +373,7 @@ async function startGeminiProxyServer(options = {}) {
 
     // 代理响应只负责维护传输健康状态；实时日志和 usage 来自 CLI 原生日志。
     proxy.on('proxyRes', (proxyRes, req, res) => {
+      prepareProxyResponse(proxyRes, res);
       const metadata = requestMetadata.get(req);
       if (!metadata) return;
 
@@ -403,8 +410,7 @@ async function startGeminiProxyServer(options = {}) {
       console.error('Gemini proxy error:', err);
       if (req && req.selectedChannel) {
         recordFailure(req.selectedChannel.id, 'gemini', err);
-        releaseChannel(req.selectedChannel.id, 'gemini');
-        broadcastSchedulerState('gemini', getSchedulerState('gemini'));
+        req.__releaseChannel?.();
       }
       if (res && !res.headersSent) {
         res.status(502).json({
@@ -457,9 +463,9 @@ async function stopGeminiProxyServer(options = {}) {
     return { success: true, message: 'Gemini proxy server not running' };
   }
 
-  requestMetadata.clear();
+  requestMetadata = new WeakMap();
 
-  const shutdownTimer = expediteServerShutdown(proxyServer);
+  const shutdownTimer = expediteServerShutdown(proxyServer, { forceAfterMs: options.forceAfterMs });
 
   return new Promise((resolve) => {
     proxyServer.close(() => {

package/src/platforms/drivers/omp/gateway.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const crypto = require('crypto');
+const { downstreamHeaders } = require('../../../shared/proxy-transport');
 const http = require('http');
 const https = require('https');
 const httpProxy = require('http-proxy');
@@ -118,12 +119,20 @@ function readRequestBody(req) {
     const chunks = [];
     let size = 0;
     let settled = false;
+    const cleanup = () => {
+      chunks.length = 0;
+      req.removeListener('data', onData);
+      req.removeListener('end', onEnd);
+      req.removeListener('error', fail);
+      req.removeListener('aborted', onAborted);
+    };
     const fail = (error) => {
       if (settled) return;
       settled = true;
+      cleanup();
       reject(error);
     };
-    req.on('data', (chunk) => {
+    const onData = (chunk) => {
       if (settled) return;
       size += chunk.length;
       if (size > MAX_REQUEST_BYTES) {
@@ -132,14 +141,19 @@ function readRequestBody(req) {
         return;
       }
       chunks.push(chunk);
-    });
-    req.on('end', () => {
+    };
+    const onEnd = () => {
       if (settled) return;
       settled = true;
-      resolve(Buffer.concat(chunks));
-    });
+      const body = Buffer.concat(chunks, size);
+      cleanup();
+      resolve(body);
+    };
+    const onAborted = () => fail(new Error('Client aborted request'));
+    req.on('data', onData);
+    req.on('end', onEnd);
     req.on('error', fail);
-    req.on('aborted', () => fail(new Error('Client aborted request')));
+    req.on('aborted', onAborted);
   });
 }
 
@@ -184,6 +198,7 @@ function writeJson(res, statusCode, payload) {
   res.end(body);
 }
 
+
 function redactSensitiveQuery(path) {
   const url = new URL(String(path || '/'), 'http://127.0.0.1');
   for (const key of [...url.searchParams.keys()]) {
@@ -330,8 +345,13 @@ function createOmpGateway(options = {}) {
         upstreamResponse = response;
         activeUpstreams.delete(upstreamRequest);
         activeUpstreams.add(response);
+        // Install error handling before resolving: discarded retry responses
+        // must never raise an unhandled stream error and terminate the daemon.
+        response.on('error', () => {});
         response.once('close', () => {
+          activeUpstreams.delete(response);
           signal?.removeEventListener('abort', abortUpstream);
+          releaseOnce();
         });
         const statusCode = response.statusCode || 502;
         resolve({
@@ -387,8 +407,7 @@ function createOmpGateway(options = {}) {
       try {
         const result = await forwardAttempt(req, route, channel, body, signal);
         if (attempt === 0 && RETRYABLE_STATUS.has(result.statusCode)) {
-          result.response.once('close', () => activeUpstreams.delete(result.response));
-          result.response.resume();
+          result.response.destroy();
           result.release();
           onFailure(channel.id, 'omp');
           lastError = Object.assign(new Error(`OMP upstream returned HTTP ${result.statusCode}`), {
@@ -397,7 +416,7 @@ function createOmpGateway(options = {}) {
           continue;
         }
 
-        res.writeHead(result.statusCode, result.response.headers);
+        res.writeHead(result.statusCode, downstreamHeaders(result.response.headers));
         await new Promise((resolve) => {
           let completed = false;
           const finish = (error) => {
@@ -413,7 +432,12 @@ function createOmpGateway(options = {}) {
             resolve();
           };
           result.response.once('end', () => finish());
-          result.response.once('close', () => finish(new Error('OMP upstream response closed early')));
+          result.response.once('close', () => {
+            if (completed) return;
+            const error = new Error('OMP upstream response closed early');
+            if (!res.destroyed) res.destroy(error);
+            finish(error);
+          });
           result.response.once('error', (error) => {
             if (!res.destroyed) res.destroy(error);
             finish(error);
@@ -640,7 +664,7 @@ function createOmpGateway(options = {}) {
       handleRequest(req, res).catch((error) => {
         writeJson(res, 500, { error: error.message || 'OMP gateway request failed' });
       });
-    }));
+    }), { drainOnExit: false });
     server.on('upgrade', (req, socket, head) => {
       handleUpgrade(req, socket, head).catch((error) => {
         rejectUpgrade(socket, 503, error.message || 'OMP websocket proxy failed');