@kaitranntt/ccs 8.8.1-dev.20 → 8.8.1-dev.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -217,6 +217,7 @@ ccs ollama "summarize these logs"
217
217
  - Contributing guide: [CONTRIBUTING.md](./CONTRIBUTING.md)
218
218
  - Daily local gate: `bun run format && bun run lint:fix && bun run validate` (`validate` is the fast path only)
219
219
  - Before review or merge confidence: `bun run validate:ci-parity`
220
+ - Cross-runtime proxy transport: `bun run test:runtime-matrix` (Node 18/22/26 and Bun)
220
221
  - If PR checks stay queued for more than 10 minutes, assume the self-hosted runner is offline and notify a maintainer instead of retrying blindly
221
222
  - Starter work:
222
223
  [good first issue](https://github.com/kaitranntt/ccs/labels/good%20first%20issue),
package/dist/ccs.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- import './utils/fetch-proxy-setup';
1
+ export {};
2
2
  //# sourceMappingURL=ccs.d.ts.map
package/dist/ccs.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ccs.d.ts","sourceRoot":"","sources":["../src/ccs.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC"}
1
+ {"version":3,"file":"ccs.d.ts","sourceRoot":"","sources":["../src/ccs.ts"],"names":[],"mappings":""}
package/dist/ccs.js CHANGED
@@ -24,13 +24,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
24
24
  return result;
25
25
  };
26
26
  Object.defineProperty(exports, "__esModule", { value: true });
27
- require("./utils/fetch-proxy-setup");
28
27
  const error_manager_1 = require("./utils/error-manager");
29
28
  const ui_1 = require("./utils/ui");
30
29
  // Import centralized error handling
31
30
  const errors_1 = require("./errors");
32
31
  const logging_1 = require("./services/logging");
33
32
  const log_redaction_1 = require("./services/logging/log-redaction");
33
+ const fetch_proxy_setup_1 = require("./utils/fetch-proxy-setup");
34
34
  // Import target adapter system
35
35
  const targets_1 = require("./targets");
36
36
  // Import extracted dispatcher modules
@@ -40,6 +40,10 @@ const pre_dispatch_1 = require("./dispatcher/pre-dispatch");
40
40
  const profile_resolver_1 = require("./dispatcher/profile-resolver");
41
41
  // ========== Main Execution ==========
42
42
  async function main() {
43
+ const fetchProxySetup = (0, fetch_proxy_setup_1.applyGlobalFetchProxy)();
44
+ if (fetchProxySetup.error) {
45
+ console.error(`[!] Skipping global fetch proxy setup: ${fetchProxySetup.error}`);
46
+ }
43
47
  // Register target adapters (singleton wiring — stays in main)
44
48
  (0, targets_1.registerTarget)(new targets_1.ClaudeAdapter());
45
49
  (0, targets_1.registerTarget)(new targets_1.DroidAdapter());
package/dist/ccs.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ccs.js","sourceRoot":"","sources":["../src/ccs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ccs.js","sourceRoot":"","sources":["../src/ccs.ts"],"names":[],"mappings":"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"}
@@ -100,9 +100,17 @@ function startRuntime(options) {
100
100
  });
101
101
  server.once('error', (error) => {
102
102
  process.stderr.write(String(error.message) + '\n');
103
- process.exit(1);
103
+ void (0, proxy_server_1.closeOpenAICompatProxyServer)(server).finally(() => {
104
+ process.exitCode = 1;
105
+ });
104
106
  });
105
- const shutdown = () => server.close();
107
+ let shutdownPromise;
108
+ const shutdown = () => {
109
+ shutdownPromise ?? (shutdownPromise = (0, proxy_server_1.closeOpenAICompatProxyServer)(server).catch((error) => {
110
+ process.stderr.write(`Proxy shutdown failed: ${String(error.message)}\n`);
111
+ process.exitCode = 1;
112
+ }));
113
+ };
106
114
  process.on('SIGTERM', shutdown);
107
115
  process.on('SIGINT', shutdown);
108
116
  }
