@3ngram/server 1.9.1 → 1.10.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/dist/app.d.ts CHANGED
@@ -3,7 +3,7 @@ import { type Gateway } from '@3ngram/llm';
3
3
  import { type Express } from 'express';
4
4
  import type { Redis } from 'ioredis';
5
5
  import { type Extension } from './composition/extension.js';
6
- import { type RateLimiterMiddleware } from './middleware/rate-limit.js';
6
+ import { type RateLimiterMiddleware, type RateLimitStore } from './middleware/rate-limit.js';
7
7
  export type { Extension } from './composition/extension.js';
8
8
  /**
9
9
  * Public composition compatibility sentinel. A downstream extension may require
@@ -21,14 +21,14 @@ export interface AppOptions {
21
21
  */
22
22
  gateway?: Gateway;
23
23
  /**
24
- * Rate-limiter seam. When omitted, boot builds Redis-backed limiters
25
- * iff REDIS_URL is set (else in-memory). Tests inject limiters directly so NO
24
+ * Rate-limiter seam. When omitted, boot builds limiters over the store
25
+ * RATE_LIMIT_STORE selects (#315). Tests inject limiters directly so NO
26
26
  * real Redis is required in CI:
27
27
  * - `mcpLimiter` — per-user bucket on /mcp (req.userId, set by oauthBearerAuth).
28
28
  * - `authLimiter` — per-IP bucket on /auth/login (req.ip is the
29
29
  * real client because trust proxy is set).
30
- * Provide `redis` instead to let boot construct the default limiters over an
31
- * explicit client (or omit both for the env-derived client).
30
+ * Provide `rateLimitStore` instead to let boot construct the default
31
+ * limiters over an explicit store (or omit both for the env-derived one).
32
32
  */
33
33
  mcpLimiter?: RateLimiterMiddleware;
34
34
  authLimiter?: RateLimiterMiddleware;
