@promster/hapi 6.1.0 → 7.0.0

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

@@ -1,6 +1,6 @@
-import type { TPromsterOptions } from '@promster/types';
-import type { Server } from '@hapi/hapi';
-import { createPlugin, getRequestRecorder, signalIsUp, signalIsNotUp } from './plugin';
-import { getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers } from '@promster/metrics';
-declare const instrument: (server: Server, options: TPromsterOptions) => Promise<void>;
-export { createPlugin, getRequestRecorder, signalIsUp, signalIsNotUp, getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers, instrument, };
+import type { TPromsterOptions } from '@promster/types';
+import type { Server } from '@hapi/hapi';
+import { createPlugin, getRequestRecorder, signalIsUp, signalIsNotUp } from './plugin';
+import { getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers } from '@promster/metrics';
+declare const instrument: (server: Server, options: TPromsterOptions) => Promise<void>;
+export { createPlugin, getRequestRecorder, signalIsUp, signalIsNotUp, getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers, instrument, };

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

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

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

@@ -1,12 +1,12 @@
-import type { TPromsterOptions } from '@promster/types';
-import type { TRequestRecorder } from '@promster/metrics';
-import type { Plugin } from '@hapi/hapi';
-declare const getRequestRecorder: () => TRequestRecorder;
-declare const signalIsUp: () => void;
-declare const signalIsNotUp: () => void;
-declare const getAreServerEventsSupported: (actualVersion: string) => boolean;
-declare const getDoesResponseNeedInvocation: (actualVersion: string) => boolean;
-declare const createPlugin: ({ options: pluginOptions, }?: {
-    options?: TPromsterOptions;
-}) => Plugin<unknown>;
-export { createPlugin, getRequestRecorder, signalIsUp, signalIsNotUp, getAreServerEventsSupported, getDoesResponseNeedInvocation, };
+import type { TPromsterOptions } from '@promster/types';
+import type { TRequestRecorder } from '@promster/metrics';
+import type { Plugin } from '@hapi/hapi';
+declare const getRequestRecorder: () => TRequestRecorder;
+declare const signalIsUp: () => void;
+declare const signalIsNotUp: () => void;
+declare const getAreServerEventsSupported: (actualVersion: string) => boolean;
+declare const getDoesResponseNeedInvocation: (actualVersion: string) => boolean;
+declare const createPlugin: ({ options: pluginOptions, }?: {
+    options?: TPromsterOptions;
+}) => Plugin<unknown>;
+export { createPlugin, getRequestRecorder, signalIsUp, signalIsNotUp, getAreServerEventsSupported, getDoesResponseNeedInvocation, };

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

