@promster/hapi 8.0.5 → 9.0.0

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

@@ -2,5 +2,5 @@ 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, timing } from '@promster/metrics';
-declare const instrument: (server: Server, options: TPromsterOptions) => Promise<void>;
+declare const instrument: (server: Server, options: TPromsterOptions) => Promise<Server<import("@hapi/hapi").ServerApplicationState> & void>;
 export { createPlugin, getRequestRecorder, signalIsUp, signalIsNotUp, getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers, instrument, timing, };

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

@@ -8,5 +8,5 @@ declare const getAreServerEventsSupported: (actualVersion: string) => boolean;
 declare const getDoesResponseNeedInvocation: (actualVersion: string) => boolean;
 declare const createPlugin: ({ options: pluginOptions, }?: {
     options?: TPromsterOptions;
-}) => Plugin<unknown>;
+}) => Plugin<unknown, void>;
 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: "8.0.5",
+	version: "9.0.0",
 	description: "Hapi server integrations of promster",
 	main: "dist/promster-hapi.cjs.js",
 	typings: "dist/promster-hapi.cjs.d.ts",
@@ -29,8 +29,8 @@ var pkg = {
 		access: "public"
 	},
 	engines: {
-		node: ">=14",
-		npm: ">=6"
+		node: ">=16",
+		npm: ">=8"
 	},
 	repository: {
 		type: "git",
@@ -49,69 +49,58 @@ var pkg = {
 		"prometheus"
 	],
 	dependencies: {
-		"@promster/metrics": "^9.1.5",
+		"@promster/metrics": "^10.0.0",
 		"merge-options": "3.0.4",
-		semver: "7.3.5",
-		tslib: "2.3.1"
+		semver: "7.5.4",
+		tslib: "2.4.1"
 	},
 	devDependencies: {
-		"@hapi/boom": "9.1.4",
-		"@hapi/hapi": "20.2.1",
-		"@promster/types": "^3.2.4",
-		"@types/hapi__hapi": "20.0.10",
-		"parse-prometheus-text-format": "1.1.1"
+		"@hapi/boom": "10.0.1",
+		"@hapi/hapi": "21.3.2",
+		"@promster/types": "^4.0.0",
+		"@types/hapi__hapi": "20.0.13",
+		"parse-prometheus-text-format": "1.1.1",
+		"@promster/server": "workspace:*"
 	}
 };
 
-const extractPath = request => request.route.path.replace(/\?/g, '');
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 
+const extractPath = request => request.route.path.replace(/\?/g, '');
 const isBoomResponse = response => response.isBoom;
-
 const extractStatusCode = request => {
   const {
     response
   } = request;
-
   if (!response) {
     return 0;
   }
-
   if (isBoomResponse(response)) {
     return response.output.statusCode;
   }
-
   return response.statusCode;
 };
