@sima-land/isomorph 11.0.0-alpha.5 → 11.0.0-alpha.6

package/error-tracker/types.d.ts

@@ -1,4 +1,4 @@
-import type { Client, Severity, Context, Extra } from '@sentry/types';
+import type { Client, Severity, Context, Extra, Breadcrumb } from '@sentry/types';
 import type { withScope as withScopeBrowser } from '@sentry/browser';
 import type { withScope as withScopeNode } from '@sentry/node';
 export interface SentryLib {
@@ -16,3 +16,4 @@ export interface SentryErrorData {
         data: Extra | null;
     };
 }
+export declare type SentryBreadcrumbData = Breadcrumb;

package/error-tracker/utils.d.ts

@@ -1,4 +1,4 @@
-import { SentryErrorData } from './types';
+import { SentryErrorData, SentryBreadcrumbData } from './types';
 /**
  * Ошибка с данными для Sentry.
  */
@@ -10,3 +10,13 @@ export declare class SentryError extends Error {
      */
     constructor(message: string, data?: SentryErrorData);
 }
+/**
+ * Хлебная крошка для Sentry.
+ */
+export declare class SentryBreadcrumb {
+    data: SentryBreadcrumbData;
+    /**
+     * @param data Данные.
+     */
+    constructor(data: SentryBreadcrumbData);
+}

package/error-tracker/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SentryError = void 0;
+exports.SentryBreadcrumb = exports.SentryError = void 0;
 /**
  * Ошибка с данными для Sentry.
  */
@@ -16,4 +16,16 @@ class SentryError extends Error {
     }
 }
 exports.SentryError = SentryError;
+/**
+ * Хлебная крошка для Sentry.
+ */
+class SentryBreadcrumb {
+    /**
+     * @param data Данные.
+     */
+    constructor(data) {
+        this.data = data;
+    }
+}
+exports.SentryBreadcrumb = SentryBreadcrumb;
 //# sourceMappingURL=utils.js.map

package/error-tracker/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/error-tracker/utils.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,WAAY,SAAQ,KAAK;IAGpC;;;OAGG;IACH,YAAY,OAAe,EAAE,OAAwB,EAAE;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;IAC5B,CAAC;CACF;AAZD,kCAYC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/error-tracker/utils.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,WAAY,SAAQ,KAAK;IAGpC;;;OAGG;IACH,YAAY,OAAe,EAAE,OAAwB,EAAE;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;IAC5B,CAAC;CACF;AAZD,kCAYC;AAED;;GAEG;AACH,MAAa,gBAAgB;IAG3B;;OAEG;IACH,YAAY,IAA0B;QACpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AATD,4CASC"}

package/http-client/middleware/logging.d.ts

@@ -0,0 +1,15 @@
+import { Middleware } from 'middleware-axios';
+import { Logger } from '../../logger/types';
+import { Severity } from '@sentry/types';
+/**
+ * Возвращает новый middleware для логирования запросов.
+ * @param logger Логгер.
+ * @return Middleware.
+ */
+export declare function loggingMiddleware(logger: Logger): Middleware<any>;
+/**
+ * Возвращает уровень на основе статуса ответа.
+ * @param status Статус.
+ * @return Уровень.
+ */
+export declare function severityFromStatus(status: number | undefined): Severity.Error | Severity.Info;

package/http-client/middleware/logging.js