@@ -13,7 +13,7 @@ var merge__default = /*#__PURE__*/_interopDefault(merge);
 
 var pkg = {
 	name: "@promster/hapi",
-	version: "6.1.0",
+	version: "7.0.0",
 	description: "Hapi server integrations of promster",
 	main: "dist/promster-hapi.cjs.js",
 	typings: "dist/promster-hapi.cjs.d.ts",
@@ -31,8 +31,8 @@ var pkg = {
 		access: "public"
 	},
 	engines: {
-		node: ">=12",
-		npm: ">=6.9.0"
+		node: ">=14",
+		npm: ">=6"
 	},
 	repository: {
 		type: "git",
@@ -50,26 +50,21 @@ var pkg = {
 		"prometheus"
 	],
 	dependencies: {
-		"@promster/metrics": "^7.0.0",
+		"@promster/metrics": "^8.0.0",
 		"merge-options": "3.0.4",
 		semver: "7.3.5",
 		tslib: "2.3.1"
 	},
 	devDependencies: {
 		"@hapi/boom": "9.1.4",
-		"@promster/types": "^3.1.0",
+		"@promster/types": "^3.1.5",
 		"@types/hapi__hapi": "20.0.9"
 	}
 };
 
 const extractPath = request => request.route.path.replace(/\?/g, '');
-/* eslint-disable @typescript-eslint/no-unnecessary-type-arguments */
 
-
-// eslint-disable-next-line no-undef
 const isBoomResponse = response => response.isBoom;
-/* eslint-enable @typescript-eslint/no-unnecessary-type-arguments */
-
 
 const extractStatusCode = request => {
   const {
@@ -112,17 +107,17 @@ const signalIsNotUp = () => {
   });
 };
 
-const getAreServerEventsSupported = actualVersion => Boolean(actualVersion && semver__default['default'].satisfies(actualVersion, '>= 17.0.0'));
+const getAreServerEventsSupported = actualVersion => Boolean(actualVersion && semver__default["default"].satisfies(actualVersion, '>= 17.0.0'));
 
-const getDoesResponseNeedInvocation = actualVersion => Boolean(actualVersion && semver__default['default'].satisfies(actualVersion, '< 17.0.0'));
+const getDoesResponseNeedInvocation = actualVersion => Boolean(actualVersion && semver__default["default"].satisfies(actualVersion, '< 17.0.0'));
 
 const createPlugin = ({
   options: pluginOptions
 } = {
   options: undefined
 }) => {
-  const defaultedOptions = merge__default['default'](metrics.createMetricTypes.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.defaultNormalizers, pluginOptions);
-  const shouldSkipMetricsByEnvironment = defaultedOptions.detectKubernetes === true && !metrics.isRunningInKubernetes();
+  const defaultedOptions = merge__default["default"](metrics.createMetricTypes.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.defaultNormalizers, pluginOptions);
+  const shouldSkipMetricsByEnvironment = defaultedOptions.detectKubernetes && !metrics.isRunningInKubernetes();
   const metricTypes = metrics.createMetricTypes(defaultedOptions);
   const observeGc = metrics.createGcObserver(metricTypes);
   recordRequest = metrics.createRequestRecorder(metricTypes, defaultedOptions);
@@ -150,16 +145,16 @@ const createPlugin = ({
       };
 
       const onResponseHandler = (request, response) => {
-        var _defaultedOptions$get, _defaultedOptions$ski;
+        var _defaultedOptions$get, _request$headers$cont, _request$headers, _request$response$hea, _request$response, _request$response$hea2, _defaultedOptions$ski;
 
         const labels = Object.assign({}, {
           path: defaultedOptions.normalizePath(extractPath(request)),
           method: defaultedOptions.normalizeMethod(request.method),
           status_code: defaultedOptions.normalizeStatusCode(extractStatusCode(request))
         }, (_defaultedOptions$get = defaultedOptions.getLabelValues) === null || _defaultedOptions$get === void 0 ? void 0 : _defaultedOptions$get.call(defaultedOptions, request, {}));
-        const requestContentLength = Number(request.headers['content-length']);
+        const requestContentLength = Number((_request$headers$cont = request === null || request === void 0 ? void 0 : (_request$headers = request.headers) === null || _request$headers === void 0 ? void 0 : _request$headers['content-length']) !== null && _request$headers$cont !== void 0 ? _request$headers$cont : 0);
         const responseContentLength = Number( // @ts-expect-error
-        request.response.headers['content-length']);
+        (_request$response$hea = request === null || request === void 0 ? void 0 : (_request$response = request.response) === null || _request$response === void 0 ? void 0 : (_request$response$hea2 = _request$response.headers) === null || _request$response$hea2 === void 0 ? void 0 : _request$response$hea2['content-length']) !== null && _request$response$hea !== void 0 ? _request$response$hea : 0);
         const shouldSkipByRequest = (_defaultedOptions$ski = defaultedOptions.skip) === null || _defaultedOptions$ski === void 0 ? void 0 : _defaultedOptions$ski.call(defaultedOptions, request, response, labels);
 
         if (!shouldSkipByRequest && !shouldSkipMetricsByEnvironment) {
@@ -171,7 +166,7 @@ const createPlugin = ({
         }
 
         if (doesResponseNeedInvocation) response.continue();
-      }; // NOTE: This version detection allows us to graceully support both new and old Hapi APIs.
+      }; // NOTE: This version detection allows us to gracefully support both new and old Hapi APIs.
       // This is very hard to type as we would have to import two aliased versions of types.
 
 
@@ -209,33 +204,23 @@ const instrument = async (server, options) => server.register(createPlugin({
 
 Object.defineProperty(exports, 'Prometheus', {
   enumerable: true,
-  get: function () {
-    return metrics.Prometheus;
-  }
+  get: function () { return metrics.Prometheus; }
 });
 Object.defineProperty(exports, 'defaultNormalizers', {
   enumerable: true,
-  get: function () {
-    return metrics.defaultNormalizers;
-  }
+  get: function () { return metrics.defaultNormalizers; }
 });
 Object.defineProperty(exports, 'defaultRegister', {
   enumerable: true,
-  get: function () {
-    return metrics.defaultRegister;
-  }
+  get: function () { return metrics.defaultRegister; }
 });
 Object.defineProperty(exports, 'getContentType', {
   enumerable: true,
-  get: function () {
-    return metrics.getContentType;
-  }
+  get: function () { return metrics.getContentType; }
 });
 Object.defineProperty(exports, 'getSummary', {
   enumerable: true,
-  get: function () {
-    return metrics.getSummary;
-  }
+  get: function () { return metrics.getSummary; }
 });
 exports.createPlugin = createPlugin;
 exports.getRequestRecorder = getRequestRecorder;

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

@@ -13,7 +13,7 @@ var merge__default = /*#__PURE__*/_interopDefault(merge);
 
 var pkg = {
 	name: "@promster/hapi",
-	version: "6.1.0",
+	version: "7.0.0",
 	description: "Hapi server integrations of promster",
 	main: "dist/promster-hapi.cjs.js",
 	typings: "dist/promster-hapi.cjs.d.ts",
@@ -31,8 +31,8 @@ var pkg = {
 		access: "public"
 	},
 	engines: {
-		node: ">=12",
-		npm: ">=6.9.0"
+		node: ">=14",
+		npm: ">=6"
 	},
 	repository: {
 		type: "git",
@@ -50,26 +50,21 @@ var pkg = {
 		"prometheus"
 	],
 	dependencies: {
-		"@promster/metrics": "^7.0.0",
+		"@promster/metrics": "^8.0.0",
 		"merge-options": "3.0.4",
 		semver: "7.3.5",
 		tslib: "2.3.1"
 	},
 	devDependencies: {
 		"@hapi/boom": "9.1.4",
-		"@promster/types": "^3.1.0",
+		"@promster/types": "^3.1.5",
 		"@types/hapi__hapi": "20.0.9"
 	}
 };
 
 const extractPath = request => request.route.path.replace(/\?/g, '');
-/* eslint-disable @typescript-eslint/no-unnecessary-type-arguments */
 
-
-// eslint-disable-next-line no-undef
 const isBoomResponse = response => response.isBoom;
-/* eslint-enable @typescript-eslint/no-unnecessary-type-arguments */
-
 
 const extractStatusCode = request => {
   const {
@@ -112,17 +107,17 @@ const signalIsNotUp = () => {
   });
 };
 
-const getAreServerEventsSupported = actualVersion => Boolean(actualVersion && semver__default['default'].satisfies(actualVersion, '>= 17.0.0'));
+const getAreServerEventsSupported = actualVersion => Boolean(actualVersion && semver__default["default"].satisfies(actualVersion, '>= 17.0.0'));
 
-const getDoesResponseNeedInvocation = actualVersion => Boolean(actualVersion && semver__default['default'].satisfies(actualVersion, '< 17.0.0'));
+const getDoesResponseNeedInvocation = actualVersion => Boolean(actualVersion && semver__default["default"].satisfies(actualVersion, '< 17.0.0'));
 
 const createPlugin = ({
   options: pluginOptions
 } = {
   options: undefined
 }) => {
-  const defaultedOptions = merge__default['default'](metrics.createMetricTypes.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.defaultNormalizers, pluginOptions);
-  const shouldSkipMetricsByEnvironment = defaultedOptions.detectKubernetes === true && !metrics.isRunningInKubernetes();
+  const defaultedOptions = merge__default["default"](metrics.createMetricTypes.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.defaultNormalizers, pluginOptions);
+  const shouldSkipMetricsByEnvironment = defaultedOptions.detectKubernetes && !metrics.isRunningInKubernetes();
   const metricTypes = metrics.createMetricTypes(defaultedOptions);
   const observeGc = metrics.createGcObserver(metricTypes);
   recordRequest = metrics.createRequestRecorder(metricTypes, defaultedOptions);
@@ -150,16 +145,16 @@ const createPlugin = ({
       };
 
       const onResponseHandler = (request, response) => {
-        var _defaultedOptions$get, _defaultedOptions$ski;
+        var _defaultedOptions$get, _request$headers$cont, _request$headers, _request$response$hea, _request$response, _request$response$hea2, _defaultedOptions$ski;
 
         const labels = Object.assign({}, {
           path: defaultedOptions.normalizePath(extractPath(request)),
           method: defaultedOptions.normalizeMethod(request.method),
           status_code: defaultedOptions.normalizeStatusCode(extractStatusCode(request))
         }, (_defaultedOptions$get = defaultedOptions.getLabelValues) === null || _defaultedOptions$get === void 0 ? void 0 : _defaultedOptions$get.call(defaultedOptions, request, {}));
-        const requestContentLength = Number(request.headers['content-length']);
+        const requestContentLength = Number((_request$headers$cont = request === null || request === void 0 ? void 0 : (_request$headers = request.headers) === null || _request$headers === void 0 ? void 0 : _request$headers['content-length']) !== null && _request$headers$cont !== void 0 ? _request$headers$cont : 0);
         const responseContentLength = Number( // @ts-expect-error
-        request.response.headers['content-length']);
+        (_request$response$hea = request === null || request === void 0 ? void 0 : (_request$response = request.response) === null || _request$response === void 0 ? void 0 : (_request$response$hea2 = _request$response.headers) === null || _request$response$hea2 === void 0 ? void 0 : _request$response$hea2['content-length']) !== null && _request$response$hea !== void 0 ? _request$response$hea : 0);
         const shouldSkipByRequest = (_defaultedOptions$ski = defaultedOptions.skip) === null || _defaultedOptions$ski === void 0 ? void 0 : _defaultedOptions$ski.call(defaultedOptions, request, response, labels);
 
         if (!shouldSkipByRequest && !shouldSkipMetricsByEnvironment) {
@@ -171,7 +166,7 @@ const createPlugin = ({
         }
 
         if (doesResponseNeedInvocation) response.continue();
-      }; // NOTE: This version detection allows us to graceully support both new and old Hapi APIs.
+      }; // NOTE: This version detection allows us to gracefully support both new and old Hapi APIs.
       // This is very hard to type as we would have to import two aliased versions of types.
 
 
@@ -209,33 +204,23 @@ const instrument = async (server, options) => server.register(createPlugin({
 
 Object.defineProperty(exports, 'Prometheus', {
   enumerable: true,
-  get: function () {
-    return metrics.Prometheus;
-  }
+  get: function () { return metrics.Prometheus; }
 });
 Object.defineProperty(exports, 'defaultNormalizers', {
   enumerable: true,
-  get: function () {
-    return metrics.defaultNormalizers;
-  }
+  get: function () { return metrics.defaultNormalizers; }
 });
 Object.defineProperty(exports, 'defaultRegister', {
   enumerable: true,
-  get: function () {
-    return metrics.defaultRegister;
-  }
+  get: function () { return metrics.defaultRegister; }
 });
 Object.defineProperty(exports, 'getContentType', {
   enumerable: true,
-  get: function () {
-    return metrics.getContentType;
-  }
+  get: function () { return metrics.getContentType; }
 });
 Object.defineProperty(exports, 'getSummary', {
   enumerable: true,
-  get: function () {
-    return metrics.getSummary;
-  }
+  get: function () { return metrics.getSummary; }
 });
 exports.createPlugin = createPlugin;
 exports.getRequestRecorder = getRequestRecorder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promster/hapi",
-  "version": "6.1.0",
+  "version": "7.0.0",
   "description": "Hapi server integrations of promster",
   "main": "dist/promster-hapi.cjs.js",
   "typings": "dist/promster-hapi.cjs.d.ts",
@@ -17,8 +17,8 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=12",
-    "npm": ">=6.9.0"
+    "node": ">=14",
+    "npm": ">=6"
   },
   "repository": {
     "type": "git",
@@ -36,14 +36,14 @@
     "prometheus"
   ],
   "dependencies": {
-    "@promster/metrics": "^7.0.0",
+    "@promster/metrics": "^8.0.0",
     "merge-options": "3.0.4",
     "semver": "7.3.5",
     "tslib": "2.3.1"
   },
   "devDependencies": {
     "@hapi/boom": "9.1.4",
-    "@promster/types": "^3.1.0",
+    "@promster/types": "^3.1.5",
     "@types/hapi__hapi": "20.0.9"
   }
 }

package/dist/declarations/package.d.ts

@@ -1,38 +0,0 @@
-export const name: string;
-export const version: string;
-export const description: string;
-export const main: string;
-export const typings: string;
-export const types: string;
-export const scripts: {};
-export const files: string[];
-export namespace publishConfig {
-    const access: string;
-}
-export namespace engines {
-    const node: string;
-    const npm: string;
-}
-export namespace repository {
-    const type: string;
-    const url: string;
-}
-export const author: string;
-export const license: string;
-export namespace bugs {
-    const url_1: string;
-    export { url_1 as url };
-}
-export const homepage: string;
-export const keywords: string[];
-export const dependencies: {
-    "@promster/metrics": string;
-    "merge-options": string;
-    semver: string;
-    tslib: string;
-};
-export const devDependencies: {
-    "@hapi/boom": string;
-    "@promster/types": string;
-    "@types/hapi__hapi": string;
-};