@promster/express 7.0.6 → 9.0.0

package/dist/declarations/src/index.d.ts

@@ -1,3 +1,4 @@
-import { createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp } from './middleware';
+import { type TPromsterOptions, createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp } from "./middleware/index.js";
 import { getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers, timing } from '@promster/metrics';
-export { createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp, getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers, timing, };
+export { type TPromsterOptions, createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp, getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers, timing, };
+export * from '@promster/types';

package/dist/declarations/src/middleware/index.d.ts

@@ -1,2 +1,2 @@
-import { createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp } from './middleware';
-export { createMiddleware, signalIsUp, signalIsNotUp, getRequestRecorder };
+import { type TPromsterOptions, createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp } from "./middleware.js";
+export { type TPromsterOptions, createMiddleware, signalIsUp, signalIsNotUp, getRequestRecorder, };

package/dist/declarations/src/middleware/middleware.d.ts

@@ -1,6 +1,6 @@
-import type { TPromsterOptions } from '@promster/types';
-import type { TRequestRecorder } from '@promster/metrics';
-import type { Application, Request, Response, NextFunction } from 'express';
+import { type TOptionalPromsterOptions, type TLabelValues } from '@promster/types';
+import { type TRequestRecorder } from '@promster/metrics';
+import { type Application, type Request, type Response, type NextFunction } from 'express';
 import { Prometheus } from '@promster/metrics';
 interface TApp extends Application {
     locals: Record<string, unknown>;
@@ -15,6 +15,10 @@ declare const extractPath: (req: Request) => string;
 declare const getRequestRecorder: () => TRequestRecorder;
 declare const signalIsUp: () => void;
 declare const signalIsNotUp: () => void;
+type TSkipFunction = <TRequest extends Request, TResponse extends Response>(_req: TRequest, _res: TResponse, _labels: TLabelValues) => boolean;
+export type TPromsterOptions = TOptionalPromsterOptions & {
+    skip?: TSkipFunction;
+};
 type TMiddlewareOptions = {
     app?: TApp;
     options?: TPromsterOptions;

package/dist/promster-express.cjs.d.ts

@@ -1 +1,2 @@
 export * from "./declarations/src/index";
+//# sourceMappingURL=promster-express.cjs.d.ts.map

package/dist/promster-express.cjs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"promster-express.cjs.d.ts","sourceRoot":"","sources":["./declarations/src/index.d.ts"],"names":[],"mappings":"AAAA"}

package/dist/promster-express.cjs.dev.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var merge = require('merge-options');
 var metrics = require('@promster/metrics');
+var types = require('@promster/types');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -45,7 +46,9 @@ const createMiddleware = ({
   app: undefined,
   options: undefined
 }) => {
-  const allDefaultedOptions = merge__default["default"](metrics.createHttpMetrics.defaultOptions, metrics.createGcMetrics.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.createGcObserver.defaultOptions, metrics.defaultNormalizers, options);
+  const allDefaultedOptions = merge__default["default"](metrics.createHttpMetrics.defaultOptions, metrics.createGcMetrics.defaultOptions, metrics.createRequestRecorder.defaultOptions,
+  // @ts-expect-error
+  metrics.createGcObserver.defaultOptions, metrics.defaultNormalizers, options);
   const shouldSkipMetricsByEnvironment = metrics.skipMetricsInEnvironment(allDefaultedOptions);
   const httpMetrics = metrics.createHttpMetrics(allDefaultedOptions);
   const gcMetrics = metrics.createGcMetrics(allDefaultedOptions);
@@ -74,6 +77,7 @@ const createMiddleware = ({
           req: request,
           res: response
         }),
+        // eslint-disable-next-line camelcase
         status_code: allDefaultedOptions.normalizeStatusCode(response.statusCode, {
           req: request,
           res: response
@@ -126,3 +130,9 @@ exports.createMiddleware = createMiddleware;
 exports.getRequestRecorder = getRequestRecorder;
 exports.signalIsNotUp = signalIsNotUp;
 exports.signalIsUp = signalIsUp;
+Object.keys(types).forEach(function (k) {
+  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return types[k]; }
+  });
+});

package/dist/promster-express.cjs.prod.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var merge = require('merge-options');
 var metrics = require('@promster/metrics');
+var types = require('@promster/types');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -45,7 +46,9 @@ const createMiddleware = ({
   app: undefined,
   options: undefined
 }) => {
-  const allDefaultedOptions = merge__default["default"](metrics.createHttpMetrics.defaultOptions, metrics.createGcMetrics.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.createGcObserver.defaultOptions, metrics.defaultNormalizers, options);
+  const allDefaultedOptions = merge__default["default"](metrics.createHttpMetrics.defaultOptions, metrics.createGcMetrics.defaultOptions, metrics.createRequestRecorder.defaultOptions,
+  // @ts-expect-error
+  metrics.createGcObserver.defaultOptions, metrics.defaultNormalizers, options);
   const shouldSkipMetricsByEnvironment = metrics.skipMetricsInEnvironment(allDefaultedOptions);
   const httpMetrics = metrics.createHttpMetrics(allDefaultedOptions);
   const gcMetrics = metrics.createGcMetrics(allDefaultedOptions);
@@ -74,6 +77,7 @@ const createMiddleware = ({
           req: request,
           res: response
         }),
+        // eslint-disable-next-line camelcase
         status_code: allDefaultedOptions.normalizeStatusCode(response.statusCode, {
           req: request,
           res: response
@@ -126,3 +130,9 @@ exports.createMiddleware = createMiddleware;
 exports.getRequestRecorder = getRequestRecorder;
 exports.signalIsNotUp = signalIsNotUp;
 exports.signalIsUp = signalIsUp;
+Object.keys(types).forEach(function (k) {
+  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return types[k]; }
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promster/express",
-  "version": "7.0.6",
+  "version": "9.0.0",
   "description": "Express server integrations of promster",
   "main": "dist/promster-express.cjs.js",
   "typings": "dist/promster-express.cjs.d.ts",
@@ -13,8 +13,8 @@
     "modules/**"
   ],
   "engines": {
-    "node": ">=14",
-    "npm": ">=6"
+    "node": ">=16",
+    "npm": ">=8"
   },
   "publishConfig": {
     "access": "public"
@@ -36,15 +36,16 @@
     "prometheus"
   ],
   "dependencies": {
-    "@promster/metrics": "^9.1.6",
+    "@promster/metrics": "^11.0.0",
+    "@promster/types": "^5.0.0",
     "merge-options": "3.0.4",
-    "tslib": "2.4.1"
+    "tslib": "2.6.2"
   },
   "devDependencies": {
-    "@promster/server": "7.0.8",
-    "@types/express": "4.17.14",
+    "@types/express": "4.17.17",
     "express": "4.18.2",
-    "node-fetch": "2.6.7",
-    "parse-prometheus-text-format": "1.1.1"
+    "node-fetch": "2.6.11",
+    "parse-prometheus-text-format": "1.1.1",
+    "@promster/server": "9.0.0"
   }
-}
+}