@sima-land/isomorph 11.0.0-alpha.46 → 11.0.0-alpha.48

package/dist/esm/preset/bun-handler/providers/handler-main.js

@@ -55,9 +55,11 @@ export function provideHandlerMain(resolve) {
   const enhancer = applyMiddleware(
   // ВАЖНО: прерываем исходящие в рамках обработчика http-запросы
   async (request, next) => {
-    const response = await next(request);
-    abortController.abort();
-    return response;
+    try {
+      return await next(request);
+    } finally {
+      abortController.abort();
+    }
   });
   return enhancer(handler);
 }

package/dist/esm/preset/bun-handler/providers/handler-main.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler-main.js","names":["KnownToken","applyMiddleware","HelmetContext","formatHandlerError","provideHandlerMain","resolve","config","Config","base","logger","assetsInit","Http","Handler","Page","assets","render","Helmet","helmet","abortController","Fetch","formatResponse","getAssets","handler","jsx","React","createElement","Provider","value","title","appName","body","headers","Response","error","response","log","level","status","redirectLocation","Location","enhancer","request","next","abort"],"sources":["../../../../../src/preset/bun-handler/providers/handler-main.tsx"],"sourcesContent":["/* eslint-disable require-jsdoc, jsdoc/require-jsdoc */\nimport { Resolve } from '../../../di';\nimport { KnownToken } from '../../../tokens';\nimport { applyMiddleware } from '../../../http';\nimport { HelmetContext } from '../../server/utils/regular-helmet';\nimport { formatHandlerError } from '../../server/utils/format-handler-error';\n\nexport function provideHandlerMain(resolve: Resolve) {\n  const config = resolve(KnownToken.Config.base);\n  const logger = resolve(KnownToken.logger);\n  const assetsInit = resolve(KnownToken.Http.Handler.Page.assets);\n  const render = resolve(KnownToken.Http.Handler.Page.render);\n  const Helmet = resolve(KnownToken.Http.Handler.Page.helmet);\n  const abortController = resolve(KnownToken.Http.Fetch.abortController);\n  const formatResponse = resolve(KnownToken.Http.Handler.Page.formatResponse);\n\n  const getAssets = typeof assetsInit === 'function' ? assetsInit : () => assetsInit;\n\n  const handler = async (): Promise<Response> => {\n    try {\n      const assets = await getAssets();\n\n      const jsx = (\n        <HelmetContext.Provider value={{ title: config.appName, assets }}>\n          <Helmet>{await render()}</Helmet>\n        </HelmetContext.Provider>\n      );\n\n      const { body, headers } = await formatResponse(jsx, assets);\n\n      return new Response(body, { headers });\n    } catch (error) {\n      const { response, log } = formatHandlerError(error);\n\n      if (log.level && logger[log.level]) {\n        logger[log.level](error);\n      }\n\n      if (response.status > 299 && response.status < 400 && response.redirectLocation) {\n        return new Response(null, {\n          status: response.status,\n          headers: {\n            Location: response.redirectLocation,\n          },\n        });\n      } else {\n        return new Response(response.body, {\n          status: response.status,\n        });\n      }\n    }\n  };\n\n  const enhancer = applyMiddleware(\n    // ВАЖНО: прерываем исходящие в рамках обработчика http-запросы\n    async (request, next) => {\n      const response = await next(request);\n\n      abortController.abort();\n\n      return response;\n    },\n  );\n\n  return enhancer(handler);\n}\n"],"mappings":"AAAA;;AAEA,SAASA,UAAU,QAAQ,oBAAiB;AAC5C,SAASC,eAAe,QAAQ,0BAAe;AAC/C,SAASC,aAAa,QAAQ,sCAAmC;AACjE,SAASC,kBAAkB,QAAQ,4CAAyC;AAE5E,OAAO,SAASC,kBAAkBA,CAACC,OAAgB,EAAE;EACnD,MAAMC,MAAM,GAAGD,OAAO,CAACL,UAAU,CAACO,MAAM,CAACC,IAAI,CAAC;EAC9C,MAAMC,MAAM,GAAGJ,OAAO,CAACL,UAAU,CAACS,MAAM,CAAC;EACzC,MAAMC,UAAU,GAAGL,OAAO,CAACL,UAAU,CAACW,IAAI,CAACC,OAAO,CAACC,IAAI,CAACC,MAAM,CAAC;EAC/D,MAAMC,MAAM,GAAGV,OAAO,CAACL,UAAU,CAACW,IAAI,CAACC,OAAO,CAACC,IAAI,CAACE,MAAM,CAAC;EAC3D,MAAMC,MAAM,GAAGX,OAAO,CAACL,UAAU,CAACW,IAAI,CAACC,OAAO,CAACC,IAAI,CAACI,MAAM,CAAC;EAC3D,MAAMC,eAAe,GAAGb,OAAO,CAACL,UAAU,CAACW,IAAI,CAACQ,KAAK,CAACD,eAAe,CAAC;EACtE,MAAME,cAAc,GAAGf,OAAO,CAACL,UAAU,CAACW,IAAI,CAACC,OAAO,CAACC,IAAI,CAACO,cAAc,CAAC;EAE3E,MAAMC,SAAS,GAAG,OAAOX,UAAU,KAAK,UAAU,GAAGA,UAAU,GAAG,MAAMA,UAAU;EAElF,MAAMY,OAAO,GAAG,MAAAA,CAAA,KAA+B;IAC7C,IAAI;MACF,MAAMR,MAAM,GAAG,MAAMO,SAAS,CAAC,CAAC;MAEhC,MAAME,GAAG,gBACPC,KAAA,CAAAC,aAAA,CAACvB,aAAa,CAACwB,QAAQ;QAACC,KAAK,EAAE;UAAEC,KAAK,EAAEtB,MAAM,CAACuB,OAAO;UAAEf;QAAO;MAAE,gBAC/DU,KAAA,CAAAC,aAAA,CAACT,MAAM,QAAE,MAAMD,MAAM,CAAC,CAAU,CACV,CACzB;MAED,MAAM;QAAEe,IAAI;QAAEC;MAAQ,CAAC,GAAG,MAAMX,cAAc,CAACG,GAAG,EAAET,MAAM,CAAC;MAE3D,OAAO,IAAIkB,QAAQ,CAACF,IAAI,EAAE;QAAEC;MAAQ,CAAC,CAAC;IACxC,CAAC,CAAC,OAAOE,KAAK,EAAE;MACd,MAAM;QAAEC,QAAQ;QAAEC;MAAI,CAAC,GAAGhC,kBAAkB,CAAC8B,KAAK,CAAC;MAEnD,IAAIE,GAAG,CAACC,KAAK,IAAI3B,MAAM,CAAC0B,GAAG,CAACC,KAAK,CAAC,EAAE;QAClC3B,MAAM,CAAC0B,GAAG,CAACC,KAAK,CAAC,CAACH,KAAK,CAAC;MAC1B;MAEA,IAAIC,QAAQ,CAACG,MAAM,GAAG,GAAG,IAAIH,QAAQ,CAACG,MAAM,GAAG,GAAG,IAAIH,QAAQ,CAACI,gBAAgB,EAAE;QAC/E,OAAO,IAAIN,QAAQ,CAAC,IAAI,EAAE;UACxBK,MAAM,EAAEH,QAAQ,CAACG,MAAM;UACvBN,OAAO,EAAE;YACPQ,QAAQ,EAAEL,QAAQ,CAACI;UACrB;QACF,CAAC,CAAC;MACJ,CAAC,MAAM;QACL,OAAO,IAAIN,QAAQ,CAACE,QAAQ,CAACJ,IAAI,EAAE;UACjCO,MAAM,EAAEH,QAAQ,CAACG;QACnB,CAAC,CAAC;MACJ;IACF;EACF,CAAC;EAED,MAAMG,QAAQ,GAAGvC,eAAe;EAC9B;EACA,OAAOwC,OAAO,EAAEC,IAAI,KAAK;IACvB,MAAMR,QAAQ,GAAG,MAAMQ,IAAI,CAACD,OAAO,CAAC;IAEpCvB,eAAe,CAACyB,KAAK,CAAC,CAAC;IAEvB,OAAOT,QAAQ;EACjB,CACF,CAAC;EAED,OAAOM,QAAQ,CAAClB,OAAO,CAAC;AAC1B"}
+{"version":3,"file":"handler-main.js","names":["KnownToken","applyMiddleware","HelmetContext","formatHandlerError","provideHandlerMain","resolve","config","Config","base","logger","assetsInit","Http","Handler","Page","assets","render","Helmet","helmet","abortController","Fetch","formatResponse","getAssets","handler","jsx","React","createElement","Provider","value","title","appName","body","headers","Response","error","response","log","level","status","redirectLocation","Location","enhancer","request","next","abort"],"sources":["../../../../../src/preset/bun-handler/providers/handler-main.tsx"],"sourcesContent":["/* eslint-disable require-jsdoc, jsdoc/require-jsdoc */\nimport { Resolve } from '../../../di';\nimport { KnownToken } from '../../../tokens';\nimport { applyMiddleware } from '../../../http';\nimport { HelmetContext } from '../../server/utils/regular-helmet';\nimport { formatHandlerError } from '../../server/utils/format-handler-error';\n\nexport function provideHandlerMain(resolve: Resolve) {\n  const config = resolve(KnownToken.Config.base);\n  const logger = resolve(KnownToken.logger);\n  const assetsInit = resolve(KnownToken.Http.Handler.Page.assets);\n  const render = resolve(KnownToken.Http.Handler.Page.render);\n  const Helmet = resolve(KnownToken.Http.Handler.Page.helmet);\n  const abortController = resolve(KnownToken.Http.Fetch.abortController);\n  const formatResponse = resolve(KnownToken.Http.Handler.Page.formatResponse);\n\n  const getAssets = typeof assetsInit === 'function' ? assetsInit : () => assetsInit;\n\n  const handler = async (): Promise<Response> => {\n    try {\n      const assets = await getAssets();\n\n      const jsx = (\n        <HelmetContext.Provider value={{ title: config.appName, assets }}>\n          <Helmet>{await render()}</Helmet>\n        </HelmetContext.Provider>\n      );\n\n      const { body, headers } = await formatResponse(jsx, assets);\n\n      return new Response(body, { headers });\n    } catch (error) {\n      const { response, log } = formatHandlerError(error);\n\n      if (log.level && logger[log.level]) {\n        logger[log.level](error);\n      }\n\n      if (response.status > 299 && response.status < 400 && response.redirectLocation) {\n        return new Response(null, {\n          status: response.status,\n          headers: {\n            Location: response.redirectLocation,\n          },\n        });\n      } else {\n        return new Response(response.body, {\n          status: response.status,\n        });\n      }\n    }\n  };\n\n  const enhancer = applyMiddleware(\n    // ВАЖНО: прерываем исходящие в рамках обработчика http-запросы\n    async (request, next) => {\n      try {\n        return await next(request);\n      } finally {\n        abortController.abort();\n      }\n    },\n  );\n\n  return enhancer(handler);\n}\n"],"mappings":"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"}

package/dist/esm/preset/node/index.js

@@ -13,13 +13,13 @@ import { provideExpressRequestMiddleware } from "./providers/express-request-mid
 import { provideExpressTracingMiddleware } from "./providers/express-tracing-middleware.js";
 import { provideKnownHttpApiHosts } from "../server/providers/known-http-api-hosts.js";
 import { provideLogger } from "./providers/logger.js";
-import { provideMetricsHttpApp } from "./providers/metrics-http-app.js";
+import { provideMetricsExpressApp } from "./providers/metrics-express-app.js";
 import { provideSpanExporter } from "./providers/span-exporter.js";
 import { provideSsrBridgeServerSide } from "../server/providers/ssr-bridge-server-side.js";
 import { provideTracer } from "./providers/tracer.js";
 import { provideTracerProvider } from "./providers/tracer-provider.js";
 import { provideTracerProviderResource } from "./providers/tracer-provider-resource.js";
-
+import { provideMainExpressApp } from "./providers/main-express-app.js";
 /**
  * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов на Node.js.
  * @param customize Получит функцию с помощью которой можно переопределить предустановленные провайдеры.
@@ -43,17 +43,23 @@ export function PresetNode(customize) {
   preset.set(KnownToken.Tracing.tracerProviderResource, provideTracerProviderResource);
 
   // metrics
-  preset.set(KnownToken.Metrics.httpApp, provideMetricsHttpApp);
+  preset.set(KnownToken.Metrics.expressApp, provideMetricsExpressApp);
 
   // fetch
   preset.set(KnownToken.Http.fetch, provideFetch);
   preset.set(KnownToken.Http.Fetch.middleware, () => []);
+  preset.set(KnownToken.Http.Serve.Proxy.config, () => null);
 
   // axios
   preset.set(KnownToken.Axios.factory, provideAxiosFactory);
   preset.set(KnownToken.Axios.middleware, () => []);
 
   // express
+  preset.set(KnownToken.Express.app, provideMainExpressApp);
+  preset.set(KnownToken.Express.pageRoutes, () => []);
+  preset.set(KnownToken.Express.serviceRoutes, resolve => [['/healthcheck', resolve(KnownToken.Express.Handlers.healthCheck)]]);
+  preset.set(KnownToken.Express.middleware, resolve => [resolve(KnownToken.Express.Middleware.request), resolve(KnownToken.Express.Middleware.log), resolve(KnownToken.Express.Middleware.metrics), resolve(KnownToken.Express.Middleware.tracing)]);
+  preset.set(KnownToken.Express.endMiddleware, resolve => [resolve(KnownToken.Express.Middleware.error)]);
   preset.set(KnownToken.Express.factory, provideExpressFactory);
   preset.set(KnownToken.Express.Handlers.healthCheck, healthCheck);
   preset.set(KnownToken.Express.Middleware.request, provideExpressRequestMiddleware);
@@ -74,7 +80,6 @@ export function PresetNode(customize) {
   }
   return preset;
 }
-
 // доступные утилиты
 export { getClientIp } from "./utils/get-client-ip.js";
 export { getForwardedHeaders } from "./utils/get-forwarded-headers.js";

package/dist/esm/preset/node/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["KnownToken","provideAxiosFactory","provideFetch","provideBaseConfig","createPreset","healthCheck","provideConfigSource","provideExpressErrorMiddleware","provideExpressFactory","provideExpressLogMiddleware","provideExpressMetricsMiddleware","provideExpressRequestMiddleware","provideExpressTracingMiddleware","provideKnownHttpApiHosts","provideLogger","provideMetricsHttpApp","provideSpanExporter","provideSsrBridgeServerSide","provideTracer","provideTracerProvider","provideTracerProviderResource","PresetNode","customize","preset","set","Config","source","base","logger","Tracing","tracer","spanExporter","tracerProvider","tracerProviderResource","Metrics","httpApp","Http","fetch","Fetch","middleware","Axios","factory","Express","Handlers","Middleware","request","log","metrics","tracing","error","Api","knownHosts","SsrBridge","serverSide","override","bind","getClientIp","getForwardedHeaders","getPageResponseFormat","HandlerProvider"],"sources":["../../../../src/preset/node/index.ts"],"sourcesContent":["import { KnownToken } from '../../tokens';\nimport { provideAxiosFactory } from '../isomorphic/providers/axios-factory';\nimport { provideFetch } from '../isomorphic/providers/fetch';\nimport { provideBaseConfig } from '../isomorphic/providers/base-config';\nimport { Preset, createPreset } from '../../di';\nimport { PresetTuner } from '../isomorphic/types';\nimport { healthCheck } from '../../utils/express/handler/health-check';\nimport { provideConfigSource } from './providers/config-source';\nimport { provideExpressErrorMiddleware } from './providers/express-error-middleware';\nimport { provideExpressFactory } from './providers/express-factory';\nimport { provideExpressLogMiddleware } from './providers/express-log-middleware';\nimport { provideExpressMetricsMiddleware } from './providers/express-metrics-middleware';\nimport { provideExpressRequestMiddleware } from './providers/express-request-middleware';\nimport { provideExpressTracingMiddleware } from './providers/express-tracing-middleware';\nimport { provideKnownHttpApiHosts } from '../server/providers/known-http-api-hosts';\nimport { provideLogger } from './providers/logger';\nimport { provideMetricsHttpApp } from './providers/metrics-http-app';\nimport { provideSpanExporter } from './providers/span-exporter';\nimport { provideSsrBridgeServerSide } from '../server/providers/ssr-bridge-server-side';\nimport { provideTracer } from './providers/tracer';\nimport { provideTracerProvider } from './providers/tracer-provider';\nimport { provideTracerProviderResource } from './providers/tracer-provider-resource';\n\n/**\n * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов на Node.js.\n * @param customize Получит функцию с помощью которой можно переопределить предустановленные провайдеры.\n * @return Preset.\n */\nexport function PresetNode(customize?: PresetTuner): Preset {\n  // ВАЖНО: используем .set() вместо аргумента defaults функции createPreset из-за скорости\n  const preset = createPreset();\n\n  // config\n  preset.set(KnownToken.Config.source, provideConfigSource);\n  preset.set(KnownToken.Config.base, provideBaseConfig);\n\n  // log\n  preset.set(KnownToken.logger, provideLogger);\n\n  // tracing\n  preset.set(KnownToken.Tracing.tracer, provideTracer);\n  preset.set(KnownToken.Tracing.spanExporter, provideSpanExporter);\n  preset.set(KnownToken.Tracing.tracerProvider, provideTracerProvider);\n  preset.set(KnownToken.Tracing.tracerProviderResource, provideTracerProviderResource);\n\n  // metrics\n  preset.set(KnownToken.Metrics.httpApp, provideMetricsHttpApp);\n\n  // fetch\n  preset.set(KnownToken.Http.fetch, provideFetch);\n  preset.set(KnownToken.Http.Fetch.middleware, () => []);\n\n  // axios\n  preset.set(KnownToken.Axios.factory, provideAxiosFactory);\n  preset.set(KnownToken.Axios.middleware, () => []);\n\n  // express\n  preset.set(KnownToken.Express.factory, provideExpressFactory);\n  preset.set(KnownToken.Express.Handlers.healthCheck, healthCheck);\n  preset.set(KnownToken.Express.Middleware.request, provideExpressRequestMiddleware);\n  preset.set(KnownToken.Express.Middleware.log, provideExpressLogMiddleware);\n  preset.set(KnownToken.Express.Middleware.metrics, provideExpressMetricsMiddleware);\n  preset.set(KnownToken.Express.Middleware.tracing, provideExpressTracingMiddleware);\n  preset.set(KnownToken.Express.Middleware.error, provideExpressErrorMiddleware);\n\n  // http api\n  preset.set(KnownToken.Http.Api.knownHosts, provideKnownHttpApiHosts);\n\n  // ssr bridge\n  preset.set(KnownToken.SsrBridge.serverSide, provideSsrBridgeServerSide);\n\n  if (customize) {\n    customize({ override: preset.set.bind(preset) });\n  }\n\n  return preset;\n}\n\n// доступные утилиты\nexport { getClientIp } from './utils/get-client-ip';\nexport { getForwardedHeaders } from './utils/get-forwarded-headers';\nexport { getPageResponseFormat } from './utils/get-page-response-format';\nexport { HandlerProvider } from './utils/handler-provider';\n"],"mappings":"AAAA,SAASA,UAAU,QAAQ,iBAAc;AACzC,SAASC,mBAAmB,QAAQ,0CAAuC;AAC3E,SAASC,YAAY,QAAQ,kCAA+B;AAC5D,SAASC,iBAAiB,QAAQ,wCAAqC;AACvE,SAAiBC,YAAY,QAAQ,qBAAU;AAE/C,SAASC,WAAW,QAAQ,6CAA0C;AACtE,SAASC,mBAAmB,QAAQ,8BAA2B;AAC/D,SAASC,6BAA6B,QAAQ,yCAAsC;AACpF,SAASC,qBAAqB,QAAQ,gCAA6B;AACnE,SAASC,2BAA2B,QAAQ,uCAAoC;AAChF,SAASC,+BAA+B,QAAQ,2CAAwC;AACxF,SAASC,+BAA+B,QAAQ,2CAAwC;AACxF,SAASC,+BAA+B,QAAQ,2CAAwC;AACxF,SAASC,wBAAwB,QAAQ,6CAA0C;AACnF,SAASC,aAAa,QAAQ,uBAAoB;AAClD,SAASC,qBAAqB,QAAQ,iCAA8B;AACpE,SAASC,mBAAmB,QAAQ,8BAA2B;AAC/D,SAASC,0BAA0B,QAAQ,+CAA4C;AACvF,SAASC,aAAa,QAAQ,uBAAoB;AAClD,SAASC,qBAAqB,QAAQ,gCAA6B;AACnE,SAASC,6BAA6B,QAAQ,yCAAsC;;AAEpF;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,UAAUA,CAACC,SAAuB,EAAU;EAC1D;EACA,MAAMC,MAAM,GAAGnB,YAAY,CAAC,CAAC;;EAE7B;EACAmB,MAAM,CAACC,GAAG,CAACxB,UAAU,CAACyB,MAAM,CAACC,MAAM,EAAEpB,mBAAmB,CAAC;EACzDiB,MAAM,CAACC,GAAG,CAACxB,UAAU,CAACyB,MAAM,CAACE,IAAI,EAAExB,iBAAiB,CAAC;;EAErD;EACAoB,MAAM,CAACC,GAAG,CAACxB,UAAU,CAAC4B,MAAM,EAAEd,aAAa,CAAC;;EAE5C;EACAS,MAAM,CAACC,GAAG,CAACxB,UAAU,CAAC6B,OAAO,CAACC,MAAM,EAAEZ,aAAa,CAAC;EACpDK,MAAM,CAACC,GAAG,CAACxB,UAAU,CAAC6B,OAAO,CAACE,YAAY,EAAEf,mBAAmB,CAAC;EAChEO,MAAM,CAACC,GAAG,CAACxB,UAAU,CAAC6B,OAAO,CAACG,cAAc,EAAEb,qBAAqB,CAAC;EACpEI,MAAM,CAACC,GAAG,CAACxB,UAAU,CAAC6B,OAAO,CAACI,sBAAsB,EAAEb,6BAA6B,CAAC;;EAEpF;EACAG,MAAM,CAACC,GAAG,CAACxB,UAAU,CAACkC,OAAO,CAACC,OAAO,EAAEpB,qBAAqB,CAAC;;EAE7D;EACAQ,MAAM,CAACC,GAAG,CAACxB,UAAU,CAACoC,IAAI,CAACC,KAAK,EAAEnC,YAAY,CAAC;EAC/CqB,MAAM,CAACC,GAAG,CAACxB,UAAU,CAACoC,IAAI,CAACE,KAAK,CAACC,UAAU,EAAE,MAAM,EAAE,CAAC;;EAEtD;EACAhB,MAAM,CAACC,GAAG,CAACxB,UAAU,CAACwC,KAAK,CAACC,OAAO,EAAExC,mBAAmB,CAAC;EACzDsB,MAAM,CAACC,GAAG,CAACxB,UAAU,CAACwC,KAAK,CAACD,UAAU,EAAE,MAAM,EAAE,CAAC;;EAEjD;EACAhB,MAAM,CAACC,GAAG,CAACxB,UAAU,CAAC0C,OAAO,CAACD,OAAO,EAAEjC,qBAAqB,CAAC;EAC7De,MAAM,CAACC,GAAG,CAACxB,UAAU,CAAC0C,OAAO,CAACC,QAAQ,CAACtC,WAAW,EAAEA,WAAW,CAAC;EAChEkB,MAAM,CAACC,GAAG,CAACxB,UAAU,CAAC0C,OAAO,CAACE,UAAU,CAACC,OAAO,EAAElC,+BAA+B,CAAC;EAClFY,MAAM,CAACC,GAAG,CAACxB,UAAU,CAAC0C,OAAO,CAACE,UAAU,CAACE,GAAG,EAAErC,2BAA2B,CAAC;EAC1Ec,MAAM,CAACC,GAAG,CAACxB,UAAU,CAAC0C,OAAO,CAACE,UAAU,CAACG,OAAO,EAAErC,+BAA+B,CAAC;EAClFa,MAAM,CAACC,GAAG,CAACxB,UAAU,CAAC0C,OAAO,CAACE,UAAU,CAACI,OAAO,EAAEpC,+BAA+B,CAAC;EAClFW,MAAM,CAACC,GAAG,CAACxB,UAAU,CAAC0C,OAAO,CAACE,UAAU,CAACK,KAAK,EAAE1C,6BAA6B,CAAC;;EAE9E;EACAgB,MAAM,CAACC,GAAG,CAACxB,UAAU,CAACoC,IAAI,CAACc,GAAG,CAACC,UAAU,EAAEtC,wBAAwB,CAAC;;EAEpE;EACAU,MAAM,CAACC,GAAG,CAACxB,UAAU,CAACoD,SAAS,CAACC,UAAU,EAAEpC,0BAA0B,CAAC;EAEvE,IAAIK,SAAS,EAAE;IACbA,SAAS,CAAC;MAAEgC,QAAQ,EAAE/B,MAAM,CAACC,GAAG,CAAC+B,IAAI,CAAChC,MAAM;IAAE,CAAC,CAAC;EAClD;EAEA,OAAOA,MAAM;AACf;;AAEA;AACA,SAASiC,WAAW,QAAQ,0BAAuB;AACnD,SAASC,mBAAmB,QAAQ,kCAA+B;AACnE,SAASC,qBAAqB,QAAQ,qCAAkC;AACxE,SAASC,eAAe,QAAQ,6BAA0B"}
+{"version":3,"file":"index.js","names":["KnownToken","provideAxiosFactory","provideFetch","provideBaseConfig","createPreset","healthCheck","provideConfigSource","provideExpressErrorMiddleware","provideExpressFactory","provideExpressLogMiddleware","provideExpressMetricsMiddleware","provideExpressRequestMiddleware","provideExpressTracingMiddleware","provideKnownHttpApiHosts","provideLogger","provideMetricsExpressApp","provideSpanExporter","provideSsrBridgeServerSide","provideTracer","provideTracerProvider","provideTracerProviderResource","provideMainExpressApp","PresetNode","customize","preset","set","Config","source","base","logger","Tracing","tracer","spanExporter","tracerProvider","tracerProviderResource","Metrics","expressApp","Http","fetch","Fetch","middleware","Serve","Proxy","config","Axios","factory","Express","app","pageRoutes","serviceRoutes","resolve","Handlers","Middleware","request","log","metrics","tracing","endMiddleware","error","Api","knownHosts","SsrBridge","serverSide","override","bind","getClientIp","getForwardedHeaders","getPageResponseFormat","HandlerProvider"],"sources":["../../../../src/preset/node/index.ts"],"sourcesContent":["import { KnownToken } from '../../tokens';\nimport { provideAxiosFactory } from '../isomorphic/providers/axios-factory';\nimport { provideFetch } from '../isomorphic/providers/fetch';\nimport { provideBaseConfig } from '../isomorphic/providers/base-config';\nimport { Preset, createPreset } from '../../di';\nimport { PresetTuner } from '../isomorphic/types';\nimport { healthCheck } from '../../utils/express/handler/health-check';\nimport { provideConfigSource } from './providers/config-source';\nimport { provideExpressErrorMiddleware } from './providers/express-error-middleware';\nimport { provideExpressFactory } from './providers/express-factory';\nimport { provideExpressLogMiddleware } from './providers/express-log-middleware';\nimport { provideExpressMetricsMiddleware } from './providers/express-metrics-middleware';\nimport { provideExpressRequestMiddleware } from './providers/express-request-middleware';\nimport { provideExpressTracingMiddleware } from './providers/express-tracing-middleware';\nimport { provideKnownHttpApiHosts } from '../server/providers/known-http-api-hosts';\nimport { provideLogger } from './providers/logger';\nimport { provideMetricsExpressApp } from './providers/metrics-express-app';\nimport { provideSpanExporter } from './providers/span-exporter';\nimport { provideSsrBridgeServerSide } from '../server/providers/ssr-bridge-server-side';\nimport { provideTracer } from './providers/tracer';\nimport { provideTracerProvider } from './providers/tracer-provider';\nimport { provideTracerProviderResource } from './providers/tracer-provider-resource';\nimport { provideMainExpressApp } from './providers/main-express-app';\nimport { ExpressRouteList } from './types';\n\n/**\n * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов на Node.js.\n * @param customize Получит функцию с помощью которой можно переопределить предустановленные провайдеры.\n * @return Preset.\n */\nexport function PresetNode(customize?: PresetTuner): Preset {\n  // ВАЖНО: используем .set() вместо аргумента defaults функции createPreset из-за скорости\n  const preset = createPreset();\n\n  // config\n  preset.set(KnownToken.Config.source, provideConfigSource);\n  preset.set(KnownToken.Config.base, provideBaseConfig);\n\n  // log\n  preset.set(KnownToken.logger, provideLogger);\n\n  // tracing\n  preset.set(KnownToken.Tracing.tracer, provideTracer);\n  preset.set(KnownToken.Tracing.spanExporter, provideSpanExporter);\n  preset.set(KnownToken.Tracing.tracerProvider, provideTracerProvider);\n  preset.set(KnownToken.Tracing.tracerProviderResource, provideTracerProviderResource);\n\n  // metrics\n  preset.set(KnownToken.Metrics.expressApp, provideMetricsExpressApp);\n\n  // fetch\n  preset.set(KnownToken.Http.fetch, provideFetch);\n  preset.set(KnownToken.Http.Fetch.middleware, () => []);\n  preset.set(KnownToken.Http.Serve.Proxy.config, () => null);\n\n  // axios\n  preset.set(KnownToken.Axios.factory, provideAxiosFactory);\n  preset.set(KnownToken.Axios.middleware, () => []);\n\n  // express\n  preset.set(KnownToken.Express.app, provideMainExpressApp);\n  preset.set(KnownToken.Express.pageRoutes, () => []);\n  preset.set(\n    KnownToken.Express.serviceRoutes,\n    (resolve): ExpressRouteList => [\n      ['/healthcheck', resolve(KnownToken.Express.Handlers.healthCheck)],\n    ],\n  );\n  preset.set(KnownToken.Express.middleware, resolve => [\n    resolve(KnownToken.Express.Middleware.request),\n    resolve(KnownToken.Express.Middleware.log),\n    resolve(KnownToken.Express.Middleware.metrics),\n    resolve(KnownToken.Express.Middleware.tracing),\n  ]);\n  preset.set(KnownToken.Express.endMiddleware, resolve => [\n    resolve(KnownToken.Express.Middleware.error),\n  ]);\n  preset.set(KnownToken.Express.factory, provideExpressFactory);\n  preset.set(KnownToken.Express.Handlers.healthCheck, healthCheck);\n  preset.set(KnownToken.Express.Middleware.request, provideExpressRequestMiddleware);\n  preset.set(KnownToken.Express.Middleware.log, provideExpressLogMiddleware);\n  preset.set(KnownToken.Express.Middleware.metrics, provideExpressMetricsMiddleware);\n  preset.set(KnownToken.Express.Middleware.tracing, provideExpressTracingMiddleware);\n  preset.set(KnownToken.Express.Middleware.error, provideExpressErrorMiddleware);\n\n  // http api\n  preset.set(KnownToken.Http.Api.knownHosts, provideKnownHttpApiHosts);\n\n  // ssr bridge\n  preset.set(KnownToken.SsrBridge.serverSide, provideSsrBridgeServerSide);\n\n  if (customize) {\n    customize({ override: preset.set.bind(preset) });\n  }\n\n  return preset;\n}\n\nexport type { ExpressHandlerContext, ExpressRouteList } from './types';\n\n// доступные утилиты\nexport { getClientIp } from './utils/get-client-ip';\nexport { getForwardedHeaders } from './utils/get-forwarded-headers';\nexport { getPageResponseFormat } from './utils/get-page-response-format';\nexport { HandlerProvider } from './utils/handler-provider';\n"],"mappings":"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"}

package/dist/esm/preset/node/providers/express-metrics-middleware.js

@@ -1,4 +1,4 @@
-import { getHandlerMetrics } from "../../server/utils/get-handler-metrics.js";
+import { getHandlerMetrics } from "../utils/get-handler-metrics.js";
 import { KnownToken } from "../../../tokens.js";
 import { PAGE_HANDLER_EVENT_TYPE } from "./../../server/index.js";
 import { toMilliseconds } from "./../../../utils/index.js";

package/dist/esm/preset/node/providers/express-metrics-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"express-metrics-middleware.js","names":["getHandlerMetrics","KnownToken","PAGE_HANDLER_EVENT_TYPE","toMilliseconds","provideExpressMetricsMiddleware","resolve","config","Config","base","requestCount","renderDuration","responseDuration","getLabels","req","res","version","appVersion","route","baseUrl","path","code","statusCode","method","getRenderLabels","request","url","next","responseStart","process","hrtime","bigint","inc","once","renderStart","renderFinish","observe","responseFinish"],"sources":["../../../../../src/preset/node/providers/express-metrics-middleware.ts"],"sourcesContent":["import type express from 'express';\nimport type { Resolve } from '../../../di';\nimport { LABEL_NAMES, getHandlerMetrics } from '../../server/utils/get-handler-metrics';\nimport { KnownToken } from '../../../tokens';\nimport { PAGE_HANDLER_EVENT_TYPE } from '../../server';\nimport { toMilliseconds } from '../../../utils';\n\n/**\n * Провайдер промежуточного слоя сбора метрик входящих http-запросов.\n * @param resolve Функция для получения зависимости по токену.\n * @return Промежуточный слой.\n */\nexport function provideExpressMetricsMiddleware(resolve: Resolve): express.Handler {\n  const config = resolve(KnownToken.Config.base);\n  const { requestCount, renderDuration, responseDuration } = getHandlerMetrics();\n\n  /**\n   * Функция формирования labels.\n   * @param req Request.\n   * @param res Response.\n   * @return Labels.\n   */\n  const getLabels = (\n    req: express.Request,\n    res: express.Response,\n  ): Record<(typeof LABEL_NAMES.httpResponse)[number], string | number> => ({\n    version: config.appVersion,\n    route: req.baseUrl + req.path,\n    code: res.statusCode,\n    method: req.method,\n  });\n\n  /** @inheritdoc */\n  const getRenderLabels = (request: express.Request) =>\n    ({\n      version: config.appVersion,\n      method: request.method,\n      route: request.url,\n    }) satisfies Record<(typeof LABEL_NAMES.pageRender)[number], string | number>;\n\n  return (req, res, next) => {\n    const responseStart = process.hrtime.bigint();\n\n    requestCount.inc(getLabels(req, res), 1);\n\n    res.once(PAGE_HANDLER_EVENT_TYPE.renderStart, () => {\n      const renderStart = process.hrtime.bigint();\n\n      res.once(PAGE_HANDLER_EVENT_TYPE.renderFinish, () => {\n        const renderFinish = process.hrtime.bigint();\n\n        renderDuration.observe(getRenderLabels(req), toMilliseconds(renderFinish - renderStart));\n      });\n    });\n\n    res.once('finish', () => {\n      const responseFinish = process.hrtime.bigint();\n\n      responseDuration.observe(getLabels(req, res), toMilliseconds(responseFinish - responseStart));\n    });\n\n    next();\n  };\n}\n"],"mappings":"AAEA,SAAsBA,iBAAiB,QAAQ,2CAAwC;AACvF,SAASC,UAAU,QAAQ,oBAAiB;AAC5C,SAASC,uBAAuB,QAAQ,yBAAc;AACtD,SAASC,cAAc,QAAQ,2BAAgB;;AAE/C;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,+BAA+BA,CAACC,OAAgB,EAAmB;EACjF,MAAMC,MAAM,GAAGD,OAAO,CAACJ,UAAU,CAACM,MAAM,CAACC,IAAI,CAAC;EAC9C,MAAM;IAAEC,YAAY;IAAEC,cAAc;IAAEC;EAAiB,CAAC,GAAGX,iBAAiB,CAAC,CAAC;;EAE9E;AACF;AACA;AACA;AACA;AACA;EACE,MAAMY,SAAS,GAAGA,CAChBC,GAAoB,EACpBC,GAAqB,MACmD;IACxEC,OAAO,EAAET,MAAM,CAACU,UAAU;IAC1BC,KAAK,EAAEJ,GAAG,CAACK,OAAO,GAAGL,GAAG,CAACM,IAAI;IAC7BC,IAAI,EAAEN,GAAG,CAACO,UAAU;IACpBC,MAAM,EAAET,GAAG,CAACS;EACd,CAAC,CAAC;;EAEF;EACA,MAAMC,eAAe,GAAIC,OAAwB,KAC9C;IACCT,OAAO,EAAET,MAAM,CAACU,UAAU;IAC1BM,MAAM,EAAEE,OAAO,CAACF,MAAM;IACtBL,KAAK,EAAEO,OAAO,CAACC;EACjB,CAAC,CAA4E;EAE/E,OAAO,CAACZ,GAAG,EAAEC,GAAG,EAAEY,IAAI,KAAK;IACzB,MAAMC,aAAa,GAAGC,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;IAE7CrB,YAAY,CAACsB,GAAG,CAACnB,SAAS,CAACC,GAAG,EAAEC,GAAG,CAAC,EAAE,CAAC,CAAC;IAExCA,GAAG,CAACkB,IAAI,CAAC9B,uBAAuB,CAAC+B,WAAW,EAAE,MAAM;MAClD,MAAMA,WAAW,GAAGL,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;MAE3ChB,GAAG,CAACkB,IAAI,CAAC9B,uBAAuB,CAACgC,YAAY,EAAE,MAAM;QACnD,MAAMA,YAAY,GAAGN,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;QAE5CpB,cAAc,CAACyB,OAAO,CAACZ,eAAe,CAACV,GAAG,CAAC,EAAEV,cAAc,CAAC+B,YAAY,GAAGD,WAAW,CAAC,CAAC;MAC1F,CAAC,CAAC;IACJ,CAAC,CAAC;IAEFnB,GAAG,CAACkB,IAAI,CAAC,QAAQ,EAAE,MAAM;MACvB,MAAMI,cAAc,GAAGR,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;MAE9CnB,gBAAgB,CAACwB,OAAO,CAACvB,SAAS,CAACC,GAAG,EAAEC,GAAG,CAAC,EAAEX,cAAc,CAACiC,cAAc,GAAGT,aAAa,CAAC,CAAC;IAC/F,CAAC,CAAC;IAEFD,IAAI,CAAC,CAAC;EACR,CAAC;AACH"}
+{"version":3,"file":"express-metrics-middleware.js","names":["getHandlerMetrics","KnownToken","PAGE_HANDLER_EVENT_TYPE","toMilliseconds","provideExpressMetricsMiddleware","resolve","config","Config","base","requestCount","renderDuration","responseDuration","getLabels","req","res","version","appVersion","route","baseUrl","path","code","statusCode","method","getRenderLabels","request","url","next","responseStart","process","hrtime","bigint","inc","once","renderStart","renderFinish","observe","responseFinish"],"sources":["../../../../../src/preset/node/providers/express-metrics-middleware.ts"],"sourcesContent":["import type express from 'express';\nimport type { Resolve } from '../../../di';\nimport { LABEL_NAMES, getHandlerMetrics } from '../utils/get-handler-metrics';\nimport { KnownToken } from '../../../tokens';\nimport { PAGE_HANDLER_EVENT_TYPE } from '../../server';\nimport { toMilliseconds } from '../../../utils';\n\n/**\n * Провайдер промежуточного слоя сбора метрик входящих http-запросов.\n * @param resolve Функция для получения зависимости по токену.\n * @return Промежуточный слой.\n */\nexport function provideExpressMetricsMiddleware(resolve: Resolve): express.Handler {\n  const config = resolve(KnownToken.Config.base);\n  const { requestCount, renderDuration, responseDuration } = getHandlerMetrics();\n\n  /**\n   * Функция формирования labels.\n   * @param req Request.\n   * @param res Response.\n   * @return Labels.\n   */\n  const getLabels = (\n    req: express.Request,\n    res: express.Response,\n  ): Record<(typeof LABEL_NAMES.httpResponse)[number], string | number> => ({\n    version: config.appVersion,\n    route: req.baseUrl + req.path,\n    code: res.statusCode,\n    method: req.method,\n  });\n\n  /** @inheritdoc */\n  const getRenderLabels = (request: express.Request) =>\n    ({\n      version: config.appVersion,\n      method: request.method,\n      route: request.url,\n    }) satisfies Record<(typeof LABEL_NAMES.pageRender)[number], string | number>;\n\n  return (req, res, next) => {\n    const responseStart = process.hrtime.bigint();\n\n    requestCount.inc(getLabels(req, res), 1);\n\n    res.once(PAGE_HANDLER_EVENT_TYPE.renderStart, () => {\n      const renderStart = process.hrtime.bigint();\n\n      res.once(PAGE_HANDLER_EVENT_TYPE.renderFinish, () => {\n        const renderFinish = process.hrtime.bigint();\n\n        renderDuration.observe(getRenderLabels(req), toMilliseconds(renderFinish - renderStart));\n      });\n    });\n\n    res.once('finish', () => {\n      const responseFinish = process.hrtime.bigint();\n\n      responseDuration.observe(getLabels(req, res), toMilliseconds(responseFinish - responseStart));\n    });\n\n    next();\n  };\n}\n"],"mappings":"AAEA,SAAsBA,iBAAiB,QAAQ,iCAA8B;AAC7E,SAASC,UAAU,QAAQ,oBAAiB;AAC5C,SAASC,uBAAuB,QAAQ,yBAAc;AACtD,SAASC,cAAc,QAAQ,2BAAgB;;AAE/C;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,+BAA+BA,CAACC,OAAgB,EAAmB;EACjF,MAAMC,MAAM,GAAGD,OAAO,CAACJ,UAAU,CAACM,MAAM,CAACC,IAAI,CAAC;EAC9C,MAAM;IAAEC,YAAY;IAAEC,cAAc;IAAEC;EAAiB,CAAC,GAAGX,iBAAiB,CAAC,CAAC;;EAE9E;AACF;AACA;AACA;AACA;AACA;EACE,MAAMY,SAAS,GAAGA,CAChBC,GAAoB,EACpBC,GAAqB,MACmD;IACxEC,OAAO,EAAET,MAAM,CAACU,UAAU;IAC1BC,KAAK,EAAEJ,GAAG,CAACK,OAAO,GAAGL,GAAG,CAACM,IAAI;IAC7BC,IAAI,EAAEN,GAAG,CAACO,UAAU;IACpBC,MAAM,EAAET,GAAG,CAACS;EACd,CAAC,CAAC;;EAEF;EACA,MAAMC,eAAe,GAAIC,OAAwB,KAC9C;IACCT,OAAO,EAAET,MAAM,CAACU,UAAU;IAC1BM,MAAM,EAAEE,OAAO,CAACF,MAAM;IACtBL,KAAK,EAAEO,OAAO,CAACC;EACjB,CAAC,CAA4E;EAE/E,OAAO,CAACZ,GAAG,EAAEC,GAAG,EAAEY,IAAI,KAAK;IACzB,MAAMC,aAAa,GAAGC,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;IAE7CrB,YAAY,CAACsB,GAAG,CAACnB,SAAS,CAACC,GAAG,EAAEC,GAAG,CAAC,EAAE,CAAC,CAAC;IAExCA,GAAG,CAACkB,IAAI,CAAC9B,uBAAuB,CAAC+B,WAAW,EAAE,MAAM;MAClD,MAAMA,WAAW,GAAGL,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;MAE3ChB,GAAG,CAACkB,IAAI,CAAC9B,uBAAuB,CAACgC,YAAY,EAAE,MAAM;QACnD,MAAMA,YAAY,GAAGN,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;QAE5CpB,cAAc,CAACyB,OAAO,CAACZ,eAAe,CAACV,GAAG,CAAC,EAAEV,cAAc,CAAC+B,YAAY,GAAGD,WAAW,CAAC,CAAC;MAC1F,CAAC,CAAC;IACJ,CAAC,CAAC;IAEFnB,GAAG,CAACkB,IAAI,CAAC,QAAQ,EAAE,MAAM;MACvB,MAAMI,cAAc,GAAGR,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;MAE9CnB,gBAAgB,CAACwB,OAAO,CAACvB,SAAS,CAACC,GAAG,EAAEC,GAAG,CAAC,EAAEX,cAAc,CAACiC,cAAc,GAAGT,aAAa,CAAC,CAAC;IAC/F,CAAC,CAAC;IAEFD,IAAI,CAAC,CAAC;EACR,CAAC;AACH"}

package/dist/esm/preset/node/providers/main-express-app.js

@@ -0,0 +1,58 @@
+import { KnownToken } from "../../../tokens.js";
+import express from 'express';
+import { createProxyMiddleware } from 'http-proxy-middleware';
+
+/**
+ * Провайдер основного express-приложения.
+ * @param resolve Функция для получения зависимости по токену.
+ * @return Основное express-приложение.
+ */
+export function provideMainExpressApp(resolve) {
+  const config = resolve(KnownToken.Config.base);
+  const pageRoutes = resolve(KnownToken.Express.pageRoutes);
+  const serviceRoutes = resolve(KnownToken.Express.serviceRoutes);
+  const middleware = resolve(KnownToken.Express.middleware);
+  const endMiddleware = resolve(KnownToken.Express.endMiddleware);
+  const proxyConfig = resolve(KnownToken.Http.Serve.Proxy.config);
+  const app = express();
+  if (config.env === 'development' && proxyConfig) {
+    const proxyConfigs = Array.isArray(proxyConfig) ? proxyConfig : [proxyConfig];
+    for (const {
+      target,
+      filter,
+      pathRewrite
+    } of proxyConfigs) {
+      // ВАЖНО: так как не можем предоставить web-интерфейс Request бросаем ошибку
+      if (typeof filter === 'function') {
+        throw new Error('Currently function is not supported for proxy "filter"');
+      }
+      const proxyPaths = Array.isArray(filter) ? filter : [filter];
+      app.use(createProxyMiddleware({
+        target,
+        changeOrigin: true,
+        pathRewrite,
+        pathFilter: inputPath => proxyPaths.some(proxyPath => inputPath.startsWith(proxyPath))
+      }));
+    }
+  }
+
+  // маршруты страниц
+  for (const [routePath, routeHandler] of pageRoutes) {
+    const path = typeof routePath === 'string' ? routePath : routePath.path;
+    const method = typeof routePath === 'string' ? 'get' : routePath.method;
+    app.use(path, middleware);
+    app[method](path, routeHandler);
+    app.use(path, endMiddleware);
+  }
+
+  // служебные маршруты (к ним не применяются промежуточные слои)
+  for (const [routePath, routeHandler] of serviceRoutes) {
+    const path = typeof routePath === 'string' ? routePath : routePath.path;
+    const method = typeof routePath === 'string' ? 'get' : routePath.method;
+    app[method](path, routeHandler);
+  }
+
+  // @todo также добавить apiRoutes?
+  return app;
+}
+//# sourceMappingURL=main-express-app.js.map

package/dist/esm/preset/node/providers/main-express-app.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"main-express-app.js","names":["KnownToken","express","createProxyMiddleware","provideMainExpressApp","resolve","config","Config","base","pageRoutes","Express","serviceRoutes","middleware","endMiddleware","proxyConfig","Http","Serve","Proxy","app","env","proxyConfigs","Array","isArray","target","filter","pathRewrite","Error","proxyPaths","use","changeOrigin","pathFilter","inputPath","some","proxyPath","startsWith","routePath","routeHandler","path","method"],"sources":["../../../../../src/preset/node/providers/main-express-app.ts"],"sourcesContent":["import type { Resolve } from '../../../di';\nimport { KnownToken } from '../../../tokens';\nimport express from 'express';\nimport { createProxyMiddleware } from 'http-proxy-middleware';\n\n/**\n * Провайдер основного express-приложения.\n * @param resolve Функция для получения зависимости по токену.\n * @return Основное express-приложение.\n */\nexport function provideMainExpressApp(resolve: Resolve): express.Application {\n  const config = resolve(KnownToken.Config.base);\n  const pageRoutes = resolve(KnownToken.Express.pageRoutes);\n  const serviceRoutes = resolve(KnownToken.Express.serviceRoutes);\n  const middleware = resolve(KnownToken.Express.middleware);\n  const endMiddleware = resolve(KnownToken.Express.endMiddleware);\n  const proxyConfig = resolve(KnownToken.Http.Serve.Proxy.config);\n\n  const app = express();\n\n  if (config.env === 'development' && proxyConfig) {\n    const proxyConfigs = Array.isArray(proxyConfig) ? proxyConfig : [proxyConfig];\n\n    for (const { target, filter, pathRewrite } of proxyConfigs) {\n      // ВАЖНО: так как не можем предоставить web-интерфейс Request бросаем ошибку\n      if (typeof filter === 'function') {\n        throw new Error('Currently function is not supported for proxy \"filter\"');\n      }\n\n      const proxyPaths = Array.isArray(filter) ? filter : [filter];\n\n      app.use(\n        createProxyMiddleware({\n          target,\n          changeOrigin: true,\n          pathRewrite,\n          pathFilter: inputPath => proxyPaths.some(proxyPath => inputPath.startsWith(proxyPath)),\n        }),\n      );\n    }\n  }\n\n  // маршруты страниц\n  for (const [routePath, routeHandler] of pageRoutes) {\n    const path = typeof routePath === 'string' ? routePath : routePath.path;\n    const method = typeof routePath === 'string' ? 'get' : routePath.method;\n\n    app.use(path, middleware);\n    app[method](path, routeHandler);\n    app.use(path, endMiddleware);\n  }\n\n  // служебные маршруты (к ним не применяются промежуточные слои)\n  for (const [routePath, routeHandler] of serviceRoutes) {\n    const path = typeof routePath === 'string' ? routePath : routePath.path;\n    const method = typeof routePath === 'string' ? 'get' : routePath.method;\n\n    app[method](path, routeHandler);\n  }\n\n  // @todo также добавить apiRoutes?\n  return app;\n}\n"],"mappings":"AACA,SAASA,UAAU,QAAQ,oBAAiB;AAC5C,OAAOC,OAAO,MAAM,SAAS;AAC7B,SAASC,qBAAqB,QAAQ,uBAAuB;;AAE7D;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,qBAAqBA,CAACC,OAAgB,EAAuB;EAC3E,MAAMC,MAAM,GAAGD,OAAO,CAACJ,UAAU,CAACM,MAAM,CAACC,IAAI,CAAC;EAC9C,MAAMC,UAAU,GAAGJ,OAAO,CAACJ,UAAU,CAACS,OAAO,CAACD,UAAU,CAAC;EACzD,MAAME,aAAa,GAAGN,OAAO,CAACJ,UAAU,CAACS,OAAO,CAACC,aAAa,CAAC;EAC/D,MAAMC,UAAU,GAAGP,OAAO,CAACJ,UAAU,CAACS,OAAO,CAACE,UAAU,CAAC;EACzD,MAAMC,aAAa,GAAGR,OAAO,CAACJ,UAAU,CAACS,OAAO,CAACG,aAAa,CAAC;EAC/D,MAAMC,WAAW,GAAGT,OAAO,CAACJ,UAAU,CAACc,IAAI,CAACC,KAAK,CAACC,KAAK,CAACX,MAAM,CAAC;EAE/D,MAAMY,GAAG,GAAGhB,OAAO,CAAC,CAAC;EAErB,IAAII,MAAM,CAACa,GAAG,KAAK,aAAa,IAAIL,WAAW,EAAE;IAC/C,MAAMM,YAAY,GAAGC,KAAK,CAACC,OAAO,CAACR,WAAW,CAAC,GAAGA,WAAW,GAAG,CAACA,WAAW,CAAC;IAE7E,KAAK,MAAM;MAAES,MAAM;MAAEC,MAAM;MAAEC;IAAY,CAAC,IAAIL,YAAY,EAAE;MAC1D;MACA,IAAI,OAAOI,MAAM,KAAK,UAAU,EAAE;QAChC,MAAM,IAAIE,KAAK,CAAC,wDAAwD,CAAC;MAC3E;MAEA,MAAMC,UAAU,GAAGN,KAAK,CAACC,OAAO,CAACE,MAAM,CAAC,GAAGA,MAAM,GAAG,CAACA,MAAM,CAAC;MAE5DN,GAAG,CAACU,GAAG,CACLzB,qBAAqB,CAAC;QACpBoB,MAAM;QACNM,YAAY,EAAE,IAAI;QAClBJ,WAAW;QACXK,UAAU,EAAEC,SAAS,IAAIJ,UAAU,CAACK,IAAI,CAACC,SAAS,IAAIF,SAAS,CAACG,UAAU,CAACD,SAAS,CAAC;MACvF,CAAC,CACH,CAAC;IACH;EACF;;EAEA;EACA,KAAK,MAAM,CAACE,SAAS,EAAEC,YAAY,CAAC,IAAI3B,UAAU,EAAE;IAClD,MAAM4B,IAAI,GAAG,OAAOF,SAAS,KAAK,QAAQ,GAAGA,SAAS,GAAGA,SAAS,CAACE,IAAI;IACvE,MAAMC,MAAM,GAAG,OAAOH,SAAS,KAAK,QAAQ,GAAG,KAAK,GAAGA,SAAS,CAACG,MAAM;IAEvEpB,GAAG,CAACU,GAAG,CAACS,IAAI,EAAEzB,UAAU,CAAC;IACzBM,GAAG,CAACoB,MAAM,CAAC,CAACD,IAAI,EAAED,YAAY,CAAC;IAC/BlB,GAAG,CAACU,GAAG,CAACS,IAAI,EAAExB,aAAa,CAAC;EAC9B;;EAEA;EACA,KAAK,MAAM,CAACsB,SAAS,EAAEC,YAAY,CAAC,IAAIzB,aAAa,EAAE;IACrD,MAAM0B,IAAI,GAAG,OAAOF,SAAS,KAAK,QAAQ,GAAGA,SAAS,GAAGA,SAAS,CAACE,IAAI;IACvE,MAAMC,MAAM,GAAG,OAAOH,SAAS,KAAK,QAAQ,GAAG,KAAK,GAAGA,SAAS,CAACG,MAAM;IAEvEpB,GAAG,CAACoB,MAAM,CAAC,CAACD,IAAI,EAAED,YAAY,CAAC;EACjC;;EAEA;EACA,OAAOlB,GAAG;AACZ"}

package/dist/esm/preset/node/providers/{metrics-http-app.js → metrics-express-app.js}

@@ -5,7 +5,7 @@ import express from 'express';
  * Провайдер express-приложения метрик.
  * @return Пул известных http-хостов.
  */
-export function provideMetricsHttpApp() {
+export function provideMetricsExpressApp() {
   PromClient.collectDefaultMetrics();
   const app = express();
   app.get('/', async function (req, res) {
@@ -15,4 +15,4 @@ export function provideMetricsHttpApp() {
   });
   return app;
 }
-//# sourceMappingURL=metrics-http-app.js.map
+//# sourceMappingURL=metrics-express-app.js.map

package/dist/esm/preset/node/providers/metrics-express-app.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metrics-express-app.js","names":["PromClient","express","provideMetricsExpressApp","collectDefaultMetrics","app","get","req","res","metrics","register","setHeader","contentType","send"],"sources":["../../../../../src/preset/node/providers/metrics-express-app.ts"],"sourcesContent":["import * as PromClient from 'prom-client';\nimport express from 'express';\n\n/**\n * Провайдер express-приложения метрик.\n * @return Пул известных http-хостов.\n */\nexport function provideMetricsExpressApp(): express.Application {\n  PromClient.collectDefaultMetrics();\n\n  const app = express();\n\n  app.get('/', async function (req, res) {\n    const metrics = await PromClient.register.metrics();\n\n    res.setHeader('Content-Type', PromClient.register.contentType);\n    res.send(metrics);\n  });\n\n  return app;\n}\n"],"mappings":"AAAA,OAAO,KAAKA,UAAU,MAAM,aAAa;AACzC,OAAOC,OAAO,MAAM,SAAS;;AAE7B;AACA;AACA;AACA;AACA,OAAO,SAASC,wBAAwBA,CAAA,EAAwB;EAC9DF,UAAU,CAACG,qBAAqB,CAAC,CAAC;EAElC,MAAMC,GAAG,GAAGH,OAAO,CAAC,CAAC;EAErBG,GAAG,CAACC,GAAG,CAAC,GAAG,EAAE,gBAAgBC,GAAG,EAAEC,GAAG,EAAE;IACrC,MAAMC,OAAO,GAAG,MAAMR,UAAU,CAACS,QAAQ,CAACD,OAAO,CAAC,CAAC;IAEnDD,GAAG,CAACG,SAAS,CAAC,cAAc,EAAEV,UAAU,CAACS,QAAQ,CAACE,WAAW,CAAC;IAC9DJ,GAAG,CAACK,IAAI,CAACJ,OAAO,CAAC;EACnB,CAAC,CAAC;EAEF,OAAOJ,GAAG;AACZ"}

package/dist/esm/preset/node/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../../src/preset/node/types.ts"],"sourcesContent":["import type { Request, Response, NextFunction } from 'express';\n\n/**\n * Контекст обработчика express.\n */\nexport interface ExpressHandlerContext {\n  readonly req: Request;\n  readonly res: Response;\n  readonly next: NextFunction;\n}\n"],"mappings":""}
+{"version":3,"file":"types.js","names":[],"sources":["../../../../src/preset/node/types.ts"],"sourcesContent":["import type express from 'express';\nimport type { RouteInfo } from '../server/types';\n\n/**\n * Контекст обработчика express.\n */\nexport interface ExpressHandlerContext {\n  readonly req: express.Request;\n  readonly res: express.Response;\n  readonly next: express.NextFunction;\n}\n\nexport type ExpressRouteList = Array<[string | RouteInfo, express.Handler]>;\n"],"mappings":""}

package/dist/esm/preset/{server → node}/utils/get-fetch-tracing.js

@@ -10,7 +10,7 @@ import { hideFirstId } from "../../isomorphic/utils/hide-first-id.js";
  */
 export function getFetchTracing(tracer, rootContext) {
   return async (request, next) => {
-    const [url, foundId] = hideFirstId(new URL(request.url).pathname);
+    const [url, foundId] = hideFirstId(new URL(request.url).pathname); // @todo тут бы помог URLPattern
     const span = tracer.startSpan(`HTTP ${request.method} ${url}`, undefined, rootContext);
     span.setAttributes({
       [SemanticAttributes.HTTP_URL]: url,
@@ -33,7 +33,7 @@ export function getFetchTracing(tracer, rootContext) {
       });
       span.end();
 
-      // не прячем ошибку
+      // ВАЖНО: не прячем ошибку
       throw error;
     }
   };

package/dist/esm/preset/node/utils/get-fetch-tracing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-fetch-tracing.js","names":["SpanStatusCode","SemanticAttributes","hideFirstId","getFetchTracing","tracer","rootContext","request","next","url","foundId","URL","pathname","span","startSpan","method","undefined","setAttributes","HTTP_URL","HTTP_METHOD","JSON","stringify","searchParams","headers","response","end","error","setStatus","code","ERROR","message"],"sources":["../../../../../src/preset/node/utils/get-fetch-tracing.ts"],"sourcesContent":["import type { Middleware } from '../../../http';\nimport { SpanStatusCode, type Context, type Tracer } from '@opentelemetry/api';\nimport { SemanticAttributes } from '@opentelemetry/semantic-conventions';\nimport { hideFirstId } from '../../isomorphic/utils/hide-first-id';\n\n/**\n * Вернет новый промежуточный слой трассировки для fetch.\n * @param tracer Трассировщик.\n * @param rootContext Контекст.\n * @return Промежуточный слой трассировки.\n */\nexport function getFetchTracing(tracer: Tracer, rootContext: Context): Middleware {\n  return async (request, next) => {\n    const [url, foundId] = hideFirstId(new URL(request.url).pathname); // @todo тут бы помог URLPattern\n    const span = tracer.startSpan(`HTTP ${request.method} ${url}`, undefined, rootContext);\n\n    span.setAttributes({\n      [SemanticAttributes.HTTP_URL]: url,\n      [SemanticAttributes.HTTP_METHOD]: request.method,\n      'request.params': JSON.stringify(new URL(request.url).searchParams),\n      'request.headers': JSON.stringify(request.headers),\n\n      // если нашли id - добавляем в теги\n      ...(foundId && { 'request.id': foundId }),\n    });\n\n    try {\n      const response = await next(request);\n\n      span.end();\n\n      return response;\n    } catch (error) {\n      span.setStatus({\n        code: SpanStatusCode.ERROR,\n        message: 'HTTP Request failed',\n      });\n\n      span.end();\n\n      // ВАЖНО: не прячем ошибку\n      throw error;\n    }\n  };\n}\n"],"mappings":"AACA,SAASA,cAAc,QAAmC,oBAAoB;AAC9E,SAASC,kBAAkB,QAAQ,qCAAqC;AACxE,SAASC,WAAW,QAAQ,yCAAsC;;AAElE;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAACC,MAAc,EAAEC,WAAoB,EAAc;EAChF,OAAO,OAAOC,OAAO,EAAEC,IAAI,KAAK;IAC9B,MAAM,CAACC,GAAG,EAAEC,OAAO,CAAC,GAAGP,WAAW,CAAC,IAAIQ,GAAG,CAACJ,OAAO,CAACE,GAAG,CAAC,CAACG,QAAQ,CAAC,CAAC,CAAC;IACnE,MAAMC,IAAI,GAAGR,MAAM,CAACS,SAAS,CAAE,QAAOP,OAAO,CAACQ,MAAO,IAAGN,GAAI,EAAC,EAAEO,SAAS,EAAEV,WAAW,CAAC;IAEtFO,IAAI,CAACI,aAAa,CAAC;MACjB,CAACf,kBAAkB,CAACgB,QAAQ,GAAGT,GAAG;MAClC,CAACP,kBAAkB,CAACiB,WAAW,GAAGZ,OAAO,CAACQ,MAAM;MAChD,gBAAgB,EAAEK,IAAI,CAACC,SAAS,CAAC,IAAIV,GAAG,CAACJ,OAAO,CAACE,GAAG,CAAC,CAACa,YAAY,CAAC;MACnE,iBAAiB,EAAEF,IAAI,CAACC,SAAS,CAACd,OAAO,CAACgB,OAAO,CAAC;MAElD;MACA,IAAIb,OAAO,IAAI;QAAE,YAAY,EAAEA;MAAQ,CAAC;IAC1C,CAAC,CAAC;IAEF,IAAI;MACF,MAAMc,QAAQ,GAAG,MAAMhB,IAAI,CAACD,OAAO,CAAC;MAEpCM,IAAI,CAACY,GAAG,CAAC,CAAC;MAEV,OAAOD,QAAQ;IACjB,CAAC,CAAC,OAAOE,KAAK,EAAE;MACdb,IAAI,CAACc,SAAS,CAAC;QACbC,IAAI,EAAE3B,cAAc,CAAC4B,KAAK;QAC1BC,OAAO,EAAE;MACX,CAAC,CAAC;MAEFjB,IAAI,CAACY,GAAG,CAAC,CAAC;;MAEV;MACA,MAAMC,KAAK;IACb;EACF,CAAC;AACH"}

package/dist/esm/preset/node/utils/get-handler-metrics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-handler-metrics.js","names":["PromClient","LABEL_NAMES","httpResponse","pageRender","getHandlerMetrics","requestCount","Counter","name","help","labelNames","responseDuration","Histogram","buckets","renderDuration"],"sources":["../../../../../src/preset/node/utils/get-handler-metrics.ts"],"sourcesContent":["import PromClient from 'prom-client';\n\nexport const LABEL_NAMES = {\n  httpResponse: ['version', 'route', 'code', 'method'],\n  pageRender: ['version', 'route', 'method'],\n} as const;\n\n/**\n * Возвращает метрики обработки входящего http-запроса.\n * @return Метрики.\n */\nexport function getHandlerMetrics() {\n  const requestCount = new PromClient.Counter({\n    name: 'http_request_count',\n    help: 'Incoming HTTP request count',\n    labelNames: LABEL_NAMES.httpResponse,\n  });\n\n  const responseDuration = new PromClient.Histogram({\n    name: 'http_response_duration_ms',\n    help: 'Duration of incoming HTTP requests in ms',\n    labelNames: LABEL_NAMES.httpResponse,\n    buckets: [30, 100, 200, 500, 1000, 2500, 5000, 10000],\n  });\n\n  const renderDuration = new PromClient.Histogram({\n    name: 'render_duration_ms',\n    help: 'Duration of SSR ms',\n    labelNames: LABEL_NAMES.pageRender,\n    buckets: [0.1, 15, 50, 100, 250, 500, 800, 1500],\n  });\n\n  return {\n    requestCount,\n    renderDuration,\n    responseDuration,\n  };\n}\n"],"mappings":"AAAA,OAAOA,UAAU,MAAM,aAAa;AAEpC,OAAO,MAAMC,WAAW,GAAG;EACzBC,YAAY,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC;EACpDC,UAAU,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ;AAC3C,CAAU;;AAEV;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAAA,EAAG;EAClC,MAAMC,YAAY,GAAG,IAAIL,UAAU,CAACM,OAAO,CAAC;IAC1CC,IAAI,EAAE,oBAAoB;IAC1BC,IAAI,EAAE,6BAA6B;IACnCC,UAAU,EAAER,WAAW,CAACC;EAC1B,CAAC,CAAC;EAEF,MAAMQ,gBAAgB,GAAG,IAAIV,UAAU,CAACW,SAAS,CAAC;IAChDJ,IAAI,EAAE,2BAA2B;IACjCC,IAAI,EAAE,0CAA0C;IAChDC,UAAU,EAAER,WAAW,CAACC,YAAY;IACpCU,OAAO,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK;EACtD,CAAC,CAAC;EAEF,MAAMC,cAAc,GAAG,IAAIb,UAAU,CAACW,SAAS,CAAC;IAC9CJ,IAAI,EAAE,oBAAoB;IAC1BC,IAAI,EAAE,oBAAoB;IAC1BC,UAAU,EAAER,WAAW,CAACE,UAAU;IAClCS,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI;EACjD,CAAC,CAAC;EAEF,OAAO;IACLP,YAAY;IACZQ,cAAc;IACdH;EACF,CAAC;AACH"}

package/dist/esm/preset/node/utils/get-page-response-format.js

@@ -3,6 +3,7 @@
  * @param req Запрос.
  * @return Формат.
  * @todo Перенести в preset/node (или в preset/server но с именем getPageResponseFormatExpress?).
+ * @deprecated Стоит использовать npm:accepts.
  */
 export function getPageResponseFormat(req) {
   let result = 'html';

package/dist/esm/preset/node/utils/get-page-response-format.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-page-response-format.js","names":["getPageResponseFormat","req","result","header","toLowerCase","includes"],"sources":["../../../../../src/preset/node/utils/get-page-response-format.tsx"],"sourcesContent":["import type express from 'express';\n\n/**\n * Определит формат ответа.\n * @param req Запрос.\n * @return Формат.\n * @todo Перенести в preset/node (или в preset/server но с именем getPageResponseFormatExpress?).\n */\nexport function getPageResponseFormat(req: express.Request): 'html' | 'json' {\n  let result: 'html' | 'json' = 'html';\n\n  if ((req.header('accept') || '').toLowerCase().includes('application/json')) {\n    result = 'json';\n  }\n\n  return result;\n}\n"],"mappings":"AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,qBAAqBA,CAACC,GAAoB,EAAmB;EAC3E,IAAIC,MAAuB,GAAG,MAAM;EAEpC,IAAI,CAACD,GAAG,CAACE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAEC,WAAW,CAAC,CAAC,CAACC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;IAC3EH,MAAM,GAAG,MAAM;EACjB;EAEA,OAAOA,MAAM;AACf"}
+{"version":3,"file":"get-page-response-format.js","names":["getPageResponseFormat","req","result","header","toLowerCase","includes"],"sources":["../../../../../src/preset/node/utils/get-page-response-format.tsx"],"sourcesContent":["import type express from 'express';\n\n/**\n * Определит формат ответа.\n * @param req Запрос.\n * @return Формат.\n * @todo Перенести в preset/node (или в preset/server но с именем getPageResponseFormatExpress?).\n * @deprecated Стоит использовать npm:accepts.\n */\nexport function getPageResponseFormat(req: express.Request): 'html' | 'json' {\n  let result: 'html' | 'json' = 'html';\n\n  if ((req.header('accept') || '').toLowerCase().includes('application/json')) {\n    result = 'json';\n  }\n\n  return result;\n}\n"],"mappings":"AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,qBAAqBA,CAACC,GAAoB,EAAmB;EAC3E,IAAIC,MAAuB,GAAG,MAAM;EAEpC,IAAI,CAACD,GAAG,CAACE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAEC,WAAW,CAAC,CAAC,CAACC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;IAC3EH,MAAM,GAAG,MAAM;EACjB;EAEA,OAAOA,MAAM;AACf"}

package/dist/esm/preset/{server → node}/utils/get-serve-measuring.js

@@ -1,4 +1,4 @@
-import { PAGE_HANDLER_EVENT_TYPE } from "../constants.js";
+import { PAGE_HANDLER_EVENT_TYPE } from "../../server/constants.js";
 import { toMilliseconds } from "./../../../utils/index.js";
 import { getHandlerMetrics } from "./get-handler-metrics.js";
 

package/dist/esm/preset/node/utils/get-serve-measuring.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-serve-measuring.js","names":["PAGE_HANDLER_EVENT_TYPE","toMilliseconds","getHandlerMetrics","getServeMeasuring","config","requestCount","renderDuration","responseDuration","getResponseLabels","req","res","version","appVersion","route","url","code","status","method","getRenderLabels","request","next","context","responseStart","process","hrtime","bigint","renderStart","events","addEventListener","once","renderFinish","observe","response","responseFinish","inc"],"sources":["../../../../../src/preset/node/utils/get-serve-measuring.ts"],"sourcesContent":["import type { BaseConfig } from '../../../config';\nimport type { ServerMiddleware } from '../../server/types';\nimport { PAGE_HANDLER_EVENT_TYPE } from '../../server/constants';\nimport { toMilliseconds } from '../../../utils';\nimport { LABEL_NAMES, getHandlerMetrics } from './get-handler-metrics';\n\n/**\n * Возвращает новый промежуточный слой метрки входящего http-запроса.\n * @param config Конфигурация.\n * @return Промежуточный слой.\n */\nexport function getServeMeasuring(config: BaseConfig): ServerMiddleware {\n  const { requestCount, renderDuration, responseDuration } = getHandlerMetrics();\n\n  /** @inheritdoc */\n  const getResponseLabels = (req: Request, res: Response) =>\n    ({\n      version: config.appVersion,\n      route: req.url,\n      code: res.status,\n      method: req.method,\n    }) satisfies Record<(typeof LABEL_NAMES.httpResponse)[number], string | number>;\n\n  /** @inheritdoc */\n  const getRenderLabels = (request: Request) =>\n    ({\n      version: config.appVersion,\n      method: request.method,\n      route: request.url,\n    }) satisfies Record<(typeof LABEL_NAMES.pageRender)[number], string | number>;\n\n  return async (request, next, context) => {\n    const responseStart = process.hrtime.bigint();\n    let renderStart = 0n;\n\n    context.events.addEventListener(\n      PAGE_HANDLER_EVENT_TYPE.renderStart,\n      () => {\n        renderStart = process.hrtime.bigint();\n      },\n      { once: true },\n    );\n\n    context.events.addEventListener(\n      PAGE_HANDLER_EVENT_TYPE.renderFinish,\n      () => {\n        const renderFinish = process.hrtime.bigint();\n\n        renderDuration.observe(\n          getRenderLabels(request),\n          toMilliseconds(renderFinish - renderStart),\n        );\n      },\n      { once: true },\n    );\n\n    const response = await next(request);\n    const responseFinish = process.hrtime.bigint();\n\n    responseDuration.observe(\n      getResponseLabels(request, response),\n      toMilliseconds(responseFinish - responseStart),\n    );\n\n    requestCount.inc(getResponseLabels(request, response), 1);\n\n    return response;\n  };\n}\n"],"mappings":"AAEA,SAASA,uBAAuB,QAAQ,2BAAwB;AAChE,SAASC,cAAc,QAAQ,2BAAgB;AAC/C,SAAsBC,iBAAiB,QAAQ,0BAAuB;;AAEtE;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAACC,MAAkB,EAAoB;EACtE,MAAM;IAAEC,YAAY;IAAEC,cAAc;IAAEC;EAAiB,CAAC,GAAGL,iBAAiB,CAAC,CAAC;;EAE9E;EACA,MAAMM,iBAAiB,GAAGA,CAACC,GAAY,EAAEC,GAAa,MACnD;IACCC,OAAO,EAAEP,MAAM,CAACQ,UAAU;IAC1BC,KAAK,EAAEJ,GAAG,CAACK,GAAG;IACdC,IAAI,EAAEL,GAAG,CAACM,MAAM;IAChBC,MAAM,EAAER,GAAG,CAACQ;EACd,CAAC,CAA8E;;EAEjF;EACA,MAAMC,eAAe,GAAIC,OAAgB,KACtC;IACCR,OAAO,EAAEP,MAAM,CAACQ,UAAU;IAC1BK,MAAM,EAAEE,OAAO,CAACF,MAAM;IACtBJ,KAAK,EAAEM,OAAO,CAACL;EACjB,CAAC,CAA4E;EAE/E,OAAO,OAAOK,OAAO,EAAEC,IAAI,EAAEC,OAAO,KAAK;IACvC,MAAMC,aAAa,GAAGC,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;IAC7C,IAAIC,WAAW,GAAG,EAAE;IAEpBL,OAAO,CAACM,MAAM,CAACC,gBAAgB,CAC7B5B,uBAAuB,CAAC0B,WAAW,EACnC,MAAM;MACJA,WAAW,GAAGH,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;IACvC,CAAC,EACD;MAAEI,IAAI,EAAE;IAAK,CACf,CAAC;IAEDR,OAAO,CAACM,MAAM,CAACC,gBAAgB,CAC7B5B,uBAAuB,CAAC8B,YAAY,EACpC,MAAM;MACJ,MAAMA,YAAY,GAAGP,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;MAE5CnB,cAAc,CAACyB,OAAO,CACpBb,eAAe,CAACC,OAAO,CAAC,EACxBlB,cAAc,CAAC6B,YAAY,GAAGJ,WAAW,CAC3C,CAAC;IACH,CAAC,EACD;MAAEG,IAAI,EAAE;IAAK,CACf,CAAC;IAED,MAAMG,QAAQ,GAAG,MAAMZ,IAAI,CAACD,OAAO,CAAC;IACpC,MAAMc,cAAc,GAAGV,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;IAE9ClB,gBAAgB,CAACwB,OAAO,CACtBvB,iBAAiB,CAACW,OAAO,EAAEa,QAAQ,CAAC,EACpC/B,cAAc,CAACgC,cAAc,GAAGX,aAAa,CAC/C,CAAC;IAEDjB,YAAY,CAAC6B,GAAG,CAAC1B,iBAAiB,CAACW,OAAO,EAAEa,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEzD,OAAOA,QAAQ;EACjB,CAAC;AACH"}

package/dist/esm/preset/node-handler/providers/fetch-middleware.js

@@ -3,7 +3,7 @@ import { KnownToken } from "../../../tokens.js";
 import { getFetchErrorLogging } from "../../isomorphic/utils/get-fetch-error-logging.js";
 import { getFetchExtraAborting } from "../../isomorphic/utils/get-fetch-extra-aborting.js";
 import { getFetchLogging } from "../../isomorphic/utils/get-fetch-logging.js";
-import { getFetchTracing } from "../../server/utils/get-fetch-tracing.js";
+import { getFetchTracing } from "../../node/utils/get-fetch-tracing.js";
 import { getForwardedHeaders } from "../../node/utils/get-forwarded-headers.js";
 
 /**

package/dist/esm/preset/node-handler/providers/fetch-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-middleware.js","names":["defaultHeaders","KnownToken","getFetchErrorLogging","getFetchExtraAborting","getFetchLogging","getFetchTracing","getForwardedHeaders","provideFetchMiddleware","resolve","config","Config","base","tracer","Tracing","context","ExpressHandler","logHandler","Http","Fetch","Middleware","Log","handler","abortController","req","res","locals","tracing","rootContext"],"sources":["../../../../../src/preset/node-handler/providers/fetch-middleware.ts"],"sourcesContent":["import { Resolve } from '../../../di';\nimport { Middleware, defaultHeaders } from '../../../http';\nimport { KnownToken } from '../../../tokens';\nimport { getFetchErrorLogging } from '../../isomorphic/utils/get-fetch-error-logging';\nimport { getFetchExtraAborting } from '../../isomorphic/utils/get-fetch-extra-aborting';\nimport { getFetchLogging } from '../../isomorphic/utils/get-fetch-logging';\nimport { getFetchTracing } from '../../server/utils/get-fetch-tracing';\nimport { getForwardedHeaders } from '../../node/utils/get-forwarded-headers';\n\n/**\n * Провайдер промежуточных слоев для fetch.\n * @param resolve Функция для получения зависимости по токену.\n * @return Массив промежуточных слоев.\n */\nexport function provideFetchMiddleware(resolve: Resolve): Middleware[] {\n  const config = resolve(KnownToken.Config.base);\n  const tracer = resolve(KnownToken.Tracing.tracer);\n  const context = resolve(KnownToken.ExpressHandler.context);\n  const logHandler = resolve(KnownToken.Http.Fetch.Middleware.Log.handler);\n  const abortController = resolve(KnownToken.Http.Fetch.abortController);\n\n  return [\n    // ВАЖНО: слой логирования ошибки ПЕРЕД остальными слоями чтобы не упустить ошибки выше\n    getFetchErrorLogging(logHandler),\n\n    // пробрасываемые заголовки по соглашению\n    defaultHeaders(getForwardedHeaders(config, context.req)),\n\n    // обрывание по сигналу из обработчика входящего запроса и по сигналу из конфига исходящего запроса\n    getFetchExtraAborting(abortController),\n\n    getFetchTracing(tracer, context.res.locals.tracing.rootContext),\n\n    // ВАЖНО: слой логирования запроса и ответа ПОСЛЕ остальных слоев чтобы использовать актуальные данные\n    getFetchLogging(logHandler),\n  ];\n}\n"],"mappings":"AACA,SAAqBA,cAAc,QAAQ,0BAAe;AAC1D,SAASC,UAAU,QAAQ,oBAAiB;AAC5C,SAASC,oBAAoB,QAAQ,mDAAgD;AACrF,SAASC,qBAAqB,QAAQ,oDAAiD;AACvF,SAASC,eAAe,QAAQ,6CAA0C;AAC1E,SAASC,eAAe,QAAQ,yCAAsC;AACtE,SAASC,mBAAmB,QAAQ,2CAAwC;;AAE5E;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,sBAAsBA,CAACC,OAAgB,EAAgB;EACrE,MAAMC,MAAM,GAAGD,OAAO,CAACP,UAAU,CAACS,MAAM,CAACC,IAAI,CAAC;EAC9C,MAAMC,MAAM,GAAGJ,OAAO,CAACP,UAAU,CAACY,OAAO,CAACD,MAAM,CAAC;EACjD,MAAME,OAAO,GAAGN,OAAO,CAACP,UAAU,CAACc,cAAc,CAACD,OAAO,CAAC;EAC1D,MAAME,UAAU,GAAGR,OAAO,CAACP,UAAU,CAACgB,IAAI,CAACC,KAAK,CAACC,UAAU,CAACC,GAAG,CAACC,OAAO,CAAC;EACxE,MAAMC,eAAe,GAAGd,OAAO,CAACP,UAAU,CAACgB,IAAI,CAACC,KAAK,CAACI,eAAe,CAAC;EAEtE,OAAO;EACL;EACApB,oBAAoB,CAACc,UAAU,CAAC;EAEhC;EACAhB,cAAc,CAACM,mBAAmB,CAACG,MAAM,EAAEK,OAAO,CAACS,GAAG,CAAC,CAAC;EAExD;EACApB,qBAAqB,CAACmB,eAAe,CAAC,EAEtCjB,eAAe,CAACO,MAAM,EAAEE,OAAO,CAACU,GAAG,CAACC,MAAM,CAACC,OAAO,CAACC,WAAW,CAAC;EAE/D;EACAvB,eAAe,CAACY,UAAU,CAAC,CAC5B;AACH"}
+{"version":3,"file":"fetch-middleware.js","names":["defaultHeaders","KnownToken","getFetchErrorLogging","getFetchExtraAborting","getFetchLogging","getFetchTracing","getForwardedHeaders","provideFetchMiddleware","resolve","config","Config","base","tracer","Tracing","context","ExpressHandler","logHandler","Http","Fetch","Middleware","Log","handler","abortController","req","res","locals","tracing","rootContext"],"sources":["../../../../../src/preset/node-handler/providers/fetch-middleware.ts"],"sourcesContent":["import { Resolve } from '../../../di';\nimport { Middleware, defaultHeaders } from '../../../http';\nimport { KnownToken } from '../../../tokens';\nimport { getFetchErrorLogging } from '../../isomorphic/utils/get-fetch-error-logging';\nimport { getFetchExtraAborting } from '../../isomorphic/utils/get-fetch-extra-aborting';\nimport { getFetchLogging } from '../../isomorphic/utils/get-fetch-logging';\nimport { getFetchTracing } from '../../node/utils/get-fetch-tracing';\nimport { getForwardedHeaders } from '../../node/utils/get-forwarded-headers';\n\n/**\n * Провайдер промежуточных слоев для fetch.\n * @param resolve Функция для получения зависимости по токену.\n * @return Массив промежуточных слоев.\n */\nexport function provideFetchMiddleware(resolve: Resolve): Middleware[] {\n  const config = resolve(KnownToken.Config.base);\n  const tracer = resolve(KnownToken.Tracing.tracer);\n  const context = resolve(KnownToken.ExpressHandler.context);\n  const logHandler = resolve(KnownToken.Http.Fetch.Middleware.Log.handler);\n  const abortController = resolve(KnownToken.Http.Fetch.abortController);\n\n  return [\n    // ВАЖНО: слой логирования ошибки ПЕРЕД остальными слоями чтобы не упустить ошибки выше\n    getFetchErrorLogging(logHandler),\n\n    // пробрасываемые заголовки по соглашению\n    defaultHeaders(getForwardedHeaders(config, context.req)),\n\n    // обрывание по сигналу из обработчика входящего запроса и по сигналу из конфига исходящего запроса\n    getFetchExtraAborting(abortController),\n\n    getFetchTracing(tracer, context.res.locals.tracing.rootContext),\n\n    // ВАЖНО: слой логирования запроса и ответа ПОСЛЕ остальных слоев чтобы использовать актуальные данные\n    getFetchLogging(logHandler),\n  ];\n}\n"],"mappings":"AACA,SAAqBA,cAAc,QAAQ,0BAAe;AAC1D,SAASC,UAAU,QAAQ,oBAAiB;AAC5C,SAASC,oBAAoB,QAAQ,mDAAgD;AACrF,SAASC,qBAAqB,QAAQ,oDAAiD;AACvF,SAASC,eAAe,QAAQ,6CAA0C;AAC1E,SAASC,eAAe,QAAQ,uCAAoC;AACpE,SAASC,mBAAmB,QAAQ,2CAAwC;;AAE5E;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,sBAAsBA,CAACC,OAAgB,EAAgB;EACrE,MAAMC,MAAM,GAAGD,OAAO,CAACP,UAAU,CAACS,MAAM,CAACC,IAAI,CAAC;EAC9C,MAAMC,MAAM,GAAGJ,OAAO,CAACP,UAAU,CAACY,OAAO,CAACD,MAAM,CAAC;EACjD,MAAME,OAAO,GAAGN,OAAO,CAACP,UAAU,CAACc,cAAc,CAACD,OAAO,CAAC;EAC1D,MAAME,UAAU,GAAGR,OAAO,CAACP,UAAU,CAACgB,IAAI,CAACC,KAAK,CAACC,UAAU,CAACC,GAAG,CAACC,OAAO,CAAC;EACxE,MAAMC,eAAe,GAAGd,OAAO,CAACP,UAAU,CAACgB,IAAI,CAACC,KAAK,CAACI,eAAe,CAAC;EAEtE,OAAO;EACL;EACApB,oBAAoB,CAACc,UAAU,CAAC;EAEhC;EACAhB,cAAc,CAACM,mBAAmB,CAACG,MAAM,EAAEK,OAAO,CAACS,GAAG,CAAC,CAAC;EAExD;EACApB,qBAAqB,CAACmB,eAAe,CAAC,EAEtCjB,eAAe,CAACO,MAAM,EAAEE,OAAO,CAACU,GAAG,CAACC,MAAM,CAACC,OAAO,CAACC,WAAW,CAAC;EAE/D;EACAvB,eAAe,CAACY,UAAU,CAAC,CAC5B;AACH"}

package/dist/esm/preset/server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["PAGE_HANDLER_EVENT_TYPE","PAGE_FORMAT_PRIORITY","applyServerMiddleware","getClientIp","getForwardedHeaders","getHealthCheck","getPageResponseFormat","getServeErrorLogging","getServeLogging","HandlerProvider","RegularHelmet","HelmetContext","SpecificExtras"],"sources":["../../../../src/preset/server/index.ts"],"sourcesContent":["export type {\n  ServerHandler,\n  ServerMiddleware,\n  ServerHandlerContext,\n  PageResponseFormatter,\n  PageResponseFormatResult,\n} from './types';\nexport { PAGE_HANDLER_EVENT_TYPE, PAGE_FORMAT_PRIORITY } from './constants';\n\n// доступные утилиты\nexport { applyServerMiddleware } from './utils/apply-server-middleware';\nexport { getClientIp } from './utils/get-client-ip';\nexport { getForwardedHeaders } from './utils/get-forwarded-headers';\nexport { getHealthCheck } from './utils/get-health-check';\nexport { getPageResponseFormat } from './utils/get-page-response-format';\nexport { getServeErrorLogging } from './utils/get-serve-error-logging';\nexport { getServeLogging } from './utils/get-serve-logging';\nexport { HandlerProvider } from './utils/handler-provider';\nexport { RegularHelmet, HelmetContext } from './utils/regular-helmet';\nexport { SpecificExtras } from './utils/specific-extras';\n"],"mappings":"AAOA,SAASA,uBAAuB,EAAEC,oBAAoB,QAAQ,gBAAa;;AAE3E;AACA,SAASC,qBAAqB,QAAQ,oCAAiC;AACvE,SAASC,WAAW,QAAQ,0BAAuB;AACnD,SAASC,mBAAmB,QAAQ,kCAA+B;AACnE,SAASC,cAAc,QAAQ,6BAA0B;AACzD,SAASC,qBAAqB,QAAQ,qCAAkC;AACxE,SAASC,oBAAoB,QAAQ,oCAAiC;AACtE,SAASC,eAAe,QAAQ,8BAA2B;AAC3D,SAASC,eAAe,QAAQ,6BAA0B;AAC1D,SAASC,aAAa,EAAEC,aAAa,QAAQ,2BAAwB;AACrE,SAASC,cAAc,QAAQ,4BAAyB"}
+{"version":3,"file":"index.js","names":["PAGE_HANDLER_EVENT_TYPE","PAGE_FORMAT_PRIORITY","applyServerMiddleware","getClientIp","getForwardedHeaders","getHealthCheck","getPageResponseFormat","getServeErrorLogging","getServeLogging","HandlerProvider","RegularHelmet","HelmetContext","SpecificExtras"],"sources":["../../../../src/preset/server/index.ts"],"sourcesContent":["export type {\n  ServerHandler,\n  ServerMiddleware,\n  ServerHandlerContext,\n  PageResponseFormatter,\n  PageResponseFormatResult,\n  RouteInfo,\n  RouteList,\n} from './types';\nexport { PAGE_HANDLER_EVENT_TYPE, PAGE_FORMAT_PRIORITY } from './constants';\n\n// доступные утилиты\nexport { applyServerMiddleware } from './utils/apply-server-middleware';\nexport { getClientIp } from './utils/get-client-ip';\nexport { getForwardedHeaders } from './utils/get-forwarded-headers';\nexport { getHealthCheck } from './utils/get-health-check';\nexport { getPageResponseFormat } from './utils/get-page-response-format';\nexport { getServeErrorLogging } from './utils/get-serve-error-logging';\nexport { getServeLogging } from './utils/get-serve-logging';\nexport { HandlerProvider } from './utils/handler-provider';\nexport { RegularHelmet, HelmetContext } from './utils/regular-helmet';\nexport { SpecificExtras } from './utils/specific-extras';\n"],"mappings":"AASA,SAASA,uBAAuB,EAAEC,oBAAoB,QAAQ,gBAAa;;AAE3E;AACA,SAASC,qBAAqB,QAAQ,oCAAiC;AACvE,SAASC,WAAW,QAAQ,0BAAuB;AACnD,SAASC,mBAAmB,QAAQ,kCAA+B;AACnE,SAASC,cAAc,QAAQ,6BAA0B;AACzD,SAASC,qBAAqB,QAAQ,qCAAkC;AACxE,SAASC,oBAAoB,QAAQ,oCAAiC;AACtE,SAASC,eAAe,QAAQ,8BAA2B;AAC3D,SAASC,eAAe,QAAQ,6BAA0B;AAC1D,SAASC,aAAa,EAAEC,aAAa,QAAQ,2BAAwB;AACrE,SAASC,cAAc,QAAQ,4BAAyB"}

package/dist/esm/preset/server/providers/fetch-middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch-middleware.js","names":["provideFetchMiddleware"],"sources":["../../../../../src/preset/server/providers/fetch-middleware.ts"],"sourcesContent":["/* eslint-disable require-jsdoc, jsdoc/require-jsdoc */\nimport { Middleware } from '../../../http';\n\nexport function provideFetchMiddleware(): Middleware[] {\n  // @todo добавить логирование ошибок?\n  return [];\n}\n"],"mappings":"AAAA;;AAGA,OAAO,SAASA,sBAAsBA,CAAA,EAAiB;EACrD;EACA,OAAO,EAAE;AACX"}

package/dist/esm/preset/server/providers/serve.js

@@ -0,0 +1,41 @@
+/* eslint-disable require-jsdoc, jsdoc/require-jsdoc */
+
+import { KnownToken } from "../../../tokens.js";
+import { proxy } from "./../../../http/index.js";
+import { router, applyMiddleware } from '@krutoo/fetch-tools';
+import { applyServerMiddleware } from "../utils/apply-server-middleware.js";
+export function provideServe(resolve) {
+  const config = resolve(KnownToken.Config.base);
+  const pageRoutes = resolve(KnownToken.Http.Serve.pageRoutes);
+  const serviceRoutes = resolve(KnownToken.Http.Serve.serviceRoutes);
+  const middleware = resolve(KnownToken.Http.Serve.middleware);
+  const proxyConfig = resolve(KnownToken.Http.Serve.Proxy.config);
+  const enhance = config.env === 'development' && proxyConfig ? applyMiddleware(...(Array.isArray(proxyConfig) ? proxyConfig.map(proxy) : [proxy(proxyConfig)])) : identity;
+  const builder = router.builder();
+
+  // маршруты с промежуточными слоями
+  for (const [pattern, handler] of pageRoutes) {
+    const path = typeof pattern === 'string' ? pattern : pattern.path;
+    const method = typeof pattern === 'string' ? 'get' : pattern.method;
+    const pageHandler = applyServerMiddleware(...middleware)(handler);
+    builder[method](path, request => pageHandler(request, {
+      events: new EventTarget()
+    }));
+  }
+
+  // служебные маршруты (к ним не применяются промежуточные слои)
+  for (const [pattern, handler] of serviceRoutes) {
+    const path = typeof pattern === 'string' ? pattern : pattern.path;
+    const method = typeof pattern === 'string' ? 'get' : pattern.method;
+    builder[method](path, request => handler(request, {
+      events: new EventTarget()
+    }));
+  }
+
+  // @todo также добавить apiRoutes?
+  return enhance(builder.build());
+}
+function identity(value) {
+  return value;
+}
+//# sourceMappingURL=serve.js.map

package/dist/esm/preset/server/providers/serve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serve.js","names":["KnownToken","proxy","router","applyMiddleware","applyServerMiddleware","provideServe","resolve","config","Config","base","pageRoutes","Http","Serve","serviceRoutes","middleware","proxyConfig","Proxy","enhance","env","Array","isArray","map","identity","builder","pattern","handler","path","method","pageHandler","request","events","EventTarget","build","value"],"sources":["../../../../../src/preset/server/providers/serve.ts"],"sourcesContent":["/* eslint-disable require-jsdoc, jsdoc/require-jsdoc */\nimport { Resolve } from '../../../di';\nimport { KnownToken } from '../../../tokens';\nimport { Handler, proxy } from '../../../http';\nimport { router, applyMiddleware } from '@krutoo/fetch-tools';\nimport { applyServerMiddleware } from '../utils/apply-server-middleware';\n\nexport function provideServe(resolve: Resolve): Handler {\n  const config = resolve(KnownToken.Config.base);\n  const pageRoutes = resolve(KnownToken.Http.Serve.pageRoutes);\n  const serviceRoutes = resolve(KnownToken.Http.Serve.serviceRoutes);\n  const middleware = resolve(KnownToken.Http.Serve.middleware);\n  const proxyConfig = resolve(KnownToken.Http.Serve.Proxy.config);\n\n  const enhance =\n    config.env === 'development' && proxyConfig\n      ? applyMiddleware(\n          ...(Array.isArray(proxyConfig) ? proxyConfig.map(proxy) : [proxy(proxyConfig)]),\n        )\n      : identity;\n\n  const builder = router.builder();\n\n  // маршруты с промежуточными слоями\n  for (const [pattern, handler] of pageRoutes) {\n    const path = typeof pattern === 'string' ? pattern : pattern.path;\n    const method = typeof pattern === 'string' ? 'get' : pattern.method;\n    const pageHandler = applyServerMiddleware(...middleware)(handler);\n\n    builder[method](path, request => pageHandler(request, { events: new EventTarget() }));\n  }\n\n  // служебные маршруты (к ним не применяются промежуточные слои)\n  for (const [pattern, handler] of serviceRoutes) {\n    const path = typeof pattern === 'string' ? pattern : pattern.path;\n    const method = typeof pattern === 'string' ? 'get' : pattern.method;\n\n    builder[method](path, request => handler(request, { events: new EventTarget() }));\n  }\n\n  // @todo также добавить apiRoutes?\n  return enhance(builder.build());\n}\n\nfunction identity<T>(value: T): T {\n  return value;\n}\n"],"mappings":"AAAA;;AAEA,SAASA,UAAU,QAAQ,oBAAiB;AAC5C,SAAkBC,KAAK,QAAQ,0BAAe;AAC9C,SAASC,MAAM,EAAEC,eAAe,QAAQ,qBAAqB;AAC7D,SAASC,qBAAqB,QAAQ,qCAAkC;AAExE,OAAO,SAASC,YAAYA,CAACC,OAAgB,EAAW;EACtD,MAAMC,MAAM,GAAGD,OAAO,CAACN,UAAU,CAACQ,MAAM,CAACC,IAAI,CAAC;EAC9C,MAAMC,UAAU,GAAGJ,OAAO,CAACN,UAAU,CAACW,IAAI,CAACC,KAAK,CAACF,UAAU,CAAC;EAC5D,MAAMG,aAAa,GAAGP,OAAO,CAACN,UAAU,CAACW,IAAI,CAACC,KAAK,CAACC,aAAa,CAAC;EAClE,MAAMC,UAAU,GAAGR,OAAO,CAACN,UAAU,CAACW,IAAI,CAACC,KAAK,CAACE,UAAU,CAAC;EAC5D,MAAMC,WAAW,GAAGT,OAAO,CAACN,UAAU,CAACW,IAAI,CAACC,KAAK,CAACI,KAAK,CAACT,MAAM,CAAC;EAE/D,MAAMU,OAAO,GACXV,MAAM,CAACW,GAAG,KAAK,aAAa,IAAIH,WAAW,GACvCZ,eAAe,CACb,IAAIgB,KAAK,CAACC,OAAO,CAACL,WAAW,CAAC,GAAGA,WAAW,CAACM,GAAG,CAACpB,KAAK,CAAC,GAAG,CAACA,KAAK,CAACc,WAAW,CAAC,CAAC,CAChF,CAAC,GACDO,QAAQ;EAEd,MAAMC,OAAO,GAAGrB,MAAM,CAACqB,OAAO,CAAC,CAAC;;EAEhC;EACA,KAAK,MAAM,CAACC,OAAO,EAAEC,OAAO,CAAC,IAAIf,UAAU,EAAE;IAC3C,MAAMgB,IAAI,GAAG,OAAOF,OAAO,KAAK,QAAQ,GAAGA,OAAO,GAAGA,OAAO,CAACE,IAAI;IACjE,MAAMC,MAAM,GAAG,OAAOH,OAAO,KAAK,QAAQ,GAAG,KAAK,GAAGA,OAAO,CAACG,MAAM;IACnE,MAAMC,WAAW,GAAGxB,qBAAqB,CAAC,GAAGU,UAAU,CAAC,CAACW,OAAO,CAAC;IAEjEF,OAAO,CAACI,MAAM,CAAC,CAACD,IAAI,EAAEG,OAAO,IAAID,WAAW,CAACC,OAAO,EAAE;MAAEC,MAAM,EAAE,IAAIC,WAAW,CAAC;IAAE,CAAC,CAAC,CAAC;EACvF;;EAEA;EACA,KAAK,MAAM,CAACP,OAAO,EAAEC,OAAO,CAAC,IAAIZ,aAAa,EAAE;IAC9C,MAAMa,IAAI,GAAG,OAAOF,OAAO,KAAK,QAAQ,GAAGA,OAAO,GAAGA,OAAO,CAACE,IAAI;IACjE,MAAMC,MAAM,GAAG,OAAOH,OAAO,KAAK,QAAQ,GAAG,KAAK,GAAGA,OAAO,CAACG,MAAM;IAEnEJ,OAAO,CAACI,MAAM,CAAC,CAACD,IAAI,EAAEG,OAAO,IAAIJ,OAAO,CAACI,OAAO,EAAE;MAAEC,MAAM,EAAE,IAAIC,WAAW,CAAC;IAAE,CAAC,CAAC,CAAC;EACnF;;EAEA;EACA,OAAOd,OAAO,CAACM,OAAO,CAACS,KAAK,CAAC,CAAC,CAAC;AACjC;AAEA,SAASV,QAAQA,CAAIW,KAAQ,EAAK;EAChC,OAAOA,KAAK;AACd"}

package/dist/esm/preset/server/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../../src/preset/server/types.ts"],"sourcesContent":["import type { PageAssets } from '../isomorphic';\n\n/**\n * На сервере между промежуточными слоями надо обмениваться данными поэтому появился такой интерфейс.\n * Возможно в будущем он перейдет в `@krutoo/fetch-tools`.\n */\nexport interface ServerHandlerContext {\n  events: EventTarget;\n}\n\nexport interface ServerHandler {\n  (request: Request, context: ServerHandlerContext): Response | Promise<Response>;\n}\n\nexport interface ServerEnhancer {\n  (request: ServerHandler): ServerHandler;\n}\n\nexport interface ServerMiddleware {\n  (\n    request: Request,\n    next: (req: Request, ctx?: ServerHandlerContext) => Response | Promise<Response>,\n    context: ServerHandlerContext,\n  ): Response | Promise<Response>;\n}\n\nexport interface PageResponseFormatResult {\n  body: string;\n  headers: Headers;\n}\n\nexport interface PageResponseFormatter {\n  (\n    jsx: JSX.Element,\n    assets: PageAssets,\n  ): PageResponseFormatResult | Promise<PageResponseFormatResult>;\n}\n\nexport interface RenderToString {\n  (jsx: JSX.Element): string | Promise<string>;\n}\n"],"mappings":""}
+{"version":3,"file":"types.js","names":[],"sources":["../../../../src/preset/server/types.ts"],"sourcesContent":["import type { PageAssets } from '../isomorphic';\n\n/**\n * На сервере между промежуточными слоями надо обмениваться данными поэтому появился такой интерфейс.\n * Возможно в будущем он перейдет в `@krutoo/fetch-tools`.\n */\nexport interface ServerHandlerContext {\n  events: EventTarget;\n}\n\nexport interface ServerHandler {\n  (request: Request, context: ServerHandlerContext): Response | Promise<Response>;\n}\n\nexport interface ServerEnhancer {\n  (request: ServerHandler): ServerHandler;\n}\n\nexport interface ServerMiddleware {\n  (\n    request: Request,\n    next: (req: Request, ctx?: ServerHandlerContext) => Response | Promise<Response>,\n    context: ServerHandlerContext,\n  ): Response | Promise<Response>;\n}\n\nexport interface PageResponseFormatResult {\n  body: string;\n  headers: Headers;\n}\n\nexport interface PageResponseFormatter {\n  (\n    jsx: JSX.Element,\n    assets: PageAssets,\n  ): PageResponseFormatResult | Promise<PageResponseFormatResult>;\n}\n\nexport interface RenderToString {\n  (jsx: JSX.Element): string | Promise<string>;\n}\n\nexport interface RouteInfo {\n  method: 'all' | 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options' | 'head';\n  path: string;\n}\n\nexport type RouteList = Array<[string | RouteInfo, ServerHandler]>;\n"],"mappings":""}

package/dist/esm/preset/server/utils/get-page-response-format.js

@@ -4,6 +4,7 @@
  * Вернет "html" во всех остальных случаях.
  * @param request Запрос.
  * @return Формат.
+ * @deprecated Стоит использовать npm:accepts.
  */
 export function getPageResponseFormat(request) {
   let result = 'html';

package/dist/esm/preset/server/utils/get-page-response-format.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-page-response-format.js","names":["getPageResponseFormat","request","result","headers","get","toLowerCase","includes"],"sources":["../../../../../src/preset/server/utils/get-page-response-format.ts"],"sourcesContent":["/**\n * Определяет формат ответа для страницы (html-верстки).\n * Вернет \"json\" - если заголовок запроса \"accept\" содержит \"application/json\".\n * Вернет \"html\" во всех остальных случаях.\n * @param request Запрос.\n * @return Формат.\n */\nexport function getPageResponseFormat(request: Request): 'html' | 'json' {\n  let result: 'html' | 'json' = 'html';\n\n  if ((request.headers.get('accept') || '').toLowerCase().includes('application/json')) {\n    result = 'json';\n  }\n\n  return result;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,qBAAqBA,CAACC,OAAgB,EAAmB;EACvE,IAAIC,MAAuB,GAAG,MAAM;EAEpC,IAAI,CAACD,OAAO,CAACE,OAAO,CAACC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAEC,WAAW,CAAC,CAAC,CAACC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;IACpFJ,MAAM,GAAG,MAAM;EACjB;EAEA,OAAOA,MAAM;AACf"}
+{"version":3,"file":"get-page-response-format.js","names":["getPageResponseFormat","request","result","headers","get","toLowerCase","includes"],"sources":["../../../../../src/preset/server/utils/get-page-response-format.ts"],"sourcesContent":["/**\n * Определяет формат ответа для страницы (html-верстки).\n * Вернет \"json\" - если заголовок запроса \"accept\" содержит \"application/json\".\n * Вернет \"html\" во всех остальных случаях.\n * @param request Запрос.\n * @return Формат.\n * @deprecated Стоит использовать npm:accepts.\n */\nexport function getPageResponseFormat(request: Request): 'html' | 'json' {\n  let result: 'html' | 'json' = 'html';\n\n  if ((request.headers.get('accept') || '').toLowerCase().includes('application/json')) {\n    result = 'json';\n  }\n\n  return result;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,qBAAqBA,CAACC,OAAgB,EAAmB;EACvE,IAAIC,MAAuB,GAAG,MAAM;EAEpC,IAAI,CAACD,OAAO,CAACE,OAAO,CAACC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAEC,WAAW,CAAC,CAAC,CAACC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;IACpFJ,MAAM,GAAG,MAAM;EACjB;EAEA,OAAOA,MAAM;AACf"}

package/dist/esm/preset/server/utils/get-serve-error-logging.js

@@ -14,7 +14,7 @@ export function getServeErrorLogging(logger) {
     }) => {
       logger.error(new DetailedError(String(error), {
         level: 'error',
-        context: [{
+        context: {
           key: 'Incoming request details',
           data: {
             url: FetchUtil.withoutParams(request.url),
@@ -23,7 +23,7 @@ export function getServeErrorLogging(logger) {
             params: Object.fromEntries(new URL(request.url).searchParams.entries())
             // @todo data
           }
-        }]
+        }
       }));
     }
   });

package/dist/esm/preset/server/utils/get-serve-error-logging.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-serve-error-logging.js","names":["FetchUtil","log","DetailedError","getServeErrorLogging","logger","onCatch","request","error","String","level","context","key","data","url","withoutParams","method","headers","Object","fromEntries","entries","params","URL","searchParams"],"sources":["../../../../../src/preset/server/utils/get-serve-error-logging.ts"],"sourcesContent":["import { FetchUtil, log, type Middleware } from '../../../http';\nimport { DetailedError, type Logger } from '../../../log';\n\n/**\n * Возвращает новый промежуточный слой для логирования ошибки при обработке входящего http-запроса.\n * @param logger Logger.\n * @return Промежуточный слой.\n */\nexport function getServeErrorLogging(logger: Logger): Middleware {\n  return log({\n    onCatch: ({ request, error }) => {\n      logger.error(\n        new DetailedError(String(error), {\n          level: 'error',\n          context: [\n            {\n              key: 'Incoming request details',\n              data: {\n                url: FetchUtil.withoutParams(request.url),\n                method: request.method,\n                headers: Object.fromEntries(request.headers.entries()),\n                params: Object.fromEntries(new URL(request.url).searchParams.entries()),\n                // @todo data\n              },\n            },\n          ],\n        }),\n      );\n    },\n  });\n}\n"],"mappings":"AAAA,SAASA,SAAS,EAAEC,GAAG,QAAyB,0BAAe;AAC/D,SAASC,aAAa,QAAqB,yBAAc;;AAEzD;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,oBAAoBA,CAACC,MAAc,EAAc;EAC/D,OAAOH,GAAG,CAAC;IACTI,OAAO,EAAEA,CAAC;MAAEC,OAAO;MAAEC;IAAM,CAAC,KAAK;MAC/BH,MAAM,CAACG,KAAK,CACV,IAAIL,aAAa,CAACM,MAAM,CAACD,KAAK,CAAC,EAAE;QAC/BE,KAAK,EAAE,OAAO;QACdC,OAAO,EAAE,CACP;UACEC,GAAG,EAAE,0BAA0B;UAC/BC,IAAI,EAAE;YACJC,GAAG,EAAEb,SAAS,CAACc,aAAa,CAACR,OAAO,CAACO,GAAG,CAAC;YACzCE,MAAM,EAAET,OAAO,CAACS,MAAM;YACtBC,OAAO,EAAEC,MAAM,CAACC,WAAW,CAACZ,OAAO,CAACU,OAAO,CAACG,OAAO,CAAC,CAAC,CAAC;YACtDC,MAAM,EAAEH,MAAM,CAACC,WAAW,CAAC,IAAIG,GAAG,CAACf,OAAO,CAACO,GAAG,CAAC,CAACS,YAAY,CAACH,OAAO,CAAC,CAAC;YACtE;UACF;QACF,CAAC;MAEL,CAAC,CACH,CAAC;IACH;EACF,CAAC,CAAC;AACJ"}
+{"version":3,"file":"get-serve-error-logging.js","names":["FetchUtil","log","DetailedError","getServeErrorLogging","logger","onCatch","request","error","String","level","context","key","data","url","withoutParams","method","headers","Object","fromEntries","entries","params","URL","searchParams"],"sources":["../../../../../src/preset/server/utils/get-serve-error-logging.ts"],"sourcesContent":["import { FetchUtil, log, type Middleware } from '../../../http';\nimport { DetailedError, type Logger } from '../../../log';\n\n/**\n * Возвращает новый промежуточный слой для логирования ошибки при обработке входящего http-запроса.\n * @param logger Logger.\n * @return Промежуточный слой.\n */\nexport function getServeErrorLogging(logger: Logger): Middleware {\n  return log({\n    onCatch: ({ request, error }) => {\n      logger.error(\n        new DetailedError(String(error), {\n          level: 'error',\n          context: {\n            key: 'Incoming request details',\n            data: {\n              url: FetchUtil.withoutParams(request.url),\n              method: request.method,\n              headers: Object.fromEntries(request.headers.entries()),\n              params: Object.fromEntries(new URL(request.url).searchParams.entries()),\n              // @todo data\n            },\n          },\n        }),\n      );\n    },\n  });\n}\n"],"mappings":"AAAA,SAASA,SAAS,EAAEC,GAAG,QAAyB,0BAAe;AAC/D,SAASC,aAAa,QAAqB,yBAAc;;AAEzD;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,oBAAoBA,CAACC,MAAc,EAAc;EAC/D,OAAOH,GAAG,CAAC;IACTI,OAAO,EAAEA,CAAC;MAAEC,OAAO;MAAEC;IAAM,CAAC,KAAK;MAC/BH,MAAM,CAACG,KAAK,CACV,IAAIL,aAAa,CAACM,MAAM,CAACD,KAAK,CAAC,EAAE;QAC/BE,KAAK,EAAE,OAAO;QACdC,OAAO,EAAE;UACPC,GAAG,EAAE,0BAA0B;UAC/BC,IAAI,EAAE;YACJC,GAAG,EAAEb,SAAS,CAACc,aAAa,CAACR,OAAO,CAACO,GAAG,CAAC;YACzCE,MAAM,EAAET,OAAO,CAACS,MAAM;YACtBC,OAAO,EAAEC,MAAM,CAACC,WAAW,CAACZ,OAAO,CAACU,OAAO,CAACG,OAAO,CAAC,CAAC,CAAC;YACtDC,MAAM,EAAEH,MAAM,CAACC,WAAW,CAAC,IAAIG,GAAG,CAACf,OAAO,CAACO,GAAG,CAAC,CAACS,YAAY,CAACH,OAAO,CAAC,CAAC;YACtE;UACF;QACF;MACF,CAAC,CACH,CAAC;IACH;EACF,CAAC,CAAC;AACJ"}

package/dist/esm/preset/server/utils/get-serve-logging.js

@@ -1,4 +1,3 @@
-import { toMilliseconds } from "./../../../utils/index.js";
 import { getClientIp } from "./get-client-ip.js";
 
 /**
@@ -8,7 +7,7 @@ import { getClientIp } from "./get-client-ip.js";
  */
 export function getServeLogging(logger) {
   return async (request, next) => {
-    const start = process.hrtime.bigint();
+    const start = performance.now();
     const clientIp = getClientIp(request);
     logger.info({
       type: 'http.request[incoming]',
@@ -17,14 +16,14 @@ export function getServeLogging(logger) {
       remote_ip: clientIp
     });
     const response = await next(request);
-    const finish = process.hrtime.bigint();
+    const finish = performance.now();
     logger.info({
       type: 'http.response[outgoing]',
       route: request.url,
       method: request.method,
       status: response.status,
       remote_ip: clientIp,
-      latency: toMilliseconds(finish - start)
+      latency: finish - start
     });
     return response;
   };

package/dist/esm/preset/server/utils/get-serve-logging.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-serve-logging.js","names":["toMilliseconds","getClientIp","getServeLogging","logger","request","next","start","process","hrtime","bigint","clientIp","info","type","route","url","method","remote_ip","response","finish","status","latency"],"sources":["../../../../../src/preset/server/utils/get-serve-logging.ts"],"sourcesContent":["import type { Middleware } from '../../../http';\nimport type { Logger } from '../../../log';\nimport { toMilliseconds } from '../../../utils';\nimport { getClientIp } from './get-client-ip';\n\n/**\n * Возвращает новый промежуточный слой для логирования обработки входящего http-запроса.\n * @param logger Logger.\n * @return Промежуточный слой.\n */\nexport function getServeLogging(logger: Logger): Middleware {\n  return async (request, next) => {\n    const start = process.hrtime.bigint();\n    const clientIp = getClientIp(request);\n\n    logger.info({\n      type: 'http.request[incoming]',\n      route: request.url,\n      method: request.method,\n      remote_ip: clientIp,\n    });\n\n    const response = await next(request);\n\n    const finish = process.hrtime.bigint();\n\n    logger.info({\n      type: 'http.response[outgoing]',\n      route: request.url,\n      method: request.method,\n      status: response.status,\n      remote_ip: clientIp,\n      latency: toMilliseconds(finish - start),\n    });\n\n    return response;\n  };\n}\n"],"mappings":"AAEA,SAASA,cAAc,QAAQ,2BAAgB;AAC/C,SAASC,WAAW,QAAQ,oBAAiB;;AAE7C;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAACC,MAAc,EAAc;EAC1D,OAAO,OAAOC,OAAO,EAAEC,IAAI,KAAK;IAC9B,MAAMC,KAAK,GAAGC,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;IACrC,MAAMC,QAAQ,GAAGT,WAAW,CAACG,OAAO,CAAC;IAErCD,MAAM,CAACQ,IAAI,CAAC;MACVC,IAAI,EAAE,wBAAwB;MAC9BC,KAAK,EAAET,OAAO,CAACU,GAAG;MAClBC,MAAM,EAAEX,OAAO,CAACW,MAAM;MACtBC,SAAS,EAAEN;IACb,CAAC,CAAC;IAEF,MAAMO,QAAQ,GAAG,MAAMZ,IAAI,CAACD,OAAO,CAAC;IAEpC,MAAMc,MAAM,GAAGX,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;IAEtCN,MAAM,CAACQ,IAAI,CAAC;MACVC,IAAI,EAAE,yBAAyB;MAC/BC,KAAK,EAAET,OAAO,CAACU,GAAG;MAClBC,MAAM,EAAEX,OAAO,CAACW,MAAM;MACtBI,MAAM,EAAEF,QAAQ,CAACE,MAAM;MACvBH,SAAS,EAAEN,QAAQ;MACnBU,OAAO,EAAEpB,cAAc,CAACkB,MAAM,GAAGZ,KAAK;IACxC,CAAC,CAAC;IAEF,OAAOW,QAAQ;EACjB,CAAC;AACH"}
+{"version":3,"file":"get-serve-logging.js","names":["getClientIp","getServeLogging","logger","request","next","start","performance","now","clientIp","info","type","route","url","method","remote_ip","response","finish","status","latency"],"sources":["../../../../../src/preset/server/utils/get-serve-logging.ts"],"sourcesContent":["import type { Middleware } from '../../../http';\nimport type { Logger } from '../../../log';\nimport { getClientIp } from './get-client-ip';\n\n/**\n * Возвращает новый промежуточный слой для логирования обработки входящего http-запроса.\n * @param logger Logger.\n * @return Промежуточный слой.\n */\nexport function getServeLogging(logger: Logger): Middleware {\n  return async (request, next) => {\n    const start = performance.now();\n    const clientIp = getClientIp(request);\n\n    logger.info({\n      type: 'http.request[incoming]',\n      route: request.url,\n      method: request.method,\n      remote_ip: clientIp,\n    });\n\n    const response = await next(request);\n\n    const finish = performance.now();\n\n    logger.info({\n      type: 'http.response[outgoing]',\n      route: request.url,\n      method: request.method,\n      status: response.status,\n      remote_ip: clientIp,\n      latency: finish - start,\n    });\n\n    return response;\n  };\n}\n"],"mappings":"AAEA,SAASA,WAAW,QAAQ,oBAAiB;;AAE7C;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAACC,MAAc,EAAc;EAC1D,OAAO,OAAOC,OAAO,EAAEC,IAAI,KAAK;IAC9B,MAAMC,KAAK,GAAGC,WAAW,CAACC,GAAG,CAAC,CAAC;IAC/B,MAAMC,QAAQ,GAAGR,WAAW,CAACG,OAAO,CAAC;IAErCD,MAAM,CAACO,IAAI,CAAC;MACVC,IAAI,EAAE,wBAAwB;MAC9BC,KAAK,EAAER,OAAO,CAACS,GAAG;MAClBC,MAAM,EAAEV,OAAO,CAACU,MAAM;MACtBC,SAAS,EAAEN;IACb,CAAC,CAAC;IAEF,MAAMO,QAAQ,GAAG,MAAMX,IAAI,CAACD,OAAO,CAAC;IAEpC,MAAMa,MAAM,GAAGV,WAAW,CAACC,GAAG,CAAC,CAAC;IAEhCL,MAAM,CAACO,IAAI,CAAC;MACVC,IAAI,EAAE,yBAAyB;MAC/BC,KAAK,EAAER,OAAO,CAACS,GAAG;MAClBC,MAAM,EAAEV,OAAO,CAACU,MAAM;MACtBI,MAAM,EAAEF,QAAQ,CAACE,MAAM;MACvBH,SAAS,EAAEN,QAAQ;MACnBU,OAAO,EAAEF,MAAM,GAAGX;IACpB,CAAC,CAAC;IAEF,OAAOU,QAAQ;EACjB,CAAC;AACH"}

package/dist/esm/preset/web/providers/axios-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"axios-middleware.js","names":["KnownToken","HttpStatus","logMiddleware","provideAxiosMiddleware","resolve","logHandler","Axios","Middleware","Log","handler","axiosMiddleware"],"sources":["../../../../../src/preset/web/providers/axios-middleware.ts"],"sourcesContent":["import { Resolve } from '../../../di';\nimport { KnownToken } from '../../../tokens';\nimport { HttpStatus } from '../../isomorphic/utils/http-status';\nimport { logMiddleware } from '../../../utils/axios';\n\n/**\n * Провайдер фабрики http-клиентов.\n * @param resolve Функция для получения зависимости по токену.\n * @return Фабрика.\n */\nexport function provideAxiosMiddleware(resolve: Resolve) {\n  const logHandler = resolve(KnownToken.Axios.Middleware.Log.handler);\n\n  return [HttpStatus.axiosMiddleware(), logMiddleware(logHandler)];\n}\n"],"mappings":"AACA,SAASA,UAAU,QAAQ,oBAAiB;AAC5C,SAASC,UAAU,QAAQ,uCAAoC;AAC/D,SAASC,aAAa,QAAQ,iCAAsB;;AAEpD;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,sBAAsBA,CAACC,OAAgB,EAAE;EACvD,MAAMC,UAAU,GAAGD,OAAO,CAACJ,UAAU,CAACM,KAAK,CAACC,UAAU,CAACC,GAAG,CAACC,OAAO,CAAC;EAEnE,OAAO,CAACR,UAAU,CAACS,eAAe,CAAC,CAAC,EAAER,aAAa,CAACG,UAAU,CAAC,CAAC;AAClE"}
+{"version":3,"file":"axios-middleware.js","names":["KnownToken","HttpStatus","logMiddleware","provideAxiosMiddleware","resolve","logHandler","Axios","Middleware","Log","handler","axiosMiddleware"],"sources":["../../../../../src/preset/web/providers/axios-middleware.ts"],"sourcesContent":["import type { Middleware } from 'middleware-axios';\nimport type { Resolve } from '../../../di';\nimport { KnownToken } from '../../../tokens';\nimport { HttpStatus } from '../../isomorphic/utils/http-status';\nimport { logMiddleware } from '../../../utils/axios';\n\n/**\n * Провайдер фабрики http-клиентов.\n * @param resolve Функция для получения зависимости по токену.\n * @return Фабрика.\n */\nexport function provideAxiosMiddleware(resolve: Resolve): Middleware<unknown>[] {\n  const logHandler = resolve(KnownToken.Axios.Middleware.Log.handler);\n\n  return [HttpStatus.axiosMiddleware(), logMiddleware(logHandler)];\n}\n"],"mappings":"AAEA,SAASA,UAAU,QAAQ,oBAAiB;AAC5C,SAASC,UAAU,QAAQ,uCAAoC;AAC/D,SAASC,aAAa,QAAQ,iCAAsB;;AAEpD;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,sBAAsBA,CAACC,OAAgB,EAAyB;EAC9E,MAAMC,UAAU,GAAGD,OAAO,CAACJ,UAAU,CAACM,KAAK,CAACC,UAAU,CAACC,GAAG,CAACC,OAAO,CAAC;EAEnE,OAAO,CAACR,UAAU,CAACS,eAAe,CAAC,CAAC,EAAER,aAAa,CAACG,UAAU,CAAC,CAAC;AAClE"}