@@ -0,0 +1,91 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.severityFromStatus = exports.loggingMiddleware = void 0;
+const axios_1 = __importDefault(require("axios"));
+const utils_1 = require("../../error-tracker/utils");
+const types_1 = require("@sentry/types");
+/**
+ * Возвращает новый middleware для логирования запросов.
+ * @param logger Логгер.
+ * @return Middleware.
+ */
+function loggingMiddleware(logger) {
+    return async function (config, next, defaults) {
+        const { baseURL, url, method = 'GET', params, data, headers } = { ...defaults, ...config };
+        const readyMethod = method.toUpperCase();
+        const readyURL = baseURL ? `${baseURL.replace(/\/$/, '')}${url}` : url;
+        try {
+            logger.info(new utils_1.SentryBreadcrumb({
+                category: 'http.request',
+                type: 'http',
+                data: {
+                    url: readyURL,
+                    status_code: 'FETCHING',
+                    method: readyMethod,
+                    params,
+                },
+                level: types_1.Severity.Info,
+            }));
+            const response = await next(config);
+            logger.info(new utils_1.SentryBreadcrumb({
+                category: 'http.response',
+                type: 'http',
+                data: {
+                    url: readyURL,
+                    status_code: response.status,
+                    method: readyMethod,
+                    params,
+                },
+                level: types_1.Severity.Info,
+            }));
+        }
+        catch (error) {
+            if (axios_1.default.isAxiosError(error)) {
+                const statusCode = error.response?.status || 'UNKNOWN';
+                logger.error(new utils_1.SentryError('HTTP request failed', {
+                    level: severityFromStatus(error.response?.status),
+                    context: {
+                        key: 'Request details',
+                        data: {
+                            url,
+                            baseURL,
+                            method,
+                            headers,
+                            params,
+                            data,
+                        },
+                    },
+                }));
+                logger.info(new utils_1.SentryBreadcrumb({
+                    category: 'http.response',
+                    type: 'http',
+                    data: {
+                        url: readyURL,
+                        status_code: statusCode,
+                        method: readyMethod,
+                        params,
+                    },
+                    level: types_1.Severity.Error,
+                }));
+            }
+            // ВАЖНО: не скрываем ошибку, сообщаем остальному миру про нее
+            throw error;
+        }
+    };
+}
+exports.loggingMiddleware = loggingMiddleware;
+/**
+ * Возвращает уровень на основе статуса ответа.
+ * @param status Статус.
+ * @return Уровень.
+ */
+function severityFromStatus(status) {
+    return typeof status === 'number' && status >= 200 && status < 300
+        ? types_1.Severity.Info
+        : types_1.Severity.Error;
+}
+exports.severityFromStatus = severityFromStatus;
+//# sourceMappingURL=logging.js.map

package/http-client/middleware/logging.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../src/http-client/middleware/logging.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAG1B,qDAA0E;AAC1E,yCAAyC;AAEzC;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,MAAc;IAC9C,OAAO,KAAK,WAAW,MAAM,EAAE,IAAI,EAAE,QAAQ;QAC3C,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,QAAQ,EAAE,GAAG,MAAM,EAAE,CAAC;QAC3F,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;QAEvE,IAAI;YACF,MAAM,CAAC,IAAI,CACT,IAAI,wBAAgB,CAAC;gBACnB,QAAQ,EAAE,cAAc;gBACxB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE;oBACJ,GAAG,EAAE,QAAQ;oBACb,WAAW,EAAE,UAAU;oBACvB,MAAM,EAAE,WAAW;oBACnB,MAAM;iBACP;gBACD,KAAK,EAAE,gBAAQ,CAAC,IAAI;aACrB,CAAC,CACH,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;YAEpC,MAAM,CAAC,IAAI,CACT,IAAI,wBAAgB,CAAC;gBACnB,QAAQ,EAAE,eAAe;gBACzB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE;oBACJ,GAAG,EAAE,QAAQ;oBACb,WAAW,EAAE,QAAQ,CAAC,MAAM;oBAC5B,MAAM,EAAE,WAAW;oBACnB,MAAM;iBACP;gBACD,KAAK,EAAE,gBAAQ,CAAC,IAAI;aACrB,CAAC,CACH,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAC7B,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,EAAE,MAAM,IAAI,SAAS,CAAC;gBAEvD,MAAM,CAAC,KAAK,CACV,IAAI,mBAAW,CAAC,qBAAqB,EAAE;oBACrC,KAAK,EAAE,kBAAkB,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC;oBACjD,OAAO,EAAE;wBACP,GAAG,EAAE,iBAAiB;wBACtB,IAAI,EAAE;4BACJ,GAAG;4BACH,OAAO;4BACP,MAAM;4BACN,OAAO;4BACP,MAAM;4BACN,IAAI;yBACL;qBACF;iBACF,CAAC,CACH,CAAC;gBAEF,MAAM,CAAC,IAAI,CACT,IAAI,wBAAgB,CAAC;oBACnB,QAAQ,EAAE,eAAe;oBACzB,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE;wBACJ,GAAG,EAAE,QAAQ;wBACb,WAAW,EAAE,UAAU;wBACvB,MAAM,EAAE,WAAW;wBACnB,MAAM;qBACP;oBACD,KAAK,EAAE,gBAAQ,CAAC,KAAK;iBACtB,CAAC,CACH,CAAC;aACH;YAED,8DAA8D;YAC9D,MAAM,KAAK,CAAC;SACb;IACH,CAAC,CAAC;AACJ,CAAC;AA5ED,8CA4EC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,MAA0B;IAC3D,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,GAAG;QAChE,CAAC,CAAC,gBAAQ,CAAC,IAAI;QACf,CAAC,CAAC,gBAAQ,CAAC,KAAK,CAAC;AACrB,CAAC;AAJD,gDAIC"}

