@juspay/neurolink 10.4.2 → 10.4.4

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.
Files changed (54) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/auth/tokenStore.d.ts +7 -0
  3. package/dist/auth/tokenStore.js +54 -0
  4. package/dist/browser/neurolink.min.js +377 -380
  5. package/dist/cli/commands/proxy.d.ts +2 -1
  6. package/dist/cli/commands/proxy.js +290 -63
  7. package/dist/cli/commands/proxyAnalyze.js +10 -1
  8. package/dist/lib/auth/tokenStore.d.ts +7 -0
  9. package/dist/lib/auth/tokenStore.js +54 -0
  10. package/dist/lib/proxy/proxyAnalysis.js +136 -12
  11. package/dist/lib/proxy/proxyTranslationEngine.d.ts +1 -0
  12. package/dist/lib/proxy/proxyTranslationEngine.js +56 -12
  13. package/dist/lib/proxy/rawStreamCapture.js +47 -1
  14. package/dist/lib/proxy/requestLogger.d.ts +2 -0
  15. package/dist/lib/proxy/requestLogger.js +72 -13
  16. package/dist/lib/proxy/rollingProxyServer.js +79 -8
  17. package/dist/lib/proxy/rollingWorkerProcess.js +20 -15
  18. package/dist/lib/proxy/rollingWorkerProtocol.js +3 -0
  19. package/dist/lib/proxy/rollingWorkerSupervisor.d.ts +1 -0
  20. package/dist/lib/proxy/rollingWorkerSupervisor.js +31 -11
  21. package/dist/lib/proxy/runtimeConfig.d.ts +1 -0
  22. package/dist/lib/proxy/runtimeConfig.js +20 -5
  23. package/dist/lib/proxy/socketWorkerRuntime.js +41 -13
  24. package/dist/lib/proxy/sseInterceptor.js +47 -1
  25. package/dist/lib/proxy/tokenRefresh.d.ts +6 -0
  26. package/dist/lib/proxy/tokenRefresh.js +70 -15
  27. package/dist/lib/proxy/usageStats.d.ts +25 -3
  28. package/dist/lib/proxy/usageStats.js +546 -55
  29. package/dist/lib/server/routes/claudeProxyRoutes.d.ts +2 -0
  30. package/dist/lib/server/routes/claudeProxyRoutes.js +261 -297
  31. package/dist/lib/types/proxy.d.ts +90 -1
  32. package/dist/proxy/proxyAnalysis.js +136 -12
  33. package/dist/proxy/proxyTranslationEngine.d.ts +1 -0
  34. package/dist/proxy/proxyTranslationEngine.js +56 -12
  35. package/dist/proxy/rawStreamCapture.js +47 -1
  36. package/dist/proxy/requestLogger.d.ts +2 -0
  37. package/dist/proxy/requestLogger.js +72 -13
  38. package/dist/proxy/rollingProxyServer.js +79 -8
  39. package/dist/proxy/rollingWorkerProcess.js +20 -15
  40. package/dist/proxy/rollingWorkerProtocol.js +3 -0
  41. package/dist/proxy/rollingWorkerSupervisor.d.ts +1 -0
  42. package/dist/proxy/rollingWorkerSupervisor.js +31 -11
  43. package/dist/proxy/runtimeConfig.d.ts +1 -0
  44. package/dist/proxy/runtimeConfig.js +20 -5
  45. package/dist/proxy/socketWorkerRuntime.js +41 -13
  46. package/dist/proxy/sseInterceptor.js +47 -1
  47. package/dist/proxy/tokenRefresh.d.ts +6 -0
  48. package/dist/proxy/tokenRefresh.js +70 -15
  49. package/dist/proxy/usageStats.d.ts +25 -3
  50. package/dist/proxy/usageStats.js +546 -55
  51. package/dist/server/routes/claudeProxyRoutes.d.ts +2 -0
  52. package/dist/server/routes/claudeProxyRoutes.js +261 -297
  53. package/dist/types/proxy.d.ts +90 -1
  54. package/package.json +1 -1
@@ -1,17 +1,41 @@
1
1
  import { createReadStream } from "node:fs";
2
- import { readdir } from "node:fs/promises";
2
+ import { lstat, readdir, realpath, stat } from "node:fs/promises";
3
3
  import { homedir } from "node:os";
4
4
  import { createInterface } from "node:readline";
5
- import { join, resolve } from "node:path";
5
+ import { isAbsolute, join, relative, resolve, sep } from "node:path";
6
6
  const LIFECYCLE_FILE_PATTERN = /^proxy-lifecycle-\d{4}-\d{2}-\d{2}\.jsonl$/;
7
7
  const REQUEST_FILE_PATTERN = /^proxy-\d{4}-\d{2}-\d{2}\.jsonl$/;