@@ -78,6 +78,9 @@ export interface AppOptions {
78
78
  * Default: 300 req / 60s per key.
79
79
  */
80
80
  apiKeyLimiter?: RateLimiterMiddleware;
81
+ /** Limiter store seam; when omitted, resolveRateLimitStore picks it from env (#315). */
82
+ rateLimitStore?: RateLimitStore;
83
+ /** Redis client injection seam; resolveRateLimitStore builds the redis store from it. */
81
84
  redis?: Redis | undefined;
82
85
  /**
83
86
  * Composition seam. When omitted, resolves to `noOpExtension` — the self-host
package/dist/app.js CHANGED
@@ -1,14 +1,15 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- import { budgetGateLookupFailure, loadBudgetConfig, loadLlmGatewayConfig, log, } from '@3ngram/config';
2
+ import { budgetGateLookupFailure, loadBudgetConfig, loadJevGatewayConfig, loadLlmGatewayConfig, loadRateLimitStoreConfig, log, } from '@3ngram/config';
3
3
  import { crashSafeError } from '@3ngram/config/otel';
4
4
  import { allowAllAccess, SELFHOST_LIMITS } from '@3ngram/core';
5
5
  import { ClientMetadataResolver } from '@3ngram/core/auth';
6
- import { createOpenAIGateway } from '@3ngram/llm';
6
+ import { composeGateway, createJevGateway, createOpenAIGateway } from '@3ngram/llm';
7
7
  import express, {} from 'express';
8
8
  import { baseCapabilities, noOpExtension } from './composition/extension.js';
9
9
  import { mcpHeaderObservability } from './middleware/mcp-header-observability.js';
10
10
  import { apiKeyIdKey, createRateLimiter, ipKey, userIdKey, } from './middleware/rate-limit.js';
11
11
  import { requestContext } from './middleware/request-context.js';
12
+ import { resolveRateLimitStore } from './rate-limit-store.js';
12
13
  import { resolveRedis } from './redis.js';
13
14
  import { restRouter } from './rest/router.js';
14
15
  import { apiKeysRouter } from './routes/api-keys.js';
@@ -55,19 +56,29 @@ const REGISTER_IP_POINTS = 10;
55
56
  const OAUTH_IP_POINTS = 30;
56
57
  const API_KEY_POINTS = 300;
57
58
  const RATE_WINDOW_SECONDS = 60;
58
- /** Resolve the embedding gateway: an explicit override, else the env-gated client. */
59
+ /**
60
+ * Resolve the gateway: an explicit override, else the env-gated clients composed
61
+ * into one — embed/complete from the OpenAI-compatible gateway, decide from the
62
+ * Jev gateway when JEV_API_KEY + JEV_MODEL are set (issue #225).
63
+ */
59
64
  function resolveGateway(override) {
60
65
  if (override !== undefined)
61
66
  return override;
62
- const config = loadLlmGatewayConfig();
63
- return config === undefined ? undefined : createOpenAIGateway(config);
67
+ const base = loadLlmGatewayConfig();
68
+ const judgment = loadJevGatewayConfig();
69
+ if (judgment !== undefined && base === undefined) {
70
+ log().warn({}, 'JEV_* set without LLM_GATEWAY_URL/LLM_GATEWAY_API_KEY: decide() unavailable');
71
+ }
72
+ return composeGateway({
73
+ base: base === undefined ? undefined : createOpenAIGateway(base),
74
+ judgment: judgment === undefined ? undefined : createJevGateway(judgment),
75
+ });
64
76
  }
65
77
  /**
66
78
  * Resolve the rate limiters: explicit overrides win (the test seam), else build
67
- * the defaults over the injected/env Redis client. Mirrors resolveGateway: a
68
- * missing Redis client makes createRateLimiter fall back to RateLimiterMemory.
79
+ * the defaults over the store resolved once in createApp.
69
80
  */
70
- function resolveLimiters(options, redis) {
81
+ function resolveLimiters(options, store) {
71
82
  return {
72
83
  edgeLimiter: options.edgeLimiter ??
73
84
  createRateLimiter({
@@ -75,7 +86,7 @@ function resolveLimiters(options, redis) {
75
86
  duration: RATE_WINDOW_SECONDS,
76
87
  keyPrefix: 'edge:ip',
77
88
  keyResolver: ipKey,
78
- redis,
89
+ store,
79
90
  }),
80
91
  mcpLimiter: options.mcpLimiter ??
81
92
  createRateLimiter({
@@ -83,7 +94,7 @@ function resolveLimiters(options, redis) {
83
94
  duration: RATE_WINDOW_SECONDS,
84
95
  keyPrefix: 'mcp:user',
85
96
  keyResolver: userIdKey,
86
- redis,
97
+ store,
87
98
  }),
88
99
  authLimiter: options.authLimiter ??
89
100
  createRateLimiter({
@@ -91,7 +102,7 @@ function resolveLimiters(options, redis) {
91
102
  duration: RATE_WINDOW_SECONDS,
92
103
  keyPrefix: 'auth:ip',
93
104
  keyResolver: ipKey,
94
- redis,
105
+ store,
95
106
  }),
96
107
  signupLimiter: options.signupLimiter ??
97
108
  createRateLimiter({
@@ -99,7 +110,7 @@ function resolveLimiters(options, redis) {
99
110
  duration: RATE_WINDOW_SECONDS,
100
111
  keyPrefix: 'auth:signup:ip',
101
112
  keyResolver: ipKey,
102
- redis,
113
+ store,
103
114
  }),
104
115
  resendVerificationLimiter: options.resendVerificationLimiter ??
105
116
  createRateLimiter({
@@ -107,7 +118,7 @@ function resolveLimiters(options, redis) {
107
118
  duration: RATE_WINDOW_SECONDS,
108
119
  keyPrefix: 'auth:resend-verification:ip',
109
120
  keyResolver: ipKey,
110
- redis,
121
+ store,
111
122
  }),
112
123
  verifyEmailLimiter: options.verifyEmailLimiter ??
113
124
  createRateLimiter({
@@ -115,7 +126,7 @@ function resolveLimiters(options, redis) {
115
126
  duration: RATE_WINDOW_SECONDS,
116
127
  keyPrefix: 'auth:verify-email:ip',
117
128
  keyResolver: ipKey,
118
- redis,
129
+ store,
119
130
  }),
120
131
  forgotPasswordLimiter: options.forgotPasswordLimiter ??
121
132
  createRateLimiter({
@@ -123,7 +134,7 @@ function resolveLimiters(options, redis) {
123
134
  duration: RATE_WINDOW_SECONDS,
124
135
  keyPrefix: 'auth:forgot-password:ip',
125
136
  keyResolver: ipKey,
126
- redis,
137
+ store,
127
138
  }),
128
139
  resetPasswordLimiter: options.resetPasswordLimiter ??
129
140
  createRateLimiter({
@@ -131,7 +142,7 @@ function resolveLimiters(options, redis) {
131
142
  duration: RATE_WINDOW_SECONDS,
132
143
  keyPrefix: 'auth:reset-password:ip',
133
144
  keyResolver: ipKey,
134
- redis,
145
+ store,
135
146
  }),
136
147
  registerLimiter: options.registerLimiter ??
137
148
  createRateLimiter({
@@ -139,7 +150,7 @@ function resolveLimiters(options, redis) {
139
150
  duration: RATE_WINDOW_SECONDS,
140
151
  keyPrefix: 'oauth:register:ip',
141
152
  keyResolver: ipKey,
142
- redis,
153
+ store,
143
154
  }),
144
155
  oauthLimiter: options.oauthLimiter ??
145
156
  createRateLimiter({
@@ -147,7 +158,7 @@ function resolveLimiters(options, redis) {
147
158
  duration: RATE_WINDOW_SECONDS,
148
159
  keyPrefix: 'oauth:as:ip',
149
160
  keyResolver: ipKey,
150
- redis,
161
+ store,
151
162
  }),
152
163
  apiKeyLimiter: options.apiKeyLimiter ??
153
164
  createRateLimiter({
@@ -155,7 +166,7 @@ function resolveLimiters(options, redis) {
155
166
  duration: RATE_WINDOW_SECONDS,
156
167
  keyPrefix: 'api:key',
157
168
  keyResolver: apiKeyIdKey,
158
- redis,
169
+ store,
159
170
  }),
160
171
  };
161
172
  }
@@ -208,13 +219,14 @@ export function createApp(options = {}) {
208
219
  // Access gate, threaded into BOTH metered transports alongside the budget. The
209
220
  // private repo injects a real access policy; self-host keeps allowAllAccess.
210
221
  const access = extension.access ?? allowAllAccess;
211
- // Resolve the shared ioredis client ONCE: the rate limiters and the
212
- // progressive-delay failure tracker both ride it, so dialing twice
213
- // would open a redundant connection. An explicit override wins (the test
214
- // seam); else the env-derived client (undefined ⇒ in-memory fallbacks).
215
- const redis = options.redis ?? resolveRedis();
222
+ // Resolve the limiter store and the shared ioredis client ONCE (#315). Redis is
223
+ // dialled only for the redis store and is used only to build it; the
224
+ // /oauth/token failure tracker follows the resolved store. An explicit
225
+ // override wins (the test seam).
226
+ const redis = options.redis ?? (loadRateLimitStoreConfig().kind === 'redis' ? resolveRedis() : undefined);
227
+ const rateLimitStore = options.rateLimitStore ?? resolveRateLimitStore(redis);
216
228
  const clientMetadataResolver = options.clientMetadataResolver ?? new ClientMetadataResolver();
217
- const { edgeLimiter, mcpLimiter, authLimiter, signupLimiter, resendVerificationLimiter, verifyEmailLimiter, forgotPasswordLimiter, resetPasswordLimiter, registerLimiter, oauthLimiter, apiKeyLimiter, } = resolveLimiters(options, redis);
229
+ const { edgeLimiter, mcpLimiter, authLimiter, signupLimiter, resendVerificationLimiter, verifyEmailLimiter, forgotPasswordLimiter, resetPasswordLimiter, registerLimiter, oauthLimiter, apiKeyLimiter, } = resolveLimiters(options, rateLimitStore);
218
230
  // Railway terminates TLS at a proxy; without this, req.ip (and the SDK auth
219
231
  // router's rate limiter) see the proxy address.
220
232
  app.set('trust proxy', 1);
@@ -289,10 +301,9 @@ export function createApp(options = {}) {
289
301
  // unauthenticated and sit behind the shared injected per-IP limiter seam
290
302
  // (real bucket by default).
291
303
  app.use(oauthAuthorizeRouter({ limiter: oauthLimiter, clientMetadataResolver }));
292
- // The same shared ioredis client backs the progressive-delay failure counter
293
- // so the budget is shared across Railway replicas; a missing client
294
- // makes the tracker fall back to a per-process Map.
295
- app.use(oauthTokenRouter({ limiter: oauthLimiter, redis, limits, clientMetadataResolver }));
304
+ // The progressive-delay failure counter follows the resolved limiter store
305
+ // (Redis or Postgres share the budget across replicas; memory is per-process).
306
+ app.use(oauthTokenRouter({ limiter: oauthLimiter, rateLimitStore, limits, clientMetadataResolver }));
296
307
  // Composition seam: the injected extension attaches its hosted-only
297
308
  // routes/handlers here, at the composition root, AFTER every Apache router and
298
309
  // BEFORE the error handler. On self-host this is the no-op default (attaches
package/dist/app.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
@@ -29,7 +29,7 @@
29
29
  import { log, mcpToolErrors } from '@3ngram/config';
30
30
  import { acceptProposalAnyKind, createScope, deleteScope, describeEnvironment, listProposalsPage, listScopes, rejectProposalAnyKind, renameScope, setRetrievalDefault, setScopeAliases, setWriteDefault, } from '@3ngram/core';
31
31
  import { MEMORY_READ_SCOPE, MEMORY_WRITE_SCOPE } from '@3ngram/core/auth';
32
- import { configureScopeInputV3Schema, configureScopeOutputV3Schema, describeEnvironmentInputSchema, describeEnvironmentOutputV5Schema, reviewProposalsInputSchema, reviewProposalsOutputV2Schema, } from '@3ngram/schema';
32
+ import { configureScopeInputV3Schema, configureScopeOutputV3Schema, describeEnvironmentInputSchema, describeEnvironmentOutputV5Schema, reviewProposalsInputSchema, reviewProposalsOutputV3Schema, } from '@3ngram/schema';
33
33
  import { decodeProposalsCursor, encodeProposalsCursor, proposalsFingerprint } from '../cursor.js';
34
34
  import { parseOutput } from '../output-validation.js';
35
35
  import { SERVER_VERSION } from '../version.js';
@@ -189,7 +189,7 @@ async function runReviewProposals(input, ctx) {
189
189
  // the tenant (hashed): a mismatched cursor is a typed invalid-input error.
190
190
  const fp = proposalsFingerprint({
191
191
  surface: 'mcp',
192
- kinds: ['edge', 'fact'],
192
+ kinds: ['edge', 'fact', 'resolution'],
193
193
  status: input.status,
194
194
  tenant: ctx.userId,
195
195
  });
@@ -199,8 +199,8 @@ async function runReviewProposals(input, ctx) {
199
199
  limit: input.limit,
200
200
  after,
201
201
  });
202
- const { proposals, factProposals } = page;
203
- return ok(parseOutput('review_proposals', reviewProposalsOutputV2Schema, {
202
+ const { proposals, factProposals, resolutionProposals } = page;
203
+ return ok(parseOutput('review_proposals', reviewProposalsOutputV3Schema, {
204
204
  action: 'list',
205
205
  proposals: proposals.map(toProposalOutput),
206
206
  // `count` stays the EDGE count ON THIS PAGE: it is the shipped field,
@@ -211,7 +211,14 @@ async function runReviewProposals(input, ctx) {
211
211
  ...(factProposals.length > 0
212
212
  ? { factProposals: factProposals.map(toFactProposalOutput) }
213
213
  : {}),
214
- counts: { edge: proposals.length, fact: factProposals.length },
214
+ ...(resolutionProposals.length > 0
215
+ ? { resolutionProposals: resolutionProposals.map(toResolutionProposalOutput) }
216
+ : {}),
217
+ counts: {
218
+ edge: proposals.length,
219
+ fact: factProposals.length,
220
+ resolution: resolutionProposals.length,
221
+ },
215
222
  totals: page.totals,
216
223
  hasMore: page.hasMore,
217
224
  ...(page.next === undefined ? {} : { nextCursor: encodeProposalsCursor(page.next, fp) }),
@@ -230,7 +237,19 @@ async function runReviewProposals(input, ctx) {
230
237
  const decided = input.action === 'accept'
231
238
  ? await acceptProposalAnyKind(ctx.userId, input.proposalId, 'user_mcp')
232
239
  : await rejectProposalAnyKind(ctx.userId, input.proposalId);
233
- return ok(parseOutput('review_proposals', reviewProposalsOutputV2Schema, toDecisionOutput(decided)));
240
+ return ok(parseOutput('review_proposals', reviewProposalsOutputV3Schema, toDecisionOutput(decided)));
241
+ }
242
+ /** Shape a core resolution-proposal record for the structured output (Dates -> ISO). */
243
+ function toResolutionProposalOutput(p) {
244
+ return {
245
+ id: p.id,
246
+ memoryId: p.memoryId,
247
+ sessionRunId: p.sessionRunId,
248
+ probability: p.probability,
249
+ status: p.status,
250
+ decidedAt: p.decidedAt === null ? null : p.decidedAt.toISOString(),
251
+ createdAt: p.createdAt.toISOString(),
252
+ };
234
253
  }
235
254
  /** Shape a core fact-proposal record for the structured output (Dates -> ISO). */
236
255
  function toFactProposalOutput(p) {
@@ -269,6 +288,18 @@ function toDecisionOutput(decided) {
269
288
  proposal: toFactProposalOutput(decided.proposal),
270
289
  factId: decided.factId,
271
290
  };
291
+ case 'resolution':
292
+ return {
293
+ action: 'rejected_resolution',
294
+ proposal: toResolutionProposalOutput(decided.proposal),
295
+ };
296
+ case 'resolution_applied':
297
+ return {
298
+ action: 'applied_resolution',
299
+ proposal: toResolutionProposalOutput(decided.proposal),
300
+ commitmentId: decided.commitmentId,
301
+ commitmentStatus: decided.commitmentStatus,
302
+ };
272
303
  }
273
304
  }
274
305
  /**
@@ -365,7 +396,7 @@ export function createAdminTools(toolNames) {
365
396
  title: 'Review Proposals',
366
397
  description: 'List proposals awaiting review (optionally by status), reject one, or accept one. Two kinds are reviewed the same way: consolidation proposals, where accepting materializes the proposed edge and a supersedes/updates edge also closes the predecessor; and extracted-fact proposals, where accepting writes the structured fact so `get_facts` can read it. Accept and reject take the proposal id either way. Reject and accept require the write scope.',
367
398
  inputSchema: reviewProposalsInputSchema,
368
- outputSchema: reviewProposalsOutputV2Schema,
399
+ outputSchema: reviewProposalsOutputV3Schema,
369
400
  // Per-action (list is a read; reject/accept are writes), so the hints
370
401
  // describe the write path. destructiveHint: false: accepting materializes
371
402
  // an edge, and a supersedes/updates edge CLOSES the predecessor's validity
@@ -1 +1 @@
1
- {"version":3,"file":"tools-admin.js","sourceRoot":"","sources":["../../src/mcp/tools-admin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tools-admin.js","sourceRoot":"","sources":["../../src/mcp/tools-admin.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,14 @@
1
1
  import type { NextFunction, Request, Response } from 'express';
2
2
  import type { Redis } from 'ioredis';
3
+ /** The limiter backing store, resolved once at boot by resolveRateLimitStore. */
4
+ export type RateLimitStore = {
5
+ kind: 'memory';
6
+ } | {
7
+ kind: 'redis';
8
+ client: Redis;
9
+ } | {
10
+ kind: 'postgres';
11
+ };
3
12
  /** Resolve the bucket key for a request, or undefined to SKIP limiting it. */
4
13
  export type KeyResolver = (req: Request) => string | undefined;
5
14
  /** The Express middleware shape the factory returns; the wiring seam injects it. */
@@ -28,7 +37,7 @@ export interface RateLimiterOptions {
28
37
  /** Window length in seconds. */
29
38
  duration: number;
30
39
  /**
31
- * Namespace for the Redis keys (e.g. 'mcp:user', 'oauth:ip'). Composes with the
40
+ * Namespace for the store keys (e.g. 'mcp:user', 'oauth:ip'). Composes with the
32
41
  * resolved key as `<keyPrefix>:<key>` so independent buckets never collide.
33
42
  */
34
43
  keyPrefix: string;
@@ -39,12 +48,12 @@ export interface RateLimiterOptions {
39
48
  */
40
49
  keyResolver?: KeyResolver;
41
50
  /**
42
- * Redis client for a cross-instance store. When omitted the limiter uses an
43
- * in-process RateLimiterMemory (local dev + CI; tests inject nothing).
51
+ * Backing store. The `{ kind: 'memory' }` default exists for unit tests only:
52
+ * createApp always passes the store resolveRateLimitStore resolved.
44
53
  */
45
- redis?: Redis | undefined;
54
+ store?: RateLimitStore;
46
55
  /**
47
- * On a STORE failure (Redis unreachable), allow the request through (true,
56
+ * On a STORE failure (Redis/Postgres unreachable), allow the request through (true,
48
57
  * default) or reject it 503-style via next(err) (false). Default fail-open:
49
58
  * availability over protection for a protective control.
50
59
  */
@@ -1,11 +1,11 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- // Redis-backed rate limiting (per-IP on the OAuth/login endpoints).
2
+ // Cross-instance rate limiting (per-IP on the OAuth/login endpoints).
3
3
  //
4
- // REUSABLE FACTORY: createRateLimiter({ points, duration, keyPrefix, ... })
5
- // returns Express middleware backed by rate-limiter-flexible — RateLimiterRedis
6
- // when an ioredis client is injected (cross-instance: Railway runs N replicas,
7
- // so the bucket MUST live in Redis, not per-process), else RateLimiterMemory
8
- // (local/CI parity, and the test seam — NO real Redis in CI).
4
+ // REUSABLE FACTORY: createRateLimiter({ points, duration, keyPrefix, store })
5
+ // returns Express middleware backed by rate-limiter-flexible over the resolved
6
+ // store (rate-limit-store.ts, #315): RateLimiterRedis, the Postgres
7
+ // `rate_limits` table, or RateLimiterMemory (local/CI and the unit-test seam).
8
+ // N replicas need a shared store; memory is per process.
9
9
  //
10
10
  // KEYING DIMENSIONS (docs/concepts/mcp-design.mdx "per-user + per-key"):
11
11
  // - /mcp -> per-AUTHENTICATED-USER (req.userId, bound by oauthBearerAuth).
@@ -19,8 +19,8 @@
19
19
  // also plumbs req.apiKeyId through api-key.ts). Building the seam now keeps
20
20
  // that follow-up additive.
21
21
  //
22
- // FAIL-OPEN on Redis-down (DECISION): rate limiting is protective, not
23
- // correctness — a Redis outage must NOT take down the API. On a store error
22
+ // FAIL-OPEN on store-down (DECISION): rate limiting is protective, not
23
+ // correctness — a store outage must NOT take down the API. On a store error
24
24
  // (distinct from a real over-limit rejection, which carries msBeforeNext) we log
25
25
  // a REDACTED warning (never REDIS_URL, never a key) and call next(). The tradeoff
26
26
  // is documented in the changeset; flip `failOpen: false` per-limiter if a future
@@ -29,6 +29,7 @@
29
29
  // On limit exceeded: 429 with Retry-After (seconds) + a structured body
30
30
  // { error: 'rate_limited' } and no further content (hard rule 5: thin transport).
31
31
  import { log, rateLimitStoreFailure } from '@3ngram/config';
32
+ import { createPostgresRateLimiter } from '@3ngram/core';
32
33
  import { RateLimiterMemory, RateLimiterRedis, } from 'rate-limiter-flexible';
33
34
  /** Per-IP key: req.ip is the real client address because app.ts sets trust proxy. */
34
35
  export const ipKey = (req) => req.ip;
@@ -76,17 +77,23 @@ function isOverLimit(rejection) {
76
77
  'msBeforeNext' in rejection &&
77
78
  typeof rejection.msBeforeNext === 'number');
78
79
  }
79
- /** Build the underlying limiter: Redis-backed when a client is present, else memory. */
80
+ /** Build the underlying limiter over the selected store. */
80
81
  function buildLimiter(options) {
81
82
  const base = {
82
83
  points: options.points,
83
84
  duration: options.duration,
84
85
  keyPrefix: options.keyPrefix,
85
86
  };
86
- if (options.redis !== undefined) {
87
- return new RateLimiterRedis({ ...base, storeClient: options.redis });
87
+ const store = options.store ?? { kind: 'memory' };
88
+ switch (store.kind) {
89
+ case 'redis':
90
+ return new RateLimiterRedis({ ...base, storeClient: store.client });
91
+ case 'postgres':
92
+ // A pg error rejects with a plain Error: a store failure, not an over-limit.
93
+ return createPostgresRateLimiter(base);
94
+ case 'memory':
95
+ return new RateLimiterMemory(base);
88
96
  }
89
- return new RateLimiterMemory(base);
90
97
  }
91
98
  /**
92
99
  * Create rate-limiting Express middleware. Consumes one point per request for the
@@ -114,12 +121,12 @@ export function createRateLimiter(options) {
114
121
  res.status(429).json({ error: 'rate_limited' });
115
122
  return;
116
123
  }
117
- // Store failure (Redis-down): the key/IP is identifying material and the
124
+ // Store failure (store down): the key/IP is identifying material and the
118
125
  // connection string is a credential — neither enters the log line or the
119
126
  // metric. key_prefix (the limiter/route class) is the only label.
120
127
  //
121
128
  // TRADEOFF (DECISION, see header): fail-open trades protection for
122
- // availability — a Redis outage with failOpen:true lets EVERY request
129
+ // availability — a store outage with failOpen:true lets EVERY request
123
130
  // through, so brute-force throttling on /auth/login
124
131
  // silently lapses with no over-limit 429s to alert on. The counter below
125
132
  // is the alert signal that makes the outage observable: an operator can
@@ -1 +1 @@
1
- {"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../../src/middleware/rate-limit.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../../src/middleware/rate-limit.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,11 @@
1
+ import type { Redis } from 'ioredis';
2
+ import type { RateLimitStore } from './middleware/rate-limit.js';
3
+ export declare class MemoryRateLimitStoreInProductionError extends Error {
4
+ name: string;
5
+ }
6
+ /**
7
+ * Pick the store from RATE_LIMIT_STORE (unset: redis iff REDIS_URL, else
8
+ * memory). `redis` is the already-resolved client, if any; it is reused so the
9
+ * process dials Redis at most once.
10
+ */
11
+ export declare function resolveRateLimitStore(redis: Redis | undefined): RateLimitStore;
@@ -0,0 +1,41 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ // Resolve the rate-limiter backing store once at boot (#315). Env validation
3
+ // already refuses an implicit memory store in production; this re-checks it
4
+ // (defence in depth) so no code path makes memory a silent production default.
5
+ import { loadEnv, loadRateLimitStoreConfig, log } from '@3ngram/config';
6
+ import { resolveRedis } from './redis.js';
7
+ export class MemoryRateLimitStoreInProductionError extends Error {
8
+ name = 'MemoryRateLimitStoreInProductionError';
9
+ }
10
+ /**
11
+ * Pick the store from RATE_LIMIT_STORE (unset: redis iff REDIS_URL, else
12
+ * memory). `redis` is the already-resolved client, if any; it is reused so the
13
+ * process dials Redis at most once.
14
+ */
15
+ export function resolveRateLimitStore(redis) {
16
+ const { kind, explicit } = loadRateLimitStoreConfig();
17
+ const production = loadEnv().NODE_ENV === 'production';
18
+ let store;
19
+ if (kind === 'redis') {
20
+ const client = redis ?? resolveRedis();
21
+ // Unreachable after env validation; fail closed rather than fall back.
22
+ if (client === undefined)
23
+ throw new Error('rate-limit: redis store selected without REDIS_URL');
24
+ store = { kind: 'redis', client };
25
+ }
26
+ else if (kind === 'postgres') {
27
+ store = { kind: 'postgres' };
28
+ }
29
+ else {
30
+ if (production && !explicit) {
31
+ throw new MemoryRateLimitStoreInProductionError('rate-limit: in-memory store refused in production; set RATE_LIMIT_STORE=postgres or REDIS_URL');
32
+ }
33
+ if (production) {
34
+ log().warn({ store: 'memory' }, 'rate-limit: in-memory store in production (per-replica buckets; single replica only)');
35
+ }
36
+ store = { kind: 'memory' };
37
+ }
38
+ log().info({ store: store.kind }, 'rate-limit: store resolved');
39
+ return store;
40
+ }
41
+ //# sourceMappingURL=rate-limit-store.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"rate-limit-store.js","sourceRoot":"","sources":["../src/rate-limit-store.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,6EAA6E;AAC7E,4EAA4E;AAC5E,+EAA+E;AAC/E,OAAO,EAAE,OAAO,EAAE,wBAAwB,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAGvE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEzC,MAAM,OAAO,qCAAsC,SAAQ,KAAK;IACrD,IAAI,GAAG,uCAAuC,CAAA;CACxD;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAAwB;IAC5D,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,wBAAwB,EAAE,CAAA;IACrD,MAAM,UAAU,GAAG,OAAO,EAAE,CAAC,QAAQ,KAAK,YAAY,CAAA;IACtD,IAAI,KAAqB,CAAA;IACzB,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,KAAK,IAAI,YAAY,EAAE,CAAA;QACtC,uEAAuE;QACvE,IAAI,MAAM,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;QAC/F,KAAK,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAA;IACnC,CAAC;SAAM,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,KAAK,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;IAC9B,CAAC;SAAM,CAAC;QACN,IAAI,UAAU,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,MAAM,IAAI,qCAAqC,CAC7C,+FAA+F,CAChG,CAAA;QACH,CAAC;QACD,IAAI,UAAU,EAAE,CAAC;YACf,GAAG,EAAE,CAAC,IAAI,CACR,EAAE,KAAK,EAAE,QAAQ,EAAE,EACnB,sFAAsF,CACvF,CAAA;QACH,CAAC;QACD,KAAK,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;IAC5B,CAAC;IACD,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,4BAA4B,CAAC,CAAA;IAC/D,OAAO,KAAK,CAAA;AACd,CAAC"}