@@ -1 +1 @@
1
- {"version":3,"file":"proxy-daemon-entry.js","sourceRoot":"","sources":["../../src/proxy/proxy-daemon-entry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"proxy-daemon-entry.js","sourceRoot":"","sources":["../../src/proxy/proxy-daemon-entry.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@
4
4
  import * as http from 'http';
5
5
  import type { Dispatcher } from 'undici';
6
6
  import type { OpenAICompatProfileConfig } from '../profile-router';
7
- import { type UpstreamAgentTimeoutOptions } from '../../utils/fetch-proxy-setup';
7
+ import type { UpstreamAgentTimeoutOptions } from '../../utils/fetch-proxy-setup';
8
8
  export declare function extractIncomingProxyToken(headers: http.IncomingHttpHeaders): string | null;
9
9
  export declare function validateIncomingProxyAuth(headers: http.IncomingHttpHeaders, expectedToken: string): boolean;
10
10
  /**
@@ -17,6 +17,6 @@ export declare function validateIncomingProxyAuth(headers: http.IncomingHttpHead
17
17
  */
18
18
  export declare function buildUpstreamAgentTimeouts(): UpstreamAgentTimeoutOptions;
19
19
  export declare function attachDisconnectAbortHandlers(req: http.IncomingMessage, res: http.ServerResponse, controller: AbortController, onDisconnect: (source: string) => void): () => void;
20
- export declare function handleProxyMessagesRequest(req: http.IncomingMessage, res: http.ServerResponse, profile: OpenAICompatProfileConfig, expectedAuthToken: string, insecureDispatcher?: Dispatcher): Promise<void>;
20
+ export declare function handleProxyMessagesRequest(req: http.IncomingMessage, res: http.ServerResponse, profile: OpenAICompatProfileConfig, expectedAuthToken: string, insecureDispatcher?: Dispatcher, sharedUpstreamDispatcher?: Dispatcher, upstreamFetch?: typeof globalThis.fetch, forceInsecureTls?: boolean): Promise<void>;
21
21
  export declare function handleProxyModelsRequest(res: http.ServerResponse, profile: OpenAICompatProfileConfig): void;
22
22
  //# sourceMappingURL=messages-route.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"messages-route.d.ts","sourceRoot":"","sources":["../../../src/proxy/server/messages-route.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AASnE,OAAO,EAEL,KAAK,2BAA2B,EACjC,MAAM,+BAA+B,CAAC;AA+UvC,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,IAAI,CAAC,mBAAmB,GAAG,MAAM,GAAG,IAAI,CAmB1F;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,IAAI,CAAC,mBAAmB,EACjC,aAAa,EAAE,MAAM,GACpB,OAAO,CAET;AAkCD;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,IAAI,2BAA2B,CAGxE;AAgCD,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,UAAU,EAAE,eAAe,EAC3B,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GACrC,MAAM,IAAI,CA0BZ;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,OAAO,EAAE,yBAAyB,EAClC,iBAAiB,EAAE,MAAM,EACzB,kBAAkB,CAAC,EAAE,UAAU,GAC9B,OAAO,CAAC,IAAI,CAAC,CA4Lf;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,OAAO,EAAE,yBAAyB,GACjC,IAAI,CAWN"}
1
+ {"version":3,"file":"messages-route.d.ts","sourceRoot":"","sources":["../../../src/proxy/server/messages-route.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AASnE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAqVjF,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,IAAI,CAAC,mBAAmB,GAAG,MAAM,GAAG,IAAI,CAmB1F;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,IAAI,CAAC,mBAAmB,EACjC,aAAa,EAAE,MAAM,GACpB,OAAO,CAET;AAkCD;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,IAAI,2BAA2B,CAGxE;AAqBD,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,UAAU,EAAE,eAAe,EAC3B,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GACrC,MAAM,IAAI,CA0BZ;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,OAAO,EAAE,yBAAyB,EAClC,iBAAiB,EAAE,MAAM,EACzB,kBAAkB,CAAC,EAAE,UAAU,EAC/B,wBAAwB,CAAC,EAAE,UAAU,EACrC,aAAa,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,EACvC,gBAAgB,UAAQ,GACvB,OAAO,CAAC,IAAI,CAAC,CAmNf;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,OAAO,EAAE,yBAAyB,GACjC,IAAI,CAWN"}
@@ -1,14 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.handleProxyModelsRequest = exports.handleProxyMessagesRequest = exports.attachDisconnectAbortHandlers = exports.buildUpstreamAgentTimeouts = exports.validateIncomingProxyAuth = exports.extractIncomingProxyToken = void 0;
4
- const undici_1 = require("undici");
5
4
  const request_router_1 = require("../request-router");
6
5
  const request_transformer_1 = require("../transformers/request-transformer");
7
6
  const sse_stream_transformer_1 = require("../transformers/sse-stream-transformer");
8
7
  const upstream_url_1 = require("../upstream-url");
9
8
  const logging_1 = require("../../services/logging");
10
- const fetch_proxy_setup_1 = require("../../utils/fetch-proxy-setup");
11
9
  const http_helpers_1 = require("./http-helpers");
10
+ const upstream_transport_1 = require("./upstream-transport");
12
11
  const REQUEST_TIMEOUT_MS = 600000;
13
12
  // Keep undici's per-phase timeouts above the explicit request timeout so the
14
13
  // AbortController is the single authority on when an upstream request dies.
@@ -335,15 +334,6 @@ function buildUpstreamAgentTimeouts() {
335
334
  return { headersTimeout: ceiling, bodyTimeout: ceiling };
336
335
  }
337
336
  exports.buildUpstreamAgentTimeouts = buildUpstreamAgentTimeouts;
338
- let defaultUpstreamDispatcher = null;
339
- function getDefaultUpstreamDispatcher() {
340
- if (!defaultUpstreamDispatcher) {
341
- const timeouts = buildUpstreamAgentTimeouts();
342
- // Honor HTTP(S)_PROXY routing when configured; otherwise a plain Agent.
343
- defaultUpstreamDispatcher = (0, fetch_proxy_setup_1.createGlobalFetchProxyDispatcher)(timeouts) ?? new undici_1.Agent(timeouts);
344
- }
345
- return defaultUpstreamDispatcher;
346
- }
347
337
  function formatTimeoutDuration(timeoutMs) {
348
338
  return timeoutMs % 1000 === 0 ? `${timeoutMs / 1000} seconds` : `${timeoutMs}ms`;
349
339
  }
@@ -381,7 +371,7 @@ function attachDisconnectAbortHandlers(req, res, controller, onDisconnect) {
381
371
  };
382
372
  }
383
373
  exports.attachDisconnectAbortHandlers = attachDisconnectAbortHandlers;
384
- async function handleProxyMessagesRequest(req, res, profile, expectedAuthToken, insecureDispatcher) {
374
+ async function handleProxyMessagesRequest(req, res, profile, expectedAuthToken, insecureDispatcher, sharedUpstreamDispatcher, upstreamFetch, forceInsecureTls = false) {
385
375
  const transformer = new sse_stream_transformer_1.ProxySseStreamTransformer();
386
376
  const startedAt = Date.now();
387
377
  logger.stage('intake', 'request.received', 'Proxy /v1/messages request received', {
@@ -430,18 +420,22 @@ async function handleProxyMessagesRequest(req, res, profile, expectedAuthToken,
430
420
  source,
431
421
  });
432
422
  });
433
- const useSharedInsecureDispatcher = insecureDispatcher !== undefined &&
434
- upstream.route.profile.profileName === profile.profileName;
423
+ const routeStaysOnActiveProfile = upstream.route.profile.profileName === profile.profileName;
424
+ const useSharedInsecureDispatcher = insecureDispatcher !== undefined && routeStaysOnActiveProfile;
425
+ const useServerInsecureTls = forceInsecureTls && routeStaysOnActiveProfile;
435
426
  const useProfileInsecureTls = upstream.route.profile.insecure === true;
436
- const ephemeralInsecureDispatcher = useProfileInsecureTls && !useSharedInsecureDispatcher
437
- ? new undici_1.Agent({ connect: { rejectUnauthorized: false }, ...buildUpstreamAgentTimeouts() })
427
+ const ephemeralInsecureDispatcher = useProfileInsecureTls && !useSharedInsecureDispatcher && !useServerInsecureTls
428
+ ? (0, upstream_transport_1.createUpstreamDispatcher)(buildUpstreamAgentTimeouts(), true)
438
429
  : undefined;
439
- const insecureTls = useSharedInsecureDispatcher || useProfileInsecureTls;
430
+ const insecureTls = useSharedInsecureDispatcher || useServerInsecureTls || useProfileInsecureTls;
431
+ const ownedUpstreamDispatcher = sharedUpstreamDispatcher || insecureTls
432
+ ? undefined
433
+ : (0, upstream_transport_1.createUpstreamDispatcher)(buildUpstreamAgentTimeouts());
440
434
  const dispatcher = useSharedInsecureDispatcher
441
435
  ? insecureDispatcher
442
436
  : useProfileInsecureTls
443
437
  ? ephemeralInsecureDispatcher
444
- : getDefaultUpstreamDispatcher();
438
+ : (sharedUpstreamDispatcher ?? ownedUpstreamDispatcher);
445
439
  try {
446
440
  logger.stage('dispatch', 'upstream.dispatch', 'Dispatching upstream fetch', {
447
441
  profileName: profile.profileName,
@@ -452,7 +446,13 @@ async function handleProxyMessagesRequest(req, res, profile, expectedAuthToken,
452
446
  const upstreamUrl = (0, upstream_url_1.resolveOpenAIChatCompletionsUrl)(upstream.route.profile.baseUrl, {
453
447
  passthrough,
454
448
  });
455
- const upstreamResponse = await fetch(upstreamUrl, buildFetchInit(upstream.route.profile, upstream.body, controller.signal, req.headers, passthrough, dispatcher));
449
+ const fetchInit = buildFetchInit(upstream.route.profile, upstream.body, controller.signal, req.headers, passthrough, dispatcher);
450
+ const upstreamResponse = upstreamFetch
451
+ ? await upstreamFetch(upstreamUrl, fetchInit)
452
+ : await (0, upstream_transport_1.fetchWithUpstreamTransport)(upstreamUrl, fetchInit, {
453
+ dispatcher,
454
+ insecureTls,
455
+ });
456
456
  logger.stage('upstream', 'upstream.response', 'Received upstream response', {
457
457
  profileName: profile.profileName,
458
458
  routedProfileName: upstream.route.profile.profileName,
@@ -475,7 +475,7 @@ async function handleProxyMessagesRequest(req, res, profile, expectedAuthToken,
475
475
  cleanupDisconnectHandlers();
476
476
  if (ephemeralInsecureDispatcher) {
477
477
  try {
478
- await ephemeralInsecureDispatcher.close();
478
+ await (0, upstream_transport_1.closeUpstreamDispatcher)(ephemeralInsecureDispatcher);
479
479
  }
480
480
  catch (closeError) {
481
481
  logger.stage('cleanup', 'request.dispatcher_close_failed', 'Failed to close per-request insecure dispatcher', {
@@ -485,14 +485,23 @@ async function handleProxyMessagesRequest(req, res, profile, expectedAuthToken,
485
485
  }, { level: 'warn' });
486
486
  }
487
487
  }
488
+ if (ownedUpstreamDispatcher) {
489
+ try {
490
+ await (0, upstream_transport_1.closeUpstreamDispatcher)(ownedUpstreamDispatcher);
491
+ }
492
+ catch (closeError) {
493
+ logger.stage('cleanup', 'request.dispatcher_close_failed', 'Failed to close per-request upstream dispatcher', {
494
+ profileName: profile.profileName,
495
+ routedProfileName: upstream.route.profile.profileName,
496
+ error: closeError instanceof Error ? closeError.message : String(closeError),
497
+ }, { level: 'warn' });
498
+ }
499
+ }
488
500
  }
489
501
  }
490
502
  catch (error) {
491
503
  const message = error instanceof Error ? error.message : 'Unknown proxy error';
492
- const errInfo = {
493
- name: error instanceof Error ? error.name : 'Error',
494
- message,
495
- };
504
+ const errInfo = (0, upstream_transport_1.toLogErrorInfo)(error);
496
505
  logger.stage('cleanup', 'request.failed', 'Proxy message request failed', {
497
506
  profileName: profile.profileName,
498
507
  abort: error instanceof Error && error.name === 'AbortError',
@@ -1 +1 @@
1
- {"version":3,"file":"messages-route.js","sourceRoot":"","sources":["../../../src/proxy/server/messages-route.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"messages-route.js","sourceRoot":"","sources":["../../../src/proxy/server/messages-route.ts"],"names":[],"mappings":"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"}
@@ -9,4 +9,5 @@ export interface OpenAICompatProxyServerOptions {
9
9
  insecure?: boolean;
10
10
  }
11
11
  export declare function startOpenAICompatProxyServer(options: OpenAICompatProxyServerOptions): http.Server;
12
+ export declare function closeOpenAICompatProxyServer(server: http.Server, forceAfterMs?: number): Promise<void>;
12
13
  //# sourceMappingURL=proxy-server.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../../../src/proxy/server/proxy-server.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAuBnE,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,yBAAyB,CAAC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,8BAA8B,GAAG,IAAI,CAAC,MAAM,CA+GjG"}
1
+ {"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../../../src/proxy/server/proxy-server.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAgCnE,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,yBAAyB,CAAC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,8BAA8B,GAAG,IAAI,CAAC,MAAM,CAgIjG;AAED,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,YAAY,SAA4B,GACvC,OAAO,CAAC,IAAI,CAAC,CAoCf"}
@@ -23,17 +23,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
23
23
  return result;
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.startOpenAICompatProxyServer = void 0;
26
+ exports.closeOpenAICompatProxyServer = exports.startOpenAICompatProxyServer = void 0;
27
27
  const http = __importStar(require("http"));
28
28
  const crypto_1 = require("crypto");
29
- const undici_1 = require("undici");
30
29
  const proxy_daemon_paths_1 = require("../proxy-daemon-paths");
31
30
  const logging_1 = require("../../services/logging");
32
31
  const messages_route_1 = require("./messages-route");
33
32
  const http_helpers_1 = require("./http-helpers");
33
+ const upstream_transport_1 = require("./upstream-transport");
34
34
  const REQUEST_ID_HEADER = 'x-ccs-request-id';
35
35
  // Loose UUID-ish guard: accepts UUIDs and similar opaque ids; rejects empty / control chars.
36
36
  const REQUEST_ID_PATTERN = /^[A-Za-z0-9._-]{8,128}$/;
37
+ const DEFAULT_SHUTDOWN_FORCE_MS = 1000;
38
+ const proxyServerLifecycles = new WeakMap();
37
39
  function resolveInboundRequestId(headers) {
38
40
  const raw = headers[REQUEST_ID_HEADER];
39
41
  if (typeof raw === 'string' && REQUEST_ID_PATTERN.test(raw.trim())) {
@@ -49,8 +51,17 @@ function startOpenAICompatProxyServer(options) {
49
51
  port: options.port,
50
52
  });
51
53
  const insecureDispatcher = options.insecure
52
- ? new undici_1.Agent({ connect: { rejectUnauthorized: false }, ...(0, messages_route_1.buildUpstreamAgentTimeouts)() })
54
+ ? (0, upstream_transport_1.createUpstreamDispatcher)((0, messages_route_1.buildUpstreamAgentTimeouts)(), true)
53
55
  : undefined;
56
+ const upstreamDispatcher = (0, upstream_transport_1.createUpstreamDispatcher)((0, messages_route_1.buildUpstreamAgentTimeouts)());
57
+ let cleanupPromise;
58
+ const cleanup = () => {
59
+ cleanupPromise ?? (cleanupPromise = Promise.all([
60
+ (0, upstream_transport_1.closeUpstreamDispatcher)(upstreamDispatcher),
61
+ (0, upstream_transport_1.closeUpstreamDispatcher)(insecureDispatcher),
62
+ ]).then(() => undefined));
63
+ return cleanupPromise;
64
+ };
54
65
  const server = http.createServer((req, res) => {
55
66
  const requestId = resolveInboundRequestId(req.headers);
56
67
  res.setHeader(REQUEST_ID_HEADER, requestId);
@@ -117,7 +128,7 @@ function startOpenAICompatProxyServer(options) {
117
128
  return;
118
129
  }
119
130
  if (method === 'POST' && pathname === '/v1/messages') {
120
- await (0, messages_route_1.handleProxyMessagesRequest)(req, res, options.profile, options.authToken, insecureDispatcher);
131
+ await (0, messages_route_1.handleProxyMessagesRequest)(req, res, options.profile, options.authToken, insecureDispatcher, upstreamDispatcher, undefined, options.insecure === true);
121
132
  return;
122
133
  }
123
134
  logger.warn('http.not_found', 'Rejected unknown proxy route', {
@@ -131,10 +142,51 @@ function startOpenAICompatProxyServer(options) {
131
142
  });
132
143
  server.on('close', () => {
133
144
  logger.info('server.stop', 'OpenAI-compatible proxy server stopped');
134
- void insecureDispatcher?.close();
145
+ void cleanup().catch((error) => {
146
+ logger.warn('server.dispatcher_close_failed', 'Failed to close upstream transport', {
147
+ error: error instanceof Error ? error.message : String(error),
148
+ });
149
+ });
135
150
  });
151
+ proxyServerLifecycles.set(server, { cleanup });
136
152
  server.listen(options.port, host);
137
153
  return server;
138
154
  }
139
155
  exports.startOpenAICompatProxyServer = startOpenAICompatProxyServer;
156
+ function closeOpenAICompatProxyServer(server, forceAfterMs = DEFAULT_SHUTDOWN_FORCE_MS) {
157
+ const lifecycle = proxyServerLifecycles.get(server);
158
+ if (lifecycle?.shutdownPromise) {
159
+ return lifecycle.shutdownPromise;
160
+ }
161
+ const shutdownPromise = (async () => {
162
+ if (server.listening) {
163
+ await new Promise((resolve, reject) => {
164
+ let forceTimer;
165
+ server.close((error) => {
166
+ if (forceTimer) {
167
+ clearTimeout(forceTimer);
168
+ }
169
+ if (error) {
170
+ reject(error);
171
+ }
172
+ else {
173
+ resolve();
174
+ }
175
+ });
176
+ // Node 18 does not reap idle keep-alive sockets as part of close().
177
+ server.closeIdleConnections?.();
178
+ if (forceAfterMs > 0) {
179
+ forceTimer = setTimeout(() => server.closeAllConnections?.(), forceAfterMs);
180
+ forceTimer.unref();
181
+ }
182
+ });
183
+ }
184
+ await lifecycle?.cleanup();
185
+ })();
186
+ if (lifecycle) {
187
+ lifecycle.shutdownPromise = shutdownPromise;
188
+ }
189
+ return shutdownPromise;
190
+ }
191
+ exports.closeOpenAICompatProxyServer = closeOpenAICompatProxyServer;
140
192
  //# sourceMappingURL=proxy-server.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"proxy-server.js","sourceRoot":"","sources":["../../../src/proxy/server/proxy-server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"proxy-server.js","sourceRoot":"","sources":["../../../src/proxy/server/proxy-server.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,14 @@
1
+ /// <reference types="bun-types" />
2
+ /// <reference types="node" />
3
+ import { type Dispatcher } from 'undici';
4
+ import type { LogErrorInfo } from '../../services/logging';
5
+ import { type UpstreamAgentTimeoutOptions } from '../../utils/fetch-proxy-setup';
6
+ export declare function isBunRuntime(): boolean;
7
+ export declare function createUpstreamDispatcher(options: UpstreamAgentTimeoutOptions, insecure?: boolean): Dispatcher | undefined;
8
+ export declare function closeUpstreamDispatcher(dispatcher?: Dispatcher): Promise<void>;
9
+ export declare function fetchWithUpstreamTransport(input: string | URL | Request, init: RequestInit, options?: {
10
+ dispatcher?: Dispatcher;
11
+ insecureTls?: boolean;
12
+ }): Promise<Response>;
13
+ export declare function toLogErrorInfo(error: unknown, depth?: number): LogErrorInfo;
14
+ //# sourceMappingURL=upstream-transport.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"upstream-transport.d.ts","sourceRoot":"","sources":["../../../src/proxy/server/upstream-transport.ts"],"names":[],"mappings":";;AAAA,OAAO,EAA+B,KAAK,UAAU,EAAE,MAAM,QAAQ,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAEL,KAAK,2BAA2B,EACjC,MAAM,+BAA+B,CAAC;AAUvC,wBAAgB,YAAY,IAAI,OAAO,CAEtC;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,2BAA2B,EACpC,QAAQ,UAAQ,GACf,UAAU,GAAG,SAAS,CAQxB;AAED,wBAAgB,uBAAuB,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAc9E;AAED,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAC7B,IAAI,EAAE,WAAW,EACjB,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,UAAU,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GAC/D,OAAO,CAAC,QAAQ,CAAC,CAwBnB;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,SAAI,GAAG,YAAY,CActE"}
@@ -0,0 +1,72 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.toLogErrorInfo = exports.fetchWithUpstreamTransport = exports.closeUpstreamDispatcher = exports.createUpstreamDispatcher = exports.isBunRuntime = void 0;
4
+ const undici_1 = require("undici");
5
+ const fetch_proxy_setup_1 = require("../../utils/fetch-proxy-setup");
6
+ const proxy_env_1 = require("../../utils/proxy-env");
7
+ const dispatcherClosePromises = new WeakMap();
8
+ function isBunRuntime() {
9
+ return typeof process.versions.bun === 'string';
10
+ }
11
+ exports.isBunRuntime = isBunRuntime;
12
+ function createUpstreamDispatcher(options, insecure = false) {
13
+ if (isBunRuntime()) {
14
+ return undefined;
15
+ }
16
+ if (insecure) {
17
+ return new undici_1.Agent({ connect: { rejectUnauthorized: false }, ...options });
18
+ }
19
+ return (0, fetch_proxy_setup_1.createGlobalFetchProxyDispatcher)(options) ?? new undici_1.Agent(options);
20
+ }
21
+ exports.createUpstreamDispatcher = createUpstreamDispatcher;
22
+ function closeUpstreamDispatcher(dispatcher) {
23
+ if (!dispatcher) {
24
+ return Promise.resolve();
25
+ }
26
+ const existing = dispatcherClosePromises.get(dispatcher);
27
+ if (existing) {
28
+ return existing;
29
+ }
30
+ const close = dispatcher.close;
31
+ const closing = typeof close === 'function' ? Promise.resolve(close.call(dispatcher)) : Promise.resolve();
32
+ dispatcherClosePromises.set(dispatcher, closing);
33
+ return closing;
34
+ }
35
+ exports.closeUpstreamDispatcher = closeUpstreamDispatcher;
36
+ async function fetchWithUpstreamTransport(input, init, options = {}) {
37
+ if (!isBunRuntime()) {
38
+ return (0, undici_1.fetch)(input, init);
39
+ }
40
+ const requestUrl = new URL(typeof input === 'string' || input instanceof URL ? input.toString() : input.url);
41
+ const bunInit = { ...init };
42
+ delete bunInit.dispatcher;
43
+ if (!(0, proxy_env_1.shouldBypassProxy)(requestUrl.hostname)) {
44
+ const proxy = (0, proxy_env_1.getProxyResolution)(requestUrl.protocol === 'https:', process.env, {
45
+ allowedProtocols: ['http:', 'https:'],
46
+ });
47
+ if (proxy.url) {
48
+ bunInit.proxy = proxy.url;
49
+ }
50
+ }
51
+ if (options.insecureTls) {
52
+ bunInit.tls = { rejectUnauthorized: false };
53
+ }
54
+ return globalThis.fetch(input, bunInit);
55
+ }
56
+ exports.fetchWithUpstreamTransport = fetchWithUpstreamTransport;
57
+ function toLogErrorInfo(error, depth = 0) {
58
+ if (!(error instanceof Error)) {
59
+ return { name: 'Error', message: String(error) };
60
+ }
61
+ const errorWithDetails = error;
62
+ const info = { name: error.name, message: error.message };
63
+ if (typeof errorWithDetails.code === 'string') {
64
+ info.code = errorWithDetails.code;
65
+ }
66
+ if (depth < 3 && errorWithDetails.cause !== undefined && errorWithDetails.cause !== error) {
67
+ info.cause = toLogErrorInfo(errorWithDetails.cause, depth + 1);
68
+ }
69
+ return info;
70
+ }
71
+ exports.toLogErrorInfo = toLogErrorInfo;
72
+ //# sourceMappingURL=upstream-transport.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"upstream-transport.js","sourceRoot":"","sources":["../../../src/proxy/server/upstream-transport.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"log-redaction.d.ts","sourceRoot":"","sources":["../../../src/services/logging/log-redaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAoDhD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKtD;AA2CD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAC3C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAMzB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,CAMzF;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAmB5D"}
1
+ {"version":3,"file":"log-redaction.d.ts","sourceRoot":"","sources":["../../../src/services/logging/log-redaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAsDhD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAOtD;AA2CD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAC3C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAMzB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,CAMzF;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAmB5D"}
@@ -39,6 +39,7 @@ function maskAuthSchemeValue(value) {
39
39
  * prefix plus an ample body to minimise false positives on ordinary prose.
40
40
  */
41
41
  const SECRET_TOKEN_PATTERN = /(?:Bearer|Basic|Token)\s+\S{8,}|sk-ant-[A-Za-z0-9_-]{16,}|sk-[A-Za-z0-9_-]{32,}|xox[bpoa]-[A-Za-z0-9-]{10,}|gh[opsu]_[A-Za-z0-9]{36,}|glpat-[A-Za-z0-9_-]{18,}|AIza[0-9A-Za-z_-]{35}|eyJ[A-Za-z0-9_-]{8,}\.eyJ[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]*|(?:api[_-]?key|access[_-]?token|refresh[_-]?token|secret)(?:=|%3D)[A-Za-z0-9._~+/=-]{8,}/g;
42
+ const URL_USERINFO_PATTERN = /([a-z][a-z\d+.-]*:\/\/)([^\s/@]+)@/gi;
42
43
  /**
43
44
  * Scrub known credential shapes from an arbitrary string. Preserves the
44
45
  * Bearer/Basic/Token scheme prefix when present so the entry stays readable.
@@ -46,7 +47,9 @@ const SECRET_TOKEN_PATTERN = /(?:Bearer|Basic|Token)\s+\S{8,}|sk-ant-[A-Za-z0-9_
46
47
  * (defense-in-depth for the hotpath console.error sweep).
47
48
  */
48
49
  function maskSecretTokens(value) {
49
- return value.replace(SECRET_TOKEN_PATTERN, (match) => {
50
+ return value
51
+ .replace(URL_USERINFO_PATTERN, '$1[redacted]@')
52
+ .replace(SECRET_TOKEN_PATTERN, (match) => {
50
53
  const scheme = /^(Bearer|Basic|Token)\s+/.exec(match);
51
54
  return scheme ? `${scheme[1]} [redacted]` : '[redacted]';
52
55
  });
@@ -1 +1 @@
1
- {"version":3,"file":"log-redaction.js","sourceRoot":"","sources":["../../../src/services/logging/log-redaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"log-redaction.js","sourceRoot":"","sources":["../../../src/services/logging/log-redaction.ts"],"names":[],"mappings":"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"}
@@ -20,6 +20,7 @@ export interface LogErrorInfo {
20
20
  message: string;
21
21
  code?: string;
22
22
  stack?: string;
23
+ cause?: LogErrorInfo;
23
24
  }
24
25
  export interface LogEntry {
25
26
  id: string;
@@ -1 +1 @@
1
- {"version":3,"file":"log-types.d.ts","sourceRoot":"","sources":["../../../src/services/logging/log-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAErF,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC;AAE5C;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,QAAQ,GAChB,QAAQ,GACR,OAAO,GACP,MAAM,GACN,UAAU,GACV,UAAU,GACV,WAAW,GACX,SAAS,GACT,SAAS,CAAC;AAEd,eAAO,MAAM,UAAU,EAAE,SAAS,QAAQ,EAShC,CAAC;AAEX,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,8EAA8E;IAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kDAAkD;IAClD,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,UAAU,EAAE,SAAS,YAAY,EAAuC,CAAC;AAStF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,GAAG,OAAO,CAE/F;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,IAAI,YAAY,CAE/E;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,IAAI,QAAQ,CAEvE"}
1
+ {"version":3,"file":"log-types.d.ts","sourceRoot":"","sources":["../../../src/services/logging/log-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAErF,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC;AAE5C;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,QAAQ,GAChB,QAAQ,GACR,OAAO,GACP,MAAM,GACN,UAAU,GACV,UAAU,GACV,WAAW,GACX,SAAS,GACT,SAAS,CAAC;AAEd,eAAO,MAAM,UAAU,EAAE,SAAS,QAAQ,EAShC,CAAC;AAEX,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,8EAA8E;IAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kDAAkD;IAClD,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,UAAU,EAAE,SAAS,YAAY,EAAuC,CAAC;AAStF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,GAAG,OAAO,CAE/F;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,IAAI,YAAY,CAE/E;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,IAAI,QAAQ,CAEvE"}
@@ -1 +1 @@
1
- {"version":3,"file":"log-types.js","sourceRoot":"","sources":["../../../src/services/logging/log-types.ts"],"names":[],"mappings":";;;AA2Ba,QAAA,UAAU,GAAwB;IAC7C,QAAQ;IACR,OAAO;IACP,MAAM;IACN,UAAU;IACV,UAAU;IACV,WAAW;IACX,SAAS;IACT,SAAS;CACD,CAAC;AA4CE,QAAA,UAAU,GAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAEtF,MAAM,kBAAkB,GAAiC;IACvD,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;CACT,CAAC;AAEF,SAAgB,mBAAmB,CAAC,KAAmB,EAAE,eAA6B;IACpF,OAAO,kBAAkB,CAAC,KAAK,CAAC,IAAI,kBAAkB,CAAC,eAAe,CAAC,CAAC;AAC1E,CAAC;AAFD,kDAEC;AAED,SAAgB,cAAc,CAAC,KAAyB;IACtD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,kBAAU,CAAC,QAAQ,CAAC,KAAqB,CAAC,CAAC;AACjF,CAAC;AAFD,wCAEC;AAED,SAAgB,UAAU,CAAC,KAAyB;IAClD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,kBAAU,CAAC,QAAQ,CAAC,KAAiB,CAAC,CAAC;AAC7E,CAAC;AAFD,gCAEC"}
1
+ {"version":3,"file":"log-types.js","sourceRoot":"","sources":["../../../src/services/logging/log-types.ts"],"names":[],"mappings":";;;AA2Ba,QAAA,UAAU,GAAwB;IAC7C,QAAQ;IACR,OAAO;IACP,MAAM;IACN,UAAU;IACV,UAAU;IACV,WAAW;IACX,SAAS;IACT,SAAS;CACD,CAAC;AA6CE,QAAA,UAAU,GAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAEtF,MAAM,kBAAkB,GAAiC;IACvD,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;CACT,CAAC;AAEF,SAAgB,mBAAmB,CAAC,KAAmB,EAAE,eAA6B;IACpF,OAAO,kBAAkB,CAAC,KAAK,CAAC,IAAI,kBAAkB,CAAC,eAAe,CAAC,CAAC;AAC1E,CAAC;AAFD,kDAEC;AAED,SAAgB,cAAc,CAAC,KAAyB;IACtD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,kBAAU,CAAC,QAAQ,CAAC,KAAqB,CAAC,CAAC;AACjF,CAAC;AAFD,wCAEC;AAED,SAAgB,UAAU,CAAC,KAAyB;IAClD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,kBAAU,CAAC,QAAQ,CAAC,KAAiB,CAAC,CAAC;AAC7E,CAAC;AAFD,gCAEC"}
@@ -1 +1 @@
1
- {"version":3,"file":"fetch-proxy-setup.d.ts","sourceRoot":"","sources":["../../src/utils/fetch-proxy-setup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,UAAU,EAAyD,MAAM,QAAQ,CAAC;AAOlG,MAAM,MAAM,2BAA2B,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,gBAAgB,GAAG,aAAa,CAAC,CAAC;AAiHhG,wBAAgB,gCAAgC,CAC9C,YAAY,GAAE,2BAAgC,GAC7C,UAAU,GAAG,IAAI,CAQnB;AAED,wBAAgB,qBAAqB,IAAI;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAmB5E"}
1
+ {"version":3,"file":"fetch-proxy-setup.d.ts","sourceRoot":"","sources":["../../src/utils/fetch-proxy-setup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,UAAU,EAAyD,MAAM,QAAQ,CAAC;AAOlG,MAAM,MAAM,2BAA2B,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,gBAAgB,GAAG,aAAa,CAAC,CAAC;AA2HhG,wBAAgB,gCAAgC,CAC9C,YAAY,GAAE,2BAAgC,GAC7C,UAAU,GAAG,IAAI,CAQnB;AAED,wBAAgB,qBAAqB,IAAI;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAmB5E"}
@@ -25,7 +25,10 @@ class RoutingProxyDispatcher extends undici_1.Dispatcher {
25
25
  return this.resolveDispatcher(options.origin).dispatch(options, handler);
26
26
  }
27
27
  close(callback) {
28
- const promise = Promise.all(this.getDispatchers().map((dispatcher) => dispatcher.close())).then(() => undefined);
28
+ const promise = Promise.all(this.getDispatchers().map((dispatcher) => {
29
+ const close = dispatcher.close;
30
+ return typeof close === 'function' ? close.call(dispatcher) : Promise.resolve();
31
+ })).then(() => undefined);
29
32
  if (callback) {
30
33
  promise.then(() => callback(), () => callback());
31
34
  return;
@@ -35,7 +38,12 @@ class RoutingProxyDispatcher extends undici_1.Dispatcher {
35
38
  destroy(errOrCallback, callback) {
36
39
  const error = typeof errOrCallback === 'function' ? null : errOrCallback;
37
40
  const done = typeof errOrCallback === 'function' ? errOrCallback : callback;
38
- const promise = Promise.all(this.getDispatchers().map((dispatcher) => dispatcher.destroy(error ?? null))).then(() => undefined);
41
+ const promise = Promise.all(this.getDispatchers().map((dispatcher) => {
42
+ const destroy = dispatcher.destroy;
43
+ return typeof destroy === 'function'
44
+ ? destroy.call(dispatcher, error ?? null)
45
+ : Promise.resolve();
46
+ })).then(() => undefined);
39
47
  if (done) {
40
48
  promise.then(() => done(), () => done());
41
49
  return;
@@ -96,10 +104,6 @@ function applyGlobalFetchProxy() {
96
104
  }
97
105
  }
98
106
  exports.applyGlobalFetchProxy = applyGlobalFetchProxy;
99
- const setupResult = applyGlobalFetchProxy();
100
- if (setupResult.error) {
101
- console.error(`[!] Skipping global fetch proxy setup: ${setupResult.error}`);
102
- }
103
107
  function resolveGlobalFetchProxyConfig() {
104
108
  const httpProxy = (0, proxy_env_1.getProxyResolution)(false, process.env, {
105
109
  allowedProtocols: FETCH_PROXY_PROTOCOLS,
@@ -1 +1 @@
1
- {"version":3,"file":"fetch-proxy-setup.js","sourceRoot":"","sources":["../../src/utils/fetch-proxy-setup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fetch-proxy-setup.js","sourceRoot":"","sources":["../../src/utils/fetch-proxy-setup.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kaitranntt/ccs",
3
- "version": "8.8.1-dev.20",
3
+ "version": "8.8.1-dev.21",
4
4
  "description": "Claude Codex Switch - Instant profile switching between Claude, GLM, Kimi, and more",
5
5
  "keywords": [
6
6
  "cli",
@@ -81,6 +81,7 @@
81
81
  "test:unit": "bun test tests/unit",
82
82
  "test:npm": "bun test tests/npm/",
83
83
  "test:native": "bash tests/native/unix/edge-cases.sh",
84
+ "test:runtime-matrix": "bun run build && CCS_RUNTIME_MATRIX=1 bun test tests/integration/proxy/runtime-transport-matrix.test.ts --timeout 60000",
84
85
  "test:e2e": "bun test tests/e2e/ --bail --timeout 60000",
85
86
  "report:hardening": "node scripts/hardening-inventory.js",
86
87
  "dev": "bun run build:server && node dist/ccs.js config --dev",
@@ -67,6 +67,7 @@ echo "[i] Running CI-parity local checks..."
67
67
  bun run typecheck
68
68
  bun run lint
69
69
  bun run format:check
70
+ bun run test:runtime-matrix
70
71
  bun run build:all
71
72
  bun run test:all
72
73
  CCS_E2E_SKIP_BUILD=1 bun run test:e2e