8
8
  const ATTEMPT_FILE_PATTERN = /^proxy-attempts-\d{4}-\d{2}-\d{2}\.jsonl$/;
9
+ const DEBUG_FILE_PATTERN = /^proxy-debug-\d{4}-\d{2}-\d{2}\.jsonl$/;
10
+ const ARTIFACT_STAT_CONCURRENCY = 64;
9
11
  const LIFECYCLE_EVENTS = new Set([
10
12
  "request_accepted",
11
13
  "response_headers",
12
14
  "response_first_chunk",
13
15
  "request_terminal",
14
16
  ]);
17
+ function isContainedPath(root, candidate) {
18
+ const candidateRelative = relative(root, candidate);
19
+ return (candidateRelative.length > 0 &&
20
+ !isAbsolute(candidateRelative) &&
21
+ candidateRelative !== ".." &&
22
+ !candidateRelative.startsWith(`..${sep}`));
23
+ }
24
+ async function inspectBodyArtifact(artifactPath, canonicalBodiesRoot) {
25
+ if (!canonicalBodiesRoot) {
26
+ return "missing";
27
+ }
28
+ try {
29
+ const canonicalArtifactPath = await realpath(artifactPath);
30
+ if (!isContainedPath(canonicalBodiesRoot, canonicalArtifactPath)) {
31
+ return "invalid";
32
+ }
33
+ return (await stat(canonicalArtifactPath)).isFile() ? "present" : "missing";
34
+ }
35
+ catch {
36
+ return "missing";
37
+ }
38
+ }
15
39
  function increment(counter, key) {
16
40
  counter[key] = (counter[key] ?? 0) + 1;
17
41
  }
@@ -192,6 +216,7 @@ async function discoverLogFiles(logsDir) {
192
216
  lifecycleFiles: matching(LIFECYCLE_FILE_PATTERN),
193
217
  requestFiles: matching(REQUEST_FILE_PATTERN),
194
218
  attemptFiles: matching(ATTEMPT_FILE_PATTERN),
219
+ debugFiles: matching(DEBUG_FILE_PATTERN),
195
220
  };
196
221
  }
197
222
  /** Analyze local proxy logs without reading request or response body artifacts. */
