@promster/express 4.1.15 → 5.0.3

package/CHANGELOG.md

@@ -1,5 +1,60 @@
 # @promster/express
 
+## 5.0.3
+
+### Patch Changes
+
+- [#620](https://github.com/tdeekens/promster/pull/620) [`ec2a8f8`](https://github.com/tdeekens/promster/commit/ec2a8f83a94bbe63360cf7027eeba92895315a19) Thanks [@tdeekens](https://github.com/tdeekens)! - refactor: improve typings (not exposed part)
+
+* [#618](https://github.com/tdeekens/promster/pull/618) [`bbab9ca`](https://github.com/tdeekens/promster/commit/bbab9cad6a3484e4894d159267d62e54e202812a) Thanks [@tdeekens](https://github.com/tdeekens)! - chore: update deps
+
+* Updated dependencies [[`ec2a8f8`](https://github.com/tdeekens/promster/commit/ec2a8f83a94bbe63360cf7027eeba92895315a19), [`bbab9ca`](https://github.com/tdeekens/promster/commit/bbab9cad6a3484e4894d159267d62e54e202812a)]:
+  - @promster/metrics@6.0.2
+
+## 5.0.2
+
+### Patch Changes
+
+- [#601](https://github.com/tdeekens/promster/pull/601) [`17a24dc`](https://github.com/tdeekens/promster/commit/17a24dc0d735478001524c853b9f54f862153852) Thanks [@tdeekens](https://github.com/tdeekens)! - Update dependencies and apply eslint rule suggestions.
+
+- Updated dependencies [[`17a24dc`](https://github.com/tdeekens/promster/commit/17a24dc0d735478001524c853b9f54f862153852)]:
+  - @promster/metrics@6.0.1
+
+## 5.0.1
+
+### Patch Changes
+
+- Updated dependencies [[`daf8605`](https://github.com/tdeekens/promster/commit/daf86055e64cb420c83dbc7abbcd5024d449c53f)]:
+  - @promster/metrics@6.0.0
+
+## 5.0.0
+
+### Major Changes
+
+- [`0eb64ca`](https://github.com/tdeekens/promster/commit/0eb64cac9a4a51dab1a556f46c97a2a5542bcc88) [#529](https://github.com/tdeekens/promster/pull/529) Thanks [@tdeekens](https://github.com/tdeekens)! - # Introduction
+
+  refactor: to use preconstruct for building
+
+  Prior TypeScript was used to build bundles. In all this should not affect consumers of this library. Under the hood preconstruct uses rollup and babel which is now instructed to build for Node.js v12 using the preset-env preset.
+
+  # Breaking Change
+
+  This release can _potentially_ be breaking for you. We want to respect semantic versioning and follow it strictly.
+
+  While migrating to preconstruct the `version` exports had to be removed as preconstruct's rollup will not resolve them. If you relied on this value you should either load the `package.json` of each module yourself or drop the usage.
+
+  ```diff
+  - const { version } = require('@promster/server');
+  + const { version } = require('@promster/server/package.json');
+  ```
+
+### Patch Changes
+
+- [`bdf75de`](https://github.com/tdeekens/promster/commit/bdf75dec8d0ce6be65ecccf5963f348e1a0a96b3) [#531](https://github.com/tdeekens/promster/pull/531) Thanks [@tdeekens](https://github.com/tdeekens)! - fix: update dependencies
+
+- Updated dependencies [[`bdf75de`](https://github.com/tdeekens/promster/commit/bdf75dec8d0ce6be65ecccf5963f348e1a0a96b3), [`0eb64ca`](https://github.com/tdeekens/promster/commit/0eb64cac9a4a51dab1a556f46c97a2a5542bcc88)]:
+  - @promster/metrics@5.0.0
+
 ## 4.1.15
 
 ### Patch Changes

package/dist/{modules → declarations/src}/index.d.ts

@@ -1,4 +1,3 @@
-import { version } from '../package.json';
-import { createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp } from './middleware';
-import { getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers } from '@promster/metrics';
-export { version, createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp, getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers, };
+import { createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp } from './middleware';
+import { getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers } from '@promster/metrics';
+export { createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp, getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers, };

package/dist/{modules → declarations/src}/middleware/index.d.ts

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

package/dist/{modules → declarations/src}/middleware/middleware.d.ts

@@ -1,23 +1,23 @@
-import type { TPromsterOptions } from '@promster/types';
-import type { TRequestRecorder } from '@promster/metrics';
-import { Application, Request, Response, NextFunction } from 'express';
-import { Prometheus } from '@promster/metrics';
-interface TApp extends Application {
-    locals: Record<string, unknown>;
-}
-declare type TLocaleTarget = {
-    app?: TApp;
-    key: string;
-    value: typeof Prometheus | TRequestRecorder;
-};
-declare const exposeOnLocals: ({ app, key, value }: TLocaleTarget) => void;
-declare const extractPath: (req: Request) => string;
-declare const getRequestRecorder: () => TRequestRecorder;
-declare const signalIsUp: () => void;
-declare const signalIsNotUp: () => void;
-declare type TMiddlewareOptions = {
-    app?: TApp;
-    options?: TPromsterOptions;
-};
-declare const createMiddleware: ({ app, options }?: TMiddlewareOptions) => (request: Request, response: Response, next: NextFunction) => void;
-export { createMiddleware, exposeOnLocals, extractPath, getRequestRecorder, signalIsUp, signalIsNotUp, };
+import type { TPromsterOptions } from '@promster/types';
+import type { TRequestRecorder } from '@promster/metrics';
+import { Application, Request, Response, NextFunction } from 'express';
+import { Prometheus } from '@promster/metrics';
+interface TApp extends Application {
+    locals: Record<string, unknown>;
+}
+declare type TLocaleTarget = {
+    app?: TApp;
+    key: string;
+    value: typeof Prometheus | TRequestRecorder;
+};
+declare const exposeOnLocals: ({ app, key, value }: TLocaleTarget) => void;
+declare const extractPath: (req: Request) => string;
+declare const getRequestRecorder: () => TRequestRecorder;
+declare const signalIsUp: () => void;
+declare const signalIsNotUp: () => void;
+declare type TMiddlewareOptions = {
+    app?: TApp;
+    options?: TPromsterOptions;
+};
+declare const createMiddleware: ({ app, options }?: TMiddlewareOptions) => (request: Request, response: Response, next: NextFunction) => void;
+export { createMiddleware, exposeOnLocals, extractPath, getRequestRecorder, signalIsUp, signalIsNotUp, };

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

@@ -0,0 +1 @@
+export * from "./declarations/src/index";

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

@@ -0,0 +1,139 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var merge = require('merge-options');
+var metrics = require('@promster/metrics');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
+
+var merge__default = /*#__PURE__*/_interopDefault(merge);
+
+const exposeOnLocals = ({
+  app,
+  key,
+  value
+}) => {
+  if (app !== null && app !== void 0 && app.locals) app.locals[key] = value;
+};
+
+const extractPath = req => req.originalUrl || req.url;
+
+let recordRequest;
+let upMetric;
+
+const getRequestRecorder = () => recordRequest;
+
+const signalIsUp = () => {
+  if (!upMetric) {
+    return;
+  }
+
+  upMetric.forEach(upMetricType => {
+    upMetricType.set(1);
+  });
+};
+
+const signalIsNotUp = () => {
+  if (!upMetric) {
+    return;
+  }
+
+  upMetric.forEach(upMetricType => {
+    upMetricType.set(0);
+  });
+};
+
+const createMiddleware = ({
+  app,
+  options
+} = {
+  app: undefined,
+  options: undefined
+}) => {
+  const allDefaultedOptions = merge__default['default'](metrics.createMetricTypes.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.defaultNormalizers, options);
+  const shouldSkipMetricsByEnvironment = allDefaultedOptions.detectKubernetes === true && !metrics.isRunningInKubernetes();
+  const metricTypes = metrics.createMetricTypes(allDefaultedOptions);
+  const observeGc = metrics.createGcObserver(metricTypes);
+  recordRequest = metrics.createRequestRecorder(metricTypes, allDefaultedOptions);
+  upMetric = metricTypes === null || metricTypes === void 0 ? void 0 : metricTypes.up;
+  exposeOnLocals({
+    app,
+    key: 'Prometheus',
+    value: metrics.Prometheus
+  });
+  exposeOnLocals({
+    app,
+    key: 'recordRequest',
+    value: recordRequest
+  });
+
+  if (!shouldSkipMetricsByEnvironment) {
+    observeGc();
+  }
+
+  return (request, response, next) => {
+    const start = process.hrtime();
+    response.on('finish', () => {
+      var _allDefaultedOptions$, _allDefaultedOptions$2;
+
+      const labels = Object.assign({}, {
+        method: allDefaultedOptions.normalizeMethod(request.method, {
+          req: request,
+          res: response
+        }),
+        status_code: allDefaultedOptions.normalizeStatusCode(response.statusCode, {
+          req: request,
+          res: response
+        }),
+        path: allDefaultedOptions.normalizePath(extractPath(request), {
+          req: request,
+          res: response
+        })
+      }, (_allDefaultedOptions$ = allDefaultedOptions.getLabelValues) === null || _allDefaultedOptions$ === void 0 ? void 0 : _allDefaultedOptions$.call(allDefaultedOptions, request, response));
+      const shouldSkipByRequest = (_allDefaultedOptions$2 = allDefaultedOptions.skip) === null || _allDefaultedOptions$2 === void 0 ? void 0 : _allDefaultedOptions$2.call(allDefaultedOptions, request, response, labels);
+
+      if (!shouldSkipByRequest && !shouldSkipMetricsByEnvironment) {
+        recordRequest(start, {
+          labels
+        });
+      }
+    });
+    next();
+  };
+};
+
+Object.defineProperty(exports, 'Prometheus', {
+  enumerable: true,
+  get: function () {
+    return metrics.Prometheus;
+  }
+});
+Object.defineProperty(exports, 'defaultNormalizers', {
+  enumerable: true,
+  get: function () {
+    return metrics.defaultNormalizers;
+  }
+});
+Object.defineProperty(exports, 'defaultRegister', {
+  enumerable: true,
+  get: function () {
+    return metrics.defaultRegister;
+  }
+});
+Object.defineProperty(exports, 'getContentType', {
+  enumerable: true,
+  get: function () {
+    return metrics.getContentType;
+  }
+});
+Object.defineProperty(exports, 'getSummary', {
+  enumerable: true,
+  get: function () {
+    return metrics.getSummary;
+  }
+});
+exports.createMiddleware = createMiddleware;
+exports.getRequestRecorder = getRequestRecorder;
+exports.signalIsNotUp = signalIsNotUp;
+exports.signalIsUp = signalIsUp;

package/dist/promster-express.cjs.js

@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === "production") {
+  module.exports = require("./promster-express.cjs.prod.js");
+} else {
+  module.exports = require("./promster-express.cjs.dev.js");
+}

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

@@ -0,0 +1,139 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var merge = require('merge-options');
+var metrics = require('@promster/metrics');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
+
+var merge__default = /*#__PURE__*/_interopDefault(merge);
+
+const exposeOnLocals = ({
+  app,
+  key,
+  value
+}) => {
+  if (app !== null && app !== void 0 && app.locals) app.locals[key] = value;
+};
+
+const extractPath = req => req.originalUrl || req.url;
+
+let recordRequest;
+let upMetric;
+
+const getRequestRecorder = () => recordRequest;
+
+const signalIsUp = () => {
+  if (!upMetric) {
+    return;
+  }
+
+  upMetric.forEach(upMetricType => {
+    upMetricType.set(1);
+  });
+};
+
+const signalIsNotUp = () => {
+  if (!upMetric) {
+    return;
+  }
+
+  upMetric.forEach(upMetricType => {
+    upMetricType.set(0);
+  });
+};
+
+const createMiddleware = ({
+  app,
+  options
+} = {
+  app: undefined,
+  options: undefined
+}) => {
+  const allDefaultedOptions = merge__default['default'](metrics.createMetricTypes.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.defaultNormalizers, options);
+  const shouldSkipMetricsByEnvironment = allDefaultedOptions.detectKubernetes === true && !metrics.isRunningInKubernetes();
+  const metricTypes = metrics.createMetricTypes(allDefaultedOptions);
+  const observeGc = metrics.createGcObserver(metricTypes);
+  recordRequest = metrics.createRequestRecorder(metricTypes, allDefaultedOptions);
+  upMetric = metricTypes === null || metricTypes === void 0 ? void 0 : metricTypes.up;
+  exposeOnLocals({
+    app,
+    key: 'Prometheus',
+    value: metrics.Prometheus
+  });
+  exposeOnLocals({
+    app,
+    key: 'recordRequest',
+    value: recordRequest
+  });
+
+  if (!shouldSkipMetricsByEnvironment) {
+    observeGc();
+  }
+
+  return (request, response, next) => {
+    const start = process.hrtime();
+    response.on('finish', () => {
+      var _allDefaultedOptions$, _allDefaultedOptions$2;
+
+      const labels = Object.assign({}, {
+        method: allDefaultedOptions.normalizeMethod(request.method, {
+          req: request,
+          res: response
+        }),
+        status_code: allDefaultedOptions.normalizeStatusCode(response.statusCode, {
+          req: request,
+          res: response
+        }),
+        path: allDefaultedOptions.normalizePath(extractPath(request), {
+          req: request,
+          res: response
+        })
+      }, (_allDefaultedOptions$ = allDefaultedOptions.getLabelValues) === null || _allDefaultedOptions$ === void 0 ? void 0 : _allDefaultedOptions$.call(allDefaultedOptions, request, response));
+      const shouldSkipByRequest = (_allDefaultedOptions$2 = allDefaultedOptions.skip) === null || _allDefaultedOptions$2 === void 0 ? void 0 : _allDefaultedOptions$2.call(allDefaultedOptions, request, response, labels);
+
+      if (!shouldSkipByRequest && !shouldSkipMetricsByEnvironment) {
+        recordRequest(start, {
+          labels
+        });
+      }
+    });
+    next();
+  };
+};
+
+Object.defineProperty(exports, 'Prometheus', {
+  enumerable: true,
+  get: function () {
+    return metrics.Prometheus;
+  }
+});
+Object.defineProperty(exports, 'defaultNormalizers', {
+  enumerable: true,
+  get: function () {
+    return metrics.defaultNormalizers;
+  }
+});
+Object.defineProperty(exports, 'defaultRegister', {
+  enumerable: true,
+  get: function () {
+    return metrics.defaultRegister;
+  }
+});
+Object.defineProperty(exports, 'getContentType', {
+  enumerable: true,
+  get: function () {
+    return metrics.getContentType;
+  }
+});
+Object.defineProperty(exports, 'getSummary', {
+  enumerable: true,
+  get: function () {
+    return metrics.getSummary;
+  }
+});
+exports.createMiddleware = createMiddleware;
+exports.getRequestRecorder = getRequestRecorder;
+exports.signalIsNotUp = signalIsNotUp;
+exports.signalIsUp = signalIsUp;

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "@promster/express",
-  "version": "4.1.15",
+  "version": "5.0.3",
   "description": "Express server integrations of promster",
-  "main": "dist/modules/index.js",
-  "typings": "dist/modules/index.d.ts",
-  "scripts": {
-    "prebuild": "rimraf dist/**",
-    "build": "cross-env tsc -p tsconfig.json --outDir dist --declarationDir dist"
-  },
+  "main": "dist/promster-express.cjs.js",
+  "typings": "dist/promster-express.cjs.d.ts",
+  "types": "dist/promster-express.cjs.d.ts",
+  "scripts": {},
   "files": [
     "readme.md",
     "package.json",
@@ -38,11 +36,11 @@
     "prometheus"
   ],
   "dependencies": {
-    "@promster/metrics": "^4.1.13",
-    "merge-options": "3.0.3",
-    "tslib": "2.0.3"
+    "@promster/metrics": "^6.0.2",
+    "merge-options": "3.0.4",
+    "tslib": "2.2.0"
   },
   "devDependencies": {
-    "@types/express": "4.17.7"
+    "@types/express": "4.17.11"
   }
 }

package/dist/modules/index.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultNormalizers = exports.defaultRegister = exports.Prometheus = exports.getContentType = exports.getSummary = exports.signalIsNotUp = exports.signalIsUp = exports.getRequestRecorder = exports.createMiddleware = exports.version = void 0;
-const package_json_1 = require("../package.json");
-Object.defineProperty(exports, "version", { enumerable: true, get: function () { return package_json_1.version; } });
-const middleware_1 = require("./middleware");
-Object.defineProperty(exports, "createMiddleware", { enumerable: true, get: function () { return middleware_1.createMiddleware; } });
-Object.defineProperty(exports, "getRequestRecorder", { enumerable: true, get: function () { return middleware_1.getRequestRecorder; } });
-Object.defineProperty(exports, "signalIsUp", { enumerable: true, get: function () { return middleware_1.signalIsUp; } });
-Object.defineProperty(exports, "signalIsNotUp", { enumerable: true, get: function () { return middleware_1.signalIsNotUp; } });
-const metrics_1 = require("@promster/metrics");
-Object.defineProperty(exports, "getSummary", { enumerable: true, get: function () { return metrics_1.getSummary; } });
-Object.defineProperty(exports, "getContentType", { enumerable: true, get: function () { return metrics_1.getContentType; } });
-Object.defineProperty(exports, "Prometheus", { enumerable: true, get: function () { return metrics_1.Prometheus; } });
-Object.defineProperty(exports, "defaultRegister", { enumerable: true, get: function () { return metrics_1.defaultRegister; } });
-Object.defineProperty(exports, "defaultNormalizers", { enumerable: true, get: function () { return metrics_1.defaultNormalizers; } });
-//# sourceMappingURL=index.js.map

package/dist/modules/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../modules/index.ts"],"names":[],"mappings":";;;AAAA,kDAA0C;AAgBxC,wFAhBO,sBAAO,OAgBP;AAfT,6CAKsB;AAWpB,iGAfA,6BAAgB,OAeA;AAChB,mGAfA,+BAAkB,OAeA;AAClB,2FAfA,uBAAU,OAeA;AACV,8FAfA,0BAAa,OAeA;AAbf,+CAM2B;AAQzB,2FAbA,oBAAU,OAaA;AACV,+FAbA,wBAAc,OAaA;AACd,2FAbA,oBAAU,OAaA;AACV,gGAbA,yBAAe,OAaA;AACf,mGAbA,4BAAkB,OAaA"}

package/dist/modules/middleware/index.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRequestRecorder = exports.signalIsNotUp = exports.signalIsUp = exports.createMiddleware = void 0;
-const middleware_1 = require("./middleware");
-Object.defineProperty(exports, "createMiddleware", { enumerable: true, get: function () { return middleware_1.createMiddleware; } });
-Object.defineProperty(exports, "getRequestRecorder", { enumerable: true, get: function () { return middleware_1.getRequestRecorder; } });
-Object.defineProperty(exports, "signalIsUp", { enumerable: true, get: function () { return middleware_1.signalIsUp; } });
-Object.defineProperty(exports, "signalIsNotUp", { enumerable: true, get: function () { return middleware_1.signalIsNotUp; } });
-//# sourceMappingURL=index.js.map

package/dist/modules/middleware/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../modules/middleware/index.ts"],"names":[],"mappings":";;;AAAA,6CAKsB;AAEb,iGANP,6BAAgB,OAMO;AAA6B,mGALpD,+BAAkB,OAKoD;AAA7C,2FAJzB,uBAAU,OAIyB;AAAE,8FAHrC,0BAAa,OAGqC"}

package/dist/modules/middleware/middleware.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.signalIsNotUp = exports.signalIsUp = exports.getRequestRecorder = exports.extractPath = exports.exposeOnLocals = exports.createMiddleware = void 0;
-const tslib_1 = require("tslib");
-const merge_options_1 = tslib_1.__importDefault(require("merge-options"));
-const metrics_1 = require("@promster/metrics");
-const exposeOnLocals = ({ app, key, value }) => {
-    if (app === null || app === void 0 ? void 0 : app.locals)
-        app.locals[key] = value;
-};
-exports.exposeOnLocals = exposeOnLocals;
-const extractPath = (req) => req.originalUrl || req.url;
-exports.extractPath = extractPath;
-let recordRequest;
-let upMetric;
-const getRequestRecorder = () => recordRequest;
-exports.getRequestRecorder = getRequestRecorder;
-const signalIsUp = () => upMetric === null || upMetric === void 0 ? void 0 : upMetric.forEach((upMetricType) => upMetricType.set(1));
-exports.signalIsUp = signalIsUp;
-const signalIsNotUp = () => upMetric === null || upMetric === void 0 ? void 0 : upMetric.forEach((upMetricType) => upMetricType.set(0));
-exports.signalIsNotUp = signalIsNotUp;
-const createMiddleware = ({ app, options } = { app: undefined, options: undefined }) => {
-    const allDefaultedOptions = merge_options_1.default(metrics_1.createMetricTypes.defaultOptions, metrics_1.createRequestRecorder.defaultOptions, metrics_1.defaultNormalizers, options);
-    const shouldSkipMetricsByEnvironment = allDefaultedOptions.detectKubernetes === true && !metrics_1.isRunningInKubernetes();
-    const metricTypes = metrics_1.createMetricTypes(allDefaultedOptions);
-    const observeGc = metrics_1.createGcObserver(metricTypes);
-    recordRequest = metrics_1.createRequestRecorder(metricTypes, allDefaultedOptions);
-    upMetric = metricTypes === null || metricTypes === void 0 ? void 0 : metricTypes.up;
-    exposeOnLocals({ app, key: 'Prometheus', value: metrics_1.Prometheus });
-    exposeOnLocals({ app, key: 'recordRequest', value: recordRequest });
-    if (!shouldSkipMetricsByEnvironment) {
-        observeGc();
-    }
-    return (request, response, next) => {
-        const start = process.hrtime();
-        response.on('finish', () => {
-            var _a, _b;
-            const labels = Object.assign({}, {
-                method: allDefaultedOptions.normalizeMethod(request.method, {
-                    req: request,
-                    res: response,
-                }),
-                status_code: allDefaultedOptions.normalizeStatusCode(response.statusCode, { req: request, res: response }),
-                path: allDefaultedOptions.normalizePath(extractPath(request), {
-                    req: request,
-                    res: response,
-                }),
-            }, (_a = allDefaultedOptions.getLabelValues) === null || _a === void 0 ? void 0 : _a.call(allDefaultedOptions, request, response));
-            const shouldSkipByRequest = (_b = allDefaultedOptions.skip) === null || _b === void 0 ? void 0 : _b.call(allDefaultedOptions, request, response, labels);
-            if (!shouldSkipByRequest && !shouldSkipMetricsByEnvironment) {
-                recordRequest(start, {
-                    labels,
-                });
-            }
-        });
-        return next();
-    };
-};
-exports.createMiddleware = createMiddleware;
-//# sourceMappingURL=middleware.js.map

package/dist/modules/middleware/middleware.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../modules/middleware/middleware.ts"],"names":[],"mappings":"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"}

package/dist/package.json

@@ -1,48 +0,0 @@
-{
-    "name": "@promster/express",
-    "version": "4.1.15",
-    "description": "Express server integrations of promster",
-    "main": "dist/modules/index.js",
-    "typings": "dist/modules/index.d.ts",
-    "scripts": {
-        "prebuild": "rimraf dist/**",
-        "build": "cross-env tsc -p tsconfig.json --outDir dist --declarationDir dist"
-    },
-    "files": [
-        "readme.md",
-        "package.json",
-        "LICENSE",
-        "dist/**",
-        "modules/**"
-    ],
-    "engines": {
-        "node": ">=9",
-        "npm": ">=3"
-    },
-    "publishConfig": {
-        "access": "public"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/tdeekens/promster.git"
-    },
-    "author": "Tobias Deekens <nerd@tdeekens.name>",
-    "license": "MIT",
-    "bugs": {
-        "url": "https://github.com/tdeekens/promster/issues"
-    },
-    "homepage": "https://github.com/tdeekens/promster#readme",
-    "keywords": [
-        "metrics",
-        "continousdelivery",
-        "prometheus"
-    ],
-    "dependencies": {
-        "@promster/metrics": "^4.1.13",
-        "merge-options": "3.0.3",
-        "tslib": "2.0.3"
-    },
-    "devDependencies": {
-        "@types/express": "4.17.7"
-    }
-}

package/modules/index.ts

@@ -1,27 +0,0 @@
-import { version } from '../package.json';
-import {
-  createMiddleware,
-  getRequestRecorder,
-  signalIsUp,
-  signalIsNotUp,
-} from './middleware';
-import {
-  getSummary,
-  getContentType,
-  Prometheus,
-  defaultRegister,
-  defaultNormalizers,
-} from '@promster/metrics';
-
-export {
-  version,
-  createMiddleware,
-  getRequestRecorder,
-  signalIsUp,
-  signalIsNotUp,
-  getSummary,
-  getContentType,
-  Prometheus,
-  defaultRegister,
-  defaultNormalizers,
-};

package/modules/middleware/index.ts

@@ -1,8 +0,0 @@
-import {
-  createMiddleware,
-  getRequestRecorder,
-  signalIsUp,
-  signalIsNotUp,
-} from './middleware';
-
-export { createMiddleware, signalIsUp, signalIsNotUp, getRequestRecorder };

package/modules/middleware/middleware.spec.js

@@ -1,145 +0,0 @@
-jest.mock('@promster/metrics', () => ({
-  Prometheus: 'MockPrometheus',
-  createMetricTypes: jest.fn(),
-  createRequestRecorder: jest.fn(() => jest.fn()),
-  createGcObserver: jest.fn(() => jest.fn()),
-  defaultNormalizers: {
-    normalizePath: jest.fn((_) => _),
-    normalizeStatusCode: jest.fn((_) => _),
-    normalizeMethod: jest.fn((_) => _),
-  },
-}));
-
-const {
-  Prometheus,
-  createRequestRecorder,
-  createGcObserver,
-} = require('@promster/metrics');
-const {
-  exposeOnLocals,
-  extractPath,
-  createMiddleware,
-} = require('./middleware');
-
-describe('exposing Prometheus', () => {
-  describe('with app and locals', () => {
-    let app = { locals: {} };
-    beforeEach(() => {
-      exposeOnLocals({ app, key: 'Prometheus', value: Prometheus });
-    });
-
-    it('should expose Prometheus on app locals', () => {
-      expect(app.locals).toHaveProperty('Prometheus', 'MockPrometheus');
-    });
-  });
-
-  describe('without app and locals', () => {
-    let app = {};
-    beforeEach(() => {
-      exposeOnLocals({ app, key: 'Prometheus', value: Prometheus });
-    });
-
-    it('should not expose Prometheus on app locals', () => {
-      expect(app).not.toHaveProperty('locals');
-    });
-  });
-});
-
-describe('extracting path', () => {
-  let extractedPath;
-  describe('with original url', () => {
-    let req = { originalUrl: 'originalUrl', url: 'nextUrl' };
-
-    beforeEach(() => {
-      extractedPath = extractPath(req);
-    });
-
-    it('should extract original url', () => {
-      expect(extractedPath).toEqual(req.originalUrl);
-    });
-  });
-
-  describe('with out original url', () => {
-    let req = { url: 'nextUrl' };
-
-    beforeEach(() => {
-      extractedPath = extractPath(req);
-    });
-
-    it('should extract url', () => {
-      expect(extractedPath).toEqual(req.url);
-    });
-  });
-});
-
-describe('middleware', () => {
-  let middleware;
-  describe('when creating middleware', () => {
-    let observeGc = jest.fn();
-    let recordRequest = jest.fn();
-
-    beforeEach(() => {
-      createGcObserver.mockReturnValue(jest.fn(observeGc));
-      createRequestRecorder.mockReturnValue(jest.fn(recordRequest));
-
-      middleware = createMiddleware();
-    });
-
-    it('should start observing garbage collection', () => {
-      expect(observeGc).toHaveBeenCalled();
-    });
-
-    describe('when request starts', () => {
-      let req;
-      let res;
-      let next;
-      let onRequest = jest.fn();
-
-      beforeEach(() => {
-        req = {
-          method: 'GET',
-        };
-        next = jest.fn();
-        res = {
-          statusCode: 200,
-          url: 'foo/bar',
-          on: onRequest,
-        };
-
-        middleware(req, res, next);
-      });
-
-      it('should invoke `next` to pass the middleware', () => {
-        expect(next).toHaveBeenCalled();
-      });
-
-      it('should listen to the response to finish', () => {
-        expect(res.on).toHaveBeenCalledWith('finish', expect.any(Function));
-      });
-
-      describe('when the response finishes', () => {
-        beforeEach(() => {
-          res.on.mock.calls[res.on.mock.calls.length - 1][1]();
-        });
-
-        it('should have observed the request', () => {
-          expect(recordRequest).toHaveBeenCalled();
-        });
-
-        it('should pass labels to the observer', () => {
-          expect(recordRequest).toHaveBeenCalledWith(
-            expect.anything(),
-            expect.objectContaining({
-              labels: expect.objectContaining({
-                // eslint-disable-next-line camelcase
-                status_code: res.statusCode,
-                method: req.method,
-                path: req.url,
-              }),
-            })
-          );
-        });
-      });
-    });
-  });
-});

package/modules/middleware/middleware.ts

@@ -1,112 +0,0 @@
-import type { TPromsterOptions, TMetricTypes } from '@promster/types';
-import type { TRequestRecorder } from '@promster/metrics';
-import { Application, Request, Response, NextFunction } from 'express';
-
-import merge from 'merge-options';
-import {
-  Prometheus,
-  createMetricTypes,
-  createRequestRecorder,
-  createGcObserver,
-  defaultNormalizers,
-  isRunningInKubernetes,
-} from '@promster/metrics';
-
-interface TApp extends Application {
-  locals: Record<string, unknown>;
-}
-
-type TLocaleTarget = {
-  app?: TApp;
-  key: string;
-  value: typeof Prometheus | TRequestRecorder;
-};
-const exposeOnLocals = ({ app, key, value }: TLocaleTarget) => {
-  if (app?.locals) app.locals[key] = value;
-};
-
-const extractPath = (req: Request) => req.originalUrl || req.url;
-
-let recordRequest: TRequestRecorder;
-let upMetric: TMetricTypes['up'];
-
-const getRequestRecorder = () => recordRequest;
-const signalIsUp = () =>
-  upMetric?.forEach((upMetricType) => upMetricType.set(1));
-const signalIsNotUp = () =>
-  upMetric?.forEach((upMetricType) => upMetricType.set(0));
-
-type TMiddlewareOptions = {
-  app?: TApp;
-  options?: TPromsterOptions;
-};
-const createMiddleware = (
-  { app, options }: TMiddlewareOptions = { app: undefined, options: undefined }
-) => {
-  const allDefaultedOptions = merge(
-    createMetricTypes.defaultOptions,
-    createRequestRecorder.defaultOptions,
-    defaultNormalizers,
-    options
-  );
-
-  const shouldSkipMetricsByEnvironment =
-    allDefaultedOptions.detectKubernetes === true && !isRunningInKubernetes();
-
-  const metricTypes = createMetricTypes(allDefaultedOptions);
-  const observeGc = createGcObserver(metricTypes);
-
-  recordRequest = createRequestRecorder(metricTypes, allDefaultedOptions);
-  upMetric = metricTypes?.up;
-
-  exposeOnLocals({ app, key: 'Prometheus', value: Prometheus });
-  exposeOnLocals({ app, key: 'recordRequest', value: recordRequest });
-
-  if (!shouldSkipMetricsByEnvironment) {
-    observeGc();
-  }
-
-  return (request: Request, response: Response, next: NextFunction) => {
-    const start = process.hrtime();
-    response.on('finish', () => {
-      const labels = Object.assign(
-        {},
-        {
-          method: allDefaultedOptions.normalizeMethod(request.method, {
-            req: request,
-            res: response,
-          }),
-          status_code: allDefaultedOptions.normalizeStatusCode(
-            response.statusCode,
-            { req: request, res: response }
-          ),
-          path: allDefaultedOptions.normalizePath(extractPath(request), {
-            req: request,
-            res: response,
-          }),
-        },
-        allDefaultedOptions.getLabelValues?.(request, response)
-      );
-
-      const shouldSkipByRequest =
-        allDefaultedOptions.skip?.(request, response, labels);
-
-      if (!shouldSkipByRequest && !shouldSkipMetricsByEnvironment) {
-        recordRequest(start, {
-          labels,
-        });
-      }
-    });
-
-    return next();
-  };
-};
-
-export {
-  createMiddleware,
-  exposeOnLocals,
-  extractPath,
-  getRequestRecorder,
-  signalIsUp,
-  signalIsNotUp,
-};