@juspay/neurolink 9.40.0 → 9.42.0
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/CHANGELOG.md +12 -0
- package/README.md +7 -1
- package/dist/auth/anthropicOAuth.d.ts +18 -3
- package/dist/auth/anthropicOAuth.js +137 -4
- package/dist/auth/providers/firebase.js +5 -1
- package/dist/auth/providers/jwt.js +5 -1
- package/dist/auth/providers/workos.js +5 -1
- package/dist/auth/sessionManager.d.ts +1 -1
- package/dist/auth/sessionManager.js +58 -27
- package/dist/browser/neurolink.min.js +471 -445
- package/dist/cli/commands/mcp.js +3 -0
- package/dist/cli/commands/proxy.d.ts +2 -1
- package/dist/cli/commands/proxy.js +279 -16
- package/dist/cli/commands/task.d.ts +56 -0
- package/dist/cli/commands/task.js +838 -0
- package/dist/cli/factories/commandFactory.d.ts +2 -0
- package/dist/cli/factories/commandFactory.js +38 -0
- package/dist/cli/parser.js +8 -4
- package/dist/client/aiSdkAdapter.js +3 -0
- package/dist/client/streamingClient.js +30 -10
- package/dist/core/modules/GenerationHandler.js +3 -2
- package/dist/core/redisConversationMemoryManager.js +7 -3
- package/dist/evaluation/BatchEvaluator.js +4 -1
- package/dist/evaluation/hooks/observabilityHooks.js +5 -3
- package/dist/evaluation/pipeline/evaluationPipeline.d.ts +3 -2
- package/dist/evaluation/pipeline/evaluationPipeline.js +20 -8
- package/dist/evaluation/pipeline/strategies/batchStrategy.js +6 -3
- package/dist/evaluation/pipeline/strategies/samplingStrategy.js +18 -10
- package/dist/lib/auth/anthropicOAuth.d.ts +18 -3
- package/dist/lib/auth/anthropicOAuth.js +137 -4
- package/dist/lib/auth/providers/firebase.js +5 -1
- package/dist/lib/auth/providers/jwt.js +5 -1
- package/dist/lib/auth/providers/workos.js +5 -1
- package/dist/lib/auth/sessionManager.d.ts +1 -1
- package/dist/lib/auth/sessionManager.js +58 -27
- package/dist/lib/client/aiSdkAdapter.js +3 -0
- package/dist/lib/client/streamingClient.js +30 -10
- package/dist/lib/core/modules/GenerationHandler.js +3 -2
- package/dist/lib/core/redisConversationMemoryManager.js +7 -3
- package/dist/lib/evaluation/BatchEvaluator.js +4 -1
- package/dist/lib/evaluation/hooks/observabilityHooks.js +5 -3
- package/dist/lib/evaluation/pipeline/evaluationPipeline.d.ts +3 -2
- package/dist/lib/evaluation/pipeline/evaluationPipeline.js +20 -8
- package/dist/lib/evaluation/pipeline/strategies/batchStrategy.js +6 -3
- package/dist/lib/evaluation/pipeline/strategies/samplingStrategy.js +18 -10
- package/dist/lib/neurolink.d.ts +18 -1
- package/dist/lib/neurolink.js +367 -484
- package/dist/lib/observability/otelBridge.d.ts +2 -2
- package/dist/lib/observability/otelBridge.js +12 -3
- package/dist/lib/providers/amazonBedrock.js +2 -4
- package/dist/lib/providers/anthropic.d.ts +9 -5
- package/dist/lib/providers/anthropic.js +19 -14
- package/dist/lib/providers/anthropicBaseProvider.d.ts +3 -3
- package/dist/lib/providers/anthropicBaseProvider.js +5 -4
- package/dist/lib/providers/azureOpenai.d.ts +1 -1
- package/dist/lib/providers/azureOpenai.js +5 -4
- package/dist/lib/providers/googleAiStudio.js +30 -1
- package/dist/lib/providers/googleVertex.js +28 -6
- package/dist/lib/providers/huggingFace.d.ts +3 -3
- package/dist/lib/providers/huggingFace.js +6 -8
- package/dist/lib/providers/litellm.js +41 -29
- package/dist/lib/providers/mistral.js +2 -1
- package/dist/lib/providers/ollama.js +80 -23
- package/dist/lib/providers/openAI.js +3 -2
- package/dist/lib/providers/openRouter.js +2 -1
- package/dist/lib/providers/openaiCompatible.d.ts +4 -4
- package/dist/lib/providers/openaiCompatible.js +4 -4
- package/dist/lib/proxy/claudeFormat.d.ts +3 -2
- package/dist/lib/proxy/claudeFormat.js +25 -20
- package/dist/lib/proxy/cloaking/plugins/sessionIdentity.d.ts +2 -6
- package/dist/lib/proxy/cloaking/plugins/sessionIdentity.js +9 -33
- package/dist/lib/proxy/modelRouter.js +3 -0
- package/dist/lib/proxy/oauthFetch.d.ts +1 -1
- package/dist/lib/proxy/oauthFetch.js +65 -72
- package/dist/lib/proxy/proxyConfig.js +44 -24
- package/dist/lib/proxy/proxyEnv.d.ts +19 -0
- package/dist/lib/proxy/proxyEnv.js +73 -0
- package/dist/lib/proxy/proxyFetch.js +50 -4
- package/dist/lib/proxy/proxyTracer.d.ts +133 -0
- package/dist/lib/proxy/proxyTracer.js +645 -0
- package/dist/lib/proxy/rawStreamCapture.d.ts +10 -0
- package/dist/lib/proxy/rawStreamCapture.js +83 -0
- package/dist/lib/proxy/requestLogger.d.ts +32 -5
- package/dist/lib/proxy/requestLogger.js +406 -37
- package/dist/lib/proxy/sseInterceptor.d.ts +97 -0
- package/dist/lib/proxy/sseInterceptor.js +402 -0
- package/dist/lib/proxy/usageStats.d.ts +4 -3
- package/dist/lib/proxy/usageStats.js +25 -12
- package/dist/lib/rag/chunkers/MarkdownChunker.js +13 -5
- package/dist/lib/rag/chunking/markdownChunker.js +15 -6
- package/dist/lib/server/routes/claudeProxyRoutes.d.ts +7 -2
- package/dist/lib/server/routes/claudeProxyRoutes.js +1737 -508
- package/dist/lib/services/server/ai/observability/instrumentation.d.ts +7 -1
- package/dist/lib/services/server/ai/observability/instrumentation.js +240 -40
- package/dist/lib/tasks/backends/bullmqBackend.d.ts +33 -0
- package/dist/lib/tasks/backends/bullmqBackend.js +196 -0
- package/dist/lib/tasks/backends/nodeTimeoutBackend.d.ts +27 -0
- package/dist/lib/tasks/backends/nodeTimeoutBackend.js +141 -0
- package/dist/lib/tasks/backends/taskBackendRegistry.d.ts +31 -0
- package/dist/lib/tasks/backends/taskBackendRegistry.js +66 -0
- package/dist/lib/tasks/errors.d.ts +31 -0
- package/dist/lib/tasks/errors.js +18 -0
- package/dist/lib/tasks/store/fileTaskStore.d.ts +43 -0
- package/dist/lib/tasks/store/fileTaskStore.js +179 -0
- package/dist/lib/tasks/store/redisTaskStore.d.ts +43 -0
- package/dist/lib/tasks/store/redisTaskStore.js +197 -0
- package/dist/lib/tasks/taskExecutor.d.ts +21 -0
- package/dist/lib/tasks/taskExecutor.js +166 -0
- package/dist/lib/tasks/taskManager.d.ts +63 -0
- package/dist/lib/tasks/taskManager.js +426 -0
- package/dist/lib/tasks/tools/taskTools.d.ts +135 -0
- package/dist/lib/tasks/tools/taskTools.js +274 -0
- package/dist/lib/telemetry/index.d.ts +2 -1
- package/dist/lib/telemetry/index.js +2 -1
- package/dist/lib/telemetry/telemetryService.d.ts +3 -0
- package/dist/lib/telemetry/telemetryService.js +65 -5
- package/dist/lib/types/cli.d.ts +10 -0
- package/dist/lib/types/configTypes.d.ts +3 -0
- package/dist/lib/types/generateTypes.d.ts +13 -0
- package/dist/lib/types/index.d.ts +1 -0
- package/dist/lib/types/proxyTypes.d.ts +37 -5
- package/dist/lib/types/streamTypes.d.ts +25 -3
- package/dist/lib/types/taskTypes.d.ts +275 -0
- package/dist/lib/types/taskTypes.js +37 -0
- package/dist/lib/utils/messageBuilder.js +3 -2
- package/dist/lib/utils/providerHealth.d.ts +18 -0
- package/dist/lib/utils/providerHealth.js +240 -9
- package/dist/lib/utils/providerUtils.js +14 -8
- package/dist/lib/utils/toolChoice.d.ts +4 -0
- package/dist/lib/utils/toolChoice.js +7 -0
- package/dist/neurolink.d.ts +18 -1
- package/dist/neurolink.js +367 -484
- package/dist/observability/otelBridge.d.ts +2 -2
- package/dist/observability/otelBridge.js +12 -3
- package/dist/providers/amazonBedrock.js +2 -4
- package/dist/providers/anthropic.d.ts +9 -5
- package/dist/providers/anthropic.js +19 -14
- package/dist/providers/anthropicBaseProvider.d.ts +3 -3
- package/dist/providers/anthropicBaseProvider.js +5 -4
- package/dist/providers/azureOpenai.d.ts +1 -1
- package/dist/providers/azureOpenai.js +5 -4
- package/dist/providers/googleAiStudio.js +30 -1
- package/dist/providers/googleVertex.js +28 -6
- package/dist/providers/huggingFace.d.ts +3 -3
- package/dist/providers/huggingFace.js +6 -7
- package/dist/providers/litellm.js +41 -29
- package/dist/providers/mistral.js +2 -1
- package/dist/providers/ollama.js +80 -23
- package/dist/providers/openAI.js +3 -2
- package/dist/providers/openRouter.js +2 -1
- package/dist/providers/openaiCompatible.d.ts +4 -4
- package/dist/providers/openaiCompatible.js +4 -3
- package/dist/proxy/claudeFormat.d.ts +3 -2
- package/dist/proxy/claudeFormat.js +25 -20
- package/dist/proxy/cloaking/plugins/sessionIdentity.d.ts +2 -6
- package/dist/proxy/cloaking/plugins/sessionIdentity.js +9 -33
- package/dist/proxy/modelRouter.js +3 -0
- package/dist/proxy/oauthFetch.d.ts +1 -1
- package/dist/proxy/oauthFetch.js +65 -72
- package/dist/proxy/proxyConfig.js +44 -24
- package/dist/proxy/proxyEnv.d.ts +19 -0
- package/dist/proxy/proxyEnv.js +72 -0
- package/dist/proxy/proxyFetch.js +50 -4
- package/dist/proxy/proxyTracer.d.ts +133 -0
- package/dist/proxy/proxyTracer.js +644 -0
- package/dist/proxy/rawStreamCapture.d.ts +10 -0
- package/dist/proxy/rawStreamCapture.js +82 -0
- package/dist/proxy/requestLogger.d.ts +32 -5
- package/dist/proxy/requestLogger.js +406 -37
- package/dist/proxy/sseInterceptor.d.ts +97 -0
- package/dist/proxy/sseInterceptor.js +401 -0
- package/dist/proxy/usageStats.d.ts +4 -3
- package/dist/proxy/usageStats.js +25 -12
- package/dist/rag/chunkers/MarkdownChunker.js +13 -5
- package/dist/rag/chunking/markdownChunker.js +15 -6
- package/dist/server/routes/claudeProxyRoutes.d.ts +7 -2
- package/dist/server/routes/claudeProxyRoutes.js +1737 -508
- package/dist/services/server/ai/observability/instrumentation.d.ts +7 -1
- package/dist/services/server/ai/observability/instrumentation.js +240 -40
- package/dist/tasks/backends/bullmqBackend.d.ts +33 -0
- package/dist/tasks/backends/bullmqBackend.js +195 -0
- package/dist/tasks/backends/nodeTimeoutBackend.d.ts +27 -0
- package/dist/tasks/backends/nodeTimeoutBackend.js +140 -0
- package/dist/tasks/backends/taskBackendRegistry.d.ts +31 -0
- package/dist/tasks/backends/taskBackendRegistry.js +65 -0
- package/dist/tasks/errors.d.ts +31 -0
- package/dist/tasks/errors.js +17 -0
- package/dist/tasks/store/fileTaskStore.d.ts +43 -0
- package/dist/tasks/store/fileTaskStore.js +178 -0
- package/dist/tasks/store/redisTaskStore.d.ts +43 -0
- package/dist/tasks/store/redisTaskStore.js +196 -0
- package/dist/tasks/taskExecutor.d.ts +21 -0
- package/dist/tasks/taskExecutor.js +165 -0
- package/dist/tasks/taskManager.d.ts +63 -0
- package/dist/tasks/taskManager.js +425 -0
- package/dist/tasks/tools/taskTools.d.ts +135 -0
- package/dist/tasks/tools/taskTools.js +273 -0
- package/dist/telemetry/index.d.ts +2 -1
- package/dist/telemetry/index.js +2 -1
- package/dist/telemetry/telemetryService.d.ts +3 -0
- package/dist/telemetry/telemetryService.js +65 -5
- package/dist/types/cli.d.ts +10 -0
- package/dist/types/configTypes.d.ts +3 -0
- package/dist/types/generateTypes.d.ts +13 -0
- package/dist/types/index.d.ts +1 -0
- package/dist/types/proxyTypes.d.ts +37 -5
- package/dist/types/streamTypes.d.ts +25 -3
- package/dist/types/taskTypes.d.ts +275 -0
- package/dist/types/taskTypes.js +36 -0
- package/dist/utils/messageBuilder.js +3 -2
- package/dist/utils/providerHealth.d.ts +18 -0
- package/dist/utils/providerHealth.js +240 -9
- package/dist/utils/providerUtils.js +14 -8
- package/dist/utils/toolChoice.d.ts +4 -0
- package/dist/utils/toolChoice.js +6 -0
- package/docs/assets/dashboards/neurolink-proxy-observability-dashboard.json +6609 -0
- package/docs/changelog.md +252 -0
- package/package.json +19 -1
- package/scripts/observability/check-proxy-telemetry.mjs +235 -0
- package/scripts/observability/docker-compose.proxy-observability.yaml +55 -0
- package/scripts/observability/import-openobserve-dashboard.mjs +240 -0
- package/scripts/observability/manage-local-openobserve.sh +184 -0
- package/scripts/observability/otel-collector.proxy-observability.yaml +78 -0
- package/scripts/observability/proxy-observability.env.example +23 -0
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
*
|
|
15
15
|
* @module auth/anthropicOAuth
|
|
16
16
|
*/
|
|
17
|
-
import { createHash, randomBytes } from "crypto";
|
|
17
|
+
import { createHash, createHmac, randomBytes, randomUUID } from "crypto";
|
|
18
18
|
import { createServer, IncomingMessage, ServerResponse } from "http";
|
|
19
19
|
import { OAuthError, OAuthConfigurationError, OAuthTokenExchangeError, OAuthTokenRefreshError, OAuthTokenRevocationError, OAuthCallbackServerError, } from "../types/errors.js";
|
|
20
20
|
import { logger } from "../utils/logger.js";
|
|
@@ -73,13 +73,146 @@ export const DEFAULT_SCOPES = [
|
|
|
73
73
|
/**
|
|
74
74
|
* User-Agent string to spoof Claude CLI
|
|
75
75
|
*/
|
|
76
|
-
export const
|
|
76
|
+
export const CLAUDE_CODE_VERSION = "2.1.87.6d6";
|
|
77
|
+
export const CLAUDE_CODE_ENTRYPOINT = "sdk-cli";
|
|
78
|
+
export const CLAUDE_CLI_USER_AGENT = "claude-cli/2.1.87 (external, sdk-cli)";
|
|
79
|
+
const CLAUDE_CODE_IDENTITY_TTL_MS = 3_600_000;
|
|
80
|
+
const CLAUDE_CODE_IDENTITY_NAMESPACE = "neurolink-claude-code-identity-v1";
|
|
81
|
+
const claudeCodeIdentityCache = new Map();
|
|
82
|
+
function stableIdentityDigest(input) {
|
|
83
|
+
// These identifiers are deterministic pseudonyms for Claude Code metadata,
|
|
84
|
+
// not password hashes or authentication secrets.
|
|
85
|
+
return createHmac("sha256", CLAUDE_CODE_IDENTITY_NAMESPACE)
|
|
86
|
+
.update(input)
|
|
87
|
+
.digest("hex");
|
|
88
|
+
}
|
|
89
|
+
function hexToUuid(hex) {
|
|
90
|
+
const trimmed = hex.replace(/-/g, "").slice(0, 32).padEnd(32, "0");
|
|
91
|
+
return `${trimmed.slice(0, 8)}-${trimmed.slice(8, 12)}-${trimmed.slice(12, 16)}-${trimmed.slice(16, 20)}-${trimmed.slice(20, 32)}`;
|
|
92
|
+
}
|
|
93
|
+
function isUuid(value) {
|
|
94
|
+
return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value);
|
|
95
|
+
}
|
|
96
|
+
function buildMetadataUserId(identity) {
|
|
97
|
+
return JSON.stringify({
|
|
98
|
+
device_id: identity.deviceId,
|
|
99
|
+
account_uuid: identity.accountUuid,
|
|
100
|
+
session_id: identity.sessionId,
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
export function parseClaudeCodeUserId(userId) {
|
|
104
|
+
if (typeof userId !== "string") {
|
|
105
|
+
return null;
|
|
106
|
+
}
|
|
107
|
+
try {
|
|
108
|
+
const parsed = JSON.parse(userId);
|
|
109
|
+
if (typeof parsed.device_id !== "string" ||
|
|
110
|
+
!/^[0-9a-f]{64}$/i.test(parsed.device_id) ||
|
|
111
|
+
typeof parsed.account_uuid !== "string" ||
|
|
112
|
+
!isUuid(parsed.account_uuid) ||
|
|
113
|
+
typeof parsed.session_id !== "string" ||
|
|
114
|
+
!isUuid(parsed.session_id)) {
|
|
115
|
+
return null;
|
|
116
|
+
}
|
|
117
|
+
return {
|
|
118
|
+
deviceId: parsed.device_id,
|
|
119
|
+
accountUuid: parsed.account_uuid,
|
|
120
|
+
sessionId: parsed.session_id,
|
|
121
|
+
metadataUserId: buildMetadataUserId({
|
|
122
|
+
deviceId: parsed.device_id,
|
|
123
|
+
accountUuid: parsed.account_uuid,
|
|
124
|
+
sessionId: parsed.session_id,
|
|
125
|
+
}),
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
catch {
|
|
129
|
+
return null;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
export function getOrCreateClaudeCodeIdentity(seed, options) {
|
|
133
|
+
const parsedExisting = parseClaudeCodeUserId(options?.existingUserId);
|
|
134
|
+
if (parsedExisting) {
|
|
135
|
+
if (options?.preferredSessionId && isUuid(options.preferredSessionId)) {
|
|
136
|
+
return {
|
|
137
|
+
deviceId: parsedExisting.deviceId,
|
|
138
|
+
accountUuid: parsedExisting.accountUuid,
|
|
139
|
+
sessionId: options.preferredSessionId,
|
|
140
|
+
metadataUserId: buildMetadataUserId({
|
|
141
|
+
deviceId: parsedExisting.deviceId,
|
|
142
|
+
accountUuid: parsedExisting.accountUuid,
|
|
143
|
+
sessionId: options.preferredSessionId,
|
|
144
|
+
}),
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
return parsedExisting;
|
|
148
|
+
}
|
|
149
|
+
const now = Date.now();
|
|
150
|
+
const cacheKey = seed || "default";
|
|
151
|
+
const cached = claudeCodeIdentityCache.get(cacheKey);
|
|
152
|
+
if (cached && cached.expiresAt > now) {
|
|
153
|
+
if (options?.preferredSessionId && isUuid(options.preferredSessionId)) {
|
|
154
|
+
return {
|
|
155
|
+
deviceId: cached.deviceId,
|
|
156
|
+
accountUuid: cached.accountUuid,
|
|
157
|
+
sessionId: options.preferredSessionId,
|
|
158
|
+
metadataUserId: buildMetadataUserId({
|
|
159
|
+
deviceId: cached.deviceId,
|
|
160
|
+
accountUuid: cached.accountUuid,
|
|
161
|
+
sessionId: options.preferredSessionId,
|
|
162
|
+
}),
|
|
163
|
+
};
|
|
164
|
+
}
|
|
165
|
+
return cached;
|
|
166
|
+
}
|
|
167
|
+
const deviceId = stableIdentityDigest(`${cacheKey}:device`);
|
|
168
|
+
const accountUuid = hexToUuid(stableIdentityDigest(`${cacheKey}:account`));
|
|
169
|
+
const sessionId = options?.preferredSessionId && isUuid(options.preferredSessionId)
|
|
170
|
+
? options.preferredSessionId
|
|
171
|
+
: randomUUID();
|
|
172
|
+
const identity = {
|
|
173
|
+
deviceId,
|
|
174
|
+
accountUuid,
|
|
175
|
+
sessionId,
|
|
176
|
+
metadataUserId: buildMetadataUserId({
|
|
177
|
+
deviceId,
|
|
178
|
+
accountUuid,
|
|
179
|
+
sessionId,
|
|
180
|
+
}),
|
|
181
|
+
expiresAt: now + CLAUDE_CODE_IDENTITY_TTL_MS,
|
|
182
|
+
};
|
|
183
|
+
claudeCodeIdentityCache.set(cacheKey, identity);
|
|
184
|
+
return identity;
|
|
185
|
+
}
|
|
186
|
+
export function purgeExpiredClaudeCodeIdentities(now = Date.now()) {
|
|
187
|
+
let removed = 0;
|
|
188
|
+
for (const [cacheKey, identity] of claudeCodeIdentityCache.entries()) {
|
|
189
|
+
if (identity.expiresAt <= now) {
|
|
190
|
+
claudeCodeIdentityCache.delete(cacheKey);
|
|
191
|
+
removed += 1;
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
return removed;
|
|
195
|
+
}
|
|
196
|
+
export function buildStableClaudeCodeBillingHeader(originalText) {
|
|
197
|
+
const version = originalText?.match(/cc_version=([^;]+)/)?.[1]?.trim() ||
|
|
198
|
+
CLAUDE_CODE_VERSION;
|
|
199
|
+
const entrypoint = originalText?.match(/cc_entrypoint=([^;]+)/)?.[1]?.trim() ||
|
|
200
|
+
CLAUDE_CODE_ENTRYPOINT;
|
|
201
|
+
return `x-anthropic-billing-header: cc_version=${version}; cc_entrypoint=${entrypoint}; cch=00000;`;
|
|
202
|
+
}
|
|
77
203
|
/**
|
|
78
204
|
* Required beta headers for OAuth API requests.
|
|
79
205
|
* The "oauth-2025-04-20" header is CRITICAL for OAuth authentication.
|
|
80
|
-
* The "interleaved-thinking-2025-05-14" enables extended thinking.
|
|
81
206
|
*/
|
|
82
|
-
export const OAUTH_BETA_HEADERS = "oauth-2025-04-20
|
|
207
|
+
export const OAUTH_BETA_HEADERS = "oauth-2025-04-20";
|
|
208
|
+
export const CLAUDE_CODE_OAUTH_BETAS = [
|
|
209
|
+
"oauth-2025-04-20",
|
|
210
|
+
"claude-code-20250219",
|
|
211
|
+
"context-management-2025-06-27",
|
|
212
|
+
"prompt-caching-scope-2026-01-05",
|
|
213
|
+
"advanced-tool-use-2025-11-20",
|
|
214
|
+
"effort-2025-11-24",
|
|
215
|
+
];
|
|
83
216
|
/**
|
|
84
217
|
* Tool name prefix required for OAuth API requests
|
|
85
218
|
*/
|
|
@@ -60,8 +60,12 @@ export class FirebaseAuthProvider extends BaseAuthProvider {
|
|
|
60
60
|
await this.initialize();
|
|
61
61
|
}
|
|
62
62
|
try {
|
|
63
|
+
const jwks = this.jwks;
|
|
64
|
+
if (!jwks) {
|
|
65
|
+
throw AuthError.create("PROVIDER_INIT_FAILED", "Firebase JWKS was not initialized", { details: { provider: "firebase" } });
|
|
66
|
+
}
|
|
63
67
|
// Verify the token using Google's public keys
|
|
64
|
-
const { payload } = await jose.jwtVerify(token,
|
|
68
|
+
const { payload } = await jose.jwtVerify(token, jwks, {
|
|
65
69
|
issuer: `https://securetoken.google.com/${this.projectId}`,
|
|
66
70
|
audience: this.projectId,
|
|
67
71
|
});
|
|
@@ -92,6 +92,10 @@ export class JWTProvider extends BaseAuthProvider {
|
|
|
92
92
|
await this.initialize();
|
|
93
93
|
}
|
|
94
94
|
try {
|
|
95
|
+
const keyObject = this.keyObject;
|
|
96
|
+
if (!keyObject) {
|
|
97
|
+
throw AuthError.create("PROVIDER_INIT_FAILED", "JWT verification key was not initialized", { details: { provider: "jwt" } });
|
|
98
|
+
}
|
|
95
99
|
const verifyOptions = {};
|
|
96
100
|
if (this.algorithms.length > 0) {
|
|
97
101
|
verifyOptions.algorithms = this
|
|
@@ -103,7 +107,7 @@ export class JWTProvider extends BaseAuthProvider {
|
|
|
103
107
|
if (this.audience) {
|
|
104
108
|
verifyOptions.audience = this.audience;
|
|
105
109
|
}
|
|
106
|
-
const { payload } = await jose.jwtVerify(token,
|
|
110
|
+
const { payload } = await jose.jwtVerify(token, keyObject, verifyOptions);
|
|
107
111
|
// Reject tokens without a non-empty sub claim
|
|
108
112
|
if (!payload.sub) {
|
|
109
113
|
return {
|
|
@@ -65,8 +65,12 @@ export class WorkOSProvider extends BaseAuthProvider {
|
|
|
65
65
|
await this.initialize();
|
|
66
66
|
}
|
|
67
67
|
try {
|
|
68
|
+
const jwks = this.jwks;
|
|
69
|
+
if (!jwks) {
|
|
70
|
+
throw AuthError.create("PROVIDER_INIT_FAILED", "WorkOS JWKS was not initialized", { details: { provider: "workos" } });
|
|
71
|
+
}
|
|
68
72
|
// Verify the JWT
|
|
69
|
-
const { payload } = await jose.jwtVerify(token,
|
|
73
|
+
const { payload } = await jose.jwtVerify(token, jwks, {
|
|
70
74
|
audience: this.clientId,
|
|
71
75
|
});
|
|
72
76
|
// Enforce organizationId if configured
|
|
@@ -46,7 +46,7 @@ export declare class MemorySessionStorage implements SessionManagerStorage {
|
|
|
46
46
|
* Redis session storage
|
|
47
47
|
*
|
|
48
48
|
* Distributed session storage using Redis. Suitable for multi-instance
|
|
49
|
-
* deployments. Requires
|
|
49
|
+
* deployments. Requires the "redis" (node-redis) package.
|
|
50
50
|
*
|
|
51
51
|
* Note: Redis client must be provided or configured via environment.
|
|
52
52
|
*/
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
// src/lib/auth/sessionManager.ts
|
|
2
|
+
import { withTimeout } from "../utils/async/withTimeout.js";
|
|
2
3
|
import { logger } from "../utils/logger.js";
|
|
3
4
|
/** Mask an identifier for safe logging: show first 4 chars + "***" */
|
|
4
5
|
function maskId(id) {
|
|
@@ -7,6 +8,7 @@ function maskId(id) {
|
|
|
7
8
|
}
|
|
8
9
|
return `${id.slice(0, 4)}***`;
|
|
9
10
|
}
|
|
11
|
+
const REDIS_CONNECT_TIMEOUT_MS = 5000;
|
|
10
12
|
/**
|
|
11
13
|
* In-memory session storage
|
|
12
14
|
*
|
|
@@ -31,10 +33,12 @@ export class MemorySessionStorage {
|
|
|
31
33
|
async set(session) {
|
|
32
34
|
this.sessions.set(session.id, session);
|
|
33
35
|
// Track user's sessions
|
|
34
|
-
|
|
35
|
-
|
|
36
|
+
let sessionIds = this.userSessions.get(session.user.id);
|
|
37
|
+
if (!sessionIds) {
|
|
38
|
+
sessionIds = new Set();
|
|
39
|
+
this.userSessions.set(session.user.id, sessionIds);
|
|
36
40
|
}
|
|
37
|
-
|
|
41
|
+
sessionIds.add(session.id);
|
|
38
42
|
}
|
|
39
43
|
async delete(sessionId) {
|
|
40
44
|
const session = this.sessions.get(sessionId);
|
|
@@ -84,7 +88,7 @@ export class MemorySessionStorage {
|
|
|
84
88
|
* Redis session storage
|
|
85
89
|
*
|
|
86
90
|
* Distributed session storage using Redis. Suitable for multi-instance
|
|
87
|
-
* deployments. Requires
|
|
91
|
+
* deployments. Requires the "redis" (node-redis) package.
|
|
88
92
|
*
|
|
89
93
|
* Note: Redis client must be provided or configured via environment.
|
|
90
94
|
*/
|
|
@@ -111,16 +115,25 @@ export class RedisSessionStorage {
|
|
|
111
115
|
async createClient() {
|
|
112
116
|
try {
|
|
113
117
|
// Use variable indirection to prevent TypeScript from resolving the module at compile time
|
|
114
|
-
const moduleName = "
|
|
115
|
-
const
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
118
|
+
const moduleName = "redis";
|
|
119
|
+
const redisModule = (await import(
|
|
120
|
+
/* @vite-ignore */ moduleName));
|
|
121
|
+
const client = redisModule.createClient({
|
|
122
|
+
url: this.redisUrl,
|
|
123
|
+
});
|
|
124
|
+
client.on("error", (err) => {
|
|
125
|
+
logger.error("Redis session client error:", err.message);
|
|
126
|
+
});
|
|
127
|
+
await withTimeout(client.connect(), REDIS_CONNECT_TIMEOUT_MS, `Redis session client connect timed out after ${REDIS_CONNECT_TIMEOUT_MS}ms`);
|
|
128
|
+
this.client = client;
|
|
129
|
+
return client;
|
|
119
130
|
}
|
|
120
|
-
catch {
|
|
131
|
+
catch (error) {
|
|
121
132
|
this.initPromise = null;
|
|
122
|
-
logger.error('Redis client
|
|
123
|
-
throw
|
|
133
|
+
logger.error('Redis client not available. Ensure the "redis" package is installed and Redis is reachable when using storage: "redis".');
|
|
134
|
+
throw error instanceof Error
|
|
135
|
+
? error
|
|
136
|
+
: new Error("Redis client not available");
|
|
124
137
|
}
|
|
125
138
|
}
|
|
126
139
|
sessionKey(sessionId) {
|
|
@@ -136,6 +149,13 @@ export class RedisSessionStorage {
|
|
|
136
149
|
if (!data) {
|
|
137
150
|
return null;
|
|
138
151
|
}
|
|
152
|
+
if (typeof data !== "string") {
|
|
153
|
+
logger.warn("Unexpected Redis session payload type", {
|
|
154
|
+
sessionId: maskId(sessionId),
|
|
155
|
+
type: typeof data,
|
|
156
|
+
});
|
|
157
|
+
return null;
|
|
158
|
+
}
|
|
139
159
|
const session = JSON.parse(data);
|
|
140
160
|
// Parse dates
|
|
141
161
|
session.createdAt = new Date(session.createdAt);
|
|
@@ -143,7 +163,7 @@ export class RedisSessionStorage {
|
|
|
143
163
|
session.expiresAt = new Date(session.expiresAt);
|
|
144
164
|
}
|
|
145
165
|
// Check expiration
|
|
146
|
-
if (new Date() > session.expiresAt) {
|
|
166
|
+
if (session.expiresAt && new Date() > session.expiresAt) {
|
|
147
167
|
await this.delete(sessionId);
|
|
148
168
|
return null;
|
|
149
169
|
}
|
|
@@ -162,9 +182,9 @@ export class RedisSessionStorage {
|
|
|
162
182
|
? Math.max(1, Math.floor((session.expiresAt.getTime() - Date.now()) / 1000))
|
|
163
183
|
: this.ttl;
|
|
164
184
|
// Store session
|
|
165
|
-
await client.
|
|
185
|
+
await client.setEx(this.sessionKey(session.id), ttlSeconds, JSON.stringify(session));
|
|
166
186
|
// Track user's sessions
|
|
167
|
-
await client.
|
|
187
|
+
await client.sAdd(this.userSessionsKey(session.user.id), session.id);
|
|
168
188
|
await client.expire(this.userSessionsKey(session.user.id), this.ttl);
|
|
169
189
|
}
|
|
170
190
|
catch (error) {
|
|
@@ -180,13 +200,21 @@ export class RedisSessionStorage {
|
|
|
180
200
|
// recursion for expired sessions.
|
|
181
201
|
const data = await client.get(this.sessionKey(sessionId));
|
|
182
202
|
if (data) {
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
203
|
+
if (typeof data !== "string") {
|
|
204
|
+
logger.warn("Unexpected Redis session payload type during delete", {
|
|
205
|
+
sessionId: maskId(sessionId),
|
|
206
|
+
type: typeof data,
|
|
207
|
+
});
|
|
186
208
|
}
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
209
|
+
else {
|
|
210
|
+
try {
|
|
211
|
+
const session = JSON.parse(data);
|
|
212
|
+
await client.sRem(this.userSessionsKey(session.user.id), sessionId);
|
|
213
|
+
}
|
|
214
|
+
catch {
|
|
215
|
+
// If parsing fails, we still delete the key below
|
|
216
|
+
logger.warn(`Failed to parse session data for cleanup: ${maskId(sessionId)}`);
|
|
217
|
+
}
|
|
190
218
|
}
|
|
191
219
|
}
|
|
192
220
|
await client.del(this.sessionKey(sessionId));
|
|
@@ -198,7 +226,7 @@ export class RedisSessionStorage {
|
|
|
198
226
|
async getUserSessions(userId) {
|
|
199
227
|
try {
|
|
200
228
|
const client = await this.getClient();
|
|
201
|
-
const sessionIds = await client.
|
|
229
|
+
const sessionIds = await client.sMembers(this.userSessionsKey(userId));
|
|
202
230
|
const sessions = [];
|
|
203
231
|
for (const sessionId of sessionIds) {
|
|
204
232
|
const session = await this.get(sessionId);
|
|
@@ -216,7 +244,7 @@ export class RedisSessionStorage {
|
|
|
216
244
|
async deleteUserSessions(userId) {
|
|
217
245
|
try {
|
|
218
246
|
const client = await this.getClient();
|
|
219
|
-
const sessionIds = await client.
|
|
247
|
+
const sessionIds = await client.sMembers(this.userSessionsKey(userId));
|
|
220
248
|
for (const sessionId of sessionIds) {
|
|
221
249
|
await client.del(this.sessionKey(sessionId));
|
|
222
250
|
}
|
|
@@ -232,10 +260,13 @@ export class RedisSessionStorage {
|
|
|
232
260
|
// Use SCAN instead of KEYS to avoid blocking Redis in production
|
|
233
261
|
let cursor = "0";
|
|
234
262
|
do {
|
|
235
|
-
const
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
263
|
+
const result = await client.scan(cursor, {
|
|
264
|
+
MATCH: `${this.prefix}*`,
|
|
265
|
+
COUNT: 100,
|
|
266
|
+
});
|
|
267
|
+
cursor = result.cursor;
|
|
268
|
+
if (result.keys.length > 0) {
|
|
269
|
+
await client.del(result.keys);
|
|
239
270
|
}
|
|
240
271
|
} while (cursor !== "0");
|
|
241
272
|
}
|
|
@@ -251,10 +251,12 @@ export class SSEClient {
|
|
|
251
251
|
* Register event handler
|
|
252
252
|
*/
|
|
253
253
|
on(event, callback) {
|
|
254
|
-
|
|
255
|
-
|
|
254
|
+
let handlers = this.eventHandlers.get(event);
|
|
255
|
+
if (!handlers) {
|
|
256
|
+
handlers = new Set();
|
|
257
|
+
this.eventHandlers.set(event, handlers);
|
|
256
258
|
}
|
|
257
|
-
|
|
259
|
+
handlers.add(callback);
|
|
258
260
|
}
|
|
259
261
|
/**
|
|
260
262
|
* Remove event handler
|
|
@@ -315,7 +317,11 @@ export class SSEClient {
|
|
|
315
317
|
});
|
|
316
318
|
while (!done && !error) {
|
|
317
319
|
if (events.length > 0) {
|
|
318
|
-
|
|
320
|
+
const nextEvent = events.shift();
|
|
321
|
+
if (!nextEvent) {
|
|
322
|
+
continue;
|
|
323
|
+
}
|
|
324
|
+
yield nextEvent;
|
|
319
325
|
}
|
|
320
326
|
else {
|
|
321
327
|
await new Promise((resolve) => {
|
|
@@ -325,7 +331,11 @@ export class SSEClient {
|
|
|
325
331
|
}
|
|
326
332
|
// Yield remaining events
|
|
327
333
|
while (events.length > 0) {
|
|
328
|
-
|
|
334
|
+
const nextEvent = events.shift();
|
|
335
|
+
if (!nextEvent) {
|
|
336
|
+
continue;
|
|
337
|
+
}
|
|
338
|
+
yield nextEvent;
|
|
329
339
|
}
|
|
330
340
|
if (error) {
|
|
331
341
|
throw error;
|
|
@@ -545,10 +555,12 @@ export class WebSocketStreamingClient {
|
|
|
545
555
|
* Register event handler
|
|
546
556
|
*/
|
|
547
557
|
on(event, callback) {
|
|
548
|
-
|
|
549
|
-
|
|
558
|
+
let handlers = this.eventHandlers.get(event);
|
|
559
|
+
if (!handlers) {
|
|
560
|
+
handlers = new Set();
|
|
561
|
+
this.eventHandlers.set(event, handlers);
|
|
550
562
|
}
|
|
551
|
-
|
|
563
|
+
handlers.add(callback);
|
|
552
564
|
}
|
|
553
565
|
/**
|
|
554
566
|
* Remove event handler
|
|
@@ -591,7 +603,11 @@ export class WebSocketStreamingClient {
|
|
|
591
603
|
try {
|
|
592
604
|
while (!disconnected) {
|
|
593
605
|
if (messageQueue.length > 0) {
|
|
594
|
-
|
|
606
|
+
const nextMessage = messageQueue.shift();
|
|
607
|
+
if (nextMessage === undefined) {
|
|
608
|
+
continue;
|
|
609
|
+
}
|
|
610
|
+
yield nextMessage;
|
|
595
611
|
}
|
|
596
612
|
else {
|
|
597
613
|
await new Promise((resolve) => {
|
|
@@ -601,7 +617,11 @@ export class WebSocketStreamingClient {
|
|
|
601
617
|
}
|
|
602
618
|
// Yield remaining messages
|
|
603
619
|
while (messageQueue.length > 0) {
|
|
604
|
-
|
|
620
|
+
const nextMessage = messageQueue.shift();
|
|
621
|
+
if (nextMessage === undefined) {
|
|
622
|
+
continue;
|
|
623
|
+
}
|
|
624
|
+
yield nextMessage;
|
|
605
625
|
}
|
|
606
626
|
}
|
|
607
627
|
finally {
|
|
@@ -95,6 +95,7 @@ export class GenerationHandler {
|
|
|
95
95
|
};
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
|
+
const prepareStep = options.prepareStep;
|
|
98
99
|
return await generateText({
|
|
99
100
|
model,
|
|
100
101
|
messages,
|
|
@@ -103,8 +104,8 @@ export class GenerationHandler {
|
|
|
103
104
|
stopWhen: stepCountIs(options.maxSteps ?? DEFAULT_MAX_STEPS),
|
|
104
105
|
...(shouldUseTools &&
|
|
105
106
|
options.toolChoice && { toolChoice: options.toolChoice }),
|
|
106
|
-
...(
|
|
107
|
-
experimental_prepareStep: ((stepOptions) =>
|
|
107
|
+
...(prepareStep && {
|
|
108
|
+
experimental_prepareStep: ((stepOptions) => prepareStep({
|
|
108
109
|
...stepOptions,
|
|
109
110
|
maxSteps: options.maxSteps ?? DEFAULT_MAX_STEPS,
|
|
110
111
|
})),
|
|
@@ -16,6 +16,7 @@ import { runWithCurrentLangfuseContext } from "../services/server/ai/observabili
|
|
|
16
16
|
import { logger } from "../utils/logger.js";
|
|
17
17
|
import { createRedisClient, deserializeConversation, getNormalizedConfig, getPooledRedisClient, getSessionKey, getUserSessionsKey, releasePooledRedisClient, scanKeys, serializeConversation, } from "../utils/redis.js";
|
|
18
18
|
const redisTracer = tracers.redis;
|
|
19
|
+
const REDIS_TIMEOUT_MS = 5000;
|
|
19
20
|
/**
|
|
20
21
|
* Redis-based implementation of the ConversationMemoryManager
|
|
21
22
|
* Uses the same interface but stores data in Redis
|
|
@@ -130,13 +131,14 @@ export class RedisConversationMemoryManager {
|
|
|
130
131
|
if (!this.redisClient) {
|
|
131
132
|
return undefined;
|
|
132
133
|
}
|
|
134
|
+
const redisClient = this.redisClient;
|
|
133
135
|
return redisTracer.startActiveSpan("neurolink.memory.getSession", { kind: SpanKind.CLIENT, attributes: { "session.id": sessionId } }, async (span) => {
|
|
134
136
|
if (userId) {
|
|
135
137
|
span.setAttribute("user.id", userId);
|
|
136
138
|
}
|
|
137
139
|
try {
|
|
138
140
|
const redisKey = getSessionKey(this.redisConfig, sessionId, userId);
|
|
139
|
-
const conversationData = await
|
|
141
|
+
const conversationData = await withTimeout(redisClient.get(redisKey), REDIS_TIMEOUT_MS);
|
|
140
142
|
const conversation = deserializeConversation(conversationData || null);
|
|
141
143
|
if (!conversation) {
|
|
142
144
|
span.setAttribute("session.found", false);
|
|
@@ -630,6 +632,7 @@ export class RedisConversationMemoryManager {
|
|
|
630
632
|
logger.warn("[RedisConversationMemoryManager] Redis client not available in buildContextMessages");
|
|
631
633
|
return [];
|
|
632
634
|
}
|
|
635
|
+
const redisClient = this.redisClient;
|
|
633
636
|
// NLK-GAP-012: Add span for buildContext CRUD operation
|
|
634
637
|
return redisTracer.startActiveSpan("neurolink.memory.buildContext", {
|
|
635
638
|
kind: SpanKind.CLIENT,
|
|
@@ -645,7 +648,7 @@ export class RedisConversationMemoryManager {
|
|
|
645
648
|
method: "buildContextMessages",
|
|
646
649
|
});
|
|
647
650
|
const redisKey = getSessionKey(this.redisConfig, sessionId, userId);
|
|
648
|
-
const conversationData = await
|
|
651
|
+
const conversationData = await withTimeout(redisClient.get(redisKey), REDIS_TIMEOUT_MS);
|
|
649
652
|
const conversation = deserializeConversation(conversationData || null);
|
|
650
653
|
if (!conversation) {
|
|
651
654
|
span.setAttribute("session.found", false);
|
|
@@ -1080,6 +1083,7 @@ User message: "${userMessage}"`;
|
|
|
1080
1083
|
if (!this.redisClient) {
|
|
1081
1084
|
return false;
|
|
1082
1085
|
}
|
|
1086
|
+
const redisClient = this.redisClient;
|
|
1083
1087
|
// NLK-GAP-012: Add span for clearSession CRUD operation
|
|
1084
1088
|
return redisTracer.startActiveSpan("neurolink.memory.clear", {
|
|
1085
1089
|
kind: SpanKind.CLIENT,
|
|
@@ -1090,7 +1094,7 @@ User message: "${userMessage}"`;
|
|
|
1090
1094
|
}, async (span) => {
|
|
1091
1095
|
try {
|
|
1092
1096
|
const redisKey = getSessionKey(this.redisConfig, sessionId, userId);
|
|
1093
|
-
const result = await
|
|
1097
|
+
const result = await withTimeout(redisClient.del(redisKey), REDIS_TIMEOUT_MS);
|
|
1094
1098
|
if (Number(result) > 0) {
|
|
1095
1099
|
// Remove session from user's session set
|
|
1096
1100
|
if (userId) {
|
|
@@ -6,6 +6,9 @@ import { Evaluator } from "./index.js";
|
|
|
6
6
|
import { createBatchEvaluationError, isRetryableEvaluationError, } from "./errors/EvaluationError.js";
|
|
7
7
|
import { logger } from "../utils/logger.js";
|
|
8
8
|
import { NeuroLinkFeatureError } from "../core/infrastructure/index.js";
|
|
9
|
+
function hasEvaluationData(result) {
|
|
10
|
+
return result.success && result.data !== undefined;
|
|
11
|
+
}
|
|
9
12
|
/**
|
|
10
13
|
* BatchEvaluator - Performs evaluation on multiple items in parallel.
|
|
11
14
|
* Supports configurable concurrency, retry logic, and progress tracking.
|
|
@@ -201,7 +204,7 @@ export class BatchEvaluator {
|
|
|
201
204
|
}
|
|
202
205
|
}
|
|
203
206
|
// Calculate summary statistics
|
|
204
|
-
const successfulResults = results.filter(
|
|
207
|
+
const successfulResults = results.filter(hasEvaluationData);
|
|
205
208
|
const scores = successfulResults.map((r) => r.data.overall);
|
|
206
209
|
const passingScores = successfulResults.filter((r) => r.data.overall >=
|
|
207
210
|
(autoEvalConfig.threshold || this.config.threshold || 7));
|
|
@@ -41,10 +41,12 @@ export class ObservabilityHooks {
|
|
|
41
41
|
* Register an event handler
|
|
42
42
|
*/
|
|
43
43
|
on(event, handler) {
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
let handlers = this._handlers.get(event);
|
|
45
|
+
if (!handlers) {
|
|
46
|
+
handlers = new Set();
|
|
47
|
+
this._handlers.set(event, handlers);
|
|
46
48
|
}
|
|
47
|
-
|
|
49
|
+
handlers.add(handler);
|
|
48
50
|
// Return unsubscribe function
|
|
49
51
|
return () => {
|
|
50
52
|
this._handlers.get(event)?.delete(handler);
|
|
@@ -12,9 +12,9 @@ export type PipelineExecutionOptions = {
|
|
|
12
12
|
correlationId?: string;
|
|
13
13
|
/** Custom timeout override */
|
|
14
14
|
timeout?: number;
|
|
15
|
-
/** Skip specific scorers */
|
|
15
|
+
/** Skip specific scorers. Mutually exclusive with onlyScorers. */
|
|
16
16
|
skipScorers?: string[];
|
|
17
|
-
/** Only run specific scorers */
|
|
17
|
+
/** Only run specific scorers. Mutually exclusive with skipScorers. */
|
|
18
18
|
onlyScorers?: string[];
|
|
19
19
|
/** Additional metadata to attach */
|
|
20
20
|
metadata?: JsonObject;
|
|
@@ -59,6 +59,7 @@ export declare class EvaluationPipeline {
|
|
|
59
59
|
* Execute the pipeline on input
|
|
60
60
|
*/
|
|
61
61
|
execute(input: ScorerInput, options?: PipelineExecutionOptions): Promise<PipelineResult>;
|
|
62
|
+
private _validateExecutionOptions;
|
|
62
63
|
/**
|
|
63
64
|
* Get scorers to run based on options
|
|
64
65
|
*/
|