@openapi-typescript-infra/service 4.27.2 → 5.0.1

package/build/express-app/route-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-loader.js","sourceRoot":"","sources":["../../src/express-app/route-loader.ts"],"names":[],"mappings":";;;;;AASA,gCA8BC;AAvCD,gDAAwB;AAExB,sDAA8B;AAK9B,uCAAsD;AAE/C,KAAK,UAAU,UAAU,CAE9B,GAA4B,EAAE,UAAkB,EAAE,OAAe;IACjE,MAAM,KAAK,GAAG,MAAM,IAAA,uBAAa,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEvD,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC3B,MAAM,SAAS,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAU,EAAC,UAAU,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;QAC/C,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE,CAAC;YAClC,MAAM,WAAW,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;YACrC,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YAC1B,MAAM,SAAS,GAAG,CAAC,EAAE,CAAC,CAAC;YACvB,IAAI,SAAS,KAAK,GAAG,EAAE,CAAC;gBACtB,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC5B,CAAC;YACD,MAAM,EAAE,GAAG,cAAI,CAAC,KAAK,CAAC,cAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;YACpD,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,OAAO,EAAE,CAAC;gBACjC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACrB,CAAC;YACD,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;YAC7C,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,oBAAoB,CAAC,CAAC;YACrF,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,kCAAkC,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"route-loader.js","sourceRoot":"","sources":["../../src/express-app/route-loader.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAKjC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,CAAC,KAAK,UAAU,UAAU,CAE9B,GAA4B,EAAE,UAAkB,EAAE,OAAe;IACjE,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEvD,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;QAC/C,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE,CAAC;YAClC,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC;YAC7B,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YAC1B,MAAM,SAAS,GAAG,CAAC,EAAE,CAAC,CAAC;YACvB,IAAI,SAAS,KAAK,GAAG,EAAE,CAAC;gBACtB,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC5B,CAAC;YACD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;YACpD,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,OAAO,EAAE,CAAC;gBACjC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACrB,CAAC;YACD,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;YAC7C,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,oBAAoB,CAAC,CAAC;YACrF,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,kCAAkC,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}

package/build/express-app/types.d.ts

@@ -1,6 +1,6 @@
 import type { NextFunction, Response } from 'express';
-import type { AnyServiceLocals, RequestLocals, RequestWithApp, ServiceLocals } from '../types';
-import { ConfigurationSchema } from '../config/schema';
+import type { AnyServiceLocals, RequestLocals, RequestWithApp, ServiceLocals } from '../types.js';
+import { ConfigurationSchema } from '../config/schema.js';
 export type ServiceHandler<SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>, RLocals extends RequestLocals = RequestLocals, ResBody = unknown, RetType = unknown> = (req: RequestWithApp<SLocals>, res: Response<ResBody, RLocals>, next: NextFunction) => RetType | Promise<RetType>;
 export interface ServiceRouter<SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>, RLocals extends RequestLocals = RequestLocals> {
     all(path: string, ...handlers: ServiceHandler<SLocals, RLocals>[]): void;

package/build/express-app/types.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=types.js.map

package/build/hook.d.ts

@@ -1,5 +1,5 @@
-import { ConfigurationSchema } from './config/schema';
-import type { AnyServiceLocals, RequestLocals, Service, ServiceLocals } from './types';
+import { ConfigurationSchema } from './config/schema.js';
+import type { AnyServiceLocals, RequestLocals, Service, ServiceLocals } from './types.js';
 /**
  * Your service should call this function and then "inherit"
  * the behavior in a functional way. So,

package/build/hook.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useService = useService;
 /**
  * Your service should call this function and then "inherit"
  * the behavior in a functional way. So,
@@ -22,7 +19,7 @@ exports.useService = useService;
  *
  * @returns Service<Config, SLocals, RLocals>
  */
-function useService(baseService) {
+export function useService(baseService) {
     return {
         async start(app) {
             await baseService?.start(app);

package/build/hook.js.map

@@ -1 +1 @@
-{"version":3,"file":"hook.js","sourceRoot":"","sources":["../src/hook.ts"],"names":[],"mappings":";;AAwBA,gCAWC;AAhCD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,SAAgB,UAAU,CAGxB,WAAuC;IACvC,OAAO;QACL,KAAK,CAAC,KAAK,CAAC,GAAG;YACb,MAAM,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9B,gEAAgE;YAChE,iDAAiD;QACnD,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"hook.js","sourceRoot":"","sources":["../src/hook.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,UAAU,CAGxB,WAAuC;IACvC,OAAO;QACL,KAAK,CAAC,KAAK,CAAC,GAAG;YACb,MAAM,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9B,gEAAgE;YAChE,iDAAiD;QACnD,CAAC;KACF,CAAC;AACJ,CAAC"}

package/build/index.d.ts

@@ -1,9 +1,9 @@
-export * from './telemetry';
-export * from './express-app';
-export * from './types';
-export * from './env';
-export * from './config';
-export * from './error';
-export * from './bootstrap';
-export * from './hook';
-export { repl$ } from './development/repl';
+export * from './telemetry/index.js';
+export * from './express-app/index.js';
+export * from './types.js';
+export * from './env.js';
+export * from './config/index.js';
+export * from './error.js';
+export * from './bootstrap.js';
+export * from './hook.js';
+export { repl$ } from './development/repl.js';

package/build/index.js

@@ -1,28 +1,10 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.repl$ = void 0;
-__exportStar(require("./telemetry"), exports);
-__exportStar(require("./express-app"), exports);
-__exportStar(require("./types"), exports);
-__exportStar(require("./env"), exports);
-__exportStar(require("./config"), exports);
-__exportStar(require("./error"), exports);
-__exportStar(require("./bootstrap"), exports);
-__exportStar(require("./hook"), exports);
-var repl_1 = require("./development/repl");
-Object.defineProperty(exports, "repl$", { enumerable: true, get: function () { return repl_1.repl$; } });
+export * from './telemetry/index.js';
+export * from './express-app/index.js';
+export * from './types.js';
+export * from './env.js';
+export * from './config/index.js';
+export * from './error.js';
+export * from './bootstrap.js';
+export * from './hook.js';
+export { repl$ } from './development/repl.js';
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,gDAA8B;AAC9B,0CAAwB;AACxB,wCAAsB;AACtB,2CAAyB;AACzB,0CAAwB;AACxB,8CAA4B;AAC5B,yCAAuB;AACvB,2CAA2C;AAAlC,6FAAA,KAAK,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC"}

package/build/openapi.d.ts

@@ -1,6 +1,6 @@
 import * as OpenApiValidator from 'express-openapi-validator';
-import type { AnyServiceLocals, ServiceExpress, ServiceLocals } from './types';
-import { ConfigurationSchema } from './config/schema';
+import type { AnyServiceLocals, ServiceExpress, ServiceLocals } from './types.js';
+import { ConfigurationSchema } from './config/schema.js';
 type OAPIOpts = Parameters<typeof OpenApiValidator.middleware>[0];
-export declare function openApi<SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>>(app: ServiceExpress<SLocals>, rootDirectory: string, codepath: string, pattern: string, openApiOptions?: Partial<OAPIOpts>): Promise<import("express-openapi-validator/dist/framework/types").OpenApiRequestHandler[]>;
+export declare function openApi<SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>>(app: ServiceExpress<SLocals>, rootDirectory: string, codepath: string, pattern: string, openApiOptions?: Partial<OAPIOpts>): Promise<import("express-openapi-validator/dist/framework/types.js").OpenApiRequestHandler[]>;
 export {};

package/build/openapi.js

@@ -1,38 +1,9 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.openApi = openApi;
-const path_1 = __importDefault(require("path"));
-const lodash_1 = __importDefault(require("lodash"));
-const OpenApiValidator = __importStar(require("express-openapi-validator"));
-const index_1 = require("express-openapi-validator/dist/framework/index");
-const env_1 = require("./env");
-const modules_1 = require("./express-app/modules");
+import path from 'path';
+import { merge } from 'moderndash';
+import * as OpenApiValidator from 'express-openapi-validator';
+import { OpenAPIFramework } from 'express-openapi-validator/dist/framework/index.js';
+import { getNodeEnv } from './env.js';
+import { getFilesInDir } from './express-app/modules.js';
 const notImplementedHandler = (req, res) => {
     res.status(501).json({
         code: 'NotImplemented',
@@ -43,16 +14,16 @@ const notImplementedHandler = (req, res) => {
 function stripExtension(filename) {
     return filename.slice(0, filename.lastIndexOf('.'));
 }
-async function openApi(app, rootDirectory, codepath, pattern, openApiOptions) {
-    const apiSpec = path_1.default.resolve(rootDirectory, `./api/${app.locals.name}.yaml`);
+export async function openApi(app, rootDirectory, codepath, pattern, openApiOptions) {
+    const apiSpec = path.resolve(rootDirectory, `./api/${app.locals.name}.yaml`);
     app.locals.logger.debug({ apiSpec, codepath }, 'Serving OpenAPI');
-    const basePath = path_1.default.resolve(rootDirectory, `${codepath}/handlers`);
+    const basePath = path.resolve(rootDirectory, `${codepath}/handlers`);
     // Because of the weirdness of ESM/CJS interop, and the synchronous nature of
     // the OpenAPI resolver, we need to preload all the modules we might need
-    const moduleFiles = await (0, modules_1.getFilesInDir)(pattern, path_1.default.resolve(rootDirectory, `${codepath}/handlers`));
+    const moduleFiles = await getFilesInDir(pattern, path.resolve(rootDirectory, `${codepath}/handlers`));
     const preloadedModules = await Promise.all(moduleFiles.map((file) => {
-        const fullPath = path_1.default.join(basePath, file);
-        return (0, modules_1.loadModule)(fullPath).catch((error) => {
+        const fullPath = path.join(basePath, file);
+        return import(fullPath).catch((error) => {
             app.locals.logger.warn({ file: fullPath, message: error.message }, 'Could not load potential API handler');
             return undefined;
         });
@@ -72,7 +43,7 @@ async function openApi(app, rootDirectory, codepath, pattern, openApiOptions) {
         delete global.window;
     }
     try {
-        app.locals.openApiSpecification = await new index_1.OpenAPIFramework({ apiDoc: apiSpec })
+        app.locals.openApiSpecification = await new OpenAPIFramework({ apiDoc: apiSpec })
             .initialize({ visitApi() { } })
             .then((docs) => docs.apiDoc)
             .catch((error) => {
@@ -89,7 +60,7 @@ async function openApi(app, rootDirectory, codepath, pattern, openApiOptions) {
                 basePath,
                 resolver(basePath, route) {
                     const pathKey = route.openApiRoute.substring(route.basePath.length);
-                    const modulePath = path_1.default.join(basePath, pathKey);
+                    const modulePath = path.join(basePath, pathKey);
                     try {
                         const module = modulesByPath[pathKey];
                         const method = module
@@ -104,7 +75,7 @@ async function openApi(app, rootDirectory, codepath, pattern, openApiOptions) {
                         app.locals.logger.error({
                             error: error.message,
                             pathKey,
-                            modulePath: path_1.default.relative(rootDirectory, modulePath),
+                            modulePath: path.relative(rootDirectory, modulePath),
                         }, 'Failed to load API method handler');
                         return notImplementedHandler;
                     }
@@ -115,7 +86,7 @@ async function openApi(app, rootDirectory, codepath, pattern, openApiOptions) {
         const combinedOptions = {
             // In test mode, validate returned swagger responses. This can easily be disabled
             // by setting validateResponses to false in the config.
-            ...((0, env_1.getNodeEnv)() === 'test'
+            ...(getNodeEnv() === 'test'
                 ? {
                     validateResponses: {
                         onError(error, body, req) {
@@ -130,7 +101,7 @@ async function openApi(app, rootDirectory, codepath, pattern, openApiOptions) {
             ...(typeof routing.openapi === 'object' ? routing.openapi : {}),
             ...openApiOptions,
         };
-        return OpenApiValidator.middleware(lodash_1.default.defaultsDeep(defaultOptions, combinedOptions));
+        return OpenApiValidator.middleware(merge(defaultOptions, combinedOptions));
     }
     finally {
         if (_window) {

package/build/openapi.js.map

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

package/build/telemetry/DummyExporter.js

@@ -1,16 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DummySpanExporter = void 0;
-const core_1 = require("@opentelemetry/core");
-class DummySpanExporter {
+import { ExportResultCode } from '@opentelemetry/core';
+export class DummySpanExporter {
     export(spans, resultCallback) {
         setImmediate(() => resultCallback({
-            code: core_1.ExportResultCode.SUCCESS,
+            code: ExportResultCode.SUCCESS,
         }));
     }
     async shutdown() {
         // Nothing to do
     }
 }
-exports.DummySpanExporter = DummySpanExporter;
 //# sourceMappingURL=DummyExporter.js.map

package/build/telemetry/DummyExporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"DummyExporter.js","sourceRoot":"","sources":["../../src/telemetry/DummyExporter.ts"],"names":[],"mappings":";;;AAAA,8CAAqE;AAGrE,MAAa,iBAAiB;IAC5B,MAAM,CAAC,KAAqB,EAAE,cAAyC;QACrE,YAAY,CAAC,GAAG,EAAE,CAChB,cAAc,CAAC;YACb,IAAI,EAAE,uBAAgB,CAAC,OAAO;SAC/B,CAAC,CACH,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,gBAAgB;IAClB,CAAC;CACF;AAZD,8CAYC"}
+{"version":3,"file":"DummyExporter.js","sourceRoot":"","sources":["../../src/telemetry/DummyExporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGrE,MAAM,OAAO,iBAAiB;IAC5B,MAAM,CAAC,KAAqB,EAAE,cAAyC;QACrE,YAAY,CAAC,GAAG,EAAE,CAChB,cAAc,CAAC;YACb,IAAI,EAAE,gBAAgB,CAAC,OAAO;SAC/B,CAAC,CACH,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,gBAAgB;IAClB,CAAC;CACF"}

package/build/telemetry/index.d.ts

@@ -1,6 +1,6 @@
 import { PrometheusExporter } from '@opentelemetry/exporter-prometheus';
-import type { AnyServiceLocals, DelayLoadServiceStartOptions, RequestLocals, ServiceLocals } from '../types';
-import type { ConfigurationSchema } from '../config/schema';
+import type { AnyServiceLocals, DelayLoadServiceStartOptions, RequestLocals, ServiceLocals } from '../types.js';
+import type { ConfigurationSchema } from '../config/schema.js';
 /**
  * OpenTelemetry is not friendly to the idea of stopping
  * and starting itself, it seems. So we can only keep a global
@@ -13,7 +13,7 @@ export declare function startGlobalTelemetry(serviceName: string): Promise<void>
 export declare function getGlobalPrometheusExporter(): PrometheusExporter | undefined;
 export declare function shutdownGlobalTelemetry(): Promise<void>;
 export declare function startWithTelemetry<SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>, RLocals extends RequestLocals = RequestLocals>(options: DelayLoadServiceStartOptions): Promise<{
-    app: import("../types").ServiceExpress<SLocals>;
+    app: import("../types.js").ServiceExpress<SLocals>;
     codepath: "build" | "src" | "dist" | undefined;
     server: import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | import("https").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
 }>;

package/build/telemetry/index.js

@@ -1,54 +1,25 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.startGlobalTelemetry = startGlobalTelemetry;
-exports.getGlobalPrometheusExporter = getGlobalPrometheusExporter;
-exports.shutdownGlobalTelemetry = shutdownGlobalTelemetry;
-exports.startWithTelemetry = startWithTelemetry;
-const exporter_trace_otlp_proto_1 = require("@opentelemetry/exporter-trace-otlp-proto");
-const resources_1 = require("@opentelemetry/resources");
-const resource_detector_container_1 = require("@opentelemetry/resource-detector-container");
-const resource_detector_gcp_1 = require("@opentelemetry/resource-detector-gcp");
-const opentelemetry = __importStar(require("@opentelemetry/sdk-node"));
-const exporter_prometheus_1 = require("@opentelemetry/exporter-prometheus");
-const instrumentations_1 = require("./instrumentations");
-const DummyExporter_1 = require("./DummyExporter");
+import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
+import { envDetectorSync, hostDetectorSync, osDetectorSync, processDetectorSync, } from '@opentelemetry/resources';
+import { containerDetector } from '@opentelemetry/resource-detector-container';
+import { gcpDetector } from '@opentelemetry/resource-detector-gcp';
+import * as opentelemetry from '@opentelemetry/sdk-node';
+import { PrometheusExporter } from '@opentelemetry/exporter-prometheus';
+import { getAutoInstrumentations } from './instrumentations.js';
+import { DummySpanExporter } from './DummyExporter.js';
 // For troubleshooting, set the log level to DiagLogLevel.DEBUG
 opentelemetry.api.diag.setLogger(new (opentelemetry.api.DiagConsoleLogger)(), opentelemetry.api.DiagLogLevel.INFO);
 function getExporter() {
     if (!process.env.DISABLE_OLTP_EXPORTER &&
         (['production', 'staging'].includes(process.env.APP_ENV || process.env.NODE_ENV || '') ||
             process.env.OTLP_EXPORTER)) {
-        return new exporter_trace_otlp_proto_1.OTLPTraceExporter({
+        return new OTLPTraceExporter({
             url: process.env.OTLP_EXPORTER || 'http://otlp-exporter:4318/v1/traces',
         });
     }
     if (process.env.ENABLE_CONSOLE_OLTP_EXPORTER) {
         return new opentelemetry.tracing.ConsoleSpanExporter();
     }
-    return new DummyExporter_1.DummySpanExporter();
+    return new DummySpanExporter();
 }
 let prometheusExporter;
 let telemetrySdk;
@@ -60,21 +31,21 @@ let telemetrySdk;
  * In addition, since we have to load it right away before configuration
  * is available, we can't use configuration to decide anything.
  */
-async function startGlobalTelemetry(serviceName) {
+export async function startGlobalTelemetry(serviceName) {
     if (!prometheusExporter) {
-        prometheusExporter = new exporter_prometheus_1.PrometheusExporter({ preventServerStart: true });
-        const instrumentations = (0, instrumentations_1.getAutoInstrumentations)();
+        prometheusExporter = new PrometheusExporter({ preventServerStart: true });
+        const instrumentations = getAutoInstrumentations();
         telemetrySdk = new opentelemetry.NodeSDK({
             serviceName,
             autoDetectResources: false,
             traceExporter: getExporter(),
             resourceDetectors: [
-                resources_1.envDetectorSync,
-                resources_1.hostDetectorSync,
-                resources_1.osDetectorSync,
-                resources_1.processDetectorSync,
-                resource_detector_container_1.containerDetector,
-                resource_detector_gcp_1.gcpDetector,
+                envDetectorSync,
+                hostDetectorSync,
+                osDetectorSync,
+                processDetectorSync,
+                containerDetector,
+                gcpDetector,
             ],
             metricReader: prometheusExporter,
             instrumentations,
@@ -90,15 +61,15 @@ async function startGlobalTelemetry(serviceName) {
         telemetrySdk.start();
     }
 }
-function getGlobalPrometheusExporter() {
+export function getGlobalPrometheusExporter() {
     return prometheusExporter;
 }
-async function shutdownGlobalTelemetry() {
+export async function shutdownGlobalTelemetry() {
     await telemetrySdk?.shutdown();
     telemetrySdk = undefined;
     prometheusExporter = undefined;
 }
-async function startWithTelemetry(options) {
+export async function startWithTelemetry(options) {
     await startGlobalTelemetry(options.name);
     // eslint-disable-next-line import/no-unresolved, @typescript-eslint/no-var-requires
     const { startApp, listen } = require('../express-app/app.js');

package/build/telemetry/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,cAAc,EACd,mBAAmB,GACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,KAAK,aAAa,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAYxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,+DAA+D;AAC/D,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,EAAE,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;AAEnH,SAAS,WAAW;IAClB,IACE,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB;QAClC,CAAC,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC;YACpF,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,EAC5B,CAAC;QACD,OAAO,IAAI,iBAAiB,CAAC;YAC3B,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,qCAAqC;SACxE,CAAC,CAAC;IACL,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,CAAC;QAC7C,OAAO,IAAI,aAAa,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;IACzD,CAAC;IACD,OAAO,IAAI,iBAAiB,EAAE,CAAC;AACjC,CAAC;AAED,IAAI,kBAAkD,CAAC;AACvD,IAAI,YAA+C,CAAC;AAEpD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,WAAmB;IAC5D,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,kBAAkB,GAAG,IAAI,kBAAkB,CAAC,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1E,MAAM,gBAAgB,GAAG,uBAAuB,EAAE,CAAC;QACnD,YAAY,GAAG,IAAI,aAAa,CAAC,OAAO,CAAC;YACvC,WAAW;YACX,mBAAmB,EAAE,KAAK;YAC1B,aAAa,EAAE,WAAW,EAAE;YAC5B,iBAAiB,EAAE;gBACjB,eAAe;gBACf,gBAAgB;gBAChB,cAAc;gBACd,mBAAmB;gBACnB,iBAAiB;gBACjB,WAAW;aACZ;YACD,YAAY,EAAE,kBAAkB;YAChC,gBAAgB;YAChB,mBAAmB,EAAE,EAAE;YACvB,KAAK,EAAE;gBACL,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC;oBAC7B,cAAc,EAAE,+BAA+B;oBAC/C,cAAc,EAAE,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS;oBAC9D,WAAW,EAAE,IAAI,aAAa,CAAC,OAAO,CAAC,kCAAkC,CACvE,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,EAChC,IAAI,CACL;iBACF,CAAC;aACH;SACF,CAAC,CAAC;QACH,YAAY,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,2BAA2B;IACzC,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB;IAC3C,MAAM,YAAY,EAAE,QAAQ,EAAE,CAAC;IAC/B,YAAY,GAAG,SAAS,CAAC;IACzB,kBAAkB,GAAG,SAAS,CAAC;AACjC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAGtC,OAAqC;IACrC,MAAM,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzC,oFAAoF;IACpF,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAG3D,CAAC;IACF,yGAAyG;IACzG,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,IAAI,aAAa,CAAC,OAAO,CAAC;IAC/D,MAAM,YAAY,GAAiC;QACjD,GAAG,OAAO;QACV,OAAO;QACP,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,EAAsB;KAClD,CAAC;IACF,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,CAAC;IACzC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAEhD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE;QAC1C,MAAM,uBAAuB,EAAE,CAAC;QAChC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;AACrD,CAAC"}

package/build/telemetry/instrumentations.js

@@ -1,27 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAutoInstrumentations = getAutoInstrumentations;
-const instrumentation_dns_1 = require("@opentelemetry/instrumentation-dns");
-const instrumentation_express_1 = require("@opentelemetry/instrumentation-express");
-const instrumentation_undici_1 = require("@opentelemetry/instrumentation-undici");
-const instrumentation_generic_pool_1 = require("@opentelemetry/instrumentation-generic-pool");
-const instrumentation_http_1 = require("@opentelemetry/instrumentation-http");
-const instrumentation_ioredis_1 = require("@opentelemetry/instrumentation-ioredis");
-const instrumentation_net_1 = require("@opentelemetry/instrumentation-net");
-const instrumentation_pg_1 = require("@opentelemetry/instrumentation-pg");
-const instrumentation_pino_1 = require("@opentelemetry/instrumentation-pino");
+import { DnsInstrumentation } from '@opentelemetry/instrumentation-dns';
+import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
+import { UndiciInstrumentation } from '@opentelemetry/instrumentation-undici';
+import { GenericPoolInstrumentation } from '@opentelemetry/instrumentation-generic-pool';
+import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
+import { IORedisInstrumentation } from '@opentelemetry/instrumentation-ioredis';
+import { NetInstrumentation } from '@opentelemetry/instrumentation-net';
+import { PgInstrumentation } from '@opentelemetry/instrumentation-pg';
+import { PinoInstrumentation } from '@opentelemetry/instrumentation-pino';
 const InstrumentationMap = {
-    '@opentelemetry/instrumentation-http': instrumentation_http_1.HttpInstrumentation,
-    '@opentelemetry/instrumentation-dns': instrumentation_dns_1.DnsInstrumentation,
-    '@opentelemetry/instrumentation-express': instrumentation_express_1.ExpressInstrumentation,
-    '@opentelemetry/instrumentation-undici': instrumentation_undici_1.UndiciInstrumentation,
-    '@opentelemetry/instrumentation-generic-pool': instrumentation_generic_pool_1.GenericPoolInstrumentation,
-    '@opentelemetry/instrumentation-ioredis': instrumentation_ioredis_1.IORedisInstrumentation,
-    '@opentelemetry/instrumentation-net': instrumentation_net_1.NetInstrumentation,
-    '@opentelemetry/instrumentation-pg': instrumentation_pg_1.PgInstrumentation,
-    '@opentelemetry/instrumentation-pino': instrumentation_pino_1.PinoInstrumentation,
+    '@opentelemetry/instrumentation-http': HttpInstrumentation,
+    '@opentelemetry/instrumentation-dns': DnsInstrumentation,
+    '@opentelemetry/instrumentation-express': ExpressInstrumentation,
+    '@opentelemetry/instrumentation-undici': UndiciInstrumentation,
+    '@opentelemetry/instrumentation-generic-pool': GenericPoolInstrumentation,
+    '@opentelemetry/instrumentation-ioredis': IORedisInstrumentation,
+    '@opentelemetry/instrumentation-net': NetInstrumentation,
+    '@opentelemetry/instrumentation-pg': PgInstrumentation,
+    '@opentelemetry/instrumentation-pino': PinoInstrumentation,
 };
-function getAutoInstrumentations(inputConfigs = {}) {
+export function getAutoInstrumentations(inputConfigs = {}) {
     const keys = Object.keys(InstrumentationMap);
     return keys
         .map((name) => {

package/build/telemetry/instrumentations.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentations.js","sourceRoot":"","sources":["../../src/telemetry/instrumentations.ts"],"names":[],"mappings":";;AA6BA,0DAmBC;AA/CD,4EAAwE;AACxE,oFAAgF;AAChF,kFAA8E;AAC9E,8FAAyF;AACzF,8EAA0E;AAC1E,oFAAgF;AAChF,4EAAwE;AACxE,0EAAsE;AACtE,8EAA0E;AAE1E,MAAM,kBAAkB,GAAG;IACzB,qCAAqC,EAAE,0CAAmB;IAC1D,oCAAoC,EAAE,wCAAkB;IACxD,wCAAwC,EAAE,gDAAsB;IAChE,uCAAuC,EAAE,8CAAqB;IAC9D,6CAA6C,EAAE,yDAA0B;IACzE,wCAAwC,EAAE,gDAAsB;IAChE,oCAAoC,EAAE,wCAAkB;IACxD,mCAAmC,EAAE,sCAAiB;IACtD,qCAAqC,EAAE,0CAAmB;CAC3D,CAAC;AAQF,SAAgB,uBAAuB,CACrC,eAAyC,EAAE;IAE3C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAA2C,CAAC;IACvF,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC1C,qDAAqD;QACrD,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAE5C,IAAI,CAAC;YACH,OAAO,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,kBAAkB,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAsB,CAAC;AAC7C,CAAC"}
+{"version":3,"file":"instrumentations.js","sourceRoot":"","sources":["../../src/telemetry/instrumentations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC;AACzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE1E,MAAM,kBAAkB,GAAG;IACzB,qCAAqC,EAAE,mBAAmB;IAC1D,oCAAoC,EAAE,kBAAkB;IACxD,wCAAwC,EAAE,sBAAsB;IAChE,uCAAuC,EAAE,qBAAqB;IAC9D,6CAA6C,EAAE,0BAA0B;IACzE,wCAAwC,EAAE,sBAAsB;IAChE,oCAAoC,EAAE,kBAAkB;IACxD,mCAAmC,EAAE,iBAAiB;IACtD,qCAAqC,EAAE,mBAAmB;CAC3D,CAAC;AAQF,MAAM,UAAU,uBAAuB,CACrC,eAAyC,EAAE;IAE3C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAA2C,CAAC;IACvF,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC1C,qDAAqD;QACrD,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAE5C,IAAI,CAAC;YACH,OAAO,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,kBAAkB,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAsB,CAAC;AAC7C,CAAC"}

package/build/telemetry/requestLogger.d.ts

@@ -1,7 +1,7 @@
 import type { RequestHandler, ErrorRequestHandler } from 'express';
 import { Histogram } from '@opentelemetry/api';
-import type { AnyServiceLocals, ServiceExpress, ServiceLocals } from '../types';
-import { ConfigurationSchema } from '../config/schema';
+import type { AnyServiceLocals, ServiceExpress, ServiceLocals } from '../types.js';
+import { ConfigurationSchema } from '../config/schema.js';
 export declare function loggerMiddleware<SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>>(app: ServiceExpress<SLocals>, histogram: Histogram, config?: ConfigurationSchema['logging']): RequestHandler;
 export declare function errorHandlerMiddleware<SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>>(app: ServiceExpress<SLocals>, histogram: Histogram, unnest?: boolean, returnError?: boolean): ErrorRequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
 export declare function notFoundMiddleware(): RequestHandler;

package/build/telemetry/requestLogger.js

@@ -1,19 +1,11 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loggerMiddleware = loggerMiddleware;
-exports.errorHandlerMiddleware = errorHandlerMiddleware;
-exports.notFoundMiddleware = notFoundMiddleware;
-const request_ip_1 = __importDefault(require("request-ip"));
-const error_1 = require("../error");
-const env_1 = require("../env");
+import { getClientIp } from 'request-ip';
+import { ServiceError } from '../error.js';
+import { getNodeEnv } from '../env.js';
 const LOG_PREFS = Symbol('Logging information');
 function getBasicInfo(req) {
     const url = req.originalUrl || req.url;
     const preInfo = {
-        ip: request_ip_1.default.getClientIp(req) || '',
+        ip: getClientIp(req) || '',
         m: req.method,
     };
     if (req.headers['user-agent']) {
@@ -54,7 +46,7 @@ function finishLog(app, error, req, res, histogram) {
     let unexpectedError = false;
     if (error) {
         endLog.e = error.message;
-        if (!(error instanceof error_1.ServiceError) || error.log_stack) {
+        if (!(error instanceof ServiceError) || error.log_stack) {
             endLog.st = error.stack;
         }
         if (!error.expected_error) {
@@ -87,8 +79,8 @@ function finishLog(app, error, req, res, histogram) {
         logger.info(endLog, msg);
     }
 }
-function loggerMiddleware(app, histogram, config) {
-    const nonProd = (0, env_1.getNodeEnv)() !== 'production';
+export function loggerMiddleware(app, histogram, config) {
+    const nonProd = getNodeEnv() !== 'production';
     const { logger, service } = app.locals;
     return function serviceLogger(req, res, next) {
         const logResponse = config?.logResponseBody || (nonProd && req.headers['x-log']?.includes('res'));
@@ -135,7 +127,7 @@ function loggerMiddleware(app, histogram, config) {
         next();
     };
 }
-function errorHandlerMiddleware(app, histogram, unnest, returnError) {
+export function errorHandlerMiddleware(app, histogram, unnest, returnError) {
     const svcErrorHandler = (error, req, res, next) => {
         let loggable = error;
         const body = error.response?.body || error.body;
@@ -169,9 +161,9 @@ function errorHandlerMiddleware(app, histogram, unnest, returnError) {
     };
     return svcErrorHandler;
 }
-function notFoundMiddleware() {
+export function notFoundMiddleware() {
     const serviceNotFoundHandler = (req, res, next) => {
-        const error = new error_1.ServiceError(req.app, `Cannot ${req.method} ${req.path}`, {
+        const error = new ServiceError(req.app, `Cannot ${req.method} ${req.path}`, {
             status: 404,
             code: 'NotFound',
             domain: 'http',