Merge pull request #110 from sima-land/38-examples-bun

src/preset/bun-handler/providers/index.tsx

@@ -20,7 +20,7 @@ import { getFetchExtraAborting } from '../../isomorphic/utils/get-fetch-extra-ab
 import { getFetchLogging } from '../../isomorphic/utils/get-fetch-logging';
 import { FetchLogging } from '../../isomorphic/utils/fetch-logging';
 import { PageAssets } from '../../isomorphic/types';
-import { RESPONSE_EVENT_TYPE } from '../../isomorphic/constants';
+import { PAGE_HANDLER_EVENT_TYPE } from '../../server/constants';
 import { getPageResponseFormat } from '../../server/utils/get-page-response-format';
 import { getForwardedHeaders } from '../../server/utils/get-forwarded-headers';
 
@@ -38,9 +38,9 @@ export const HandlerProviders = {
     const getAssets = typeof assetsInit === 'function' ? assetsInit : () => assetsInit;
 
     const elementToString = (element: JSX.Element) => {
-      context.events.dispatchEvent(new Event(RESPONSE_EVENT_TYPE.renderStart));
+      context.events.dispatchEvent(new Event(PAGE_HANDLER_EVENT_TYPE.renderStart));
       const result = renderToString(element);
-      context.events.dispatchEvent(new Event(RESPONSE_EVENT_TYPE.renderFinish));
+      context.events.dispatchEvent(new Event(PAGE_HANDLER_EVENT_TYPE.renderFinish));
 
       return result;
     };

src/preset/node/handler/providers/index.tsx

@@ -21,7 +21,7 @@ import { getFetchLogging } from '../../../isomorphic/utils/get-fetch-logging';
 import { getFetchErrorLogging } from '../../../isomorphic/utils/get-fetch-error-logging';
 import { getFetchExtraAborting } from '../../../isomorphic/utils/get-fetch-extra-aborting';
 import { LogMiddlewareHandlerInit, cookieMiddleware, logMiddleware } from '../../../../utils/axios';
-import { RESPONSE_EVENT_TYPE } from '../../../isomorphic/constants';
+import { PAGE_HANDLER_EVENT_TYPE } from '../../../server/constants';
 import type { ConventionalJson } from '../../../isomorphic/types';
 import { Fragment } from 'react';
 import { HelmetContext, RegularHelmet, getPageResponseFormat } from '../utils';
@@ -51,9 +51,9 @@ export function provideHandlerMain(resolve: Resolve): VoidFunction {
    * @return Строка.
    */
   const elementToString = (element: JSX.Element) => {
-    res.emit(RESPONSE_EVENT_TYPE.renderStart);
+    res.emit(PAGE_HANDLER_EVENT_TYPE.renderStart);
     const result = renderToString(element);
-    res.emit(RESPONSE_EVENT_TYPE.renderFinish);
+    res.emit(PAGE_HANDLER_EVENT_TYPE.renderFinish);
 
     return result;
   };

src/preset/node/node/providers/index.ts

@@ -9,7 +9,7 @@ import { KnownToken } from '../../../../tokens';
 import { Resolve } from '../../../../di';
 import { KnownHttpApiKey } from '../../../isomorphic/types';
 import { toMilliseconds } from '../../../../utils';
-import { RESPONSE_EVENT_TYPE } from '../../../isomorphic/constants';
+import { PAGE_HANDLER_EVENT_TYPE } from '../../../server/constants';
 import { getClientIp } from '../utils/http-server';
 
 // Node.js specific packages
@@ -283,10 +283,10 @@ export function provideExpressMetricsMiddleware(resolve: Resolve): Handler {
 
     requestCount.inc(getLabels(req, res), 1);
 
-    res.once(RESPONSE_EVENT_TYPE.renderStart, () => {
+    res.once(PAGE_HANDLER_EVENT_TYPE.renderStart, () => {
       const renderStart = process.hrtime.bigint();
 
-      res.once(RESPONSE_EVENT_TYPE.renderFinish, () => {
+      res.once(PAGE_HANDLER_EVENT_TYPE.renderFinish, () => {
         const renderFinish = process.hrtime.bigint();
 
         renderDuration.observe(
@@ -351,10 +351,10 @@ export function provideExpressTracingMiddleware(resolve: Resolve): Handler {
       renderSpan: null,
     };
 
-    res.once(RESPONSE_EVENT_TYPE.renderStart, () => {
+    res.once(PAGE_HANDLER_EVENT_TYPE.renderStart, () => {
       res.locals.tracing.renderSpan = tracer.startSpan('render', undefined, rootContext);
 
-      res.once(RESPONSE_EVENT_TYPE.renderFinish, () => {
+      res.once(PAGE_HANDLER_EVENT_TYPE.renderFinish, () => {
         res.locals.tracing.renderSpan.end();
       });
     });

src/preset/isomorphic/constants.ts → src/preset/server/constants.ts

@@ -1,8 +1,7 @@
 /**
  * События в процессе ответа на запрос.
- * @todo Переименовать в PAGE_HANDLER_EVENT_TYPE и перенести в preset/server/constants.
  */
-export const RESPONSE_EVENT_TYPE = {
+export const PAGE_HANDLER_EVENT_TYPE = {
   // ВАЖНО: пусть здесь остаются строки в качестве значений чтобы их можно было использовать вместе с EventTarget
   renderStart: 'isomorph/render:start',
   renderFinish: 'isomorph/render:finish',

src/preset/server/index.ts

@@ -1,4 +1,5 @@
 export type { ServerHandler, ServerMiddleware, ServerHandlerContext } from './types';
+export { PAGE_HANDLER_EVENT_TYPE } from './constants';
 export { getClientIp } from './utils/get-client-ip';
 export { getForwardedHeaders } from './utils/get-forwarded-headers';
 export { getHealthCheck } from './utils/get-health-check';

src/preset/server/utils/__test__/get-serve-measuring.test.ts

@@ -1,5 +1,5 @@
 import { BaseConfig } from '../../../../config';
-import { RESPONSE_EVENT_TYPE } from '../../../isomorphic/constants';
+import { PAGE_HANDLER_EVENT_TYPE } from '../../constants';
 import { getServeMeasuring } from '../get-serve-measuring';
 
 describe('getServeMeasuring', () => {
@@ -17,8 +17,8 @@ describe('getServeMeasuring', () => {
       await middleware(
         new Request('http://test.com'),
         () => {
-          events.dispatchEvent(new Event(RESPONSE_EVENT_TYPE.renderStart));
-          events.dispatchEvent(new Event(RESPONSE_EVENT_TYPE.renderFinish));
+          events.dispatchEvent(new Event(PAGE_HANDLER_EVENT_TYPE.renderStart));
+          events.dispatchEvent(new Event(PAGE_HANDLER_EVENT_TYPE.renderFinish));
           return Promise.resolve<Response>(new Response('OK'));
         },
         {

src/preset/server/utils/get-serve-measuring.ts

@@ -1,6 +1,6 @@
 import type { BaseConfig } from '../../../config';
 import type { ServerMiddleware } from '../types';
-import { RESPONSE_EVENT_TYPE } from '../../isomorphic/constants';
+import { PAGE_HANDLER_EVENT_TYPE } from '../constants';
 import { toMilliseconds } from '../../../utils';
 import PromClient from 'prom-client';
 
@@ -58,15 +58,15 @@ export function getServeMeasuring(config: BaseConfig): ServerMiddleware {
     let renderStart = 0n;
 
     context.events.addEventListener(
-      RESPONSE_EVENT_TYPE.renderStart,
+      PAGE_HANDLER_EVENT_TYPE.renderStart,
       () => {
         renderStart = process.hrtime.bigint();
       },
       { once: true },
     );
 
     context.events.addEventListener(
-      RESPONSE_EVENT_TYPE.renderFinish,
+      PAGE_HANDLER_EVENT_TYPE.renderFinish,
       () => {
         const renderFinish = process.hrtime.bigint();