@abyss-project/monitor 14.0.0 → 15.0.0

package/dist/middlewares/rate-limit/identifier-resolver.d.ts

@@ -19,4 +19,7 @@ export declare function hashCredential(value: string): string;
 export declare const RATE_LIMIT_INTERNAL_APPLICATION_LOCAL = "rateLimitInternalApplicationId";
 export declare function setRateLimitInternalApplication(res: Response, applicationId: string): void;
 export declare function readRateLimitInternalApplication(res: Response): string | undefined;
+export declare const RATE_LIMIT_API_KEY_FINGERPRINT_LOCAL = "apiKeyFingerprint";
+export declare function setRateLimitApiKey(res: Response, apiKey: string): void;
+export declare function readRateLimitApiKeyFingerprint(res: Response): string | undefined;
 export declare function resolveIdentifiers(req: Request, res: Response): ResolvedIdentifier;

package/dist/middlewares/rate-limit/identifier-resolver.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RATE_LIMIT_INTERNAL_APPLICATION_LOCAL = void 0;
+exports.RATE_LIMIT_API_KEY_FINGERPRINT_LOCAL = exports.RATE_LIMIT_INTERNAL_APPLICATION_LOCAL = void 0;
 exports.hashCredential = hashCredential;
 exports.setRateLimitInternalApplication = setRateLimitInternalApplication;
 exports.readRateLimitInternalApplication = readRateLimitInternalApplication;
+exports.setRateLimitApiKey = setRateLimitApiKey;
+exports.readRateLimitApiKeyFingerprint = readRateLimitApiKeyFingerprint;
 exports.resolveIdentifiers = resolveIdentifiers;
 const node_require_1 = require("../../utils/node-require");
