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

#38
sima-land · Mar 11, 2024 · 6e31158 · 6e31158
2 parents e1379f0 + c86c9cf
commit 6e31158
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 45 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -62,15 +62,15 @@
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
     "jsesc": "^3.0.2",
-    "middleware-axios": "^2.1.5",
+    "middleware-axios": "^2.1.6",
     "pino": "^8.14.1",
     "pino-pretty": "^9.1.1",
     "prom-client": "^14.2.0",
     "webpack": "^5.82.0"
   },
   "peerDependencies": {
     "@reduxjs/toolkit": "^1.9.5",
-    "axios": "^1.4.0",
+    "axios": "^1.6.7",
     "react": "^17.0 || ^18.0",
     "react-dom": "^17.0 || ^18.0",
     "react-redux": "^8.0.5",

diff --git a/src/preset/isomorphic/providers/index.ts b/src/preset/isomorphic/providers/index.ts
@@ -49,13 +49,13 @@ export function provideAxiosFactory(resolve: Resolve) {
   const middleware = resolve(KnownToken.Axios.middleware);
 
   return (config: CreateAxiosDefaults = {}) => {
-    const client = create(config as any); // @todo убрать as any
+    const instance = create(config);
 
     for (const item of middleware) {
-      client.use(item);
+      instance.use(item);
     }
 
-    return client;
+    return instance;
   };
 }
 

diff --git a/src/preset/node/utils/axios-tracing-middleware.ts b/src/preset/node/utils/axios-tracing-middleware.ts
@@ -1,4 +1,4 @@
-import type { AxiosDefaults, AxiosRequestConfig } from 'axios';
+import type { AxiosInstance, AxiosRequestConfig, HeadersDefaults } from 'axios';
 import type { Middleware } from 'middleware-axios';
 import { Context, Tracer, SpanStatusCode } from '@opentelemetry/api';
 import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
@@ -24,8 +24,11 @@ export function axiosTracingMiddleware(tracer: Tracer, rootContext: Context): Mi
         ...config.params,
       }),
       'request.headers': JSON.stringify({
-        ...defaults.headers[method.toLowerCase() as 'get'],
+        // @todo непонятно как доставать заголовки из defaults потому что там на одном уровне заголовки и таблицы заголовков
+        ...defaults.headers.common,
+        ...defaults.headers[method.toLowerCase() as keyof HeadersDefaults],
         ...config.headers,
+        // @todo возможно стоит убрать cookie/Cookie
       }),
 
       // если нашли id - добавляем в теги
@@ -59,7 +62,7 @@ export function axiosTracingMiddleware(tracer: Tracer, rootContext: Context): Mi
  */
 export function getRequestInfo(
   config: AxiosRequestConfig,
-  defaults: AxiosDefaults,
+  defaults: AxiosInstance['defaults'],
 ): {
   method: string;
   url: string;

diff --git a/src/utils/axios/middleware/__test__/cookie.test.ts b/src/utils/axios/middleware/__test__/cookie.test.ts
@@ -1,4 +1,4 @@
-import { AxiosDefaults, InternalAxiosRequestConfig } from 'axios';
+import { AxiosHeaders, AxiosInstance, InternalAxiosRequestConfig } from 'axios';
 import { Next } from 'middleware-axios';
 import { cookieMiddleware } from '../cookie';
 import { createCookieStore } from '../../../../http';
@@ -23,15 +23,15 @@ describe('cookieMiddleware', () => {
         headers: {},
       }),
     );
-    const defaults: AxiosDefaults = {
+    const defaults: AxiosInstance['defaults'] = {
       headers: {
-        get: {},
-        post: {},
-        put: {},
-        delete: {},
-        patch: {},
-        common: {},
-        head: {},
+        get: new AxiosHeaders(),
+        post: new AxiosHeaders(),
+        put: new AxiosHeaders(),
+        delete: new AxiosHeaders(),
+        patch: new AxiosHeaders(),
+        common: new AxiosHeaders(),
+        head: new AxiosHeaders(),
       },
     };
 
@@ -73,15 +73,15 @@ describe('cookieMiddleware', () => {
         } as any,
       }),
     );
-    const defaults: AxiosDefaults = {
+    const defaults: AxiosInstance['defaults'] = {
       headers: {
-        get: {},
-        post: {},
-        put: {},
-        delete: {},
-        patch: {},
-        common: {},
-        head: {},
+        get: new AxiosHeaders(),
+        post: new AxiosHeaders(),
+        put: new AxiosHeaders(),
+        delete: new AxiosHeaders(),
+        patch: new AxiosHeaders(),
+        common: new AxiosHeaders(),
+        head: new AxiosHeaders(),
       },
     };
 

diff --git a/src/utils/axios/middleware/__test__/log.test.ts b/src/utils/axios/middleware/__test__/log.test.ts
@@ -1,4 +1,4 @@
-import { AxiosRequestConfig, AxiosDefaults, AxiosResponse } from 'axios';
+import { AxiosRequestConfig, AxiosResponse, AxiosInstance } from 'axios';
 import { Next } from 'middleware-axios';
 import { logMiddleware, LogMiddlewareHandler } from '../log';
 
@@ -31,7 +31,7 @@ describe('logMiddleware', () => {
   it('should works properly without error', async () => {
     const config: AxiosRequestConfig<any> = {};
 
-    const defaults: AxiosDefaults<any> = {
+    const defaults: AxiosInstance['defaults'] = {
       headers: {} as any,
       baseURL: 'https://sima.com/',
     };
@@ -62,7 +62,7 @@ describe('logMiddleware', () => {
   it('should works properly with error', async () => {
     const config: AxiosRequestConfig<any> = {};
 
-    const defaults: AxiosDefaults<any> = {
+    const defaults: AxiosInstance['defaults'] = {
       headers: {} as any,
       baseURL: 'https://sima.com/',
     };
@@ -87,7 +87,7 @@ describe('logMiddleware', () => {
   it('should handle handler factory', async () => {
     const config: AxiosRequestConfig<any> = {};
 
-    const defaults: AxiosDefaults<any> = {
+    const defaults: AxiosInstance['defaults'] = {
       headers: {} as any,
       baseURL: 'https://sima.com/',
     };