@openapi-typescript-infra/service 5.15.0 → 6.1.0

package/build/types.d.ts

@@ -1,6 +1,6 @@
 import type { Server } from 'http';
 import type { REPLServer } from 'repl';
-import type { pino } from 'pino';
+import type { BaseLogger, Logger } from 'pino';
 import type { Request, Response } from 'express';
 import type { Application } from 'express-serve-static-core';
 import type { middleware } from 'express-openapi-validator';
@@ -12,7 +12,7 @@ export interface InternalLocals<SLocals extends AnyServiceLocals = ServiceLocals
     server?: Server;
     mainApp: ServiceExpress<SLocals>;
 }
-export type ServiceLogger = pino.BaseLogger & Pick<pino.Logger, 'isLevelEnabled'>;
+export type ServiceLogger = BaseLogger & Pick<Logger, 'isLevelEnabled'>;
 export interface ServiceLocals<Config extends ConfigurationSchema = ConfigurationSchema> {
     service: Service;
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-typescript-infra/service",
-  "version": "5.15.0",
+  "version": "6.1.0",
   "description": "An opinionated framework for building configuration driven services - web, api, or  ob. Uses OpenAPI, pino logging, express, confit, Typescript and vitest.",
   "exports": {
     ".": {
@@ -33,7 +33,7 @@
     "coconfig": "@openapi-typescript-infra/coconfig"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "keywords": [
     "service",
@@ -70,68 +70,68 @@
   "dependencies": {
     "@godaddy/terminus": "^4.12.1",
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/auto-instrumentations-node": "^0.60.1",
-    "@opentelemetry/exporter-prometheus": "^0.202.0",
-    "@opentelemetry/instrumentation-dns": "^0.46.0",
-    "@opentelemetry/instrumentation-express": "^0.51.0",
-    "@opentelemetry/instrumentation-generic-pool": "^0.46.0",
-    "@opentelemetry/instrumentation-graphql": "^0.50.0",
-    "@opentelemetry/instrumentation-http": "^0.202.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.50.0",
-    "@opentelemetry/instrumentation-net": "^0.46.1",
-    "@opentelemetry/instrumentation-pg": "^0.54.0",
-    "@opentelemetry/instrumentation-pino": "^0.49.0",
-    "@opentelemetry/instrumentation-undici": "^0.13.1",
-    "@opentelemetry/resource-detector-container": "^0.7.2",
-    "@opentelemetry/resource-detector-gcp": "^0.36.0",
-    "@opentelemetry/sdk-node": "^0.202.0",
-    "@opentelemetry/semantic-conventions": "^1.34.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.66.0",
+    "@opentelemetry/exporter-prometheus": "^0.207.0",
+    "@opentelemetry/instrumentation-dns": "^0.51.0",
+    "@opentelemetry/instrumentation-express": "^0.56.0",
+    "@opentelemetry/instrumentation-generic-pool": "^0.51.0",
+    "@opentelemetry/instrumentation-graphql": "^0.55.0",
+    "@opentelemetry/instrumentation-http": "^0.207.0",
+    "@opentelemetry/instrumentation-net": "^0.51.0",
+    "@opentelemetry/instrumentation-pg": "^0.60.0",
+    "@opentelemetry/instrumentation-pino": "^0.54.0",
+    "@opentelemetry/instrumentation-redis": "^0.56.0",
+    "@opentelemetry/instrumentation-undici": "^0.18.0",
+    "@opentelemetry/resource-detector-container": "^0.7.10",
+    "@opentelemetry/resource-detector-gcp": "^0.42.0",
+    "@opentelemetry/sdk-node": "^0.207.0",
+    "@opentelemetry/semantic-conventions": "^1.37.0",
     "@sesamecare-oss/confit": "^2.2.1",
     "@sesamecare-oss/opentelemetry-node-metrics": "^1.1.0",
     "ajv": "^8.17.1",
-    "clean-stack": "^5.2.0",
+    "clean-stack": "^5.3.0",
     "cookie-parser": "^1.4.7",
-    "dotenv": "^16.5.0",
+    "dotenv": "^17.2.3",
     "express": "^5.1.0",
-    "express-openapi-validator": "^5.5.7",
+    "express-openapi-validator": "^5.6.0",
     "glob": "^11.0.3",
-    "import-in-the-middle": "^1.14.2",
+    "import-in-the-middle": "^2.0.0",
     "minimist": "^1.2.8",
     "moderndash": "^4.0.0",
     "opentelemetry-resource-detector-sync-api": "^0.30.0",
-    "pino": "^9.7.0",
+    "pino": "^10.1.0",
     "read-package-up": "^11.0.0",
     "request-ip": "^3.3.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.8.1",
-    "@commitlint/config-conventional": "^19.8.1",
+    "@commitlint/cli": "^20.1.0",
+    "@commitlint/config-conventional": "^20.0.0",
     "@openapi-typescript-infra/coconfig": "^4.7.1",
     "@semantic-release/commit-analyzer": "^13.0.1",
     "@semantic-release/exec": "^7.1.0",
-    "@semantic-release/github": "^11.0.3",
-    "@semantic-release/release-notes-generator": "^14.0.3",
-    "@types/cookie-parser": "^1.4.9",
-    "@types/express": "^5.0.3",
+    "@semantic-release/github": "^12.0.1",
+    "@semantic-release/release-notes-generator": "^14.1.0",
+    "@types/cookie-parser": "^1.4.10",
+    "@types/express": "^5.0.5",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^22.15.31",
+    "@types/node": "^24.10.0",
     "@types/request-ip": "^0.0.41",
     "@types/supertest": "^6.0.3",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.46.2",
+    "@typescript-eslint/parser": "^8.46.2",
     "coconfig": "^1.6.2",
     "eslint": "^8.57.1",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-import-resolver-typescript": "^4.4.3",
-    "eslint-plugin-import": "^2.31.0",
-    "pino-pretty": "^13.0.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-import-resolver-typescript": "^4.4.4",
+    "eslint-plugin-import": "^2.32.0",
+    "pino-pretty": "^13.1.2",
     "pinst": "^3.0.0",
-    "prettier": "^3.5.3",
-    "supertest": "^7.1.1",
+    "prettier": "^3.6.2",
+    "supertest": "^7.1.4",
     "tsconfig-paths": "^4.2.0",
-    "tsx": "^4.20.3",
-    "typescript": "^5.8.3",
-    "vitest": "^3.2.3"
+    "tsx": "^4.20.6",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.6"
   },
   "resolutions": {
     "qs": "^6.11.0"

package/src/bootstrap.ts

@@ -143,3 +143,13 @@ export async function bootstrap<
   const server = argv?.nobind ? undefined : await listen(app);
   return { server, app, codepath };
 }
+
+export function bootstrapCli<
+  SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>,
+  RLocals extends RequestLocals = RequestLocals,
+>(argv?: BootstrapArguments) {
+  return bootstrap<SLocals, RLocals>({
+    nobind: true,
+    ...argv,
+  });
+}

package/src/express-app/app.ts

@@ -3,7 +3,7 @@ import http from 'http';
 import https from 'https';
 import path from 'path';
 
-import { pino } from 'pino';
+import { destination, type Logger, pino } from 'pino';
 import cookieParser from 'cookie-parser';
 import { context, metrics, trace } from '@opentelemetry/api';
 import { setupNodeMetrics } from '@sesamecare-oss/opentelemetry-node-metrics';
@@ -47,7 +47,7 @@ export async function startApp<
 >(startOptions: ServiceStartOptions<SLocals, RLocals>): Promise<ServiceExpress<SLocals>> {
   const { service, rootDirectory, codepath = 'build', name, version } = startOptions;
   const shouldPrettyPrint = isDev() && !process.env.NO_PRETTY_LOGS;
-  const destination = pino.destination({
+  const pinoDestination = destination({
     sync: isSyncLogging(),
     dest: process.env.LOG_TO_FILE || process.stdout.fd,
     minLength: process.env.LOG_BUFFER ? Number(process.env.LOG_BUFFER) : undefined,
@@ -79,7 +79,7 @@ export async function startApp<
           },
           mixin: poorMansOtlp,
         },
-        destination,
+        pinoDestination,
       )
     : pino(
         {
@@ -90,7 +90,7 @@ export async function startApp<
           },
           mixin: poorMansOtlp,
         },
-        destination,
+        pinoDestination,
       );
 
   const serviceImpl = service();
@@ -302,7 +302,7 @@ export async function shutdownApp<
   } catch (error) {
     logger.warn(error, 'Shutdown failed');
   }
-  (logger as pino.Logger).flush?.();
+  (logger as Logger).flush?.();
 }
 
 function httpServer<
@@ -368,7 +368,7 @@ export async function listen<SLocals extends AnyServiceLocals = ServiceLocals<Co
         .then(shutdownHandler || (() => Promise.resolve()))
         .then(() => logger.info('Graceful shutdown complete'))
         .catch((error) => logger.error(error, 'Error terminating tracing'))
-        .then(() => (logger as pino.Logger).flush?.());
+        .then(() => (logger as Logger).flush?.());
     },
     logger: (msg, e) => {
       logger.error(e, msg);
@@ -380,7 +380,9 @@ export async function listen<SLocals extends AnyServiceLocals = ServiceLocals<Co
       shutdownInProgress = true;
       app.locals.logger.info('Shutdown requested');
       if (app.locals.internalApp) {
-        app.locals.internalApp.locals.server?.close();
+        if (app.locals.internalApp.locals.server?.listening) {
+          app.locals.internalApp.locals.server?.close();
+        }
       }
       shutdownApp(app);
     }

package/src/telemetry/instrumentations.ts

@@ -7,7 +7,7 @@ import {
   HttpInstrumentation,
   IgnoreIncomingRequestFunction,
 } from '@opentelemetry/instrumentation-http';
-import { IORedisInstrumentation } from '@opentelemetry/instrumentation-ioredis';
+import { RedisInstrumentation } from '@opentelemetry/instrumentation-redis';
 import { NetInstrumentation } from '@opentelemetry/instrumentation-net';
 import { GraphQLInstrumentation } from '@opentelemetry/instrumentation-graphql';
 import { PgInstrumentation } from '@opentelemetry/instrumentation-pg';
@@ -20,7 +20,7 @@ const InstrumentationMap = {
   '@opentelemetry/instrumentation-graphql': GraphQLInstrumentation,
   '@opentelemetry/instrumentation-undici': UndiciInstrumentation,
   '@opentelemetry/instrumentation-generic-pool': GenericPoolInstrumentation,
-  '@opentelemetry/instrumentation-ioredis': IORedisInstrumentation,
+  '@opentelemetry/instrumentation-redis': RedisInstrumentation,
   '@opentelemetry/instrumentation-net': NetInstrumentation,
   '@opentelemetry/instrumentation-pg': PgInstrumentation,
   '@opentelemetry/instrumentation-pino': PinoInstrumentation,

package/src/types.ts

@@ -1,7 +1,7 @@
 import type { Server } from 'http';
 import type { REPLServer } from 'repl';
 
-import type { pino } from 'pino';
+import type { BaseLogger, Logger } from 'pino';
 import type { Request, Response } from 'express';
 import type { Application } from 'express-serve-static-core';
 import type { middleware } from 'express-openapi-validator';
@@ -18,7 +18,7 @@ export interface InternalLocals<
   mainApp: ServiceExpress<SLocals>;
 }
 
-export type ServiceLogger = pino.BaseLogger & Pick<pino.Logger, 'isLevelEnabled'>;
+export type ServiceLogger = BaseLogger & Pick<Logger, 'isLevelEnabled'>;
 
 // Vanilla express wants this to extend Record<string, any> but this is a mistake
 // because you lose type checking on it, even though I get that underneath it truly