#38

- deps: добавлен accepts (patch) - preset/server: перенесена часть провайдеров из preset/node (patch) - preset/server: добавлен провайдер функции рендера jsx в строку (patch) - preset/server: добавлен провайдер обьекта событий ответа (patch) - preset/server: добавлен провайдер формформаттера ответа на запрос страницы (patch) - preset/node-handler: добавлен провайдер событий ответа (patch) - preset/node-handler: провайдер main декомпозирован (patch) - preset/bun-handler: добавлен провайдер событий ответа (patch) - preset/bun-handler: провайдер main декомпозирован (patch)
sima-land · Mar 21, 2024 · 3fd96ef · 3fd96ef
1 parent f2d9e98
commit 3fd96ef
Show file tree

Hide file tree

Showing 21 changed files with 253 additions and 191 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "author": "www.sima-land.ru team",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=16.15.1"
+    "node": ">=18.0.0"
   },
   "scripts": {
     "prepare": "husky install",
@@ -27,6 +27,7 @@
     "@babel/preset-typescript": "^7.22.5",
     "@sima-land/linters": "^4.0.0",
     "@testing-library/react": "^14.0.0",
+    "@types/accepts": "^1.3.7",
     "@types/express": "^4.17.17",
     "@types/jest": "^28.1.7",
     "@types/jsesc": "^3.0.1",
@@ -59,6 +60,7 @@
     "@sentry/browser": "^7.81.0",
     "@sentry/bun": "^7.81.0",
     "@sentry/node": "^7.81.0",
+    "accepts": "^1.3.8",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
     "jsesc": "^3.0.2",

diff --git a/src/preset/bun-handler/index.ts b/src/preset/bun-handler/index.ts
@@ -5,14 +5,18 @@ import { PresetTuner } from '../isomorphic';
 import { provideAbortController } from '../isomorphic/providers/abort-controller';
 import { provideFetch } from '../isomorphic/providers/fetch';
 import { provideReduxMiddlewareSaga } from '../isomorphic/providers/redux-middleware-saga';
-import { providePageRender } from '../node-handler/providers/page-render';
-import { provideFetchLogHandler } from './providers/fetch-log-handler';
+import { providePageRender } from '../server/providers/page-render';
+import { provideFetchLogHandler } from '../server/providers/fetch-log-handler';
 import { provideFetchMiddleware } from './providers/fetch-middleware';
 import { provideHandlerMain } from './providers/handler-main';
-import { providePageHelmet } from './providers/page-helmet';
+import { providePageHelmet } from '../server/providers/page-helmet';
 import { provideSpecificParams } from './providers/specific-params';
 import { provideCookieStore } from './providers/cookie-store';
 import { SpecificExtras } from '../server/utils/specific-extras';
+import { provideElementToString } from '../server/providers/element-to-string';
+import { provideFormatPageResponse } from '../server/providers/format-page-response';
+import { provideAcceptType } from './providers/accept-type';
+import { provideResponseEvents } from '../server/providers/response-events';
 
 /**
  * Возвращает preset с зависимостями для формирования обработчика входящего http-запроса.
@@ -32,11 +36,15 @@ export function PresetBunHandler(customize?: PresetTuner) {
 
   // handler
   preset.set(KnownToken.Http.Handler.main, provideHandlerMain);
+  preset.set(KnownToken.Http.Handler.Request.acceptType, provideAcceptType);
   preset.set(KnownToken.Http.Handler.Request.specificParams, provideSpecificParams);
+  preset.set(KnownToken.Http.Handler.Response.events, provideResponseEvents);
   preset.set(KnownToken.Http.Handler.Response.specificExtras, () => new SpecificExtras());
   preset.set(KnownToken.Http.Handler.Page.assets, () => ({ js: '', css: '' }));
   preset.set(KnownToken.Http.Handler.Page.helmet, providePageHelmet);
   preset.set(KnownToken.Http.Handler.Page.render, providePageRender);
+  preset.set(KnownToken.Http.Handler.Page.elementToString, provideElementToString);
+  preset.set(KnownToken.Http.Handler.Page.formatResponse, provideFormatPageResponse);
 
   // redux saga
   preset.set(KnownToken.Redux.Middleware.saga, provideReduxMiddlewareSaga);

diff --git a/src/preset/bun-handler/providers/accept-type.ts b/src/preset/bun-handler/providers/accept-type.ts
@@ -0,0 +1,19 @@
+import type { Resolve } from '../../../di';
+import { KnownToken } from '../../../tokens';
+import accepts from 'accepts';
+
+/**
+ * Провайдер функции, которая определяет возможные типы ответа и их приоритет.
+ * @param resolve Resolve.
+ * @return Функция.
+ */
+export function provideAcceptType(resolve: Resolve) {
+  const context = resolve(KnownToken.Http.Handler.context);
+
+  // @todo опасное место, будем решать как исправлять по итогам https://github.com/jshttp/accepts/issues/30
+  const accept = accepts({
+    headers: Object.fromEntries(context.request.headers.entries()),
+  } as any);
+
+  return accept.type.bind(accept);
+}
diff --git a/src/preset/bun-handler/providers/fetch-log-handler.ts b/src/preset/bun-handler/providers/fetch-log-handler.ts
diff --git a/src/preset/bun-handler/providers/handler-main.tsx b/src/preset/bun-handler/providers/handler-main.tsx
@@ -1,12 +1,9 @@
 /* eslint-disable require-jsdoc, jsdoc/require-jsdoc */
-import { renderToString } from 'react-dom/server';
 import { Resolve } from '../../../di';
 import { KnownToken } from '../../../tokens';
 import { ResponseError, applyMiddleware } from '../../../http';
-import { PageAssets } from '../../isomorphic/types';
-import { PAGE_HANDLER_EVENT_TYPE } from '../../server/constants';
-import { getPageResponseFormat } from '../../server/utils/get-page-response-format';
 import { HelmetContext } from '../../server/utils/regular-helmet';
+import { LogLevel } from '../../../log';
 
 export function provideHandlerMain(resolve: Resolve) {
   const config = resolve(KnownToken.Config.base);
@@ -16,7 +13,7 @@ export function provideHandlerMain(resolve: Resolve) {
   const extras = resolve(KnownToken.Http.Handler.Response.specificExtras);
   const Helmet = resolve(KnownToken.Http.Handler.Page.helmet);
   const abortController = resolve(KnownToken.Http.Fetch.abortController);
-  const context = resolve(KnownToken.Http.Handler.context);
+  const formatResponse = resolve(KnownToken.Http.Handler.Page.formatResponse);
 
   // @todo https://github.com/sima-land/isomorph/issues/69
   // const cookieStore = resolve(KnownToken.Http.Fetch.cookieStore);
@@ -27,65 +24,7 @@ export function provideHandlerMain(resolve: Resolve) {
 
   const getAssets = typeof assetsInit === 'function' ? assetsInit : () => assetsInit;
 
-  const elementToString = (element: JSX.Element) => {
-    context.events.dispatchEvent(new Event(PAGE_HANDLER_EVENT_TYPE.renderStart));
-    const result = renderToString(element);
-    context.events.dispatchEvent(new Event(PAGE_HANDLER_EVENT_TYPE.renderFinish));
-
-    return result;
-  };
-
-  const getResponseHTML = (jsx: React.JSX.Element, assets: PageAssets, meta: unknown) => {
-    const headers = new Headers();
-
-    headers.set('content-type', 'text/html');
-    headers.set('simaland-bundle-js', assets.js);
-    headers.set('simaland-bundle-css', assets.css);
-
-    if (assets.criticalJs) {
-      headers.set('simaland-critical-js', assets.criticalJs);
-    }
-
-    if (assets.criticalCss) {
-      headers.set('simaland-critical-css', assets.criticalCss);
-    }
-
-    if (meta) {
-      headers.set('simaland-meta', JSON.stringify(meta));
-    }
-
-    // ВАЖНО: DOCTYPE обязательно нужен так как влияет на то как браузер будет парсить html/css
-    // ВАЖНО: DOCTYPE нужен только когда отдаем полноценную страницу
-    if (config.env === 'development') {
-      return new Response(`<!DOCTYPE html>${elementToString(jsx)}`, {
-        headers,
-      });
-    } else {
-      return new Response(elementToString(jsx), {
-        headers,
-      });
-    }
-  };
-
-  const getResponseJSON = (jsx: React.JSX.Element, assets: PageAssets, meta: unknown) => {
-    const headers = new Headers();
-
-    headers.set('content-type', 'application/json');
-
-    return new Response(
-      JSON.stringify({
-        markup: elementToString(jsx),
-        bundle_js: assets.js,
-        bundle_css: assets.css,
-        critical_js: assets.criticalJs,
-        critical_css: assets.criticalCss,
-        meta,
-      }),
-      { headers },
-    );
-  };
-
-  const handler = async (request: Request): Promise<Response> => {
+  const handler = async (): Promise<Response> => {
     try {
       const assets = await getAssets();
       const meta = extras.getMeta();
@@ -96,33 +35,43 @@ export function provideHandlerMain(resolve: Resolve) {
         </HelmetContext.Provider>
       );
 
-      switch (getPageResponseFormat(request)) {
-        case 'html': {
-          return getResponseHTML(jsx, assets, meta);
-        }
-        case 'json': {
-          return getResponseJSON(jsx, assets, meta);
-        }
-      }
+      const { body, headers } = await formatResponse(jsx, assets, meta);
+
+      return new Response(body, { headers });
     } catch (error) {
+      let logLevel: LogLevel | null = 'error';
       let message: string;
       let statusCode = 500; // по умолчанию, если на этапе подготовки страницы что-то не так, отдаем 500
+      let redirectLocation: string | null = null;
 
       if (error instanceof Error) {
         message = error.message;
 
         if (error instanceof ResponseError) {
           statusCode = error.statusCode;
+          redirectLocation = error.redirectLocation;
+          logLevel = error.logLevel;
         }
       } else {
         message = String(error);
       }
 
-      logger.error(error);
+      if (logLevel && logger[logLevel]) {
+        logger[logLevel](error);
+      }
 
-      return new Response(message, {
-        status: statusCode,
-      });
+      if (statusCode > 299 && statusCode < 400 && redirectLocation) {
+        return new Response(null, {
+          status: statusCode,
+          headers: {
+            Location: redirectLocation,
+          },
+        });
+      } else {
+        return new Response(message, {
+          status: statusCode,
+        });
+      }
     }
   };
 

diff --git a/src/preset/bun-handler/providers/page-helmet.ts b/src/preset/bun-handler/providers/page-helmet.ts
diff --git a/src/preset/bun/index.ts b/src/preset/bun/index.ts
@@ -3,8 +3,8 @@ import { KnownToken } from '../../tokens';
 import { PresetTuner } from '../isomorphic';
 import { provideBaseConfig } from '../isomorphic/providers/base-config';
 import { provideFetch } from '../isomorphic/providers/fetch';
-import { provideKnownHttpApiHosts } from '../node/providers/known-http-api-hosts';
-import { provideSsrBridgeServerSide } from '../node/providers/ssr-bridge-server-side';
+import { provideKnownHttpApiHosts } from '../server/providers/known-http-api-hosts';
+import { provideSsrBridgeServerSide } from '../server/providers/ssr-bridge-server-side';
 import { provideConfigSource } from './providers/config-source';
 import { provideLogger } from './providers/logger';
 import { provideServe } from './providers/serve';

diff --git a/src/preset/node-handler/index.ts b/src/preset/node-handler/index.ts
@@ -4,16 +4,20 @@ import { provideReduxMiddlewareSaga } from '../isomorphic/providers/redux-middle
 import { provideFetch } from '../isomorphic/providers/fetch';
 import { provideAbortController } from '../isomorphic/providers/abort-controller';
 import { PresetTuner } from '../isomorphic/types';
+import { provideFormatPageResponse } from '../server/providers/format-page-response';
+import { provideElementToString } from '../server/providers/element-to-string';
 import { provideAxiosMiddleware } from './providers/axios-middleware';
 import { provideAxiosLogHandler } from './providers/axios-log-handler';
 import { provideHandlerMain } from './providers/handler-main';
 import { provideSpecificParams } from './providers/specific-params';
-import { providePageHelmet } from './providers/page-helmet';
-import { providePageRender } from './providers/page-render';
+import { providePageHelmet } from '../server/providers/page-helmet';
+import { providePageRender } from '../server/providers/page-render';
 import { provideFetchMiddleware } from './providers/fetch-middleware';
-import { provideFetchLogHandler } from './providers/fetch-log-handler';
+import { provideFetchLogHandler } from '../server/providers/fetch-log-handler';
 import { provideCookieStore } from './providers/cookie-store';
 import { SpecificExtras } from '../server/utils/specific-extras';
+import { provideAcceptType } from './providers/accepts-type';
+import { provideResponseEvents } from './providers/response-events';
 
 /**
  * Возвращает preset с зависимостями по умолчанию для работы в рамках ответа на http-запрос.
@@ -43,11 +47,15 @@ export function PresetHandler(customize?: PresetTuner): Preset {
   preset.set(KnownToken.ExpressHandler.main, provideHandlerMain);
 
   // http handler
+  preset.set(KnownToken.Http.Handler.Request.acceptType, provideAcceptType);
   preset.set(KnownToken.Http.Handler.Request.specificParams, provideSpecificParams);
   preset.set(KnownToken.Http.Handler.Response.specificExtras, () => new SpecificExtras());
+  preset.set(KnownToken.Http.Handler.Response.events, provideResponseEvents);
   preset.set(KnownToken.Http.Handler.Page.assets, () => ({ js: '', css: '' }));
   preset.set(KnownToken.Http.Handler.Page.helmet, providePageHelmet);
   preset.set(KnownToken.Http.Handler.Page.render, providePageRender);
+  preset.set(KnownToken.Http.Handler.Page.elementToString, provideElementToString);
+  preset.set(KnownToken.Http.Handler.Page.formatResponse, provideFormatPageResponse);
 
   if (customize) {
     customize({ override: preset.set.bind(preset) });

diff --git a/src/preset/node-handler/providers/accepts-type.ts b/src/preset/node-handler/providers/accepts-type.ts
@@ -0,0 +1,13 @@
+import type { Resolve } from '../../../di';
+import { KnownToken } from '../../../tokens';
+
+/**
+ * Провайдер функции, которая определяет возможные типы ответа и их приоритет.
+ * @param resolve Resolve.
+ * @return Функция.
+ */
+export function provideAcceptType(resolve: Resolve) {
+  const context = resolve(KnownToken.ExpressHandler.context);
+
+  return context.req.accepts.bind(context.req);
+}