@@ -199,7 +224,24 @@ export async function analyzeProxyLogs(options) {
199
224
  const nowMs = options?.nowMs ?? Date.now();
200
225
  const sinceMs = parseSince(options?.since ?? "24h", nowMs);
201
226
  const logsDir = resolve(options?.logsDir ?? join(homedir(), ".neurolink", "logs"));
202
- const { lifecycleFiles, requestFiles, attemptFiles } = await discoverLogFiles(logsDir);
227
+ const { lifecycleFiles, requestFiles, attemptFiles, debugFiles } = await discoverLogFiles(logsDir);
228
+ const observedRanges = {
229
+ lifecycle: { from: null, to: null },
230
+ requests: { from: null, to: null },
231
+ attempts: { from: null, to: null },
232
+ debug: { from: null, to: null },
233
+ };
234
+ const observeTimestamp = (stream, record) => {
235
+ const timestamp = Date.parse(String(record.timestamp ?? ""));
236
+ if (!Number.isFinite(timestamp)) {
237
+ return null;
238
+ }
239
+ const range = observedRanges[stream];
240
+ range.from =
241
+ range.from === null ? timestamp : Math.min(range.from, timestamp);
242
+ range.to = range.to === null ? timestamp : Math.max(range.to, timestamp);
243
+ return timestamp;
244
+ };
203
245
  let linesRead = 0;
204
246
  let malformedLines = 0;
205
247
  let unsupportedLifecycleLines = 0;
@@ -216,8 +258,8 @@ export async function analyzeProxyLogs(options) {
216
258
  const sequences = new Map();
217
259
  for (const filePath of lifecycleFiles) {
218
260
  linesRead += await readJsonLines(filePath, (record) => {
219
- const timestamp = Date.parse(String(record.timestamp ?? ""));
220
- if (!Number.isFinite(timestamp) || timestamp < sinceMs) {
261
+ const timestamp = observeTimestamp("lifecycle", record);
262
+ if (timestamp === null || timestamp < sinceMs) {
221
263
  return;
222
264
  }
223
265
  const event = stringValue(record.event);
@@ -298,8 +340,8 @@ export async function analyzeProxyLogs(options) {
298
340
  let unclassifiedRateLimits = 0;
299
341
  for (const filePath of attemptFiles) {
300
342
  linesRead += await readJsonLines(filePath, (record) => {
301
- const timestamp = Date.parse(String(record.timestamp ?? ""));
302
- if (!Number.isFinite(timestamp) || timestamp < sinceMs) {
343
+ const timestamp = observeTimestamp("attempts", record);
344
+ if (timestamp === null || timestamp < sinceMs) {
303
345
  return;
304
346
  }
305
347
  const requestId = stringValue(record.requestId);
@@ -360,8 +402,8 @@ export async function analyzeProxyLogs(options) {
360
402
  const terminalStreamErrors = new Set();
361
403
  for (const filePath of requestFiles) {
362
404
  linesRead += await readJsonLines(filePath, (record) => {
363
- const timestamp = Date.parse(String(record.timestamp ?? ""));
364
- if (!Number.isFinite(timestamp) || timestamp < sinceMs) {
405
+ const timestamp = observeTimestamp("requests", record);
406
+ if (timestamp === null || timestamp < sinceMs) {
365
407
  return;
366
408
  }
367
409
  const requestId = stringValue(record.requestId);
@@ -391,6 +433,70 @@ export async function analyzeProxyLogs(options) {
391
433
  malformedLines += 1;
392
434
  });
393
435
  }
436
+ let capturesIndexed = 0;
437
+ let truncatedCaptures = 0;
438
+ let writeFailures = 0;
439
+ let invalidPaths = 0;
440
+ const referencedArtifacts = new Set();
441
+ const bodiesRoot = resolve(logsDir, "bodies");
442
+ for (const filePath of debugFiles) {
443
+ linesRead += await readJsonLines(filePath, (record) => {
444
+ const timestamp = observeTimestamp("debug", record);
445
+ if (timestamp === null || timestamp < sinceMs) {
446
+ return;
447
+ }
448
+ if (record.type !== "body_capture") {
449
+ return;
450
+ }
451
+ capturesIndexed += 1;
452
+ truncatedCaptures += record.bodyTruncated === true ? 1 : 0;
453
+ writeFailures += record.bodyWriteFailed === true ? 1 : 0;
454
+ const bodyPath = stringValue(record.bodyPath);
455
+ if (!bodyPath) {
456
+ return;
457
+ }
458
+ if (bodyPath.includes("\0") || bodyPath.split(/[\\/]/).includes("..")) {
459
+ invalidPaths += 1;
460
+ return;
461
+ }
462
+ const resolvedBodyPath = resolve(logsDir, bodyPath);
463
+ if (!isContainedPath(bodiesRoot, resolvedBodyPath)) {
464
+ invalidPaths += 1;
465
+ return;
466
+ }
467
+ referencedArtifacts.add(resolvedBodyPath);
468
+ }, () => {
469
+ malformedLines += 1;
470
+ });
471
+ }
472
+ const artifactPaths = [...referencedArtifacts];
473
+ let canonicalBodiesRoot = null;
474
+ let bodiesRootUnsafe = false;
475
+ try {
476
+ const bodiesRootStat = await lstat(bodiesRoot);
477
+ if (bodiesRootStat.isDirectory() && !bodiesRootStat.isSymbolicLink()) {
478
+ canonicalBodiesRoot = await realpath(bodiesRoot);
479
+ }
480
+ else {
481
+ bodiesRootUnsafe = true;
482
+ }
483
+ }
484
+ catch {
485
+ // A missing body directory means every lexically valid reference is absent.
486
+ }
487
+ let artifactsPresent = 0;
488
+ let artifactsMissing = 0;
489
+ for (let offset = 0; offset < artifactPaths.length; offset += ARTIFACT_STAT_CONCURRENCY) {
490
+ const presence = await Promise.all(artifactPaths
491
+ .slice(offset, offset + ARTIFACT_STAT_CONCURRENCY)
492
+ .map((artifactPath) => bodiesRootUnsafe
493
+ ? Promise.resolve("invalid")
494
+ : inspectBodyArtifact(artifactPath, canonicalBodiesRoot)));
495
+ artifactsPresent += presence.filter((value) => value === "present").length;
496
+ artifactsMissing += presence.filter((value) => value === "missing").length;
497
+ invalidPaths += presence.filter((value) => value === "invalid").length;
498
+ }
499
+ const artifactsReferenced = artifactsPresent + artifactsMissing;
394
500
  const finalSummary = summarizeFinalRequests(finalRequests, terminalStreamErrors, attemptsByRequest, accounts);
395
501
  return {
396
502
  generatedAt: new Date(nowMs).toISOString(),
@@ -400,11 +506,12 @@ export async function analyzeProxyLogs(options) {
400
506
  lifecycle: lifecycleFiles.length,
401
507
  requests: requestFiles.length,
402
508
  attempts: attemptFiles.length,
509
+ debug: debugFiles.length,
403
510
  },
404
511
  coverage: {
405
- lifecycle: lifecycleFiles.length > 0,
406
- finalRequests: requestFiles.length > 0,
407
- attempts: attemptFiles.length > 0,
512
+ lifecycle: accepted.size + headers.size + firstChunks.size + terminal.size > 0,
513
+ finalRequests: finalRequests.size > 0 || terminalStreamErrors.size > 0,
514
+ attempts: totalAttempts > 0,
408
515
  attemptLatency: attemptLatency.length > 0,
409
516
  cacheUsage: finalSummary.cache.requestsWithUsage > 0,
410
517
  },
@@ -414,6 +521,23 @@ export async function analyzeProxyLogs(options) {
414
521
  unsupportedLifecycleLines,
415
522
  lifecycleSequenceGaps,
416
523
  lifecycleSequenceDuplicates,
524
+ streams: Object.fromEntries(Object.entries(observedRanges).map(([stream, range]) => [
525
+ stream,
526
+ {
527
+ observedFrom: range.from === null ? null : new Date(range.from).toISOString(),
528
+ observedTo: range.to === null ? null : new Date(range.to).toISOString(),
529
+ startsAtOrBeforeRequestedWindow: range.from !== null && range.from <= sinceMs,
530
+ },
531
+ ])),
532
+ bodyArtifacts: {
533
+ capturesIndexed,
534
+ artifactsReferenced,
535
+ artifactsPresent,
536
+ artifactsMissing,
537
+ invalidPaths,
538
+ writeFailures,
539
+ truncatedCaptures,
540
+ },
417
541
  },
418
542
  lifecycle: {
419
543
  accepted: accepted.size,
@@ -77,6 +77,7 @@ export declare function handleTranslatedJsonRequest(args: {
77
77
  attempts: ProxyTranslationAttempt[];
78
78
  tracer?: ProxyTracer;
79
79
  requestStartTime: number;
80
+ terminalFailureStatus?: number;
80
81
  }): Promise<unknown>;
81
82
  /**
82
83
  * Build the /v1/models response in OpenAI list format.
@@ -247,6 +247,7 @@ export async function handleTranslatedStreamRequest(args) {
247
247
  let keepAliveTimer;
248
248
  let cancelled = false;
249
249
  let succeeded = false;
250
+ let streamInterruptedAfterOutput = false;
250
251
  let translatedModel;
251
252
  let finalStreamError = "No translation providers succeeded";
252
253
  let upstreamIterator;
@@ -267,6 +268,9 @@ export async function handleTranslatedStreamRequest(args) {
267
268
  }, KEEPALIVE_INTERVAL_MS);
268
269
  try {
269
270
  for (let attemptIndex = 0; attemptIndex < attempts.length; attemptIndex++) {
271
+ if (cancelled) {
272
+ break;
273
+ }
270
274
  const attempt = attempts[attemptIndex];
271
275
  lastAttemptLabel = attempt.label ?? "translation";
272
276
  logger.always(`[proxy:${format}] attempt ${attemptIndex + 1}/${attempts.length}: ${attempt.label}`);
@@ -295,10 +299,14 @@ export async function handleTranslatedStreamRequest(args) {
295
299
  }
296
300
  }
297
301
  }
302
+ if (cancelled) {
303
+ return;
304
+ }
298
305
  const toolCalls = streamResult.toolCalls ?? [];
299
306
  if (!hasTranslatedOutput(collectedText, toolCalls)) {
300
307
  finalStreamError = `Translated provider ${attempt.label} returned no content or tool calls`;
301
308
  logger.debug(`${tag} translation attempt ${attempt.label} returned no content or tool calls`);
309
+ recordAttemptError(lastAttemptLabel, "translation", 502);
302
310
  continue;
303
311
  }
304
312
  if (!cancelled && toolCalls.length) {
@@ -331,7 +339,6 @@ export async function handleTranslatedStreamRequest(args) {
331
339
  tracer?.recordMetrics();
332
340
  translatedModel = streamResult.model;
333
341
  succeeded = true;
334
- recordFinalSuccess(lastAttemptLabel, "translation");
335
342
  return;
336
343
  }
337
344
  catch (streamErr) {
@@ -343,6 +350,8 @@ export async function handleTranslatedStreamRequest(args) {
343
350
  ? streamErr.message
344
351
  : String(streamErr);
345
352
  if (collectedText.trim().length > 0) {
353
+ streamInterruptedAfterOutput = true;
354
+ recordAttemptError(lastAttemptLabel, "translation", 502);
346
355
  logger.always(`${tag} mid-stream error: ${finalStreamError}`);
347
356
  for (const frame of serializer.emitError(`Upstream stream interrupted: ${finalStreamError}`)) {
348
357
  controller.enqueue(encoder.encode(frame));
@@ -354,7 +363,6 @@ export async function handleTranslatedStreamRequest(args) {
354
363
  }
355
364
  }
356
365
  // All attempts exhausted
357
- recordFinalError(500, lastAttemptLabel, "translation");
358
366
  if (!cancelled) {
359
367
  logger.always(`${tag} all translation attempts failed: ${finalStreamError}`);
360
368
  for (const frame of serializer.emitError(finalStreamError)) {
@@ -372,12 +380,38 @@ export async function handleTranslatedStreamRequest(args) {
372
380
  if (tracer && translatedModel && translatedModel !== requestModel) {
373
381
  tracer.setModelSubstitution(requestModel, translatedModel);
374
382
  }
375
- if (!succeeded) {
376
- tracer?.setError("generation_error", finalStreamError.slice(0, 500));
383
+ const terminalStatus = cancelled
384
+ ? 499
385
+ : succeeded
386
+ ? 200
387
+ : streamInterruptedAfterOutput
388
+ ? 502
389
+ : 500;
390
+ const terminalErrorType = cancelled
391
+ ? "client_cancelled"
392
+ : streamInterruptedAfterOutput
393
+ ? "stream_error"
394
+ : succeeded
395
+ ? undefined
396
+ : "generation_error";
397
+ const terminalErrorMessage = cancelled
398
+ ? "Client cancelled the streaming response"
399
+ : succeeded
400
+ ? undefined
401
+ : finalStreamError;
402
+ if (terminalErrorType && terminalErrorMessage) {
403
+ tracer?.setError(terminalErrorType, terminalErrorMessage.slice(0, 500));
404
+ recordFinalError(terminalStatus, lastAttemptLabel, "translation", {
405
+ requestId: ctx.requestId,
406
+ errorType: terminalErrorType,
407
+ terminalOutcome: terminalErrorType,
408
+ message: terminalErrorMessage,
409
+ });
410
+ }
411
+ else {
412
+ recordFinalSuccess(lastAttemptLabel, "translation");
377
413
  }
378
- // Use the real outcome status so trace data matches the logged
379
- // responseStatus below (success path is 200, exhausted-attempts path is 500).
380
- tracer?.end(succeeded ? 200 : 500, Date.now() - requestStartTime);
414
+ tracer?.end(terminalStatus, Date.now() - requestStartTime);
381
415
  const traceCtx = tracer?.getTraceContext();
382
416
  logRequest({
383
417
  timestamp: new Date().toISOString(),
@@ -389,8 +423,12 @@ export async function handleTranslatedStreamRequest(args) {
389
423
  toolCount: Object.keys(parsed.tools).length,
390
424
  account: "translation",
391
425
  accountType: "translation",
392
- responseStatus: succeeded ? 200 : 500,
426
+ responseStatus: terminalStatus,
393
427
  responseTimeMs: Date.now() - requestStartTime,
428
+ ...(terminalErrorType ? { errorType: terminalErrorType } : {}),
429
+ ...(terminalErrorMessage
430
+ ? { errorMessage: terminalErrorMessage.slice(0, 500) }
431
+ : {}),
394
432
  ...(traceCtx?.traceId ? { traceId: traceCtx.traceId } : {}),
395
433
  ...(traceCtx?.spanId ? { spanId: traceCtx.spanId } : {}),
396
434
  });
@@ -424,7 +462,7 @@ export async function handleTranslatedStreamRequest(args) {
424
462
  * Handles a translated non-streaming request for either Claude or OpenAI format.
425
463
  */
426
464
  export async function handleTranslatedJsonRequest(args) {
427
- const { ctx, format, requestModel, parsed, attempts, tracer, requestStartTime, } = args;
465
+ const { ctx, format, requestModel, parsed, attempts, tracer, requestStartTime, terminalFailureStatus = 500, } = args;
428
466
  const tag = logTag(format);
429
467
  let lastAttemptError = "No translation providers succeeded";
430
468
  let lastAttemptLabel = "translation";
@@ -448,6 +486,7 @@ export async function handleTranslatedJsonRequest(args) {
448
486
  if (!hasTranslatedOutput(collectedText, streamResult.toolCalls)) {
449
487
  lastAttemptError = `Translated provider ${attempt.label} returned no content or tool calls`;
450
488
  logger.debug(`${tag} translation attempt ${attempt.label} returned no content or tool calls`);
489
+ recordAttemptError(lastAttemptLabel, "translation", 502);
451
490
  continue;
452
491
  }
453
492
  const internal = {
@@ -505,9 +544,14 @@ export async function handleTranslatedJsonRequest(args) {
505
544
  recordAttemptError(lastAttemptLabel, "translation", 500);
506
545
  }
507
546
  }
508
- recordFinalError(500, lastAttemptLabel, "translation");
547
+ recordFinalError(terminalFailureStatus, lastAttemptLabel, "translation", {
548
+ requestId: ctx.requestId,
549
+ errorType: "generation_error",
550
+ terminalOutcome: "handler_error",
551
+ message: lastAttemptError,
552
+ });
509
553
  tracer?.setError("generation_error", lastAttemptError.slice(0, 500));
510
- tracer?.end(500, Date.now() - requestStartTime);
554
+ tracer?.end(terminalFailureStatus, Date.now() - requestStartTime);
511
555
  const traceCtx = tracer?.getTraceContext();
512
556
  logRequest({
513
557
  timestamp: new Date().toISOString(),
@@ -519,7 +563,7 @@ export async function handleTranslatedJsonRequest(args) {
519
563
  toolCount: Object.keys(parsed.tools).length,
520
564
  account: "translation",
521
565
  accountType: "translation",
522
- responseStatus: 500,
566
+ responseStatus: terminalFailureStatus,
523
567
  responseTimeMs: Date.now() - requestStartTime,
524
568
  errorType: "generation_error",
525
569
  errorMessage: lastAttemptError.slice(0, 500),
@@ -60,7 +60,11 @@ export function createRawStreamCapture() {
60
60
  },
61
61
  });
62
62
  const innerWriter = transform.writable.getWriter();
63
+ let writableController;
63
64
  const writable = new WritableStream({
65
+ start(controller) {
66
+ writableController = controller;
67
+ },
64
68
  write(chunk) {
65
69
  return innerWriter.write(chunk);
66
70
  },
@@ -72,9 +76,51 @@ export function createRawStreamCapture() {
72
76
  return innerWriter.abort(reason);
73
77
  },
74
78
  });
79
+ // A downstream reader cancellation errors the TransformStream's writable
80
+ // side, but this wrapper otherwise hides that state from the upstream pipe.
81
+ // Mirror it onto the wrapper so cancellation reaches the source reader.
82
+ void innerWriter.closed.catch((reason) => {
83
+ settle();
84
+ try {
85
+ writableController.error(reason);
86
+ }
87
+ catch {
88
+ // The wrapper may already be closing or aborted.
89
+ }
90
+ });
91
+ const innerReader = transform.readable.getReader();
92
+ const readable = new ReadableStream({
93
+ async pull(controller) {
94
+ try {
95
+ const { done, value } = await innerReader.read();
96
+ if (done) {
97
+ controller.close();
98
+ }
99
+ else {
100
+ controller.enqueue(value);
101
+ }
102
+ }
103
+ catch (error) {
104
+ controller.error(error);
105
+ }
106
+ },
107
+ async cancel(reason) {
108
+ settle();
109
+ try {
110
+ writableController.error(reason);
111
+ }
112
+ catch {
113
+ // The wrapper may already be closing or aborted.
114
+ }
115
+ await Promise.allSettled([
116
+ innerReader.cancel(reason),
117
+ innerWriter.abort(reason),
118
+ ]);
119
+ },
120
+ });
75
121
  return {
76
122
  stream: {
77
- readable: transform.readable,
123
+ readable,
78
124
  writable,
79
125
  },
80
126
  capture,
@@ -6,6 +6,8 @@
6
6
  * Useful for debugging and auditing proxy traffic.
7
7
  */
8
8
  import type { ProxyBodyCaptureEntry, RequestAttemptLogEntry, RequestLogEntry } from "../types/index.js";
9
+ /** Wait, up to a bounded deadline, for admitted request/body writes to settle. */
10
+ export declare function flushRequestLogs(timeoutMs?: number): Promise<void>;
9
11
  export declare function initRequestLogger(enabled?: boolean, customLogsDir?: string): void;
10
12
  export declare function logRequest(entry: RequestLogEntry): Promise<void>;
11
13
  /**
@@ -9,15 +9,49 @@ import { join } from "path";
9
9
  import { homedir } from "os";
10
10
  import { logger } from "../utils/logger.js";
11
11
  import { chmodSync, existsSync, mkdirSync, readdirSync, rmSync, statSync, unlinkSync, } from "fs";
12
- import { appendFile, writeFile } from "fs/promises";
12
+ import { writeFile } from "fs/promises";
13
13
  import { createHash } from "crypto";
14
14
  import { promisify } from "util";
15
15
  import { gzip as gzipCallback } from "zlib";
16
16
  import { OtelBridge } from "../observability/otelBridge.js";
17
17
  import { SeverityNumber } from "@opentelemetry/api-logs";
18
18
  import { configureProxyLifecycleLogger } from "./proxyLifecycle.js";
19
+ import { withTimeout } from "../utils/async/withTimeout.js";
19
20
  let logDir = null;
20
21
  let logEnabled = false;
22
+ const pendingLogOperations = new Set();
23
+ const REQUEST_LOG_IO_TIMEOUT_MS = 5_000;
24
+ function trackLogOperation(operation) {
25
+ pendingLogOperations.add(operation);
26
+ void operation.then(() => pendingLogOperations.delete(operation), () => pendingLogOperations.delete(operation));
27
+ return operation;
28
+ }
29
+ /** Wait, up to a bounded deadline, for admitted request/body writes to settle. */
30
+ export async function flushRequestLogs(timeoutMs = REQUEST_LOG_IO_TIMEOUT_MS) {
31
+ const deadline = Date.now() + Math.max(1, timeoutMs);
32
+ while (pendingLogOperations.size > 0) {
33
+ const admitted = [...pendingLogOperations];
34
+ const remainingMs = Math.max(1, deadline - Date.now());
35
+ try {
36
+ await withTimeout(Promise.allSettled(admitted), remainingMs, `Timed out flushing ${admitted.length} proxy request log operation(s)`);
37
+ }
38
+ catch (error) {
39
+ for (const operation of admitted) {
40
+ pendingLogOperations.delete(operation);
41
+ }
42
+ throw error;
43
+ }
44
+ if (Date.now() >= deadline && pendingLogOperations.size > 0) {
45
+ const remaining = pendingLogOperations.size;
46
+ throw new Error(`Timed out flushing ${remaining} proxy request log operation(s)`);
47
+ }
48
+ }
49
+ }
50
+ /** @internal Test-only hook for exercising shutdown behavior without real I/O. */
51
+ export const __requestLoggerTestHooks = {
52
+ pendingOperationCount: () => pendingLogOperations.size,
53
+ trackLogOperation,
54
+ };
21
55
  /**
22
56
  * Lazily-resolved LoggerProvider from OTel instrumentation.
23
57
  * null = not resolved yet (will retry), LoggerProvider = resolved, false = permanently unavailable.
@@ -86,7 +120,11 @@ export async function logRequest(entry) {
86
120
  const logFile = join(logDir, `proxy-${new Date().toISOString().split("T")[0]}.jsonl`);
87
121
  const line = JSON.stringify(entry) + "\n";
88
122
  try {
89
- await appendFile(logFile, line, { mode: 0o600 });
123
+ await trackLogOperation(writeFile(logFile, line, {
124
+ mode: 0o600,
125
+ flag: "a",
126
+ signal: AbortSignal.timeout(REQUEST_LOG_IO_TIMEOUT_MS),
127
+ }));
90
128
  }
91
129
  catch {
92
130
  // Non-fatal — don't crash proxy for logging failures
@@ -114,7 +152,11 @@ export async function logRequestAttempt(entry) {
114
152
  const logFile = join(logDir, `proxy-attempts-${new Date().toISOString().split("T")[0]}.jsonl`);
115
153
  const line = JSON.stringify(entry) + "\n";
116
154
  try {
117
- await appendFile(logFile, line, { mode: 0o600 });
155
+ await trackLogOperation(writeFile(logFile, line, {
156
+ mode: 0o600,
157
+ flag: "a",
158
+ signal: AbortSignal.timeout(REQUEST_LOG_IO_TIMEOUT_MS),
159
+ }));
118
160
  }
119
161
  catch {
120
162
  // Non-fatal — don't crash proxy for logging failures
@@ -353,7 +395,7 @@ function collectManagedLogFiles(rootDir) {
353
395
  continue;
354
396
  }
355
397
  const isTopLevelProxyLog = directory === rootDir &&
356
- /^proxy(?:-attempts|-debug)?-.*\.jsonl$/.test(entry.name);
398
+ /^proxy(?:-attempts|-debug|-lifecycle)?-.*\.jsonl$/.test(entry.name);
357
399
  const isBodyArtifact = entry.name.endsWith(".json.gz") &&
358
400
  entryPath.includes(`${join(rootDir, "bodies")}`);
359
401
  if (!isTopLevelProxyLog && !isBodyArtifact) {
@@ -427,7 +469,10 @@ async function writeBodyArtifact(entry, redactedHeaders, redactedBody, bodyTrunc
427
469
  metadata: entry.metadata,
428
470
  });
429
471
  const compressed = await gzip(payload);
430
- await writeFile(bodyPath, compressed, { mode: 0o600 });
472
+ await writeFile(bodyPath, compressed, {
473
+ mode: 0o600,
474
+ signal: AbortSignal.timeout(REQUEST_LOG_IO_TIMEOUT_MS),
475
+ });
431
476
  return {
432
477
  bodyPath,
433
478
  bodySha256: sha256(redactedBody),
@@ -510,7 +555,7 @@ export async function logBodyCapture(entry) {
510
555
  const preparedBody = prepareRedactedBody(entry.body);
511
556
  let stored;
512
557
  try {
513
- stored = await writeBodyArtifact(entry, redactedHeaders, preparedBody.value, preparedBody.truncated);
558
+ stored = await trackLogOperation(writeBodyArtifact(entry, redactedHeaders, preparedBody.value, preparedBody.truncated));
514
559
  }
515
560
  catch (writeError) {
516
561
  logger.warn("[RequestLogger] writeBodyArtifact failed, falling back to in-memory body for OTLP", { error: writeError });
@@ -518,6 +563,7 @@ export async function logBodyCapture(entry) {
518
563
  redactedBody: preparedBody.value,
519
564
  redactedBodyBytes: preparedBody.bytes,
520
565
  bodyTruncated: preparedBody.truncated,
566
+ bodyWriteFailed: true,
521
567
  };
522
568
  }
523
569
  const dateStr = new Date(entry.timestamp).toISOString().split("T")[0];
@@ -542,6 +588,7 @@ export async function logBodyCapture(entry) {
542
588
  redactedBodyBytes: stored.redactedBodyBytes ?? preparedBody.bytes,
543
589
  storedFileBytes: stored.storedFileBytes,
544
590
  bodyTruncated: stored.bodyTruncated ?? preparedBody.truncated,
591
+ bodyWriteFailed: stored.bodyWriteFailed,
545
592
  metadata: entry.metadata,
546
593
  };
547
594
  if (traceCtx) {
@@ -549,9 +596,11 @@ export async function logBodyCapture(entry) {
549
596
  indexEntry.spanId = traceCtx.spanId;
550
597
  }
551
598
  try {
552
- await appendFile(logFile, JSON.stringify(indexEntry) + "\n", {
599
+ await trackLogOperation(writeFile(logFile, JSON.stringify(indexEntry) + "\n", {
553
600
  mode: 0o600,
554
- });
601
+ flag: "a",
602
+ signal: AbortSignal.timeout(REQUEST_LOG_IO_TIMEOUT_MS),
603
+ }));
555
604
  }
556
605
  catch {
557
606
  // Non-fatal
@@ -623,9 +672,11 @@ export async function logStreamError(entry) {
623
672
  logEntry.spanId = traceCtx.spanId;
624
673
  }
625
674
  try {
626
- await appendFile(logFile, JSON.stringify(logEntry) + "\n", {
675
+ await trackLogOperation(writeFile(logFile, JSON.stringify(logEntry) + "\n", {
627
676
  mode: 0o600,
628
- });
677
+ flag: "a",
678
+ signal: AbortSignal.timeout(REQUEST_LOG_IO_TIMEOUT_MS),
679
+ }));
629
680
  }
630
681
  catch {
631
682
  // Non-fatal — don't crash proxy for logging failures
@@ -644,13 +695,16 @@ export function cleanupLogs(maxAgeDays = 7, maxSizeMb = 500) {
644
695
  try {
645
696
  const activeLogDir = logDir;
646
697
  const files = collectManagedLogFiles(activeLogDir).sort((a, b) => a.mtime - b.mtime); // oldest first
698
+ const currentDate = new Date().toISOString().split("T")[0];
699
+ const currentMetadataLogs = new Set(["proxy", "proxy-attempts", "proxy-debug", "proxy-lifecycle"].map((prefix) => join(activeLogDir, `${prefix}-${currentDate}.jsonl`)));
700
+ const canDelete = (file) => !currentMetadataLogs.has(file.path);
647
701
  const cutoff = Date.now() - maxAgeDays * 24 * 60 * 60 * 1000;
648
702
  let deletedCount = 0;
649
703
  let freedBytes = 0;
650
704
  // Pass 1: delete files older than maxAgeDays
651
705
  const remaining = [];
652
706
  for (const file of files) {
653
- if (file.mtime < cutoff) {
707
+ if (file.mtime < cutoff && canDelete(file)) {
654
708
  unlinkSync(file.path);
655
709
  deletedCount++;
656
710
  freedBytes += file.size;
@@ -666,8 +720,13 @@ export function cleanupLogs(maxAgeDays = 7, maxSizeMb = 500) {
666
720
  // Pass 2: if total size exceeds maxSizeMb, delete oldest until under limit
667
721
  const maxBytes = maxSizeMb * 1024 * 1024;
668
722
  let totalSize = remaining.reduce((sum, f) => sum + f.size, 0);
669
- while (totalSize > maxBytes && remaining.length > 0) {
670
- const oldest = remaining.shift();
723
+ const deletionCandidates = remaining.filter(canDelete);
724
+ // Current-day metadata is the only reliable source for final-request,
725
+ // attempt, lifecycle, and body-index reconciliation. Keep those indexes
726
+ // intact during size cleanup; body artifacts and older indexes remain
727
+ // eligible for eviction.
728
+ while (totalSize > maxBytes && deletionCandidates.length > 0) {
729
+ const oldest = deletionCandidates.shift();
671
730
  if (!oldest) {
672
731
  break;
673
732
  }