-const api_key_header_1 = require("../../utils/api-key-header");
 function hashCredential(value) {
     const { createHash } = (0, node_require_1.nodeRequire)('crypto');
     return createHash('sha256').update(value).digest('hex').slice(0, 16);
@@ -19,13 +20,22 @@ function readRateLimitInternalApplication(res) {
     const value = res.locals?.[exports.RATE_LIMIT_INTERNAL_APPLICATION_LOCAL];
     return typeof value === 'string' && value !== '' ? value : undefined;
 }
+exports.RATE_LIMIT_API_KEY_FINGERPRINT_LOCAL = 'apiKeyFingerprint';
+function setRateLimitApiKey(res, apiKey) {
+    res.locals[exports.RATE_LIMIT_API_KEY_FINGERPRINT_LOCAL] =
+        hashCredential(apiKey);
+}
+function readRateLimitApiKeyFingerprint(res) {
+    const value = res.locals?.[exports.RATE_LIMIT_API_KEY_FINGERPRINT_LOCAL];
+    return typeof value === 'string' && value !== '' ? value : undefined;
+}
 function resolveIdentifiers(req, res) {
     const locals = (res.locals ?? {});
     if (locals.isAdmin)
         return { kind: 'admin' };
-    const apiKey = req.header?.(api_key_header_1.API_KEY_APPLICATION_HEADER) || req.header?.('abyss-api-key');
-    if (apiKey)
-        return { kind: 'apikey', apiKeyId: hashCredential(apiKey) };
+    const apiKeyId = readRateLimitApiKeyFingerprint(res);
+    if (apiKeyId)
+        return { kind: 'apikey', apiKeyId };
     if (locals.currentUser?.id) {
         if (locals.organization?.id) {
             return { kind: 'userOrg', userId: locals.currentUser.id, orgId: locals.organization.id };

package/dist/middlewares/rate-limit/identifier-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"identifier-resolver.js","sourceRoot":"","sources":["../../../src/middlewares/rate-limit/identifier-resolver.ts"],"names":[],"mappings":";;;AAeA,wCAMC;AAWD,0EAEC;AAGD,4EAKC;AAED,gDAsBC;AAjED,2DAAuD;AACvD,+DAAwE;AAaxE,SAAgB,cAAc,CAAC,KAAa;IAI1C,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,0BAAW,EAA0B,QAAQ,CAAC,CAAC;IACtE,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACvE,CAAC;AAGY,QAAA,qCAAqC,GAAG,gCAAgC,CAAC;AAQtF,SAAgB,+BAA+B,CAAC,GAAa,EAAE,aAAqB;IACjF,GAAG,CAAC,MAAkC,CAAC,6CAAqC,CAAC,GAAG,aAAa,CAAC;AACjG,CAAC;AAGD,SAAgB,gCAAgC,CAAC,GAAa;IAC5D,MAAM,KAAK,GAAI,GAAG,CAAC,MAA8C,EAAE,CACjE,6CAAqC,CACtC,CAAC;IACF,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACvE,CAAC;AAED,SAAgB,kBAAkB,CAAC,GAAY,EAAE,GAAa;IAC5D,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAI/B,CAAC;IAEF,IAAI,MAAM,CAAC,OAAO;QAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAI7C,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,2CAA0B,CAAC,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,eAAe,CAAC,CAAC;IACzF,IAAI,MAAM;QAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;IAExE,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,EAAE,CAAC;QAC3B,IAAI,MAAM,CAAC,YAAY,EAAE,EAAE,EAAE,CAAC;YAC5B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC;QAC3F,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;IACzD,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,SAAS,EAAE,CAAC;AACjD,CAAC"}
+{"version":3,"file":"identifier-resolver.js","sourceRoot":"","sources":["../../../src/middlewares/rate-limit/identifier-resolver.ts"],"names":[],"mappings":";;;AAcA,wCAMC;AAWD,0EAEC;AAGD,4EAKC;AAYD,gDAGC;AAGD,wEAKC;AAED,gDAsBC;AAvFD,2DAAuD;AAavD,SAAgB,cAAc,CAAC,KAAa;IAI1C,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,0BAAW,EAA0B,QAAQ,CAAC,CAAC;IACtE,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACvE,CAAC;AAGY,QAAA,qCAAqC,GAAG,gCAAgC,CAAC;AAQtF,SAAgB,+BAA+B,CAAC,GAAa,EAAE,aAAqB;IACjF,GAAG,CAAC,MAAkC,CAAC,6CAAqC,CAAC,GAAG,aAAa,CAAC;AACjG,CAAC;AAGD,SAAgB,gCAAgC,CAAC,GAAa;IAC5D,MAAM,KAAK,GAAI,GAAG,CAAC,MAA8C,EAAE,CACjE,6CAAqC,CACtC,CAAC;IACF,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACvE,CAAC;AAGY,QAAA,oCAAoC,GAAG,mBAAmB,CAAC;AASxE,SAAgB,kBAAkB,CAAC,GAAa,EAAE,MAAc;IAC7D,GAAG,CAAC,MAAkC,CAAC,4CAAoC,CAAC;QAC3E,cAAc,CAAC,MAAM,CAAC,CAAC;AAC3B,CAAC;AAGD,SAAgB,8BAA8B,CAAC,GAAa;IAC1D,MAAM,KAAK,GAAI,GAAG,CAAC,MAA8C,EAAE,CACjE,4CAAoC,CACrC,CAAC;IACF,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACvE,CAAC;AAED,SAAgB,kBAAkB,CAAC,GAAY,EAAE,GAAa;IAC5D,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAI/B,CAAC;IAEF,IAAI,MAAM,CAAC,OAAO;QAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAI7C,MAAM,QAAQ,GAAG,8BAA8B,CAAC,GAAG,CAAC,CAAC;IACrD,IAAI,QAAQ;QAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAElD,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,EAAE,CAAC;QAC3B,IAAI,MAAM,CAAC,YAAY,EAAE,EAAE,EAAE,CAAC;YAC5B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC;QAC3F,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;IACzD,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,SAAS,EAAE,CAAC;AACjD,CAAC"}

package/dist/middlewares/rate-limit/index.d.ts

@@ -3,7 +3,7 @@ export type { RouteRateLimiterContext } from './rate-limit.middleware';
 export { RateLimit, readRateLimitOptions } from './rate-limit.decorator';
 export { TokenBucketStore } from './token-bucket.store';
 export type { ConsumeArgs, ConsumeDualArgs, SingleResult, DualResult } from './token-bucket.store';
-export { resolveIdentifiers, setRateLimitInternalApplication, readRateLimitInternalApplication, RATE_LIMIT_INTERNAL_APPLICATION_LOCAL, } from './identifier-resolver';
+export { resolveIdentifiers, setRateLimitInternalApplication, readRateLimitInternalApplication, RATE_LIMIT_INTERNAL_APPLICATION_LOCAL, setRateLimitApiKey, readRateLimitApiKeyFingerprint, RATE_LIMIT_API_KEY_FINGERPRINT_LOCAL, } from './identifier-resolver';
 export type { ResolvedIdentifier } from './identifier-resolver';
 export { parseWindow } from './parse-window';
 export type { RateLimitWindow } from './parse-window';

package/dist/middlewares/rate-limit/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseWindow = exports.RATE_LIMIT_INTERNAL_APPLICATION_LOCAL = exports.readRateLimitInternalApplication = exports.setRateLimitInternalApplication = exports.resolveIdentifiers = exports.TokenBucketStore = exports.readRateLimitOptions = exports.RateLimit = exports.createRouteRateLimiter = void 0;
+exports.parseWindow = exports.RATE_LIMIT_API_KEY_FINGERPRINT_LOCAL = exports.readRateLimitApiKeyFingerprint = exports.setRateLimitApiKey = exports.RATE_LIMIT_INTERNAL_APPLICATION_LOCAL = exports.readRateLimitInternalApplication = exports.setRateLimitInternalApplication = exports.resolveIdentifiers = exports.TokenBucketStore = exports.readRateLimitOptions = exports.RateLimit = exports.createRouteRateLimiter = void 0;
 var rate_limit_middleware_1 = require("./rate-limit.middleware");
 Object.defineProperty(exports, "createRouteRateLimiter", { enumerable: true, get: function () { return rate_limit_middleware_1.createRouteRateLimiter; } });
 var rate_limit_decorator_1 = require("./rate-limit.decorator");
@@ -13,6 +13,9 @@ Object.defineProperty(exports, "resolveIdentifiers", { enumerable: true, get: fu
 Object.defineProperty(exports, "setRateLimitInternalApplication", { enumerable: true, get: function () { return identifier_resolver_1.setRateLimitInternalApplication; } });
 Object.defineProperty(exports, "readRateLimitInternalApplication", { enumerable: true, get: function () { return identifier_resolver_1.readRateLimitInternalApplication; } });
 Object.defineProperty(exports, "RATE_LIMIT_INTERNAL_APPLICATION_LOCAL", { enumerable: true, get: function () { return identifier_resolver_1.RATE_LIMIT_INTERNAL_APPLICATION_LOCAL; } });
+Object.defineProperty(exports, "setRateLimitApiKey", { enumerable: true, get: function () { return identifier_resolver_1.setRateLimitApiKey; } });
+Object.defineProperty(exports, "readRateLimitApiKeyFingerprint", { enumerable: true, get: function () { return identifier_resolver_1.readRateLimitApiKeyFingerprint; } });
+Object.defineProperty(exports, "RATE_LIMIT_API_KEY_FINGERPRINT_LOCAL", { enumerable: true, get: function () { return identifier_resolver_1.RATE_LIMIT_API_KEY_FINGERPRINT_LOCAL; } });
 var parse_window_1 = require("./parse-window");
 Object.defineProperty(exports, "parseWindow", { enumerable: true, get: function () { return parse_window_1.parseWindow; } });
 //# sourceMappingURL=index.js.map

package/dist/middlewares/rate-limit/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/middlewares/rate-limit/index.ts"],"names":[],"mappings":";;;AAAA,iEAAiE;AAAxD,+HAAA,sBAAsB,OAAA;AAE/B,+DAAyE;AAAhE,iHAAA,SAAS,OAAA;AAAE,4HAAA,oBAAoB,OAAA;AACxC,2DAAwD;AAA/C,sHAAA,gBAAgB,OAAA;AAEzB,6DAK+B;AAJ7B,yHAAA,kBAAkB,OAAA;AAClB,sIAAA,+BAA+B,OAAA;AAC/B,uIAAA,gCAAgC,OAAA;AAChC,4IAAA,qCAAqC,OAAA;AAGvC,+CAA6C;AAApC,2GAAA,WAAW,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/middlewares/rate-limit/index.ts"],"names":[],"mappings":";;;AAAA,iEAAiE;AAAxD,+HAAA,sBAAsB,OAAA;AAE/B,+DAAyE;AAAhE,iHAAA,SAAS,OAAA;AAAE,4HAAA,oBAAoB,OAAA;AACxC,2DAAwD;AAA/C,sHAAA,gBAAgB,OAAA;AAEzB,6DAQ+B;AAP7B,yHAAA,kBAAkB,OAAA;AAClB,sIAAA,+BAA+B,OAAA;AAC/B,uIAAA,gCAAgC,OAAA;AAChC,4IAAA,qCAAqC,OAAA;AACrC,yHAAA,kBAAkB,OAAA;AAClB,qIAAA,8BAA8B,OAAA;AAC9B,2IAAA,oCAAoC,OAAA;AAGtC,+CAA6C;AAApC,2GAAA,WAAW,OAAA"}

package/dist/types/interface/api/responses/rum-read.response.d.ts

@@ -177,7 +177,9 @@ export interface IRumLiveRoute {
     p75LcpMs: number | null;
 }
 export type IGetRumLiveRoutesResponse = IResponse<IRumLiveRoute[]>;
-export type IRumRequestListItem = Omit<IRumRequest, 'dateValue' | 'applicationId'>;
+export type IRumRequestListItem = Omit<IRumRequest, 'dateValue' | 'applicationId' | 'createdAt'> & {
+    createdAt: Date;
+};
 export interface IRumRequestPage {
     items: IRumRequestListItem[];
     nextCursor: string | null;

package/dist/types/interface/api/responses/rum-socket-messages.response.d.ts

@@ -44,6 +44,7 @@ export interface IRumSocketMessageItem {
     binaryType: RumSocketBinaryType | null;
     payload: string | null;
     json: boolean;
+    createdAt: Date;
 }
 export interface IRumSocketMessageSearchItem extends IRumSocketMessageItem {
     connectionKind: RumSocketConnectionKind | null;

package/dist/types/interface/api/type-message/keyset-paginate.d.ts

@@ -11,4 +11,5 @@ export interface KeysetPaginate<T> {
 }
 export interface ApplicationLogKeysetPaginate extends KeysetPaginate<IPaginatedApplicationLog> {
     rehydrationWatermark: Date | null;
+    estimatedTotalCapped: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abyss-project/monitor",
-  "version": "14.0.0",
+  "version": "15.0.0",
   "description": "Core package to interact with Abyss-Monitor",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",