-
 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 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 createPlugin = ({
   options: pluginOptions
 } = {
@@ -124,31 +113,25 @@ const createPlugin = ({
   const observeGc = metrics.createGcObserver(gcMetrics, allDefaultedOptions);
   recordRequest = metrics.createRequestRecorder(httpMetrics, allDefaultedOptions);
   upMetric = gcMetrics === null || gcMetrics === void 0 ? void 0 : gcMetrics.up;
-
   if (!shouldSkipMetricsByEnvironment) {
     observeGc();
   }
-
   const plugin = {
     name: pkg.name,
     version: pkg.version,
-
     // @ts-expect-error
     register(server, _registrationOptions, onRegistrationFinished = () => null) {
       const areServerEventsSupported = getAreServerEventsSupported(server.version);
       const doesResponseNeedInvocation = getDoesResponseNeedInvocation(server.version);
-
       const onRequestHandler = (request, h) => {
         request.plugins.promster = {
           timing: metrics.timing.start()
-        }; // @ts-expect-error
-
+        };
+        // @ts-expect-error
         return doesResponseNeedInvocation ? h.continue() : h.continue;
       };
-
       const onResponseHandler = (request, response) => {
-        var _allDefaultedOptions$, _request$headers$cont, _request$headers, _request$response$hea, _request$response, _request$response$hea2, _allDefaultedOptions$2;
-
+        var _allDefaultedOptions$, _request$headers$cont, _request$headers, _request$response$hea, _request$response, _allDefaultedOptions$2;
         const labels = Object.assign({}, {
           path: allDefaultedOptions.normalizePath(extractPath(request), {
             req: request,
@@ -163,11 +146,10 @@ const createPlugin = ({
             res: response
           })
         }, (_allDefaultedOptions$ = allDefaultedOptions.getLabelValues) === null || _allDefaultedOptions$ === void 0 ? void 0 : _allDefaultedOptions$.call(allDefaultedOptions, request, {}));
-        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 requestContentLength = Number((_request$headers$cont = request === null || request === 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$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);
+        (_request$response$hea = request === null || request === void 0 || (_request$response = request.response) === null || _request$response === void 0 || (_request$response = _request$response.headers) === null || _request$response === void 0 ? void 0 : _request$response['content-length']) !== null && _request$response$hea !== void 0 ? _request$response$hea : 0);
         const shouldSkipByRequest = (_allDefaultedOptions$2 = allDefaultedOptions.skip) === null || _allDefaultedOptions$2 === void 0 ? void 0 : _allDefaultedOptions$2.call(allDefaultedOptions, request, response, labels);
-
         if (!shouldSkipByRequest && !shouldSkipMetricsByEnvironment) {
           recordRequest(request.plugins.promster.timing, {
             labels,
@@ -175,34 +157,32 @@ const createPlugin = ({
             responseContentLength
           });
         }
-
         if (doesResponseNeedInvocation) response.continue();
-      }; // 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.
-
+      };
 
+      // 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.
       if (areServerEventsSupported) {
         // @ts-expect-error
-        server.ext('onRequest', onRequestHandler); // @ts-expect-error
-
+        server.ext('onRequest', onRequestHandler);
+        // @ts-expect-error
         server.events.on('response', onResponseHandler);
       } else {
         // @ts-expect-error
-        server.ext('onRequest', onRequestHandler); // @ts-expect-error
-
+        server.ext('onRequest', onRequestHandler);
+        // @ts-expect-error
         server.ext('onPreResponse', onResponseHandler);
-      } // NOTE: The type of the server.decorate only supports a function signature,
+      }
+
+      // NOTE: The type of the server.decorate only supports a function signature,
       // even when the docs state that it can also be "other value" in the case of `server`.
       // @ts-expect-error
-
-
       server.decorate('server', 'Prometheus', metrics.Prometheus);
       server.decorate('server', 'recordRequest', recordRequest);
       return onRegistrationFinished === null || onRegistrationFinished === void 0 ? void 0 : onRegistrationFinished();
     }
-
-  }; // @ts-expect-error
-
+  };
+  // @ts-expect-error
   plugin.register.attributes = {
     pkg
   };

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

@@ -13,7 +13,7 @@ var merge__default = /*#__PURE__*/_interopDefault(merge);
 
 var pkg = {
 	name: "@promster/hapi",
-	version: "8.0.5",
+	version: "9.0.0",
 	description: "Hapi server integrations of promster",
 	main: "dist/promster-hapi.cjs.js",
 	typings: "dist/promster-hapi.cjs.d.ts",
@@ -29,8 +29,8 @@ var pkg = {
 		access: "public"
 	},
 	engines: {
-		node: ">=14",
-		npm: ">=6"
+		node: ">=16",
+		npm: ">=8"
 	},
 	repository: {
 		type: "git",
@@ -49,69 +49,58 @@ var pkg = {
 		"prometheus"
 	],
 	dependencies: {
-		"@promster/metrics": "^9.1.5",
+		"@promster/metrics": "^10.0.0",
 		"merge-options": "3.0.4",
-		semver: "7.3.5",
-		tslib: "2.3.1"
+		semver: "7.5.4",
+		tslib: "2.4.1"
 	},
 	devDependencies: {
-		"@hapi/boom": "9.1.4",
-		"@hapi/hapi": "20.2.1",
-		"@promster/types": "^3.2.4",
-		"@types/hapi__hapi": "20.0.10",
-		"parse-prometheus-text-format": "1.1.1"
+		"@hapi/boom": "10.0.1",
+		"@hapi/hapi": "21.3.2",
+		"@promster/types": "^4.0.0",
+		"@types/hapi__hapi": "20.0.13",
+		"parse-prometheus-text-format": "1.1.1",
+		"@promster/server": "workspace:*"
 	}
 };
 
-const extractPath = request => request.route.path.replace(/\?/g, '');
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 
+const extractPath = request => request.route.path.replace(/\?/g, '');
 const isBoomResponse = response => response.isBoom;
-
 const extractStatusCode = request => {
   const {
     response
   } = request;
-
   if (!response) {
     return 0;
   }
-
   if (isBoomResponse(response)) {
     return response.output.statusCode;
   }
-
   return response.statusCode;
 };
-
 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 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 createPlugin = ({
   options: pluginOptions
 } = {
@@ -124,31 +113,25 @@ const createPlugin = ({
   const observeGc = metrics.createGcObserver(gcMetrics, allDefaultedOptions);
   recordRequest = metrics.createRequestRecorder(httpMetrics, allDefaultedOptions);
   upMetric = gcMetrics === null || gcMetrics === void 0 ? void 0 : gcMetrics.up;
-
   if (!shouldSkipMetricsByEnvironment) {
     observeGc();
   }
-
   const plugin = {
     name: pkg.name,
     version: pkg.version,
-
     // @ts-expect-error
     register(server, _registrationOptions, onRegistrationFinished = () => null) {
       const areServerEventsSupported = getAreServerEventsSupported(server.version);
       const doesResponseNeedInvocation = getDoesResponseNeedInvocation(server.version);
-
       const onRequestHandler = (request, h) => {
         request.plugins.promster = {
           timing: metrics.timing.start()
-        }; // @ts-expect-error
-
+        };
+        // @ts-expect-error
         return doesResponseNeedInvocation ? h.continue() : h.continue;
       };
-
       const onResponseHandler = (request, response) => {
-        var _allDefaultedOptions$, _request$headers$cont, _request$headers, _request$response$hea, _request$response, _request$response$hea2, _allDefaultedOptions$2;
-
+        var _allDefaultedOptions$, _request$headers$cont, _request$headers, _request$response$hea, _request$response, _allDefaultedOptions$2;
         const labels = Object.assign({}, {
           path: allDefaultedOptions.normalizePath(extractPath(request), {
             req: request,
@@ -163,11 +146,10 @@ const createPlugin = ({
             res: response
           })
         }, (_allDefaultedOptions$ = allDefaultedOptions.getLabelValues) === null || _allDefaultedOptions$ === void 0 ? void 0 : _allDefaultedOptions$.call(allDefaultedOptions, request, {}));
-        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 requestContentLength = Number((_request$headers$cont = request === null || request === 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$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);
+        (_request$response$hea = request === null || request === void 0 || (_request$response = request.response) === null || _request$response === void 0 || (_request$response = _request$response.headers) === null || _request$response === void 0 ? void 0 : _request$response['content-length']) !== null && _request$response$hea !== void 0 ? _request$response$hea : 0);
         const shouldSkipByRequest = (_allDefaultedOptions$2 = allDefaultedOptions.skip) === null || _allDefaultedOptions$2 === void 0 ? void 0 : _allDefaultedOptions$2.call(allDefaultedOptions, request, response, labels);
-
         if (!shouldSkipByRequest && !shouldSkipMetricsByEnvironment) {
           recordRequest(request.plugins.promster.timing, {
             labels,
@@ -175,34 +157,32 @@ const createPlugin = ({
             responseContentLength
           });
         }
-
         if (doesResponseNeedInvocation) response.continue();
-      }; // 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.
-
+      };
 
+      // 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.
       if (areServerEventsSupported) {
         // @ts-expect-error
-        server.ext('onRequest', onRequestHandler); // @ts-expect-error
-
+        server.ext('onRequest', onRequestHandler);
+        // @ts-expect-error
         server.events.on('response', onResponseHandler);
       } else {
         // @ts-expect-error
-        server.ext('onRequest', onRequestHandler); // @ts-expect-error
-
+        server.ext('onRequest', onRequestHandler);
+        // @ts-expect-error
         server.ext('onPreResponse', onResponseHandler);
-      } // NOTE: The type of the server.decorate only supports a function signature,
+      }
+
+      // NOTE: The type of the server.decorate only supports a function signature,
       // even when the docs state that it can also be "other value" in the case of `server`.
       // @ts-expect-error
-
-
       server.decorate('server', 'Prometheus', metrics.Prometheus);
       server.decorate('server', 'recordRequest', recordRequest);
       return onRegistrationFinished === null || onRegistrationFinished === void 0 ? void 0 : onRegistrationFinished();
     }
-
-  }; // @ts-expect-error
-
+  };
+  // @ts-expect-error
   plugin.register.attributes = {
     pkg
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promster/hapi",
-  "version": "8.0.5",
+  "version": "9.0.0",
   "description": "Hapi server integrations of promster",
   "main": "dist/promster-hapi.cjs.js",
   "typings": "dist/promster-hapi.cjs.d.ts",
@@ -16,8 +16,8 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=14",
-    "npm": ">=6"
+    "node": ">=16",
+    "npm": ">=8"
   },
   "repository": {
     "type": "git",
@@ -36,16 +36,17 @@
     "prometheus"
   ],
   "dependencies": {
-    "@promster/metrics": "^9.1.5",
+    "@promster/metrics": "^10.0.0",
     "merge-options": "3.0.4",
-    "semver": "7.3.5",
-    "tslib": "2.3.1"
+    "semver": "7.5.4",
+    "tslib": "2.4.1"
   },
   "devDependencies": {
-    "@hapi/boom": "9.1.4",
-    "@hapi/hapi": "20.2.1",
-    "@promster/types": "^3.2.4",
-    "@types/hapi__hapi": "20.0.10",
-    "parse-prometheus-text-format": "1.1.1"
+    "@hapi/boom": "10.0.1",
+    "@hapi/hapi": "21.3.2",
+    "@promster/types": "^4.0.0",
+    "@types/hapi__hapi": "20.0.13",
+    "parse-prometheus-text-format": "1.1.1",
+    "@promster/server": "8.0.0"
   }
-}
+}