@3ngram/server 1.8.5 → 1.8.7

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.js CHANGED
@@ -159,11 +159,25 @@ function resolveLimiters(options, redis) {
159
159
  }),
160
160
  };
161
161
  }
162
- /** A body-parser parse failure (malformed JSON body) — a 400, not a 500. */
163
- function isBodyParseError(err) {
164
- return (err instanceof SyntaxError &&
165
- 'type' in err &&
166
- err.type === 'entity.parse.failed');
162
+ function rejectedBody(err) {
163
+ if (typeof err !== 'object' || err === null)
164
+ return undefined;
165
+ const { status, type, code } = err;
166
+ if (typeof status !== 'number' || status < 400 || status > 499)
167
+ return undefined;
168
+ if (typeof type === 'string' && type.includes('.'))
169
+ return { status, type };
170
+ if (typeof code === 'string' && code.startsWith('Z_'))
171
+ return { status, type: code };
172
+ return undefined;
173
+ }
174
+ /** Stable wire error code for a rejected body; any other 4xx is a plain 400. */
175
+ function rejectedBodyResponse(status) {
176
+ if (status === 413)
177
+ return { status, error: 'payload_too_large' };
178
+ if (status === 415)
179
+ return { status, error: 'unsupported_media_type' };
180
+ return { status: 400, error: 'invalid_request' };
167
181
  }
168
182
  /** App factory — tests drive it in-process; index.ts is the only listener. */
169
183
  export function createApp(options = {}) {
@@ -289,12 +303,16 @@ export function createApp(options = {}) {
289
303
  // logged via the crash-safe projection: an Error message built from memory
290
304
  // content must not reach stdout raw.
291
305
  app.use((err, _req, res, _next) => {
292
- // A malformed JSON body is a client error: express.json() throws a
293
- // body-parser SyntaxError (status 400, type 'entity.parse.failed') before
294
- // any route runs. Surface it as the documented 400 invalid_request contract
295
- // rather than the generic 500.
296
- if (isBodyParseError(err)) {
297
- res.status(400).json({ error: 'invalid_request' });
306
+ // express.json() rejects a body before any route runs: malformed JSON or a
307
+ // corrupt compressed body is a 400 invalid_request, one over the size limit
308
+ // a 413 payload_too_large, an unsupported content encoding or charset a 415
309
+ // unsupported_media_type. Log body-parser's own status and type only — never
310
+ // the body — and keep the 500 for genuinely unhandled errors.
311
+ const rejected = rejectedBody(err);
312
+ if (rejected !== undefined) {
313
+ const { status, error } = rejectedBodyResponse(rejected.status);
314
+ log().warn({ status: rejected.status, type: rejected.type }, 'server: request body rejected');
315
+ res.status(status).json({ error });
298
316
  return;
299
317
  }
300
318
  log().error(crashSafeError(err), 'server: unhandled error');
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":"AAAA,sCAAsC;AACtC,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,oBAAoB,EACpB,GAAG,GACJ,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,cAAc,EAA0B,eAAe,EAAE,MAAM,cAAc,CAAA;AACtF,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAE,mBAAmB,EAAgB,MAAM,aAAa,CAAA;AAC/D,OAAO,OAAO,EAAE,EAAgE,MAAM,SAAS,CAAA;AAE/F,OAAO,EAAE,gBAAgB,EAAkB,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC5F,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAA;AACjF,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,KAAK,EAEL,SAAS,GACV,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAOxD;;;;GAIG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAa,CAAA;AA+ErD;;;;;;;GAOG;AACH,MAAM,eAAe,GAAG,GAAG,CAAA;AAC3B,MAAM,cAAc,GAAG,EAAE,CAAA;AACzB,MAAM,cAAc,GAAG,GAAG,CAAA;AAC1B,wEAAwE;AACxE,6EAA6E;AAC7E,uEAAuE;AACvE,MAAM,gBAAgB,GAAG,CAAC,CAAA;AAC1B,MAAM,6BAA6B,GAAG,CAAC,CAAA;AACvC,MAAM,sBAAsB,GAAG,EAAE,CAAA;AACjC,MAAM,yBAAyB,GAAG,CAAC,CAAA;AACnC,MAAM,wBAAwB,GAAG,CAAC,CAAA;AAClC,MAAM,kBAAkB,GAAG,EAAE,CAAA;AAC7B,+EAA+E;AAC/E,6EAA6E;AAC7E,gFAAgF;AAChF,MAAM,eAAe,GAAG,EAAE,CAAA;AAC1B,MAAM,cAAc,GAAG,GAAG,CAAA;AAC1B,MAAM,mBAAmB,GAAG,EAAE,CAAA;AAE9B,sFAAsF;AACtF,SAAS,cAAc,CAAC,QAA6B;IACnD,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAA;IAC3C,MAAM,MAAM,GAAG,oBAAoB,EAAE,CAAA;IACrC,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAA;AACvE,CAAC;AAED;;;;GAIG;AACH,SAAS,eAAe,CACtB,OAAmB,EACnB,KAAwB;IAcxB,OAAO;QACL,WAAW,EACT,OAAO,CAAC,WAAW;YACnB,iBAAiB,CAAC;gBAChB,MAAM,EAAE,cAAc;gBACtB,QAAQ,EAAE,mBAAmB;gBAC7B,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,KAAK;gBAClB,KAAK;aACN,CAAC;QACJ,UAAU,EACR,OAAO,CAAC,UAAU;YAClB,iBAAiB,CAAC;gBAChB,MAAM,EAAE,eAAe;gBACvB,QAAQ,EAAE,mBAAmB;gBAC7B,SAAS,EAAE,UAAU;gBACrB,WAAW,EAAE,SAAS;gBACtB,KAAK;aACN,CAAC;QACJ,WAAW,EACT,OAAO,CAAC,WAAW;YACnB,iBAAiB,CAAC;gBAChB,MAAM,EAAE,cAAc;gBACtB,QAAQ,EAAE,mBAAmB;gBAC7B,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,KAAK;gBAClB,KAAK;aACN,CAAC;QACJ,aAAa,EACX,OAAO,CAAC,aAAa;YACrB,iBAAiB,CAAC;gBAChB,MAAM,EAAE,gBAAgB;gBACxB,QAAQ,EAAE,mBAAmB;gBAC7B,SAAS,EAAE,gBAAgB;gBAC3B,WAAW,EAAE,KAAK;gBAClB,KAAK;aACN,CAAC;QACJ,yBAAyB,EACvB,OAAO,CAAC,yBAAyB;YACjC,iBAAiB,CAAC;gBAChB,MAAM,EAAE,6BAA6B;gBACrC,QAAQ,EAAE,mBAAmB;gBAC7B,SAAS,EAAE,6BAA6B;gBACxC,WAAW,EAAE,KAAK;gBAClB,KAAK;aACN,CAAC;QACJ,kBAAkB,EAChB,OAAO,CAAC,kBAAkB;YAC1B,iBAAiB,CAAC;gBAChB,MAAM,EAAE,sBAAsB;gBAC9B,QAAQ,EAAE,mBAAmB;gBAC7B,SAAS,EAAE,sBAAsB;gBACjC,WAAW,EAAE,KAAK;gBAClB,KAAK;aACN,CAAC;QACJ,qBAAqB,EACnB,OAAO,CAAC,qBAAqB;YAC7B,iBAAiB,CAAC;gBAChB,MAAM,EAAE,yBAAyB;gBACjC,QAAQ,EAAE,mBAAmB;gBAC7B,SAAS,EAAE,yBAAyB;gBACpC,WAAW,EAAE,KAAK;gBAClB,KAAK;aACN,CAAC;QACJ,oBAAoB,EAClB,OAAO,CAAC,oBAAoB;YAC5B,iBAAiB,CAAC;gBAChB,MAAM,EAAE,wBAAwB;gBAChC,QAAQ,EAAE,mBAAmB;gBAC7B,SAAS,EAAE,wBAAwB;gBACnC,WAAW,EAAE,KAAK;gBAClB,KAAK;aACN,CAAC;QACJ,eAAe,EACb,OAAO,CAAC,eAAe;YACvB,iBAAiB,CAAC;gBAChB,MAAM,EAAE,kBAAkB;gBAC1B,QAAQ,EAAE,mBAAmB;gBAC7B,SAAS,EAAE,mBAAmB;gBAC9B,WAAW,EAAE,KAAK;gBAClB,KAAK;aACN,CAAC;QACJ,YAAY,EACV,OAAO,CAAC,YAAY;YACpB,iBAAiB,CAAC;gBAChB,MAAM,EAAE,eAAe;gBACvB,QAAQ,EAAE,mBAAmB;gBAC7B,SAAS,EAAE,aAAa;gBACxB,WAAW,EAAE,KAAK;gBAClB,KAAK;aACN,CAAC;QACJ,aAAa,EACX,OAAO,CAAC,aAAa;YACrB,iBAAiB,CAAC;gBAChB,MAAM,EAAE,cAAc;gBACtB,QAAQ,EAAE,mBAAmB;gBAC7B,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,WAAW;gBACxB,KAAK;aACN,CAAC;KACL,CAAA;AACH,CAAC;AAeD,SAAS,YAAY,CAAC,GAAY;IAChC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,SAAS,CAAA;IAC7D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAA2D,CAAA;IAC1F,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,GAAG,GAAG,IAAI,MAAM,GAAG,GAAG;QAAE,OAAO,SAAS,CAAA;IAChF,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;IAC3E,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;IACpF,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,gFAAgF;AAChF,SAAS,oBAAoB,CAAC,MAAc;IAC1C,IAAI,MAAM,KAAK,GAAG;QAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAA;IACjE,IAAI,MAAM,KAAK,GAAG;QAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,wBAAwB,EAAE,CAAA;IACtE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAA;AAClD,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,SAAS,CAAC,UAAsB,EAAE;IAChD,MAAM,GAAG,GAAG,OAAO,EAAE,CAAA;IACrB,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAC/C,gFAAgF;IAChF,mFAAmF;IACnF,gFAAgF;IAChF,mFAAmF;IACnF,SAAS;IACT,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,aAAa,CAAA;IACpD,MAAM,MAAM,GAAG,SAAS,CAAC,aAAa,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,eAAe,CAAC,CAAA;IACvE,6EAA6E;IAC7E,qDAAqD;IACrD,8DAA8D;IAC9D,gEAAgE;IAChE,0EAA0E;IAC1E,iFAAiF;IACjF,gFAAgF;IAChF,+EAA+E;IAC/E,aAAa;IACb,MAAM,MAAM,GAAsB;QAChC,aAAa,EAAE,MAAM;QACrB,MAAM,EAAE,gBAAgB,EAAE;QAC1B,eAAe,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC;QAC7E,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;KACrD,CAAA;IACD,+EAA+E;IAC/E,6EAA6E;IAC7E,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,IAAI,cAAc,CAAA;IACjD,oEAAoE;IACpE,mEAAmE;IACnE,yEAAyE;IACzE,wEAAwE;IACxE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,YAAY,EAAE,CAAA;IAC7C,MAAM,sBAAsB,GAAG,OAAO,CAAC,sBAAsB,IAAI,IAAI,sBAAsB,EAAE,CAAA;IAC7F,MAAM,EACJ,WAAW,EACX,UAAU,EACV,WAAW,EACX,aAAa,EACb,yBAAyB,EACzB,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,eAAe,EACf,YAAY,EACZ,aAAa,GACd,GAAG,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACnC,4EAA4E;IAC5E,gDAAgD;IAChD,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;IACzB,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAE3B,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;IACvB,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;IACrB,+EAA+E;IAC/E,2EAA2E;IAC3E,sDAAsD;IACtD,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IACpB,0EAA0E;IAC1E,0EAA0E;IAC1E,8EAA8E;IAC9E,uCAAuC;IACvC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAA;IACvC,0EAA0E;IAC1E,qEAAqE;IACrE,+EAA+E;IAC/E,4DAA4D;IAC5D,0CAA0C;IAC1C,GAAG,CAAC,GAAG,CACL,OAAO,CAAC,IAAI,CAAC;QACX,MAAM,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;YACzB,CAAC;YAAC,GAAsC,CAAC,OAAO,GAAG,GAAG,CAAA;QACxD,CAAC;KACF,CAAC,CACH,CAAA;IACD,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IACxB,oEAAoE;IACpE,8EAA8E;IAC9E,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,GAAG,gBAAgB,EAAE,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IAC7E,GAAG,CAAC,GAAG,CACL,UAAU,CAAC;QACT,OAAO,EAAE,WAAW;QACpB,aAAa;QACb,yBAAyB;QACzB,kBAAkB;QAClB,qBAAqB;QACrB,oBAAoB;QACpB,MAAM;KACP,CAAC,CACH,CAAA;IACD,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IACtB,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;IAC3B,6DAA6D;IAC7D,4EAA4E;IAC5E,gEAAgE;IAChE,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;IACjC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IACtB,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;IAC5E,oEAAoE;IACpE,8EAA8E;IAC9E,6EAA6E;IAC7E,gFAAgF;IAChF,wEAAwE;IACxE,GAAG,CAAC,GAAG,CACL,UAAU,CAAC;QACT,OAAO;QACP,WAAW,EAAE,aAAa;QAC1B,MAAM;QACN,MAAM;QACN,MAAM;QACN,6EAA6E;QAC7E,kDAAkD;QAClD,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;QAC9C,2EAA2E;QAC3E,iCAAiC;QACjC,cAAc,EAAE,SAAS,CAAC,cAAc;KACzC,CAAC,CACH,CAAA;IACD,yCAAyC;IACzC,6EAA6E;IAC7E,6DAA6D;IAC7D,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC,CAAA;IAC1D,8CAA8C;IAC9C,6EAA6E;IAC7E,yEAAyE;IACzE,4BAA4B;IAC5B,GAAG,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,CAAC,CAAC,CAAA;IAChF,6EAA6E;IAC7E,oEAAoE;IACpE,oDAAoD;IACpD,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAC,CAAA;IAE3F,oEAAoE;IACpE,+EAA+E;IAC/E,6EAA6E;IAC7E,0EAA0E;IAC1E,2CAA2C;IAC3C,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IAEvB,6EAA6E;IAC7E,2EAA2E;IAC3E,qCAAqC;IACrC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAY,EAAE,IAAa,EAAE,GAAa,EAAE,KAAmB,EAAE,EAAE;QAC1E,2EAA2E;QAC3E,4EAA4E;QAC5E,4EAA4E;QAC5E,6EAA6E;QAC7E,8DAA8D;QAC9D,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;QAClC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,oBAAoB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAC/D,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,EAAE,+BAA+B,CAAC,CAAA;YAC7F,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;YAClC,OAAM;QACR,CAAC;QACD,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,yBAAyB,CAAC,CAAA;QAC3D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,CAAA;IACnD,CAAC,CAAC,CAAA;IACF,OAAO,GAAG,CAAA;AACZ,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import type { LimitsResolver } from '@3ngram/core';
2
2
  import { type ClientMetadataResolver } from '@3ngram/core/auth';
3
- import { OAuthError } from '@modelcontextprotocol/server-legacy/auth';
3
+ import { OAuthError } from '@modelcontextprotocol/server';
4
4
  import { Router } from 'express';
5
5
  import type { Redis } from 'ioredis';
6
6
  import type { RateLimiterMiddleware } from '../middleware/rate-limit.js';
@@ -22,7 +22,7 @@ export interface OAuthTokenRouterOptions {
22
22
  /**
23
23
  * The per-process fallback counter used when no Redis client is injected
24
24
  * (single-instance / CI). Exported for test inspection of the fallback path
25
- * only — the Redis path is exercised via an injected ioredis-mock client.
25
+ * only — the Redis path is exercised via an injected in-memory fake client.
26
26
  */
27
27
  export declare const _exchangeFailures: Map<string, number>;
28
28
  /** Wire the failure-tracker Redis client (or clear it for the Map fallback). */
@@ -32,7 +32,7 @@ export declare function recordExchangeFailure(clientId: string): Promise<void>;
32
32
  /** Clear the failure counter for a client_id (a successful exchange forgives it). */
33
33
  export declare function clearExchangeFailures(clientId: string): Promise<void>;
34
34
  export declare function applyProgressiveDelay(clientId: string): Promise<void>;
35
- /** Map a thrown failure to the SDK's typed OAuthError (generic -> ServerError 500). */
35
+ /** Map a thrown failure to the SDK's OAuthError (generic -> server_error 500). */
36
36
  export declare function toOAuthError(err: unknown): OAuthError;
37
37
  /** Build the /oauth/token router behind the injected per-IP limiter. */
38
38
  export declare function oauthTokenRouter(options: OAuthTokenRouterOptions): Router;
@@ -4,24 +4,24 @@
4
4
  // authenticate the client, delegate the grant exchange to the core provider,
5
5
  // shape the RFC 6749 response.
6
6
  //
7
- // CLIENT AUTH IS CUSTOM (by design): the SDK's authenticateClient
8
- // middleware compares a PLAINTEXT secret against what the clients store
9
- // returns — but our store never returns secret material (only the SHA-256 hash
10
- // is at rest), so the SDK default cannot work. authenticateClientCredentials
11
- // (core) hashes the presented secret and compares against the stored hash.
12
- // The retained legacy AS helper reads client credentials from req.body, so a
7
+ // CLIENT AUTH IS CUSTOM (by design): a stock authenticateClient middleware
8
+ // compares a PLAINTEXT secret against what the clients store returns — but our
9
+ // store never returns secret material (only the SHA-256 hash is at rest), so
10
+ // that default cannot work. authenticateClientCredentials (core) hashes the
11
+ // presented secret and compares against the stored hash.
12
+ // The token request schema reads client credentials from req.body, so a
13
13
  // Basic-auth shim decodes `Authorization: Basic` into the body first (RFC 6749 §2.3.1) —
14
14
  // that is how client_secret_basic (the RFC 7591 default) is honored.
15
15
  //
16
- // ERRORS ARE THE SDK'S TYPED ERRORS ONLY: every failure maps to
17
- // an OAuthError subclass and its RFC 6749 response object — a generic Error
18
- // becomes the opaque ServerError 500 and is logged crash-safe. Token, code,
16
+ // ERRORS ARE THE SDK'S OAuthError ONLY: every failure maps to an OAuthError
17
+ // carrying an OAuthErrorCode and its RFC 6749 response object — a generic Error
18
+ // becomes the opaque server_error 500 and is logged crash-safe. Token, code,
19
19
  // and secret material never enter a log line or an error body.
20
20
  import { contentDigest, loadOAuthConfig, log } from '@3ngram/config';
21
21
  import { crashSafeError } from '@3ngram/config/otel';
22
22
  import { authenticateClientCredentials, createOAuthServerProvider, insertAuditLog, OAuthGrantError, ResourceLimitExceededError, touchClientLastUsed, } from '@3ngram/core/auth';
23
23
  import { tokenRequestSchema } from '@3ngram/schema';
24
- import { InvalidClientError, InvalidGrantError, InvalidRequestError, InvalidTargetError, InvalidTokenError, OAuthError, ServerError, UnsupportedGrantTypeError, } from '@modelcontextprotocol/server-legacy/auth';
24
+ import { OAuthError, OAuthErrorCode } from '@modelcontextprotocol/server';
25
25
  import { Router, urlencoded } from 'express';
26
26
  /** Which channel carried the client credentials — used to enforce the registered method. */
27
27
  const PRESENTED_AUTH_METHOD = Symbol('presentedAuthMethod');
@@ -69,7 +69,7 @@ function decodeBasicCredentials(header) {
69
69
  }
70
70
  }
71
71
  /**
72
- * RFC 6749 §2.3.1 / §3.2.1 client-authentication shim (S4). The SDK reads
72
+ * RFC 6749 §2.3.1 / §3.2.1 client-authentication shim (S4). The schema reads
73
73
  * credentials from req.body only, so this normalizes every accepted channel
74
74
  * into the body the schema validates AND attributes the presented method so the
75
75
  * auth step can enforce the registered token_endpoint_auth_method:
@@ -174,13 +174,13 @@ function exchangeFailureId(clientId) {
174
174
  /**
175
175
  * The per-process fallback counter used when no Redis client is injected
176
176
  * (single-instance / CI). Exported for test inspection of the fallback path
177
- * only — the Redis path is exercised via an injected ioredis-mock client.
177
+ * only — the Redis path is exercised via an injected in-memory fake client.
178
178
  */
179
179
  export const _exchangeFailures = new Map();
180
180
  /**
181
181
  * The injected failure-tracker Redis client, or undefined for the in-process
182
182
  * fallback. Set once by oauthTokenRouter at boot; the tracker functions read it
183
- * so the wiring stays a single injection seam (testable with ioredis-mock).
183
+ * so the wiring stays a single injection seam (testable with an in-memory fake).
184
184
  */
185
185
  let exchangeFailureRedis;
186
186
  /** Wire the failure-tracker Redis client (or clear it for the Map fallback). */
@@ -305,26 +305,26 @@ function logTokenOutcome(grantType, clientId, outcome) {
305
305
  outcome,
306
306
  }, 'oauth: token endpoint');
307
307
  }
308
- /** Map a thrown failure to the SDK's typed OAuthError (generic -> ServerError 500). */
308
+ /** Map a thrown failure to the SDK's OAuthError (generic -> server_error 500). */
309
309
  export function toOAuthError(err) {
310
310
  if (err instanceof OAuthError)
311
311
  return err;
312
312
  if (err instanceof ResourceLimitExceededError) {
313
- return new InvalidGrantError('Active MCP client limit reached');
313
+ return new OAuthError(OAuthErrorCode.InvalidGrant, 'Active MCP client limit reached');
314
314
  }
315
315
  if (err instanceof OAuthGrantError) {
316
316
  switch (err.code) {
317
317
  case 'invalid_grant':
318
- return new InvalidGrantError('The provided grant is invalid, expired, or revoked');
318
+ return new OAuthError(OAuthErrorCode.InvalidGrant, 'The provided grant is invalid, expired, or revoked');
319
319
  case 'invalid_client':
320
- return new InvalidClientError('Client authentication failed');
320
+ return new OAuthError(OAuthErrorCode.InvalidClient, 'Client authentication failed');
321
321
  case 'invalid_target':
322
- return new InvalidTargetError('The requested resource is not served by this server');
322
+ return new OAuthError(OAuthErrorCode.InvalidTarget, 'The requested resource is not served by this server');
323
323
  case 'invalid_token':
324
- return new InvalidTokenError('The access token is invalid');
324
+ return new OAuthError(OAuthErrorCode.InvalidToken, 'The access token is invalid');
325
325
  }
326
326
  }
327
- return new ServerError('Internal Server Error');
327
+ return new OAuthError(OAuthErrorCode.ServerError, 'Internal Server Error');
328
328
  }
329
329
  /**
330
330
  * RFC 6749 §3.2/§4.1.3: the token endpoint accepts ONLY a
@@ -347,25 +347,28 @@ async function handleTokenRequest(req, res, limits, clientMetadataResolver) {
347
347
  // RFC 6749 §5.1 also mandates Pragma: no-cache on token-bearing responses.
348
348
  res.setHeader('Pragma', 'no-cache');
349
349
  if (rejectsNonFormContentType(req)) {
350
- throw new InvalidRequestError('The token endpoint requires application/x-www-form-urlencoded');
350
+ throw new OAuthError(OAuthErrorCode.InvalidRequest, 'The token endpoint requires application/x-www-form-urlencoded');
351
351
  }
352
352
  // A malformed Basic header or a Basic identity conflicting with a posted
353
353
  // client_id is a failed client authentication (RFC 6749 §2.3/§3.2.1) — a
354
354
  // uniform invalid_client with no oracle, decided before any schema/provider work.
355
- if (clientAuthIsInvalid(req))
356
- throw new InvalidClientError('Client authentication failed');
355
+ if (clientAuthIsInvalid(req)) {
356
+ throw new OAuthError(OAuthErrorCode.InvalidClient, 'Client authentication failed');
357
+ }
357
358
  const body = (req.body ?? {});
358
359
  // RFC 6749 §5.2: a request missing required parameters is invalid_request.
359
360
  // An absent grant_type (e.g. an empty body) is a malformed request, distinct
360
361
  // from a PRESENT-but-unrecognized grant_type (unsupported_grant_type).
361
- if (body.grant_type === undefined)
362
- throw new InvalidRequestError('Malformed token request');
362
+ if (body.grant_type === undefined) {
363
+ throw new OAuthError(OAuthErrorCode.InvalidRequest, 'Malformed token request');
364
+ }
363
365
  if (body.grant_type !== 'authorization_code' && body.grant_type !== 'refresh_token') {
364
- throw new UnsupportedGrantTypeError('The grant type is not supported by this server');
366
+ throw new OAuthError(OAuthErrorCode.UnsupportedGrantType, 'The grant type is not supported by this server');
365
367
  }
366
368
  const parsed = tokenRequestSchema.safeParse(body);
367
- if (!parsed.success)
368
- throw new InvalidRequestError('Malformed token request');
369
+ if (!parsed.success) {
370
+ throw new OAuthError(OAuthErrorCode.InvalidRequest, 'Malformed token request');
371
+ }
369
372
  const input = parsed.data;
370
373
  // Apply progressive delay before the grant exchange. The delay is keyed on
371
374
  // client_id (never logged) and ramps after DELAY_THRESHOLD
@@ -374,10 +377,8 @@ async function handleTokenRequest(req, res, limits, clientMetadataResolver) {
374
377
  const client = await authenticateClientCredentials(input.client_id, input.client_secret, presentedAuthMethod(req), clientMetadataResolver);
375
378
  if (client === undefined || !client.grant_types.includes(input.grant_type)) {
376
379
  await recordExchangeFailure(input.client_id);
377
- throw new InvalidClientError('Client authentication failed');
380
+ throw new OAuthError(OAuthErrorCode.InvalidClient, 'Client authentication failed');
378
381
  }
379
- // COMPILE PIN: the core provider must remain assignable to the retained
380
- // legacy OAuthServerProvider while DCR compatibility remains supported.
381
382
  const provider = createOAuthServerProvider(loadOAuthConfig(), limits);
382
383
  const resource = input.resource === undefined ? undefined : new URL(input.resource);
383
384
  let tokens;
@@ -425,14 +426,14 @@ export function oauthTokenRouter(options) {
425
426
  // outcome IS the mapped RFC error code (invalid_grant|invalid_client|
426
427
  // invalid_request|unsupported_grant_type|server_error) — docs/concepts/observability.mdx
427
428
  // wants the same vocabulary the client sees in the response body.
428
- logTokenOutcome(body.grant_type, body.client_id, oauthError.errorCode);
429
- if (oauthError instanceof ServerError) {
429
+ logTokenOutcome(body.grant_type, body.client_id, oauthError.code);
430
+ if (oauthError.code === OAuthErrorCode.ServerError) {
430
431
  log().error(crashSafeError(err), 'oauth: token endpoint failure');
431
432
  }
432
433
  // RFC 6749 §5.2: a failed client authentication is 401, not 400; and
433
434
  // when the client authenticated via the Authorization header, the
434
435
  // response MUST carry a matching WWW-Authenticate challenge.
435
- if (oauthError instanceof InvalidClientError) {
436
+ if (oauthError.code === OAuthErrorCode.InvalidClient) {
436
437
  if (req.header('authorization')?.toLowerCase().startsWith('basic ') === true) {
437
438
  res.setHeader('WWW-Authenticate', 'Basic realm="oauth"');
438
439
  }
@@ -440,7 +441,7 @@ export function oauthTokenRouter(options) {
440
441
  return;
441
442
  }
442
443
  res
443
- .status(oauthError instanceof ServerError ? 500 : 400)
444
+ .status(oauthError.code === OAuthErrorCode.ServerError ? 500 : 400)
444
445
  .json(oauthError.toResponseObject());
445
446
  });
446
447
  });
@@ -1 +1 @@
1
- {"version":3,"file":"oauth-token.js","sourceRoot":"","sources":["../../src/routes/oauth-token.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauth-token.js","sourceRoot":"","sources":["../../src/routes/oauth-token.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@3ngram/server",
3
- "version": "1.8.5",
3
+ "version": "1.8.7",
4
4
  "description": "MCP server and REST API for persistent, typed AI-agent memory.",
5
5
  "license": "Apache-2.0",
6
6
  "homepage": "https://3ngram.ai",
@@ -53,28 +53,26 @@
53
53
  "README.md"
54
54
  ],
55
55
  "dependencies": {
56
- "@modelcontextprotocol/node": "2.0.0",
57
- "@modelcontextprotocol/server": "2.0.0",
58
- "@modelcontextprotocol/server-legacy": "2.0.0",
59
- "express": "5.2.1",
60
- "hono": "4.13.11",
56
+ "@modelcontextprotocol/node": "2.1.1",
57
+ "@modelcontextprotocol/server": "2.3.1",
58
+ "express": "5.3.0",
59
+ "hono": "4.13.13",
61
60
  "ioredis": "5.11.1",
62
- "nodemailer": "10.0.12",
63
- "rate-limiter-flexible": "11.2.0",
64
- "zod": "4.4.3",
65
- "@3ngram/config": "0.5.0",
66
- "@3ngram/core": "0.13.2",
61
+ "nodemailer": "10.0.16",
62
+ "rate-limiter-flexible": "11.2.1",
63
+ "zod": "4.6.5",
64
+ "@3ngram/config": "0.5.1",
65
+ "@3ngram/core": "0.13.4",
67
66
  "@3ngram/llm": "0.3.0",
68
- "@3ngram/schema": "0.11.1"
67
+ "@3ngram/schema": "0.11.2"
69
68
  },
70
69
  "devDependencies": {
71
- "@modelcontextprotocol/client": "2.0.0",
70
+ "@modelcontextprotocol/client": "2.3.1",
72
71
  "@types/express": "5.0.6",
73
72
  "@types/node": "25.9.1",
74
- "ioredis-mock": "8.13.1",
75
73
  "tsx": "4.22.4",
76
74
  "typescript": "6.0.3",
77
- "vitest": "4.1.8"
75
+ "vitest": "4.1.11"
78
76
  },
79
77
  "scripts": {
80
78
  "build": "tsc -p tsconfig.json",