package/logger/handler/sentry.js

@@ -9,6 +9,7 @@ const utils_1 = require("../../error-tracker/utils");
  */
 function createSentryHandler(sentry) {
     return event => {
+        // error
         if (event.type === 'error') {
             const error = event.data;
             if (error instanceof utils_1.SentryError) {
@@ -30,6 +31,13 @@ function createSentryHandler(sentry) {
                 sentry.client.captureException(error);
             }
         }
+        // breadcrumb
+        if (event.data instanceof utils_1.SentryBreadcrumb) {
+            const breadcrumb = event.data.data;
+            sentry.withScope(scope => {
+                scope.addBreadcrumb(breadcrumb);
+            });
+        }
     };
 }
 exports.createSentryHandler = createSentryHandler;

package/logger/handler/sentry.js.map

@@ -1 +1 @@
-{"version":3,"file":"sentry.js","sourceRoot":"","sources":["../../../src/logger/handler/sentry.ts"],"names":[],"mappings":";;;AAEA,qDAAwD;AAExD;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,MAAiB;IACnD,OAAO,KAAK,CAAC,EAAE;QACb,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC;YAEzB,IAAI,KAAK,YAAY,mBAAW,EAAE;gBAChC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;gBAE7C,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;oBACvB,IAAI,KAAK,EAAE;wBACT,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;qBACvB;oBAED,IAAI,OAAO,EAAE;wBACX,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;qBAC7C;oBAED,IAAI,KAAK,EAAE;wBACT,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;qBACvC;oBAED,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;gBACxC,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;aACvC;SACF;IACH,CAAC,CAAC;AACJ,CAAC;AA5BD,kDA4BC"}
+{"version":3,"file":"sentry.js","sourceRoot":"","sources":["../../../src/logger/handler/sentry.ts"],"names":[],"mappings":";;;AAEA,qDAA0E;AAE1E;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,MAAiB;IACnD,OAAO,KAAK,CAAC,EAAE;QACb,QAAQ;QACR,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC;YAEzB,IAAI,KAAK,YAAY,mBAAW,EAAE;gBAChC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;gBAE7C,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;oBACvB,IAAI,KAAK,EAAE;wBACT,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;qBACvB;oBAED,IAAI,OAAO,EAAE;wBACX,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;qBAC7C;oBAED,IAAI,KAAK,EAAE;wBACT,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;qBACvC;oBAED,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;gBACxC,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;aACvC;SACF;QAED,aAAa;QACb,IAAI,KAAK,CAAC,IAAI,YAAY,wBAAgB,EAAE;YAC1C,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;YAEnC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;gBACvB,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAClC,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AAtCD,kDAsCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sima-land/isomorph",
-  "version": "11.0.0-alpha.5",
+  "version": "11.0.0-alpha.6",
   "description": "Tiny framework for fast start frontend microservices",
   "author": "www.sima-land.ru team",
   "license": "Apache-2.0",