npm - @sima-land/isomorph - Versions diffs - 11.0.0-alpha.45 → 11.0.0-alpha.47 - Mend

@sima-land/isomorph 11.0.0-alpha.45 → 11.0.0-alpha.47

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (232) hide show

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.provideMetricsHttpApp = provideMetricsHttpApp;
+exports.provideMetricsExpressApp = provideMetricsExpressApp;
 var PromClient = _interopRequireWildcard(require("prom-client"));
 var _express = _interopRequireDefault(require("express"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -13,7 +13,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * Провайдер express-приложения метрик.
  * @return Пул известных http-хостов.
  */
-function provideMetricsHttpApp() {
+function provideMetricsExpressApp() {
   PromClient.collectDefaultMetrics();
   const app = (0, _express.default)();
   app.get('/', async function (req, res) {
@@ -23,4 +23,4 @@ function provideMetricsHttpApp() {
   });
   return app;
 }
-//# sourceMappingURL=metrics-http-app.js.map
+//# sourceMappingURL=metrics-express-app.js.map

package/dist/cjs/preset/node/providers/metrics-express-app.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"metrics-express-app.js","names":["PromClient","_interopRequireWildcard","require","_express","_interopRequireDefault","obj","__esModule","default","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","provideMetricsExpressApp","collectDefaultMetrics","app","express","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,IAAAA,UAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,QAAA,GAAAC,sBAAA,CAAAF,OAAA;AAA8B,SAAAE,uBAAAC,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAR,wBAAAI,GAAA,EAAAI,WAAA,SAAAA,WAAA,IAAAJ,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAQ,KAAA,GAAAL,wBAAA,CAAAC,WAAA,OAAAI,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAT,GAAA,YAAAQ,KAAA,CAAAE,GAAA,CAAAV,GAAA,SAAAW,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAhB,GAAA,QAAAgB,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAnB,GAAA,EAAAgB,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAf,GAAA,EAAAgB,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAhB,GAAA,CAAAgB,GAAA,SAAAL,MAAA,CAAAT,OAAA,GAAAF,GAAA,MAAAQ,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAArB,GAAA,EAAAW,MAAA,YAAAA,MAAA;AAE9B;AACA;AACA;AACA;AACO,SAASW,wBAAwBA,CAAA,EAAwB;EAC9D3B,UAAU,CAAC4B,qBAAqB,CAAC,CAAC;EAElC,MAAMC,GAAG,GAAG,IAAAC,gBAAO,EAAC,CAAC;EAErBD,GAAG,CAACd,GAAG,CAAC,GAAG,EAAE,gBAAgBgB,GAAG,EAAEC,GAAG,EAAE;IACrC,MAAMC,OAAO,GAAG,MAAMjC,UAAU,CAACkC,QAAQ,CAACD,OAAO,CAAC,CAAC;IAEnDD,GAAG,CAACG,SAAS,CAAC,cAAc,EAAEnC,UAAU,CAACkC,QAAQ,CAACE,WAAW,CAAC;IAC9DJ,GAAG,CAACK,IAAI,CAACJ,OAAO,CAAC;EACnB,CAAC,CAAC;EAEF,OAAOJ,GAAG;AACZ"}

package/dist/cjs/preset/node/types.js.map CHANGED Viewed

	@@ -1 +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":""}
1	+ {"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/cjs/preset/{server → node}/utils/get-fetch-tracing.js RENAMED Viewed

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

package/dist/cjs/preset/node/utils/get-fetch-tracing.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"get-fetch-tracing.js","names":["_api","require","_semanticConventions","_hideFirstId","getFetchTracing","tracer","rootContext","request","next","url","foundId","hideFirstId","URL","pathname","span","startSpan","method","undefined","setAttributes","SemanticAttributes","HTTP_URL","HTTP_METHOD","JSON","stringify","searchParams","headers","response","end","error","setStatus","code","SpanStatusCode","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,IAAAA,IAAA,GAAAC,OAAA;AACA,IAAAC,oBAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASG,eAAeA,CAACC,MAAc,EAAEC,WAAoB,EAAc;EAChF,OAAO,OAAOC,OAAO,EAAEC,IAAI,KAAK;IAC9B,MAAM,CAACC,GAAG,EAAEC,OAAO,CAAC,GAAG,IAAAC,wBAAW,EAAC,IAAIC,GAAG,CAACL,OAAO,CAACE,GAAG,CAAC,CAACI,QAAQ,CAAC,CAAC,CAAC;IACnE,MAAMC,IAAI,GAAGT,MAAM,CAACU,SAAS,CAAE,QAAOR,OAAO,CAACS,MAAO,IAAGP,GAAI,EAAC,EAAEQ,SAAS,EAAEX,WAAW,CAAC;IAEtFQ,IAAI,CAACI,aAAa,CAAC;MACjB,CAACC,uCAAkB,CAACC,QAAQ,GAAGX,GAAG;MAClC,CAACU,uCAAkB,CAACE,WAAW,GAAGd,OAAO,CAACS,MAAM;MAChD,gBAAgB,EAAEM,IAAI,CAACC,SAAS,CAAC,IAAIX,GAAG,CAACL,OAAO,CAACE,GAAG,CAAC,CAACe,YAAY,CAAC;MACnE,iBAAiB,EAAEF,IAAI,CAACC,SAAS,CAAChB,OAAO,CAACkB,OAAO,CAAC;MAElD;MACA,IAAIf,OAAO,IAAI;QAAE,YAAY,EAAEA;MAAQ,CAAC;IAC1C,CAAC,CAAC;IAEF,IAAI;MACF,MAAMgB,QAAQ,GAAG,MAAMlB,IAAI,CAACD,OAAO,CAAC;MAEpCO,IAAI,CAACa,GAAG,CAAC,CAAC;MAEV,OAAOD,QAAQ;IACjB,CAAC,CAAC,OAAOE,KAAK,EAAE;MACdd,IAAI,CAACe,SAAS,CAAC;QACbC,IAAI,EAAEC,mBAAc,CAACC,KAAK;QAC1BC,OAAO,EAAE;MACX,CAAC,CAAC;MAEFnB,IAAI,CAACa,GAAG,CAAC,CAAC;;MAEV;MACA,MAAMC,KAAK;IACb;EACF,CAAC;AACH"}

package/dist/cjs/preset/node/utils/get-handler-metrics.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"get-handler-metrics.js","names":["_promClient","_interopRequireDefault","require","obj","__esModule","default","LABEL_NAMES","exports","httpResponse","pageRender","getHandlerMetrics","requestCount","PromClient","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,IAAAA,WAAA,GAAAC,sBAAA,CAAAC,OAAA;AAAqC,SAAAD,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAE9B,MAAMG,WAAW,GAAAC,OAAA,CAAAD,WAAA,GAAG;EACzBE,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;AACO,SAASC,iBAAiBA,CAAA,EAAG;EAClC,MAAMC,YAAY,GAAG,IAAIC,mBAAU,CAACC,OAAO,CAAC;IAC1CC,IAAI,EAAE,oBAAoB;IAC1BC,IAAI,EAAE,6BAA6B;IACnCC,UAAU,EAAEV,WAAW,CAACE;EAC1B,CAAC,CAAC;EAEF,MAAMS,gBAAgB,GAAG,IAAIL,mBAAU,CAACM,SAAS,CAAC;IAChDJ,IAAI,EAAE,2BAA2B;IACjCC,IAAI,EAAE,0CAA0C;IAChDC,UAAU,EAAEV,WAAW,CAACE,YAAY;IACpCW,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,IAAIR,mBAAU,CAACM,SAAS,CAAC;IAC9CJ,IAAI,EAAE,oBAAoB;IAC1BC,IAAI,EAAE,oBAAoB;IAC1BC,UAAU,EAAEV,WAAW,CAACG,UAAU;IAClCU,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI;EACjD,CAAC,CAAC;EAEF,OAAO;IACLR,YAAY;IACZS,cAAc;IACdH;EACF,CAAC;AACH"}

package/dist/cjs/preset/node/utils/get-page-response-format.js CHANGED Viewed

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

package/dist/cjs/preset/node/utils/get-page-response-format.js.map CHANGED Viewed

	@@ -1 +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;AACO,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"}
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 * @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;AACO,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/cjs/preset/{server → node}/utils/get-serve-measuring.js RENAMED Viewed

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getServeMeasuring = getServeMeasuring;
-var _constants = require("../constants");
+var _constants = require("../../server/constants");
 var _utils = require("../../../utils");
 var _getHandlerMetrics = require("./get-handler-metrics");
 /**

package/dist/cjs/preset/node/utils/get-serve-measuring.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"get-serve-measuring.js","names":["_constants","require","_utils","_getHandlerMetrics","getServeMeasuring","config","requestCount","renderDuration","responseDuration","getHandlerMetrics","getResponseLabels","req","res","version","appVersion","route","url","code","status","method","getRenderLabels","request","next","context","responseStart","process","hrtime","bigint","renderStart","events","addEventListener","PAGE_HANDLER_EVENT_TYPE","once","renderFinish","observe","toMilliseconds","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,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,kBAAA,GAAAF,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,SAASG,iBAAiBA,CAACC,MAAkB,EAAoB;EACtE,MAAM;IAAEC,YAAY;IAAEC,cAAc;IAAEC;EAAiB,CAAC,GAAG,IAAAC,oCAAiB,EAAC,CAAC;;EAE9E;EACA,MAAMC,iBAAiB,GAAGA,CAACC,GAAY,EAAEC,GAAa,MACnD;IACCC,OAAO,EAAER,MAAM,CAACS,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,EAAER,MAAM,CAACS,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,CAC7BC,kCAAuB,CAACH,WAAW,EACnC,MAAM;MACJA,WAAW,GAAGH,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;IACvC,CAAC,EACD;MAAEK,IAAI,EAAE;IAAK,CACf,CAAC;IAEDT,OAAO,CAACM,MAAM,CAACC,gBAAgB,CAC7BC,kCAAuB,CAACE,YAAY,EACpC,MAAM;MACJ,MAAMA,YAAY,GAAGR,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;MAE5CpB,cAAc,CAAC2B,OAAO,CACpBd,eAAe,CAACC,OAAO,CAAC,EACxB,IAAAc,qBAAc,EAACF,YAAY,GAAGL,WAAW,CAC3C,CAAC;IACH,CAAC,EACD;MAAEI,IAAI,EAAE;IAAK,CACf,CAAC;IAED,MAAMI,QAAQ,GAAG,MAAMd,IAAI,CAACD,OAAO,CAAC;IACpC,MAAMgB,cAAc,GAAGZ,OAAO,CAACC,MAAM,CAACC,MAAM,CAAC,CAAC;IAE9CnB,gBAAgB,CAAC0B,OAAO,CACtBxB,iBAAiB,CAACW,OAAO,EAAEe,QAAQ,CAAC,EACpC,IAAAD,qBAAc,EAACE,cAAc,GAAGb,aAAa,CAC/C,CAAC;IAEDlB,YAAY,CAACgC,GAAG,CAAC5B,iBAAiB,CAACW,OAAO,EAAEe,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEzD,OAAOA,QAAQ;EACjB,CAAC;AACH"}

package/dist/cjs/preset/node-handler/index.js CHANGED Viewed

@@ -19,10 +19,10 @@ var _pageHelmet = require("../server/providers/page-helmet");
 var _pageRender = require("../server/providers/page-render");
 var _fetchMiddleware = require("./providers/fetch-middleware");
 var _fetchLogHandler = require("../server/providers/fetch-log-handler");
-var _cookieStore = require("./providers/cookie-store");
 var _specificExtras = require("../server/utils/specific-extras");
 var _acceptsType = require("./providers/accepts-type");
 var _responseEvents = require("./providers/response-events");
+var _axiosFactory = require("../isomorphic/providers/axios-factory");
 /**
  * Возвращает preset с зависимостями по умолчанию для работы в рамках ответа на http-запрос.
  * @param customize Получит функцию с помощью которой можно переопределить предустановленные провайдеры.
@@ -36,7 +36,6 @@ function PresetHandler(customize) {
   // fetch
   preset.set(_tokens.KnownToken.Http.fetch, _fetch.provideFetch);
   preset.set(_tokens.KnownToken.Http.Fetch.middleware, _fetchMiddleware.provideFetchMiddleware);
-  preset.set(_tokens.KnownToken.Http.Fetch.cookieStore, _cookieStore.provideCookieStore);
   preset.set(_tokens.KnownToken.Http.Fetch.abortController, _abortController.provideAbortController);
   preset.set(_tokens.KnownToken.Http.Fetch.Middleware.Log.handler, _fetchLogHandler.provideFetchLogHandler);
@@ -44,6 +43,7 @@ function PresetHandler(customize) {
   preset.set(_tokens.KnownToken.Redux.Middleware.saga, _reduxMiddlewareSaga.provideReduxMiddlewareSaga);
   // axios
+  preset.set(_tokens.KnownToken.Axios.factory, _axiosFactory.provideAxiosFactory);
   preset.set(_tokens.KnownToken.Axios.middleware, _axiosMiddleware.provideAxiosMiddleware);
   preset.set(_tokens.KnownToken.Axios.Middleware.Log.handler, _axiosLogHandler.provideAxiosLogHandler);

package/dist/cjs/preset/node-handler/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","names":["_di","require","_tokens","_reduxMiddlewareSaga","_fetch","_abortController","_formatPageResponse","_elementToString","_axiosMiddleware","_axiosLogHandler","_handlerMain","_specificParams","_pageHelmet","_pageRender","_fetchMiddleware","_fetchLogHandler","~~_cookieStore","~~_specificExtras","_acceptsType","_responseEvents","PresetHandler","customize","preset","createPreset","set","KnownToken","Http","fetch","provideFetch","Fetch","middleware","provideFetchMiddleware","~~cookieStore","provideCookieStore","~~abortController","provideAbortController","Middleware","Log","handler","provideFetchLogHandler","Redux","saga","provideReduxMiddlewareSaga","Axios","provideAxiosMiddleware","provideAxiosLogHandler","ExpressHandler","main","provideHandlerMain","Handler","Request","acceptType","provideAcceptType","specificParams","provideSpecificParams","Response","specificExtras","SpecificExtras","events","provideResponseEvents","Page","assets","js","css","helmet","providePageHelmet","render","providePageRender","elementToString","provideElementToString","formatResponse","provideFormatPageResponse","override","bind"],"sources":["../../../../src/preset/node-handler/index.ts"],"sourcesContent":["import { Preset, createPreset } from '../../di';\nimport { KnownToken } from '../../tokens';\nimport { provideReduxMiddlewareSaga } from '../isomorphic/providers/redux-middleware-saga';\nimport { provideFetch } from '../isomorphic/providers/fetch';\nimport { provideAbortController } from '../isomorphic/providers/abort-controller';\nimport { PresetTuner } from '../isomorphic/types';\nimport { provideFormatPageResponse } from '../server/providers/format-page-response';\nimport { provideElementToString } from '../server/providers/element-to-string';\nimport { provideAxiosMiddleware } from './providers/axios-middleware';\nimport { provideAxiosLogHandler } from './providers/axios-log-handler';\nimport { provideHandlerMain } from './providers/handler-main';\nimport { provideSpecificParams } from './providers/specific-params';\nimport { providePageHelmet } from '../server/providers/page-helmet';\nimport { providePageRender } from '../server/providers/page-render';\nimport { provideFetchMiddleware } from './providers/fetch-middleware';\nimport { provideFetchLogHandler } from '../server/providers/fetch-log-handler';\nimport { ~~provideCookieStore } from './providers/cookie-store';\nimport {~~ SpecificExtras } from '../server/utils/specific-extras';\nimport { provideAcceptType } from './providers/accepts-type';\nimport { provideResponseEvents } from './providers/response-events';\n\n/*\n Возвращает preset с зависимостями по умолчанию для работы в рамках ответа на http-запрос.\n * @param customize Получит функцию с помощью которой можно переопределить предустановленные провайдеры.\n * @todo Возможно стоит переименовать в PresetPageHandler.\n * @return Preset.\n */\nexport function PresetHandler(customize?: PresetTuner): Preset {\n // ВАЖНО: используем .set() вместо аргумента defaults функции createPreset из-за скорости\n const preset = createPreset();\n\n // fetch\n preset.set(KnownToken.Http.fetch, provideFetch);\n preset.set(KnownToken.Http.Fetch.middleware, provideFetchMiddleware);\n preset.set(KnownToken.Http.Fetch.~~cookieStore, provideCookieStore);\n preset.set(KnownToken.Http.Fetch.~~abortController, provideAbortController);\n preset.set(KnownToken.Http.Fetch.Middleware.Log.handler, provideFetchLogHandler);\n\n // saga\n preset.set(KnownToken.Redux.Middleware.saga, provideReduxMiddlewareSaga);\n\n // axios\n preset.set(KnownToken.Axios.middleware, provideAxiosMiddleware);\n preset.set(KnownToken.Axios.Middleware.Log.handler, provideAxiosLogHandler);\n\n // express handler\n preset.set(KnownToken.ExpressHandler.main, provideHandlerMain);\n\n // http handler\n preset.set(KnownToken.Http.Handler.Request.acceptType, provideAcceptType);\n preset.set(KnownToken.Http.Handler.Request.specificParams, provideSpecificParams);\n preset.set(KnownToken.Http.Handler.Response.specificExtras, () => new SpecificExtras());\n preset.set(KnownToken.Http.Handler.Response.events, provideResponseEvents);\n preset.set(KnownToken.Http.Handler.Page.assets, () => ({ js: '', css: '' }));\n preset.set(KnownToken.Http.Handler.Page.helmet, providePageHelmet);\n preset.set(KnownToken.Http.Handler.Page.render, providePageRender);\n preset.set(KnownToken.Http.Handler.Page.elementToString, provideElementToString);\n preset.set(KnownToken.Http.Handler.Page.formatResponse, provideFormatPageResponse);\n\n if (customize) {\n customize({ override: preset.set.bind(preset) });\n }\n\n return preset;\n}\n"],"mappings":";;;;;;AAAA,IAAAA,GAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AACA,IAAAI,gBAAA,GAAAJ,OAAA;AAEA,IAAAK,mBAAA,GAAAL,OAAA;AACA,IAAAM,gBAAA,GAAAN,OAAA;AACA,IAAAO,gBAAA,GAAAP,OAAA;AACA,IAAAQ,gBAAA,GAAAR,OAAA;AACA,IAAAS,YAAA,GAAAT,OAAA;AACA,IAAAU,eAAA,GAAAV,OAAA;AACA,IAAAW,WAAA,GAAAX,OAAA;AACA,IAAAY,WAAA,GAAAZ,OAAA;AACA,IAAAa,gBAAA,GAAAb,OAAA;AACA,IAAAc,gBAAA,GAAAd,OAAA;AACA,IAAAe,~~YAAA~~,GAAAf,OAAA;AACA,IAAAgB,~~eAAA~~,GAAAhB,OAAA;AACA,IAAAiB,~~YAAA~~,GAAAjB,OAAA;AACA,IAAAkB,~~eAAA~~,GAAAlB,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASmB,aAAaA,CAACC,SAAuB,EAAU;EAC7D;EACA,MAAMC,MAAM,GAAG,IAAAC,gBAAY,EAAC,CAAC;;EAE7B;EACAD,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACC,KAAK,EAAEC,mBAAY,CAAC;EAC/CN,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACG,KAAK,CAACC,UAAU,EAAEC,uCAAsB,CAAC;EACpET,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACG,KAAK,CAACG,~~WAAW~~,EAAEC~~,+BAAkB~~,CAAC;~~EACjEX~~,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACG,KAAK,CAACK,~~eAAe~~,EAAEC,uCAAsB,CAAC;~~EACzEb~~,MAAM,CAACE,GAAG,CAACC,kBAAU,~~CAACC~~,~~IAAI,CAACG,~~KAAK,~~CAACO~~,UAAU,~~CAACC~~,~~GAAG~~,~~CAACC,OAAO,~~EAAEC,~~uCAAsB,~~CAAC;;~~EAEhF~~;~~EACAjB~~,MAAM,CAACE,GAAG,CAACC,kBAAU,~~CAACe~~,KAAK,~~CAACJ~~,~~UAAU~~,~~CAACK~~,~~IAAI~~,~~EAAEC,+CAA0B,~~CAAC~~;;EAExE~~;~~EACApB~~,MAAM,CAACE,GAAG,CAACC,kBAAU,~~CAACkB~~,KAAK,~~CAACb~~,UAAU,EAAEc,uCAAsB,CAAC;EAC/DtB,MAAM,CAACE,GAAG,CAACC,kBAAU,~~CAACkB~~,KAAK,CAACP,UAAU,CAACC,GAAG,CAACC,OAAO,~~EAAEO~~,uCAAsB,CAAC;;EAE3E;EACAvB,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACqB,cAAc,CAACC,IAAI,EAAEC,+BAAkB,CAAC;;EAE9D;EACA1B,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACC,OAAO,CAACC,UAAU,EAAEC,8BAAiB,CAAC;EACzE9B,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACC,OAAO,CAACG,cAAc,EAAEC,qCAAqB,CAAC;EACjFhC,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACM,QAAQ,CAACC,cAAc,EAAE,MAAM,IAAIC,8BAAc,CAAC,CAAC,CAAC;EACvFnC,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACM,QAAQ,CAACG,MAAM,EAAEC,qCAAqB,CAAC;EAC1ErC,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACW,IAAI,CAACC,MAAM,EAAE,OAAO;IAAEC,EAAE,EAAE,EAAE;IAAEC,GAAG,EAAE;EAAG,CAAC,CAAC,CAAC;EAC5EzC,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACW,IAAI,CAACI,MAAM,EAAEC,6BAAiB,CAAC;EAClE3C,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACW,IAAI,CAACM,MAAM,EAAEC,6BAAiB,CAAC;EAClE7C,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACW,IAAI,CAACQ,eAAe,EAAEC,uCAAsB,CAAC;EAChF/C,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACW,IAAI,CAACU,cAAc,EAAEC,6CAAyB,CAAC;EAElF,IAAIlD,SAAS,EAAE;IACbA,SAAS,CAAC;MAAEmD,QAAQ,EAAElD,MAAM,CAACE,GAAG,CAACiD,IAAI,CAACnD,MAAM;IAAE,CAAC,CAAC;EAClD;EAEA,OAAOA,MAAM;AACf"}
1	+ {"version":3,"file":"index.js","names":["_di","require","_tokens","_reduxMiddlewareSaga","_fetch","_abortController","_formatPageResponse","_elementToString","_axiosMiddleware","_axiosLogHandler","_handlerMain","_specificParams","_pageHelmet","_pageRender","_fetchMiddleware","_fetchLogHandler","_specificExtras","_acceptsType","_responseEvents","_axiosFactory","PresetHandler","customize","preset","createPreset","set","KnownToken","Http","fetch","provideFetch","Fetch","middleware","provideFetchMiddleware","abortController","provideAbortController","Middleware","Log","handler","provideFetchLogHandler","Redux","saga","provideReduxMiddlewareSaga","Axios","factory","provideAxiosFactory","provideAxiosMiddleware","provideAxiosLogHandler","ExpressHandler","main","provideHandlerMain","Handler","Request","acceptType","provideAcceptType","specificParams","provideSpecificParams","Response","specificExtras","SpecificExtras","events","provideResponseEvents","Page","assets","js","css","helmet","providePageHelmet","render","providePageRender","elementToString","provideElementToString","formatResponse","provideFormatPageResponse","override","bind"],"sources":["../../../../src/preset/node-handler/index.ts"],"sourcesContent":["import { Preset, createPreset } from '../../di';\nimport { KnownToken } from '../../tokens';\nimport { provideReduxMiddlewareSaga } from '../isomorphic/providers/redux-middleware-saga';\nimport { provideFetch } from '../isomorphic/providers/fetch';\nimport { provideAbortController } from '../isomorphic/providers/abort-controller';\nimport { PresetTuner } from '../isomorphic/types';\nimport { provideFormatPageResponse } from '../server/providers/format-page-response';\nimport { provideElementToString } from '../server/providers/element-to-string';\nimport { provideAxiosMiddleware } from './providers/axios-middleware';\nimport { provideAxiosLogHandler } from './providers/axios-log-handler';\nimport { provideHandlerMain } from './providers/handler-main';\nimport { provideSpecificParams } from './providers/specific-params';\nimport { providePageHelmet } from '../server/providers/page-helmet';\nimport { providePageRender } from '../server/providers/page-render';\nimport { provideFetchMiddleware } from './providers/fetch-middleware';\nimport { provideFetchLogHandler } from '../server/providers/fetch-log-handler';\nimport { SpecificExtras } from '../server/utils/specific-extras';\nimport { provideAcceptType } from './providers/accepts-type';\nimport { provideResponseEvents } from './providers/response-events';\nimport { provideAxiosFactory } from '../isomorphic/providers/axios-factory';\n\n/*\n Возвращает preset с зависимостями по умолчанию для работы в рамках ответа на http-запрос.\n * @param customize Получит функцию с помощью которой можно переопределить предустановленные провайдеры.\n * @todo Возможно стоит переименовать в PresetPageHandler.\n * @return Preset.\n */\nexport function PresetHandler(customize?: PresetTuner): Preset {\n // ВАЖНО: используем .set() вместо аргумента defaults функции createPreset из-за скорости\n const preset = createPreset();\n\n // fetch\n preset.set(KnownToken.Http.fetch, provideFetch);\n preset.set(KnownToken.Http.Fetch.middleware, provideFetchMiddleware);\n preset.set(KnownToken.Http.Fetch.abortController, provideAbortController);\n preset.set(KnownToken.Http.Fetch.Middleware.Log.handler, provideFetchLogHandler);\n\n // saga\n preset.set(KnownToken.Redux.Middleware.saga, provideReduxMiddlewareSaga);\n\n // axios\n preset.set(KnownToken.Axios.factory, provideAxiosFactory);\n preset.set(KnownToken.Axios.middleware, provideAxiosMiddleware);\n preset.set(KnownToken.Axios.Middleware.Log.handler, provideAxiosLogHandler);\n\n // express handler\n preset.set(KnownToken.ExpressHandler.main, provideHandlerMain);\n\n // http handler\n preset.set(KnownToken.Http.Handler.Request.acceptType, provideAcceptType);\n preset.set(KnownToken.Http.Handler.Request.specificParams, provideSpecificParams);\n preset.set(KnownToken.Http.Handler.Response.specificExtras, () => new SpecificExtras());\n preset.set(KnownToken.Http.Handler.Response.events, provideResponseEvents);\n preset.set(KnownToken.Http.Handler.Page.assets, () => ({ js: '', css: '' }));\n preset.set(KnownToken.Http.Handler.Page.helmet, providePageHelmet);\n preset.set(KnownToken.Http.Handler.Page.render, providePageRender);\n preset.set(KnownToken.Http.Handler.Page.elementToString, provideElementToString);\n preset.set(KnownToken.Http.Handler.Page.formatResponse, provideFormatPageResponse);\n\n if (customize) {\n customize({ override: preset.set.bind(preset) });\n }\n\n return preset;\n}\n"],"mappings":";;;;;;AAAA,IAAAA,GAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AACA,IAAAI,gBAAA,GAAAJ,OAAA;AAEA,IAAAK,mBAAA,GAAAL,OAAA;AACA,IAAAM,gBAAA,GAAAN,OAAA;AACA,IAAAO,gBAAA,GAAAP,OAAA;AACA,IAAAQ,gBAAA,GAAAR,OAAA;AACA,IAAAS,YAAA,GAAAT,OAAA;AACA,IAAAU,eAAA,GAAAV,OAAA;AACA,IAAAW,WAAA,GAAAX,OAAA;AACA,IAAAY,WAAA,GAAAZ,OAAA;AACA,IAAAa,gBAAA,GAAAb,OAAA;AACA,IAAAc,gBAAA,GAAAd,OAAA;AACA,IAAAe,eAAA,GAAAf,OAAA;AACA,IAAAgB,YAAA,GAAAhB,OAAA;AACA,IAAAiB,eAAA,GAAAjB,OAAA;AACA,IAAAkB,aAAA,GAAAlB,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASmB,aAAaA,CAACC,SAAuB,EAAU;EAC7D;EACA,MAAMC,MAAM,GAAG,IAAAC,gBAAY,EAAC,CAAC;;EAE7B;EACAD,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACC,KAAK,EAAEC,mBAAY,CAAC;EAC/CN,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACG,KAAK,CAACC,UAAU,EAAEC,uCAAsB,CAAC;EACpET,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACG,KAAK,CAACG,eAAe,EAAEC,uCAAsB,CAAC;EACzEX,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACG,KAAK,CAACK,UAAU,CAACC,GAAG,CAACC,OAAO,EAAEC,uCAAsB,CAAC;;EAEhF;EACAf,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACa,KAAK,CAACJ,UAAU,CAACK,IAAI,EAAEC,+CAA0B,CAAC;;EAExE;EACAlB,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACgB,KAAK,CAACC,OAAO,EAAEC,iCAAmB,CAAC;EACzDrB,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACgB,KAAK,CAACX,UAAU,EAAEc,uCAAsB,CAAC;EAC/DtB,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACgB,KAAK,CAACP,UAAU,CAACC,GAAG,CAACC,OAAO,EAAES,uCAAsB,CAAC;;EAE3E;EACAvB,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACqB,cAAc,CAACC,IAAI,EAAEC,+BAAkB,CAAC;;EAE9D;EACA1B,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACC,OAAO,CAACC,UAAU,EAAEC,8BAAiB,CAAC;EACzE9B,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACC,OAAO,CAACG,cAAc,EAAEC,qCAAqB,CAAC;EACjFhC,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACM,QAAQ,CAACC,cAAc,EAAE,MAAM,IAAIC,8BAAc,CAAC,CAAC,CAAC;EACvFnC,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACM,QAAQ,CAACG,MAAM,EAAEC,qCAAqB,CAAC;EAC1ErC,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACW,IAAI,CAACC,MAAM,EAAE,OAAO;IAAEC,EAAE,EAAE,EAAE;IAAEC,GAAG,EAAE;EAAG,CAAC,CAAC,CAAC;EAC5EzC,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACW,IAAI,CAACI,MAAM,EAAEC,6BAAiB,CAAC;EAClE3C,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACW,IAAI,CAACM,MAAM,EAAEC,6BAAiB,CAAC;EAClE7C,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACW,IAAI,CAACQ,eAAe,EAAEC,uCAAsB,CAAC;EAChF/C,MAAM,CAACE,GAAG,CAACC,kBAAU,CAACC,IAAI,CAACuB,OAAO,CAACW,IAAI,CAACU,cAAc,EAAEC,6CAAyB,CAAC;EAElF,IAAIlD,SAAS,EAAE;IACbA,SAAS,CAAC;MAAEmD,QAAQ,EAAElD,MAAM,CAACE,GAAG,CAACiD,IAAI,CAACnD,MAAM;IAAE,CAAC,CAAC;EAClD;EAEA,OAAOA,MAAM;AACf"}

package/dist/cjs/preset/node-handler/providers/axios-middleware.js CHANGED Viewed

@@ -19,7 +19,6 @@ function provideAxiosMiddleware(resolve) {
   const tracer = resolve(_tokens.KnownToken.Tracing.tracer);
   const context = resolve(_tokens.KnownToken.ExpressHandler.context);
   const logHandler = resolve(_tokens.KnownToken.Axios.Middleware.Log.handler);
-  const cookieStore = resolve(_tokens.KnownToken.Http.Fetch.cookieStore);
   const abortController = resolve(_tokens.KnownToken.Http.Fetch.abortController);
   return [
   // пробрасываемые заголовки по соглашению
@@ -50,6 +49,6 @@ function provideAxiosMiddleware(resolve) {
       ...config,
       signal: innerController.signal
     });
-  }, _httpStatus.HttpStatus.axiosMiddleware(), (0, _axiosTracingMiddleware.axiosTracingMiddleware)(tracer, context.res.locals.tracing.rootContext), (0, _axios.logMiddleware)(logHandler), (0, _axios.cookieMiddleware)(cookieStore)];
+  }, _httpStatus.HttpStatus.axiosMiddleware(), (0, _axiosTracingMiddleware.axiosTracingMiddleware)(tracer, context.res.locals.tracing.rootContext), (0, _axios.logMiddleware)(logHandler)];
 }
 //# sourceMappingURL=axios-middleware.js.map

package/dist/cjs/preset/node-handler/providers/axios-middleware.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"axios-middleware.js","names":["_tokens","require","_httpStatus","_axiosTracingMiddleware","_axios","_getForwardedHeaders","provideAxiosMiddleware","resolve","appConfig","KnownToken","Config","base","tracer","Tracing","context","ExpressHandler","logHandler","Axios","Middleware","Log","handler","~~cookieStore~~","Http","Fetch","~~abortController","~~config","next","headers","getForwardedHeaders","req","innerController","AbortController","signal","addEventListener","abort","once","HttpStatus","axiosMiddleware","axiosTracingMiddleware","res","locals","tracing","rootContext","logMiddleware"~~,"cookieMiddleware"~~],"sources":["../../../../../src/preset/node-handler/providers/axios-middleware.ts"],"sourcesContent":["import { Middleware } from 'middleware-axios';\nimport { Resolve } from '../../../di';\nimport { KnownToken } from '../../../tokens';\nimport { HttpStatus } from '../../isomorphic/utils/http-status';\nimport { axiosTracingMiddleware } from '../../node/utils/axios-tracing-middleware';\nimport { ~~cookieMiddleware,~~ logMiddleware } from '../../../utils/axios';\nimport { getForwardedHeaders } from '../../node/utils/get-forwarded-headers';\n\n/*\n Провайдер фабрики http-клиентов.\n * @param resolve Функция для получения зависимости по токену.\n * @return Фабрика.\n */\nexport function provideAxiosMiddleware(resolve: Resolve): Middleware<any>[] {\n const appConfig = resolve(KnownToken.Config.base);\n const tracer = resolve(KnownToken.Tracing.tracer);\n const context = resolve(KnownToken.ExpressHandler.context);\n const logHandler = resolve(KnownToken.Axios.Middleware.Log.handler);\n const ~~cookieStore = resolve(KnownToken.Http.Fetch.cookieStore);\n const~~ abortController = resolve(KnownToken.Http.Fetch.abortController);\n\n return [\n // пробрасываемые заголовки по соглашению\n async (config, next) => {\n await next({\n ...config,\n headers: {\n ...getForwardedHeaders(appConfig, context.req),\n\n // ВАЖНО: заголовки из конфига важнее, поэтому идут в конце\n ...config.headers,\n },\n });\n },\n\n // обрывание по сигналу из обработчика входящего запроса и по сигналу из конфига исходящего запроса\n async (config, next) => {\n const innerController = new AbortController();\n\n abortController.signal.addEventListener(\n 'abort',\n () => {\n innerController.abort();\n },\n { once: true },\n );\n\n config.signal?.addEventListener?.(\n 'abort',\n () => {\n innerController.abort();\n },\n { once: true },\n );\n\n await next({ ...config, signal: innerController.signal });\n },\n\n HttpStatus.axiosMiddleware(),\n axiosTracingMiddleware(tracer, context.res.locals.tracing.rootContext),\n logMiddleware(logHandler),\n ~~cookieMiddleware(cookieStore),\n~~ ];\n}\n"],"mappings":";;;;;;AAEA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,uBAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AACA,IAAAI,oBAAA,GAAAJ,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,SAASK,sBAAsBA,CAACC,OAAgB,EAAqB;EAC1E,MAAMC,SAAS,GAAGD,OAAO,CAACE,kBAAU,CAACC,MAAM,CAACC,IAAI,CAAC;EACjD,MAAMC,MAAM,GAAGL,OAAO,CAACE,kBAAU,CAACI,OAAO,CAACD,MAAM,CAAC;EACjD,MAAME,OAAO,GAAGP,OAAO,CAACE,kBAAU,CAACM,cAAc,CAACD,OAAO,CAAC;EAC1D,MAAME,UAAU,GAAGT,OAAO,CAACE,kBAAU,CAACQ,KAAK,CAACC,UAAU,CAACC,GAAG,CAACC,OAAO,CAAC;EACnE,MAAMC,~~WAAW~~,GAAGd,OAAO,CAACE,kBAAU,CAACa,IAAI,CAACC,KAAK,CAACF,~~WAAW,CAAC;EAC9D,MAAMG,~~eAAe,~~GAAGjB,OAAO,CAACE,kBAAU,CAACa,IAAI,CAACC,KAAK,CAACC,eAAe,~~CAAC;EAEtE,OAAO;EACL;EACA,~~OAAOC~~,MAAM,EAAEC,IAAI,KAAK;IACtB,MAAMA,IAAI,CAAC;MACT,GAAGD,MAAM;MACTE,OAAO,EAAE;QACP,GAAG,IAAAC,wCAAmB,~~EAACpB~~,SAAS,EAAEM,OAAO,~~CAACe~~,GAAG,CAAC;QAE9C;QACA,GAAGJ,MAAM,CAACE;MACZ;IACF,CAAC,CAAC;EACJ,CAAC;EAED;EACA,OAAOF,MAAM,EAAEC,IAAI,KAAK;IACtB,MAAMI,eAAe,GAAG,IAAIC,eAAe,CAAC,CAAC;~~IAE7CP~~,eAAe,~~CAACQ~~,MAAM,CAACC,gBAAgB,CACrC,OAAO,EACP,MAAM;MACJH,eAAe,CAACI,KAAK,CAAC,CAAC;IACzB,CAAC,EACD;MAAEC,IAAI,EAAE;IAAK,CACf,CAAC;IAEDV,MAAM,CAACO,MAAM,EAAEC,gBAAgB,GAC7B,OAAO,EACP,MAAM;MACJH,eAAe,CAACI,KAAK,CAAC,CAAC;IACzB,CAAC,EACD;MAAEC,IAAI,EAAE;IAAK,CACf,CAAC;IAED,MAAMT,IAAI,CAAC;MAAE,GAAGD,MAAM;MAAEO,MAAM,EAAEF,eAAe,CAACE;IAAO,CAAC,CAAC;EAC3D,CAAC,EAEDI,sBAAU,CAACC,eAAe,CAAC,CAAC,EAC5B,IAAAC,8CAAsB,~~EAAC1B~~,MAAM,EAAEE,OAAO,~~CAACyB~~,GAAG,CAACC,MAAM,CAACC,OAAO,CAACC,WAAW,CAAC,EACtE,IAAAC,oBAAa,~~EAAC3B~~,UAAU,CAAC,~~EACzB,IAAA4B,uBAAgB,EAACvB,WAAW,CAAC,CAC9B~~;AACH"}
1	+ {"version":3,"file":"axios-middleware.js","names":["_tokens","require","_httpStatus","_axiosTracingMiddleware","_axios","_getForwardedHeaders","provideAxiosMiddleware","resolve","appConfig","KnownToken","Config","base","tracer","Tracing","context","ExpressHandler","logHandler","Axios","Middleware","Log","handler","abortController","Http","Fetch","config","next","headers","getForwardedHeaders","req","innerController","AbortController","signal","addEventListener","abort","once","HttpStatus","axiosMiddleware","axiosTracingMiddleware","res","locals","tracing","rootContext","logMiddleware"],"sources":["../../../../../src/preset/node-handler/providers/axios-middleware.ts"],"sourcesContent":["import { Middleware } from 'middleware-axios';\nimport { Resolve } from '../../../di';\nimport { KnownToken } from '../../../tokens';\nimport { HttpStatus } from '../../isomorphic/utils/http-status';\nimport { axiosTracingMiddleware } from '../../node/utils/axios-tracing-middleware';\nimport { logMiddleware } from '../../../utils/axios';\nimport { getForwardedHeaders } from '../../node/utils/get-forwarded-headers';\n\n/*\n Провайдер фабрики http-клиентов.\n * @param resolve Функция для получения зависимости по токену.\n * @return Фабрика.\n */\nexport function provideAxiosMiddleware(resolve: Resolve): Middleware<any>[] {\n const appConfig = resolve(KnownToken.Config.base);\n const tracer = resolve(KnownToken.Tracing.tracer);\n const context = resolve(KnownToken.ExpressHandler.context);\n const logHandler = resolve(KnownToken.Axios.Middleware.Log.handler);\n const abortController = resolve(KnownToken.Http.Fetch.abortController);\n\n return [\n // пробрасываемые заголовки по соглашению\n async (config, next) => {\n await next({\n ...config,\n headers: {\n ...getForwardedHeaders(appConfig, context.req),\n\n // ВАЖНО: заголовки из конфига важнее, поэтому идут в конце\n ...config.headers,\n },\n });\n },\n\n // обрывание по сигналу из обработчика входящего запроса и по сигналу из конфига исходящего запроса\n async (config, next) => {\n const innerController = new AbortController();\n\n abortController.signal.addEventListener(\n 'abort',\n () => {\n innerController.abort();\n },\n { once: true },\n );\n\n config.signal?.addEventListener?.(\n 'abort',\n () => {\n innerController.abort();\n },\n { once: true },\n );\n\n await next({ ...config, signal: innerController.signal });\n },\n\n HttpStatus.axiosMiddleware(),\n axiosTracingMiddleware(tracer, context.res.locals.tracing.rootContext),\n logMiddleware(logHandler),\n ];\n}\n"],"mappings":";;;;;;AAEA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,uBAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AACA,IAAAI,oBAAA,GAAAJ,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,SAASK,sBAAsBA,CAACC,OAAgB,EAAqB;EAC1E,MAAMC,SAAS,GAAGD,OAAO,CAACE,kBAAU,CAACC,MAAM,CAACC,IAAI,CAAC;EACjD,MAAMC,MAAM,GAAGL,OAAO,CAACE,kBAAU,CAACI,OAAO,CAACD,MAAM,CAAC;EACjD,MAAME,OAAO,GAAGP,OAAO,CAACE,kBAAU,CAACM,cAAc,CAACD,OAAO,CAAC;EAC1D,MAAME,UAAU,GAAGT,OAAO,CAACE,kBAAU,CAACQ,KAAK,CAACC,UAAU,CAACC,GAAG,CAACC,OAAO,CAAC;EACnE,MAAMC,eAAe,GAAGd,OAAO,CAACE,kBAAU,CAACa,IAAI,CAACC,KAAK,CAACF,eAAe,CAAC;EAEtE,OAAO;EACL;EACA,OAAOG,MAAM,EAAEC,IAAI,KAAK;IACtB,MAAMA,IAAI,CAAC;MACT,GAAGD,MAAM;MACTE,OAAO,EAAE;QACP,GAAG,IAAAC,wCAAmB,EAACnB,SAAS,EAAEM,OAAO,CAACc,GAAG,CAAC;QAE9C;QACA,GAAGJ,MAAM,CAACE;MACZ;IACF,CAAC,CAAC;EACJ,CAAC;EAED;EACA,OAAOF,MAAM,EAAEC,IAAI,KAAK;IACtB,MAAMI,eAAe,GAAG,IAAIC,eAAe,CAAC,CAAC;IAE7CT,eAAe,CAACU,MAAM,CAACC,gBAAgB,CACrC,OAAO,EACP,MAAM;MACJH,eAAe,CAACI,KAAK,CAAC,CAAC;IACzB,CAAC,EACD;MAAEC,IAAI,EAAE;IAAK,CACf,CAAC;IAEDV,MAAM,CAACO,MAAM,EAAEC,gBAAgB,GAC7B,OAAO,EACP,MAAM;MACJH,eAAe,CAACI,KAAK,CAAC,CAAC;IACzB,CAAC,EACD;MAAEC,IAAI,EAAE;IAAK,CACf,CAAC;IAED,MAAMT,IAAI,CAAC;MAAE,GAAGD,MAAM;MAAEO,MAAM,EAAEF,eAAe,CAACE;IAAO,CAAC,CAAC;EAC3D,CAAC,EAEDI,sBAAU,CAACC,eAAe,CAAC,CAAC,EAC5B,IAAAC,8CAAsB,EAACzB,MAAM,EAAEE,OAAO,CAACwB,GAAG,CAACC,MAAM,CAACC,OAAO,CAACC,WAAW,CAAC,EACtE,IAAAC,oBAAa,EAAC1B,UAAU,CAAC,CAC1B;AACH"}

package/dist/cjs/preset/node-handler/providers/fetch-middleware.js CHANGED Viewed

@@ -9,7 +9,7 @@ var _tokens = require("../../../tokens");
 var _getFetchErrorLogging = require("../../isomorphic/utils/get-fetch-error-logging");
 var _getFetchExtraAborting = require("../../isomorphic/utils/get-fetch-extra-aborting");
 var _getFetchLogging = require("../../isomorphic/utils/get-fetch-logging");
-var _getFetchTracing = require("../../server/utils/get-fetch-tracing");
+var _getFetchTracing = require("../../node/utils/get-fetch-tracing");
 var _getForwardedHeaders = require("../../node/utils/get-forwarded-headers");
 /**
  * Провайдер промежуточных слоев для fetch.
@@ -21,7 +21,6 @@ function provideFetchMiddleware(resolve) {
   const tracer = resolve(_tokens.KnownToken.Tracing.tracer);
   const context = resolve(_tokens.KnownToken.ExpressHandler.context);
   const logHandler = resolve(_tokens.KnownToken.Http.Fetch.Middleware.Log.handler);
-  const cookieStore = resolve(_tokens.KnownToken.Http.Fetch.cookieStore);
   const abortController = resolve(_tokens.KnownToken.Http.Fetch.abortController);
   return [
   // ВАЖНО: слой логирования ошибки ПЕРЕД остальными слоями чтобы не упустить ошибки выше
@@ -29,7 +28,7 @@ function provideFetchMiddleware(resolve) {
   // пробрасываемые заголовки по соглашению
   (0, _http.defaultHeaders)((0, _getForwardedHeaders.getForwardedHeaders)(config, context.req)),
   // обрывание по сигналу из обработчика входящего запроса и по сигналу из конфига исходящего запроса
-  (0, _getFetchExtraAborting.getFetchExtraAborting)(abortController), (0, _http.cookie)(cookieStore), (0, _getFetchTracing.getFetchTracing)(tracer, context.res.locals.tracing.rootContext),
+  (0, _getFetchExtraAborting.getFetchExtraAborting)(abortController), (0, _getFetchTracing.getFetchTracing)(tracer, context.res.locals.tracing.rootContext),
   // ВАЖНО: слой логирования запроса и ответа ПОСЛЕ остальных слоев чтобы использовать актуальные данные
   (0, _getFetchLogging.getFetchLogging)(logHandler)];
 }

package/dist/cjs/preset/node-handler/providers/fetch-middleware.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fetch-middleware.js","names":["_http","require","_tokens","_getFetchErrorLogging","_getFetchExtraAborting","_getFetchLogging","_getFetchTracing","_getForwardedHeaders","provideFetchMiddleware","resolve","config","KnownToken","Config","base","tracer","Tracing","context","ExpressHandler","logHandler","Http","Fetch","Middleware","Log","handler","~~cookieStore","~~abortController","getFetchErrorLogging","defaultHeaders","getForwardedHeaders","req","getFetchExtraAborting","~~cookie","~~getFetchTracing","res","locals","tracing","rootContext","getFetchLogging"],"sources":["../../../../../src/preset/node-handler/providers/fetch-middleware.ts"],"sourcesContent":["import { Resolve } from '../../../di';\nimport { Middleware, ~~cookie,~~ 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 ~~cookieStore = resolve(KnownToken.Http.Fetch.cookieStore);\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 ~~cookie(cookieStore),\n\n~~ getFetchTracing(tracer, context.res.locals.tracing.rootContext),\n\n // ВАЖНО: слой логирования запроса и ответа ПОСЛЕ остальных слоев чтобы использовать актуальные данные\n getFetchLogging(logHandler),\n ];\n}\n"],"mappings":";;;;;;AACA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,qBAAA,GAAAF,OAAA;AACA,IAAAG,sBAAA,GAAAH,OAAA;AACA,IAAAI,gBAAA,GAAAJ,OAAA;AACA,IAAAK,gBAAA,GAAAL,OAAA;AACA,IAAAM,oBAAA,GAAAN,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,SAASO,sBAAsBA,CAACC,OAAgB,EAAgB;EACrE,MAAMC,MAAM,GAAGD,OAAO,CAACE,kBAAU,CAACC,MAAM,CAACC,IAAI,CAAC;EAC9C,MAAMC,MAAM,GAAGL,OAAO,CAACE,kBAAU,CAACI,OAAO,CAACD,MAAM,CAAC;EACjD,MAAME,OAAO,GAAGP,OAAO,CAACE,kBAAU,CAACM,cAAc,CAACD,OAAO,CAAC;EAC1D,MAAME,UAAU,GAAGT,OAAO,CAACE,kBAAU,CAACQ,IAAI,CAACC,KAAK,CAACC,UAAU,CAACC,GAAG,CAACC,OAAO,CAAC;EACxE,MAAMC,~~WAAW~~,GAAGf,OAAO,CAACE,kBAAU,CAACQ,IAAI,CAACC,KAAK,CAACI,~~WAAW,CAAC;EAC9D,MAAMC,~~eAAe,~~GAAGhB,OAAO,CAACE,kBAAU,CAACQ,IAAI,CAACC,KAAK,CAACK,eAAe,~~CAAC;EAEtE,OAAO;EACL;EACA,IAAAC,0CAAoB,~~EAACR~~,UAAU,CAAC;EAEhC;EACA,~~IAAAS~~,oBAAc,EAAC,IAAAC,wCAAmB,~~EAAClB~~,MAAM,EAAEM,OAAO,~~CAACa~~,GAAG,CAAC,CAAC;EAExD;EACA,IAAAC,4CAAqB,EAACL,eAAe,CAAC,EAEtC,IAAAM,~~YAAM,EAACP,WAAW,CAAC,EAEnB,IAAAQ,~~gCAAe,~~EAAClB~~,MAAM,EAAEE,OAAO,~~CAACiB~~,GAAG,CAACC,MAAM,CAACC,OAAO,CAACC,WAAW,CAAC;EAE/D;EACA,IAAAC,gCAAe,~~EAACnB~~,UAAU,CAAC,CAC5B;AACH"}
1	+ {"version":3,"file":"fetch-middleware.js","names":["_http","require","_tokens","_getFetchErrorLogging","_getFetchExtraAborting","_getFetchLogging","_getFetchTracing","_getForwardedHeaders","provideFetchMiddleware","resolve","config","KnownToken","Config","base","tracer","Tracing","context","ExpressHandler","logHandler","Http","Fetch","Middleware","Log","handler","abortController","getFetchErrorLogging","defaultHeaders","getForwardedHeaders","req","getFetchExtraAborting","getFetchTracing","res","locals","tracing","rootContext","getFetchLogging"],"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,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,qBAAA,GAAAF,OAAA;AACA,IAAAG,sBAAA,GAAAH,OAAA;AACA,IAAAI,gBAAA,GAAAJ,OAAA;AACA,IAAAK,gBAAA,GAAAL,OAAA;AACA,IAAAM,oBAAA,GAAAN,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,SAASO,sBAAsBA,CAACC,OAAgB,EAAgB;EACrE,MAAMC,MAAM,GAAGD,OAAO,CAACE,kBAAU,CAACC,MAAM,CAACC,IAAI,CAAC;EAC9C,MAAMC,MAAM,GAAGL,OAAO,CAACE,kBAAU,CAACI,OAAO,CAACD,MAAM,CAAC;EACjD,MAAME,OAAO,GAAGP,OAAO,CAACE,kBAAU,CAACM,cAAc,CAACD,OAAO,CAAC;EAC1D,MAAME,UAAU,GAAGT,OAAO,CAACE,kBAAU,CAACQ,IAAI,CAACC,KAAK,CAACC,UAAU,CAACC,GAAG,CAACC,OAAO,CAAC;EACxE,MAAMC,eAAe,GAAGf,OAAO,CAACE,kBAAU,CAACQ,IAAI,CAACC,KAAK,CAACI,eAAe,CAAC;EAEtE,OAAO;EACL;EACA,IAAAC,0CAAoB,EAACP,UAAU,CAAC;EAEhC;EACA,IAAAQ,oBAAc,EAAC,IAAAC,wCAAmB,EAACjB,MAAM,EAAEM,OAAO,CAACY,GAAG,CAAC,CAAC;EAExD;EACA,IAAAC,4CAAqB,EAACL,eAAe,CAAC,EAEtC,IAAAM,gCAAe,EAAChB,MAAM,EAAEE,OAAO,CAACe,GAAG,CAACC,MAAM,CAACC,OAAO,CAACC,WAAW,CAAC;EAE/D;EACA,IAAAC,gCAAe,EAACjB,UAAU,CAAC,CAC5B;AACH"}

package/dist/cjs/preset/node-handler/providers/handler-main.js CHANGED Viewed

@@ -19,26 +19,13 @@ function provideHandlerMain(resolve) {
   const context = resolve(_tokens.KnownToken.ExpressHandler.context);
   const render = resolve(_tokens.KnownToken.Http.Handler.Page.render);
   const assetsInit = resolve(_tokens.KnownToken.Http.Handler.Page.assets);
-  const extras = resolve(_tokens.KnownToken.Http.Handler.Response.specificExtras);
   const Helmet = resolve(_tokens.KnownToken.Http.Handler.Page.helmet);
   const abortController = resolve(_tokens.KnownToken.Http.Fetch.abortController);
   const formatResponse = resolve(_tokens.KnownToken.Http.Handler.Page.formatResponse);
   const getAssets = typeof assetsInit === 'function' ? assetsInit : () => assetsInit;
-  // @todo https://github.com/sima-land/isomorph/issues/69
-  // const cookieStore = resolve(KnownToken.Http.Fetch.cookieStore);
-  // cookieStore.subscribe(setCookieList => {
-  //   for (const setCookie of setCookieList) {
-  //     const parsed = parseSetCookieHeader(setCookie);
-  //     parsed && res.cookie(parsed.name, parsed.value, parsed.attrs);
-  //   }
-  // });
   return async () => {
     try {
       const assets = await getAssets();
-      const meta = extras.getMeta();
       const jsx = /*#__PURE__*/(0, _jsxRuntime.jsx)(_regularHelmet.HelmetContext.Provider, {
         value: {
           title: config.appName,
@@ -51,7 +38,7 @@ function provideHandlerMain(resolve) {
       const {
         body,
         headers
-      } = await formatResponse(jsx, assets, meta);
+      } = await formatResponse(jsx, assets);
       headers.forEach((hValue, hName) => context.res.setHeader(hName, hValue));
       context.res.send(body);
     } catch (error) {

package/dist/cjs/preset/node-handler/providers/handler-main.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"handler-main.js","names":["_tokens","require","_regularHelmet","_formatHandlerError","_jsxRuntime","provideHandlerMain","resolve","config","KnownToken","Config","base","logger","context","ExpressHandler","render","Http","Handler","Page","assetsInit","assets","~~extras","Response","specificExtras","~~Helmet","helmet","abortController","Fetch","formatResponse","getAssets","~~meta","getMeta","~~jsx","HelmetContext","Provider","value","title","appName","children","body","headers","forEach","hValue","hName","res","setHeader","send","error","response","log","formatHandlerError","status","redirectLocation","redirect","level","abort"],"sources":["../../../../../src/preset/node-handler/providers/handler-main.tsx"],"sourcesContent":["import type { Resolve } from '../../../di';\nimport type express from 'express';\nimport { KnownToken } from '../../../tokens';\nimport { HelmetContext } from '../../server/utils/regular-helmet';\nimport { formatHandlerError } from '../../server/utils/format-handler-error';\n\n/*\n Провайдер главной функции обработчика входящего http-запроса.\n * @param resolve Функция для получения зависимости по токену.\n * @return Главная функция.\n */\nexport function provideHandlerMain(resolve: Resolve): express.Handler {\n const config = resolve(KnownToken.Config.base);\n const logger = resolve(KnownToken.logger);\n const context = resolve(KnownToken.ExpressHandler.context);\n const render = resolve(KnownToken.Http.Handler.Page.render);\n const assetsInit = resolve(KnownToken.Http.Handler.Page.assets);\n const ~~extras = resolve(KnownToken.Http.Handler.Response.specificExtras);\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 // @todo https://github.com/sima-land/isomorph/issues/69\n // const cookieStore = resolve(KnownToken.Http.Fetch.cookieStore);\n // cookieStore.subscribe(setCookieList => {\n // for (const setCookie of setCookieList) {\n // const parsed = parseSetCookieHeader(setCookie);\n\n // parsed && res.cookie(parsed.name, parsed.value, parsed.attrs);\n // }\n // });\n\n return async () => {\n try {\n const assets = await getAssets();\n ~~const meta = extras.getMeta();\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~~, meta~~);\n\n headers.forEach((hValue, hName) => context.res.setHeader(hName, hValue));\n context.res.send(body);\n } catch (error) {\n const { response, log } = formatHandlerError(error);\n\n if (response.status > 299 && response.status < 400 && response.redirectLocation) {\n context.res.redirect(response.status, response.redirectLocation);\n } else {\n context.res.status(response.status).send(response.body);\n }\n\n if (log.level && logger[log.level]) {\n logger[log.level](error);\n }\n }\n\n // ВАЖНО: прерываем исходящие в рамках обработчика http-запросы\n abortController.abort();\n };\n}\n\n// @todo а что если привести все зависимости к виду:\n// const getAppConfig = resolve.lazy(KnownToken.Config.base);\n"],"mappings":";;;;;;AAEA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,mBAAA,GAAAF,OAAA;AAA6E,IAAAG,WAAA,GAAAH,OAAA;AAE7E;AACA;AACA;AACA;AACA;AACO,SAASI,kBAAkBA,CAACC,OAAgB,EAAmB;EACpE,MAAMC,MAAM,GAAGD,OAAO,CAACE,kBAAU,CAACC,MAAM,CAACC,IAAI,CAAC;EAC9C,MAAMC,MAAM,GAAGL,OAAO,CAACE,kBAAU,CAACG,MAAM,CAAC;EACzC,MAAMC,OAAO,GAAGN,OAAO,CAACE,kBAAU,CAACK,cAAc,CAACD,OAAO,CAAC;EAC1D,MAAME,MAAM,GAAGR,OAAO,CAACE,kBAAU,CAACO,IAAI,CAACC,OAAO,CAACC,IAAI,CAACH,MAAM,CAAC;EAC3D,MAAMI,UAAU,GAAGZ,OAAO,CAACE,kBAAU,CAACO,IAAI,CAACC,OAAO,CAACC,IAAI,CAACE,MAAM,CAAC;EAC/D,MAAMC,MAAM,GAAGd,OAAO,CAACE,kBAAU,CAACO,IAAI,CAACC,OAAO,~~CAACK,QAAQ,~~CAACC,~~cAAc,CAAC;EACvE,MAAMC,MAAM,GAAGjB,OAAO,CAACE,kBAAU,CAACO,~~IAAI,~~CAACC~~,~~OAAO,CAACC,IAAI,CAACO,~~MAAM,CAAC;EAC3D,MAAMC,eAAe,~~GAAGnB~~,OAAO,CAACE,kBAAU,CAACO,IAAI,~~CAACW~~,KAAK,CAACD,eAAe,CAAC;EACtE,MAAME,cAAc,~~GAAGrB~~,OAAO,CAACE,kBAAU,CAACO,IAAI,CAACC,OAAO,CAACC,IAAI,~~CAACU~~,cAAc,CAAC;EAE3E,MAAMC,SAAS,GAAG,~~OAAOV~~,UAAU,KAAK,UAAU,GAAGA,UAAU,GAAG,MAAMA,UAAU;;EAElF~~;EACA;EACA;EACA;EACA;;EAEA;EACA;EACA;;EAEA~~,OAAO,YAAY;IACjB,IAAI;MACF,MAAMC,MAAM,GAAG,~~MAAMS~~,SAAS,CAAC,CAAC;~~MAChC~~,MAAMC,~~IAAI,GAAGT,MAAM,CAACU,OAAO,CAAC,CAAC;MAE7B,MAAMC,~~GAAG,gBACP,~~IAAA3B~~,WAAA,~~CAAA2B~~,GAAA,~~EAAC7B~~,cAAA,~~CAAA8B~~,aAAa,CAACC,QAAQ;QAACC,KAAK,EAAE;UAAEC,KAAK,~~EAAE5B~~,MAAM,~~CAAC6B~~,OAAO;~~UAAEjB~~;QAAO,CAAE;~~QAAAkB~~,QAAA,eAC/D,~~IAAAjC~~,WAAA,~~CAAA2B~~,GAAA,~~EAACR~~,MAAM;~~UAAAc~~,QAAA,EAAE,~~MAAMvB~~,MAAM,CAAC;QAAC,CAAS;MAAC,CACX,CACzB;MAED,MAAM;~~QAAEwB~~,IAAI;QAAEC;MAAQ,CAAC,GAAG,~~MAAMZ~~,cAAc,~~CAACI~~,GAAG,~~EAAEZ~~,MAAM,~~EAAEU,IAAI,~~CAAC;~~MAEjEU~~,OAAO,CAACC,OAAO,CAAC,CAACC,MAAM,EAAEC,KAAK,~~KAAK9B~~,OAAO,~~CAAC+B~~,GAAG,CAACC,SAAS,CAACF,KAAK,EAAED,MAAM,CAAC,CAAC;~~MACxE7B~~,OAAO,~~CAAC+B~~,GAAG,CAACE,IAAI,CAACP,IAAI,CAAC;IACxB,CAAC,CAAC,OAAOQ,KAAK,EAAE;MACd,MAAM;QAAEC,QAAQ;QAAEC;MAAI,CAAC,GAAG,IAAAC,sCAAkB,EAACH,KAAK,CAAC;MAEnD,IAAIC,QAAQ,CAACG,MAAM,GAAG,GAAG,IAAIH,QAAQ,CAACG,MAAM,GAAG,GAAG,IAAIH,QAAQ,CAACI,gBAAgB,EAAE;QAC/~~EvC~~,OAAO,~~CAAC+B~~,GAAG,CAACS,QAAQ,CAACL,QAAQ,CAACG,MAAM,EAAEH,QAAQ,CAACI,gBAAgB,CAAC;MAClE,CAAC,MAAM;~~QACLvC~~,OAAO,~~CAAC+B~~,GAAG,CAACO,MAAM,CAACH,QAAQ,CAACG,MAAM,CAAC,CAACL,IAAI,CAACE,QAAQ,CAACT,IAAI,CAAC;MACzD;MAEA,IAAIU,GAAG,CAACK,KAAK,~~IAAI1C~~,MAAM,~~CAACqC~~,GAAG,CAACK,KAAK,CAAC,EAAE;~~QAClC1C~~,MAAM,~~CAACqC~~,GAAG,CAACK,KAAK,CAAC,CAACP,KAAK,CAAC;MAC1B;IACF;;IAEA;~~IACArB~~,eAAe,~~CAAC6B~~,KAAK,CAAC,CAAC;EACzB,CAAC;AACH;;AAEA;AACA"}
1	+ {"version":3,"file":"handler-main.js","names":["_tokens","require","_regularHelmet","_formatHandlerError","_jsxRuntime","provideHandlerMain","resolve","config","KnownToken","Config","base","logger","context","ExpressHandler","render","Http","Handler","Page","assetsInit","assets","Helmet","helmet","abortController","Fetch","formatResponse","getAssets","jsx","HelmetContext","Provider","value","title","appName","children","body","headers","forEach","hValue","hName","res","setHeader","send","error","response","log","formatHandlerError","status","redirectLocation","redirect","level","abort"],"sources":["../../../../../src/preset/node-handler/providers/handler-main.tsx"],"sourcesContent":["import type { Resolve } from '../../../di';\nimport type express from 'express';\nimport { KnownToken } from '../../../tokens';\nimport { HelmetContext } from '../../server/utils/regular-helmet';\nimport { formatHandlerError } from '../../server/utils/format-handler-error';\n\n/*\n Провайдер главной функции обработчика входящего http-запроса.\n * @param resolve Функция для получения зависимости по токену.\n * @return Главная функция.\n */\nexport function provideHandlerMain(resolve: Resolve): express.Handler {\n const config = resolve(KnownToken.Config.base);\n const logger = resolve(KnownToken.logger);\n const context = resolve(KnownToken.ExpressHandler.context);\n const render = resolve(KnownToken.Http.Handler.Page.render);\n const assetsInit = resolve(KnownToken.Http.Handler.Page.assets);\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 return async () => {\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 headers.forEach((hValue, hName) => context.res.setHeader(hName, hValue));\n context.res.send(body);\n } catch (error) {\n const { response, log } = formatHandlerError(error);\n\n if (response.status > 299 && response.status < 400 && response.redirectLocation) {\n context.res.redirect(response.status, response.redirectLocation);\n } else {\n context.res.status(response.status).send(response.body);\n }\n\n if (log.level && logger[log.level]) {\n logger[log.level](error);\n }\n }\n\n // ВАЖНО: прерываем исходящие в рамках обработчика http-запросы\n abortController.abort();\n };\n}\n\n// @todo а что если привести все зависимости к виду:\n// const getAppConfig = resolve.lazy(KnownToken.Config.base);\n"],"mappings":"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"}

package/dist/cjs/preset/server/index.js CHANGED Viewed

@@ -15,6 +15,12 @@ Object.defineProperty(exports, "HelmetContext", {
     return _regularHelmet.HelmetContext;
   }
 });
+Object.defineProperty(exports, "PAGE_FORMAT_PRIORITY", {
+  enumerable: true,
+  get: function () {
+    return _constants.PAGE_FORMAT_PRIORITY;
+  }
+});
 Object.defineProperty(exports, "PAGE_HANDLER_EVENT_TYPE", {
   enumerable: true,
   get: function () {

package/dist/cjs/preset/server/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","names":["_constants","require","_applyServerMiddleware","_getClientIp","_getForwardedHeaders","_getHealthCheck","_getPageResponseFormat","_getServeErrorLogging","_getServeLogging","_handlerProvider","_regularHelmet","_specificExtras"],"sources":["../../../../src/preset/server/index.ts"],"sourcesContent":["export type { ServerHandler, ServerMiddleware, ServerHandlerContext } from './types';\nexport { PAGE_HANDLER_EVENT_TYPE } 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":"~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA~~,IAAAA,UAAA,GAAAC,OAAA;AAGA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,oBAAA,GAAAH,OAAA;AACA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,sBAAA,GAAAL,OAAA;AACA,IAAAM,qBAAA,GAAAN,OAAA;AACA,IAAAO,gBAAA,GAAAP,OAAA;AACA,IAAAQ,gBAAA,GAAAR,OAAA;AACA,IAAAS,cAAA,GAAAT,OAAA;AACA,IAAAU,eAAA,GAAAV,OAAA"}
1	+ {"version":3,"file":"index.js","names":["_constants","require","_applyServerMiddleware","_getClientIp","_getForwardedHeaders","_getHealthCheck","_getPageResponseFormat","_getServeErrorLogging","_getServeLogging","_handlerProvider","_regularHelmet","_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,IAAAA,UAAA,GAAAC,OAAA;AAGA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,oBAAA,GAAAH,OAAA;AACA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,sBAAA,GAAAL,OAAA;AACA,IAAAM,qBAAA,GAAAN,OAAA;AACA,IAAAO,gBAAA,GAAAP,OAAA;AACA,IAAAQ,gBAAA,GAAAR,OAAA;AACA,IAAAS,cAAA,GAAAT,OAAA;AACA,IAAAU,eAAA,GAAAV,OAAA"}

package/dist/cjs/preset/server/providers/fetch-middleware.js.map ADDED Viewed

@@ -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;;AAGO,SAASA,sBAAsBA,CAAA,EAAiB;EACrD;EACA,OAAO,EAAE;AACX"}

package/dist/cjs/preset/server/providers/format-page-response.js CHANGED Viewed

@@ -16,7 +16,9 @@ function provideFormatPageResponse(resolve) {
   const config = resolve(_tokens.KnownToken.Config.base);
   const acceptType = resolve(_tokens.KnownToken.Http.Handler.Request.acceptType);
   const elementToString = resolve(_tokens.KnownToken.Http.Handler.Page.elementToString);
-  return async (jsx, assets, meta) => {
+  const extras = resolve(_tokens.KnownToken.Http.Handler.Response.specificExtras);
+  return async (jsx, assets) => {
+    const meta = extras.getMeta();
     const headers = new Headers();
     let body;
     switch (acceptType(_constants.PAGE_FORMAT_PRIORITY)) {
@@ -51,6 +53,7 @@ function provideFormatPageResponse(resolve) {
           // ВАЖНО: DOCTYPE обязательно нужен так как влияет на то как браузер будет парсить html/css
           // ВАЖНО: DOCTYPE нужен только когда отдаем полноценную страницу
+          // @todo переделать  на проверку параметра ?html-doctype=false
           if (config.env === 'development') {
             body = `<!DOCTYPE html>${await elementToString(jsx)}`;
           } else {

package/dist/cjs/preset/server/providers/format-page-response.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"format-page-response.js","names":["_tokens","require","_constants","provideFormatPageResponse","resolve","config","KnownToken","Config","base","acceptType","Http","Handler","Request","elementToString","Page","jsx","assets","meta","headers","Headers","body","PAGE_FORMAT_PRIORITY","set","JSON","stringify","markup","bundle_js","js","bundle_css","css","critical_js","criticalJs","critical_css","criticalCss","env"],"sources":["../../../../../src/preset/server/providers/format-page-response.ts"],"sourcesContent":["import type { Resolve } from '../../../di';\nimport type { ConventionalJson } from '../../isomorphic';\nimport type { PageResponseFormatter } from '../types';\nimport { KnownToken } from '../../../tokens';\nimport { PAGE_FORMAT_PRIORITY } from '../constants';\n\n/*\n Провайдер функции форматирования ответа.\n * Функция форматирования вернёт данные ответа на запрос страницы в нужном формате в зависимости от заголовка Accept.\n * @param resolve Резолвер.\n * @return Функция форматирования.\n */\nexport function provideFormatPageResponse(resolve: Resolve): PageResponseFormatter {\n const config = resolve(KnownToken.Config.base);\n const acceptType = resolve(KnownToken.Http.Handler.Request.acceptType);\n const elementToString = resolve(KnownToken.Http.Handler.Page.elementToString);\n\n return async (jsx, assets~~, meta~~) => {\n const headers = new Headers();\n let body: string;\n\n switch (acceptType(PAGE_FORMAT_PRIORITY)) {\n case 'json': {\n headers.set('content-type', 'application/json');\n\n body = JSON.stringify({\n markup: await elementToString(jsx),\n bundle_js: assets.js,\n bundle_css: assets.css,\n critical_js: assets.criticalJs,\n critical_css: assets.criticalCss,\n meta,\n } satisfies ConventionalJson);\n\n break;\n }\n\n case 'html':\n default: {\n headers.set('content-type', 'text/html');\n headers.set('simaland-bundle-js', assets.js);\n headers.set('simaland-bundle-css', assets.css);\n\n if (assets.criticalJs) {\n headers.set('simaland-critical-js', assets.criticalJs);\n }\n\n if (assets.criticalCss) {\n headers.set('simaland-critical-css', assets.criticalCss);\n }\n\n if (meta) {\n headers.set('simaland-meta', JSON.stringify(meta));\n }\n\n // ВАЖНО: DOCTYPE обязательно нужен так как влияет на то как браузер будет парсить html/css\n // ВАЖНО: DOCTYPE нужен только когда отдаем полноценную страницу\n if (config.env === 'development') {\n body = `<!DOCTYPE html>${await elementToString(jsx)}`;\n } else {\n body = await elementToString(jsx);\n }\n\n break;\n }\n }\n\n return { body, headers };\n };\n}\n"],"mappings":";;;;;;AAGA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASE,yBAAyBA,CAACC,OAAgB,EAAyB;EACjF,MAAMC,MAAM,GAAGD,OAAO,CAACE,kBAAU,CAACC,MAAM,CAACC,IAAI,CAAC;EAC9C,MAAMC,UAAU,GAAGL,OAAO,CAACE,kBAAU,CAACI,IAAI,CAACC,OAAO,CAACC,OAAO,CAACH,UAAU,CAAC;EACtE,MAAMI,eAAe,GAAGT,OAAO,CAACE,kBAAU,CAACI,IAAI,CAACC,OAAO,CAACG,IAAI,CAACD,eAAe,CAAC;~~EAE7E~~,OAAO,~~OAAOE~~,GAAG,EAAEC,MAAM,~~EAAEC~~,IAAI,~~KAAK~~;~~IAClC~~,MAAMC,OAAO,GAAG,IAAIC,OAAO,CAAC,CAAC;~~IAC7B~~,IAAIC,IAAY;IAEhB,~~QAAQX~~,UAAU,~~CAACY~~,+BAAoB,CAAC;MACtC,KAAK,MAAM;QAAE;UACXH,OAAO,CAACI,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC;UAE/CF,IAAI,GAAGG,IAAI,CAACC,SAAS,CAAC;YACpBC,MAAM,EAAE,~~MAAMZ~~,eAAe,~~CAACE~~,GAAG,CAAC;~~YAClCW~~,SAAS,~~EAAEV~~,MAAM,~~CAACW~~,EAAE;YACpBC,UAAU,~~EAAEZ~~,MAAM,~~CAACa~~,GAAG;YACtBC,WAAW,~~EAAEd~~,MAAM,~~CAACe~~,UAAU;YAC9BC,YAAY,~~EAAEhB~~,MAAM,~~CAACiB~~,WAAW;~~YAChChB~~;UACF,CAA4B,CAAC;UAE7B;QACF;MAEA,KAAK,MAAM;MACX;QAAS;~~UACPC~~,OAAO,CAACI,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC;UACxCJ,OAAO,CAACI,GAAG,CAAC,oBAAoB,~~EAAEN~~,MAAM,~~CAACW~~,EAAE,CAAC;UAC5CT,OAAO,CAACI,GAAG,CAAC,qBAAqB,~~EAAEN~~,MAAM,~~CAACa~~,GAAG,CAAC;UAE9C,~~IAAIb~~,MAAM,~~CAACe~~,UAAU,EAAE;YACrBb,OAAO,CAACI,GAAG,CAAC,sBAAsB,~~EAAEN~~,MAAM,~~CAACe~~,UAAU,CAAC;UACxD;UAEA,~~IAAIf~~,MAAM,~~CAACiB~~,WAAW,EAAE;YACtBf,OAAO,CAACI,GAAG,CAAC,uBAAuB,~~EAAEN~~,MAAM,~~CAACiB~~,WAAW,CAAC;UAC1D;UAEA,~~IAAIhB~~,IAAI,EAAE;~~YACRC~~,OAAO,CAACI,GAAG,CAAC,eAAe,EAAEC,IAAI,CAACC,SAAS,~~CAACP~~,IAAI,CAAC,CAAC;UACpD;;UAEA;UACA;UACA,~~IAAIZ~~,MAAM,~~CAAC6B~~,GAAG,KAAK,aAAa,EAAE;YAChCd,IAAI,GAAI,kBAAiB,~~MAAMP~~,eAAe,~~CAACE~~,GAAG,CAAE,EAAC;UACvD,CAAC,MAAM;~~YACLK~~,IAAI,GAAG,~~MAAMP~~,eAAe,~~CAACE~~,GAAG,CAAC;UACnC;UAEA;QACF;IACF;IAEA,OAAO;~~MAAEK~~,IAAI;MAAEF;IAAQ,CAAC;EAC1B,CAAC;AACH"}
1	+ {"version":3,"file":"format-page-response.js","names":["_tokens","require","_constants","provideFormatPageResponse","resolve","config","KnownToken","Config","base","acceptType","Http","Handler","Request","elementToString","Page","extras","Response","specificExtras","jsx","assets","meta","getMeta","headers","Headers","body","PAGE_FORMAT_PRIORITY","set","JSON","stringify","markup","bundle_js","js","bundle_css","css","critical_js","criticalJs","critical_css","criticalCss","env"],"sources":["../../../../../src/preset/server/providers/format-page-response.ts"],"sourcesContent":["import type { Resolve } from '../../../di';\nimport type { ConventionalJson } from '../../isomorphic';\nimport type { PageResponseFormatter } from '../types';\nimport { KnownToken } from '../../../tokens';\nimport { PAGE_FORMAT_PRIORITY } from '../constants';\n\n/*\n Провайдер функции форматирования ответа.\n * Функция форматирования вернёт данные ответа на запрос страницы в нужном формате в зависимости от заголовка Accept.\n * @param resolve Резолвер.\n * @return Функция форматирования.\n */\nexport function provideFormatPageResponse(resolve: Resolve): PageResponseFormatter {\n const config = resolve(KnownToken.Config.base);\n const acceptType = resolve(KnownToken.Http.Handler.Request.acceptType);\n const elementToString = resolve(KnownToken.Http.Handler.Page.elementToString);\n const extras = resolve(KnownToken.Http.Handler.Response.specificExtras);\n\n return async (jsx, assets) => {\n const meta = extras.getMeta();\n const headers = new Headers();\n\n let body: string;\n\n switch (acceptType(PAGE_FORMAT_PRIORITY)) {\n case 'json': {\n headers.set('content-type', 'application/json');\n\n body = JSON.stringify({\n markup: await elementToString(jsx),\n bundle_js: assets.js,\n bundle_css: assets.css,\n critical_js: assets.criticalJs,\n critical_css: assets.criticalCss,\n meta,\n } satisfies ConventionalJson);\n\n break;\n }\n\n case 'html':\n default: {\n headers.set('content-type', 'text/html');\n headers.set('simaland-bundle-js', assets.js);\n headers.set('simaland-bundle-css', assets.css);\n\n if (assets.criticalJs) {\n headers.set('simaland-critical-js', assets.criticalJs);\n }\n\n if (assets.criticalCss) {\n headers.set('simaland-critical-css', assets.criticalCss);\n }\n\n if (meta) {\n headers.set('simaland-meta', JSON.stringify(meta));\n }\n\n // ВАЖНО: DOCTYPE обязательно нужен так как влияет на то как браузер будет парсить html/css\n // ВАЖНО: DOCTYPE нужен только когда отдаем полноценную страницу\n // @todo переделать на проверку параметра ?html-doctype=false\n if (config.env === 'development') {\n body = `<!DOCTYPE html>${await elementToString(jsx)}`;\n } else {\n body = await elementToString(jsx);\n }\n\n break;\n }\n }\n\n return { body, headers };\n };\n}\n"],"mappings":";;;;;;AAGA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASE,yBAAyBA,CAACC,OAAgB,EAAyB;EACjF,MAAMC,MAAM,GAAGD,OAAO,CAACE,kBAAU,CAACC,MAAM,CAACC,IAAI,CAAC;EAC9C,MAAMC,UAAU,GAAGL,OAAO,CAACE,kBAAU,CAACI,IAAI,CAACC,OAAO,CAACC,OAAO,CAACH,UAAU,CAAC;EACtE,MAAMI,eAAe,GAAGT,OAAO,CAACE,kBAAU,CAACI,IAAI,CAACC,OAAO,CAACG,IAAI,CAACD,eAAe,CAAC;EAC7E,MAAME,MAAM,GAAGX,OAAO,CAACE,kBAAU,CAACI,IAAI,CAACC,OAAO,CAACK,QAAQ,CAACC,cAAc,CAAC;EAEvE,OAAO,OAAOC,GAAG,EAAEC,MAAM,KAAK;IAC5B,MAAMC,IAAI,GAAGL,MAAM,CAACM,OAAO,CAAC,CAAC;IAC7B,MAAMC,OAAO,GAAG,IAAIC,OAAO,CAAC,CAAC;IAE7B,IAAIC,IAAY;IAEhB,QAAQf,UAAU,CAACgB,+BAAoB,CAAC;MACtC,KAAK,MAAM;QAAE;UACXH,OAAO,CAACI,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC;UAE/CF,IAAI,GAAGG,IAAI,CAACC,SAAS,CAAC;YACpBC,MAAM,EAAE,MAAMhB,eAAe,CAACK,GAAG,CAAC;YAClCY,SAAS,EAAEX,MAAM,CAACY,EAAE;YACpBC,UAAU,EAAEb,MAAM,CAACc,GAAG;YACtBC,WAAW,EAAEf,MAAM,CAACgB,UAAU;YAC9BC,YAAY,EAAEjB,MAAM,CAACkB,WAAW;YAChCjB;UACF,CAA4B,CAAC;UAE7B;QACF;MAEA,KAAK,MAAM;MACX;QAAS;UACPE,OAAO,CAACI,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC;UACxCJ,OAAO,CAACI,GAAG,CAAC,oBAAoB,EAAEP,MAAM,CAACY,EAAE,CAAC;UAC5CT,OAAO,CAACI,GAAG,CAAC,qBAAqB,EAAEP,MAAM,CAACc,GAAG,CAAC;UAE9C,IAAId,MAAM,CAACgB,UAAU,EAAE;YACrBb,OAAO,CAACI,GAAG,CAAC,sBAAsB,EAAEP,MAAM,CAACgB,UAAU,CAAC;UACxD;UAEA,IAAIhB,MAAM,CAACkB,WAAW,EAAE;YACtBf,OAAO,CAACI,GAAG,CAAC,uBAAuB,EAAEP,MAAM,CAACkB,WAAW,CAAC;UAC1D;UAEA,IAAIjB,IAAI,EAAE;YACRE,OAAO,CAACI,GAAG,CAAC,eAAe,EAAEC,IAAI,CAACC,SAAS,CAACR,IAAI,CAAC,CAAC;UACpD;;UAEA;UACA;UACA;UACA,IAAIf,MAAM,CAACiC,GAAG,KAAK,aAAa,EAAE;YAChCd,IAAI,GAAI,kBAAiB,MAAMX,eAAe,CAACK,GAAG,CAAE,EAAC;UACvD,CAAC,MAAM;YACLM,IAAI,GAAG,MAAMX,eAAe,CAACK,GAAG,CAAC;UACnC;UAEA;QACF;IACF;IAEA,OAAO;MAAEM,IAAI;MAAEF;IAAQ,CAAC;EAC1B,CAAC;AACH"}

package/dist/cjs/preset/server/providers/serve.js ADDED Viewed

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.provideServe = provideServe;
+var _tokens = require("../../../tokens");
+var _http = require("../../../http");
+var _fetchTools = require("@krutoo/fetch-tools");
+var _applyServerMiddleware = require("../utils/apply-server-middleware");
+/* eslint-disable require-jsdoc, jsdoc/require-jsdoc */
+function provideServe(resolve) {
+  const config = resolve(_tokens.KnownToken.Config.base);
+  const pageRoutes = resolve(_tokens.KnownToken.Http.Serve.pageRoutes);
+  const serviceRoutes = resolve(_tokens.KnownToken.Http.Serve.serviceRoutes);
+  const middleware = resolve(_tokens.KnownToken.Http.Serve.middleware);
+  const proxyConfig = resolve(_tokens.KnownToken.Http.Serve.Proxy.config);
+  const enhance = config.env === 'development' && proxyConfig ? (0, _fetchTools.applyMiddleware)(...(Array.isArray(proxyConfig) ? proxyConfig.map(_http.proxy) : [(0, _http.proxy)(proxyConfig)])) : identity;
+  const builder = _fetchTools.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 = (0, _applyServerMiddleware.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/cjs/preset/server/providers/serve.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"serve.js","names":["_tokens","require","_http","_fetchTools","_applyServerMiddleware","provideServe","resolve","config","KnownToken","Config","base","pageRoutes","Http","Serve","serviceRoutes","middleware","proxyConfig","Proxy","enhance","env","applyMiddleware","Array","isArray","map","proxy","identity","builder","router","pattern","handler","path","method","pageHandler","applyServerMiddleware","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":";;;;;;AAEA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,sBAAA,GAAAH,OAAA;AALA;;AAOO,SAASI,YAAYA,CAACC,OAAgB,EAAW;EACtD,MAAMC,MAAM,GAAGD,OAAO,CAACE,kBAAU,CAACC,MAAM,CAACC,IAAI,CAAC;EAC9C,MAAMC,UAAU,GAAGL,OAAO,CAACE,kBAAU,CAACI,IAAI,CAACC,KAAK,CAACF,UAAU,CAAC;EAC5D,MAAMG,aAAa,GAAGR,OAAO,CAACE,kBAAU,CAACI,IAAI,CAACC,KAAK,CAACC,aAAa,CAAC;EAClE,MAAMC,UAAU,GAAGT,OAAO,CAACE,kBAAU,CAACI,IAAI,CAACC,KAAK,CAACE,UAAU,CAAC;EAC5D,MAAMC,WAAW,GAAGV,OAAO,CAACE,kBAAU,CAACI,IAAI,CAACC,KAAK,CAACI,KAAK,CAACV,MAAM,CAAC;EAE/D,MAAMW,OAAO,GACXX,MAAM,CAACY,GAAG,KAAK,aAAa,IAAIH,WAAW,GACvC,IAAAI,2BAAe,EACb,IAAIC,KAAK,CAACC,OAAO,CAACN,WAAW,CAAC,GAAGA,WAAW,CAACO,GAAG,CAACC,WAAK,CAAC,GAAG,CAAC,IAAAA,WAAK,EAACR,WAAW,CAAC,CAAC,CAChF,CAAC,GACDS,QAAQ;EAEd,MAAMC,OAAO,GAAGC,kBAAM,CAACD,OAAO,CAAC,CAAC;;EAEhC;EACA,KAAK,MAAM,CAACE,OAAO,EAAEC,OAAO,CAAC,IAAIlB,UAAU,EAAE;IAC3C,MAAMmB,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,GAAG,IAAAC,4CAAqB,EAAC,GAAGlB,UAAU,CAAC,CAACc,OAAO,CAAC;IAEjEH,OAAO,CAACK,MAAM,CAAC,CAACD,IAAI,EAAEI,OAAO,IAAIF,WAAW,CAACE,OAAO,EAAE;MAAEC,MAAM,EAAE,IAAIC,WAAW,CAAC;IAAE,CAAC,CAAC,CAAC;EACvF;;EAEA;EACA,KAAK,MAAM,CAACR,OAAO,EAAEC,OAAO,CAAC,IAAIf,aAAa,EAAE;IAC9C,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;IAEnEL,OAAO,CAACK,MAAM,CAAC,CAACD,IAAI,EAAEI,OAAO,IAAIL,OAAO,CAACK,OAAO,EAAE;MAAEC,MAAM,EAAE,IAAIC,WAAW,CAAC;IAAE,CAAC,CAAC,CAAC;EACnF;;EAEA;EACA,OAAOlB,OAAO,CAACQ,OAAO,CAACW,KAAK,CAAC,CAAC,CAAC;AACjC;AAEA,SAASZ,QAAQA,CAAIa,KAAQ,EAAK;EAChC,OAAOA,KAAK;AACd"}

package/dist/cjs/preset/server/types.js.map CHANGED Viewed

	@@ -1 +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 ~~meta: unknown,\n~~ ): PageResponseFormatResult \| Promise<PageResponseFormatResult>;\n}\n\nexport interface RenderToString {\n (jsx: JSX.Element): string \| Promise<string>;\n}\n"],"mappings":""}
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\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/cjs/preset/server/utils/get-forwarded-headers.js CHANGED Viewed

@@ -23,6 +23,12 @@ function getForwardedHeaders(config, request) {
     result.set('X-Client-Ip', clientIp);
   }
+  // cookie
+  const cookie = request.headers.get('cookie');
+  if (cookie) {
+    result.set('cookie', cookie);
+  }
   // service headers
   request.headers.forEach((headerValue, headerName) => {
     if (headerName.toLowerCase().startsWith('simaland-') && headerName.toLowerCase() !== 'simaland-params') {

package/dist/cjs/preset/server/utils/get-forwarded-headers.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"get-forwarded-headers.js","names":["_getClientIp","require","getForwardedHeaders","config","request","result","Headers","set","appName","appVersion","clientIp","getClientIp","headers","forEach","headerValue","headerName","toLowerCase","startsWith"],"sources":["../../../../../src/preset/server/utils/get-forwarded-headers.ts"],"sourcesContent":["import type { BaseConfig } from '../../../config';\nimport { getClientIp } from './get-client-ip';\n\n/*\n Вернет заголовки, которые должны содержаться в исходящих http-запросах при обработке входящего http-запроса.\n * @param config Конфигурация.\n * @param request Входящий запрос.\n * @return Заголовки.\n */\nexport function getForwardedHeaders(config: BaseConfig, request: Request): Headers {\n const result = new Headers();\n\n // user agent\n result.set('User-Agent', `simaland-${config.appName}/${config.appVersion}`);\n\n // client ip\n const clientIp = getClientIp(request);\n\n if (clientIp) {\n result.set('X-Client-Ip', clientIp);\n }\n\n // service headers\n request.headers.forEach((headerValue, headerName) => {\n if (\n headerName.toLowerCase().startsWith('simaland-') &&\n headerName.toLowerCase() !== 'simaland-params'\n ) {\n result.set(headerName, headerValue);\n }\n });\n\n return result;\n}\n"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,mBAAmBA,CAACC,MAAkB,EAAEC,OAAgB,EAAW;EACjF,MAAMC,MAAM,GAAG,IAAIC,OAAO,CAAC,CAAC;;EAE5B;EACAD,MAAM,CAACE,GAAG,CAAC,YAAY,EAAG,YAAWJ,MAAM,CAACK,OAAQ,IAAGL,MAAM,CAACM,UAAW,EAAC,CAAC;;EAE3E;EACA,MAAMC,QAAQ,GAAG,IAAAC,wBAAW,EAACP,OAAO,CAAC;~~EAErC~~,IAAIM,QAAQ,EAAE;IACZL,MAAM,CAACE,GAAG,CAAC,aAAa,EAAEG,QAAQ,CAAC;EACrC;;EAEA;~~EACAN~~,OAAO,~~CAACQ~~,OAAO,CAACC,OAAO,CAAC,CAACC,WAAW,EAAEC,UAAU,KAAK;IACnD,IACEA,UAAU,CAACC,WAAW,CAAC,CAAC,CAACC,UAAU,CAAC,WAAW,CAAC,IAChDF,UAAU,CAACC,WAAW,CAAC,CAAC,KAAK,iBAAiB,EAC9C;~~MACAX~~,MAAM,CAACE,GAAG,~~CAACQ~~,UAAU,EAAED,WAAW,CAAC;IACrC;EACF,CAAC,CAAC;EAEF,~~OAAOT~~,MAAM;AACf"}
1	+ {"version":3,"file":"get-forwarded-headers.js","names":["_getClientIp","require","getForwardedHeaders","config","request","result","Headers","set","appName","appVersion","clientIp","getClientIp","cookie","headers","get","forEach","headerValue","headerName","toLowerCase","startsWith"],"sources":["../../../../../src/preset/server/utils/get-forwarded-headers.ts"],"sourcesContent":["import type { BaseConfig } from '../../../config';\nimport { getClientIp } from './get-client-ip';\n\n/*\n Вернет заголовки, которые должны содержаться в исходящих http-запросах при обработке входящего http-запроса.\n * @param config Конфигурация.\n * @param request Входящий запрос.\n * @return Заголовки.\n */\nexport function getForwardedHeaders(config: BaseConfig, request: Request): Headers {\n const result = new Headers();\n\n // user agent\n result.set('User-Agent', `simaland-${config.appName}/${config.appVersion}`);\n\n // client ip\n const clientIp = getClientIp(request);\n if (clientIp) {\n result.set('X-Client-Ip', clientIp);\n }\n\n // cookie\n const cookie = request.headers.get('cookie');\n if (cookie) {\n result.set('cookie', cookie);\n }\n\n // service headers\n request.headers.forEach((headerValue, headerName) => {\n if (\n headerName.toLowerCase().startsWith('simaland-') &&\n headerName.toLowerCase() !== 'simaland-params'\n ) {\n result.set(headerName, headerValue);\n }\n });\n\n return result;\n}\n"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,mBAAmBA,CAACC,MAAkB,EAAEC,OAAgB,EAAW;EACjF,MAAMC,MAAM,GAAG,IAAIC,OAAO,CAAC,CAAC;;EAE5B;EACAD,MAAM,CAACE,GAAG,CAAC,YAAY,EAAG,YAAWJ,MAAM,CAACK,OAAQ,IAAGL,MAAM,CAACM,UAAW,EAAC,CAAC;;EAE3E;EACA,MAAMC,QAAQ,GAAG,IAAAC,wBAAW,EAACP,OAAO,CAAC;EACrC,IAAIM,QAAQ,EAAE;IACZL,MAAM,CAACE,GAAG,CAAC,aAAa,EAAEG,QAAQ,CAAC;EACrC;;EAEA;EACA,MAAME,MAAM,GAAGR,OAAO,CAACS,OAAO,CAACC,GAAG,CAAC,QAAQ,CAAC;EAC5C,IAAIF,MAAM,EAAE;IACVP,MAAM,CAACE,GAAG,CAAC,QAAQ,EAAEK,MAAM,CAAC;EAC9B;;EAEA;EACAR,OAAO,CAACS,OAAO,CAACE,OAAO,CAAC,CAACC,WAAW,EAAEC,UAAU,KAAK;IACnD,IACEA,UAAU,CAACC,WAAW,CAAC,CAAC,CAACC,UAAU,CAAC,WAAW,CAAC,IAChDF,UAAU,CAACC,WAAW,CAAC,CAAC,KAAK,iBAAiB,EAC9C;MACAb,MAAM,CAACE,GAAG,CAACU,UAAU,EAAED,WAAW,CAAC;IACrC;EACF,CAAC,CAAC;EAEF,OAAOX,MAAM;AACf"}

package/dist/cjs/preset/server/utils/get-page-response-format.js CHANGED Viewed

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

package/dist/cjs/preset/server/utils/get-page-response-format.js.map CHANGED Viewed

	@@ -1 +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;AACO,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"}
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 * @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;AACO,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/cjs/preset/server/utils/get-serve-error-logging.js CHANGED Viewed

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